summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rwxr-xr-xmisc/battle_tower_47.asm14
-rw-r--r--misc/crystal_misc.asm2
-rw-r--r--misc/mobile_22.asm2
-rw-r--r--misc/mobile_40.asm6
-rw-r--r--misc/mobile_45.asm24
-rwxr-xr-xmisc/mobile_46.asm58
-rwxr-xr-xmisc/mobile_5c.asm8
-rw-r--r--misc/mobile_5f.asm10
8 files changed, 62 insertions, 62 deletions
diff --git a/misc/battle_tower_47.asm b/misc/battle_tower_47.asm
index 37620212a..91efccc1b 100755
--- a/misc/battle_tower_47.asm
+++ b/misc/battle_tower_47.asm
@@ -385,7 +385,7 @@ Function11c1ca: ; 11c1ca
ld de, VTiles0
call Decompress
call EnableLCD
- callba Function104061
+ callba ReloadMapPart
callba Function8cf53
callba LoadPokemonData
callba Function40c30
@@ -443,7 +443,7 @@ Function11c283: ; 11c283
jr nz, .asm_11c2a2
call Function11c2ac
callba Function8cf69
- callba Function104061
+ callba ReloadMapPart
jr .asm_11c283
.asm_11c2a2
@@ -782,7 +782,7 @@ Function11c4be: ; 11c4be (47:44be)
hlcoord 0, 14, AttrMap
ld bc, $28
call ByteFill
- callba Function104061
+ callba ReloadMapPart
ret
; 11c4db (47:44db)
@@ -978,7 +978,7 @@ Function11c618: ; 11c618 (47:4618)
hlcoord 0, 6, AttrMap
ld bc, $c8
call ByteFill
- callba Function104061
+ callba ReloadMapPart
ret
; 11c62a (47:462a)
@@ -1585,7 +1585,7 @@ Function11c9ab: ; 11c9ab (47:49ab)
hlcoord 0, 6, AttrMap
ld bc, $c8
call ByteFill
- callba Function104061
+ callba ReloadMapPart
ret
Function11c9bd: ; 11c9bd (47:49bd)
@@ -1672,7 +1672,7 @@ Function11ca19: ; 11ca19 (47:4a19)
add hl, de
dec c
jr nz, .asm_11ca22
- callba Function104061
+ callba ReloadMapPart
ret
; 11ca38 (47:4a38)
@@ -2089,7 +2089,7 @@ Function11cdaa: ; 11cdaa (47:4daa)
hlcoord 0, 12, AttrMap
ld bc, $50
call ByteFill
- callba Function104061
+ callba ReloadMapPart
ret
; 11cdc7 (47:4dc7)
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm
index 489ec77ee..6e9844866 100644
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -173,7 +173,7 @@ Function17a78f: ; 17a78f (5e:678f)
ret
.asm_17a79f
- callba Function104061
+ callba ReloadMapPart
ret
; 17a7a6 (5e:67a6)
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index 291006118..3fc378924 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -93,7 +93,7 @@ Function8919e: ; 8919e (22:519e)
Function891ab: ; 891ab
call Function89240
- callba Function104061
+ callba ReloadMapPart
call Function8923c
ret
; 891b8
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index f3d023e08..128fdf2b1 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -1495,7 +1495,7 @@ Function100902: ; 100902
call PrintNum
ld de, SFX_TWO_PC_BEEPS
call PlaySFX
- callba Function104061
+ callba ReloadMapPart
ld c, $3c
call DelayFrames
ret
@@ -1506,7 +1506,7 @@ Function100902: ; 100902
call PlaceString
ld de, SFX_4_NOTE_DITTY
call PlaySFX
- callba Function104061
+ callba ReloadMapPart
ld c, 120
call DelayFrames
ret
@@ -1536,7 +1536,7 @@ Function100989: ; 100989
decoord 0, 0
call Function1009a5
call Function1009ae
- callba Function104061
+ callba ReloadMapPart
ld hl, w3_dd68
decoord 0, 0, AttrMap
call Function1009a5
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index da4cadc6d..f4df98c06 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -5750,7 +5750,7 @@ Function1161d5: ; 1161d5
pop af
ld [rSVBK], a
- callba Function104061
+ callba ReloadMapPart
ld a, $8
ld [MusicFade], a
ld de, MUSIC_MOBILE_ADAPTER
@@ -5931,7 +5931,7 @@ Function11636e: ; 11636e
call UpdateSprites
pop af
ld [rSVBK], a
- callba Function104061
+ callba ReloadMapPart
ld a, $8
ld [MusicFade], a
ld a, [wc2c0]
@@ -5975,7 +5975,7 @@ Function1163c0: ; 1163c0
callba Function14157
pop af
ld [rSVBK], a
- callba Function104061
+ callba ReloadMapPart
ld a, [wLinkMode]
cp $4
jr z, .asm_11642a
@@ -6006,7 +6006,7 @@ Function116441: ; 116441
callba Function17d405
ld a, $90
ld [hWY], a
- callba Function104061
+ callba ReloadMapPart
ld a, $8
ld [MusicFade], a
ld a, [wc2c0]
@@ -7711,7 +7711,7 @@ Function117699: ; 117699 (45:7699)
call ClearBGPalettes
call ClearSprites
callba Function171c87
- callba Function104061
+ callba ReloadMapPart
callba Function8cf53
ret
@@ -7722,7 +7722,7 @@ Function1176ee: ; 1176ee (45:76ee)
jr nz, .asm_117709
call Function117719
callba Function8cf69
- callba Function104061
+ callba ReloadMapPart
jr Function1176ee
.asm_117709
callba Function8cf53
@@ -7978,7 +7978,7 @@ Function1178aa: ; 1178aa (45:78aa)
call LoadMenuDataHeader
call MenuBox
call MenuBoxCoord2Tile
- callba Function104061
+ callba ReloadMapPart
hlcoord 16, 8
ld de, String_1179c5
call PlaceString
@@ -8077,7 +8077,7 @@ Function117984: ; 117984 (45:7984)
call LoadMenuDataHeader
call MenuBox
call MenuBoxCoord2Tile
- callba Function104061
+ callba ReloadMapPart
hlcoord 1, 14
ld de, String_1179e1
call PlaceString
@@ -8184,7 +8184,7 @@ Function117ab4: ; 0x117ab4
call ClearSprites
callba Function172e78
callba Function172eb9
- callba Function104061
+ callba ReloadMapPart
ret
; 0x117acd
@@ -8299,12 +8299,12 @@ Function117b4f:
jr nz, .asm_117ba4 ; 0x117b93 $f
call ExitMenu
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
jp Function117cdd
.asm_117ba4
call ExitMenu
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
ld a, $80
ld [wJumptableIndex], a
ret
@@ -8387,7 +8387,7 @@ Function117c4a:
call LoadMenuDataHeader
call MenuBox
call MenuBoxCoord2Tile
- callba Function104061
+ callba ReloadMapPart
ld hl, MobileStadiumSuccessText
call PrintText
ld a, [rSVBK]
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index b07164f6f..48281ac13 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -4463,7 +4463,7 @@ Function119f98: ; 119f98
and a
jr z, .asm_119fd4
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
callba Function115dc3
ld a, [wcd33]
ld [wcf66], a
@@ -4480,14 +4480,14 @@ Function119f98: ; 119f98
ld [wc30d], a
ld a, $1
ld [wc314], a
- callba Function104061
+ callba ReloadMapPart
and a
ret
.asm_119fef
call ExitMenu
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
ld a, [wcd45]
ld [wcf66], a
callba Function115dc3
@@ -4562,7 +4562,7 @@ Function11a00e: ; 11a00e
callba Function106462
callba Function106464
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
callba Function115d99
ld c, $0
callba Function115e18
@@ -4585,7 +4585,7 @@ Function11a0ca: ; 11a0ca
callba Function106462
callba Function106464
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
callba Function115d99
ld c, $0
callba Function115e18
@@ -4677,7 +4677,7 @@ Function11a192: ; 11a192
and a
jr nz, .asm_11a1b6
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
call Function11a63c
hlcoord 4, 2
ld de, String_11a6d2
@@ -4687,7 +4687,7 @@ Function11a192: ; 11a192
.asm_11a1b6
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
ld a, [wcd45]
ld [wcf66], a
ld [wcd80], a
@@ -4818,7 +4818,7 @@ Function11a235: ; 11a235
and a
jr nz, .asm_11a2c4
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
ld a, [wcd46]
cp $0
jr z, .asm_11a2b4
@@ -4840,7 +4840,7 @@ Function11a235: ; 11a235
.asm_11a2c4
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
and a
ret
; 11a2cf
@@ -4919,7 +4919,7 @@ Function11a33a: ; 11a33a
.asm_11a346
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
callba Function115dc3
and a
ret
@@ -4963,7 +4963,7 @@ Function11a38d: ; 11a38d
and a
jr nz, .asm_11a3b1
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
call Function11a63c
hlcoord 4, 2
ld de, String_11a6d2
@@ -4973,7 +4973,7 @@ Function11a38d: ; 11a38d
.asm_11a3b1
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
ld a, [wcd45]
ld [wcf66], a
ld [wcd80], a
@@ -5038,7 +5038,7 @@ Function11a41b: ; 11a41b
and a
jr nz, .asm_11a43f
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
call Function11a63c
hlcoord 4, 2
ld de, String_11a6d2
@@ -5048,7 +5048,7 @@ Function11a41b: ; 11a41b
.asm_11a43f
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
ld a, $1c
ld [wcf66], a
ld [wcd80], a
@@ -5109,7 +5109,7 @@ Function11a49e: ; 11a49e
and a
jr nz, .asm_11a4c7
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
call Function11a63c
hlcoord 4, 2
ld de, String_11a6d2
@@ -5121,7 +5121,7 @@ Function11a49e: ; 11a49e
.asm_11a4c7
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
ld a, [wcd46]
ld [wcf66], a
ld [wcd80], a
@@ -5156,7 +5156,7 @@ Function11a4fe: ; 11a4fe
and a
jr nz, .asm_11a522
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
call Function11a63c
hlcoord 4, 2
ld de, String_11a6d2
@@ -5166,7 +5166,7 @@ Function11a4fe: ; 11a4fe
.asm_11a522
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
ld a, [wcd45]
ld [wcf66], a
ld [wcd80], a
@@ -5195,7 +5195,7 @@ Function11a536: ; 11a536
call Function11a9f0
jr nz, .asm_11a562
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
.asm_11a562
scf
@@ -5271,7 +5271,7 @@ Function11a5b9: ; 11a5b9
ld b, $4
ld c, $12
call Function3eea
- callba Function104061
+ callba ReloadMapPart
call UpdateSprites
ld c, $0
callba Function115e18
@@ -5306,7 +5306,7 @@ Function11a5f5: ; 11a5f5
hlcoord 15, 7
ld a, $ed
ld [hl], a
- callba Function104061
+ callba ReloadMapPart
ret
; 11a63c
@@ -5840,7 +5840,7 @@ UnknownText_0x11ac1f: ; 0x11ac1f
Function11ac3e: ; 11ac3e
call SpeechTextBox
call FadeToMenu
- callab InefficientlyClear121BytesAtwc300
+ callab ClearSpriteAnims
call Function11ac51
call ReturnToCallingMenu
ret
@@ -5881,7 +5881,7 @@ Function11ac51: ; 11ac51
ld a, $78
ld [wc3b5], a
callba Function8cf7a
- callba Function104061
+ callba ReloadMapPart
jr .asm_11ac82
.asm_11aca8
@@ -6025,7 +6025,7 @@ Function11ad95: ; 11ad95
hlcoord 10, 10, AttrMap
ld bc, $0808
call Function11afd6
- callba Function104061
+ callba ReloadMapPart
call Function11ad8a
ld a, $1
ld [MenuSelection2], a
@@ -6104,7 +6104,7 @@ Function11adc4:
.asm_11ae2e
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
ret
; 11ae38
@@ -6142,7 +6142,7 @@ Function11ae4e: ; 11ae4e
hlcoord 9, 12, AttrMap
lb bc, 6, 11
call Function11afd6
- callba Function104061
+ callba ReloadMapPart
call Function11ad8a
ld a, $1
ld [MenuSelection2], a
@@ -6210,7 +6210,7 @@ Function11ae98:
.asm_11aef7
call ExitMenu
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
ret
; 11af04
@@ -6233,7 +6233,7 @@ Function11af04: ; 11af04
hlcoord 9, 12, AttrMap
lb bc, 6, 11
call Function11afd6
- callba Function104061
+ callba ReloadMapPart
call Function11ad8a
ld a, $2
ld [MenuSelection2], a
@@ -6301,7 +6301,7 @@ Function11af4e:
.asm_11afaa
call ExitMenu
call ExitMenu
- callba Function104061
+ callba ReloadMapPart
ret
; 11afb7
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index 8501aab7e..61a3b1962 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -391,7 +391,7 @@ Function1704f1: ; 1704f1
bit 7, a
jr nz, .asm_17050f
call Function170510
- callba Function104061
+ callba ReloadMapPart
jr .asm_1704fa
.asm_17050f
@@ -1692,7 +1692,7 @@ Function1719ed: ; 1719ed (5c:59ed)
call ClearBGPalettes
call ClearSprites
callba Function171d2b
- callba Function104061
+ callba ReloadMapPart
callba Function8cf53
ret
@@ -1703,7 +1703,7 @@ Function171a11: ; 171a11 (5c:5a11)
jr nz, .asm_171a2c
call Function171a36
callba Function8cf69
- callba Function104061
+ callba ReloadMapPart
jr Function171a11
.asm_171a2c
callba Function8cf53
@@ -1960,7 +1960,7 @@ Function171beb: ; 171beb (5c:5beb)
call LoadMenuDataHeader
call MenuBox
call MenuBoxCoord2Tile
- callba Function104061
+ callba ReloadMapPart
hlcoord 1, 14
ld de, String_171c73
call PlaceString
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index b1f609298..3f35d8346 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -81,7 +81,7 @@ Function17c000: ; 17c000
ld [rVBK], a
call EnableLCD
- callba Function104061
+ callba ReloadMapPart
ret
; 17c083
@@ -629,7 +629,7 @@ Function17d370: ; 17d370
call ClearBGPalettes
call ClearSprites
call ClearScreen
- callba Function104061
+ callba ReloadMapPart
call DisableLCD
ld hl, VTiles1 tile $6e
ld de, $c608
@@ -675,7 +675,7 @@ Function17d3f6: ; 17d3f6
call ClearBGPalettes
call ClearSprites
call ClearScreen
- callba Function104061
+ callba ReloadMapPart
Function17d405:
call DisableLCD
@@ -721,7 +721,7 @@ Function17d45a: ; 17d45a
bit 7, a
jr nz, .asm_17d46f
call Function17d474
- callba Function104061
+ callba ReloadMapPart
jr .asm_17d45a
.asm_17d46f
@@ -935,7 +935,7 @@ endr
call Function17e451
call Function17e55b
call Function17e5af
- callba Function104061
+ callba ReloadMapPart
jp Function17e438
; 17d5be
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 07:27:10 +0000