diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-23 15:40:59 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-23 15:40:59 -0500 |
| commit | 043e9327650f2ee0053fe43a29c9d63bc5e120d3 (patch) | |
| tree | 0fe1b2d958825dfd22d921d77fe068087e164ddf /yellow/main.asm | |
| parent | 8b82d13dd520d387f926db819fda949ad0021b53 (diff) | |
engine/trade.asm, trade2.asm, intro.asm, overworld/emotion_bubbles.asm
Also document Func_1681 (GetFarByte) and fix Missingno's dex entry
Diffstat (limited to 'yellow/main.asm')
| -rwxr-xr-x | yellow/main.asm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/yellow/main.asm b/yellow/main.asm index 10006296..ee205439 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -4013,10 +4013,12 @@ INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm" TradingAnimationGraphics: INCBIN "gfx/game_boy.norepeat.2bpp" INCBIN "gfx/link_cable.2bpp" - +TradingAnimationGraphicsEnd: + TradingAnimationGraphics2: ; Pokeball traveling through the link cable. INCBIN "gfx/trade2.2bpp" +TradingAnimationGraphics2End: INCLUDE "engine/evos_moves.asm" @@ -4117,9 +4119,10 @@ PlayCurrentMoveAnimation: ; 3fb83 (f:7b83) SECTION "bank10",ROMX,BANK[$10] INCLUDE "engine/menu/pokedex.asm" - - dr $4116f,$41c70 - +INCLUDE "engine/overworld/emotion_bubbles.asm" +INCLUDE "engine/trade.asm" +INCLUDE "engine/intro.asm" +INCLUDE "engine/trade2.asm" INCLUDE "engine/menu/options.asm" @@ -4367,7 +4370,9 @@ INCLUDE "engine/bank3d/main.asm" SECTION "bank3E",ROMX,BANK[$3E] - dr $f8000,$fa35a + dr $f8000,$f982d +PlayIntroScene: ; f982d (3e:582d) + dr $f982d,$fa35a YellowIntroGraphics: INCBIN "gfx/yellow_intro.2bpp" |