Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,707 Commits 2 Branches 0 Tags 197 MiB
Commit Graph

73 Commits

Author SHA1 Message Date
Rangi 95fd05744d Remove "UnusedSpecial_" prefixes too 2018-01-24 11:20:41 -05:00
Rangi d719d318e8 Remove Special_ prefix from special routines (close #478) 2018-01-24 11:17:05 -05:00
Rangi 132fe46925 Rename some routines to avoid conflicts when removing "Special_" prefixes 2018-01-24 11:12:02 -05:00
Rangi 505a6595bc EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481) 2018-01-24 10:46:49 -05:00
Rangi ead103d2c6 MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440) 2018-01-23 16:08:43 -05:00
Rangi 7c0553b2d2 x is the standard temp variable 2018-01-23 10:56:36 -05:00
Rangi 0261bd2ff5 Daisy offers "grooming", not "massage" 2018-01-23 00:11:23 -05:00
Rangi 363d8b9242 KrissHouse → PlayersHouse 2018-01-22 19:10:09 -05:00
Rangi efe6981a0d Add daily+weekly bit flags (close issue #429) 2018-01-22 15:59:24 -05:00
Rangi 3a7f518de4 wStatusFlags/2 bit constants 2018-01-22 15:40:43 -05:00
Rangi 4d8528f903 More engine flag constants 2018-01-22 14:34:55 -05:00
Rangi 125d51b3b2 More engine bit flag constants 2018-01-22 13:57:44 -05:00
Rangi e135091f09 Day-Care bit flags 2018-01-22 13:18:23 -05:00
Rangi 7cef012335 wUnlockedUnowns engine flag constants 
Use local labels for "End"ings
 2018-01-22 13:00:35 -05:00
Remy Oukaour 05382d3e3c PARTY_LENGTH; MON_NAME; sgb_border.bin 2018-01-20 12:25:55 -05:00
Remy Oukaour 8127d1fbcf Rename BATTLETOWER_NROF constants 2018-01-20 12:05:16 -05:00
Remy Oukaour a3beba1e64 Use Japanese charmap definitions in strings 2018-01-18 20:49:17 -05:00
Remy Oukaour 23f2c056e8 Heal machine jumptable index constants 2018-01-18 00:57:06 -05:00
Remy Oukaour 6d20cf3e80 "CryHeader" → "Cry"; "Cry" → "MonCry" 2018-01-16 23:47:45 -05:00
Remy Oukaour bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -05:00
Remy Oukaour 7b3de85a06 Avoid "+- 1" at every maskbits 2018-01-16 17:27:50 -05:00
Remy Oukaour 8048082114 Remove Predef_ prefix from routines listed in PredefPointers 2018-01-16 14:39:28 -05:00
Remy Oukaour 9180362211 Move code out of gfx/ (close #474) 2018-01-15 11:06:32 -05:00
Remy Oukaour 9bb584798e _Special_BugContestJudging → _BugContestJudging; HOF_Predef_AnimateFrontpic → Predef_HOF_AnimateFrontpic (close #473) 2018-01-15 10:55:44 -05:00
Remy Oukaour 14c8cf5b48 Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452) 
# Conflicts:
#	data/player_names.asm
#	engine/battle/menu.asm
#	engine/billspc.asm
#	engine/billspctop.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/delete_save_change_clock.asm
#	engine/events/buena.asm
#	engine/events/elevator.asm
#	engine/events/kurt.asm
#	engine/events/mom.asm
#	engine/events/move_tutor.asm
#	engine/events/pokecenter_pc.asm
#	engine/events/pokepic.asm
#	engine/events/std_scripts.asm
#	engine/events/unown_walls.asm
#	engine/init_gender.asm
#	engine/intro_menu.asm
#	engine/mail.asm
#	engine/main_menu.asm
#	engine/mart.asm
#	engine/menu_2.asm
#	engine/mon_menu.asm
#	engine/pack.asm
#	engine/slot_machine.asm
#	engine/start_menu.asm
#	home/menu.asm
#	maps/CeladonDeptStore6F.asm
#	maps/CeladonGameCornerPrizeRoom.asm
#	maps/DragonShrine.asm
#	maps/EarlsPokemonAcademy.asm
#	maps/GoldenrodCity.asm
#	maps/GoldenrodDeptStore6F.asm
#	maps/GoldenrodGameCorner.asm
#	maps/GoldenrodPokeComCenter2FMobile.asm
#	mobile/mobile_12.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_22.asm
#	mobile/mobile_22_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_45.asm
#	mobile/mobile_45_sprite_engine.asm
#	mobile/mobile_46.asm
#	mobile/mobile_5c.asm
#	mobile/mobile_5f.asm
#	mobile/mobile_menu.asm
 2018-01-14 23:43:51 -05:00
Remy Oukaour dfcca93b45 Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 
# Conflicts:
#	engine/battle/core.asm
#	engine/save.asm
 2018-01-14 23:00:22 -05:00
Remy Oukaour 5c28d05bb4 Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 
# Conflicts:
#	data/items/descriptions.asm
#	data/sprite_anims/framesets.asm
#	engine/crystal_colors.asm
#	engine/events/kurt.asm
#	engine/events/special.asm
#	engine/events/std_scripts.asm
#	engine/events_3.asm
#	engine/item_effects.asm
#	engine/namingscreen.asm
#	engine/scripting.asm
#	engine/stats_screen.asm
#	engine/trade_animation.asm
#	home/audio.asm
#	main.asm
#	maps/BattleTower1F.asm
#	maps/BattleTowerBattleRoom.asm
#	maps/BurnedTowerB1F.asm
#	maps/ElmsLab.asm
#	maps/GoldenrodDeptStore5F.asm
#	maps/GoldenrodUnderground.asm
#	maps/HallOfFame.asm
#	maps/MahoganyTown.asm
#	maps/ManiasHouse.asm
#	maps/MobileBattleRoom.asm
#	maps/MobileTradeRoomMobile.asm
#	maps/RadioTower2F.asm
#	maps/Route35NationalParkGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/Route39Farmhouse.asm
#	tilesets/palette_maps.asm
 2018-01-14 22:56:36 -05:00
Remy Oukaour 7a09fc9f75 GFX tile sizes in decimal 2018-01-14 19:43:35 -05:00
Remy Oukaour eb3102200f More Battle Tower map script constants, fewer raw hex values 2018-01-14 19:26:55 -05:00
mid-kid 11d67567d2 Use constants for menu flags 
Added a bunch of constants for the bitflags of each kind of menu. Some
are slightly vague or too long, but I'm not sure how to else name them.
 2018-01-14 11:59:56 +01:00
Remy Oukaour 2ab60fa8a4 menu_coords macro for (x1, y1, x2, y2) order (see issue #440) 2018-01-13 16:38:14 -05:00
Remy Oukaour f1e1b26138 More gfx/**/*.pal files 2018-01-12 14:54:00 -05:00
Remy Oukaour d83aefb30a Use more constants in scripts 2018-01-12 02:27:42 -05:00
Remy Oukaour af4001132e Break up engine/events_3.asm 2018-01-11 23:50:44 -05:00
Remy Oukaour 177341425c Use charmap frame characters 2018-01-11 21:14:35 -05:00
Remy Oukaour 17f34cb29c Disambiguate some uses of wcf64/5/6 2018-01-11 15:36:11 -05:00
Remy Oukaour 94d6a32721 Use maskbits some more 2018-01-11 14:27:19 -05:00
Remy Oukaour b45f89f80c More constants and data tables 2018-01-11 01:45:27 -05:00
Remy Oukaour cc8dac5a22 Use constants and data for Unown chamber events 2018-01-11 00:25:14 -05:00
Remy Oukaour 0a3b251dcb Arrays end with -1, not $ff 2018-01-10 22:53:42 -05:00
Remy Oukaour 28d5169a11 maskbits <count> +- 1 2018-01-10 14:03:11 -05:00
Remy Oukaour bc79f17b9d More maskbits 2018-01-10 13:59:07 -05:00
Remy Oukaour 417937cffc Resolve #461 2018-01-10 13:47:57 -05:00
Remy Oukaour 16eb97ae9c Constant swap explains this Battle Tower bug 2018-01-10 02:55:44 -05:00
Remy Oukaour cc0fd6e12c CRYSTAL11 → _CRYSTAL11 2018-01-09 17:26:40 -05:00
Remy Oukaour ce50d1b2cb Clearer Battle Tower code 2018-01-09 16:55:11 -05:00
Remy Oukaour 11556196ba Consistent sine wave code formatting 2018-01-09 16:39:36 -05:00
Adelaide Walter 6c5cd7a963 Simplify comments per Rangi's rec. 2018-01-08 23:07:46 -05:00
Remy Oukaour bdd3a55333 Organize mobile/battle_tower_*.asm data and code 2018-01-06 18:53:30 -05:00
Adelaide Walter ce985a09a7 Document switches to BANK(sScratch) via xor a 2018-01-04 16:51:50 -05:00