diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-12 16:17:32 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-12 16:17:32 -0500 |
| commit | 2fe27ede5d2a82cc9746ecfda8f73c34d4b030f1 (patch) | |
| tree | 256f70f633292193acc7ba0bb852cd3dc273192e /yellow/main.asm | |
| parent | e5a76039e3e17c02d0ef9fa52bdb7de7b4eceaad (diff) | |
engine/evos_moves.asm
Todo: data/evos_moves.asm
Diffstat (limited to 'yellow/main.asm')
| -rwxr-xr-x | yellow/main.asm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/yellow/main.asm b/yellow/main.asm index 9eb1b798..16bf2cfc 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -4017,11 +4017,8 @@ TradingAnimationGraphics2: ; Pokeball traveling through the link cable. INCBIN "gfx/trade2.2bpp" -TryEvolvingMon: -EvolveTradeMon: ; 3adb8 (e:6db8) - dr $3adb8,$3b10f -Func_3b10f: ; 3b01f (e:710f) - dr $3b10f,$3b1e5 +INCLUDE "engine/evos_moves.asm" + EvosMovesPointerTable: ; 3b1e5 (e:71e5) dr $3b1e5,$3c000 @@ -4228,7 +4225,9 @@ PrintStatusAilment: ; 58e8b (16:4e8b) SECTION "bank17",ROMX,BANK[$17] - dr $5c000,$60000 + dr $5c000,$5da70 +EvolveMon: ; 5da70 (17:5a70) + dr $5da70,$60000 SECTION "bank18",ROMX,BANK[$18] |