summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rwxr-xr-xmisc/battle_tower_47.asm4
-rw-r--r--misc/crystal_misc.asm4
-rw-r--r--misc/mobile_22.asm6
-rw-r--r--misc/mobile_22_2.asm2
-rw-r--r--misc/mobile_42.asm10
-rw-r--r--misc/mobile_45.asm4
-rwxr-xr-xmisc/mobile_46.asm42
-rwxr-xr-xmisc/mobile_5b.asm28
-rwxr-xr-xmisc/mobile_5c.asm6
-rw-r--r--misc/mobile_5f.asm24
-rw-r--r--misc/unused_title.asm2
11 files changed, 66 insertions, 66 deletions
diff --git a/misc/battle_tower_47.asm b/misc/battle_tower_47.asm
index d5c9693b6..68abcf1b9 100755
--- a/misc/battle_tower_47.asm
+++ b/misc/battle_tower_47.asm
@@ -2888,7 +2888,7 @@ Function11d323: ; 11d323
ld a, $5
ld [rSVBK], a
ld hl, Palette_11d33a
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, 16 * 8
call CopyBytes
pop af
@@ -3015,7 +3015,7 @@ Function11d3ef: ; 11d3ef
ld a, [hli]
ld b, a
push hl
- ld hl, Unkn1Pals
+ ld hl, wMapPals
add hl, de
ld a, [wcd2d]
ld e, a
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm
index 7a84364da..489ec77ee 100644
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -768,11 +768,11 @@ Function17aba0: ; 17aba0 (5e:6ba0)
Function17abcf: ; 17abcf (5e:6bcf)
ld a, [rSVBK]
push af
- ld a, BANK(Unkn1Pals)
+ ld a, BANK(wMapPals)
ld [rSVBK], a
ld hl, Palette_17ac55
- ld de, Unkn1Pals ; $d000
+ ld de, wMapPals ; $d000
ld bc, $30
call CopyBytes
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index d73776be6..291006118 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -623,7 +623,7 @@ Function8949c: ; 8949c
ld a, 5
ld [rSVBK], a
ld hl, Palette_894b3
- ld de, Unkn1Pals + 8 * 7
+ ld de, wMapPals + 8 * 7
ld bc, 8
call CopyBytes
pop af
@@ -674,7 +674,7 @@ endr
ld a, [hli]
ld h, [hl]
ld l, a
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, 24
call CopyBytes
ld hl, Palette_89557
@@ -2152,7 +2152,7 @@ Function89d0d: ; 89d0d (22:5d0d)
ld a, $5
ld [rSVBK], a
ld c, $8
- ld de, Unkn1Pals
+ ld de, wMapPals
.asm_89d1c
push bc
ld hl, Palette_89d4e
diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm
index cb5fc0628..7a206e3e0 100644
--- a/misc/mobile_22_2.asm
+++ b/misc/mobile_22_2.asm
@@ -610,7 +610,7 @@ Function8b6bb: ; 8b6bb
ld a, $5
ld [rSVBK], a
ld hl, Palette_8b6d5
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $0018
call CopyBytes
pop af
diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm
index 5e48eb6c1..39d27e941 100644
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -804,7 +804,7 @@ Function108638: ; 108638
ld a, $5
ld [rSVBK], a
ld hl, Palette_109107
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $0040
call CopyBytes
pop af
@@ -850,7 +850,7 @@ Function108689: ; 108689
ld a, $5
ld [rSVBK], a
ld hl, Palette_109107
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $0040
call CopyBytes
pop af
@@ -894,7 +894,7 @@ Function1086f4: ; 1086f4
ld a, $5
ld [rSVBK], a
ld hl, Palette_109107
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $0040
call CopyBytes
pop af
@@ -1459,7 +1459,7 @@ Function108b45: ; 108b45
ld a, $5
ld [rSVBK], a
ld de, $7fff
- ld hl, Unkn1Pals
+ ld hl, wMapPals
ld a, e
ld [hli], a
ld d, a
@@ -1537,7 +1537,7 @@ Function108b98: ; 108b98
ld hl, Palette_108b98
.asm_108bb0
- ld de, Unkn1Pals + 8 * 7
+ ld de, wMapPals + 8 * 7
ld bc, $0040
call CopyBytes
pop af
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index 5bb2b4a0c..6852745b5 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -5786,7 +5786,7 @@ Function116294: ; 116294
ld bc, $0010
call CopyBytes
ld hl, Palette_11734e
- ld de, Unkn1Pals + 8 * 7
+ ld de, wMapPals + 8 * 7
ld bc, $0008
call CopyBytes
call SetPalettes
@@ -5912,7 +5912,7 @@ Function11636e: ; 11636e
ld a, $5
ld [rSVBK], a
ld hl, BGPals
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $0040
call CopyBytes
pop af
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 1bcccbfe5..54e5a81ba 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -175,7 +175,7 @@ Function118125: ; 118125
cp [hl]
jr nz, .asm_11813e
xor a
- ld [Unkn1Pals], a
+ ld [wMapPals], a
pop af
ld [rSVBK], a
call Function118452
@@ -1067,7 +1067,7 @@ Function11878d: ; 11878d (46:478d)
set 0, [hl]
ld a, $6
ld [rSVBK], a
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
ld a, [hl]
sla a
@@ -1462,7 +1462,7 @@ Function118a65: ; 118a65
ld de, wcc60
ld bc, $80
call CopyBytes
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
jp Function118b10
; 118a7a
@@ -1472,7 +1472,7 @@ Function118a7a: ; 118a7a
ld de, wcc60
ld bc, $80
call CopyBytes
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
jp Function118b10
; 118a8f
@@ -1482,7 +1482,7 @@ Function118a8f: ; 118a8f
ld de, wcc60
ld bc, $80
call CopyBytes
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
jp Function118b10
; 118aa4
@@ -1504,7 +1504,7 @@ Function118abc: ; 118abc (46:4abc)
ld de, wcc60
ld bc, $80
call CopyBytes
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
jr Function118b10
; 118ad0 (46:4ad0)
@@ -1514,7 +1514,7 @@ Function118ad0:
ld de, wcc60
ld bc, $80
call CopyBytes
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
jr Function118b10
@@ -2101,7 +2101,7 @@ Function119009:
ld a, $40
ld [wcd89], a
ld hl, wc314 + 48 + 2
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
ld a, $2c
jp Function119e2b
@@ -2115,7 +2115,7 @@ Function119054: ; 119054
ld e, a
ld a, [wcd50]
ld d, a
- ld a, [Unkn1Pals]
+ ld a, [wMapPals]
ld c, a
ld a, [wd001]
ld b, a
@@ -2127,7 +2127,7 @@ Function119054: ; 119054
ld a, $6
ld [rSVBK], a
ld hl, wd002
- ld a, [Unkn1Pals]
+ ld a, [wMapPals]
ld c, a
ld a, [wd001]
ld b, a
@@ -2174,7 +2174,7 @@ Function1190d0: ; 1190d0
ld de, wcc60
call Function1191ad
ret c
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
jp Function118b10
; 1190ec
@@ -2194,7 +2194,7 @@ Function1190ec: ; 1190ec
call CloseSRAM
ld a, $6
call GetSRAMBank
- ld a, [Unkn1Pals]
+ ld a, [wMapPals]
ld c, a
ld a, [wd001]
ld b, a
@@ -2207,7 +2207,7 @@ Function1190ec: ; 1190ec
jr z, .asm_11913e
ld a, $6
ld [rSVBK], a
- ld a, [Unkn1Pals]
+ ld a, [wMapPals]
ld c, a
ld a, [wd001]
ld b, a
@@ -2674,7 +2674,7 @@ Function1193fb:
ld a, $8
ld [wcd3c], a
call Function119ed8
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
jp Function118b10
; 119413
@@ -2682,7 +2682,7 @@ Function1193fb:
Function119413: ; 119413
ld a, $6
call GetSRAMBank
- ld a, [Unkn1Pals]
+ ld a, [wMapPals]
ld c, a
ld a, [wd001]
ld b, a
@@ -3039,7 +3039,7 @@ Function119648: ; 119648 (46:5648)
ld [wcd3c], a
call Function119ed8
call Function118b24
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
ld a, $2a
jp Function119e2b
@@ -3334,7 +3334,7 @@ Function1197dc:
xor a
ld [de], a
call Function118b24
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
ld a, $2a
jp Function119e2b
@@ -3533,14 +3533,14 @@ Function119973: ; 119973
xor a
ld [wcf65], a
ld [StringBuffer2 + 10], a
- ld de, Unkn1Pals
+ ld de, wMapPals
ld a, $20
jp Function119e2b
; 119987
Function119987: ; 119987
ld hl, wd001
- ld a, [Unkn1Pals]
+ ld a, [wMapPals]
or [hl]
jr z, .asm_1199a0
ld a, [wcf64]
@@ -3702,13 +3702,13 @@ Function1199e2: ; 1199e2
ld [StringBuffer2 + 12], a
Function119ac9:
- ld a, [Unkn1Pals]
+ ld a, [wMapPals]
ld l, a
ld a, [wd001]
ld h, a
dec hl
ld a, l
- ld [Unkn1Pals], a
+ ld [wMapPals], a
ld a, h
ld [wd001], a
ld a, [wcf64]
diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm
index 6fb42b16f..3e26aa9ea 100755
--- a/misc/mobile_5b.asm
+++ b/misc/mobile_5b.asm
@@ -179,7 +179,7 @@ Function16c108: ; 16c108
; 16c130
Function16c130: ; 16c130
- ld de, Unkn1Pals
+ ld de, wMapPals
ld hl, Unknown_16c903
ld bc, 8
ld a, $5
@@ -274,7 +274,7 @@ Function16c943: ; 16c943
ld [rSVBK], a
ld a, $ff
ld bc, $0008
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call ByteFill
pop af
ld [rSVBK], a
@@ -291,7 +291,7 @@ Function16c943: ; 16c943
call Function16cab6
call Function16cabb
ld d, a
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function16cab6
call Function16cabb
cp d
@@ -305,7 +305,7 @@ Function16c943: ; 16c943
jr nz, .asm_16c981
.asm_16c988
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function16cab6
call Function16cadc
@@ -314,7 +314,7 @@ Function16c943: ; 16c943
call Function16cab6
call Function16cad8
ld d, a
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function16cab6
call Function16cad8
cp d
@@ -328,7 +328,7 @@ Function16c943: ; 16c943
jr nz, .asm_16c9a9
.asm_16c9b0
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function16cab6
call Function16cb08
@@ -337,7 +337,7 @@ Function16c943: ; 16c943
call Function16cab6
call Function16cac4
ld d, a
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function16cab6
call Function16cac4
cp d
@@ -351,7 +351,7 @@ Function16c943: ; 16c943
jr nz, .asm_16c9d1
.asm_16c9d8
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function16cab6
call Function16cae8
@@ -402,7 +402,7 @@ Function16ca11: ; 16ca11
ld e, $0
ld a, $0
.asm_16ca28
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function16cab6
call Function16cabb
cp $1f
@@ -416,12 +416,12 @@ Function16ca11: ; 16ca11
jr nz, .asm_16ca37
.asm_16ca3f
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function16cab6
call Function16cadc
.asm_16ca48
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function16cab6
call Function16cad8
cp $1f
@@ -435,12 +435,12 @@ Function16ca11: ; 16ca11
jr nz, .asm_16ca57
.asm_16ca5f
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function16cab6
call Function16cb08
.asm_16ca68
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function16cab6
call Function16cac4
cp $1f
@@ -454,7 +454,7 @@ Function16ca11: ; 16ca11
jr nz, .asm_16ca77
.asm_16ca7f
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function16cab6
call Function16cae8
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index 0b4b18b4f..5d9e207bb 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -1532,7 +1532,7 @@ Function170cc6: ; 170cc6
ld hl, LZ_1715a4
ld de, wd000
call Decompress
- ld de, Unkn1Pals
+ ld de, wMapPals
ld hl, VTiles0
lb bc, $6, $53
call Get2bpp
@@ -1957,7 +1957,7 @@ Function171ccd: ; 171ccd (5c:5ccd)
ld a, $5
ld [rSVBK], a
ld hl, Palette_171d71
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $40
call CopyBytes
ld hl, MovementAnimation
@@ -2120,7 +2120,7 @@ Function172eb9:
ld a, $5
ld [rSVBK], a
ld hl, Palette_172edf
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $40
call CopyBytes
ld hl, Palette_172edf
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index ab6dd07e7..01a4db77f 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -48,11 +48,11 @@ Function17c000: ; 17c000
ld a, [rSVBK]
push af
- ld a, 5 ; BANK(Unkn1Pals)
+ ld a, 5 ; BANK(wMapPals)
ld [rSVBK], a
ld hl, HaveWantPals
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $80
call CopyBytes
@@ -664,7 +664,7 @@ Function17d370: ; 17d370
ld a, $6
call GetSRAMBank
ld hl, $a006
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
call CopyBytes
call CloseSRAM
@@ -705,7 +705,7 @@ Function17d405:
ld a, $5
ld [rSVBK], a
ld hl, Palette_17eff6
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $0040
call CopyBytes
call SetPalettes
@@ -985,7 +985,7 @@ Function17d5f6: ; 17d5f6
ld a, $5
ld [rSVBK], a
ld hl, $c608
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $0040
call CopyBytes
ld a, $4
@@ -1239,7 +1239,7 @@ Function17d78d: ; 17d78d
call GetSRAMBank
ld hl, $a006
add hl, bc
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $1000
call CopyBytes
call CloseSRAM
@@ -1363,7 +1363,7 @@ Function17d85d: ; 17d85d
ld a, [hli]
ld d, a
push hl
- ld hl, Unkn1Pals
+ ld hl, wMapPals
add hl, de
ld de, wcc60
.asm_17d86c
@@ -1432,7 +1432,7 @@ Function17d85d: ; 17d85d
ld a, $3
ld [rSVBK], a
ld hl, $c608
- ld de, Unkn1Pals
+ ld de, wMapPals
ld b, $0
call CopyBytes
ld a, $4
@@ -1467,7 +1467,7 @@ Function17d902: ; 17d902
call Function17e41e
call Function17e32b
pop de
- ld hl, Unkn1Pals
+ ld hl, wMapPals
add hl, de
ld de, wcc60
.asm_17d918
@@ -1984,7 +1984,7 @@ Function17dca9: ; 17dca9
Function17dcaf:
ld a, $5
ld [rSVBK], a
- ld hl, Unkn1Pals
+ ld hl, wMapPals
ld de, $0008
ld c, $8
.asm_17dcbb
@@ -3165,7 +3165,7 @@ Function17e409: ; 17e409
; 17e40f
Function17e40f: ; 17e40f
- ld de, Unkn1Pals
+ ld de, wMapPals
add hl, de
jr Function17e41e
@@ -4419,7 +4419,7 @@ endr
ld e, a
ld a, [hli]
ld d, a
- ld hl, Unkn1Pals
+ ld hl, wMapPals
add hl, de
ld e, l
ld d, h
diff --git a/misc/unused_title.asm b/misc/unused_title.asm
index 7a9c2556f..143994d9a 100644
--- a/misc/unused_title.asm
+++ b/misc/unused_title.asm
@@ -67,7 +67,7 @@ endr
ld [rSVBK], a
ld hl, UnusedTitleBG_Palettes
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $40
call CopyBytes