summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rwxr-xr-xmisc/battle_tower_47.asm2
-rw-r--r--misc/mobile_22.asm38
-rw-r--r--misc/mobile_22_2.asm2
-rw-r--r--misc/mobile_40.asm10
-rwxr-xr-xmisc/mobile_41.asm2
-rw-r--r--misc/mobile_42.asm18
-rw-r--r--misc/mobile_45.asm10
-rwxr-xr-xmisc/mobile_46.asm20
-rwxr-xr-xmisc/mobile_5b.asm4
-rwxr-xr-xmisc/mobile_5c.asm8
-rw-r--r--misc/mobile_5f.asm8
-rw-r--r--misc/unused_title.asm2
12 files changed, 62 insertions, 62 deletions
diff --git a/misc/battle_tower_47.asm b/misc/battle_tower_47.asm
index bc6eec83d..d5c9693b6 100755
--- a/misc/battle_tower_47.asm
+++ b/misc/battle_tower_47.asm
@@ -371,7 +371,7 @@ Function11c1ca: ; 11c1ca
ld a, [MenuSelection2]
dec a
call Function11c254
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearScreen
call Function11d323
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index eee9223f0..d73776be6 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -1801,7 +1801,7 @@ Function89b07: ; 89b07
; 89b14
Function89b14: ; 89b14
- call WhiteBGMap
+ call ClearBGPalettes
call Function89b07
call Function89b00
ret
@@ -1814,7 +1814,7 @@ Function89b1e: ; 89b1e (22:5b1e)
Function89b28: ; 89b28 (22:5b28)
call Function891de
- call WhiteBGMap
+ call ClearBGPalettes
call Function893e2
call Call_ExitMenu
call Function891ab
@@ -2414,7 +2414,7 @@ Function89eb9: ; 89eb9 (22:5eb9)
jp Function89e36
Function89ee1: ; 89ee1 (22:5ee1)
- call WhiteBGMap
+ call ClearBGPalettes
call Function893e2
call Function8923c
callba Function4a3a7
@@ -2602,7 +2602,7 @@ Function89fed: ; 89fed (22:5fed)
Function89ff6: ; 89ff6 (22:5ff6)
call Function891fe
- call WhiteBGMap
+ call ClearBGPalettes
call Function893cc
call Function89807
call Function89492
@@ -2937,14 +2937,14 @@ Function8a241: ; 8a241 (22:6241)
ret
.asm_8a254
call Function891de
- call WhiteBGMap
+ call ClearBGPalettes
call Call_ExitMenu
call Function891de
and a
ret
Function8a262: ; 8a262 (22:6262)
- call WhiteBGMap
+ call ClearBGPalettes
call Function893e2
call Function8923c
callba Function4a3a7
@@ -3501,7 +3501,7 @@ Jumptable_8a671: ; 8a671 (22:6671)
Function8a679: ; 8a679 (22:6679)
call Function891de
- call WhiteBGMap
+ call ClearBGPalettes
call Function893cc
call OpenSRAMBank4
call Function8931b
@@ -3546,7 +3546,7 @@ Function8a6c5: ; 8a6c5 (22:66c5)
Function8a6cd: ; 8a6cd (22:66cd)
call Function891de
- call WhiteBGMap
+ call ClearBGPalettes
call Function893cc
call OpenSRAMBank4
call Function8931b
@@ -3594,7 +3594,7 @@ Function8a6cd: ; 8a6cd (22:66cd)
.asm_8a73f
call CloseSRAM
.asm_8a742
- call WhiteBGMap
+ call ClearBGPalettes
call Function89448
call Function891d3
call Function8b677
@@ -3657,7 +3657,7 @@ Function8a78c: ; 8a78c (22:678c)
call DelayFrame
call JoyTextDelay
call Function891de
- call WhiteBGMap
+ call ClearBGPalettes
call Function893cc
call OpenSRAMBank4
pop bc
@@ -3687,7 +3687,7 @@ Function8a7cb: ; 8a7cb (22:67cb)
pop af
ld [MenuSelection], a
call Function891de
- call WhiteBGMap
+ call ClearBGPalettes
call Function893cc
call OpenSRAMBank4
call Function8931b
@@ -3781,7 +3781,7 @@ Function8a8a1: ; 8a8a1 (22:68a1)
Function8a8c3: ; 8a8c3 (22:68c3)
call Function891de
- call WhiteBGMap
+ call ClearBGPalettes
call Function893cc
call OpenSRAMBank4
call Function8931b
@@ -3969,7 +3969,7 @@ Function8aa0a: ; 8aa0a (22:6a0a)
call Function89381
call CloseSRAM
call Function891fe
- call WhiteBGMap
+ call ClearBGPalettes
call Function893cc
call Function89807
call Function89492
@@ -4027,7 +4027,7 @@ Function8aa73: ; 8aa73 (22:6a73)
call Function89193
.asm_8aa9d
call Function891fe
- call WhiteBGMap
+ call ClearBGPalettes
call Function893cc
call Function89807
call Function89492
@@ -4101,7 +4101,7 @@ Function8ab11: ; 8ab11 (22:6b11)
Function8ab3b: ; 8ab3b (22:6b3b)
call Function891fe
- call WhiteBGMap
+ call ClearBGPalettes
call Function893cc
call Function89807
call Function89492
@@ -4140,7 +4140,7 @@ Function8ab77: ; 8ab77 (22:6b77)
ret
Function8ab93: ; 8ab93 (22:6b93)
- call WhiteBGMap
+ call ClearBGPalettes
call LoadStandardMenuDataHeader
callba Function105688
call ClearSprites
@@ -4183,7 +4183,7 @@ Function8aba9: ; 8aba9
call PlayClickSFX
.asm_8abe5
call Function891de
- call WhiteBGMap
+ call ClearBGPalettes
call Function893cc
call OpenSRAMBank4
call Function8931b
@@ -4228,7 +4228,7 @@ Function8ac4e: ; 8ac4e
ld [MenuSelection], a
push de
call Function891de
- call WhiteBGMap
+ call ClearBGPalettes
call Function893cc
pop bc
call Function89844
@@ -4337,7 +4337,7 @@ Function8ad0b: ; 8ad0b
ld a, [MenuSelection]
ld [wd02f], a
call Function891de
- call WhiteBGMap
+ call ClearBGPalettes
call Function893cc
call OpenSRAMBank4
call Function8931b
diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm
index c04f933fe..cb5fc0628 100644
--- a/misc/mobile_22_2.asm
+++ b/misc/mobile_22_2.asm
@@ -574,7 +574,7 @@ Function8b664: ; 8b664 (22:7664)
ret
Function8b677: ; 8b677
- call WhiteBGMap
+ call ClearBGPalettes
call DisableLCD
call Function8b690
call Function8b6bb
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index dab86875d..4743f2c27 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -48,7 +48,7 @@ Function100022: ; 100022
Function100057: ; 100057
call Function1000a4
- call Function222a
+ call ReturnToMapFromSubmenu
ld hl, VramState
res 1, [hl]
ret
@@ -74,7 +74,7 @@ Function100063: ; 100063
Function100082: ; 100082
xor a
ld hl, OverworldMap
- ld bc, 1300
+ ld bc, OverworldMapEnd - OverworldMap
call ByteFill
di
call DoubleSpeed
@@ -312,7 +312,7 @@ Function10016f: ; 10016f
Function10020b: ; 10020b
xor a
ld [wc303], a
- callba FadeBlackBGMap
+ callba FadeOutPalettes
callba Function106464
call HideSprites
call DelayFrame
@@ -412,7 +412,7 @@ Function1002c9: ; 1002c9
; 1002dc
Function1002dc: ; 1002dc
- ld a, MAPSETUP_08
+ ld a, MAPSETUP_LINKRETURN
ld [hMapEntryMethod], a
callba RunMapSetupScript
xor a
@@ -3048,7 +3048,7 @@ Function10138b: ; 10138b
; 1013aa
Function1013aa: ; 1013aa
- call WhiteBGMap
+ call ClearBGPalettes
call Call_ExitMenu
call Function2bae
callba Function106464
diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm
index 825ee9497..9b2664e6b 100755
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -951,7 +951,7 @@ Function106442: ; 106442
call Function3e32
xor a
ld [hMobile], a
- ld [$ffc9], a
+ ld [hFFC9], a
ld a, [wcd25]
inc a
ld [wcd25], a
diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm
index 591a26e1f..5e48eb6c1 100644
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -125,7 +125,7 @@ Function108089: ; 108089
Function1080b7: ; 1080b7
xor a
ld [wJumptableIndex], a
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearTileMap
call DisableLCD
@@ -188,7 +188,7 @@ Function1080b7: ; 1080b7
Function108157: ; 108157
xor a
ld [wJumptableIndex], a
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearTileMap
call DisableLCD
@@ -508,7 +508,7 @@ Function10830e: ; 10830e
; 10839b
Function10839b: ; 10839b
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearTileMap
call DisableLCD
@@ -643,7 +643,7 @@ Function10842c: ; 10842c
; 1084d7
Function1084d7: ; 1084d7
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearTileMap
call DisableLCD
@@ -712,7 +712,7 @@ Function1084d7: ; 1084d7
; 108589
Function108589: ; 108589
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearTileMap
call DisableLCD
@@ -781,7 +781,7 @@ Function108589: ; 108589
Function108638: ; 108638
callba Function8d03d
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearTileMap
xor a
@@ -817,7 +817,7 @@ Function108638: ; 108638
Function108689: ; 108689
callba Function8d03d
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearTileMap
xor a
@@ -862,7 +862,7 @@ Function108689: ; 108689
; 1086f4
Function1086f4: ; 1086f4
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearTileMap
xor a
@@ -1162,7 +1162,7 @@ Function108919: ; 108919
ld c, $28
call Function1082cc
callba Function8d03d
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearTileMap
call DisableLCD
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index 3055ca988..5bb2b4a0c 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -7708,7 +7708,7 @@ Function117699: ; 117699 (45:7699)
ld hl, wc708
ld bc, $11
call ByteFill
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
callba Function171c87
callba Function104061
@@ -7726,7 +7726,7 @@ Function1176ee: ; 1176ee (45:76ee)
jr Function1176ee
.asm_117709
callba Function8cf53
- call WhiteBGMap
+ call ClearBGPalettes
call ClearScreen
call ClearSprites
ret
@@ -8172,7 +8172,7 @@ Function117a94: ; 0x117a94
ld [wcf64], a
ld [wcf65], a
ld [wcf66], a
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
callba Function172e78
callba Function104000
@@ -8180,7 +8180,7 @@ Function117a94: ; 0x117a94
; 0x117ab4
Function117ab4: ; 0x117ab4
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
callba Function172e78
callba Function172eb9
@@ -8197,7 +8197,7 @@ Function117acd: ; 0x117acd
callba Function104000
jr Function117acd
.asm_117ae2
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
ret
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index b869e2f8f..1bcccbfe5 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -43,7 +43,7 @@ asm_11800b
pop af
ld [rSVBK], a
call Function118452
- call Function222a
+ call ReturnToMapFromSubmenu
Function11805e: ; 11805e (46:405e)
ret
; 11805f
@@ -84,7 +84,7 @@ Function11805f: ; 11805f
pop af
ld [rSVBK], a
call Function118452
- call Function222a
+ call ReturnToMapFromSubmenu
ret
; 1180b8
@@ -130,7 +130,7 @@ Function1180b8: ; 1180b8
pop af
ld [rSVBK], a
call Function118452
- call Function222a
+ call ReturnToMapFromSubmenu
ret
; 11811a
@@ -180,7 +180,7 @@ Function118125: ; 118125
ld [rSVBK], a
call Function118452
call Function118180
- call Function222a
+ call ReturnToMapFromSubmenu
ret
; 118180
@@ -262,7 +262,7 @@ Function1181da: ; 1181da
pop af
ld [rSVBK], a
call Function118452
- call Function222a
+ call ReturnToMapFromSubmenu
ret
; 118233
@@ -374,7 +374,7 @@ Function1182d5: ; 1182d5
pop af
ld [rSVBK], a
call Function118452
- call Function222a
+ call ReturnToMapFromSubmenu
ret
; 118329
@@ -482,7 +482,7 @@ Function1183cb: ; 1183cb
ld a, $f
ld [rIE], a
ld a, $1
- ld [$ffc9], a
+ ld [hFFC9], a
ld [hMobile], a
ei
callba Function106462
@@ -512,7 +512,7 @@ Function118440: ; 118440
Function118452: ; 118452
di
xor a
- ld [$ffc9], a
+ ld [hFFC9], a
ld [hMobile], a
ld [hVBlank], a
call NormalSpeed
@@ -5682,7 +5682,7 @@ Function11a9c0: ; 11a9c0
; 11a9ce
Function11a9ce: ; 11a9ce
- call WhiteBGMap
+ call ClearBGPalettes
call Function2bae
call Call_ExitMenu
callba Function106462
@@ -5950,7 +5950,7 @@ Function11acb7: ; 11acb7
; 11ad1b
Function11ad1b: ; 11ad1b
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearTileMap
callba Function17c000
diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm
index 759d5f586..6fb42b16f 100755
--- a/misc/mobile_5b.asm
+++ b/misc/mobile_5b.asm
@@ -140,7 +140,7 @@ Function16c0dc: ; 16c0dc
; 16c0ec
Function16c0ec: ; 16c0ec
- call WhiteBGMap
+ call ClearBGPalettes
call ClearScreen
push af
ld a, $ff
@@ -885,7 +885,7 @@ Function16d42e: ; 16d42e
Function16d43b: ; 16d43b
call LoadStandardMenuDataHeader
- call WhiteBGMap
+ call ClearBGPalettes
call ClearTileMap
call ClearSprites
callba Function16d421
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index 85681221a..0b4b18b4f 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -283,7 +283,7 @@ Function1704e1: ; 1704e1
; 1704f1
Function1704f1: ; 1704f1
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearScreen
.asm_1704fa
@@ -1590,7 +1590,7 @@ Function1719ed: ; 1719ed (5c:59ed)
ld [wcd4a], a
dec a
ld [wcd4b], a
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
callba Function171d2b
callba Function104061
@@ -1883,7 +1883,7 @@ Function171c2c: ; 171c2c (5c:5c2c)
dec [hl]
ret nz
call ExitMenu
- call WhiteBGMap
+ call ClearBGPalettes
jr asm_171c60
Function171c39: ; 171c39 (5c:5c39)
@@ -1895,7 +1895,7 @@ Function171c41: ; 171c41 (5c:5c41)
ld hl, wcd4c
dec [hl]
ret nz
- call WhiteBGMap
+ call ClearBGPalettes
callba Function106462
callba Function106464
ld a, $2
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index 8e89a648b..ab6dd07e7 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -561,7 +561,7 @@ Function17d2ce: ; 17d2ce
ld a, d
ld [MusicFadeIDHi], a
call PlayMusic
- call Function222a
+ call ReturnToMapFromSubmenu
call Function2b3c
ret
; 17d314
@@ -626,7 +626,7 @@ Function17d370: ; 17d370
ld [wcd79], a
dec a
ld [wcd6c], a
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearScreen
callba Function104061
@@ -672,7 +672,7 @@ Function17d370: ; 17d370
; 17d3f6
Function17d3f6: ; 17d3f6
- call WhiteBGMap
+ call ClearBGPalettes
call ClearSprites
call ClearScreen
callba Function104061
@@ -1245,7 +1245,7 @@ Function17d78d: ; 17d78d
call CloseSRAM
xor a
ld [wcd77], a
- call WhiteBGMap
+ call ClearBGPalettes
ret
; 17d7b4
diff --git a/misc/unused_title.asm b/misc/unused_title.asm
index e151deb14..7a9c2556f 100644
--- a/misc/unused_title.asm
+++ b/misc/unused_title.asm
@@ -3,7 +3,7 @@ SECTION "bank43", ROMX, BANK[$43]
UnusedTitleScreen: ; 10c000
- call WhiteBGMap
+ call ClearBGPalettes
call ClearTileMap
call DisableLCD
xor a
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 16:08:45 +0000