summaryrefslogtreecommitdiff
path: root/engine/menu
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menu')
-rw-r--r--engine/menu/bills_pc.asm8
-rwxr-xr-xengine/menu/party_menu.asm2
-rwxr-xr-xengine/menu/status_screen.asm4
3 files changed, 7 insertions, 7 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 347ec5df..ce9ca5a8 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -225,7 +225,7 @@ BillsPCDeposit: ; 2156d (8:556d)
ld hl, wPartyCount
call DisplayMonListMenu
jp c, BillsPCMenu
- callab IsThisPartymonOurPikachu
+ callab IsThisPartymonStarterPikachu_Party
jr nc, .asm_215ad
call Func_154a
jr z, .asm_215ad
@@ -235,7 +235,7 @@ BillsPCDeposit: ; 2156d (8:556d)
.asm_215ad
call DisplayDepositWithdrawMenu
jp nc, BillsPCMenu
- callab IsThisPartymonOurPikachu
+ callab IsThisPartymonStarterPikachu_Party
jr nc, .asm_215c9
ld e, $1b
callab PlayPikachuSoundClip
@@ -298,7 +298,7 @@ BillsPCWithdraw: ; 21613 (8:5613)
ld a, [wWhichPokemon]
ld hl, wBoxMonNicks
call GetPartyMonName
- callab Func_fce0d
+ callab IsThisPartymonStarterPikachu_Box
jr nc, .asm_21660
ld e, $22
callab PlayPikachuSoundClip
@@ -329,7 +329,7 @@ BillsPCRelease: ; 21690 (8:5690)
ld hl, wNumInBox
call DisplayMonListMenu
jp c, BillsPCMenu
- callab Func_fce0d
+ callab IsThisPartymonStarterPikachu_Box
jr c, .asm_216cb
ld hl, OnceReleasedText
call PrintText
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index d65123d7..3ec0029e 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -51,7 +51,7 @@ RedrawPartyMenu_: ; 11886 (4:5886)
call PlaceString ; print the pokemon's name
ld a,[hPartyMonIndex]
ld [wWhichPokemon],a
- callab IsThisPartymonOurPikachu
+ callab IsThisPartymonStarterPikachu_Party
jr nc, .regularMon
call Func_154a
jr z, .regularMon
diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index e91d3b31..719cacd1 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -175,11 +175,11 @@ StatusScreen: ; 114cc (4:54cc)
jr z, .playRegularCry
cp BOX_DATA
jr z, .checkBoxData
- callab IsThisPartymonOurPikachu
+ callab IsThisPartymonStarterPikachu_Party
jr nc, .playRegularCry
jr .playPikachuSoundClip
.checkBoxData
- callab Func_fce0d
+ callab IsThisPartymonStarterPikachu_Box
jr nc, .playRegularCry
.playPikachuSoundClip
ld e, 16