Commit Graph

27 Commits

Author SHA1 Message Date
Remy Oukaour
bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -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
c8575823a0 Battle data goes in data/battle/
TreeMons, like fish groups, have constants
2018-01-10 17:30:27 -05:00
xCrystal
b4a49351c1 Finish consistent Special function names 2018-01-02 17:47:58 +01:00
xCrystal
333524f0be Lowercase v for VRAM addresses 2017-12-28 13:32:33 +01:00
Remy Oukaour
24f0e7d045 Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers 2017-12-26 12:50:32 -05:00
Remy Oukaour
e34e68095d Resolve #428: Use HIGH(X) and LOW(X) instead of X / $100 and X % $100 or X >> 8 and X & $ff 2017-12-25 14:23:16 -05:00
Remy Oukaour
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
Remy Oukaour
20d6c1d876 Rename "map permissions" to "map environment" (fix #396) 2017-12-24 13:08:38 -05:00
Remy Oukaour
c66d195089 callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
Remy Oukaour
cd2a748128 More WRAM cleanup 2017-12-09 22:00:36 -05:00
Remy Oukaour
6a41d4f63e Define more charmap characters and use them in place of hard-coded numbers 2017-12-09 12:57:23 -05:00
pikalaxalt
98f443f70c engine/events.asm labels finished
fixed palred/green/blue macros
2016-05-17 08:40:56 -04:00
pikalaxalt
ae36ef2c7f Labeled every function in ROM0 that's referenced in the source 2016-05-10 12:31:49 -04:00
pikalaxalt
a613ed915c HDMA transfer functions 2016-05-04 22:34:09 -04:00
pikalaxalt
3713b71d9e More splitting of main.asm; remove unneeded rept 2 2016-05-04 11:46:23 -04:00
pikalaxalt
6be4cd4da9 Local labels starting with lowercase letters are no longer decorated with a trailing colon 2016-04-10 15:01:49 -04:00
PikalaxALT
1637d915d4 Restored StandingTile and introduced LastTile 2016-01-11 02:28:09 -05:00
PikalaxALT
69af99da5e Mr Pokemons House 2016-01-06 16:59:56 -05:00
PikalaxALT
ce019e6347 Map callback constants 2016-01-06 07:44:50 -05:00
PikalaxALT
c087d44c42 more gfx-related labels 2016-01-04 08:43:55 -05:00
PikalaxALT
d08199c79d Color fns, some more address decoding in link/mobile 2015-12-22 18:03:00 -05:00
PikalaxALT
987ed1fafb More work on slots; WRAM cleanup, Move Deleter 2015-12-19 14:48:30 -05:00
PikalaxALT
6e257bc7cd mystery gift, credits 2015-12-14 20:06:41 -05:00
PikalaxALT
c635e30777 map setup and warps 2015-12-14 11:12:18 -05:00
PikalaxALT
8a439dbd05 Miscellaneous labels 2015-12-13 20:33:56 -05:00
PikalaxALT
d314bdb4fa Pokedex labels 2015-11-29 21:34:59 -05:00