summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElectroDeoxys <ElectroDeoxys@gmail.com>2021-05-22 12:17:32 +0100
committerElectroDeoxys <ElectroDeoxys@gmail.com>2021-05-22 12:17:32 +0100
commit183219ee6479320b6dadc1eba4fbea211de24a11 (patch)
tree0f275ee2b54d3c0c03bd2e50f0f10ab8a355336e /src
parentd487040f86ffed1e458b1b65d0ede88779a1faf1 (diff)
StartMenu -> PauseMenu
Diffstat (limited to 'src')
-rw-r--r--src/engine/bank03.asm16
-rw-r--r--src/engine/bank04.asm4
-rw-r--r--src/engine/bank07.asm2
3 files changed, 11 insertions, 11 deletions
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index 8d9442c..3468a54 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -759,7 +759,7 @@ HandlePlayerMoveMode: ; c510 (3:4510)
.not_moving
ldh a, [hKeysPressed]
and START
- call nz, OpenStartMenu
+ call nz, OpenPauseMenu
ret
Func_c53d: ; c53d (3:453d)
@@ -1104,18 +1104,18 @@ FindNPCOrObject: ; c71e (3:471e)
scf
ret
-OpenStartMenu: ; c74d (3:474d)
+OpenPauseMenu: ; c74d (3:474d)
push hl
push bc
push de
- call StartMenu
+ call PauseMenu
call CloseAdvancedDialogueBox
pop de
pop bc
pop hl
ret
-StartMenu: ; c75a (3:475a)
+PauseMenu: ; c75a (3:475a)
call PauseSong
ld a, MUSIC_PAUSE_MENU
call PlaySong
@@ -1148,7 +1148,7 @@ StartMenu: ; c75a (3:475a)
Func_c797: ; c797 (3:4797)
ld a, [wd0b8]
ld hl, Unknown_10d98
- farcall InitAndPrintStartMenu
+ farcall InitAndPrintPauseMenu
ret
PointerTable_c7a2: ; c7a2 (3:47a2)
@@ -1245,7 +1245,7 @@ PointerTable_c846: ; c846 (3:4846)
Func_c84e: ; c84e (3:484e)
ld a, [wd0b9]
ld hl, Unknown_10da9
- farcall InitAndPrintStartMenu
+ farcall InitAndPrintPauseMenu
ret
Func_c859: ; c859 (3:4859)
@@ -2817,7 +2817,7 @@ ScriptCommand_PickChallengeHallOpponent: ; d195 (3:5195)
jp IncreaseScriptPointerBy1
ScriptCommand_OpenMenu: ; d1ad (3:51ad)
- call StartMenu
+ call PauseMenu
jp IncreaseScriptPointerBy1
ScriptCommand_PickChallengeCupPrizeCard: ; d1b3 (3:51b3)
@@ -3025,7 +3025,7 @@ ShowMultichoiceTextbox: ; d28c (3:528c)
ld h, [hl]
ld l, a
ld a, [wd416]
- farcall InitAndPrintStartMenu
+ farcall InitAndPrintPauseMenu
pop hl
inc hl
ld a, [hli]
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index 036648b..50cb01c 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -917,7 +917,7 @@ Func_10dba: ; 10dba (4:4dba)
farcall Func_c29b
ld a, [wd0ba]
ld hl, Unknown_10e17
- farcall InitAndPrintStartMenu
+ farcall InitAndPrintPauseMenu
.asm_10dca
call DoFrameIfLCDEnabled
call HandleMenuInput
@@ -1649,7 +1649,7 @@ Func_111b3: ; 111b3 (4:51b3)
jr .loop_text_print_2
; 0x111e9
-InitAndPrintStartMenu: ; 111e9 (4:51e9)
+InitAndPrintPauseMenu: ; 111e9 (4:51e9)
push hl
push bc
push de
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index 4fe6b6b..9fee1d9 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -2002,7 +2002,7 @@ HandleStartMenu: ; 1d11c (7:511c)
ld a, 1 ; start at second menu option
.init_menu
ld hl, wStartMenuParams
- farcall InitAndPrintStartMenu
+ farcall InitAndPrintPauseMenu
farcall FlashWhiteScreen
.wait_input