diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/gfx/palettes.asm | 16 | ||||
| -rw-r--r-- | engine/link/cable_club.asm | 8 | ||||
| -rw-r--r-- | engine/minigame/surfing_pikachu.asm | 4 | ||||
| -rw-r--r-- | engine/movie/intro_yellow.asm | 2 | ||||
| -rw-r--r-- | engine/printer/printer.asm | 2 | ||||
| -rw-r--r-- | engine/printer/printer2.asm | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 67ec6868..26bffb4f 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -253,13 +253,13 @@ SetPal_TrainerCard: ld de, wTrainerCardBlkPacket ret -SendUnknownPalPacket_7205d:: - ld hl, UnknownPalPacket_72811 +SetPal_PikachusBeach:: + ld hl, PalPacket_PikachusBeach ld de, BlkPacket_WholeScreen ret -SendUnknownPalPacket_72064:: - ld hl, UnknownPalPacket_72821 +SetPal_PikachusBeachTitle:: + ld hl, PalPacket_PikachusBeachTitle ld de, UnknownPacket_72751 ret @@ -279,8 +279,8 @@ SetPalFunctions: dw SetPal_PokemonWholeScreen dw SetPal_GameFreakIntro dw SetPal_TrainerCard - dw SendUnknownPalPacket_7205d - dw SendUnknownPalPacket_72064 + dw SetPal_PikachusBeach + dw SetPal_PikachusBeachTitle ; The length of the blk data of each badge on the Trainer Card. ; The Rainbow Badge has 3 entries because of its many colors. @@ -323,7 +323,7 @@ YellowIntroPaletteAction:: jp InitGBCPalettes .asm_720bd - ld hl, UnknownPalPacket_72811 + ld hl, PalPacket_PikachusBeach ldh a, [hGBC] and a jp z, SendSGBPacket @@ -351,7 +351,7 @@ LoadOverworldPikachuFrontpicPalettes:: ld hl, wPartyMenuBlkPacket ld [hl], a ld hl, wPartyMenuBlkPacket + 2 - ld a, $26 + ld a, PAL_PIKACHU_PORTRAIT ld [hl], a ld hl, wPalPacket ldh a, [hGBC] diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm index 32acfb3d..3c8ffcc2 100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm @@ -277,7 +277,7 @@ CableClub_DoBattleOrTradeAgain: ld [wCurOpponent], a call ClearScreen call Delay3 - ld b, $9 + ld b, SET_PAL_OVERWORLD call RunPaletteCommand ld hl, wOptions res 7, [hl] @@ -316,7 +316,7 @@ CallCurrentTradeCenterFunction: TradeCenter_SelectMon: call ClearScreen call Delay3 - ld b, $9 + ld b, SET_PAL_OVERWORLD call RunPaletteCommand call LoadTrainerInfoTextBoxTiles call TradeCenter_DrawPartyLists @@ -633,7 +633,7 @@ TradeCenter_DisplayStats: predef StatusScreen predef StatusScreen2 call Delay3 - ld b, $9 + ld b, SET_PAL_OVERWORLD call RunPaletteCommand call GBPalNormal call LoadTrainerInfoTextBoxTiles @@ -859,7 +859,7 @@ TradeCenter_Trade: ld c, 40 call DelayFrames call Delay3 - ld b, $9 + ld b, SET_PAL_OVERWORLD call RunPaletteCommand hlcoord 0, 12 lb bc, 4, 18 diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm index 9e93d970..6d31c7b7 100644 --- a/engine/minigame/surfing_pikachu.asm +++ b/engine/minigame/surfing_pikachu.asm @@ -62,7 +62,7 @@ SurfingPikachuMinigame:: SurfingPikachuLoop: call SurfingPikachuMinigame_LoadGFXAndLayout call DelayFrame - ld b, $e + ld b, SET_PAL_SURFING_PIKACHU_TITLE call RunPaletteCommand .loop ld a, [wSurfingMinigameRoutineNumber] @@ -2362,7 +2362,7 @@ SurfingPikachuMinigameIntro: ldh [hSCY], a ld a, $90 ldh [hWY], a - ld b, $f + ld b, SET_PAL_SURFING_PIKACHU_MINIGAME call RunPaletteCommand ld a, $e3 ldh [rLCDC], a diff --git a/engine/movie/intro_yellow.asm b/engine/movie/intro_yellow.asm index 78dcdf0a..043ff068 100644 --- a/engine/movie/intro_yellow.asm +++ b/engine/movie/intro_yellow.asm @@ -847,7 +847,7 @@ InitYellowIntroGFXAndMusic: call CopyVideoData call ClearObjectAnimationBuffers call LoadYellowIntroObjectAnimationDataPointers - ld b, $8 + ld b, SET_PAL_GENERIC call RunPaletteCommand xor a ld hl, wYellowIntroCurrentScene diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index d75dfbde..be0aecf1 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -687,7 +687,7 @@ Printer_PrepareSurfingMinigameHighScoreTileMap:: add hl, bc call PlaceString call CopySurfingMinigameScore - ld b, 8 + ld b, SET_PAL_GENERIC call RunPaletteCommand ld a, $1 ldh [hAutoBGTransferEnabled], a diff --git a/engine/printer/printer2.asm b/engine/printer/printer2.asm index 407aee8a..4a7b68db 100644 --- a/engine/printer/printer2.asm +++ b/engine/printer/printer2.asm @@ -129,7 +129,7 @@ Printer_GetMonStats: ld a, [wLoadedMonMoves + 3] call .PlaceMoveName - ld b, $4 ; SET_PAL_STATUS_SCREEN + ld b, SET_PAL_POKEDEX call RunPaletteCommand ld a, $1 |