diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2015-04-01 11:41:20 +0200 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2015-04-01 17:05:43 +0200 |
| commit | 46c2a38c7c55ff01e8787dfd624cb1c771248b6c (patch) | |
| tree | 6b8590d765cbb93f40fdb59d39f3a3e5d8ddb28e /main.asm | |
| parent | Rename battle files and split move effects Part 1 (diff) | |
| download | pokeyellow-46c2a38c7c55ff01e8787dfd624cb1c771248b6c.tar.gz pokeyellow-46c2a38c7c55ff01e8787dfd624cb1c771248b6c.tar.xz pokeyellow-46c2a38c7c55ff01e8787dfd624cb1c771248b6c.zip | |
Rename battle files and split move effects Part 2
5.asm, 9.asm, and a.asm
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -4825,7 +4825,7 @@ INCLUDE "engine/load_pokedex_tiles.asm" INCLUDE "engine/overworld/map_sprites.asm" INCLUDE "engine/overworld/emotion_bubbles.asm" INCLUDE "engine/evolve_trade.asm" -INCLUDE "engine/battle/5.asm" +INCLUDE "engine/battle/moveEffects/substitute_effect.asm" INCLUDE "engine/menu/pc.asm" @@ -5154,7 +5154,9 @@ TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" SECTION "Battle (bank 9)", ROMX, BANK[$9] -INCLUDE "engine/battle/9.asm" +INCLUDE "engine/battle/print_type.asm" +INCLUDE "engine/battle/save_trainer_name.asm" +INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" SECTION "Pics 2", ROMX, BANK[PICS_2] @@ -5226,7 +5228,7 @@ MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" SECTION "Battle (bank A)", ROMX, BANK[$A] -INCLUDE "engine/battle/a.asm" +INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" SECTION "Pics 3", ROMX, BANK[PICS_3] |