Commit Graph

150 Commits

Author SHA1 Message Date
ead103d2c6 MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440) 2018-01-23 16:08:43 -05:00
c5cc23a35f wGameTimerPause bit flag constants 2018-01-23 12:40:29 -05:00
3a7f518de4 wStatusFlags/2 bit constants 2018-01-22 15:40:43 -05:00
4d8528f903 More engine flag constants 2018-01-22 14:34:55 -05:00
7cef012335 wUnlockedUnowns engine flag constants
Use local labels for "End"ings
2018-01-22 13:00:35 -05:00
6d20cf3e80 "CryHeader" → "Cry"; "Cry" → "MonCry" 2018-01-16 23:47:45 -05:00
bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -05:00
7b3de85a06 Avoid "+- 1" at every maskbits 2018-01-16 17:27:50 -05:00
8048082114 Remove Predef_ prefix from routines listed in PredefPointers 2018-01-16 14:39:28 -05:00
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
d83aefb30a Use more constants in scripts 2018-01-12 02:27:42 -05:00
94d6a32721 Use maskbits some more 2018-01-11 14:27:19 -05:00
a8cf8979d9 Do a little cleanup towards issue #465 2018-01-09 17:20:47 -05:00
2f741dfa03 Remove old Python class names from script command param doc comments 2018-01-09 01:02:29 -05:00
05e5eaf12f Eliminate version.asm (resolves #464) 2018-01-09 00:51:53 -05:00
aa9a0a900d No more mobile EQUS ret (replace with Stubbed_ + ret) 2018-01-02 20:00:14 +01:00
d7970f749a Consistent predef function names 2018-01-02 18:49:25 +01:00
6f0b81504d More unreferenced labels cleanup 2018-01-02 16:04:21 +01:00
9a3088e50c Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
b9a68fec25 Consistent if/else/endc (matches rept/endr) and DEF (matches BANK/HIGH/LOW) 2017-12-28 22:13:39 -05:00
9457679af8 Prefix engine_flags wram addresses with w 2017-12-28 13:15:46 +01:00
35a3a19fda Use "battle_anims" and "sprite_anims" for clarity, not just "anims" 2017-12-26 18:45:04 -05:00
c05b7f41dd Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 14:33:17 -05:00
c66d195089 callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
5b13a7a13b Identify more sprite-related constants
Start more documentation
2017-12-12 13:22:19 -05:00