diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/mobile_22.asm | 14 | ||||
| -rw-r--r-- | misc/mobile_40.asm | 2 | ||||
| -rw-r--r-- | misc/mobile_45.asm | 12 | ||||
| -rwxr-xr-x | misc/mobile_46.asm | 2 | ||||
| -rwxr-xr-x | misc/mobile_5b.asm | 20 |
5 files changed, 26 insertions, 24 deletions
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm index 8977c0fb0..8734a4ca3 100644 --- a/misc/mobile_22.asm +++ b/misc/mobile_22.asm @@ -3390,16 +3390,16 @@ Function8a5b6: ; 8a5b6 (22:65b6) ld a, $5 ld [rSVBK], a ld hl, Palette_8a5e5 - ld de, wd020 - ld bc, $18 + ld de, UnknBGPals + 4 palettes + ld bc, 3 palettes call CopyBytes ld hl, Palette_8a5fd ld de, UnknOBPals - ld bc, $8 + ld bc, 1 palettes call CopyBytes ld hl, Palette_8a605 - ld de, wd048 - ld bc, $8 + ld de, UnknOBPals + 1 palettes + ld bc, 1 palettes call CopyBytes pop af ld [rSVBK], a @@ -3411,10 +3411,12 @@ Palette_8a5e5: ; 8a5e5 RGB 27, 19, 00 RGB 07, 11, 22 RGB 00, 00, 00 + RGB 31, 31, 31 RGB 16, 16, 31 RGB 27, 19, 00 RGB 00, 00, 00 + RGB 31, 31, 31 RGB 31, 00, 00 RGB 27, 19, 00 @@ -3442,7 +3444,7 @@ Function8a60d: ; 8a60d ld [rSVBK], a ld hl, Palette_8a624 ld de, UnknOBPals - ld bc, $0008 + ld bc, 1 palettes call CopyBytes pop af ld [rSVBK], a diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index bf1d10f9f..548c4b1d4 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -3059,7 +3059,7 @@ Function10138b: ; 10138b Function1013aa: ; 1013aa call ClearBGPalettes call Call_ExitMenu - call Function2bae + call ReloadTilesetAndPalettes callba Function106464 call UpdateSprites call Function2b5c diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 03ff7441d..c5c18b6fc 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -5781,13 +5781,13 @@ Function116294: ; 116294 push af ld a, $5 ld [rSVBK], a - ld hl, wd030 + ld hl, UnknBGPals + 8 * 6 ld de, wc314 + 12 - ld bc, $0010 + ld bc, 2 palettes call CopyBytes ld hl, Palette_11734e ld de, UnknBGPals + 8 * 7 - ld bc, $0008 + ld bc, 1 palettes call CopyBytes call SetPalettes pop af @@ -5807,8 +5807,8 @@ Function1162cb: ; 1162cb ld a, $5 ld [rSVBK], a ld hl, Palette_11730e - ld de, wd050 - ld bc, $0030 + ld de, UnknOBPals + 2 palettes + ld bc, 6 palettes call CopyBytes call SetPalettes pop af @@ -5821,7 +5821,7 @@ Function1162f2: ; 1162f2 call Function116758 call Function1167a6 ld a, [wc310] - cp $fd + cp EGG ret z sla a ld c, a diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 0689d4653..22d0f8fe2 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -5690,7 +5690,7 @@ Function11a9c0: ; 11a9c0 Function11a9ce: ; 11a9ce call ClearBGPalettes - call Function2bae + call ReloadTilesetAndPalettes call Call_ExitMenu callba MobileFunc_106462 callba Function106464 diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm index 558807f66..d11e655cf 100755 --- a/misc/mobile_5b.asm +++ b/misc/mobile_5b.asm @@ -711,11 +711,11 @@ Function16cbd1: ; 16cbd1 ld hl, Unknown_16cbfb add hl, bc ld a, [hl] - ld bc, $0002 + ld bc, 2 ld hl, Unknown_16cfa3 call AddNTimes - ld de, wd00c - ld bc, $0002 + ld de, UnknBGPals + 1 palettes + 4 + ld bc, 2 ld a, $5 call FarCopyWRAM callba ApplyPals @@ -749,19 +749,19 @@ Function16cc18: ; 16cc18 Function16cc25: ; 16cc25 ld hl, Unknown_16cfa9 - ld de, wd008 - call Function16cc41 + ld de, UnknBGPals + 1 palettes + call .CopyPal ld hl, Unknown_16cfb1 ld de, UnknOBPals - call Function16cc41 + call .CopyPal ld hl, Unknown_16cfb9 - ld de, wd048 - call Function16cc41 + ld de, UnknOBPals + 1 palettes + call .CopyPal ret ; 16cc41 -Function16cc41: ; 16cc41 - ld bc, $0008 +.CopyPal: ; 16cc41 + ld bc, 1 palettes ld a, $5 jp FarCopyWRAM ; 16cc49 |