diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/crystal_misc.asm | 2 | ||||
| -rw-r--r-- | misc/mobile_40.asm | 11 | ||||
| -rw-r--r-- | misc/mobile_45.asm | 30 | ||||
| -rw-r--r-- | misc/mobile_5f.asm | 10 |
4 files changed, 27 insertions, 26 deletions
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index 67bef18bc..3c6ded567 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -50,7 +50,7 @@ Function17a6a8: ; 17a6a8 (5e:66a8) call Function17abcf callba Function49409 callba Function49420 - call Function32f9 + call SetPalettes call DelayFrame ret diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index fa3490f82..79d982cea 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -1615,6 +1615,7 @@ Function100a09: ; 100a09 ld a, [InLinkBattle] cp $4 jr nz, .asm_100a2a + call Function100a87 call Function100da5 callba Function3ee27 @@ -1941,15 +1942,15 @@ endr ret .asm_100c63 - ld hl, BattleText_0x80c5b + ld hl, BattleText_TheMoveIsDisabled jr .asm_100c6b .asm_100c68 - ld hl, BattleText_0x80c39 + ld hl, BattleText_TheresNoPPLeftForThisMove .asm_100c6b call StdBattleTextBox - call Function30b4 + call Call_LoadTempTileMapToTileMap jp Function100bc2 ; 100c74 @@ -3015,7 +3016,7 @@ Function10138b: ; 10138b Function1013aa: ; 1013aa call WhiteBGMap - call Function1d7d + call Call_ExitMenu call Function2bae callba Function106464 call UpdateSprites @@ -6793,7 +6794,7 @@ Function102dec: ; 102dec ld a, $5 call FarCopyWRAM callba Function49742 - call Function32f9 + call SetPalettes call DelayFrame ret ; 102e07 diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 7ae4f8327..1b0732f10 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -5789,7 +5789,7 @@ Function116294: ; 116294 ld de, Unkn1Pals + 8 * 7 ld bc, $0008 call CopyBytes - call Function32f9 + call SetPalettes pop af ld [rSVBK], a ld a, $30 @@ -5810,7 +5810,7 @@ Function1162cb: ; 1162cb ld de, wd050 ld bc, $0030 call CopyBytes - call Function32f9 + call SetPalettes pop af ld [rSVBK], a ret @@ -5917,7 +5917,7 @@ Function11636e: ; 11636e call CopyBytes pop af ld [rSVBK], a - call Function32f9 + call SetPalettes ld a, [rSVBK] push af ld a, $1 @@ -5967,7 +5967,7 @@ Function1163c0: ; 1163c0 call CopyBytes pop af ld [rSVBK], a - call Function32f9 + call SetPalettes call DelayFrame ld a, $90 ld [hWY], a @@ -14155,7 +14155,7 @@ Function11a9c0: ; 11a9c0 Function11a9ce: ; 11a9ce call WhiteBGMap call Function2bae - call Function1d7d + call Call_ExitMenu callba Function106462 callba Function106464 call Functiond90 @@ -14937,7 +14937,7 @@ Function11b082: ; 11b082 call Function11b099 call Function11b295 call Function11b275 - call Function32f9 + call SetPalettes jp Function11ad8a ; 11b099 @@ -16875,7 +16875,7 @@ Function11c1ca: ; 11c1ca call ClearSprites call ClearScreen call Function11d323 - call Function32f9 + call SetPalettes call DisableLCD ld hl, GFX_11d67e ld de, VTiles2 @@ -21659,7 +21659,7 @@ endr cp $8 jr nz, .asm_16c969 callba Function96a4 - call Function32f9 + call SetPalettes ld a, [rSVBK] push af ld a, $1 @@ -21762,7 +21762,7 @@ endr cp $8 jr nz, .asm_16ca28 callba Function96a4 - call Function32f9 + call SetPalettes ld a, [rSVBK] push af ld a, $1 @@ -22185,10 +22185,10 @@ Function16d43b: ; 16d43b callba Function16d42e ld b, $8 call GetSGBLayout - call Function32f9 + call SetPalettes call WaitBGMap call Functiona36 - call Function1d7d + call Call_ExitMenu ret ; 16d465 @@ -22330,7 +22330,7 @@ Function16d6ce: ; 16d6ce call Function1d6e call Function16d6e1 callba Function87d - call Function1d7d + call Call_ExitMenu call Function3200 ret ; 16d6e1 @@ -23293,7 +23293,7 @@ Function170525: ; 170525 Function170571: - call Function32f9 + call SetPalettes call Function1705b2 @@ -24906,7 +24906,7 @@ Function171ccd: ; 171ccd (5c:5ccd) ld [hli], a ld a, $7f ld [hl], a - call Function32f9 + call SetPalettes pop af ld [rSVBK], a ; $ff00+$70 ret @@ -25068,7 +25068,7 @@ Function172eb9: ld de, BGPals ld bc, $40 call CopyBytes - call Function32f9 + call SetPalettes pop af ld [rSVBK], a ; $ff00+$70 ret diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 9c38fbb27..d581467ff 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -706,7 +706,7 @@ Function17d405: ld de, Unkn1Pals ld bc, $0040 call CopyBytes - call Function32f9 + call SetPalettes pop af ld [rSVBK], a ret @@ -938,7 +938,7 @@ endr ; 17d5be Function17d5be: ; 17d5be - call Function32f9 + call SetPalettes call Function17e438 Function17d5c4: @@ -1508,7 +1508,7 @@ Function17d93a: ; 17d93a ld a, [wc70c] ld e, a callba Function8bc6 - call Function32f9 + call SetPalettes ld a, [wc708] ld l, a ld a, [wc709] @@ -1544,7 +1544,7 @@ Function17d98b: ; 17d98b ld a, [wc70b] ld e, a callba Function8bbd - call Function32f9 + call SetPalettes ld a, [wc708] ld e, a ld a, [wc709] @@ -4764,7 +4764,7 @@ Function17f5c3: ; 17f5c3 Function17f5d2: ; 17f5d2 call Function17f5e4 callba Function104000 - call Function32f9 + call SetPalettes ld a, $1 ld [wc303], a ret |