Rangi
|
32ed487a47
|
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# audio/engine.asm
# constants/gfx_constants.asm
# constants/map_data_constants.asm
# constants/pokemon_data_constants.asm
# constants/sprite_constants.asm
# constants/wram_constants.asm
# data/maps/data.asm
# engine/battle/ai/scoring.asm
# engine/battle/core.asm
# engine/battle/effect_commands.asm
# engine/battle/misc.asm
# engine/battle_anims/getpokeballwobble.asm
# engine/breeding.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/events/battle_tower/battle_tower.asm
# engine/events/battle_tower/rules.asm
# engine/events/buena.asm
# engine/events/bug_contest/contest_2.asm
# engine/events/daycare.asm
# engine/events/dratini.asm
# engine/events/halloffame.asm
# engine/events/happiness_egg.asm
# engine/events/kurt.asm
# engine/events/lucky_number.asm
# engine/events/magnet_train.asm
# engine/events/overworld.asm
# engine/events/pokerus/pokerus.asm
# engine/events/print_unown.asm
# engine/events/print_unown_2.asm
# engine/events/unown_walls.asm
# engine/item_effects.asm
# engine/link.asm
# engine/mon_menu.asm
# engine/player_object.asm
# engine/routines/playslowcry.asm
# engine/scripting.asm
# engine/search.asm
# engine/search2.asm
# engine/specials.asm
# engine/start_menu.asm
# engine/timeset.asm
# home/battle_vars.asm
# home/map.asm
# maps/GoldenrodUndergroundSwitchRoomEntrances.asm
# maps/IlexForest.asm
# maps/KrissHouse2F.asm
# maps/Route39Barn.asm
# mobile/mobile_12_2.asm
# mobile/mobile_40.asm
# mobile/mobile_5f.asm
# wram.asm
|
2018-02-03 19:42:56 -05:00 |
|
luckytyphlosion
|
a1951cefc0
|
Prefix wram labels with w, part 2.
|
2018-01-23 17:39:09 -05:00 |
|
Rangi
|
fdda670f40
|
Cry headers and map headers were eliminated
|
2018-01-23 11:17:21 -05:00 |
|
Remy Oukaour
|
6d20cf3e80
|
"CryHeader" → "Cry"; "Cry" → "MonCry"
|
2018-01-16 23:47:45 -05:00 |
|
Remy Oukaour
|
24f0e7d045
|
Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers
|
2017-12-26 12:50:32 -05:00 |
|
PikalaxALT
|
8152ab612c
|
Battle anims
|
2015-12-23 17:10:50 -05:00 |
|
PikalaxALT
|
471492b775
|
Reverted ld_hl_pointer macro
|
2015-07-20 22:18:18 -04:00 |
|
yenatch
|
c07ed74a5d
|
Blind wram labels part 4.
|
2015-02-10 15:14:41 -08:00 |
|
yenatch
|
68ee99818a
|
Move cry functions out of home.asm.
|
2014-07-18 10:31:52 -07:00 |
|