summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/mobile_40.asm2
-rwxr-xr-xmisc/mobile_46.asm6
-rwxr-xr-xmisc/mobile_5c.asm2
-rw-r--r--misc/mobile_5f.asm6
4 files changed, 8 insertions, 8 deletions
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index ce3035c35..f37cce5f2 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -2523,7 +2523,7 @@ Unknown_100fc0: ; 100fc0
db -1
Unknown_100feb: ; 100feb
- dbwww $00, sPartyScratch1, SCRATCHMON_STRUCT_LENGTH * PARTY_LENGTH, NULL
+ dbwww $00, sPartyMail, MAIL_STRUCT_LENGTH * PARTY_LENGTH, NULL
db -1
Unknown_100ff3: ; 100ff3
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 54e5a81ba..931cda0ac 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -5842,7 +5842,7 @@ Function11ac3e: ; 11ac3e
call FadeToMenu
callab InefficientlyClear121BytesAtwc300
call Function11ac51
- call Function2b3c
+ call ReturnToCallingMenu
ret
; 11ac51
@@ -7697,7 +7697,7 @@ Function11b7e5: ; 11b7e5
ld [de], a
.asm_11b872
- call Function2b3c
+ call ReturnToCallingMenu
call RestartMapMusic
ret
; 11b879
@@ -7919,7 +7919,7 @@ Function11b98f: ; 11b98f
call CopyBytes
ld a, "@"
ld [de], a
- ld hl, sPartyScratch1
+ ld hl, sPartyMail
ld bc, PARTYMON_STRUCT_LENGTH - 1
ld a, [wcd2a]
.loop5
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index 7c36b993d..7b768e10b 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -278,7 +278,7 @@ Function1704e1: ; 1704e1
call FadeToMenu
call Function17021e
call Function1704f1
- call Function2b3c
+ call ReturnToCallingMenu
ret
; 1704f1
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index 01a4db77f..11906805d 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -324,7 +324,7 @@ Function17d0f3: ; 17d0f3
ld [de], a
.asm_17d180
- call Function2b3c
+ call ReturnToCallingMenu
call RestartMapMusic
ret
; 17d187
@@ -562,7 +562,7 @@ Function17d2ce: ; 17d2ce
ld [MusicFadeIDHi], a
call PlayMusic
call ReturnToMapFromSubmenu
- call Function2b3c
+ call ReturnToCallingMenu
ret
; 17d314
@@ -4674,7 +4674,7 @@ Function17f53d: ; 17f53d
call Function17f555
pop af
ld [rSVBK], a
- call Function2b4d
+ call ExitAllMenus
ret
; 17f555