diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-22 20:22:09 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-22 20:22:09 -0400 |
| commit | 705c6fb69d3ae2da0bc47c70b2f361e8228caa5e (patch) | |
| tree | 05c9770d0e5d6253c3f0e1881b8b842b87db2736 /engine | |
| parent | b5aad665f6f50d4ed04b0fc51ec45dc46ccf9fdf (diff) | |
Ball functions
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/main_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/predef.asm | 6 | ||||
| -rwxr-xr-x | engine/specials.asm | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engine/main_menu.asm b/engine/main_menu.asm index dc386990..eb837145 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -1053,7 +1053,7 @@ Intro_PrepTrainerPic: ; 61df, 61e0 (1:61df, 1:61e0) ShrinkFrame: ; 61f7 (1:61f7) ld de, $9000 ld c, $31 - predef GetTrainerPic + predef DecompressPredef xor a ld [hGraphicStartTile], a hlcoord 6, 4 diff --git a/engine/predef.asm b/engine/predef.asm index 4068e313..4e386f98 100755 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -92,11 +92,11 @@ endm add_predef PartyMonItemName add_predef GetFrontpic add_predef GetBackpic - add_predef FrontpicPredef add_predef GetTrainerPic - add_predef DecompressPredef ; $40 - add_predef CheckTypeMatchup + add_predef DecompressPredef + add_predef CheckTypeMatchup ; $40 add_predef ConvertMon_1to2 add_predef NewPokedexEntry + add_predef FrontpicPredef add_predef UpdateTimePredef dbw $ff, InexplicablyEmptyFunction diff --git a/engine/specials.asm b/engine/specials.asm index a3279a57..5616a4b1 100755 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -140,7 +140,7 @@ Special_GameCornerPrizeMonCheckDex: ; c38a call FadeToMenu ld a, [wScriptVar] ld [wd151], a - callba ConvertMon_1to2 + callba NewPokedexEntry call ExitAllMenus ret |