diff options
-rw-r--r-- | engine/battle/battle_transition.asm | 2 | ||||
-rw-r--r-- | engine/battle_anims/anim_commands.asm | 4 | ||||
-rw-r--r-- | engine/battle_anims/bg_effects.asm | 4 | ||||
-rw-r--r-- | engine/debug/color_picker.asm | 4 | ||||
-rw-r--r-- | engine/events/heal_machine_anim.asm | 4 | ||||
-rw-r--r-- | engine/events/poisonstep_pals.asm | 2 | ||||
-rw-r--r-- | engine/gfx/cgb_layouts.asm | 32 | ||||
-rw-r--r-- | engine/gfx/color.asm | 6 | ||||
-rw-r--r-- | home/palettes.asm | 10 | ||||
-rw-r--r-- | home/tilemap.asm | 2 |
10 files changed, 35 insertions, 35 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index e09d617f..b26feaa2 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -600,7 +600,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ld a, PAL_BG_TEXT call ByteFill - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a call DelayFrame call CGBOnly_CopyTilemapAtOnce diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 20041a32..21f15db9 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -1300,7 +1300,7 @@ BattleAnim_SetBGPals: ld b, a ld c, 2 call CopyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -1315,7 +1315,7 @@ BattleAnim_SetOBPals: ld b, a ld c, 2 call CopyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index fb29aad6..37040efd 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -2502,7 +2502,7 @@ BGEffects_LoadBGPal0_OBPal1: ld c, $1 call CopyPals pop bc - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -2521,7 +2521,7 @@ BGEffects_LoadBGPal1_OBPal0: ld c, $1 call CopyPals pop bc - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm index 204703d9..8d85dd1a 100644 --- a/engine/debug/color_picker.asm +++ b/engine/debug/color_picker.asm @@ -457,7 +457,7 @@ Functionfd646: hlcoord 15, 2 ld de, wc508 + 2 call Functionfd6b0 - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a ld a, 3 ld [wJumptableIndex], a @@ -1229,7 +1229,7 @@ Functionfdc98: hlcoord 16, 0 ld de, wc508 + 6 call Functionfd6b0 - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a call DelayFrame ret diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm index 002d4ad4..7cf2f03a 100644 --- a/engine/events/heal_machine_anim.asm +++ b/engine/events/heal_machine_anim.asm @@ -166,7 +166,7 @@ INCBIN "gfx/overworld/heal_machine.2bpp" ld de, wOBPals2 palette PAL_OW_TREE ld bc, 1 palettes call CopyBytes - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -223,7 +223,7 @@ INCLUDE "gfx/overworld/heal_machine.pal" ld a, e ld [hl], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret diff --git a/engine/events/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm index 2752f5a7..9ef8b99e 100644 --- a/engine/events/poisonstep_pals.asm +++ b/engine/events/poisonstep_pals.asm @@ -33,7 +33,7 @@ LoadPoisonBGPals: ld [hli], a dec c jr nz, .loop - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ld c, 4 call DelayFrames diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 97180f7f..d62fdaf0 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -158,7 +158,7 @@ _CGB_PokegearPals: ld bc, 6 palettes call CopyBytes call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -211,7 +211,7 @@ _CGB_StatsScreenHPPals: call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -264,7 +264,7 @@ _CGB_Pokedex_Resume: call CopyBytes call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -299,7 +299,7 @@ _CGB_BillsPC: call InitPartyMenuOBPals call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -321,7 +321,7 @@ Function95a0: call InitPartyMenuOBPals call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -344,7 +344,7 @@ _CGB_PokedexUnownMode: call InitPartyMenuOBPals call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -396,7 +396,7 @@ _CGB_SlotMachine: call ByteFill call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -414,7 +414,7 @@ _CGB_BetaTitleScreen: call FillBoxCGB call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -548,7 +548,7 @@ _CGB_Evolution: call WipeAttrmap call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -564,7 +564,7 @@ _CGB_GSTitleScreen: ld a, SCGB_DIPLOMA ld [wDefaultSGBLayout], a call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -664,7 +664,7 @@ _CGB_TrainerCard: call FillBoxCGB call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -688,7 +688,7 @@ _CGB_MoveList: call FillBoxCGB call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -698,7 +698,7 @@ _CGB_BetaPikachuMinigame: call WipeAttrmap call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -710,7 +710,7 @@ _CGB_PokedexSearchOption: call WipeAttrmap call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -742,7 +742,7 @@ _CGB_PackPals: call FillBoxCGB call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -798,7 +798,7 @@ _CGB_MagnetTrain: call FillBoxCGB call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index bf6ac5a2..18f3fa4c 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -156,7 +156,7 @@ Function9102: call CopyBytes call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -321,7 +321,7 @@ ApplyHPBarPals: add hl, bc ld bc, 4 call CopyBytes - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -359,7 +359,7 @@ LoadStatsScreenPals: ld [wBGPals1 palette 0 + 1], a ld [wBGPals1 palette 2 + 1], a call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret diff --git a/home/palettes.asm b/home/palettes.asm index 6eec53ef..af7f7ba7 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -81,7 +81,7 @@ DmgToCgbBGPals:: ld c, 8 call CopyPals ; request pal update - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a pop bc @@ -120,7 +120,7 @@ DmgToCgbObjPals:: ld c, 8 call CopyPals ; request pal update - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a pop bc @@ -147,7 +147,7 @@ DmgToCgbObjPal0:: ld b, a ld c, 1 call CopyPals - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a pop bc @@ -176,7 +176,7 @@ DmgToCgbObjPal1:: ld b, a ld c, 1 call CopyPals - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a pop bc @@ -282,7 +282,7 @@ ReloadSpritesNoPalettes:: ld bc, (8 palettes) + (2 palettes) xor a call ByteFill - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a call DelayFrame ret diff --git a/home/tilemap.asm b/home/tilemap.asm index ddd32d9e..f65a0d5b 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -180,7 +180,7 @@ ClearPalettes:: ld a, $ff call ByteFill ; Request palette update - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a ret |