From 3f7b6ca3575d8663dc18013e927ce9b1b3c0a7a0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 28 Apr 2022 09:04:16 -0400 Subject: [PATCH 01/13] Remove spurious space in battle_anim_scripts.s --- data/battle_anim_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 1cfc5230c0..35ad7cde05 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -5645,7 +5645,7 @@ HydroPumpBeams: createsprite gHydroPumpOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, 10, 0, -16 delay 1 return -HydroPumpHitSplats : +HydroPumpHitSplats: createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 15, ANIM_TARGET, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, -15, ANIM_TARGET, 1 return From ff936c15e1a5ca4e07e9d52cecc0f140cffd3a27 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 28 Apr 2022 13:46:23 -0400 Subject: [PATCH 02/13] Sync arg descriptions from FireRed https://github.com/pret/pokefirered/pull/501 --- data/battle_anim_scripts.s | 144 ++++++++++++++++---------------- include/constants/battle_anim.h | 13 ++- ld_script_modern.txt | 1 + 3 files changed, 82 insertions(+), 76 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 35ad7cde05..b4fdd4b1c1 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1458,11 +1458,11 @@ FuryCutterStrongest: Move_SELF_DESTRUCT: loadspritegfx ANIM_TAG_EXPLOSION createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 0, 9, RGB_RED - createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 - createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 - createvisualtask AnimTask_ShakeMon2, 5, 6, 6, 0, 38, 1 - createvisualtask AnimTask_ShakeMon2, 5, 7, 6, 0, 38, 1 - createvisualtask AnimTask_ShakeMon2, 5, 8, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_RIGHT, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_LEFT, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_RIGHT, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER_FORCE, 6, 0, 38, 1 call SelfDestructExplode call SelfDestructExplode waitforvisualfinish @@ -1624,11 +1624,11 @@ RisingWaterHitEffect: Move_EXPLOSION: loadspritegfx ANIM_TAG_EXPLOSION createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 9, RGB(26, 8, 8), 8, RGB_BLACK, 8 - createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 - createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 - createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1 - createvisualtask AnimTask_ShakeMon2, 5, 7, 8, 0, 40, 1 - createvisualtask AnimTask_ShakeMon2, 5, 8, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_RIGHT, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_LEFT, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_RIGHT, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER_FORCE, 8, 0, 40, 1 call Explosion1 call Explosion1 waitforvisualfinish @@ -1657,12 +1657,12 @@ Explosion1: Move_DEFENSE_CURL: loadspritegfx ANIM_TAG_ECLIPSING_ORB loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3 - createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 0 + createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, FALSE createvisualtask AnimTask_DefenseCurlDeformMon, 5 waitforvisualfinish createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1 waitforvisualfinish - createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 + createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE waitforvisualfinish end @@ -1709,7 +1709,7 @@ Frustration_Continue: Frustration_Strongest: playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 - createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, 31 + createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, RGB_RED waitforvisualfinish delay 20 playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER @@ -1740,12 +1740,12 @@ Frustration_Strongest: createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, -18, ANIM_TARGET, 0 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, 31 + createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, RGB_RED goto Frustration_Continue Frustration_Strong: playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 - createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, 31 + createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, RGB_RED waitforvisualfinish delay 20 playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER @@ -1766,7 +1766,7 @@ Frustration_Strong: createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, -6, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, 31 + createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, RGB_RED goto Frustration_Continue Frustration_Medium: playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER @@ -2597,8 +2597,8 @@ Move_LOW_KICK: end Move_EARTHQUAKE: - createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 10, 50 - createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 10, 50 + createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 10, 50 + createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 10, 50 playsewithpan SE_M_EARTHQUAKE, 0 delay 10 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, RGB_WHITE, 14 @@ -2608,7 +2608,7 @@ Move_EARTHQUAKE: Move_FISSURE: loadspritegfx ANIM_TAG_MUD_SAND - createvisualtask AnimTask_HorizontalShake, 3, (MAX_BATTLERS_COUNT + 1), 10, 50 + createvisualtask AnimTask_HorizontalShake, 3, ANIM_PLAYER_RIGHT, 10, 50 createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 50 playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET delay 8 @@ -2953,7 +2953,7 @@ SkyAttackSetUpAgainstPartner: delay 20 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 15, 0, RGB_WHITE waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 1, 8, 0, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_PLAYER_LEFT, 1, 8, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -3182,15 +3182,15 @@ Move_DESTINY_BOND: playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER delay 48 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1 - createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 0, 12, RGB(29, 29, 29) + createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, ANIM_OPPONENT_LEFT, 1, 0, 12, RGB(29, 29, 29) delay 24 - createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 12, 0, RGB(29, 29, 29) + createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, ANIM_OPPONENT_LEFT, 1, 12, 0, RGB(29, 29, 29) playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein blendoff - clearmonbg 5 + clearmonbg ANIM_PLAYER_RIGHT end Move_ENDURE: @@ -3323,13 +3323,13 @@ Move_MAGNITUDE: MagnitudeEnd: end MagnitudeRegular: - createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 0, 50 - createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 0, 50 + createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 0, 50 + createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 0, 50 loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 goto MagnitudeEnd MagnitudeIntense: - createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 0, 50 - createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 0, 50 + createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 0, 50 + createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 0, 50 loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 delay 10 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, RGB_WHITE, 14 @@ -3814,8 +3814,8 @@ Move_ERUPTION: createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 110, -32, 64, 50, 0 createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 60, -32, 80, 70, 1 delay 22 - createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 8, 60 - createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 8, 60 + createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 8, 60 + createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 8, 60 loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 16, 12 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, 31, 4, 4, 0, RGB_RED @@ -3845,7 +3845,7 @@ Move_IMPRISON: waitforvisualfinish delay 4 createsprite gRedXSpriteTemplate, ANIM_ATTACKER, 5, ANIM_ATTACKER, 40 - createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 1, 10 + createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 1, 10 playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER clearmonbg ANIM_DEF_PARTNER call UnsetPsychicBackground @@ -3915,27 +3915,27 @@ Move_LUSTER_PURGE: playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER createsprite gLusterPurgeCircleSpriteTemplate, ANIM_ATTACKER, 41, 0, 0, 0, 0 delay 20 - createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA + createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, ANIM_PLAYER_RIGHT, 2, 0, 16, RGB_WHITEALPHA createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, 2, 0, 16, RGB_WHITEALPHA waitforvisualfinish createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23) waitforvisualfinish - createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 + createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2 createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 - createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 + createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2 createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 - createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 + createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2 createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 - createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 + createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2 createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 - createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 + createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2 createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 - createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 + createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2 createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA @@ -4360,7 +4360,7 @@ Move_AERIAL_ACE: Move_IRON_DEFENSE: loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2 - createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 + createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, RGB_WHITEALPHA, 0 waitforvisualfinish end @@ -4373,7 +4373,7 @@ Move_BLOCK: Move_HOWL: loadspritegfx ANIM_TAG_NOISE_LINE - createvisualtask AnimTask_DeepInhale, 2, 0 + createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER delay 12 call RoarEffect createvisualtask SoundTask_PlayCryHighPitch, 2, ANIM_ATTACKER, 3 @@ -4572,7 +4572,7 @@ Move_SHOCK_WAVE: Move_HARDEN: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 + createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK waitforvisualfinish end @@ -5269,14 +5269,14 @@ Move_DRAGON_RAGE: Move_RAIN_DANCE: loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER - createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 0, 4, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 delay 120 delay 30 waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 4, 0, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 2, 4, 0, RGB_BLACK waitforvisualfinish end @@ -6721,7 +6721,7 @@ Move_SUNNY_DAY: loadspritegfx ANIM_TAG_SUNLIGHT monbg ANIM_ATK_PARTNER setalpha 13, 3 - createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 1, 0, 6, RGB_WHITE + createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 1, 0, 6, RGB_WHITE waitforvisualfinish panse_adjustnone SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 call SunnyDayLightRay @@ -6729,7 +6729,7 @@ Move_SUNNY_DAY: call SunnyDayLightRay call SunnyDayLightRay waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 1, 6, 0, RGB_WHITE + createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 1, 6, 0, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -6945,9 +6945,9 @@ Move_HAZE: playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_HazeScrollingFog, 5 delay 30 - createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x780, 2, 0, 16, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPal, 10, 0 | (0xF << 7), 2, 0, 16, RGB_BLACK delay 90 - createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x780, 1, 16, 0, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPal, 10, 0 | (0xF << 7), 1, 16, 0, RGB_BLACK end Move_FIRE_PUNCH: @@ -7219,7 +7219,7 @@ Move_STEEL_WING: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 + createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK waitforvisualfinish monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -7245,7 +7245,7 @@ Move_STEEL_WING: Move_IRON_TAIL: loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 + createvisualtask AnimTask_MetallicShine, 5, 1, 0, RGB_BLACK waitforvisualfinish monbg ANIM_TARGET setalpha 12, 8 @@ -7255,7 +7255,7 @@ Move_IRON_TAIL: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 + createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE clearmonbg ANIM_TARGET blendoff waitforvisualfinish @@ -7275,7 +7275,7 @@ Move_POISON_TAIL: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 + createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE clearmonbg ANIM_TARGET blendoff call PoisonBubblesEffect @@ -7285,7 +7285,7 @@ Move_POISON_TAIL: Move_METAL_CLAW: loadspritegfx ANIM_TAG_CLAW_SLASH loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 - createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 + createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 @@ -7740,12 +7740,12 @@ Move_HEAL_BELL: unloadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_THIN_RING playsewithpan SE_SHINY, SOUND_PAN_ATTACKER - createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 3, 10, 0, RGB(12, 24, 30) + createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_PLAYER_LEFT, 3, 10, 0, RGB(12, 24, 30) createvisualtask AnimTask_BlendBattleAnimPal, 10, 10, 3, 10, 0, RGB_WHITE createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 end HealBellRing: - createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 3, 8, 0, RGB(12, 24, 30) + createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_PLAYER_LEFT, 3, 8, 0, RGB(12, 24, 30) createvisualtask AnimTask_BlendBattleAnimPal, 10, 10, 3, 2, 10, RGB_WHITE createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1 playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER @@ -7947,16 +7947,16 @@ Move_PERISH_SONG: panse SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK - createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 4, 0 - createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 5, 0 - createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 6, 0 - createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 7, 0 + createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_LEFT, FALSE + createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_RIGHT, FALSE + createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_LEFT, FALSE + createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_RIGHT, FALSE delay 100 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK - createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 4, 1 - createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 5, 1 - createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 6, 1 - createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 7, 1 + createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_LEFT, TRUE + createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_RIGHT, TRUE + createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_LEFT, TRUE + createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_RIGHT, TRUE waitforvisualfinish end @@ -8102,7 +8102,7 @@ Move_ENCORE: loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_TAG_HAND createvisualtask AnimTask_CreateSpotlight, 2 - createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 0, 10, 0 + createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE waitforvisualfinish createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8 createsprite gClappingHandSpriteTemplate, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9 @@ -8113,7 +8113,7 @@ Move_ENCORE: createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET waitforvisualfinish - createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1 + createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE waitforvisualfinish createvisualtask AnimTask_RemoveSpotlight, 2 end @@ -8288,7 +8288,7 @@ Move_MORNING_SUN: loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_MorningSunLightBeam, 5 delay 8 - createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 8, 0, 12, RGB_WHITE + createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 8, 0, 12, RGB_WHITE delay 14 call MorningSunStar call MorningSunStar @@ -8305,7 +8305,7 @@ Move_MORNING_SUN: call MorningSunStar call MorningSunStar call MorningSunStar - createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 3, 12, 0, RGB_WHITE + createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 3, 12, 0, RGB_WHITE waitforvisualfinish waitsound call HealingEffect @@ -8364,7 +8364,7 @@ Move_HYPER_BEAM: delay 30 createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_HYPER_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1 - createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB(31, 0, 0), 16, 0, 0 + createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB_RED, 16, 0, 0 call HyperBeamOrbs call HyperBeamOrbs call HyperBeamOrbs @@ -8408,7 +8408,7 @@ Move_FLATTER: loadspritegfx ANIM_TAG_CONFETTI createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET createvisualtask AnimTask_CreateSpotlight, 2 - createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 0, 10, 0 + createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE waitforvisualfinish createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80 delay 0 @@ -8439,7 +8439,7 @@ Move_FLATTER: delay 5 createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_FLATTER, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1 + createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE waitforvisualfinish createvisualtask AnimTask_RemoveSpotlight, 2 end @@ -9680,10 +9680,10 @@ Move_TWISTER: createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1 delay 4 - createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 + createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 4 - createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 + createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3 @@ -10505,13 +10505,13 @@ General_FocusBand: General_Rain: loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER - createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 0, 4, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 delay 50 waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 4, 0, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 2, 4, 0, RGB_BLACK waitforvisualfinish end diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 2ff9318be0..e478c396a7 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -298,10 +298,15 @@ #define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288) // battlers -#define ANIM_ATTACKER 0 -#define ANIM_TARGET 1 -#define ANIM_ATK_PARTNER 2 -#define ANIM_DEF_PARTNER 3 +#define ANIM_ATTACKER 0 +#define ANIM_TARGET 1 +#define ANIM_ATK_PARTNER 2 +#define ANIM_DEF_PARTNER 3 +#define ANIM_PLAYER_LEFT 4 +#define ANIM_PLAYER_RIGHT 5 +#define ANIM_OPPONENT_LEFT 6 +#define ANIM_OPPONENT_RIGHT 7 +#define ANIM_ATTACKER_FORCE 8 // stereo panning constants [0-255] // diff --git a/ld_script_modern.txt b/ld_script_modern.txt index a988fe0cd5..a5977db7b1 100644 --- a/ld_script_modern.txt +++ b/ld_script_modern.txt @@ -49,6 +49,7 @@ SECTIONS { ALIGN(4) { src/rom_header.o(.text*); + src/rom_header_gf.o(.text*); src/*.o(.text*); gflib/*.o(.text*); asm/*.o(.text*); From 6fed961ed6e62b18452b0add96f914f009ce46c9 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Fri, 19 Aug 2022 15:29:35 +0100 Subject: [PATCH 03/13] Write palette IDs in hex --- gflib/sprite.c | 2 +- include/gba/defines.h | 6 + include/palette.h | 17 ++ src/battle_anim.c | 12 +- src/battle_anim_dark.c | 12 +- src/battle_anim_effects_1.c | 10 +- src/battle_anim_effects_2.c | 8 +- src/battle_anim_effects_3.c | 10 +- src/battle_anim_fire.c | 3 +- src/battle_anim_ghost.c | 4 +- src/battle_anim_ice.c | 4 +- src/battle_anim_mons.c | 14 +- src/battle_anim_rock.c | 2 +- src/battle_anim_status_effects.c | 2 +- src/battle_anim_throw.c | 22 +-- src/battle_anim_utility_funcs.c | 36 ++--- src/battle_anim_water.c | 4 +- src/battle_arena.c | 6 +- src/battle_bg.c | 172 ++++++++++----------- src/battle_controller_link_partner.c | 2 +- src/battle_controller_player.c | 2 +- src/battle_controller_player_partner.c | 4 +- src/battle_controller_recorded_player.c | 2 +- src/battle_controller_wally.c | 2 +- src/battle_dome.c | 60 +++---- src/battle_factory_screen.c | 56 +++---- src/battle_gfx_sfx_util.c | 44 +++--- src/battle_interface.c | 6 +- src/battle_main.c | 2 +- src/battle_pyramid_bag.c | 30 ++-- src/battle_records.c | 8 +- src/battle_script_commands.c | 2 +- src/battle_transition.c | 72 ++++----- src/battle_transition_frontier.c | 2 +- src/berry_blender.c | 28 ++-- src/berry_crush.c | 28 ++-- src/berry_fix_program.c | 8 +- src/berry_powder.c | 17 +- src/berry_tag_screen.c | 12 +- src/cable_car.c | 2 +- src/cable_club.c | 2 +- src/clear_save_data_screen.c | 8 +- src/contest.c | 44 +++--- src/contest_painting.c | 8 +- src/contest_util.c | 30 ++-- src/credits.c | 8 +- src/data/party_menu.h | 86 +++++------ src/data/trade.h | 42 ++--- src/data/union_room.h | 24 +-- src/daycare.c | 2 +- src/decoration.c | 12 +- src/diploma.c | 6 +- src/dodrio_berry_picking.c | 32 ++-- src/easy_chat.c | 30 ++-- src/egg_hatch.c | 10 +- src/event_object_movement.c | 2 +- src/evolution_scene.c | 20 +-- src/field_effect.c | 8 +- src/field_region_map.c | 6 +- src/field_screen_effect.c | 4 +- src/field_specials.c | 20 +-- src/field_weather.c | 20 +-- src/fieldmap.c | 12 +- src/fldeff_flash.c | 16 +- src/frontier_pass.c | 24 +-- src/frontier_util.c | 6 +- src/hall_of_fame.c | 8 +- src/intro.c | 18 +-- src/intro_credits_graphics.c | 42 ++--- src/item_menu.c | 44 +++--- src/link.c | 14 +- src/list_menu.c | 6 +- src/mail.c | 6 +- src/main_menu.c | 76 ++++----- src/map_name_popup.c | 20 +-- src/match_call.c | 8 +- src/menu.c | 35 +++-- src/menu_specialized.c | 10 +- src/move_relearner.c | 4 +- src/mystery_event_menu.c | 10 +- src/mystery_gift_menu.c | 50 +++--- src/mystery_gift_view.c | 24 +-- src/naming_screen.c | 16 +- src/option_menu.c | 46 +++--- src/palette.c | 18 +-- src/party_menu.c | 40 ++--- src/player_pc.c | 18 +-- src/pokeblock.c | 32 ++-- src/pokeblock_feed.c | 8 +- src/pokedex.c | 40 ++--- src/pokedex_cry_screen.c | 4 +- src/pokemon_animation.c | 29 ++-- src/pokemon_icon.c | 6 +- src/pokemon_jump.c | 32 ++-- src/pokemon_storage_system.c | 70 ++++----- src/pokemon_summary_screen.c | 72 ++++----- src/pokenav_conditions_gfx.c | 18 +-- src/pokenav_conditions_search_results.c | 7 +- src/pokenav_main_menu.c | 12 +- src/pokenav_match_call_gfx.c | 26 ++-- src/pokenav_menu_handler_gfx.c | 12 +- src/pokenav_region_map.c | 10 +- src/pokenav_ribbons_list.c | 5 +- src/pokenav_ribbons_summary.c | 13 +- src/rayquaza_scene.c | 12 +- src/region_map.c | 12 +- src/reset_rtc_screen.c | 6 +- src/roulette.c | 12 +- src/save_failed_screen.c | 12 +- src/scrcmd.c | 2 +- src/secret_base.c | 4 +- src/shop.c | 24 +-- src/slot_machine.c | 46 +++--- src/start_menu.c | 10 +- src/starter_choose.c | 12 +- src/text_window.c | 8 +- src/tileset_anims.c | 4 +- src/title_screen.c | 6 +- src/trade.c | 36 ++--- src/trader.c | 2 +- src/trainer_card.c | 62 ++++---- src/trainer_hill.c | 2 +- src/trainer_pokemon_sprites.c | 8 +- src/union_room.c | 10 +- src/union_room_battle.c | 4 +- src/union_room_chat.c | 32 ++-- src/use_pokeblock.c | 22 +-- src/wallclock.c | 16 +- src/wireless_communication_status_screen.c | 12 +- 129 files changed, 1262 insertions(+), 1240 deletions(-) diff --git a/gflib/sprite.c b/gflib/sprite.c index 9fc597cc3b..be2c5e2805 100644 --- a/gflib/sprite.c +++ b/gflib/sprite.c @@ -1615,7 +1615,7 @@ void LoadSpritePalettes(const struct SpritePalette *palettes) void DoLoadSpritePalette(const u16 *src, u16 paletteOffset) { - LoadPalette(src, paletteOffset + 0x100, 32); + LoadPalette(src, OBJ_PLTT_OFFSET + paletteOffset, PLTT_SIZE_4BPP); } u8 AllocSpritePalette(u16 tag) diff --git a/include/gba/defines.h b/include/gba/defines.h index c52d7ef4f9..3ef025fd88 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -67,6 +67,12 @@ #define DISPLAY_WIDTH 240 #define DISPLAY_HEIGHT 160 +#define PLTT_SIZEOF(n) ((n) * sizeof(u16)) +#define PLTT_SIZE_4BPP PLTT_SIZEOF(16) +#define PLTT_SIZE_8BPP PLTT_SIZEOF(256) + +#define PLTT_OFFSET_4BPP(n) ((n) * PLTT_SIZE_4BPP) + #define TILE_SIZE_4BPP 32 #define TILE_SIZE_8BPP 64 diff --git a/include/palette.h b/include/palette.h index 81a1e1caec..b94cf6aa84 100644 --- a/include/palette.h +++ b/include/palette.h @@ -18,6 +18,13 @@ #define PALETTES_OBJECTS 0xFFFF0000 #define PALETTES_ALL (PALETTES_BG | PALETTES_OBJECTS) +#define PLTT_ID(n) ((n) * 16) +#define BG_PLTT_OFFSET 0x000 +#define OBJ_PLTT_OFFSET 0x100 +#define BG_PLTT_ID(n) (BG_PLTT_OFFSET + PLTT_ID(n)) +#define OBJ_PLTT_ID(n) (OBJ_PLTT_OFFSET + PLTT_ID(n)) +#define OBJ_PLTT_ID2(n) (PLTT_ID((n) + 16)) + enum { FAST_FADE_IN_FROM_WHITE, @@ -74,4 +81,14 @@ void TintPalette_GrayScale2(u16 *palette, u16 count); void TintPalette_SepiaTone(u16 *palette, u16 count); void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 bTone); +extern inline void SetBackdropFromColor(u16 color) +{ + FillPalette(color, 0x00, PLTT_SIZEOF(1)); +} + +extern inline void SetBackdropFromPalette(const u16 *palette) +{ + LoadPalette(palette, 0x00, PLTT_SIZEOF(1)); +} + #endif // GUARD_PALETTE_H diff --git a/src/battle_anim.c b/src/battle_anim.c index 375363212b..a5e487af26 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -706,8 +706,8 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible) SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); - LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], animBg.paletteId * 16, 0x20); - CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void *)(BG_PLTT + animBg.paletteId * 32), 0x20); + LoadPalette(&gPlttBufferUnfaded[OBJ_PLTT_ID(battlerId)], BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); + CpuCopy32(&gPlttBufferUnfaded[OBJ_PLTT_ID(battlerId)], (void *)(BG_PLTT + PLTT_OFFSET_4BPP(animBg.paletteId)), PLTT_SIZE_4BPP); if (IsContest()) battlerPosition = 0; @@ -741,8 +741,8 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible) SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X); SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y); - LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], 0x90, 0x20); - CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void *)(BG_PLTT + 0x120), 0x20); + LoadPalette(&gPlttBufferUnfaded[OBJ_PLTT_ID(battlerId)], BG_PLTT_ID(0x9), PLTT_SIZE_4BPP); + CpuCopy32(&gPlttBufferUnfaded[OBJ_PLTT_ID(battlerId)], (void *)(BG_PLTT + PLTT_OFFSET_4BPP(0x9)), PLTT_SIZE_4BPP); DrawBattlerOnBg(2, 0, 0, GetBattlerPosition(battlerId), animBg.paletteId, animBg.bgTiles + 0x1000, animBg.bgTilemap + 0x400, animBg.tilesOffset); } @@ -1208,13 +1208,13 @@ static void LoadMoveBg(u16 bgId) dmaDest = (void *)BG_SCREEN_ADDR(26); DmaCopy32(3, dmaSrc, dmaDest, 0x800); LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)BG_SCREEN_ADDR(4)); - LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, GetBattleBgPaletteNum() * 16, 32); + LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, BG_PLTT_ID(GetBattleBgPaletteNum()), PLTT_SIZE_4BPP); } else { LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)BG_SCREEN_ADDR(26)); LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)BG_CHAR_ADDR(2)); - LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, 32, 32); + LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); } } diff --git a/src/battle_anim_dark.c b/src/battle_anim_dark.c index 1281ccc8b4..4106a7485e 100644 --- a/src/battle_anim_dark.c +++ b/src/battle_anim_dark.c @@ -426,7 +426,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId) GetBattleAnimBg1Data(&animBg); task->data[10] = gBattle_BG1_Y; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1); - FillPalette(RGB_BLACK, animBg.paletteId * 16, 32); + FillPalette(RGB_BLACK, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); scanlineParams.dmaDest = ®_BG1VOFS; var0 = WINOUT_WIN01_BG1; if (!IsContest()) @@ -436,7 +436,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId) { task->data[10] = gBattle_BG2_Y; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG2); - FillPalette(RGB_BLACK, 144, 32); + FillPalette(RGB_BLACK, BG_PLTT_ID(0x9), PLTT_SIZE_4BPP); scanlineParams.dmaDest = ®_BG2VOFS; var0 = WINOUT_WIN01_BG2; if (!IsContest()) @@ -566,12 +566,12 @@ void AnimTask_MoveTargetMementoShadow(u8 taskId) { GetBattleAnimBg1Data(&animBg); task->data[10] = gBattle_BG1_Y; - FillPalette(RGB_BLACK, animBg.paletteId * 16, 32); + FillPalette(RGB_BLACK, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); } else { task->data[10] = gBattle_BG2_Y; - FillPalette(RGB_BLACK, 9 * 16, 32); + FillPalette(RGB_BLACK, BG_PLTT_ID(0x9), PLTT_SIZE_4BPP); } SetAllBattlersSpritePriority(3); @@ -863,7 +863,7 @@ void AnimTask_MetallicShine(u8 taskId) GetBattleAnimBg1Data(&animBg); AnimLoadCompressedBgTilemap(animBg.bgId, gMetalShineTilemap); AnimLoadCompressedBgGfx(animBg.bgId, gMetalShineGfx, animBg.tilesOffset); - LoadCompressedPalette(gMetalShinePalette, animBg.paletteId * 16, 32); + LoadCompressedPalette(gMetalShinePalette, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); gBattle_BG1_X = -gSprites[spriteId].x + 96; gBattle_BG1_Y = -gSprites[spriteId].y + 32; @@ -872,7 +872,7 @@ void AnimTask_MetallicShine(u8 taskId) if (gBattleAnimArgs[1] == 0) SetGrayscaleOrOriginalPalette(paletteNum, FALSE); else - BlendPalette(paletteNum * 16, 16, 11, gBattleAnimArgs[2]); + BlendPalette(BG_PLTT_ID(paletteNum), 16, 11, gBattleAnimArgs[2]); gTasks[taskId].data[0] = newSpriteId; gTasks[taskId].data[1] = gBattleAnimArgs[0]; diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 0387d39291..14d0839ec9 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -3641,8 +3641,8 @@ void AnimTask_CycleMagicalLeafPal(u8 taskId) switch (task->data[0]) { case 0: - task->data[8] = IndexOfSpritePaletteTag(ANIM_TAG_LEAF) * 16 + 256; - task->data[12] = IndexOfSpritePaletteTag(ANIM_TAG_RAZOR_LEAF) * 16 + 256; + task->data[8] = OBJ_PLTT_ID(IndexOfSpritePaletteTag(ANIM_TAG_LEAF)); + task->data[12] = OBJ_PLTT_ID(IndexOfSpritePaletteTag(ANIM_TAG_RAZOR_LEAF)); task->data[0]++; break; case 1: @@ -4349,7 +4349,7 @@ static void AnimLockOnTarget_Step4(struct Sprite *sprite) int pal; sprite->data[2]++; pal = sprite->oam.paletteNum; - LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4); + LoadPalette(&gPlttBufferUnfaded[OBJ_PLTT_ID(pal) + 8], OBJ_PLTT_ID(pal) + 1, PLTT_SIZEOF(2)); PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(63)); } else if (sprite->data[1] == 0) @@ -5173,8 +5173,8 @@ void AnimTask_DoubleTeam(u8 taskId) struct Task *task = &gTasks[taskId]; task->data[0] = GetAnimBattlerSpriteId(ANIM_ATTACKER); task->data[1] = AllocSpritePalette(ANIM_TAG_BENT_SPOON); - r3 = (task->data[1] * 16) + 0x100; - r4 = (gSprites[task->data[0]].oam.paletteNum + 16) << 4; + r3 = OBJ_PLTT_ID(task->data[1]); + r4 = OBJ_PLTT_ID2(gSprites[task->data[0]].oam.paletteNum); for (i = 1; i < 16; i++) gPlttBufferUnfaded[r3 + i] = gPlttBufferUnfaded[r4 + i]; diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 33065c0dd8..e7ab07543a 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -2678,7 +2678,7 @@ static void AnimUproarRing(struct Sprite *sprite) u8 index = IndexOfSpritePaletteTag(ANIM_TAG_THIN_RING); if (index != 0xFF) { - BlendPalette(((index << 20) + 0x1010000) >> 16, 15, gBattleAnimArgs[5], gBattleAnimArgs[4]); + BlendPalette((OBJ_PLTT_ID(index) + 1), 15, gBattleAnimArgs[5], gBattleAnimArgs[4]); } StartSpriteAffineAnim(sprite, 1); @@ -3026,7 +3026,7 @@ void AnimTask_LoadMusicNotesPals(u8 taskId) gMonSpritesGfxPtr->buffer = AllocZeroed(0x2000); LZDecompressWram(gBattleAnimSpritePal_MusicNotes2, gMonSpritesGfxPtr->buffer); for (i = 0; i < NUM_MUSIC_NOTE_PAL_TAGS; i++) - LoadPalette(&gMonSpritesGfxPtr->buffer[i * 32], (u16)((paletteNums[i] << 4) + 0x100), 32); + LoadPalette(&gMonSpritesGfxPtr->buffer[i * 32], (u16)(OBJ_PLTT_ID(paletteNums[i])), PLTT_SIZE_4BPP); FREE_AND_SET_NULL(gMonSpritesGfxPtr->buffer); DestroyAnimVisualTask(taskId); @@ -3261,7 +3261,7 @@ void AnimTask_HeartsBackground(u8 taskId) GetBattleAnimBg1Data(&animBg); AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_Attract, animBg.tilesOffset); AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimBgTilemap_Attract, FALSE); - LoadCompressedPalette(gBattleAnimBgPalette_Attract, animBg.paletteId * 16, 32); + LoadCompressedPalette(gBattleAnimBgPalette_Attract, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); gTasks[taskId].func = AnimTask_HeartsBackground_Step; } @@ -3345,7 +3345,7 @@ void AnimTask_ScaryFace(u8 taskId) AnimLoadCompressedBgTilemapHandleContest(&animBg, &gBattleAnimBgTilemap_ScaryFaceOpponent, FALSE); AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_ScaryFace, animBg.tilesOffset); - LoadCompressedPalette(gBattleAnimBgPalette_ScaryFace, animBg.paletteId * 16, 32); + LoadCompressedPalette(gBattleAnimBgPalette_ScaryFace, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); gTasks[taskId].func = AnimTask_ScaryFace_Step; } diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 6fca60369a..ebfed9b4a3 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -2405,7 +2405,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId) } AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimMaskImage_LightBeam, animBg.tilesOffset); - LoadCompressedPalette(gBattleAnimMaskPalette_LightBeam, animBg.paletteId * 16, 32); + LoadCompressedPalette(gBattleAnimMaskPalette_LightBeam, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); gTasks[taskId].data[10] = gBattle_BG1_X; gTasks[taskId].data[11] = gBattle_BG1_Y; @@ -2601,7 +2601,7 @@ void AnimTask_DoomDesireLightBeam(u8 taskId) } AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimMaskImage_LightBeam, animBg.tilesOffset); - LoadCompressedPalette(gBattleAnimMaskPalette_LightBeam, animBg.paletteId * 16, 32); + LoadCompressedPalette(gBattleAnimMaskPalette_LightBeam, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); gTasks[taskId].data[10] = gBattle_BG1_X; gTasks[taskId].data[11] = gBattle_BG1_Y; gTasks[taskId].data[0]++; @@ -3252,7 +3252,7 @@ void AnimTask_RolePlaySilhouette(u8 taskId) gSprites[spriteId].oam.priority = priority; gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND; - FillPalette(RGB_WHITE, (gSprites[spriteId].oam.paletteNum << 4) + 0x100, 32); + FillPalette(RGB_WHITE, OBJ_PLTT_ID(gSprites[spriteId].oam.paletteNum), PLTT_SIZE_4BPP); gSprites[spriteId].oam.priority = priority; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[1], 16 - gTasks[taskId].data[1])); @@ -3880,7 +3880,7 @@ void AnimTask_FacadeColorBlend(u8 taskId) gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = gBattleAnimArgs[1]; spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); - gTasks[taskId].data[2] = 0x100 + gSprites[spriteId].oam.paletteNum * 16; + gTasks[taskId].data[2] = OBJ_PLTT_ID(gSprites[spriteId].oam.paletteNum); gTasks[taskId].func = AnimTask_FacadeColorBlend_Step; } @@ -5145,7 +5145,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) spriteId2 = CreateAdditionalMonSpriteForMoveAnim(species, isBackPic, 0, x, GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y), subpriority, personality, otId, gBattleAnimAttacker, FALSE); if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies != SPECIES_NONE) - BlendPalette((gSprites[spriteId2].oam.paletteNum * 16) | 0x100, 16, 6, RGB_WHITE); + BlendPalette(OBJ_PLTT_ID(gSprites[spriteId2].oam.paletteNum), 16, 6, RGB_WHITE); gTasks[taskId].data[15] = spriteId2; gTasks[taskId].data[0]++; diff --git a/src/battle_anim_fire.c b/src/battle_anim_fire.c index cbfe21c609..2cf3a0ce4d 100644 --- a/src/battle_anim_fire.c +++ b/src/battle_anim_fire.c @@ -2,6 +2,7 @@ #include "battle_anim.h" #include "constants/rgb.h" #include "constants/songs.h" +#include "palette.h" #include "sound.h" #include "util.h" #include "task.h" @@ -1329,7 +1330,7 @@ void AnimTask_BlendBackground(u8 taskId) { struct BattleAnimBgData animBg; GetBattleAnimBg1Data(&animBg); - BlendPalette(animBg.paletteId * 16, 16, gBattleAnimArgs[0], gBattleAnimArgs[1]); + BlendPalette(BG_PLTT_ID(animBg.paletteId), 16, gBattleAnimArgs[0], gBattleAnimArgs[1]); DestroyAnimVisualTask(taskId); } diff --git a/src/battle_anim_ghost.c b/src/battle_anim_ghost.c index 819b60969b..3604daf399 100644 --- a/src/battle_anim_ghost.c +++ b/src/battle_anim_ghost.c @@ -642,8 +642,8 @@ static void AnimTask_SpiteTargetShadow_Step1(u8 taskId) } break; case 1: - task->data[14] = (task->data[14] + 16) * 16; - CpuCopy32(&gPlttBufferUnfaded[task->data[4]], &gPlttBufferFaded[task->data[14]], 32); + task->data[14] = OBJ_PLTT_ID2(task->data[14]); + CpuCopy32(&gPlttBufferUnfaded[task->data[4]], &gPlttBufferFaded[task->data[14]], PLTT_SIZE_4BPP); BlendPalette(task->data[4], 16, 10, RGB(13, 0, 15)); task->data[15]++; break; diff --git a/src/battle_anim_ice.c b/src/battle_anim_ice.c index 6a0ff1154a..6a381a3755 100644 --- a/src/battle_anim_ice.c +++ b/src/battle_anim_ice.c @@ -1001,7 +1001,7 @@ void AnimTask_HazeScrollingFog(u8 taskId) GetBattleAnimBg1Data(&animBg); LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset); AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimFogTilemap, FALSE); - LoadPalette(&gFogPalette, animBg.paletteId * 16, 32); + LoadPalette(&gFogPalette, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); gTasks[taskId].func = AnimTask_HazeScrollingFog_Step; } @@ -1106,7 +1106,7 @@ void AnimTask_LoadMistTiles(u8 taskId) GetBattleAnimBg1Data(&animBg); LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset); AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimFogTilemap, FALSE); - LoadPalette(&gFogPalette, animBg.paletteId * 16, 32); + LoadPalette(&gFogPalette, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); gTasks[taskId].data[15] = -1; gTasks[taskId].func = AnimTask_LoadMistTiles_Step; diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index 05b0daf3f4..42c949ffc0 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -1726,7 +1726,7 @@ void AnimTask_BlendMonInAndOut(u8 task) DestroyAnimVisualTask(task); return; } - gTasks[task].data[0] = (gSprites[spriteId].oam.paletteNum * 0x10) + 0x101; + gTasks[task].data[0] = OBJ_PLTT_ID(gSprites[spriteId].oam.paletteNum) + 1; AnimTask_BlendPalInAndOutSetup(&gTasks[task]); } @@ -2104,7 +2104,7 @@ u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 id, s16 gMonSpritesGfxPtr->buffer = AllocZeroed(0x2000); if (!isBackpic) { - LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20); + LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), OBJ_PLTT_ID(palette), PLTT_SIZE_4BPP); if (ignoreDeoxysForm == TRUE || ShouldIgnoreDeoxysForm(5, battlerId) == TRUE || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0) LoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species], gMonSpritesGfxPtr->buffer, @@ -2120,7 +2120,7 @@ u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 id, s16 } else { - LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20); + LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), OBJ_PLTT_ID(palette), PLTT_SIZE_4BPP); if (ignoreDeoxysForm == TRUE || ShouldIgnoreDeoxysForm(5, battlerId) == TRUE || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0) LoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species], gMonSpritesGfxPtr->buffer, @@ -2427,9 +2427,9 @@ void AnimTask_AttackerPunchWithTrace(u8 taskId) task->tPaletteNum = AllocSpritePalette(ANIM_TAG_BENT_SPOON); task->tNumTracesActive = 0; - dest = (task->tPaletteNum + 16) * 16; - src = (gSprites[task->tBattlerSpriteId].oam.paletteNum + 0x10) * 0x10; - + dest = OBJ_PLTT_ID2(task->tPaletteNum); + src = OBJ_PLTT_ID2(gSprites[task->tBattlerSpriteId].oam.paletteNum); + // Set trace's priority based on battler's subpriority task->tPriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker); if (task->tPriority == 20 || task->tPriority == 40) @@ -2437,7 +2437,7 @@ void AnimTask_AttackerPunchWithTrace(u8 taskId) else task->tPriority = 3; - CpuCopy32(&gPlttBufferUnfaded[src], &gPlttBufferFaded[dest], 0x20); + CpuCopy32(&gPlttBufferUnfaded[src], &gPlttBufferFaded[dest], PLTT_SIZE_4BPP); BlendPalette(dest, 16, gBattleAnimArgs[1], gBattleAnimArgs[0]); task->func = AnimTask_AttackerPunchWithTrace_Step; } diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c index e2ea43fb67..ed887c8757 100644 --- a/src/battle_anim_rock.c +++ b/src/battle_anim_rock.c @@ -410,7 +410,7 @@ void AnimTask_LoadSandstormBackground(u8 taskId) GetBattleAnimBg1Data(&animBg); AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_Sandstorm, animBg.tilesOffset); AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimBgTilemap_Sandstorm, FALSE); - LoadCompressedPalette(gBattleAnimSpritePal_FlyingDirt, animBg.paletteId * 16, 32); + LoadCompressedPalette(gBattleAnimSpritePal_FlyingDirt, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); if (gBattleAnimArgs[0] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) var0 = 1; diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c index f56d04ccd1..4e6b3a3402 100644 --- a/src/battle_anim_status_effects.c +++ b/src/battle_anim_status_effects.c @@ -316,7 +316,7 @@ static void Task_UpdateFlashingCircleImpacts(u8 taskId) if (gTasks[taskId].data[2] == 2) { gTasks[taskId].data[2] = 0; - BlendPalette(0x100 + gTasks[taskId].data[0] * 16, 16, gTasks[taskId].data[4], gTasks[taskId].data[1]); + BlendPalette(OBJ_PLTT_ID(gTasks[taskId].data[0]), 16, gTasks[taskId].data[4], gTasks[taskId].data[1]); if (gTasks[taskId].data[5] == 0) { gTasks[taskId].data[4]++; diff --git a/src/battle_anim_throw.c b/src/battle_anim_throw.c index b029951426..aaec63e59b 100755 --- a/src/battle_anim_throw.c +++ b/src/battle_anim_throw.c @@ -471,7 +471,7 @@ void AnimTask_UnusedLevelUpHealthBox(u8 taskId) GetBattleAnimBg1Data(&animBgData); AnimLoadCompressedBgTilemap(animBgData.bgId, UnusedLevelupAnimationTilemap); AnimLoadCompressedBgGfx(animBgData.bgId, UnusedLevelupAnimationGfx, animBgData.tilesOffset); - LoadCompressedPalette(gCureBubblesPal, animBgData.paletteId << 4, 32); + LoadCompressedPalette(gCureBubblesPal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP); gBattle_BG1_X = -gSprites[spriteId3].x + 32; gBattle_BG1_Y = -gSprites[spriteId3].y - 32; @@ -553,10 +553,10 @@ static void LoadHealthboxPalsForLevelUp(u8 *paletteId1, u8 *paletteId2, u8 battl *paletteId1 = AllocSpritePalette(0xD709); *paletteId2 = AllocSpritePalette(0xD70A); - offset1 = (gSprites[healthBoxSpriteId].oam.paletteNum * 16) + 0x100; - offset2 = (gSprites[spriteId2].oam.paletteNum * 16) + 0x100; - LoadPalette(&gPlttBufferUnfaded[offset1], *paletteId1 * 16 + 0x100, 0x20); - LoadPalette(&gPlttBufferUnfaded[offset2], *paletteId2 * 16 + 0x100, 0x20); + offset1 = OBJ_PLTT_ID(gSprites[healthBoxSpriteId].oam.paletteNum); + offset2 = OBJ_PLTT_ID(gSprites[spriteId2].oam.paletteNum); + LoadPalette(&gPlttBufferUnfaded[offset1], OBJ_PLTT_ID(*paletteId1), PLTT_SIZE_4BPP); + LoadPalette(&gPlttBufferUnfaded[offset2], OBJ_PLTT_ID(*paletteId2), PLTT_SIZE_4BPP); gSprites[healthBoxSpriteId].oam.paletteNum = *paletteId1; gSprites[spriteId1].oam.paletteNum = *paletteId1; @@ -620,7 +620,7 @@ static void AnimTask_FlashHealthboxOnLevelUp_Step(u8 taskId) if (gTasks[taskId].data[2] > 16) gTasks[taskId].data[2] = 16; - paletteOffset = paletteNum * 16 + 0x100; + paletteOffset = OBJ_PLTT_ID(paletteNum); BlendPalette(paletteOffset + colorOffset, 1, gTasks[taskId].data[2], RGB(20, 27, 31)); if (gTasks[taskId].data[2] == 16) gTasks[taskId].data[1]++; @@ -630,7 +630,7 @@ static void AnimTask_FlashHealthboxOnLevelUp_Step(u8 taskId) if (gTasks[taskId].data[2] < 0) gTasks[taskId].data[2] = 0; - paletteOffset = paletteNum * 16 + 0x100; + paletteOffset = OBJ_PLTT_ID(paletteNum); BlendPalette(paletteOffset + colorOffset, 1, gTasks[taskId].data[2], RGB(20, 27, 31)); if (gTasks[taskId].data[2] == 0) DestroyAnimVisualTask(taskId); @@ -2030,12 +2030,12 @@ u8 LaunchBallFadeMonTask(bool8 unfadeLater, u8 spritePalNum, u32 selectedPalette if (!unfadeLater) { - BlendPalette(spritePalNum * 16 + 0x100, 16, 0, gBallOpenFadeColors[ballId]); + BlendPalette(OBJ_PLTT_ID(spritePalNum), 16, 0, gBallOpenFadeColors[ballId]); gTasks[taskId].tdCoeff = 1; } else { - BlendPalette(spritePalNum * 16 + 0x100, 16, 16, gBallOpenFadeColors[ballId]); + BlendPalette(OBJ_PLTT_ID(spritePalNum), 16, 16, gBallOpenFadeColors[ballId]); gTasks[taskId].tCoeff = 16; gTasks[taskId].tdCoeff = -1; gTasks[taskId].func = Task_FadeMon_ToNormal; @@ -2051,7 +2051,7 @@ static void Task_FadeMon_ToBallColor(u8 taskId) if (gTasks[taskId].tTimer <= 16) { - BlendPalette(gTasks[taskId].tPalOffset * 16 + 0x100, 16, gTasks[taskId].tCoeff, gBallOpenFadeColors[ballId]); + BlendPalette(OBJ_PLTT_ID(gTasks[taskId].tPalOffset), 16, gTasks[taskId].tCoeff, gBallOpenFadeColors[ballId]); gTasks[taskId].tCoeff += gTasks[taskId].tdCoeff; gTasks[taskId].tTimer++; } @@ -2079,7 +2079,7 @@ static void Task_FadeMon_ToNormal_Step(u8 taskId) if (gTasks[taskId].tTimer <= 16) { - BlendPalette(gTasks[taskId].tPalOffset * 16 + 0x100, 16, gTasks[taskId].tCoeff, gBallOpenFadeColors[ballId]); + BlendPalette(OBJ_PLTT_ID(gTasks[taskId].tPalOffset), 16, gTasks[taskId].tCoeff, gBallOpenFadeColors[ballId]); gTasks[taskId].tCoeff += gTasks[taskId].tdCoeff; gTasks[taskId].tTimer++; } diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 688a6e5aea..197443aa85 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -166,7 +166,7 @@ void StartBlendAnimSpriteColor(u8 taskId, u32 selectedPalettes) static void AnimTask_BlendSpriteColor_Step2(u8 taskId) { u32 selectedPalettes; - u16 singlePaletteMask = 0; + u16 singlePaletteOffset = 0x00; if (gTasks[taskId].data[9] == gTasks[taskId].data[2]) { @@ -175,8 +175,8 @@ static void AnimTask_BlendSpriteColor_Step2(u8 taskId) while (selectedPalettes != 0) { if (selectedPalettes & 1) - BlendPalette(singlePaletteMask, 16, gTasks[taskId].data[10], gTasks[taskId].data[5]); - singlePaletteMask += 0x10; + BlendPalette(singlePaletteOffset, 16, gTasks[taskId].data[10], gTasks[taskId].data[5]); + singlePaletteOffset += 0x10; selectedPalettes >>= 1; } @@ -333,7 +333,7 @@ void AnimTask_DrawFallingWhiteLinesOnAttacker(u8 taskId) GetBattleAnimBg1Data(&animBgData); AnimLoadCompressedBgTilemapHandleContest(&animBgData, gBattleAnimMaskTilemap_Curse, FALSE); AnimLoadCompressedBgGfx(animBgData.bgId, gBattleAnimMaskImage_Curse, animBgData.tilesOffset); - LoadPalette(sCurseLinesPalette, animBgData.paletteId * 16 + 1, 2); + LoadPalette(sCurseLinesPalette, BG_PLTT_ID(animBgData.paletteId) + 1, PLTT_SIZEOF(1)); gBattle_BG1_X = -gSprites[spriteId].x + 32; gBattle_BG1_Y = -gSprites[spriteId].y + 32; @@ -478,28 +478,28 @@ static void StatsChangeAnimation_Step2(u8 taskId) switch (sAnimStatsChangeData->data[1]) { case 0: - LoadCompressedPalette(gBattleStatMask2_Pal, animBgData.paletteId * 16, 32); + LoadCompressedPalette(gBattleStatMask2_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP); break; case 1: - LoadCompressedPalette(gBattleStatMask1_Pal, animBgData.paletteId * 16, 32); + LoadCompressedPalette(gBattleStatMask1_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP); break; case 2: - LoadCompressedPalette(gBattleStatMask3_Pal, animBgData.paletteId * 16, 32); + LoadCompressedPalette(gBattleStatMask3_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP); break; case 3: - LoadCompressedPalette(gBattleStatMask4_Pal, animBgData.paletteId * 16, 32); + LoadCompressedPalette(gBattleStatMask4_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP); break; case 4: - LoadCompressedPalette(gBattleStatMask6_Pal, animBgData.paletteId * 16, 32); + LoadCompressedPalette(gBattleStatMask6_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP); break; case 5: - LoadCompressedPalette(gBattleStatMask7_Pal, animBgData.paletteId * 16, 32); + LoadCompressedPalette(gBattleStatMask7_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP); break; case 6: - LoadCompressedPalette(gBattleStatMask8_Pal, animBgData.paletteId * 16, 32); + LoadCompressedPalette(gBattleStatMask8_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP); break; default: - LoadCompressedPalette(gBattleStatMask5_Pal, animBgData.paletteId * 16, 32); + LoadCompressedPalette(gBattleStatMask5_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP); break; } @@ -639,16 +639,10 @@ static void AnimTask_Flash_Step(u8 taskId) for (i = 0; i < 16; i++) { if ((task->data[15] >> i) & 1) - { - u16 paletteOffset = i * 16; - BlendPalette(paletteOffset, 16, task->data[2], 0xFFFF); - } + BlendPalette(BG_PLTT_ID(i), 16, task->data[2], 0xFFFF); if ((task->data[14] >> i) & 1) - { - u16 paletteOffset = i * 16 + 0x100; - BlendPalette(paletteOffset, 16, task->data[2], 0); - } + BlendPalette(OBJ_PLTT_ID(i), 16, task->data[2], 0); } if (task->data[2] == 0) @@ -822,7 +816,7 @@ void StartMonScrollingBgMask(u8 taskId, int unused, u16 scrollSpeed, u8 battler, GetBattleAnimBg1Data(&animBgData); AnimLoadCompressedBgTilemapHandleContest(&animBgData, tilemap, FALSE); AnimLoadCompressedBgGfx(animBgData.bgId, gfx, animBgData.tilesOffset); - LoadCompressedPalette(palette, animBgData.paletteId * 16, 32); + LoadCompressedPalette(palette, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP); gBattle_BG1_X = 0; gBattle_BG1_Y = 0; diff --git a/src/battle_anim_water.c b/src/battle_anim_water.c index b7c2df3d11..117dd3b88c 100644 --- a/src/battle_anim_water.c +++ b/src/battle_anim_water.c @@ -825,9 +825,9 @@ void AnimTask_CreateSurfWave(u8 taskId) } AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_Surf, animBg.tilesOffset); if (gBattleAnimArgs[0] == 0) - LoadCompressedPalette(gBattleAnimBgPalette_Surf, animBg.paletteId * 16, 32); + LoadCompressedPalette(gBattleAnimBgPalette_Surf, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); else - LoadCompressedPalette(gBattleAnimBackgroundImageMuddyWater_Pal, animBg.paletteId * 16, 32); + LoadCompressedPalette(gBattleAnimBackgroundImageMuddyWater_Pal, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); taskId2 = CreateTask(AnimTask_SurfWaveScanlineEffect, gTasks[taskId].priority + 1); gTasks[taskId].data[15] = taskId2; gTasks[taskId2].data[0] = 0; diff --git a/src/battle_arena.c b/src/battle_arena.c index 92b7c66a3a..8139325191 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -514,7 +514,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) BeginNormalPaletteFade(0x7FFFFF1C, 4, 0, 8, RGB_BLACK); SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); LoadCompressedSpriteSheet(sBattleArenaJudgementSymbolsSpriteSheet); - LoadCompressedPalette(gBattleArenaJudgementSymbolsPalette, 0x1F0, 0x20); + LoadCompressedPalette(gBattleArenaJudgementSymbolsPalette, OBJ_PLTT_ID(0xF), PLTT_SIZE_4BPP); gBattle_WIN0H = 0xFF; gBattle_WIN0V = 0x70; (*state)++; @@ -894,7 +894,7 @@ static void BufferArenaOpponentName(void) void DrawArenaRefereeTextBox(void) { u8 width = 27; - u8 palNum = 7; + u8 palNum = 0x7; FillBgTilemapBufferRect(0, 0, 254, 14, 1, 6, palNum); FillBgTilemapBufferRect(0, 0, 32, 14, 1, 6, palNum); @@ -918,7 +918,7 @@ void EraseArenaRefereeTextBox(void) { u8 width; u8 height; - u8 palNum = 0; + u8 palNum = 0x0; FillBgTilemapBufferRect(0, 3, 0, 14, 1, 1, palNum); height = 4; diff --git a/src/battle_bg.c b/src/battle_bg.c index ace4ea24fa..163b77a517 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -167,7 +167,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 0x0090, }, [B_WIN_ACTION_PROMPT] = { @@ -176,7 +176,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 35, .width = 14, .height = 4, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 0x01c0, }, [B_WIN_ACTION_MENU] = { @@ -185,7 +185,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 35, .width = 12, .height = 4, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0190, }, [B_WIN_MOVE_NAME_1] = { @@ -194,7 +194,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 55, .width = 8, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0300, }, [B_WIN_MOVE_NAME_2] = { @@ -203,7 +203,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 55, .width = 8, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0310, }, [B_WIN_MOVE_NAME_3] = { @@ -212,7 +212,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 57, .width = 8, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0320, }, [B_WIN_MOVE_NAME_4] = { @@ -221,7 +221,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 57, .width = 8, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0330, }, [B_WIN_PP] = { @@ -230,7 +230,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 55, .width = 4, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0290, }, [B_WIN_DUMMY] = { @@ -239,7 +239,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 57, .width = 0, .height = 0, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0298, }, [B_WIN_PP_REMAINING] = { @@ -248,7 +248,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 55, .width = 4, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0298, }, [B_WIN_MOVE_TYPE] = { @@ -257,7 +257,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 57, .width = 8, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x02a0, }, [B_WIN_SWITCH_PROMPT] = { @@ -266,7 +266,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 55, .width = 8, .height = 4, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x02b0, }, [B_WIN_YESNO] = { @@ -275,7 +275,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 9, .width = 3, .height = 4, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0100, }, [B_WIN_LEVEL_UP_BOX] = { @@ -284,7 +284,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 8, .width = 10, .height = 11, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0100, }, [B_WIN_LEVEL_UP_BANNER] = { @@ -293,7 +293,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 0, .width = 12, .height = 3, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 0x016e, }, [B_WIN_VS_PLAYER] = { @@ -302,7 +302,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 3, .width = 6, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0020, }, [B_WIN_VS_OPPONENT] = { @@ -311,7 +311,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 3, .width = 6, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0040, }, [B_WIN_VS_MULTI_PLAYER_1] = { @@ -320,7 +320,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 2, .width = 6, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0020, }, [B_WIN_VS_MULTI_PLAYER_2] = { @@ -329,7 +329,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 2, .width = 6, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0040, }, [B_WIN_VS_MULTI_PLAYER_3] = { @@ -338,7 +338,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 6, .width = 6, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0060, }, [B_WIN_VS_MULTI_PLAYER_4] = { @@ -347,7 +347,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 6, .width = 6, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0080, }, [B_WIN_VS_OUTCOME_DRAW] = { @@ -356,7 +356,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 2, .width = 6, .height = 2, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 0x00a0, }, [B_WIN_VS_OUTCOME_LEFT] = { @@ -365,7 +365,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 2, .width = 7, .height = 2, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 0x00a0, }, [B_WIN_VS_OUTCOME_RIGHT] = { @@ -374,7 +374,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 2, .width = 7, .height = 2, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 0x00b0, }, DUMMY_WIN_TEMPLATE @@ -388,7 +388,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 0x0090, }, [B_WIN_ACTION_PROMPT] = { @@ -397,7 +397,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 35, .width = 14, .height = 4, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 0x01c0, }, [B_WIN_ACTION_MENU] = { @@ -406,7 +406,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 35, .width = 12, .height = 4, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0190, }, [B_WIN_MOVE_NAME_1] = { @@ -415,7 +415,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 55, .width = 8, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0300, }, [B_WIN_MOVE_NAME_2] = { @@ -424,7 +424,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 55, .width = 8, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0310, }, [B_WIN_MOVE_NAME_3] = { @@ -433,7 +433,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 57, .width = 8, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0320, }, [B_WIN_MOVE_NAME_4] = { @@ -442,7 +442,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 57, .width = 8, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0330, }, [B_WIN_PP] = { @@ -451,7 +451,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 55, .width = 4, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0290, }, [B_WIN_DUMMY] = { @@ -460,7 +460,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 57, .width = 0, .height = 0, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0298, }, [B_WIN_PP_REMAINING] = { @@ -469,7 +469,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 55, .width = 4, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0298, }, [B_WIN_MOVE_TYPE] = { @@ -478,7 +478,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 57, .width = 8, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x02a0, }, [B_WIN_SWITCH_PROMPT] = { @@ -487,7 +487,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 55, .width = 8, .height = 4, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x02b0, }, [B_WIN_YESNO] = { @@ -496,7 +496,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 9, .width = 3, .height = 4, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0100, }, [B_WIN_LEVEL_UP_BOX] = { @@ -505,7 +505,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 8, .width = 10, .height = 11, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0100, }, [B_WIN_LEVEL_UP_BANNER] = { @@ -514,7 +514,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 0, .width = 12, .height = 3, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 0x016e, }, [ARENA_WIN_PLAYER_NAME] = { @@ -523,7 +523,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 1, .width = 8, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0100, }, [ARENA_WIN_VS] = { @@ -532,7 +532,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 1, .width = 2, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0110, }, [ARENA_WIN_OPPONENT_NAME] = { @@ -541,7 +541,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 1, .width = 8, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0114, }, [ARENA_WIN_MIND] = { @@ -550,7 +550,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 4, .width = 6, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0124, }, [ARENA_WIN_SKILL] = { @@ -559,7 +559,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 6, .width = 6, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0130, }, [ARENA_WIN_BODY] = { @@ -568,7 +568,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 8, .width = 6, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x013c, }, [ARENA_WIN_JUDGEMENT_TITLE] = { @@ -577,7 +577,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 11, .width = 14, .height = 2, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0x0148, }, [ARENA_WIN_JUDGEMENT_TEXT] = { @@ -586,7 +586,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 7, + .paletteNum = 0x7, .baseBlock = 0x0090, }, DUMMY_WIN_TEMPLATE @@ -742,17 +742,17 @@ void InitBattleBgsVideo(void) void LoadBattleMenuWindowGfx(void) { - LoadUserWindowBorderGfx(2, 0x12, 0x10); - LoadUserWindowBorderGfx(2, 0x22, 0x10); - LoadCompressedPalette(gBattleWindowTextPalette, 0x50, 0x20); + LoadUserWindowBorderGfx(2, 0x12, BG_PLTT_ID(0x1)); + LoadUserWindowBorderGfx(2, 0x22, BG_PLTT_ID(0x1)); + LoadCompressedPalette(gBattleWindowTextPalette, BG_PLTT_ID(0x5), PLTT_SIZE_4BPP); if (gBattleTypeFlags & BATTLE_TYPE_ARENA) { // Load graphics for the Battle Arena referee's mid-battle messages. - Menu_LoadStdPalAt(0x70); - LoadMessageBoxGfx(0, 0x30, 0x70); - gPlttBufferUnfaded[0x76] = 0; - CpuCopy16(&gPlttBufferUnfaded[0x76], &gPlttBufferFaded[0x76], 2); + Menu_LoadStdPalAt(BG_PLTT_ID(0x7)); + LoadMessageBoxGfx(0, 0x30, BG_PLTT_ID(0x7)); + gPlttBufferUnfaded[BG_PLTT_ID(0x7) + 6] = 0; + CpuCopy16(&gPlttBufferUnfaded[BG_PLTT_ID(0x7) + 6], &gPlttBufferFaded[BG_PLTT_ID(0x7) + 6], PLTT_SIZEOF(1)); } } @@ -762,25 +762,25 @@ void DrawMainBattleBackground(void) { LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); } else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON) { LZDecompressVram(gBattleTerrainTiles_Cave, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Cave, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_Groudon, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); } else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE) { LZDecompressVram(gBattleTerrainTiles_Water, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Water, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_Kyogre, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); } else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA) { LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); } else { @@ -791,14 +791,14 @@ void DrawMainBattleBackground(void) { LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); return; } else if (trainerClass == TRAINER_CLASS_CHAMPION) { LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); return; } } @@ -809,47 +809,47 @@ void DrawMainBattleBackground(void) case MAP_BATTLE_SCENE_NORMAL: LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tileset, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tilemap, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60); + LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_GYM: LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_MAGMA: LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_AQUA: LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_SIDNEY: LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_PHOEBE: LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_GLACIA: LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_DRAKE: LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_FRONTIER: LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; } } @@ -860,7 +860,7 @@ void LoadBattleTextboxAndBackground(void) LZDecompressVram(gBattleTextboxTiles, (void *)(BG_CHAR_ADDR(0))); CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); CopyBgTilemapBufferToVram(0); - LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40); + LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); LoadBattleMenuWindowGfx(); DrawMainBattleBackground(); } @@ -1126,7 +1126,7 @@ void DrawBattleEntryBackground(void) { LZDecompressVram(gBattleVSFrame_Gfx, (void *)(BG_CHAR_ADDR(1))); LZDecompressVram(gVsLettersGfx, (void *)OBJ_VRAM0); - LoadCompressedPalette(gBattleVSFrame_Pal, 0x60, 0x20); + LoadCompressedPalette(gBattleVSFrame_Pal, BG_PLTT_ID(0x6), PLTT_SIZE_4BPP); SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1); SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04); CopyToBgTilemapBuffer(1, gBattleVSFrame_Tilemap, 0, 0); @@ -1219,7 +1219,7 @@ bool8 LoadChosenBattleElement(u8 caseId) CopyBgTilemapBufferToVram(0); break; case 2: - LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40); + LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); break; case 3: if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER)) @@ -1345,14 +1345,14 @@ bool8 LoadChosenBattleElement(u8 caseId) case 5: if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER)) { - LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); } else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) { if (gGameVersion == VERSION_RUBY) - LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_Groudon, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); else - LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_Kyogre, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); } else { @@ -1361,12 +1361,12 @@ bool8 LoadChosenBattleElement(u8 caseId) u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; if (trainerClass == TRAINER_CLASS_LEADER) { - LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; } else if (trainerClass == TRAINER_CLASS_CHAMPION) { - LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; } } @@ -1375,31 +1375,31 @@ bool8 LoadChosenBattleElement(u8 caseId) { default: case MAP_BATTLE_SCENE_NORMAL: - LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60); + LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_GYM: - LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_MAGMA: - LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_AQUA: - LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_SIDNEY: - LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_PHOEBE: - LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_GLACIA: - LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_DRAKE: - LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_FRONTIER: - LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); break; } } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index c072ae12ff..8c5b0bff17 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1558,7 +1558,7 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void) trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender; } - LoadCompressedPalette(gTrainerBackPicPaletteTable[trainerPicId].data, 0x100 + paletteNum * 16, 32); + LoadCompressedPalette(gTrainerBackPicPaletteTable[trainerPicId].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum; diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 272e0120c6..22a710d4cd 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -2960,7 +2960,7 @@ static void PlayerHandleIntroTrainerBallThrow(void) StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1); paletteNum = AllocSpritePalette(0xD6F8); - LoadCompressedPalette(gTrainerBackPicPaletteTable[gSaveBlock2Ptr->playerGender].data, 0x100 + paletteNum * 16, 32); + LoadCompressedPalette(gTrainerBackPicPaletteTable[gSaveBlock2Ptr->playerGender].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum; taskId = CreateTask(Task_StartSendOutAnim, 5); diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 3812a8ffee..7a389f5dd2 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -1794,12 +1794,12 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void) if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { u8 spriteId = TRAINER_BACK_PIC_STEVEN; - LoadCompressedPalette(gTrainerBackPicPaletteTable[spriteId].data, 0x100 + paletteNum * 16, 32); + LoadCompressedPalette(gTrainerBackPicPaletteTable[spriteId].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP); } else { u8 spriteId = GetFrontierTrainerFrontSpriteId(gPartnerTrainerId); - LoadCompressedPalette(gTrainerFrontPicPaletteTable[spriteId].data, 0x100 + paletteNum * 16, 32); + LoadCompressedPalette(gTrainerFrontPicPaletteTable[spriteId].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 6200b5ef63..35979cb931 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -1678,7 +1678,7 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void) else trainerPicId = gSaveBlock2Ptr->playerGender; - LoadCompressedPalette(gTrainerBackPicPaletteTable[trainerPicId].data, 0x100 + paletteNum * 16, 32); + LoadCompressedPalette(gTrainerBackPicPaletteTable[trainerPicId].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum; diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 8e02831776..bb2adba5fa 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -1445,7 +1445,7 @@ static void WallyHandleIntroTrainerBallThrow(void) StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1); paletteNum = AllocSpritePalette(0xD6F8); - LoadCompressedPalette(gTrainerBackPicPaletteTable[TRAINER_BACK_PIC_WALLY].data, 0x100 + paletteNum * 16, 32); + LoadCompressedPalette(gTrainerBackPicPaletteTable[TRAINER_BACK_PIC_WALLY].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum; taskId = CreateTask(Task_StartSendOutAnim, 5); diff --git a/src/battle_dome.c b/src/battle_dome.c index 9018050311..4293e5e19b 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -676,7 +676,7 @@ static const struct WindowTemplate sTourneyTreeWindowTemplates[] = .tilemapTop = 3, .width = 8, .height = 16, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 16, }, { @@ -685,7 +685,7 @@ static const struct WindowTemplate sTourneyTreeWindowTemplates[] = .tilemapTop = 3, .width = 8, .height = 16, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 144, }, { @@ -694,7 +694,7 @@ static const struct WindowTemplate sTourneyTreeWindowTemplates[] = .tilemapTop = 1, .width = 14, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 272, }, DUMMY_WIN_TEMPLATE, @@ -708,7 +708,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 2, .width = 26, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1, }, { @@ -717,7 +717,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 53, }, { @@ -726,7 +726,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 7, .width = 9, .height = 3, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 69, }, { @@ -735,7 +735,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 10, .width = 8, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 96, }, { @@ -744,7 +744,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 12, .width = 26, .height = 7, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 112, }, { @@ -753,7 +753,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 2, .width = 23, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 294, }, { @@ -762,7 +762,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 340, }, { @@ -771,7 +771,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 356, }, { @@ -780,7 +780,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 16, .width = 26, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 372, }, { @@ -789,7 +789,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 2, .width = 26, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1, }, { @@ -798,7 +798,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 53, }, { @@ -807,7 +807,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 7, .width = 9, .height = 3, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 69, }, { @@ -816,7 +816,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 10, .width = 8, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 96, }, { @@ -825,7 +825,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 12, .width = 26, .height = 7, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 112, }, { @@ -834,7 +834,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 2, .width = 23, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 294, }, { @@ -843,7 +843,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 340, }, { @@ -852,7 +852,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 356, }, { @@ -861,7 +861,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 16, .width = 26, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 372, }, #ifdef UBFIX @@ -3048,12 +3048,12 @@ static void Task_ShowTourneyInfoCard(u8 taskId) DecompressAndLoadBgGfxUsingHeap(2, gDomeTourneyInfoCard_Tilemap, 0x2000, 0, 1); DecompressAndLoadBgGfxUsingHeap(3, gDomeTourneyInfoCardBg_Tilemap, 0x800, 0, 1); LoadCompressedSpriteSheet(sTourneyTreeButtonsSpriteSheet); - LoadCompressedPalette(gDomeTourneyTree_Pal, 0, 0x200); - LoadCompressedPalette(gDomeTourneyTreeButtons_Pal, 0x100, 0x200); - LoadCompressedPalette(gBattleWindowTextPalette, 0xF0, 0x20); + LoadCompressedPalette(gDomeTourneyTree_Pal, BG_PLTT_OFFSET, BG_PLTT_SIZE); + LoadCompressedPalette(gDomeTourneyTreeButtons_Pal, OBJ_PLTT_OFFSET, OBJ_PLTT_SIZE); + LoadCompressedPalette(gBattleWindowTextPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); if (mode == INFOCARD_MATCH) - LoadCompressedPalette(gDomeTourneyMatchCardBg_Pal, 0x50, 0x20); // Changes the moving info card bg to orange when in match card mode - CpuFill32(0, gPlttBufferFaded, 0x400); + LoadCompressedPalette(gDomeTourneyMatchCardBg_Pal, BG_PLTT_ID(0x5), PLTT_SIZE_4BPP); // Changes the moving info card bg to orange when in match card mode + CpuFill32(0, gPlttBufferFaded, PLTT_SIZE); ShowBg(0); ShowBg(1); ShowBg(2); @@ -5327,10 +5327,10 @@ static void Task_ShowTourneyTree(u8 taskId) DecompressAndLoadBgGfxUsingHeap(2, gDomeTourneyLine_Gfx, 0x2000, 0, 0); DecompressAndLoadBgGfxUsingHeap(2, gDomeTourneyLineDown_Tilemap, 0x2000, 0, 1); DecompressAndLoadBgGfxUsingHeap(3, gDomeTourneyLineUp_Tilemap, 0x2000, 0, 1); - LoadCompressedPalette(gDomeTourneyTree_Pal, 0, 0x200); - LoadCompressedPalette(gDomeTourneyTreeButtons_Pal, 0x100, 0x200); - LoadCompressedPalette(gBattleWindowTextPalette, 0xF0, 0x20); - CpuFill32(0, gPlttBufferFaded, 0x400); + LoadCompressedPalette(gDomeTourneyTree_Pal, BG_PLTT_OFFSET, BG_PLTT_SIZE); + LoadCompressedPalette(gDomeTourneyTreeButtons_Pal, OBJ_PLTT_OFFSET, OBJ_PLTT_SIZE); + LoadCompressedPalette(gBattleWindowTextPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + CpuFill32(0, gPlttBufferFaded, PLTT_SIZE); ShowBg(0); ShowBg(1); ShowBg(2); diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 0e3ebaeff8..c6843e7533 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -350,7 +350,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .tilemapTop = 2, .width = 12, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0001, }, [SELECT_WIN_SPECIES] = { @@ -359,7 +359,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .tilemapTop = 2, .width = 11, .height = 2, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x0019, }, [SELECT_WIN_INFO] = { @@ -368,7 +368,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .tilemapTop = 15, .width = 20, .height = 3, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x002f, }, [SELECT_WIN_OPTIONS] = { @@ -377,7 +377,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .tilemapTop = 14, .width = 8, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x006b, }, [SELECT_WIN_YES_NO] = { @@ -386,7 +386,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .tilemapTop = 14, .width = 8, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x009b, }, [SELECT_WIN_MON_CATEGORY] = { @@ -395,7 +395,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .tilemapTop = 0, .width = 15, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x00bb, }, DUMMY_WIN_TEMPLATE, @@ -945,7 +945,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 2, .width = 12, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0001, }, [SWAP_WIN_SPECIES] = { @@ -954,7 +954,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 2, .width = 11, .height = 2, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x0019, }, [SWAP_WIN_INFO] = { @@ -963,7 +963,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 15, .width = 20, .height = 3, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x002f, }, [SWAP_WIN_OPTIONS] = { @@ -972,7 +972,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 14, .width = 9, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x006b, }, [SWAP_WIN_YES_NO] = { @@ -981,7 +981,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 14, .width = 8, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x00a1, }, [SWAP_WIN_ACTION_FADE] = { @@ -990,7 +990,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 15, .width = 9, .height = 5, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x006b, }, [SWAP_WIN_UNUSED] = { @@ -999,7 +999,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 2, .width = 4, .height = 2, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x00c1, }, [SWAP_WIN_SPECIES_AT_FADE] = { @@ -1008,7 +1008,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 2, .width = 11, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x00c9, }, [SWAP_WIN_MON_CATEGORY] = { @@ -1017,7 +1017,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 0, .width = 15, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x00df, }, DUMMY_WIN_TEMPLATE, @@ -1175,16 +1175,16 @@ static void CB2_InitSelectScreen(void) LoadBgTiles(3, sSelectMonPicBgTilesetBuffer, 0x60, 0); CpuCopy16(gFrontierFactorySelectMenu_Tilemap, sSelectMenuTilemapBuffer, BG_SCREEN_SIZE); LoadBgTilemap(1, sSelectMenuTilemapBuffer, BG_SCREEN_SIZE, 0); - LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 0x40); - LoadPalette(sSelectText_Pal, 0xF0, 8); - LoadPalette(sSelectText_Pal, 0xE0, 10); + LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 2 * PLTT_SIZE_4BPP); + LoadPalette(sSelectText_Pal, BG_PLTT_ID(0xF), PLTT_SIZEOF(4)); + LoadPalette(sSelectText_Pal, BG_PLTT_ID(0xE), PLTT_SIZEOF(5)); #ifdef UBFIX if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) #else if (sFactorySelectScreen->fromSummaryScreen == TRUE) #endif gPlttBufferUnfaded[228] = sFactorySelectScreen->speciesNameColorBackup; - LoadPalette(sMonPicBg_Pal, 0x20, 4); + LoadPalette(sMonPicBg_Pal, BG_PLTT_ID(0x2), PLTT_SIZEOF(2)); gMain.state++; break; case 3: @@ -2748,7 +2748,7 @@ static void Swap_Task_FadeOutSpeciesName(u8 taskId) gTasks[taskId].tState++; break; case 1: - LoadPalette(&gPlttBufferUnfaded[0xF0], 0xE0, 0xA); + LoadPalette(&gPlttBufferUnfaded[BG_PLTT_ID(0xF)], BG_PLTT_ID(0xE), PLTT_SIZEOF(5)); gTasks[taskId].tState++; break; case 2: @@ -2994,7 +2994,7 @@ static void Swap_Task_ScreenInfoTransitionOut(u8 taskId) switch (gTasks[taskId].tState) { case 0: - LoadPalette(sSwapText_Pal, 0xE0, sizeof(sSwapText_Pal)); + LoadPalette(sSwapText_Pal, BG_PLTT_ID(0xE), sizeof(sSwapText_Pal)); Swap_PrintActionStrings(); PutWindowTilemap(SWAP_WIN_ACTION_FADE); gTasks[taskId].tState++; @@ -3309,10 +3309,10 @@ static void CB2_InitSwapScreen(void) LoadBgTiles(3, sSwapMonPicBgTilesetBuffer, 0x60, 0); CpuCopy16(gFrontierFactorySelectMenu_Tilemap, sSwapMenuTilemapBuffer, BG_SCREEN_SIZE); LoadBgTilemap(1, sSwapMenuTilemapBuffer, BG_SCREEN_SIZE, 0); - LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 0x40); - LoadPalette(sSwapText_Pal, 0xF0, sizeof(sSwapText_Pal)); - LoadPalette(sSwapText_Pal, 0xE0, sizeof(sSwapText_Pal)); - LoadPalette(sMonPicBg_Pal, 0x20, 4); + LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 2 * PLTT_SIZE_4BPP); + LoadPalette(sSwapText_Pal, BG_PLTT_ID(0xF), sizeof(sSwapText_Pal)); + LoadPalette(sSwapText_Pal, BG_PLTT_ID(0xE), sizeof(sSwapText_Pal)); + LoadPalette(sMonPicBg_Pal, BG_PLTT_ID(0x2), PLTT_SIZEOF(2)); gMain.state++; break; case 3: @@ -3867,7 +3867,7 @@ static void Swap_PrintMonSpeciesAtFade(void) pal[4] = gPlttBufferFaded[228]; else pal[4] = sFactorySwapScreen->speciesNameColorBackup; - LoadPalette(pal, 0xF0, sizeof(sSwapText_Pal)); + LoadPalette(pal, BG_PLTT_ID(0xF), sizeof(sSwapText_Pal)); PutWindowTilemap(SWAP_WIN_SPECIES_AT_FADE); FillWindowPixelBuffer(SWAP_WIN_SPECIES_AT_FADE, PIXEL_FILL(0)); @@ -3895,8 +3895,8 @@ static void Swap_PrintMonSpeciesForTransition(void) u16 species; u8 x; - LoadPalette(sSwapText_Pal, 0xE0, sizeof(sSwapText_Pal)); - CpuCopy16(&gPlttBufferUnfaded[240], &gPlttBufferFaded[224], 10); + LoadPalette(sSwapText_Pal, BG_PLTT_ID(0xE), sizeof(sSwapText_Pal)); + CpuCopy16(&gPlttBufferUnfaded[BG_PLTT_ID(0xF)], &gPlttBufferFaded[BG_PLTT_ID(0xE)], PLTT_SIZEOF(5)); if (sFactorySwapScreen->cursorPos >= FRONTIER_PARTY_SIZE) { diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index ca6be9d4e2..42f3805aa0 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -576,7 +576,7 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battlerId) gMonSpritesGfxPtr->sprites.ptr[position], species, currentPersonality); - paletteOffset = 0x100 + battlerId * 16; + paletteOffset = OBJ_PLTT_ID(battlerId); if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies == SPECIES_NONE) lzPaletteData = GetMonFrontSpritePal(mon); @@ -584,21 +584,21 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battlerId) lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality); LZDecompressWram(lzPaletteData, gDecompressionBuffer); - LoadPalette(gDecompressionBuffer, paletteOffset, 0x20); - LoadPalette(gDecompressionBuffer, 0x80 + battlerId * 16, 0x20); + LoadPalette(gDecompressionBuffer, paletteOffset, PLTT_SIZE_4BPP); + LoadPalette(gDecompressionBuffer, 0x80 + BG_PLTT_ID(battlerId), PLTT_SIZE_4BPP); if (species == SPECIES_CASTFORM) { - paletteOffset = 0x100 + battlerId * 16; + paletteOffset = OBJ_PLTT_ID(battlerId); LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette); - LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerId]], paletteOffset, 0x20); + LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerId]], paletteOffset, PLTT_SIZE_4BPP); } // transform's pink color if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE) { BlendPalette(paletteOffset, 16, 6, RGB_WHITE); - CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); + CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, PLTT_SIZEOF(16)); } } @@ -639,7 +639,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId) species, currentPersonality); } - paletteOffset = 0x100 + battlerId * 16; + paletteOffset = OBJ_PLTT_ID(battlerId); if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies == SPECIES_NONE) lzPaletteData = GetMonFrontSpritePal(mon); @@ -647,21 +647,21 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId) lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality); LZDecompressWram(lzPaletteData, gDecompressionBuffer); - LoadPalette(gDecompressionBuffer, paletteOffset, 0x20); - LoadPalette(gDecompressionBuffer, 0x80 + battlerId * 16, 0x20); + LoadPalette(gDecompressionBuffer, paletteOffset, PLTT_SIZE_4BPP); + LoadPalette(gDecompressionBuffer, 0x80 + BG_PLTT_ID(battlerId), PLTT_SIZE_4BPP); if (species == SPECIES_CASTFORM) { - paletteOffset = 0x100 + battlerId * 16; + paletteOffset = OBJ_PLTT_ID(battlerId); LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette); - LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerId]], paletteOffset, 0x20); + LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerId]], paletteOffset, PLTT_SIZE_4BPP); } // transform's pink color if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE) { BlendPalette(paletteOffset, 16, 6, RGB_WHITE); - CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); + CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, PLTT_SIZEOF(16)); } } @@ -690,7 +690,7 @@ void DecompressTrainerBackPic(u16 backPicId, u8 battlerId) gMonSpritesGfxPtr->sprites.ptr[position], SPECIES_NONE); LoadCompressedPalette(gTrainerBackPicPaletteTable[backPicId].data, - 0x100 + 16 * battlerId, 0x20); + OBJ_PLTT_ID(battlerId), PLTT_SIZE_4BPP); } void BattleGfxSfxDummy3(u8 gender) @@ -903,13 +903,13 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 castform) if (castform) { StartSpriteAnim(&gSprites[gBattlerSpriteIds[battlerAtk]], gBattleSpritesDataPtr->animationData->animArg); - paletteOffset = 0x100 + battlerAtk * 16; - LoadPalette(gBattleStruct->castformPalette[gBattleSpritesDataPtr->animationData->animArg], paletteOffset, 32); + paletteOffset = OBJ_PLTT_ID(battlerAtk); + LoadPalette(gBattleStruct->castformPalette[gBattleSpritesDataPtr->animationData->animArg], paletteOffset, PLTT_SIZE_4BPP); gBattleMonForms[battlerAtk] = gBattleSpritesDataPtr->animationData->animArg; if (gBattleSpritesDataPtr->battlerData[battlerAtk].transformSpecies != SPECIES_NONE) { BlendPalette(paletteOffset, 16, 6, RGB_WHITE); - CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); + CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, PLTT_SIZEOF(16)); } gSprites[gBattlerSpriteIds[battlerAtk]].y = GetBattlerSpriteDefault_Y(battlerAtk); } @@ -965,20 +965,20 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 castform) src = gMonSpritesGfxPtr->sprites.ptr[position]; dst = (void *)(OBJ_VRAM0 + gSprites[gBattlerSpriteIds[battlerAtk]].oam.tileNum * 32); DmaCopy32(3, src, dst, MON_PIC_SIZE); - paletteOffset = 0x100 + battlerAtk * 16; + paletteOffset = OBJ_PLTT_ID(battlerAtk); lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(targetSpecies, otId, personalityValue); LZDecompressWram(lzPaletteData, gDecompressionBuffer); - LoadPalette(gDecompressionBuffer, paletteOffset, 32); + LoadPalette(gDecompressionBuffer, paletteOffset, PLTT_SIZE_4BPP); if (targetSpecies == SPECIES_CASTFORM) { gSprites[gBattlerSpriteIds[battlerAtk]].anims = gMonFrontAnimsPtrTable[targetSpecies]; LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette); - LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerDef]], paletteOffset, 32); + LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerDef]], paletteOffset, PLTT_SIZE_4BPP); } BlendPalette(paletteOffset, 16, 6, RGB_WHITE); - CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); + CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, PLTT_SIZEOF(16)); if (!IsContest()) { @@ -1014,8 +1014,8 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite) Dma3CopyLarge32_(gMonSpritesGfxPtr->sprites.ptr[position], &gMonSpritesGfxPtr->sprites.byte[position][MON_PIC_SIZE * i], MON_PIC_SIZE); } - palOffset = (battlerId * 16) + 0x100; - LoadCompressedPalette(gSubstituteDollPal, palOffset, 32); + palOffset = OBJ_PLTT_ID(battlerId); + LoadCompressedPalette(gSubstituteDollPal, palOffset, PLTT_SIZE_4BPP); } else { diff --git a/src/battle_interface.c b/src/battle_interface.c index ed4aa9ed8a..2bf1a02244 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -2027,11 +2027,11 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) return; } - pltAdder = gSprites[healthboxSpriteId].oam.paletteNum * 16; + pltAdder = PLTT_ID(gSprites[healthboxSpriteId].oam.paletteNum); pltAdder += battlerId + 12; - FillPalette(sStatusIconColors[statusPalId], pltAdder + 0x100, 2); - CpuCopy16(gPlttBufferUnfaded + 0x100 + pltAdder, (void *)(OBJ_PLTT + pltAdder * 2), 2); + FillPalette(sStatusIconColors[statusPalId], OBJ_PLTT_OFFSET + pltAdder, PLTT_SIZEOF(1)); + CpuCopy16(gPlttBufferUnfaded + OBJ_PLTT_OFFSET + pltAdder, (u16 *)OBJ_PLTT + pltAdder, PLTT_SIZEOF(1)); CpuCopy32(statusGfxPtr, (void *)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * TILE_SIZE_4BPP), 96); if (IsDoubleBattle() == TRUE || GetBattlerSide(battlerId) == B_SIDE_OPPONENT) { diff --git a/src/battle_main.c b/src/battle_main.c index 6a4244b1ae..879d9113d3 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2215,7 +2215,7 @@ void CB2_InitEndLinkBattle(void) gBattle_BG3_Y = 0; InitBattleBgsVideo(); - LoadCompressedPalette(gBattleTextboxPalette, 0, 64); + LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); LoadBattleMenuWindowGfx(); ResetSpriteData(); ResetTasks(); diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 9fab996da8..93c7df06ac 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -214,7 +214,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 2, .width = 15, .height = 16, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 30 }, [WIN_INFO] = { @@ -223,7 +223,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 13, .width = 14, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 270 }, [WIN_MSG] = { @@ -232,7 +232,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 354 }, [WIN_TOSS_NUM] = { @@ -241,7 +241,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 17, .width = 5, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 462 }, DUMMY_WIN_TEMPLATE, @@ -263,7 +263,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] = .tilemapTop = 17, .width = 7, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 472 }, [MENU_WIN_1x2] = { @@ -272,7 +272,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] = .tilemapTop = 15, .width = 7, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 472 }, [MENU_WIN_2x2] = { @@ -281,7 +281,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] = .tilemapTop = 15, .width = 14, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 472 }, [MENU_WIN_2x3] = { // Unused @@ -290,7 +290,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] = .tilemapTop = 13, .width = 14, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 472 }, [MENU_WIN_YESNO] = { @@ -299,7 +299,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] = .tilemapTop = 15, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 472 }, }; @@ -578,7 +578,7 @@ static bool8 LoadPyramidBagGfx(void) } break; case 2: - LoadCompressedPalette(gBattlePyramidBagInterface_Pal, 0, 32); + LoadCompressedPalette(gBattlePyramidBagInterface_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); gPyramidBagMenu->state++; break; case 3: @@ -1439,9 +1439,9 @@ static void InitPyramidBagWindows(void) InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 0x1, 0xE0); - LoadMessageBoxGfx(0, 0xA, 0xD0); - LoadPalette(gStandardMenuPalette, 0xF0, 0x20); + LoadUserWindowBorderGfx(0, 0x1, BG_PLTT_ID(0xE)); + LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(0xD)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); for (i = 0; i < ARRAY_COUNT(sWindowTemplates); i++) FillWindowPixelBuffer(i, PIXEL_FILL(0)); @@ -1537,10 +1537,10 @@ static void FreeItemIconSprite(u8 spriteArrId) static void LoadPyramidBagPalette(void) { struct SpritePalette spritePalette; - u16 *palPtr = Alloc(0x40); + u16 *palPtr = Alloc(2 * PLTT_SIZE_4BPP); LZDecompressWram(gBattlePyramidBag_Pal, palPtr); - spritePalette.data = palPtr + (gSaveBlock2Ptr->frontier.lvlMode * 16); + spritePalette.data = palPtr + PLTT_ID(gSaveBlock2Ptr->frontier.lvlMode); spritePalette.tag = TAG_PYRAMID_BAG; LoadSpritePalette(&spritePalette); Free(palPtr); diff --git a/src/battle_records.c b/src/battle_records.c index 6cab28d21b..c6becd6d7d 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -67,7 +67,7 @@ static const struct WindowTemplate sTrainerHillRecordsWindowTemplates[] = .tilemapTop = 1, .width = 26, .height = 18, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 20 }, DUMMY_WIN_TEMPLATE @@ -80,7 +80,7 @@ static const struct WindowTemplate sLinkBattleRecordsWindow = .tilemapTop = 1, .width = 26, .height = 17, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }; @@ -444,7 +444,7 @@ static void LoadTrainerHillRecordsWindowGfx(u8 bgId) { LoadBgTiles(bgId, sTrainerHillWindowTileset, sizeof(sTrainerHillWindowTileset), 0); CopyToBgTilemapBufferRect(bgId, sTrainerHillWindowTilemap, 0, 0, 0x20, 0x20); - LoadPalette(sTrainerHillWindowPalette, 0, 0x20); + LoadPalette(sTrainerHillWindowPalette, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); } static void VblankCB_TrainerHillRecords(void) @@ -491,7 +491,7 @@ static void CB2_ShowTrainerHillRecords(void) break; case 3: LoadTrainerHillRecordsWindowGfx(3); - LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20); + LoadPalette(GetTextWindowPalette(0), BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); gMain.state++; break; case 4: diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6532215833..e3bba69624 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6013,7 +6013,7 @@ static void InitLevelUpBanner(void) gBattle_BG2_Y = 0; gBattle_BG2_X = LEVEL_UP_BANNER_START; - LoadPalette(sLevelUpBanner_Pal, 0x60, 0x20); + LoadPalette(sLevelUpBanner_Pal, BG_PLTT_ID(0x6), PLTT_SIZE_4BPP); CopyToWindowPixelBuffer(B_WIN_LEVEL_UP_BANNER, sLevelUpBanner_Gfx, 0, 0); PutWindowTilemap(B_WIN_LEVEL_UP_BANNER); CopyWindowToVram(B_WIN_LEVEL_UP_BANNER, COPYWIN_FULL); diff --git a/src/battle_transition.c b/src/battle_transition.c index bc289efa7f..31363f4a9c 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1406,7 +1406,7 @@ static bool8 Aqua_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuFill16(0, tilemap, BG_SCREEN_SIZE); LZ77UnCompVram(sTeamAqua_Tileset, tileset); - LoadPalette(sEvilTeam_Palette, 0xF0, sizeof(sEvilTeam_Palette)); + LoadPalette(sEvilTeam_Palette, BG_PLTT_ID(0xF), sizeof(sEvilTeam_Palette)); task->tState++; return FALSE; @@ -1421,7 +1421,7 @@ static bool8 Magma_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuFill16(0, tilemap, BG_SCREEN_SIZE); LZ77UnCompVram(sTeamMagma_Tileset, tileset); - LoadPalette(sEvilTeam_Palette, 0xF0, sizeof(sEvilTeam_Palette)); + LoadPalette(sEvilTeam_Palette, BG_PLTT_ID(0xF), sizeof(sEvilTeam_Palette)); task->tState++; return FALSE; @@ -1449,7 +1449,7 @@ static bool8 BigPokeball_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuFill16(0, tilemap, BG_SCREEN_SIZE); CpuCopy16(sBigPokeball_Tileset, tileset, sizeof(sBigPokeball_Tileset)); - LoadPalette(sFieldEffectPal_Pokeball, 0xF0, sizeof(sFieldEffectPal_Pokeball)); + LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(0xF), sizeof(sFieldEffectPal_Pokeball)); task->tState++; return FALSE; @@ -1504,7 +1504,7 @@ static bool8 Regice_SetGfx(struct Task *task) u16 *tilemap, *tileset; GetBg0TilesDst(&tilemap, &tileset); - LoadPalette(sRegice_Palette, 0xF0, sizeof(sRegice_Palette)); + LoadPalette(sRegice_Palette, BG_PLTT_ID(0xF), sizeof(sRegice_Palette)); CpuCopy16(sRegice_Tilemap, tilemap, 0x500); SetSinWave(gScanlineEffectRegBuffers[0], 0, task->tSinIndex, 132, task->tAmplitude, DISPLAY_HEIGHT); @@ -1517,7 +1517,7 @@ static bool8 Registeel_SetGfx(struct Task *task) u16 *tilemap, *tileset; GetBg0TilesDst(&tilemap, &tileset); - LoadPalette(sRegisteel_Palette, 0xF0, sizeof(sRegisteel_Palette)); + LoadPalette(sRegisteel_Palette, BG_PLTT_ID(0xF), sizeof(sRegisteel_Palette)); CpuCopy16(sRegisteel_Tilemap, tilemap, 0x500); SetSinWave(gScanlineEffectRegBuffers[0], 0, task->tSinIndex, 132, task->tAmplitude, DISPLAY_HEIGHT); @@ -1530,7 +1530,7 @@ static bool8 Regirock_SetGfx(struct Task *task) u16 *tilemap, *tileset; GetBg0TilesDst(&tilemap, &tileset); - LoadPalette(sRegirock_Palette, 0xF0, sizeof(sRegirock_Palette)); + LoadPalette(sRegirock_Palette, BG_PLTT_ID(0xF), sizeof(sRegirock_Palette)); CpuCopy16(sRegirock_Tilemap, tilemap, 0x500); SetSinWave(gScanlineEffectRegBuffers[0], 0, task->tSinIndex, 132, task->tAmplitude, DISPLAY_HEIGHT); @@ -1559,7 +1559,7 @@ static bool8 Kyogre_PaletteFlash(struct Task *task) { u16 offset = task->tTimer % 30; offset /= 3; - LoadPalette(&sKyogre1_Palette[offset * 16], 0xF0, 0x20); + LoadPalette(&sKyogre1_Palette[offset * 16], BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); } if (++task->tTimer > 58) { @@ -1575,7 +1575,7 @@ static bool8 Kyogre_PaletteBrighten(struct Task *task) if (task->tTimer % 5 == 0) { s16 offset = task->tTimer / 5; - LoadPalette(&sKyogre2_Palette[offset * 16], 0xF0, 0x20); + LoadPalette(&sKyogre2_Palette[offset * 16], BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); } if (++task->tTimer > 68) { @@ -1776,7 +1776,7 @@ static bool8 PokeballsTrail_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuSet(sPokeballTrail_Tileset, tileset, 0x20); CpuFill32(0, tilemap, BG_SCREEN_SIZE); - LoadPalette(sFieldEffectPal_Pokeball, 0xF0, sizeof(sFieldEffectPal_Pokeball)); + LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(0xF), sizeof(sFieldEffectPal_Pokeball)); task->tState++; return FALSE; @@ -2328,8 +2328,8 @@ static bool8 Mugshot_SetGfx(struct Task *task) mugshotsMap = sMugshotsTilemap; GetBg0TilesDst(&tilemap, &tileset); CpuSet(sEliteFour_Tileset, tileset, 0xF0); - LoadPalette(sOpponentMugshotsPals[task->tMugshotId], 0xF0, 0x20); - LoadPalette(sPlayerMugshotsPals[gSaveBlock2Ptr->playerGender], 0xFA, 0xC); + LoadPalette(sOpponentMugshotsPals[task->tMugshotId], BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(sPlayerMugshotsPals[gSaveBlock2Ptr->playerGender], BG_PLTT_ID(0xF) + 10, PLTT_SIZEOF(6)); for (i = 0; i < 20; i++) { @@ -3193,7 +3193,7 @@ static bool8 RectangularSpiral_Init(struct Task *task) CpuCopy16(sShrinkingBoxTileset, tileset, 0x20); CpuCopy16(&sShrinkingBoxTileset[0x70], &tileset[0x20], 0x20); CpuFill16(0xF0 << 8, tilemap, BG_SCREEN_SIZE); - LoadPalette(sFieldEffectPal_Pokeball, 0xF0, sizeof(sFieldEffectPal_Pokeball)); + LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(0xF), sizeof(sFieldEffectPal_Pokeball)); task->data[3] = 1; task->tState++; @@ -3389,7 +3389,7 @@ static bool8 Groudon_PaletteFlash(struct Task *task) if (task->tTimer % 3 == 0) { u16 offset = (task->tTimer % 30) / 3; - LoadPalette(&sGroudon1_Palette[offset * 16], 0xF0, 0x20); + LoadPalette(&sGroudon1_Palette[offset * 16], BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); } if (++task->tTimer > 58) { @@ -3405,7 +3405,7 @@ static bool8 Groudon_PaletteBrighten(struct Task *task) if (task->tTimer % 5 == 0) { s16 offset = task->tTimer / 5; - LoadPalette(&sGroudon2_Palette[offset * 16], 0xF0, 0x20); + LoadPalette(&sGroudon2_Palette[offset * 16], BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); } if (++task->tTimer > 68) { @@ -3448,7 +3448,7 @@ static bool8 Rayquaza_Init(struct Task *task) sTransitionData->counter = 0; task->tState++; - LoadPalette(&sRayquaza_Palette[0x50], 0xF0, 0x20); + LoadPalette(&sRayquaza_Palette[0x50], BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); for (i = 0; i < DISPLAY_HEIGHT; i++) { @@ -3476,7 +3476,7 @@ static bool8 Rayquaza_PaletteFlash(struct Task *task) { u16 value = task->tTimer / 4; const u16 *palPtr = &sRayquaza_Palette[(value + 5) * 16]; - LoadPalette(palPtr, 0xF0, 0x20); + LoadPalette(palPtr, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); } if (++task->tTimer > 40) { @@ -3524,7 +3524,7 @@ static bool8 Rayquaza_TriRing(struct Task *task) { u16 value = task->tTimer / 3; const u16 *palPtr = &sRayquaza_Palette[(value + 0) * 16]; - LoadPalette(palPtr, 0xF0, 0x20); + LoadPalette(palPtr, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); } if (++task->tTimer >= 40) { @@ -3775,7 +3775,7 @@ static bool8 GridSquares_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuSet(sShrinkingBoxTileset, tileset, 16); CpuFill16(0xF0 << 8, tilemap, BG_SCREEN_SIZE); - LoadPalette(sFieldEffectPal_Pokeball, 0xF0, sizeof(sFieldEffectPal_Pokeball)); + LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(0xF), sizeof(sFieldEffectPal_Pokeball)); task->tState++; return FALSE; @@ -4242,7 +4242,7 @@ static bool8 FrontierLogoWiggle_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuFill16(0, tilemap, BG_SCREEN_SIZE); LZ77UnCompVram(sFrontierLogo_Tileset, tileset); - LoadPalette(sFrontierLogo_Palette, 0xF0, sizeof(sFrontierLogo_Palette)); + LoadPalette(sFrontierLogo_Palette, BG_PLTT_ID(0xF), sizeof(sFrontierLogo_Palette)); task->tState++; return FALSE; @@ -4304,7 +4304,7 @@ static bool8 FrontierLogoWave_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuFill16(0, tilemap, BG_SCREEN_SIZE); LZ77UnCompVram(sFrontierLogo_Tileset, tileset); - LoadPalette(sFrontierLogo_Palette, 0xF0, sizeof(sFrontierLogo_Palette)); + LoadPalette(sFrontierLogo_Palette, BG_PLTT_ID(0xF), sizeof(sFrontierLogo_Palette)); sTransitionData->cameraY = 0; task->tState++; @@ -4451,10 +4451,10 @@ static bool8 FrontierSquares_Init(struct Task *task) LZ77UnCompVram(sFrontierSquares_FilledBg_Tileset, tileset); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32); - FillBgTilemapBufferRect(0, 1, 0, 0, MARGIN_SIZE, 32, 15); - FillBgTilemapBufferRect(0, 1, 30 - MARGIN_SIZE, 0, MARGIN_SIZE, 32, 15); + FillBgTilemapBufferRect(0, 1, 0, 0, MARGIN_SIZE, 32, 0xF); + FillBgTilemapBufferRect(0, 1, 30 - MARGIN_SIZE, 0, MARGIN_SIZE, 32, 0xF); CopyBgTilemapBufferToVram(0); - LoadPalette(sFrontierSquares_Palette, 0xF0, sizeof(sFrontierSquares_Palette)); + LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(0xF), sizeof(sFrontierSquares_Palette)); task->tPosX = MARGIN_SIZE; task->tPosY = 0; @@ -4471,7 +4471,7 @@ static bool8 FrontierSquares_Draw(struct Task *task) SQUARE_SIZE, SQUARE_SIZE, task->tPosX, task->tPosY, SQUARE_SIZE, SQUARE_SIZE, - 15, 0, 0); + 0xF, 0, 0); CopyBgTilemapBufferToVram(0); task->tPosX += SQUARE_SIZE; @@ -4546,12 +4546,12 @@ static bool8 FrontierSquaresSpiral_Init(struct Task *task) LZ77UnCompVram(sFrontierSquares_FilledBg_Tileset, tileset); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32); - FillBgTilemapBufferRect(0, 1, 0, 0, MARGIN_SIZE, 32, 15); - FillBgTilemapBufferRect(0, 1, 30 - MARGIN_SIZE, 0, MARGIN_SIZE, 32, 15); + FillBgTilemapBufferRect(0, 1, 0, 0, MARGIN_SIZE, 32, 0xF); + FillBgTilemapBufferRect(0, 1, 30 - MARGIN_SIZE, 0, MARGIN_SIZE, 32, 0xF); CopyBgTilemapBufferToVram(0); - LoadPalette(sFrontierSquares_Palette, 0xE0, sizeof(sFrontierSquares_Palette)); - LoadPalette(sFrontierSquares_Palette, 0xF0, sizeof(sFrontierSquares_Palette)); - BlendPalette(0xE0, 16, 8, RGB_BLACK); + LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(0xE), sizeof(sFrontierSquares_Palette)); + LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(0xF), sizeof(sFrontierSquares_Palette)); + BlendPalette(BG_PLTT_ID(0xE), 16, 8, RGB_BLACK); task->tSquareNum = NUM_SQUARES - 1; task->tFadeFlag = 0; @@ -4569,7 +4569,7 @@ static bool8 FrontierSquaresSpiral_Outward(struct Task *task) SQUARE_SIZE, SQUARE_SIZE, SQUARE_SIZE * x + MARGIN_SIZE, SQUARE_SIZE * y, SQUARE_SIZE, SQUARE_SIZE, - 15, 0, 0); + 0xF, 0, 0); CopyBgTilemapBufferToVram(0); if (--task->tSquareNum < 0) @@ -4581,7 +4581,7 @@ static bool8 FrontierSquaresSpiral_Outward(struct Task *task) // set it to black so it's not revealed when the squares are removed. static bool8 FrontierSquaresSpiral_SetBlack(struct Task *task) { - BlendPalette(0xE0, 16, 3, RGB_BLACK); + BlendPalette(BG_PLTT_ID(0xE), 16, 3, RGB_BLACK); BlendPalettes(PALETTES_ALL & ~(1 << 15 | 1 << 14), 16, RGB_BLACK); task->tSquareNum = 0; @@ -4603,7 +4603,7 @@ static bool8 FrontierSquaresSpiral_Inward(struct Task *task) SQUARE_SIZE * (sFrontierSquaresSpiral_Positions[task->tSquareNum] % NUM_SQUARES_PER_ROW) + MARGIN_SIZE, SQUARE_SIZE * (sFrontierSquaresSpiral_Positions[task->tSquareNum] / NUM_SQUARES_PER_ROW), SQUARE_SIZE, SQUARE_SIZE, - 14, 0, 0); + 0xE, 0, 0); } else { @@ -4614,7 +4614,7 @@ static bool8 FrontierSquaresSpiral_Inward(struct Task *task) SQUARE_SIZE * (sFrontierSquaresSpiral_Positions[task->tSquareNum - 1] % NUM_SQUARES_PER_ROW) + MARGIN_SIZE, SQUARE_SIZE * (sFrontierSquaresSpiral_Positions[task->tSquareNum - 1] / NUM_SQUARES_PER_ROW), SQUARE_SIZE, SQUARE_SIZE, - 15); + 0xF); } task->tSquareNum++; } @@ -4664,7 +4664,7 @@ static bool8 FrontierSquaresScroll_Init(struct Task *task) LZ77UnCompVram(sFrontierSquares_FilledBg_Tileset, tileset); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32); CopyBgTilemapBufferToVram(0); - LoadPalette(sFrontierSquares_Palette, 0xF0, sizeof(sFrontierSquares_Palette)); + LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(0xF), sizeof(sFrontierSquares_Palette)); gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -4709,7 +4709,7 @@ static bool8 FrontierSquaresScroll_Draw(struct Task *task) SQUARE_SIZE, SQUARE_SIZE, SQUARE_SIZE * x + MARGIN_SIZE, SQUARE_SIZE * y, SQUARE_SIZE, SQUARE_SIZE, - 15, 0, 0); + 0xF, 0, 0); CopyBgTilemapBufferToVram(0); if (++task->tSquareNum >= (int)ARRAY_COUNT(sFrontierSquaresScroll_Positions)) @@ -4738,7 +4738,7 @@ static bool8 FrontierSquaresScroll_Erase(struct Task *task) FillBgTilemapBufferRect(0, 1, SQUARE_SIZE * x + MARGIN_SIZE, SQUARE_SIZE * y, SQUARE_SIZE, SQUARE_SIZE, - 15); + 0xF); CopyBgTilemapBufferToVram(0); if (++task->tSquareNum >= (int)ARRAY_COUNT(sFrontierSquaresScroll_Positions)) diff --git a/src/battle_transition_frontier.c b/src/battle_transition_frontier.c index 088865dbab..107e9067db 100644 --- a/src/battle_transition_frontier.c +++ b/src/battle_transition_frontier.c @@ -226,7 +226,7 @@ static void LoadLogoGfx(void) GetBg0TilesDst(&tilemap, &tileset); LZ77UnCompVram(sLogoCenter_Gfx, tileset); LZ77UnCompVram(sLogoCenter_Tilemap, tilemap); - LoadPalette(sLogo_Pal, 0xF0, sizeof(sLogo_Pal)); + LoadPalette(sLogo_Pal, BG_PLTT_ID(0xF), sizeof(sLogo_Pal)); LoadCompressedSpriteSheet(&sSpriteSheet_LogoCircles); LoadSpritePalette(&sSpritePalette_LogoCircles); } diff --git a/src/berry_blender.c b/src/berry_blender.c index d099a14ba2..defc5ac963 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -338,7 +338,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 6, .width = 7, .height = 2, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x28, }, { @@ -347,7 +347,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 6, .width = 7, .height = 2, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x36, }, { @@ -356,7 +356,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 12, .width = 7, .height = 2, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x44, }, { @@ -365,7 +365,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 12, .width = 7, .height = 2, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x52, }, { @@ -374,7 +374,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x60, }, { @@ -383,7 +383,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 3, .width = 21, .height = 14, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x60, }, DUMMY_WIN_TEMPLATE @@ -396,7 +396,7 @@ static const struct WindowTemplate sYesNoWindowTemplate_ContinuePlaying = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0xCC }; @@ -926,7 +926,7 @@ static const struct WindowTemplate sBlenderRecordWindowTemplate = .tilemapTop = 4, .width = 18, .height = 11, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 8 }; @@ -959,7 +959,7 @@ static bool8 LoadBerryBlenderGfx(void) case 1: CopyToBgTilemapBuffer(2, sBlenderCenter_Tilemap, 0x400, 0); CopyBgTilemapBufferToVram(2); - LoadPalette(sBlenderCenter_Pal, 0, 0x100); + LoadPalette(sBlenderCenter_Pal, BG_PLTT_ID(0x0), 8 * PLTT_SIZE_4BPP); sBerryBlender->loadGfxState++; break; case 2: @@ -984,7 +984,7 @@ static bool8 LoadBerryBlenderGfx(void) sBerryBlender->loadGfxState++; break; case 7: - LoadPalette(sBlenderOuter_Pal, 0x80, 0x20); + LoadPalette(sBlenderOuter_Pal, BG_PLTT_ID(0x8), PLTT_SIZE_4BPP); sBerryBlender->loadGfxState++; break; case 8: @@ -1065,8 +1065,8 @@ static void CB2_LoadBerryBlender(void) InitBgsFromTemplates(1, sBgTemplates, ARRAY_COUNT(sBgTemplates)); SetBgTilemapBuffer(1, sBerryBlender->tilemapBuffers[0]); SetBgTilemapBuffer(2, sBerryBlender->tilemapBuffers[1]); - LoadUserWindowBorderGfx(0, 1, 0xD0); - LoadMessageBoxGfx(0, 0x14, 0xF0); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD)); + LoadMessageBoxGfx(0, 0x14, BG_PLTT_ID(0xF)); InitBerryBlenderWindows(); sBerryBlender->mainState++; @@ -1502,8 +1502,8 @@ static void InitBlenderBgs(void) SetBgTilemapBuffer(1, sBerryBlender->tilemapBuffers[0]); SetBgTilemapBuffer(2, sBerryBlender->tilemapBuffers[1]); - LoadUserWindowBorderGfx(0, 1, 0xD0); - LoadMessageBoxGfx(0, 0x14, 0xF0); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD)); + LoadMessageBoxGfx(0, 0x14, BG_PLTT_ID(0xF)); InitBerryBlenderWindows(); sBerryBlender->unk0 = 0; diff --git a/src/berry_crush.c b/src/berry_crush.c index 19c03391d3..a100b72358 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -473,7 +473,7 @@ static const struct WindowTemplate sWindowTemplate_Rankings = .tilemapTop = 4, .width = 24, .height = 13, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }; @@ -485,7 +485,7 @@ static const struct WindowTemplate sWindowTemplates_PlayerNames[MAX_RFU_PLAYERS .tilemapTop = 0, .width = 9, .height = 2, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 1005 }, { @@ -494,7 +494,7 @@ static const struct WindowTemplate sWindowTemplates_PlayerNames[MAX_RFU_PLAYERS .tilemapTop = 3, .width = 9, .height = 2, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 987 }, { @@ -503,7 +503,7 @@ static const struct WindowTemplate sWindowTemplates_PlayerNames[MAX_RFU_PLAYERS .tilemapTop = 6, .width = 9, .height = 2, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 969 }, { @@ -512,7 +512,7 @@ static const struct WindowTemplate sWindowTemplates_PlayerNames[MAX_RFU_PLAYERS .tilemapTop = 3, .width = 9, .height = 2, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 951 }, { @@ -521,7 +521,7 @@ static const struct WindowTemplate sWindowTemplates_PlayerNames[MAX_RFU_PLAYERS .tilemapTop = 6, .width = 9, .height = 2, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 933 }, DUMMY_WIN_TEMPLATE, @@ -535,7 +535,7 @@ static const struct WindowTemplate sWindowTemplates_Results[] = .tilemapTop = 2, .width = 20, .height = 16, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }, [STATE_RESULTS_RANDOM - RESULTS_STATE_START] = { @@ -544,7 +544,7 @@ static const struct WindowTemplate sWindowTemplates_Results[] = .tilemapTop = 2, .width = 20, .height = 16, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }, [STATE_RESULTS_CRUSHING - RESULTS_STATE_START] = { @@ -553,7 +553,7 @@ static const struct WindowTemplate sWindowTemplates_Results[] = .tilemapTop = 2, .width = 22, .height = 16, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }, DUMMY_WIN_TEMPLATE, @@ -1235,7 +1235,7 @@ static s32 ShowGameDisplay(void) gPaletteFade.bufferTransferDisabled = TRUE; break; case 7: - LoadPalette(gBerryCrush_Crusher_Pal, 0, 0x180); + LoadPalette(gBerryCrush_Crusher_Pal, BG_PLTT_ID(0x0), 12 * PLTT_SIZE_4BPP); CopyToBgTilemapBuffer(1, sCrusherTop_Tilemap, 0, 0); CopyToBgTilemapBuffer(2, sContainerCap_Tilemap, 0, 0); CopyToBgTilemapBuffer(3, sBg_Tilemap, 0, 0); @@ -1751,8 +1751,8 @@ static bool32 OpenResultsWindow(struct BerryCrushGame *game, struct BerryCrushGa FillWindowPixelBuffer(gfx->resultsWindowId, PIXEL_FILL(0)); break; case 2: - LoadUserWindowBorderGfx_(gfx->resultsWindowId, 541, 208); - DrawStdFrameWithCustomTileAndPalette(gfx->resultsWindowId, FALSE, 541, 13); + LoadUserWindowBorderGfx_(gfx->resultsWindowId, 541, BG_PLTT_ID(0xD)); + DrawStdFrameWithCustomTileAndPalette(gfx->resultsWindowId, FALSE, 541, 0xD); break; case 3: playerCountIdx = game->playerCount - 2; @@ -1809,8 +1809,8 @@ static void Task_ShowRankings(u8 taskId) tWindowId = AddWindow(&sWindowTemplate_Rankings); PutWindowTilemap(tWindowId); FillWindowPixelBuffer(tWindowId, PIXEL_FILL(0)); - LoadUserWindowBorderGfx_(tWindowId, 541, 208); - DrawStdFrameWithCustomTileAndPalette(tWindowId, FALSE, 541, 13); + LoadUserWindowBorderGfx_(tWindowId, 541, BG_PLTT_ID(0xD)); + DrawStdFrameWithCustomTileAndPalette(tWindowId, FALSE, 541, 0xD); break; case 1: // Print header text diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index e8c4bc7e68..149e5d5116 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -77,7 +77,7 @@ static const struct WindowTemplate sBerryFixWindowTemplates[] = { .tilemapTop = 4, .width = 26, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }, { @@ -86,7 +86,7 @@ static const struct WindowTemplate sBerryFixWindowTemplates[] = { .tilemapTop = 11, .width = 28, .height = 8, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 53 }, { @@ -95,7 +95,7 @@ static const struct WindowTemplate sBerryFixWindowTemplates[] = { .tilemapTop = 8, .width = 30, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 277 }, { @@ -104,7 +104,7 @@ static const struct WindowTemplate sBerryFixWindowTemplates[] = { .tilemapTop = 0, .width = 14, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 337 }, DUMMY_WIN_TEMPLATE diff --git a/src/berry_powder.c b/src/berry_powder.c index 96f14d6e4e..70a8960f76 100755 --- a/src/berry_powder.c +++ b/src/berry_powder.c @@ -4,6 +4,7 @@ #include "event_data.h" #include "load_save.h" #include "menu.h" +#include "palette.h" #include "string_util.h" #include "strings.h" #include "text.h" @@ -67,7 +68,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 1, .width = 28, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 19 }, { @@ -76,7 +77,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 5, .width = 28, .height = 14, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 75 }, { @@ -85,7 +86,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 5, .width = 28, .height = 7, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 75 }, { @@ -94,7 +95,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 8, .width = 19, .height = 3, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 19 }, { @@ -103,7 +104,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 7, .width = 6, .height = 4, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 76 }, { @@ -112,7 +113,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 6, .width = 22, .height = 5, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 19 }, { @@ -121,7 +122,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 8, .width = 19, .height = 3, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 19 }, }; @@ -228,7 +229,7 @@ void DisplayBerryPowderVendorMenu(void) sBerryPowderVendorWindowId = AddWindow(&template); FillWindowPixelBuffer(sBerryPowderVendorWindowId, PIXEL_FILL(0)); PutWindowTilemap(sBerryPowderVendorWindowId); - LoadUserWindowBorderGfx_(sBerryPowderVendorWindowId, 0x21D, 0xD0); + LoadUserWindowBorderGfx_(sBerryPowderVendorWindowId, 0x21D, BG_PLTT_ID(0xD)); DrawPlayerPowderAmount(sBerryPowderVendorWindowId, 0x21D, 13, GetBerryPowder()); } diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index f683c73f45..70d88b3133 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -108,7 +108,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 4, .width = 8, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 69, }, { // WIN_SIZE_FIRM @@ -117,7 +117,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 7, .width = 18, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 85, }, { // WIN_DESC @@ -126,7 +126,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 14, .width = 25, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 157, }, { // WIN_BERRY_TAG @@ -135,7 +135,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 0, .width = 8, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 257, }, DUMMY_WIN_TEMPLATE @@ -346,7 +346,7 @@ static bool8 LoadBerryTagGfx(void) sBerryTag->gfxState++; break; case 4: - LoadCompressedPalette(gBerryCheck_Pal, 0, 0xC0); + LoadCompressedPalette(gBerryCheck_Pal, BG_PLTT_ID(0x0), 6 * PLTT_SIZE_4BPP); sBerryTag->gfxState++; break; case 5: @@ -367,7 +367,7 @@ static void HandleInitWindows(void) InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadPalette(sFontPalette, 0xF0, 0x20); + LoadPalette(sFontPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); for (i = 0; i < ARRAY_COUNT(sWindowTemplates) - 1; i++) PutWindowTilemap(i); ScheduleBgCopyTilemapToVram(0); diff --git a/src/cable_car.c b/src/cable_car.c index 562e9eceb7..8485c2352a 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -306,7 +306,7 @@ static void CB2_LoadCableCar(void) case 3: if (!FreeTempTileDataBuffersIfPossible()) { - LoadPalette(gCableCarBg_Pal, 0, 0x80); + LoadPalette(gCableCarBg_Pal, BG_PLTT_ID(0x0), 4 * PLTT_SIZE_4BPP); gMain.state++; } break; diff --git a/src/cable_club.c b/src/cable_club.c index 913a1b7287..762bd4ec35 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -41,7 +41,7 @@ static const struct WindowTemplate sWindowTemplate_LinkPlayerCount = { .tilemapTop = 11, .width = 11, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0125, }; diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index 9b79b48f1f..42930777ba 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -52,7 +52,7 @@ static const struct WindowTemplate sClearSaveTextWindow[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 11, }, DUMMY_WIN_TEMPLATE @@ -66,7 +66,7 @@ static const struct WindowTemplate sClearSaveYesNo[] = .tilemapTop = 2, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 115, } }; @@ -204,6 +204,6 @@ static void InitClearSaveDataScreenWindows(void) InitWindows(sClearSaveTextWindow); DeactivateAllTextPrinters(); FillWindowPixelBuffer(0, PIXEL_FILL(0)); - LoadWindowGfx(0, 0, 2, 224); - LoadPalette(gStandardMenuPalette, 0xF0, 0x20); + LoadWindowGfx(0, 0, 2, BG_PLTT_ID(0xE)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); } diff --git a/src/contest.c b/src/contest.c index b2c875a583..7a7db4f5f3 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1032,13 +1032,13 @@ void LoadContestBgAfterMoveAnim(void) LZDecompressVram(gContestAudienceGfx, (void *)(BG_SCREEN_ADDR(4))); CopyToBgTilemapBuffer(3, gContestAudienceTilemap, 0, 0); CopyBgTilemapBufferToVram(3); - LoadCompressedPalette(gContestInterfaceAudiencePalette, 0, 0x200); + LoadCompressedPalette(gContestInterfaceAudiencePalette, BG_PLTT_OFFSET, BG_PLTT_SIZE); LoadContestPalettes(); for (i = 0; i < CONTESTANT_COUNT; i++) { u32 contestantWindowId = 5 + i; - LoadPalette(eContestTempSave.cachedWindowPalettes[contestantWindowId], 16 * (5 + gContestantTurnOrder[i]), sizeof((eContestTempSave.cachedWindowPalettes[contestantWindowId]))); + LoadPalette(eContestTempSave.cachedWindowPalettes[contestantWindowId], BG_PLTT_ID(0x5 + gContestantTurnOrder[i]), sizeof((eContestTempSave.cachedWindowPalettes[contestantWindowId]))); } } @@ -1073,11 +1073,11 @@ static void LoadContestPalettes(void) { s32 i; - LoadPalette(sText_Pal, 0xf0, 0x20); - FillPalette(RGB_BLACK, 0, 2); + LoadPalette(sText_Pal, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + SetBackdropFromColor(RGB_BLACK); for (i = 10; i < 14; i++) - LoadPalette(gPlttBufferUnfaded + 241, 240 + i, 2); - FillPalette(RGB(31, 17, 31), 0xF3, 2); + LoadPalette(gPlttBufferUnfaded + BG_PLTT_ID(0xF) + 1, BG_PLTT_ID(0xF) + i, PLTT_SIZEOF(1)); + FillPalette(RGB(31, 17, 31), BG_PLTT_ID(0xF) + 3, PLTT_SIZEOF(1)); } static void InitContestResources(void) @@ -1327,11 +1327,11 @@ static bool8 SetupContestGraphics(u8 *stateVar) DmaCopy32Defvars(3, gContestResources->contestBgTilemaps[2], eContestTempSave.savedJunk, sizeof(eContestTempSave.savedJunk)); break; case 5: - LoadCompressedPalette(gContestInterfaceAudiencePalette, 0, 0x200); - CpuCopy32(gPlttBufferUnfaded + 128, tempPalette1, 16 * sizeof(u16)); - CpuCopy32(gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, tempPalette2, 16 * sizeof(u16)); - CpuCopy32(tempPalette2, gPlttBufferUnfaded + 128, 16 * sizeof(u16)); - CpuCopy32(tempPalette1, gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, 16 * sizeof(u16)); + LoadCompressedPalette(gContestInterfaceAudiencePalette, BG_PLTT_OFFSET, BG_PLTT_SIZE); + CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(0x8), tempPalette1, PLTT_SIZE_4BPP); + CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(0x5 + gContestPlayerMonIndex), tempPalette2, 16 * sizeof(u16)); + CpuCopy32(tempPalette2, gPlttBufferUnfaded + BG_PLTT_ID(0x8), PLTT_SIZE_4BPP); + CpuCopy32(tempPalette1, gPlttBufferUnfaded + BG_PLTT_ID(0x5 + gContestPlayerMonIndex), PLTT_SIZE_4BPP); DmaCopy32Defvars(3, gPlttBufferUnfaded, eContestTempSave.cachedWindowPalettes, sizeof(eContestTempSave.cachedWindowPalettes)); LoadContestPalettes(); break; @@ -3097,7 +3097,7 @@ static u8 CreateJudgeSprite(void) u8 spriteId; LoadCompressedSpriteSheet(&sSpriteSheet_Judge); - LoadCompressedPalette(gContest2Pal, 0x110, 32); + LoadCompressedPalette(gContest2Pal, OBJ_PLTT_ID(0x1), PLTT_SIZE_4BPP); spriteId = CreateSprite(&sSpriteTemplate_Judge, 112, 36, 30); gSprites[spriteId].oam.paletteNum = 1; gSprites[spriteId].callback = SpriteCallbackDummy; @@ -3126,7 +3126,7 @@ static u8 CreateContestantSprite(u16 species, u32 otId, u32 personality, u32 ind else HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species], gMonSpritesGfxPtr->sprites.ptr[B_POSITION_PLAYER_LEFT], species, personality); - LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x120, 0x20); + LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), OBJ_PLTT_ID(0x2), PLTT_SIZE_4BPP); SetMultiuseSpriteTemplateToPokemon(species, B_POSITION_PLAYER_LEFT); spriteId = CreateSprite(&gMultiuseSpriteTemplate, 0x70, GetBattlerSpriteFinal_Y(2, species, FALSE), 30); @@ -3997,7 +3997,7 @@ static void Task_StopFlashJudgeAttentionEye(u8 taskId) { gTasks[eContest.judgeAttentionTaskId].data[contestant * 4 + 0] = 0xFF; gTasks[eContest.judgeAttentionTaskId].data[contestant * 4 + 1] = 0; - BlendPalette((eContest.prevTurnOrder[contestant] + 5) * 16 + 6, 2, 0, RGB(31, 31, 18)); + BlendPalette(BG_PLTT_ID(0x5 + eContest.prevTurnOrder[contestant]) + 6, 2, 0, RGB(31, 31, 18)); DestroyTask(taskId); } } @@ -4021,7 +4021,7 @@ static void Task_FlashJudgeAttentionEye(u8 taskId) || gTasks[taskId].data[offset + 0] == 0) gTasks[taskId].data[offset + 1] ^= 1; - BlendPalette((eContest.prevTurnOrder[i] + 5) * 16 + 6, 2, gTasks[taskId].data[offset + 0], RGB(31, 31, 18)); + BlendPalette(BG_PLTT_ID(0x5 + eContest.prevTurnOrder[i]) + 6, 2, gTasks[taskId].data[offset + 0], RGB(31, 31, 18)); } } } @@ -4100,8 +4100,8 @@ static void Task_UnusedBlend(u8 taskId) || gTasks[taskId].data[idx] == 0) gTasks[taskId].data[idx + 1] ^= 1; - BlendPalette((i + 5) * 16 + 10, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18)); - BlendPalette((i + 5) * 16 + 12 + i, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18)); + BlendPalette(BG_PLTT_ID(0x5 + i) + 10, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18)); + BlendPalette(BG_PLTT_ID(0x5 + i) + 12 + i, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18)); } } } @@ -4414,7 +4414,7 @@ static void DrawContestantWindows(void) for (i = 0; i < CONTESTANT_COUNT; i++) { s32 windowId = i + 5; - LoadPalette(eContestTempSave.cachedWindowPalettes[windowId], (gContestantTurnOrder[i] + 5) * 16, sizeof(eContestTempSave.cachedWindowPalettes[0])); + LoadPalette(eContestTempSave.cachedWindowPalettes[windowId], BG_PLTT_ID(0x5 + gContestantTurnOrder[i]), sizeof(eContestTempSave.cachedWindowPalettes[0])); } DrawContestantWindowText(); } @@ -4769,7 +4769,7 @@ static void Task_ApplauseOverflowAnimation(u8 taskId) else gTasks[taskId].data[4]--; - BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, gTasks[taskId].data[4], RGB_WHITE); + BlendPalette(OBJ_PLTT_ID(gTasks[taskId].data[2]) + 8, 1, gTasks[taskId].data[4], RGB_WHITE); // At the maximum or minimum blending, switch directions. if (gTasks[taskId].data[4] == 0 || gTasks[taskId].data[4] == 16) @@ -4779,7 +4779,7 @@ static void Task_ApplauseOverflowAnimation(u8 taskId) // Continue the animation until the applause meter is cleared. if (eContest.applauseLevel < 5) { - BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, 0, RGB_RED); + BlendPalette(OBJ_PLTT_ID(gTasks[taskId].data[2]) + 8, 1, 0, RGB_RED); DestroyTask(taskId); } } @@ -4992,8 +4992,8 @@ static void Task_BlendAudienceBackground(u8 taskId) else gTasks[taskId].tBlendCoeff--; - BlendPalette(17, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor); - BlendPalette(26, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor); + BlendPalette(BG_PLTT_ID(0x1) + 1, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor); + BlendPalette(BG_PLTT_ID(0x1) + 10, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor); if (gTasks[taskId].tBlendCoeff == gTasks[taskId].tTargetBlendCoeff) { diff --git a/src/contest_painting.c b/src/contest_painting.c index e71cf391f8..d995749bb2 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -121,7 +121,7 @@ static const struct WindowTemplate sWindowTemplate = .tilemapTop = 14, .width = 26, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1, }; @@ -223,7 +223,7 @@ static void ShowContestPainting(void) break; case 4: PrintContestPaintingCaption(gCurContestWinnerSaveIdx, gCurContestWinnerIsForArtist); - LoadPalette(sBgPalette, 0, 1 * 2); + SetBackdropFromPalette(sBgPalette); DmaClear32(3, PLTT, PLTT_SIZE); BeginFastPaletteFade(2); SetVBlankCallback(VBlankCB_ContestPainting); @@ -420,7 +420,7 @@ static void LoadContestPaintingFrame(u8 contestWinnerId, bool8 isForArtist) { u8 x, y; - LoadPalette(sPictureFramePalettes, 0, 0x100); + LoadPalette(sPictureFramePalettes, BG_PLTT_ID(0x0), 8 * PLTT_SIZE_4BPP); if (isForArtist == TRUE) { // Load Artist's frame @@ -586,7 +586,7 @@ static void DoContestPaintingImageProcessing(u8 imageEffect) ApplyImageProcessingEffects(&gImageProcessingContext); ApplyImageProcessingQuantization(&gImageProcessingContext); ConvertImageProcessingToGBA(&gImageProcessingContext); - LoadPalette(gContestPaintingMonPalette, 0x100, 0x200); + LoadPalette(gContestPaintingMonPalette, OBJ_PLTT_ID(0x0), 16 * PLTT_SIZE_4BPP); } static void CreateContestPaintingPicture(u8 contestWinnerId, bool8 isForArtist) diff --git a/src/contest_util.c b/src/contest_util.c index d44b47373c..bbb4ba5bdd 100644 --- a/src/contest_util.c +++ b/src/contest_util.c @@ -327,7 +327,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 4, .width = 12, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 770 }, { @@ -336,7 +336,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 7, .width = 12, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 794 }, { @@ -345,7 +345,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 10, .width = 12, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 818 }, { @@ -354,7 +354,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 13, .width = 12, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 842 }, DUMMY_WIN_TEMPLATE, @@ -455,8 +455,8 @@ static void LoadContestResultsBgGfx(void) CopyToBgTilemapBuffer(2, gContestResults_Interface_Tilemap, 0, 0); CopyToBgTilemapBuffer(0, gContestResults_WinnerBanner_Tilemap, 0, 0); LoadContestResultsTitleBarTilemaps(); - LoadCompressedPalette(gContestResults_Pal, 0, 0x200); - LoadPalette(sResultsTextWindow_Pal, 0xF0, sizeof(sResultsTextWindow_Pal)); + LoadCompressedPalette(gContestResults_Pal, BG_PLTT_ID(0x0), 16 * PLTT_SIZE_4BPP); + LoadPalette(sResultsTextWindow_Pal, BG_PLTT_ID(0xF), sizeof(sResultsTextWindow_Pal)); for (i = 0; i < CONTESTANT_COUNT; i++) { @@ -1092,9 +1092,9 @@ static void Task_FlashStarsAndHearts(u8 taskId) else if (gTasks[taskId].tCoeff == 0) gTasks[taskId].tDecreasing = FALSE; - BlendPalette(0x6B, 1, gTasks[taskId].tCoeff, RGB(30, 22, 11)); - BlendPalette(0x68, 1, gTasks[taskId].tCoeff, RGB_WHITE); - BlendPalette(0x6E, 1, gTasks[taskId].tCoeff, RGB(30, 29, 29)); + BlendPalette(BG_PLTT_ID(0x6) + 11, 1, gTasks[taskId].tCoeff, RGB(30, 22, 11)); + BlendPalette(BG_PLTT_ID(0x6) + 8, 1, gTasks[taskId].tCoeff, RGB_WHITE); + BlendPalette(BG_PLTT_ID(0x6) + 14, 1, gTasks[taskId].tCoeff, RGB(30, 29, 29)); } if (gTasks[taskId].tCoeff == 0) @@ -1143,7 +1143,7 @@ static void LoadAllContestMonIconPalettes(void) for (i = 0; i < CONTESTANT_COUNT; i++) { species = gContestMons[i].species; - LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[GetIconSpecies(species, 0)]], i * 0x10 + 0xA0, 0x20); + LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[GetIconSpecies(species, 0)]], BG_PLTT_ID(0xA + i), PLTT_SIZE_4BPP); } } @@ -1561,7 +1561,7 @@ static void Task_HighlightWinnersBox(u8 taskId) if (++gTasks[taskId].data[11] == 1) { gTasks[taskId].data[11] = 0; - BlendPalette(0x91, 1, gTasks[taskId].data[12], RGB(13, 28, 27)); + BlendPalette(BG_PLTT_ID(0x9) + 1, 1, gTasks[taskId].data[12], RGB(13, 28, 27)); if (gTasks[taskId].data[13] == 0) { if (++gTasks[taskId].data[12] == 16) @@ -2525,16 +2525,16 @@ void LoadLinkContestPlayerPalettes(void) if (version == VERSION_RUBY || version == VERSION_SAPPHIRE) { if (gLinkPlayers[i].gender == MALE) - LoadPalette(gObjectEventPal_RubySapphireBrendan, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPal_RubySapphireBrendan, OBJ_PLTT_ID(0x6 + i), PLTT_SIZE_4BPP); else - LoadPalette(gObjectEventPal_RubySapphireMay, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPal_RubySapphireMay, OBJ_PLTT_ID(0x6 + i), PLTT_SIZE_4BPP); } else { if (gLinkPlayers[i].gender == MALE) - LoadPalette(gObjectEventPal_Brendan, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPal_Brendan, OBJ_PLTT_ID(0x6 + i), PLTT_SIZE_4BPP); else - LoadPalette(gObjectEventPal_May, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPal_May, OBJ_PLTT_ID(0x6 + i), PLTT_SIZE_4BPP); } } } diff --git a/src/credits.c b/src/credits.c index c318595999..0764e185db 100644 --- a/src/credits.c +++ b/src/credits.c @@ -185,7 +185,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 9, .width = 30, .height = 12, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 1 }, DUMMY_WIN_TEMPLATE, @@ -365,7 +365,7 @@ static void InitCreditsBgsAndWindows(void) ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sBackgroundTemplates, ARRAY_COUNT(sBackgroundTemplates)); SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE)); - LoadPalette(sCredits_Pal, 0x80, 64); + LoadPalette(sCredits_Pal, BG_PLTT_ID(0x8), 2 * PLTT_SIZE_4BPP); InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); PutWindowTilemap(0); @@ -549,7 +549,7 @@ static void Task_LoadShowMons(u8 taskId) gReservedSpritePaletteCount = 8; LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7))); - LoadPalette(gBirchBagGrassPal[0] + 1, 1, 31 * 2); + LoadPalette(gBirchBagGrassPal[0] + 1, BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(2 * 16 - 1)); for (i = 0; i < MON_PIC_SIZE; i++) gDecompressionBuffer[i] = 0x11; @@ -624,7 +624,7 @@ static void Task_CreditsTheEnd3(u8 taskId) { ResetGpuAndVram(); ResetPaletteFade(); - LoadTheEndScreen(0, 0x3800, 0); + LoadTheEndScreen(0, 0x3800, BG_PLTT_ID(0x0)); ResetSpriteData(); FreeAllSpritePalettes(); BeginNormalPaletteFade(PALETTES_ALL, 8, 16, 0, RGB_BLACK); diff --git a/src/data/party_menu.h b/src/data/party_menu.h index fdceb9b7d9..a3cf30fc13 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -140,7 +140,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 3, .width = 10, .height = 7, - .paletteNum = 3, + .paletteNum = 0x3, .baseBlock = 0x63, }, { @@ -149,7 +149,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 1, .width = 18, .height = 3, - .paletteNum = 4, + .paletteNum = 0x4, .baseBlock = 0xA9, }, { @@ -158,7 +158,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 4, .width = 18, .height = 3, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0xDF, }, { @@ -167,7 +167,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 7, .width = 18, .height = 3, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 0x115, }, { @@ -176,7 +176,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 10, .width = 18, .height = 3, - .paletteNum = 7, + .paletteNum = 0x7, .baseBlock = 0x14B, }, { @@ -185,7 +185,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 13, .width = 18, .height = 3, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 0x181, }, { @@ -194,7 +194,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x1DF, }, DUMMY_WIN_TEMPLATE @@ -208,7 +208,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 1, .width = 10, .height = 7, - .paletteNum = 3, + .paletteNum = 0x3, .baseBlock = 0x63, }, { @@ -217,7 +217,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 8, .width = 10, .height = 7, - .paletteNum = 4, + .paletteNum = 0x4, .baseBlock = 0xA9, }, { @@ -226,7 +226,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 1, .width = 18, .height = 3, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0xEF, }, { @@ -235,7 +235,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 5, .width = 18, .height = 3, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 0x125, }, { @@ -244,7 +244,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 9, .width = 18, .height = 3, - .paletteNum = 7, + .paletteNum = 0x7, .baseBlock = 0x15B, }, { @@ -253,7 +253,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 13, .width = 18, .height = 3, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 0x191, }, { @@ -262,7 +262,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x1DF, }, DUMMY_WIN_TEMPLATE @@ -276,7 +276,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 1, .width = 10, .height = 7, - .paletteNum = 3, + .paletteNum = 0x3, .baseBlock = 0x63, }, { @@ -285,7 +285,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 8, .width = 10, .height = 7, - .paletteNum = 4, + .paletteNum = 0x4, .baseBlock = 0xA9, }, { @@ -294,7 +294,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 2, .width = 18, .height = 3, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0xEF, }, { @@ -303,7 +303,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 5, .width = 18, .height = 3, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 0x125, }, { @@ -312,7 +312,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 9, .width = 18, .height = 3, - .paletteNum = 7, + .paletteNum = 0x7, .baseBlock = 0x15B, }, { @@ -321,7 +321,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 12, .width = 18, .height = 3, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 0x191, }, { @@ -330,7 +330,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x1DF, }, DUMMY_WIN_TEMPLATE @@ -344,7 +344,7 @@ static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] = .tilemapTop = 2, .width = 10, .height = 7, - .paletteNum = 3, + .paletteNum = 0x3, .baseBlock = 0x63, }, { @@ -353,7 +353,7 @@ static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] = .tilemapTop = 3, .width = 18, .height = 3, - .paletteNum = 5, + .paletteNum = 0x5, .baseBlock = 0xA9, }, { @@ -362,7 +362,7 @@ static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] = .tilemapTop = 6, .width = 18, .height = 3, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 0xDF, }, { @@ -371,7 +371,7 @@ static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] = .tilemapTop = 11, .width = 10, .height = 7, - .paletteNum = 4, + .paletteNum = 0x4, .baseBlock = 0x115, }, { @@ -380,7 +380,7 @@ static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] = .tilemapTop = 12, .width = 18, .height = 3, - .paletteNum = 7, + .paletteNum = 0x7, .baseBlock = 0x16B, }, { @@ -389,7 +389,7 @@ static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] = .tilemapTop = 15, .width = 18, .height = 3, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 0x1A1, }, DUMMY_WIN_TEMPLATE @@ -402,7 +402,7 @@ static const struct WindowTemplate sCancelButtonWindowTemplate = .tilemapTop = 17, .width = 6, .height = 2, - .paletteNum = 3, + .paletteNum = 0x3, .baseBlock = 0x1C7, }; @@ -413,7 +413,7 @@ static const struct WindowTemplate sMultiCancelButtonWindowTemplate = .tilemapTop = 18, .width = 6, .height = 2, - .paletteNum = 3, + .paletteNum = 0x3, .baseBlock = 0x1C7, }; @@ -424,7 +424,7 @@ static const struct WindowTemplate sConfirmButtonWindowTemplate = .tilemapTop = 16, .width = 6, .height = 2, - .paletteNum = 3, + .paletteNum = 0x3, .baseBlock = 0x1D3, }; @@ -435,7 +435,7 @@ static const struct WindowTemplate sDefaultPartyMsgWindowTemplate = .tilemapTop = 17, .width = 21, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x24F, }; @@ -446,7 +446,7 @@ static const struct WindowTemplate sDoWhatWithMonMsgWindowTemplate = .tilemapTop = 17, .width = 16, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x279, }; @@ -457,7 +457,7 @@ static const struct WindowTemplate sDoWhatWithItemMsgWindowTemplate = .tilemapTop = 17, .width = 20, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x299, }; @@ -468,7 +468,7 @@ static const struct WindowTemplate sDoWhatWithMailMsgWindowTemplate = .tilemapTop = 17, .width = 18, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x299, }; @@ -479,7 +479,7 @@ static const struct WindowTemplate sWhichMoveMsgWindowTemplate = .tilemapTop = 17, .width = 16, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x299, }; @@ -490,7 +490,7 @@ static const struct WindowTemplate sAlreadyHoldingOneMsgWindowTemplate = .tilemapTop = 15, .width = 20, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x299, }; @@ -501,7 +501,7 @@ static const struct WindowTemplate sItemGiveTakeWindowTemplate = .tilemapTop = 13, .width = 6, .height = 6, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x39D, }; @@ -512,7 +512,7 @@ static const struct WindowTemplate sMailReadTakeWindowTemplate = .tilemapTop = 13, .width = 8, .height = 6, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x39D, }; @@ -523,7 +523,7 @@ static const struct WindowTemplate sMoveSelectWindowTemplate = .tilemapTop = 11, .width = 10, .height = 8, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x2E9, }; @@ -534,7 +534,7 @@ static const struct WindowTemplate sPartyMenuYesNoWindowTemplate = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x2E9, }; @@ -545,7 +545,7 @@ static const struct WindowTemplate sLevelUpStatsWindowTemplate = .tilemapTop = 1, .width = 10, .height = 11, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x2E9, }; @@ -556,7 +556,7 @@ static const struct WindowTemplate sUnusedWindowTemplate1 = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x1DF, }; @@ -567,7 +567,7 @@ static const struct WindowTemplate sUnusedWindowTemplate2 = .tilemapTop = 13, .width = 18, .height = 3, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x39D, }; diff --git a/src/data/trade.h b/src/data/trade.h index 80d17a49ba..9cf4955bcc 100644 --- a/src/data/trade.h +++ b/src/data/trade.h @@ -463,7 +463,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 7, .width = 22, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 30 }, { @@ -472,7 +472,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 15, .width = 10, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 118 }, { @@ -481,7 +481,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 158 }, { @@ -490,7 +490,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 174 }, { @@ -499,7 +499,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 10, .width = 8, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 190 }, { @@ -508,7 +508,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 10, .width = 8, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 206 }, { @@ -517,7 +517,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 15, .width = 8, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 222 }, { @@ -526,7 +526,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 15, .width = 8, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 238 }, { @@ -535,7 +535,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 254 }, { @@ -544,7 +544,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 270 }, { @@ -553,7 +553,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 10, .width = 8, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 286 }, { @@ -562,7 +562,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 10, .width = 8, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 302 }, { @@ -571,7 +571,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 15, .width = 8, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 318 }, { @@ -580,7 +580,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 15, .width = 8, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 334 }, { @@ -589,7 +589,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 5, .width = 14, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 350 }, { @@ -598,7 +598,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 8, .width = 11, .height = 8, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 378 }, { @@ -607,7 +607,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 5, .width = 14, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 466 }, { @@ -616,7 +616,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 8, .width = 11, .height = 8, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 494 }, DUMMY_WIN_TEMPLATE, @@ -629,7 +629,7 @@ static const struct WindowTemplate sTradeYesNoWindowTemplate = .tilemapTop = 13, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 582 }; @@ -1112,7 +1112,7 @@ static const struct WindowTemplate sTradeSequenceWindowTemplates[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 64 }, DUMMY_WIN_TEMPLATE @@ -1125,7 +1125,7 @@ const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 188 }; diff --git a/src/data/union_room.h b/src/data/union_room.h index cf4b12b5d5..804a8435ff 100644 --- a/src/data/union_room.h +++ b/src/data/union_room.h @@ -627,7 +627,7 @@ static const struct WindowTemplate sWindowTemplate_BButtonCancel = { .tilemapTop = 0, .width = 30, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0008 }; @@ -669,7 +669,7 @@ static const struct WindowTemplate sWindowTemplate_PlayerList = { .tilemapTop = 3, .width = 13, .height = 8, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0044 }; @@ -679,7 +679,7 @@ static const struct WindowTemplate sWindowTemplate_5PlayerList = { .tilemapTop = 3, .width = 13, .height = 10, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0044 }; @@ -689,7 +689,7 @@ static const struct WindowTemplate sWindowTemplate_NumPlayerMode = { .tilemapTop = 3, .width = 7, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x00c6 }; @@ -728,7 +728,7 @@ static const struct WindowTemplate sWindowTemplate_GroupList = { .tilemapTop = 3, .width = 17, .height = 10, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0044 }; @@ -738,7 +738,7 @@ static const struct WindowTemplate sWindowTemplate_PlayerNameAndId = { .tilemapTop = 3, .width = 7, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x00ee }; @@ -788,7 +788,7 @@ static const struct WindowTemplate sWindowTemplate_InviteToActivity = { .tilemapTop = 5, .width = 16, .height = 8, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0001 }; @@ -826,7 +826,7 @@ static const struct WindowTemplate sWindowTemplate_RegisterForTrade = { .tilemapTop = 7, .width = 16, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0001 }; @@ -863,7 +863,7 @@ static const struct WindowTemplate sWindowTemplate_TradingBoardRequestType = { .tilemapTop = 1, .width = 16, .height = 12, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0001 }; @@ -915,7 +915,7 @@ static const struct WindowTemplate sWindowTemplate_TradingBoardHeader = { .tilemapTop = 1, .width = 28, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 0x0001 }; @@ -925,7 +925,7 @@ static const struct WindowTemplate sWindowTemplate_TradingBoardMain = { .tilemapTop = 5, .width = 28, .height = 12, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 0x0039 }; @@ -970,7 +970,7 @@ static const struct WindowTemplate sWindowTemplate_Unused = { .tilemapTop = 5, .width = 28, .height = 12, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 0x0039 }; diff --git a/src/daycare.c b/src/daycare.c index 19d5edbb2c..57119c3ca7 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -46,7 +46,7 @@ static const struct WindowTemplate sDaycareLevelMenuWindowTemplate = .tilemapTop = 1, .width = 14, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 8 }; diff --git a/src/decoration.c b/src/decoration.c index cc740f189e..684e67bc87 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -263,7 +263,7 @@ static const struct WindowTemplate sDecorationWindowTemplates[WINDOW_COUNT] = .tilemapTop = 1, .width = 18, .height = 2 * ARRAY_COUNT(sDecorationMainMenuActions), - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0001 }, { @@ -272,7 +272,7 @@ static const struct WindowTemplate sDecorationWindowTemplates[WINDOW_COUNT] = .tilemapTop = 1, .width = 13, .height = 18, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 0x0091 }, { @@ -281,7 +281,7 @@ static const struct WindowTemplate sDecorationWindowTemplates[WINDOW_COUNT] = .tilemapTop = 1, .width = 12, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x017b }, { @@ -290,7 +290,7 @@ static const struct WindowTemplate sDecorationWindowTemplates[WINDOW_COUNT] = .tilemapTop = 13, .width = 13, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0193 } }; @@ -687,7 +687,7 @@ static void ReturnToDecorationActionsAfterInvalidSelection(u8 taskId) static void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId) { - LoadPalette(sDecorationMenuPalette, 0xd0, 0x20); + LoadPalette(sDecorationMenuPalette, BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); ClearDialogWindowAndFrame(0, FALSE); RemoveDecorationWindow(WINDOW_MAIN_MENU); InitDecorationCategoriesWindow(taskId); @@ -833,7 +833,7 @@ static void ReturnToActionsMenuFromCategories(u8 taskId) void ShowDecorationCategoriesWindow(u8 taskId) { - LoadPalette(sDecorationMenuPalette, 0xd0, 0x20); + LoadPalette(sDecorationMenuPalette, BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); ClearDialogWindowAndFrame(0, FALSE); gTasks[taskId].tDecorationMenuCommand = DECOR_MENU_TRADE; sCurDecorationCategory = DECORCAT_DESK; diff --git a/src/diploma.c b/src/diploma.c index ce31578dcb..5fe8aef83d 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -72,7 +72,7 @@ void CB2_ShowDiploma(void) ResetSpriteData(); ResetPaletteFade(); FreeAllSpritePalettes(); - LoadPalette(sDiplomaPalettes, 0, 64); + LoadPalette(sDiplomaPalettes, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); sDiplomaTilemapPtr = malloc(0x1000); InitDiplomaBg(); InitDiplomaWindow(); @@ -186,7 +186,7 @@ static const struct WindowTemplate sDiplomaWinTemplates[2] = .tilemapTop = 2, .width = 20, .height = 16, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1, }, DUMMY_WIN_TEMPLATE, @@ -196,7 +196,7 @@ static void InitDiplomaWindow(void) { InitWindows(sDiplomaWinTemplates); DeactivateAllTextPrinters(); - LoadPalette(gStandardMenuPalette, 0xF0, 0x20); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); } diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 11bf12925b..e1fe5248f1 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -2931,7 +2931,7 @@ static const struct WindowTemplate sWindowTemplates_Records = .tilemapTop = 1, .width = 20, .height = 11, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x1, }; @@ -3005,7 +3005,7 @@ static void PrintRecordsText(u8 windowId, s32 width) recordNums[1] = gSaveBlock2Ptr->berryPick.bestScore; recordNums[2] = gSaveBlock2Ptr->berryPick.berriesPickedInRow; - LoadUserWindowBorderGfx_(windowId, 0x21D, 0xD0); + LoadUserWindowBorderGfx_(windowId, 0x21D, BG_PLTT_ID(0xD)); DrawTextBorderOuter(windowId, 0x21D, 0xD); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_BerryPickingRecords, GetStringCenterAlignXOffset(FONT_NORMAL, gText_BerryPickingRecords, width * 8), 1, TEXT_SKIP_DRAW, NULL); @@ -3401,7 +3401,7 @@ static const struct WindowTemplate sWindowTemplates_Results[] = .tilemapTop = 1, .width = 28, .height = 2, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 0x13, }, { @@ -3410,7 +3410,7 @@ static const struct WindowTemplate sWindowTemplates_Results[] = .tilemapTop = 5, .width = 28, .height = 14, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 0x4B, } }; @@ -3422,7 +3422,7 @@ static const struct WindowTemplate sWindowTemplate_Prize = .tilemapTop = 5, .width = 28, .height = 7, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 0x4B, }; @@ -3439,7 +3439,7 @@ static const struct WindowTemplate sWindowTemplates_PlayAgain[] = .tilemapTop = 8, .width = 19, .height = 3, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 0x13, }, [WIN_YES_NO] = { @@ -3448,7 +3448,7 @@ static const struct WindowTemplate sWindowTemplates_PlayAgain[] = .tilemapTop = 7, .width = 6, .height = 4, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 0x4C, } }; @@ -3460,7 +3460,7 @@ static const struct WindowTemplate sWindowTemplate_DroppedOut = .tilemapTop = 6, .width = 22, .height = 5, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 0x13, }; @@ -3471,7 +3471,7 @@ static const struct WindowTemplate sWindowTemplate_CommStandby = .tilemapTop = 8, .width = 19, .height = 3, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 0x13, }; @@ -4429,12 +4429,12 @@ static void ResetBerryAndStatusBarSprites(void) static void LoadWindowFrameGfx(u8 frameId) { LoadBgTiles(BG_INTERFACE, GetWindowFrameTilesPal(frameId)->tiles, 0x120, 1); - LoadPalette(GetWindowFrameTilesPal(frameId)->pal, 0xA0, 0x20); + LoadPalette(GetWindowFrameTilesPal(frameId)->pal, BG_PLTT_ID(0xA), PLTT_SIZE_4BPP); } static void LoadUserWindowFrameGfx(void) { - LoadUserWindowBorderGfx_(0, 0xA, 0xB0); + LoadUserWindowBorderGfx_(0, 0xA, BG_PLTT_ID(0xB)); } static void ResetGfxState(void) @@ -4448,7 +4448,7 @@ static void ResetGfxState(void) static void DrawYesNoMessageWindow(const struct WindowTemplate *template) { - u8 pal = 10; + u8 pal = 0xA; FillBgTilemapBufferRect(BG_INTERFACE, 1, template->tilemapLeft - 1, template->tilemapTop - 1, 1, 1, pal); FillBgTilemapBufferRect(BG_INTERFACE, 2, template->tilemapLeft, template->tilemapTop - 1, template->width, 1, pal); @@ -4462,7 +4462,7 @@ static void DrawYesNoMessageWindow(const struct WindowTemplate *template) static void DrawMessageWindow(const struct WindowTemplate *template) { - u8 pal = 11; + u8 pal = 0xB; FillBgTilemapBufferRect(BG_INTERFACE, 10, template->tilemapLeft - 1, template->tilemapTop - 1, 1, 1, pal); FillBgTilemapBufferRect(BG_INTERFACE, 11, template->tilemapLeft, template->tilemapTop - 1, template->width, 1, pal); @@ -4634,7 +4634,7 @@ static void ShowNames(void) window.bg = BG_INTERFACE; window.width = 7; window.height = 2; - window.paletteNum = 13; + window.paletteNum = 0xD; window.baseBlock = 0x13; for (i = 0; i < numPlayers; coords++, i++) { @@ -5193,7 +5193,7 @@ static bool32 LoadBgGfx(void) switch (sGfx->loadState) { case 0: - LoadPalette(sBg_Pal, 0, sizeof(sBg_Pal)); + LoadPalette(sBg_Pal, BG_PLTT_ID(0x0), sizeof(sBg_Pal)); break; case 1: ResetTempTileDataBuffers(); @@ -5209,7 +5209,7 @@ static bool32 LoadBgGfx(void) return FALSE; break; case 5: - LoadPalette(GetTextWindowPalette(3), 0xD0, 0x20); + LoadPalette(GetTextWindowPalette(3), BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); break; default: sGfx->loadState = 0; diff --git a/src/easy_chat.c b/src/easy_chat.c index 91b44fb26b..574ed22ee5 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -820,7 +820,7 @@ static const struct WindowTemplate sEasyChatWindowTemplates[] = { .tilemapTop = 0, .width = 18, .height = 2, - .paletteNum = 10, + .paletteNum = 0xA, .baseBlock = 0x10, }, { @@ -829,7 +829,7 @@ static const struct WindowTemplate sEasyChatWindowTemplates[] = { .tilemapTop = 15, .width = 24, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0xA, }, { @@ -838,7 +838,7 @@ static const struct WindowTemplate sEasyChatWindowTemplates[] = { .tilemapTop = 0, .width = 28, .height = 32, - .paletteNum = 3, + .paletteNum = 0x3, .baseBlock = 0, }, DUMMY_WIN_TEMPLATE, @@ -850,7 +850,7 @@ static const struct WindowTemplate sEasyChatYesNoWindowTemplate = { .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x6A, }; @@ -3911,13 +3911,13 @@ static void InitEasyChatBgs(void) static void LoadEasyChatPalettes(void) { ResetPaletteFade(); - LoadPalette(gEasyChatMode_Pal, 0, 32); - LoadPalette(sTextInputFrameOrange_Pal, 1 * 16, 32); - LoadPalette(sTextInputFrameGreen_Pal, 4 * 16, 32); - LoadPalette(sTitleText_Pal, 10 * 16, 8); - LoadPalette(sText_Pal, 11 * 16, 12); - LoadPalette(sText_Pal, 15 * 16, 12); - LoadPalette(sText_Pal, 3 * 16, 12); + LoadPalette(gEasyChatMode_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(sTextInputFrameOrange_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + LoadPalette(sTextInputFrameGreen_Pal, BG_PLTT_ID(0x4), PLTT_SIZE_4BPP); + LoadPalette(sTitleText_Pal, BG_PLTT_ID(0xA), PLTT_SIZEOF(4)); + LoadPalette(sText_Pal, BG_PLTT_ID(0xB), PLTT_SIZEOF(6)); + LoadPalette(sText_Pal, BG_PLTT_ID(0xF), PLTT_SIZEOF(6)); + LoadPalette(sText_Pal, BG_PLTT_ID(0x3), PLTT_SIZEOF(6)); } static void PrintTitle(void) @@ -3951,8 +3951,8 @@ static void PrintEasyChatTextWithColors(u8 windowId, u8 fontId, const u8 *str, u static void PrintInitialInstructions(void) { FillBgTilemapBufferRect(0, 0, 0, 0, 32, 20, 17); - LoadUserWindowBorderGfx(1, 1, 0xE0); - DrawTextBorderOuter(1, 1, 14); + LoadUserWindowBorderGfx(1, 1, BG_PLTT_ID(0xE)); + DrawTextBorderOuter(1, 1, 0xE); PrintEasyChatStdMessage(MSG_INSTRUCTIONS); PutWindowTilemap(1); CopyBgTilemapBufferToVram(0); @@ -4024,7 +4024,7 @@ static void AddPhraseWindow(void) template.tilemapTop = sPhraseFrameDimensions[frameId].top; template.width = sPhraseFrameDimensions[frameId].width; template.height = sPhraseFrameDimensions[frameId].height; - template.paletteNum = 11; + template.paletteNum = 0xB; template.baseBlock = 0x6C; sScreenControl->windowId = AddWindow(&template); PutWindowTilemap(sScreenControl->windowId); @@ -5069,7 +5069,7 @@ static void AddMainScreenButtonWindow(void) template.tilemapTop = 11; template.width = 28; template.height = 2; - template.paletteNum = 11; + template.paletteNum = 0xB; template.baseBlock = 0x34; windowId = AddWindow(&template); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); diff --git a/src/egg_hatch.c b/src/egg_hatch.c index d714fb9505..1832ec2156 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -264,7 +264,7 @@ static const struct WindowTemplate sWinTemplates_EggHatch[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 64 }, DUMMY_WIN_TEMPLATE @@ -277,7 +277,7 @@ static const struct WindowTemplate sYesNoWinTemplate = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 424 }; @@ -532,7 +532,7 @@ static void CB2_LoadEggHatch(void) case 2: DecompressAndLoadBgGfxUsingHeap(0, gBattleTextboxTiles, 0, 0, 0); CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); - LoadCompressedPalette(gBattleTextboxPalette, 0, 0x20); + LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); gMain.state++; break; case 3: @@ -556,7 +556,7 @@ static void CB2_LoadEggHatch(void) break; case 7: SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); - LoadPalette(gTradeGba2_Pal, 0x10, 0xA0); + LoadPalette(gTradeGba2_Pal, BG_PLTT_ID(0x1), 5 * PLTT_SIZE_4BPP); LoadBgTiles(1, gTradeGba_Gfx, 0x1420, 0); CopyToBgTilemapBuffer(1, gTradePlatform_Tilemap, 0x1000, 0); CopyBgTilemapBufferToVram(1); @@ -678,7 +678,7 @@ static void CB2_EggHatch(void) // Print the nickname prompt if (!IsTextPrinterActive(sEggHatchData->windowId)) { - LoadUserWindowBorderGfx(sEggHatchData->windowId, 0x140, 0xE0); + LoadUserWindowBorderGfx(sEggHatchData->windowId, 0x140, BG_PLTT_ID(0xE)); CreateYesNoMenu(&sYesNoWinTemplate, 0x140, 0xE, 0); sEggHatchData->state++; } diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 69377cac61..eaca44a7ae 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -2005,7 +2005,7 @@ void PatchObjectPalette(u16 paletteTag, u8 paletteSlot) { u8 paletteIndex = FindObjectEventPaletteIndexByTag(paletteTag); - LoadPalette(sObjectEventSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20); + LoadPalette(sObjectEventSpritePalettes[paletteIndex].data, OBJ_PLTT_ID(paletteSlot), PLTT_SIZE_4BPP); } void PatchObjectPaletteRange(const u16 *paletteTags, u8 minSlot, u8 maxSlot) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 2c4e225c1b..9ca441bc4f 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -263,7 +263,7 @@ void EvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, bool8 canStopEvo, u gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_LEFT], currSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(currSpecies, trainerId, personality); - LoadCompressedPalette(pokePal->data, 0x110, 0x20); + LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(0x1), PLTT_SIZE_4BPP); SetMultiuseSpriteTemplateToPokemon(currSpecies, B_POSITION_OPPONENT_LEFT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; @@ -278,7 +278,7 @@ void EvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, bool8 canStopEvo, u gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT], postEvoSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); - LoadCompressedPalette(pokePal->data, 0x120, 0x20); + LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(0x2), PLTT_SIZE_4BPP); SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; @@ -356,7 +356,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) postEvoSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); - LoadCompressedPalette(pokePal->data, 0x120, 0x20); + LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(0x2), PLTT_SIZE_4BPP); SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; @@ -427,7 +427,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT], postEvoSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); - LoadCompressedPalette(pokePal->data, 0x120, 0x20); + LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(0x2), PLTT_SIZE_4BPP); gMain.state++; } break; @@ -492,7 +492,7 @@ void TradeEvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, u8 preEvoSprit postEvoSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); - LoadCompressedPalette(pokePal->data, 0x120, 0x20); + LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(0x2), PLTT_SIZE_4BPP); SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_LEFT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; @@ -1301,7 +1301,7 @@ static void Task_TradeEvolutionScene(u8 taskId) case T_MVSTATE_PRINT_YES_NO: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - LoadUserWindowBorderGfx(0, 0xA8, 0xE0); + LoadUserWindowBorderGfx(0, 0xA8, BG_PLTT_ID(0xE)); CreateYesNoMenu(&gTradeEvolutionSceneYesNoWindowTemplate, 0xA8, 0xE, 0); sEvoCursorPos = 0; gTasks[taskId].tLearnMoveState++; @@ -1507,7 +1507,7 @@ static void Task_UpdateBgPalette(u8 taskId) else { // Haven't reached final palette in current stage, load the current palette - LoadPalette(&sBgAnimPal[tPalStage * 16], 0xA0, 0x20); + LoadPalette(&sBgAnimPal[tPalStage * 16], BG_PLTT_ID(0xA), PLTT_SIZE_4BPP); tCycleTimer = 0; tPalStage++; } @@ -1605,7 +1605,7 @@ static void StartBgAnimation(bool8 isLink) else innerBgId = 1, outerBgId = 3; - LoadPalette(sBgAnim_Intro_Pal, 0xA0, 0x20); + LoadPalette(sBgAnim_Intro_Pal, BG_PLTT_ID(0xA), PLTT_SIZE_4BPP); DecompressAndLoadBgGfxUsingHeap(1, sBgAnim_Gfx, FALSE, 0, 0); CopyToBgTilemapBuffer(innerBgId, sBgAnim_Inner_Tilemap, 0, 0); @@ -1644,7 +1644,7 @@ static void PauseBgPaletteAnim(void) if (taskId != TASK_NONE) gTasks[taskId].tPaused = TRUE; - FillPalette(RGB_BLACK, 0xA0, 0x20); + FillPalette(RGB_BLACK, BG_PLTT_ID(0xA), PLTT_SIZE_4BPP); } #undef tPaused @@ -1658,7 +1658,7 @@ static void StopBgAnimation(void) if ((taskId = FindTaskIdByFunc(Task_AnimateBg)) != TASK_NONE) DestroyTask(taskId); - FillPalette(RGB_BLACK, 0xA0, 0x20); + FillPalette(RGB_BLACK, BG_PLTT_ID(0xA), PLTT_SIZE_4BPP); RestoreBgAfterAnim(); } diff --git a/src/field_effect.c b/src/field_effect.c index ba917b5654..242d55770f 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -893,7 +893,7 @@ u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buf void LoadTrainerGfx_TrainerCard(u8 gender, u16 palOffset, u8 *dest) { LZDecompressVram(gTrainerFrontPicTable[gender].data, dest); - LoadCompressedPalette(gTrainerFrontPicPaletteTable[gender].data, palOffset, 0x20); + LoadCompressedPalette(gTrainerFrontPicPaletteTable[gender].data, palOffset, PLTT_SIZE_4BPP); } u8 AddNewGameBirchObject(s16 x, s16 y, u8 subpriority) @@ -2620,7 +2620,7 @@ static void FieldMoveShowMonOutdoorsEffect_LoadGfx(struct Task *task) u16 delta = ((REG_BG0CNT >> 8) << 11); CpuCopy16(sFieldMoveStreaksOutdoors_Gfx, (void *)(VRAM + offset), 0x200); CpuFill32(0, (void *)(VRAM + delta), 0x800); - LoadPalette(sFieldMoveStreaksOutdoors_Pal, 0xf0, sizeof(sFieldMoveStreaksOutdoors_Pal)); + LoadPalette(sFieldMoveStreaksOutdoors_Pal, BG_PLTT_ID(0xF), sizeof(sFieldMoveStreaksOutdoors_Pal)); LoadFieldMoveOutdoorStreaksTilemap(delta); task->tState++; } @@ -2783,7 +2783,7 @@ static void FieldMoveShowMonIndoorsEffect_LoadGfx(struct Task *task) task->data[12] = delta; CpuCopy16(sFieldMoveStreaksIndoors_Gfx, (void *)(VRAM + offset), 0x80); CpuFill32(0, (void *)(VRAM + delta), 0x800); - LoadPalette(sFieldMoveStreaksIndoors_Pal, 0xf0, sizeof(sFieldMoveStreaksIndoors_Pal)); + LoadPalette(sFieldMoveStreaksIndoors_Pal, BG_PLTT_ID(0xF), sizeof(sFieldMoveStreaksIndoors_Pal)); task->tState++; } @@ -3082,7 +3082,7 @@ u8 FldEff_RayquazaSpotlight(void) SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(14, 14)); SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); - LoadPalette(sSpotlight_Pal, 0xC0, sizeof(sSpotlight_Pal)); + LoadPalette(sSpotlight_Pal, BG_PLTT_ID(0xC), sizeof(sSpotlight_Pal)); SetGpuReg(REG_OFFSET_BG0VOFS, 120); for (i = 3; i < 15; i++) { diff --git a/src/field_region_map.c b/src/field_region_map.c index 5e14920fba..cd728aef79 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -72,7 +72,7 @@ static const struct WindowTemplate sFieldRegionMapWindowTemplates[] = .tilemapTop = 17, .width = 12, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }, { @@ -81,7 +81,7 @@ static const struct WindowTemplate sFieldRegionMapWindowTemplates[] = .tilemapTop = 1, .width = 7, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 25 }, DUMMY_WIN_TEMPLATE @@ -115,7 +115,7 @@ static void MCB2_InitRegionMapRegisters(void) InitBgsFromTemplates(1, sFieldRegionMapBgTemplates, ARRAY_COUNT(sFieldRegionMapBgTemplates)); InitWindows(sFieldRegionMapWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 0x27, 0xd0); + LoadUserWindowBorderGfx(0, 0x27, BG_PLTT_ID(0xD)); ClearScheduledBgCopiesToVram(); SetMainCallback2(MCB2_FieldUpdateRegionMap); SetVBlankCallback(VBCB_FieldUpdateRegionMap); diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 948d812e81..2192aa574b 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -1079,9 +1079,7 @@ static void LoadOrbEffectPalette(bool8 blueOrb) color[0] = RGB_BLUE; for (i = 0; i < 16; i++) - { - LoadPalette(color, 0xF0 + i, 2); - } + LoadPalette(color, BG_PLTT_ID(0xF) + i, PLTT_SIZEOF(1)); } static bool8 UpdateOrbEffectBlend(u16 shakeDir) diff --git a/src/field_specials.c b/src/field_specials.c index 7c226e7a39..74c4a5e7ac 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -583,16 +583,16 @@ static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEvent switch (graphicsId) { case OBJ_EVENT_GFX_LINK_RS_BRENDAN: - LoadPalette(gObjectEventPal_RubySapphireBrendan, 0x100 + (adjustedPaletteNum << 4), 0x20); + LoadPalette(gObjectEventPal_RubySapphireBrendan, OBJ_PLTT_ID(adjustedPaletteNum), PLTT_SIZE_4BPP); break; case OBJ_EVENT_GFX_LINK_RS_MAY: - LoadPalette(gObjectEventPal_RubySapphireMay, 0x100 + (adjustedPaletteNum << 4), 0x20); + LoadPalette(gObjectEventPal_RubySapphireMay, OBJ_PLTT_ID(adjustedPaletteNum), PLTT_SIZE_4BPP); break; case OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL: - LoadPalette(gObjectEventPal_Brendan, 0x100 + (adjustedPaletteNum << 4), 0x20); + LoadPalette(gObjectEventPal_Brendan, OBJ_PLTT_ID(adjustedPaletteNum), PLTT_SIZE_4BPP); break; case OBJ_EVENT_GFX_RIVAL_MAY_NORMAL: - LoadPalette(gObjectEventPal_May, 0x100 + (adjustedPaletteNum << 4), 0x20); + LoadPalette(gObjectEventPal_May, OBJ_PLTT_ID(adjustedPaletteNum), PLTT_SIZE_4BPP); break; } } @@ -1638,7 +1638,7 @@ const struct WindowTemplate gElevatorFloor_WindowTemplate = .tilemapTop = 1, .width = 8, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 8, }; @@ -2845,7 +2845,7 @@ void ShowBattlePointsWindow(void) .tilemapTop = 1, .width = 6, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 8, }; @@ -2891,7 +2891,7 @@ void ShowFrontierExchangeCornerItemIconWindow(void) .tilemapTop = 9, .width = 4, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 20, }; @@ -3031,7 +3031,7 @@ static void ShowBattleFrontierTutorWindow(u8 menu, u16 selection) .tilemapTop = 7, .width = 12, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 28, }; @@ -3266,7 +3266,7 @@ static void Task_DeoxysRockInteraction(u8 taskId) static void ChangeDeoxysRockLevel(u8 rockLevel) { u8 objectEventId; - LoadPalette(&sDeoxysRockPalettes[rockLevel], 0x1A0, 8); + LoadPalette(&sDeoxysRockPalettes[rockLevel], OBJ_PLTT_ID(0xA), PLTT_SIZEOF(4)); TryGetObjectEventIdByLocalIdAndMap(LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); if (rockLevel == 0) @@ -3314,7 +3314,7 @@ void IncrementBirthIslandRockStepCount(void) void SetDeoxysRockPalette(void) { - LoadPalette(&sDeoxysRockPalettes[(u8)VarGet(VAR_DEOXYS_ROCK_LEVEL)], 0x1A0, 8); + LoadPalette(&sDeoxysRockPalettes[(u8)VarGet(VAR_DEOXYS_ROCK_LEVEL)], OBJ_PLTT_ID(0xA), PLTT_SIZEOF(4)); BlendPalettes(0x04000000, 16, 0); } diff --git a/src/field_weather.c b/src/field_weather.c index f7a7f81291..164da8343d 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -545,7 +545,7 @@ static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaI u8 gBlend = color.g; u8 bBlend = color.b; - palOffset = startPalIndex * 16; + palOffset = BG_PLTT_ID(startPalIndex); numPalettes += startPalIndex; gammaIndex--; curPalIndex = startPalIndex; @@ -556,7 +556,7 @@ static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaI { // No gamma shift. Simply blend the colors. BlendPalette(palOffset, 16, blendCoeff, blendColor); - palOffset += 16; + palOffset += 0x10; } else { @@ -601,14 +601,14 @@ static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 bl rBlend = color.r; gBlend = color.g; bBlend = color.b; - palOffset = 0; + palOffset = 0x00; for (curPalIndex = 0; curPalIndex < 32; curPalIndex++) { if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) { // No gamma shift. Simply blend the colors. BlendPalette(palOffset, 16, blendCoeff, blendColor); - palOffset += 16; + palOffset += 0x10; } else { @@ -649,7 +649,7 @@ static void ApplyFogBlend(u8 blendCoeff, u16 blendColor) u8 bBlend; u16 curPalIndex; - BlendPalette(0, 256, blendCoeff, blendColor); + BlendPalette(BG_PLTT_ID(0x0), 16 * 16, blendCoeff, blendColor); color = *(struct RGBColor *)&blendColor; rBlend = color.r; gBlend = color.g; @@ -683,7 +683,7 @@ static void ApplyFogBlend(u8 blendCoeff, u16 blendColor) } else { - BlendPalette(curPalIndex * 16, 16, blendCoeff, blendColor); + BlendPalette(PLTT_ID(curPalIndex), 16, blendCoeff, blendColor); } } } @@ -823,8 +823,8 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) } break; case WEATHER_PAL_STATE_SCREEN_FADING_OUT: - paletteIndex *= 16; - CpuFastCopy(gPlttBufferFaded + paletteIndex, gPlttBufferUnfaded + paletteIndex, 32); + paletteIndex = PLTT_ID(paletteIndex); + CpuFastCopy(gPlttBufferFaded + paletteIndex, gPlttBufferUnfaded + paletteIndex, PLTT_SIZE_4BPP); BlendPalette(paletteIndex, 16, gPaletteFade.y, gPaletteFade.blendColor); break; // WEATHER_PAL_STATE_CHANGING_WEATHER @@ -836,7 +836,7 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) } else { - paletteIndex *= 16; + paletteIndex = PLTT_ID(paletteIndex); BlendPalette(paletteIndex, 16, 12, RGB(28, 31, 28)); } break; @@ -859,7 +859,7 @@ static bool8 IsFirstFrameOfWeatherFadeIn(void) void LoadCustomWeatherSpritePalette(const u16 *palette) { - LoadPalette(palette, 0x100 + gWeatherPtr->weatherPicSpritePalIndex * 16, 32); + LoadPalette(palette, OBJ_PLTT_ID(gWeatherPtr->weatherPicSpritePalIndex), PLTT_SIZE_4BPP); UpdateSpritePaletteWithWeather(gWeatherPtr->weatherPicSpritePalIndex); } diff --git a/src/fieldmap.c b/src/fieldmap.c index 2b981dc6e5..479150d489 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -878,13 +878,13 @@ void LoadTilesetPalette(struct Tileset const *tileset, u16 destOffset, u16 size) { if (tileset->isSecondary == FALSE) { - LoadPalette(&black, destOffset, 2); - LoadPalette(((u16 *)tileset->palettes) + 1, destOffset + 1, size - 2); - FieldmapPaletteDummy(destOffset + 1, (size - 2) >> 1); + LoadPalette(&black, destOffset, PLTT_SIZEOF(1)); + LoadPalette(((u16 *)tileset->palettes) + 1, destOffset + 1, size - PLTT_SIZEOF(1)); + FieldmapPaletteDummy(destOffset + 1, (size - PLTT_SIZEOF(1)) >> 1); } else if (tileset->isSecondary == TRUE) { - LoadPalette(((u16 *)tileset->palettes) + (NUM_PALS_IN_PRIMARY * 16), destOffset, size); + LoadPalette(((u16 *)tileset->palettes) + BG_PLTT_ID(NUM_PALS_IN_PRIMARY), destOffset, size); FieldmapPaletteDummy(destOffset, size >> 1); } else @@ -912,12 +912,12 @@ void CopySecondaryTilesetToVramUsingHeap(struct MapLayout const *mapLayout) static void LoadPrimaryTilesetPalette(struct MapLayout const *mapLayout) { - LoadTilesetPalette(mapLayout->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2); + LoadTilesetPalette(mapLayout->primaryTileset, BG_PLTT_ID(0x0), NUM_PALS_IN_PRIMARY * PLTT_SIZE_4BPP); } void LoadSecondaryTilesetPalette(struct MapLayout const *mapLayout) { - LoadTilesetPalette(mapLayout->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2); + LoadTilesetPalette(mapLayout->secondaryTileset, BG_PLTT_ID(NUM_PALS_IN_PRIMARY), (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * PLTT_SIZE_4BPP); } void CopyMapTilesetsToVram(struct MapLayout const *mapLayout) diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index abdca2a88a..3790636ea2 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -218,8 +218,8 @@ static void Task_ExitCaveTransition2(u8 taskId) SetGpuReg(REG_OFFSET_DISPCNT, 0); LZ77UnCompVram(sCaveTransitionTiles, (void *)(VRAM + 0xC000)); LZ77UnCompVram(sCaveTransitionTilemap, (void *)(VRAM + 0xF800)); - LoadPalette(sCaveTransitionPalette_White, 0xE0, 0x20); - LoadPalette(sCaveTransitionPalette_Exit, 0xE0, 0x10); + LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); + LoadPalette(sCaveTransitionPalette_Exit, BG_PLTT_ID(0xE), 0x10); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 @@ -270,11 +270,11 @@ static void Task_ExitCaveTransition4(u8 taskId) if (count < 8) { gTasks[taskId].data[2]++; - LoadPalette(&sCaveTransitionPalette_Exit[count], 0xE0, 16 - 2 * count); + LoadPalette(&sCaveTransitionPalette_Exit[count], BG_PLTT_ID(0xE), PLTT_SIZEOF(8) - PLTT_SIZEOF(count)); } else { - LoadPalette(sCaveTransitionPalette_White, 0, 0x20); + LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); gTasks[taskId].func = Task_ExitCaveTransition5; gTasks[taskId].data[2] = 8; } @@ -315,8 +315,8 @@ static void Task_EnterCaveTransition2(u8 taskId) | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_OBJ_ON); - LoadPalette(sCaveTransitionPalette_White, 0xE0, 0x20); - LoadPalette(sCaveTransitionPalette_Black, 0, 0x20); + LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); + LoadPalette(sCaveTransitionPalette_Black, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); gTasks[taskId].func = Task_EnterCaveTransition3; gTasks[taskId].data[0] = 16; gTasks[taskId].data[1] = 0; @@ -331,7 +331,7 @@ static void Task_EnterCaveTransition3(u8 taskId) { gTasks[taskId].data[2]++; gTasks[taskId].data[2]++; - LoadPalette(&sCaveTransitionPalette_Enter[15 - count], 0xE0, 2 * (count + 1)); + LoadPalette(&sCaveTransitionPalette_Enter[15 - count], BG_PLTT_ID(0xE), PLTT_SIZEOF(count + 1)); } else { @@ -359,7 +359,7 @@ static void Task_EnterCaveTransition4(u8 taskId) } else { - LoadPalette(sCaveTransitionPalette_Black, 0, 0x20); + LoadPalette(sCaveTransitionPalette_Black, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); SetMainCallback2(gMain.savedCallback); } } diff --git a/src/frontier_pass.c b/src/frontier_pass.c index b143587415..48d4a5fce2 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -253,7 +253,7 @@ static const struct WindowTemplate sPassWindowTemplates[WINDOW_COUNT] = .tilemapTop = 3, .width = 12, .height = 3, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x1, }, [WINDOW_BATTLE_RECORD] = { @@ -262,7 +262,7 @@ static const struct WindowTemplate sPassWindowTemplates[WINDOW_COUNT] = .tilemapTop = 10, .width = 12, .height = 3, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x26, }, [WINDOW_BATTLE_POINTS] = { @@ -271,7 +271,7 @@ static const struct WindowTemplate sPassWindowTemplates[WINDOW_COUNT] = .tilemapTop = 13, .width = 12, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x4B, }, [WINDOW_DESCRIPTION] = { @@ -280,7 +280,7 @@ static const struct WindowTemplate sPassWindowTemplates[WINDOW_COUNT] = .tilemapTop = 18, .width = 30, .height = 3, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x7C, }, DUMMY_WIN_TEMPLATE @@ -294,7 +294,7 @@ static const struct WindowTemplate sMapWindowTemplates[] = .tilemapTop = 1, .width = 15, .height = 5, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x1, }, [MAP_WINDOW_NAME] = { @@ -303,7 +303,7 @@ static const struct WindowTemplate sMapWindowTemplates[] = .tilemapTop = 1, .width = 10, .height = 14, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x4D, }, [MAP_WINDOW_DESCRIPTION] = { @@ -312,7 +312,7 @@ static const struct WindowTemplate sMapWindowTemplates[] = .tilemapTop = 16, .width = 26, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0xDA, }, DUMMY_WIN_TEMPLATE @@ -768,9 +768,9 @@ static bool32 InitFrontierPass(void) CopyBgTilemapBufferToVram(2); break; case 8: - LoadPalette(gFrontierPassBg_Pal[0], 0, 0x1A0); - LoadPalette(gFrontierPassBg_Pal[1 + sPassData->trainerStars], 0x10, 0x20); - LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20); + LoadPalette(gFrontierPassBg_Pal[0], 0, 13 * PLTT_SIZE_4BPP); + LoadPalette(gFrontierPassBg_Pal[1 + sPassData->trainerStars], BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + LoadPalette(GetTextWindowPalette(0), BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); DrawFrontierPassBg(); UpdateAreaHighlight(sPassData->cursorArea, sPassData->previousCursorArea); if (sPassData->areaToShow == CURSOR_AREA_MAP || sPassData->areaToShow == CURSOR_AREA_CARD) @@ -1412,8 +1412,8 @@ static bool32 InitFrontierMap(void) case 5: if (FreeTempTileDataBuffersIfPossible()) return FALSE; - LoadPalette(gFrontierPassBg_Pal[0], 0, 0x1A0); - LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20); + LoadPalette(gFrontierPassBg_Pal[0], BG_PLTT_ID(0x0), 13 * PLTT_SIZE_4BPP); + LoadPalette(GetTextWindowPalette(0), BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); CopyToBgTilemapBuffer(2, sMapScreen_Tilemap, 0, 0); CopyBgTilemapBufferToVram(2); break; diff --git a/src/frontier_util.c b/src/frontier_util.c index f5dde452fc..9f8c030231 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -638,7 +638,7 @@ static const struct WindowTemplate sFrontierResultsWindowTemplate = .tilemapTop = 1, .width = 28, .height = 18, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }; @@ -649,7 +649,7 @@ static const struct WindowTemplate sLinkContestResultsWindowTemplate = .tilemapTop = 2, .width = 26, .height = 15, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }; @@ -660,7 +660,7 @@ static const struct WindowTemplate sRankingHallRecordsWindowTemplate = .tilemapTop = 1, .width = 26, .height = 17, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 8be5372e98..07bbf9bb88 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -140,7 +140,7 @@ static const struct WindowTemplate sHof_WindowTemplate = { .tilemapTop = 2, .width = 14, .height = 6, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 1 }; @@ -702,8 +702,8 @@ static void Task_Hof_DisplayPlayer(u8 taskId) ShowBg(3); gTasks[taskId].tPlayerSpriteID = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId_Debug(gSaveBlock2Ptr->playerGender, TRUE), TRUE, 120, 72, 6, TAG_NONE); AddWindow(&sHof_WindowTemplate); - LoadWindowGfx(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0); - LoadPalette(GetTextWindowPalette(1), 0xE0, 0x20); + LoadWindowGfx(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, BG_PLTT_ID(0xD)); + LoadPalette(GetTextWindowPalette(1), BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); gTasks[taskId].tFrameCount = 120; gTasks[taskId].func = Task_Hof_WaitAndPrintPlayerInfo; } @@ -1269,7 +1269,7 @@ static void ClearVramOamPltt_LoadHofPal(void) DmaFill16(3, 0, plttOffset, plttSize); ResetPaletteFade(); - LoadPalette(sHallOfFame_Pal, 0, 0x20); + LoadPalette(sHallOfFame_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); } static void LoadHofGfx(void) diff --git a/src/intro.c b/src/intro.c index 7e9a751690..06c5adba5d 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1051,11 +1051,11 @@ static void MainCB2_EndIntro(void) SetMainCallback2(CB2_InitTitleScreen); } -static void LoadCopyrightGraphics(u16 tilesetAddress, u16 tilemapAddress, u16 paletteAddress) +static void LoadCopyrightGraphics(u16 tilesetAddress, u16 tilemapAddress, u16 paletteOffset) { LZ77UnCompVram(gIntroCopyright_Gfx, (void *)(VRAM + tilesetAddress)); LZ77UnCompVram(gIntroCopyright_Tilemap, (void *)(VRAM + tilemapAddress)); - LoadPalette(gIntroCopyright_Pal, paletteAddress, 32); + LoadPalette(gIntroCopyright_Pal, paletteOffset, PLTT_SIZE_4BPP); } static void SerialCB_CopyrightScreen(void) @@ -1080,7 +1080,7 @@ static u8 SetUpCopyrightScreen(void) CpuFill32(0, (void *)OAM, OAM_SIZE); CpuFill16(0, (void *)(PLTT + 2), PLTT_SIZE - 2); ResetPaletteFade(); - LoadCopyrightGraphics(0, 0x3800, 0); + LoadCopyrightGraphics(0, 0x3800, BG_PLTT_ID(0x0)); ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); @@ -1178,7 +1178,7 @@ static void Task_Scene1_Load(u8 taskId) DmaClear16(3, BG_SCREEN_ADDR(21), BG_SCREEN_SIZE); LZ77UnCompVram(sIntro1Bg3_Tilemap, (void *)(BG_SCREEN_ADDR(22))); DmaClear16(3, BG_SCREEN_ADDR(23), BG_SCREEN_SIZE); - LoadPalette(sIntro1Bg_Pal, 0, sizeof(sIntro1Bg_Pal)); + LoadPalette(sIntro1Bg_Pal, BG_PLTT_ID(0x0), sizeof(sIntro1Bg_Pal)); SetGpuReg(REG_OFFSET_BG3CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(22) | BGCNT_16COLOR | BGCNT_TXT256x512); SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(20) | BGCNT_16COLOR | BGCNT_TXT256x512); SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(18) | BGCNT_16COLOR | BGCNT_TXT256x512); @@ -1717,7 +1717,7 @@ static void Task_Scene3_Load(u8 taskId) IntroResetGpuRegs(); LZ77UnCompVram(sIntroPokeball_Gfx, (void *)VRAM); LZ77UnCompVram(sIntroPokeball_Tilemap, (void *)(BG_CHAR_ADDR(1))); - LoadPalette(sIntroPokeball_Pal, 0, sizeof(sIntroPokeball_Pal)); + LoadPalette(sIntroPokeball_Pal, BG_PLTT_ID(0x0), sizeof(sIntroPokeball_Pal)); gTasks[taskId].tAlpha = 0; gTasks[taskId].tZoomDiv = 0; gTasks[taskId].tZoomDivSpeed = 0; @@ -2663,10 +2663,10 @@ static void Task_RayquazaAttack(u8 taskId) { if (--data[3] != 0) { - BlendPalette(0x50, 16, data[3], RGB(9, 10, 10)); - CpuCopy16(&gIntro3Bg_Pal[0x1AC], &gPlttBufferFaded[94], 2); - CpuCopy16(&gIntro3Bg_Pal[0x1AC], &gPlttBufferFaded[88], 2); - CpuCopy16(&gIntro3Bg_Pal[0x18C], &gPlttBufferFaded[92], 2); + BlendPalette(BG_PLTT_ID(0x5), 16, data[3], RGB(9, 10, 10)); + CpuCopy16(&gIntro3Bg_Pal[0x1AC], &gPlttBufferFaded[BG_PLTT_ID(0x5) + 14], PLTT_SIZEOF(1)); + CpuCopy16(&gIntro3Bg_Pal[0x1AC], &gPlttBufferFaded[BG_PLTT_ID(0x5) + 8], PLTT_SIZEOF(1)); + CpuCopy16(&gIntro3Bg_Pal[0x18C], &gPlttBufferFaded[BG_PLTT_ID(0x5) + 12], PLTT_SIZEOF(1)); } else { diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index cf193018a4..2851f8638d 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -730,7 +730,7 @@ void LoadIntroPart2Graphics(u8 scenery) { LZ77UnCompVram(sGrass_Gfx, (void *)(BG_CHAR_ADDR(1))); LZ77UnCompVram(sGrass_Tilemap, (void *)(BG_SCREEN_ADDR(15))); - LoadPalette(&sGrass_Pal, 240, sizeof(sGrass_Pal)); + LoadPalette(&sGrass_Pal, BG_PLTT_ID(0xF), sizeof(sGrass_Pal)); switch (scenery) { case 0: @@ -739,17 +739,17 @@ void LoadIntroPart2Graphics(u8 scenery) // Clouds are never used in this part of the intro LZ77UnCompVram(sCloudsBg_Gfx, (void *)(VRAM)); LZ77UnCompVram(sCloudsBg_Tilemap, (void *)(BG_SCREEN_ADDR(6))); - LoadPalette(&sCloudsBg_Pal, 0, sizeof(sCloudsBg_Pal)); + LoadPalette(&sCloudsBg_Pal, BG_PLTT_ID(0x0), sizeof(sCloudsBg_Pal)); LoadCompressedSpriteSheet(sSpriteSheet_Clouds); - LoadPalette(&sClouds_Pal, 256, sizeof(sClouds_Pal)); + LoadPalette(&sClouds_Pal, OBJ_PLTT_ID(0x0), sizeof(sClouds_Pal)); CreateCloudSprites(); break; case 1: LZ77UnCompVram(sTrees_Gfx, (void *)(VRAM)); LZ77UnCompVram(sTrees_Tilemap, (void *)(BG_SCREEN_ADDR(6))); - LoadPalette(&sTrees_Pal, 0, sizeof(sTrees_Pal)); + LoadPalette(&sTrees_Pal, BG_PLTT_ID(0x0), sizeof(sTrees_Pal)); LoadCompressedSpriteSheet(sSpriteSheet_TreesSmall); - LoadPalette(&sTreesSmall_Pal, 256, sizeof(sTreesSmall_Pal)); + LoadPalette(&sTreesSmall_Pal, OBJ_PLTT_ID(0x0), sizeof(sTreesSmall_Pal)); CreateTreeSprites(); break; } @@ -843,42 +843,42 @@ void LoadCreditsSceneGraphics(u8 scene) { case SCENE_OCEAN_MORNING: default: - LoadPalette(&sGrass_Pal, 240, sizeof(sGrass_Pal)); + LoadPalette(&sGrass_Pal, BG_PLTT_ID(0xF), sizeof(sGrass_Pal)); LZ77UnCompVram(sCloudsBg_Gfx, (void *)(VRAM)); LZ77UnCompVram(sCloudsBg_Tilemap, (void *)(BG_SCREEN_ADDR(6))); - LoadPalette(&sCloudsBg_Pal, 0, sizeof(sCloudsBg_Pal)); + LoadPalette(&sCloudsBg_Pal, BG_PLTT_ID(0x0), sizeof(sCloudsBg_Pal)); LoadCompressedSpriteSheet(sSpriteSheet_Clouds); LZ77UnCompVram(sClouds_Gfx, (void *)(OBJ_VRAM0)); - LoadPalette(&sClouds_Pal, 256, sizeof(sClouds_Pal)); + LoadPalette(&sClouds_Pal, OBJ_PLTT_ID(0x0), sizeof(sClouds_Pal)); CreateCloudSprites(); break; case SCENE_OCEAN_SUNSET: - LoadPalette(&sGrassSunset_Pal, 240, sizeof(sGrassSunset_Pal)); + LoadPalette(&sGrassSunset_Pal, BG_PLTT_ID(0xF), sizeof(sGrassSunset_Pal)); LZ77UnCompVram(sCloudsBg_Gfx, (void *)(VRAM)); LZ77UnCompVram(sCloudsBg_Tilemap, (void *)(BG_SCREEN_ADDR(6))); - LoadPalette(&sCloudsBgSunset_Pal, 0, sizeof(sCloudsBgSunset_Pal)); + LoadPalette(&sCloudsBgSunset_Pal, BG_PLTT_ID(0x0), sizeof(sCloudsBgSunset_Pal)); LoadCompressedSpriteSheet(sSpriteSheet_Clouds); LZ77UnCompVram(sClouds_Gfx, (void *)(OBJ_VRAM0)); - LoadPalette(&sCloudsSunset_Pal, 256, sizeof(sCloudsSunset_Pal)); + LoadPalette(&sCloudsSunset_Pal, OBJ_PLTT_ID(0x0), sizeof(sCloudsSunset_Pal)); CreateCloudSprites(); break; case SCENE_FOREST_RIVAL_ARRIVE: case SCENE_FOREST_CATCH_RIVAL: - LoadPalette(&sGrassSunset_Pal, 240, sizeof(sGrassSunset_Pal)); + LoadPalette(&sGrassSunset_Pal, BG_PLTT_ID(0xF), sizeof(sGrassSunset_Pal)); LZ77UnCompVram(sTrees_Gfx, (void *)(VRAM)); LZ77UnCompVram(sTrees_Tilemap, (void *)(BG_SCREEN_ADDR(6))); - LoadPalette(&sTreesSunset_Pal, 0, sizeof(sTreesSunset_Pal)); + LoadPalette(&sTreesSunset_Pal, BG_PLTT_ID(0x0), sizeof(sTreesSunset_Pal)); LoadCompressedSpriteSheet(sSpriteSheet_TreesSmall); - LoadPalette(&sTreesSunset_Pal, 256, sizeof(sTreesSunset_Pal)); + LoadPalette(&sTreesSunset_Pal, OBJ_PLTT_ID(0x0), sizeof(sTreesSunset_Pal)); CreateTreeSprites(); break; case SCENE_CITY_NIGHT: - LoadPalette(&sGrassNight_Pal, 240, sizeof(sGrassNight_Pal)); + LoadPalette(&sGrassNight_Pal, BG_PLTT_ID(0xF), sizeof(sGrassNight_Pal)); LZ77UnCompVram(sHouses_Gfx, (void *)(VRAM)); LZ77UnCompVram(sHouses_Tilemap, (void *)(BG_SCREEN_ADDR(6))); - LoadPalette(&sHouses_Pal, 0, sizeof(sHouses_Pal)); + LoadPalette(&sHouses_Pal, BG_PLTT_ID(0x0), sizeof(sHouses_Pal)); LoadCompressedSpriteSheet(sSpriteSheet_HouseSilhouette); - LoadPalette(&sHouseSilhouette_Pal, 256, sizeof(sHouseSilhouette_Pal)); + LoadPalette(&sHouseSilhouette_Pal, OBJ_PLTT_ID(0x0), sizeof(sHouseSilhouette_Pal)); CreateHouseSprites(); break; } @@ -1006,8 +1006,8 @@ void CycleSceneryPalette(u8 mode) x = gPlttBufferUnfaded[10]; y = gPlttBufferUnfaded[9]; } - LoadPalette(&x, 9, sizeof(x)); - LoadPalette(&y, 10, sizeof(y)); + LoadPalette(&x, BG_PLTT_ID(0x0) + 9, sizeof(x)); + LoadPalette(&y, BG_PLTT_ID(0x0) + 10, sizeof(y)); break; case 2: if (gMain.vblankCounter1 & 3 || gPaletteFade.active) @@ -1022,8 +1022,8 @@ void CycleSceneryPalette(u8 mode) x = RGB(28, 24, 0); y = RGB(7, 9, 15); } - LoadPalette(&x, 12, sizeof(x)); - LoadPalette(&y, 13, sizeof(y)); + LoadPalette(&x, BG_PLTT_ID(0x0) + 12, sizeof(x)); + LoadPalette(&y, BG_PLTT_ID(0x0) + 13, sizeof(y)); break; case 1: break; diff --git a/src/item_menu.c b/src/item_menu.c index 288c2d9565..33b204291f 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -399,7 +399,7 @@ static const struct WindowTemplate sDefaultBagWindows[] = .tilemapTop = 2, .width = 15, .height = 16, - .paletteNum = 1, + .paletteNum = 0x1, .baseBlock = 0x27, }, [WIN_DESCRIPTION] = { @@ -408,7 +408,7 @@ static const struct WindowTemplate sDefaultBagWindows[] = .tilemapTop = 13, .width = 14, .height = 6, - .paletteNum = 1, + .paletteNum = 0x1, .baseBlock = 0x117, }, [WIN_POCKET_NAME] = { @@ -417,7 +417,7 @@ static const struct WindowTemplate sDefaultBagWindows[] = .tilemapTop = 1, .width = 8, .height = 2, - .paletteNum = 1, + .paletteNum = 0x1, .baseBlock = 0x1A1, }, [WIN_TMHM_INFO_ICONS] = { @@ -426,7 +426,7 @@ static const struct WindowTemplate sDefaultBagWindows[] = .tilemapTop = 13, .width = 5, .height = 6, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x16B, }, [WIN_TMHM_INFO] = { @@ -435,7 +435,7 @@ static const struct WindowTemplate sDefaultBagWindows[] = .tilemapTop = 13, .width = 4, .height = 6, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x189, }, [WIN_MESSAGE] = { @@ -444,7 +444,7 @@ static const struct WindowTemplate sDefaultBagWindows[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x1B1, }, DUMMY_WIN_TEMPLATE, @@ -458,7 +458,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 17, .width = 7, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x21D, }, [ITEMWIN_1x2] = { @@ -467,7 +467,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 15, .width = 7, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x21D, }, [ITEMWIN_2x2] = { @@ -476,7 +476,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 15, .width = 14, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x21D, }, [ITEMWIN_2x3] = { @@ -485,7 +485,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 13, .width = 14, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x21D, }, [ITEMWIN_MESSAGE] = { @@ -494,7 +494,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x1B1, }, [ITEMWIN_YESNO_LOW] = { // Yes/No tucked in corner, for toss confirm @@ -503,7 +503,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 15, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x21D, }, [ITEMWIN_YESNO_HIGH] = { // Yes/No higher up, positioned above a lower message box @@ -512,7 +512,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x21D, }, [ITEMWIN_QUANTITY] = { // Used for quantity of items to Toss/Deposit @@ -521,7 +521,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 17, .width = 5, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x21D, }, [ITEMWIN_QUANTITY_WIDE] = { // Used for quantity and price of items to Sell @@ -530,7 +530,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 11, .width = 10, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x245, }, [ITEMWIN_MONEY] = { @@ -539,7 +539,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 1, .width = 10, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x231, }, }; @@ -818,9 +818,9 @@ static bool8 LoadBagMenu_Graphics(void) break; case 2: if (!IsWallysBag() && gSaveBlock2Ptr->playerGender != MALE) - LoadCompressedPalette(gBagScreenFemale_Pal, 0, 0x40); + LoadCompressedPalette(gBagScreenFemale_Pal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); else - LoadCompressedPalette(gBagScreenMale_Pal, 0, 0x40); + LoadCompressedPalette(gBagScreenMale_Pal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); gBagMenu->graphicsLoadState++; break; case 3: @@ -2448,10 +2448,10 @@ static void LoadBagMenuTextWindows(void) InitWindows(sDefaultBagWindows); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 1, 0xE0); - LoadMessageBoxGfx(0, 10, 0xD0); - ListMenuLoadStdPalAt(0xC0, 1); - LoadPalette(&gStandardMenuPalette, 0xF0, 0x20); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xE)); + LoadMessageBoxGfx(0, 10, BG_PLTT_ID(0xD)); + ListMenuLoadStdPalAt(BG_PLTT_ID(0xC), 1); + LoadPalette(&gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); for (i = 0; i <= WIN_POCKET_NAME; i++) { FillWindowPixelBuffer(i, PIXEL_FILL(0)); diff --git a/src/link.c b/src/link.c index 57e33c8115..a78849ddbe 100644 --- a/src/link.c +++ b/src/link.c @@ -200,7 +200,7 @@ static const struct WindowTemplate sLinkErrorWindowTemplates[] = { .tilemapTop = 0, .width = 30, .height = 5, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x002 }, { .bg = 0, @@ -208,7 +208,7 @@ static const struct WindowTemplate sLinkErrorWindowTemplates[] = { .tilemapTop = 6, .width = 30, .height = 7, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x098 }, { .bg = 0, @@ -216,7 +216,7 @@ static const struct WindowTemplate sLinkErrorWindowTemplates[] = { .tilemapTop = 13, .width = 30, .height = 7, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x16A }, DUMMY_WIN_TEMPLATE }; @@ -247,7 +247,7 @@ void Task_DestroySelf(u8 taskId) static void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock, u16 baseChar) { - LoadPalette(sLinkTestDigitsPal, paletteNum * 16, 0x20); + LoadPalette(sLinkTestDigitsPal, BG_PLTT_ID(paletteNum), PLTT_SIZE_4BPP); DmaCopy16(3, sLinkTestDigitsGfx, (u16 *)BG_CHAR_ADDR(charBaseBlock) + (16 * baseChar), sizeof sLinkTestDigitsGfx); gLinkTestBGInfo.screenBaseBlock = screenBaseBlock; gLinkTestBGInfo.paletteNum = paletteNum; @@ -271,7 +271,7 @@ static void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charB // Unused static void LoadLinkTestBgGfx(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock) { - LoadPalette(sLinkTestDigitsPal, paletteNum * 16, 0x20); + LoadPalette(sLinkTestDigitsPal, BG_PLTT_ID(paletteNum), PLTT_SIZE_4BPP); DmaCopy16(3, sLinkTestDigitsGfx, (u16 *)BG_CHAR_ADDR(charBaseBlock), sizeof sLinkTestDigitsGfx); gLinkTestBGInfo.screenBaseBlock = screenBaseBlock; gLinkTestBGInfo.paletteNum = paletteNum; @@ -1595,7 +1595,7 @@ void CB2_LinkError(void) ResetSpriteData(); FreeAllSpritePalettes(); ResetPaletteFadeControl(); - FillPalette(RGB_BLACK, 0, 2); + SetBackdropFromColor(RGB_BLACK); ResetTasks(); ScanlineEffect_Stop(); if (gWirelessCommType) @@ -1621,7 +1621,7 @@ void CB2_LinkError(void) SetGpuReg(REG_OFFSET_BG1HOFS, 0); SetGpuReg(REG_OFFSET_BG1VOFS, 0); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON | DISPCNT_WIN1_ON | DISPCNT_OBJWIN_ON); - LoadPalette(gStandardMenuPalette, 0xf0, 0x20); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); gSoftResetDisabled = FALSE; CreateTask(Task_DestroySelf, 0); StopMapMusic(); diff --git a/src/list_menu.c b/src/list_menu.c index 64692ce1f6..55ddf436e8 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -1078,7 +1078,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16 if (arrowInfo->palTag == TAG_NONE) { - LoadPalette(sRedArrowPal, (16 * arrowInfo->palNum) + 0x100, 0x20); + LoadPalette(sRedArrowPal, OBJ_PLTT_ID(arrowInfo->palNum), PLTT_SIZE_4BPP); } else { @@ -1324,7 +1324,7 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor) if (cursor->palTag == TAG_NONE) { - LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20); + LoadPalette(sRedArrowPal, OBJ_PLTT_ID(cursor->palNum), PLTT_SIZE_4BPP); } else { @@ -1409,7 +1409,7 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor) if (cursor->palTag == TAG_NONE) { - LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20); + LoadPalette(sRedArrowPal, OBJ_PLTT_ID(cursor->palNum), PLTT_SIZE_4BPP); } else { diff --git a/src/mail.c b/src/mail.c index 651fcbb84e..52ce8df5ea 100644 --- a/src/mail.c +++ b/src/mail.c @@ -113,7 +113,7 @@ static const struct WindowTemplate sWindowTemplates[] = { .tilemapTop = 3, .width = 26, .height = 15, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }, DUMMY_WIN_TEMPLATE @@ -566,13 +566,13 @@ static bool8 MailReadBuildGraphics(void) CopyBgTilemapBufferToVram(2); break; case 12: - LoadPalette(GetOverworldTextboxPalettePtr(), 240, 32); + LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); gPlttBufferUnfaded[250] = sMailGraphics[sMailRead->mailType].textColor; gPlttBufferFaded[250] = sMailGraphics[sMailRead->mailType].textColor; gPlttBufferUnfaded[251] = sMailGraphics[sMailRead->mailType].textShadow; gPlttBufferFaded[251] = sMailGraphics[sMailRead->mailType].textShadow; - LoadPalette(sMailGraphics[sMailRead->mailType].palette, 0, 32); + LoadPalette(sMailGraphics[sMailRead->mailType].palette, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); gPlttBufferUnfaded[10] = sBgColors[gSaveBlock2Ptr->playerGender][0]; gPlttBufferFaded[10] = sBgColors[gSaveBlock2Ptr->playerGender][0]; diff --git a/src/main_menu.c b/src/main_menu.c index b8abffda57..381676c0da 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -294,7 +294,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN0, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN0, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }, // OPTIONS @@ -304,7 +304,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN1, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN1, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x35 }, // Has saved game @@ -315,7 +315,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN2, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }, // NEW GAME @@ -325,7 +325,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN3, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN3, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x9D }, // OPTION / MYSTERY GIFT @@ -335,7 +335,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN4, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0xD1 }, // OPTION / MYSTERY EVENTS @@ -345,7 +345,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN5, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN5, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x105 }, // OPTION @@ -355,7 +355,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN6, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x139 }, // Error message window @@ -365,7 +365,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_ERROR, .width = MENU_WIDTH_ERROR, .height = MENU_HEIGHT_ERROR, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x16D }, DUMMY_WIN_TEMPLATE @@ -379,7 +379,7 @@ static const struct WindowTemplate sNewGameBirchSpeechTextWindows[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }, { @@ -388,7 +388,7 @@ static const struct WindowTemplate sNewGameBirchSpeechTextWindows[] = .tilemapTop = 5, .width = 6, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x6D }, { @@ -397,7 +397,7 @@ static const struct WindowTemplate sNewGameBirchSpeechTextWindows[] = .tilemapTop = 2, .width = 9, .height = 10, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x85 }, DUMMY_WIN_TEMPLATE @@ -571,8 +571,8 @@ static u32 InitMainMenu(bool8 returningFromOptionsMenu) DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2); ResetPaletteFade(); - LoadPalette(sMainMenuBgPal, 0, 32); - LoadPalette(sMainMenuTextPal, 0xF0, 32); + LoadPalette(sMainMenuBgPal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(sMainMenuTextPal, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); @@ -750,28 +750,28 @@ static void Task_DisplayMainMenu(u8 taskId) SetGpuReg(REG_OFFSET_BLDY, 7); palette = RGB_BLACK; - LoadPalette(&palette, 254, 2); + LoadPalette(&palette, BG_PLTT_ID(0xF) + 14, PLTT_SIZEOF(1)); palette = RGB_WHITE; - LoadPalette(&palette, 250, 2); + LoadPalette(&palette, BG_PLTT_ID(0xF) + 10, PLTT_SIZEOF(1)); palette = RGB(12, 12, 12); - LoadPalette(&palette, 251, 2); + LoadPalette(&palette, BG_PLTT_ID(0xF) + 11, PLTT_SIZEOF(1)); palette = RGB(26, 26, 25); - LoadPalette(&palette, 252, 2); + LoadPalette(&palette, BG_PLTT_ID(0xF) + 12, PLTT_SIZEOF(1)); // Note: If there is no save file, the save block is zeroed out, // so the default gender is MALE. if (gSaveBlock2Ptr->playerGender == MALE) { palette = RGB(4, 16, 31); - LoadPalette(&palette, 241, 2); + LoadPalette(&palette, BG_PLTT_ID(0xF) + 1, PLTT_SIZEOF(1)); } else { palette = RGB(31, 3, 21); - LoadPalette(&palette, 241, 2); + LoadPalette(&palette, BG_PLTT_ID(0xF) + 1, PLTT_SIZEOF(1)); } switch (gTasks[taskId].tMenuType) @@ -1274,8 +1274,8 @@ static void Task_NewGameBirchSpeech_Init(u8 taskId) LZ77UnCompVram(sBirchSpeechShadowGfx, (void *)VRAM); LZ77UnCompVram(sBirchSpeechBgMap, (void *)(BG_SCREEN_ADDR(7))); - LoadPalette(sBirchSpeechBgPals, 0, 64); - LoadPalette(sBirchSpeechPlatformBlackPal, 1, 16); + LoadPalette(sBirchSpeechBgPals, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadPalette(sBirchSpeechPlatformBlackPal, BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(8)); ScanlineEffect_Stop(); ResetSpriteData(); FreeAllSpritePalettes(); @@ -1327,7 +1327,7 @@ static void Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome(u8 taskId) { InitWindows(sNewGameBirchSpeechTextWindows); LoadMainMenuWindowFrameTiles(0, 0xF3); - LoadMessageBoxGfx(0, 0xFC, 0xF0); + LoadMessageBoxGfx(0, 0xFC, BG_PLTT_ID(0xF)); NewGameBirchSpeech_ShowDialogueWindow(0, 1); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_GFX); @@ -1809,8 +1809,8 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void) ResetPaletteFade(); LZ77UnCompVram(sBirchSpeechShadowGfx, (u8 *)VRAM); LZ77UnCompVram(sBirchSpeechBgMap, (u8 *)(BG_SCREEN_ADDR(7))); - LoadPalette(sBirchSpeechBgPals, 0, 64); - LoadPalette(&sBirchSpeechBgGradientPal[1], 1, 16); + LoadPalette(sBirchSpeechBgPals, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadPalette(&sBirchSpeechBgGradientPal[1], BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(8)); ResetTasks(); taskId = CreateTask(Task_NewGameBirchSpeech_ReturnFromNamingScreenShowTextbox, 0); gTasks[taskId].tTimer = 5; @@ -1853,7 +1853,7 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void) SetMainCallback2(CB2_MainMenu); InitWindows(sNewGameBirchSpeechTextWindows); LoadMainMenuWindowFrameTiles(0, 0xF3); - LoadMessageBoxGfx(0, 0xFC, 0xF0); + LoadMessageBoxGfx(0, 0xFC, BG_PLTT_ID(0xF)); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); } @@ -2029,7 +2029,7 @@ static void Task_NewGameBirchSpeech_FadePlatformIn(u8 taskId) { gTasks[taskId].tDelayTimer = gTasks[taskId].tDelay; gTasks[taskId].tPalIndex++; - LoadPalette(&sBirchSpeechBgGradientPal[gTasks[taskId].tPalIndex], 1, 16); + LoadPalette(&sBirchSpeechBgGradientPal[gTasks[taskId].tPalIndex], BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(8)); } } @@ -2063,7 +2063,7 @@ static void Task_NewGameBirchSpeech_FadePlatformOut(u8 taskId) { gTasks[taskId].tDelayTimer = gTasks[taskId].tDelay; gTasks[taskId].tPalIndex--; - LoadPalette(&sBirchSpeechBgGradientPal[gTasks[taskId].tPalIndex], 1, 16); + LoadPalette(&sBirchSpeechBgGradientPal[gTasks[taskId].tPalIndex], BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(8)); } } @@ -2191,7 +2191,7 @@ static void MainMenu_FormatSavegameBadges(void) static void LoadMainMenuWindowFrameTiles(u8 bgId, u16 tileOffset) { LoadBgTiles(bgId, GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->tiles, 0x120, tileOffset); - LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, 32, 32); + LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); } static void DrawMainMenuWindowBorder(const struct WindowTemplate *template, u16 baseTileNum) @@ -2204,26 +2204,26 @@ static void DrawMainMenuWindowBorder(const struct WindowTemplate *template, u16 u16 sp14 = 7 + baseTileNum; u16 r6 = 8 + baseTileNum; - FillBgTilemapBufferRect(template->bg, baseTileNum, template->tilemapLeft - 1, template->tilemapTop - 1, 1, 1, 2); - FillBgTilemapBufferRect(template->bg, r9, template->tilemapLeft, template->tilemapTop - 1, template->width, 1, 2); - FillBgTilemapBufferRect(template->bg, r10, template->tilemapLeft + template->width, template->tilemapTop - 1, 1, 1, 2); - FillBgTilemapBufferRect(template->bg, sp18, template->tilemapLeft - 1, template->tilemapTop, 1, template->height, 2); - FillBgTilemapBufferRect(template->bg, spC, template->tilemapLeft + template->width, template->tilemapTop, 1, template->height, 2); - FillBgTilemapBufferRect(template->bg, sp10, template->tilemapLeft - 1, template->tilemapTop + template->height, 1, 1, 2); - FillBgTilemapBufferRect(template->bg, sp14, template->tilemapLeft, template->tilemapTop + template->height, template->width, 1, 2); - FillBgTilemapBufferRect(template->bg, r6, template->tilemapLeft + template->width, template->tilemapTop + template->height, 1, 1, 2); + FillBgTilemapBufferRect(template->bg, baseTileNum, template->tilemapLeft - 1, template->tilemapTop - 1, 1, 1, 0x2); + FillBgTilemapBufferRect(template->bg, r9, template->tilemapLeft, template->tilemapTop - 1, template->width, 1, 0x2); + FillBgTilemapBufferRect(template->bg, r10, template->tilemapLeft + template->width, template->tilemapTop - 1, 1, 1, 0x2); + FillBgTilemapBufferRect(template->bg, sp18, template->tilemapLeft - 1, template->tilemapTop, 1, template->height, 0x2); + FillBgTilemapBufferRect(template->bg, spC, template->tilemapLeft + template->width, template->tilemapTop, 1, template->height, 0x2); + FillBgTilemapBufferRect(template->bg, sp10, template->tilemapLeft - 1, template->tilemapTop + template->height, 1, 1, 0x2); + FillBgTilemapBufferRect(template->bg, sp14, template->tilemapLeft, template->tilemapTop + template->height, template->width, 1, 0x2); + FillBgTilemapBufferRect(template->bg, r6, template->tilemapLeft + template->width, template->tilemapTop + template->height, 1, 1, 0x2); CopyBgTilemapBufferToVram(template->bg); } static void ClearMainMenuWindowTilemap(const struct WindowTemplate *template) { - FillBgTilemapBufferRect(template->bg, 0, template->tilemapLeft - 1, template->tilemapTop - 1, template->tilemapLeft + template->width + 1, template->tilemapTop + template->height + 1, 2); + FillBgTilemapBufferRect(template->bg, 0, template->tilemapLeft - 1, template->tilemapTop - 1, template->tilemapLeft + template->width + 1, template->tilemapTop + template->height + 1, 0x2); CopyBgTilemapBufferToVram(template->bg); } static void NewGameBirchSpeech_ClearGenderWindowTilemap(u8 bg, u8 x, u8 y, u8 width, u8 height, u8 unused) { - FillBgTilemapBufferRect(bg, 0, x + 255, y + 255, width + 2, height + 2, 2); + FillBgTilemapBufferRect(bg, 0, x + 255, y + 255, width + 2, height + 2, 0x2); } static void NewGameBirchSpeech_ClearGenderWindow(u8 windowId, bool8 copyToVram) diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 41054d16d2..f7d5320d34 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -351,19 +351,19 @@ static void DrawMapNamePopUpFrame(u8 bg, u8 x, u8 y, u8 deltaX, u8 deltaY, u8 un // Draw top edge for (i = 0; i < 1 + TILE_TOP_EDGE_END - TILE_TOP_EDGE_START; i++) - FillBgTilemapBufferRect(bg, TILE_TOP_EDGE_START + i, i - 1 + x, y - 1, 1, 1, 14); + FillBgTilemapBufferRect(bg, TILE_TOP_EDGE_START + i, i - 1 + x, y - 1, 1, 1, 0xE); // Draw sides - FillBgTilemapBufferRect(bg, TILE_LEFT_EDGE_TOP, x - 1, y, 1, 1, 14); - FillBgTilemapBufferRect(bg, TILE_RIGHT_EDGE_TOP, deltaX + x, y, 1, 1, 14); - FillBgTilemapBufferRect(bg, TILE_LEFT_EDGE_MID, x - 1, y + 1, 1, 1, 14); - FillBgTilemapBufferRect(bg, TILE_RIGHT_EDGE_MID, deltaX + x, y + 1, 1, 1, 14); - FillBgTilemapBufferRect(bg, TILE_LEFT_EDGE_BOT, x - 1, y + 2, 1, 1, 14); - FillBgTilemapBufferRect(bg, TILE_RIGHT_EDGE_BOT, deltaX + x, y + 2, 1, 1, 14); + FillBgTilemapBufferRect(bg, TILE_LEFT_EDGE_TOP, x - 1, y, 1, 1, 0xE); + FillBgTilemapBufferRect(bg, TILE_RIGHT_EDGE_TOP, deltaX + x, y, 1, 1, 0xE); + FillBgTilemapBufferRect(bg, TILE_LEFT_EDGE_MID, x - 1, y + 1, 1, 1, 0xE); + FillBgTilemapBufferRect(bg, TILE_RIGHT_EDGE_MID, deltaX + x, y + 1, 1, 1, 0xE); + FillBgTilemapBufferRect(bg, TILE_LEFT_EDGE_BOT, x - 1, y + 2, 1, 1, 0xE); + FillBgTilemapBufferRect(bg, TILE_RIGHT_EDGE_BOT, deltaX + x, y + 2, 1, 1, 0xE); // Draw bottom edge for (i = 0; i < 1 + TILE_BOT_EDGE_END - TILE_BOT_EDGE_START; i++) - FillBgTilemapBufferRect(bg, TILE_BOT_EDGE_START + i, i - 1 + x, y + deltaY, 1, 1, 14); + FillBgTilemapBufferRect(bg, TILE_BOT_EDGE_START + i, i - 1 + x, y + deltaY, 1, 1, 0xE); } static void LoadMapNamePopUpWindowBg(void) @@ -385,8 +385,8 @@ static void LoadMapNamePopUpWindowBg(void) CallWindowFunction(popupWindowId, DrawMapNamePopUpFrame); PutWindowTilemap(popupWindowId); if (gMapHeader.weather == WEATHER_UNDERWATER_BUBBLES) - LoadPalette(&sMapPopUp_Palette_Underwater, 0xE0, sizeof(sMapPopUp_Palette_Underwater)); + LoadPalette(&sMapPopUp_Palette_Underwater, BG_PLTT_ID(0xE), sizeof(sMapPopUp_Palette_Underwater)); else - LoadPalette(sMapPopUp_PaletteTable[popUpThemeId], 0xE0, sizeof(sMapPopUp_PaletteTable[0])); + LoadPalette(sMapPopUp_PaletteTable[popUpThemeId], BG_PLTT_ID(0xE), sizeof(sMapPopUp_PaletteTable[0])); BlitBitmapToWindow(popupWindowId, sMapPopUp_Table[popUpThemeId], 0, 0, 80, 24); } diff --git a/src/match_call.c b/src/match_call.c index 4f6a7b9821..5d92e55b9f 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1235,7 +1235,7 @@ static const struct WindowTemplate sMatchCallTextWindow = .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x200 }; @@ -1267,8 +1267,8 @@ static bool32 MatchCall_LoadGfx(u8 taskId) } FillWindowPixelBuffer(tWindowId, PIXEL_FILL(8)); - LoadPalette(sMatchCallWindow_Pal, 0xE0, sizeof(sMatchCallWindow_Pal)); - LoadPalette(sPokenavIcon_Pal, 0xF0, sizeof(sPokenavIcon_Pal)); + LoadPalette(sMatchCallWindow_Pal, BG_PLTT_ID(0xE), sizeof(sMatchCallWindow_Pal)); + LoadPalette(sPokenavIcon_Pal, BG_PLTT_ID(0xF), sizeof(sPokenavIcon_Pal)); ChangeBgY(0, -0x2000, BG_COORD_SET); return TRUE; } @@ -2102,7 +2102,7 @@ void LoadMatchCallWindowGfx(u32 windowId, u32 destOffset, u32 paletteId) { u8 bg = GetWindowAttribute(windowId, WINDOW_BG); LoadBgTiles(bg, sMatchCallWindow_Gfx, 0x100, destOffset); - LoadPalette(sMatchCallWindow_Pal, paletteId << 4, sizeof(sMatchCallWindow_Pal)); + LoadPalette(sMatchCallWindow_Pal, BG_PLTT_ID(paletteId), sizeof(sMatchCallWindow_Pal)); } void DrawMatchCallTextBoxBorder(u32 windowId, u32 tileOffset, u32 paletteId) diff --git a/src/menu.c b/src/menu.c index 937c391436..2a8b2f565b 100644 --- a/src/menu.c +++ b/src/menu.c @@ -20,9 +20,10 @@ #include "window.h" #include "constants/songs.h" -#define DLG_WINDOW_PALETTE_NUM 15 +#define DLG_WINDOW_PALETTE_NUM 0xF #define DLG_WINDOW_BASE_TILE_NUM 0x200 -#define STD_WINDOW_PALETTE_NUM 14 +#define STD_WINDOW_PALETTE_NUM 0xE +#define STD_WINDOW_PALETTE_SIZE PLTT_SIZEOF(10) #define STD_WINDOW_BASE_TILE_NUM 0x214 struct MenuInfoIcon @@ -88,7 +89,7 @@ static const struct WindowTemplate sStandardTextBox_WindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x194 }, DUMMY_WIN_TEMPLATE @@ -101,7 +102,7 @@ static const struct WindowTemplate sYesNo_WindowTemplates = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x125 }; @@ -208,8 +209,8 @@ void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonP void LoadMessageBoxAndBorderGfx(void) { - LoadMessageBoxGfx(0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10); - LoadUserWindowBorderGfx(0, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM * 0x10); + LoadMessageBoxGfx(0, DLG_WINDOW_BASE_TILE_NUM, BG_PLTT_ID(DLG_WINDOW_PALETTE_NUM)); + LoadUserWindowBorderGfx(0, STD_WINDOW_BASE_TILE_NUM, BG_PLTT_ID(STD_WINDOW_PALETTE_NUM)); } void DrawDialogueFrame(u8 windowId, bool8 copyToVram) @@ -427,18 +428,18 @@ void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram) void LoadMessageBoxAndFrameGfx(u8 windowId, bool8 copyToVram) { - LoadMessageBoxGfx(windowId, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10); + LoadMessageBoxGfx(windowId, DLG_WINDOW_BASE_TILE_NUM, BG_PLTT_ID(DLG_WINDOW_PALETTE_NUM)); DrawDialogFrameWithCustomTileAndPalette(windowId, copyToVram, DLG_WINDOW_BASE_TILE_NUM, 0xF); } void Menu_LoadStdPal(void) { - LoadPalette(gStandardMenuPalette, STD_WINDOW_PALETTE_NUM * 0x10, 0x14); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(STD_WINDOW_PALETTE_NUM), STD_WINDOW_PALETTE_SIZE); } void Menu_LoadStdPalAt(u16 offset) { - LoadPalette(gStandardMenuPalette, offset, 0x14); + LoadPalette(gStandardMenuPalette, offset, STD_WINDOW_PALETTE_SIZE); } // Unused @@ -550,7 +551,7 @@ void AddTextPrinterWithCallbackForMessage(bool8 canSpeedUp, void (*callback)(str void EraseFieldMessageBox(bool8 copyToVram) { - FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0x11); + FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 17); if (copyToVram == TRUE) CopyBgTilemapBufferToVram(0); } @@ -685,7 +686,7 @@ void ClearDialogWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram) static void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { - FillBgTilemapBufferRect(bg, 0, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, 0); + FillBgTilemapBufferRect(bg, 0, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, 0x0); } void DrawStdFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 baseTileNum, u8 paletteNum) @@ -782,7 +783,7 @@ void ClearStdWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram) static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { - FillBgTilemapBufferRect(bg, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, 0); + FillBgTilemapBufferRect(bg, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, 0x0); } // Creates the window used to display the info bar at the top of the HOF PC that shows the controls and team number. @@ -805,10 +806,10 @@ u8 HofPCTopBar_AddWindow(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile) sHofPCTopBarWindowId = AddWindow(&window); - if (palette > 15) - palette = 15 * 16; + if (palette > 0xF) + palette = BG_PLTT_ID(0xF); else - palette *= 16; + palette = BG_PLTT_ID(palette); LoadPalette(sHofPC_TopBar_Pal, palette, sizeof(sHofPC_TopBar_Pal)); return sHofPCTopBarWindowId; @@ -2084,7 +2085,7 @@ static void UnusedBlitBitmapRect(const struct Bitmap *src, struct Bitmap *dst, u // Unused static void LoadMonIconPalAtOffset(u8 palOffset, u16 speciesId) { - LoadPalette(GetValidMonIconPalettePtr(speciesId), palOffset, 0x20); + LoadPalette(GetValidMonIconPalettePtr(speciesId), palOffset, PLTT_SIZE_4BPP); } // Unused @@ -2111,7 +2112,7 @@ void ListMenuLoadStdPalAt(u8 palOffset, u8 palId) break; } - LoadPalette(palette, palOffset, 0x20); + LoadPalette(palette, palOffset, PLTT_SIZE_4BPP); } void BlitMenuInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y) diff --git a/src/menu_specialized.c b/src/menu_specialized.c index 42c80b5ee3..f4d3493d7c 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -48,7 +48,7 @@ static const struct WindowTemplate sWindowTemplates_MailboxMenu[MAILBOXWIN_COUNT .tilemapTop = 1, .width = 8, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x8 }, [MAILBOXWIN_LIST] = { @@ -57,7 +57,7 @@ static const struct WindowTemplate sWindowTemplates_MailboxMenu[MAILBOXWIN_COUNT .tilemapTop = 1, .width = 8, .height = 18, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x18 }, [MAILBOXWIN_OPTIONS] = { @@ -66,7 +66,7 @@ static const struct WindowTemplate sWindowTemplates_MailboxMenu[MAILBOXWIN_COUNT .tilemapTop = 1, .width = 11, .height = 8, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x18 } }; @@ -707,8 +707,8 @@ void InitMoveRelearnerWindows(bool8 useContextWindow) InitWindows(sMoveRelearnerWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 1, 0xE0); - LoadPalette(gStandardMenuPalette, 0xF0, 0x20); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xE)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); for (i = 0; i < ARRAY_COUNT(sMoveRelearnerWindowTemplates) - 1; i++) FillWindowPixelBuffer(i, PIXEL_FILL(1)); diff --git a/src/move_relearner.c b/src/move_relearner.c index d9c943b576..e86877c8ea 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -405,7 +405,7 @@ static void CB2_InitLearnMove(void) CreateUISprites(); sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuSate.listOffset, sMoveRelearnerMenuSate.listRow); - FillPalette(RGB_BLACK, 0, 2); + SetBackdropFromColor(RGB_BLACK); SetMainCallback2(CB2_MoveRelearnerMain); } @@ -430,7 +430,7 @@ static void CB2_InitLearnMoveReturnFromSelectMove(void) CreateUISprites(); sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuSate.listOffset, sMoveRelearnerMenuSate.listRow); - FillPalette(RGB_BLACK, 0, 2); + SetBackdropFromColor(RGB_BLACK); SetMainCallback2(CB2_MoveRelearnerMain); } diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index c35fe8ed80..59e6d999e2 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -46,7 +46,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 22, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 20 }, { @@ -55,7 +55,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 6, .width = 16, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x6C }, DUMMY_WIN_TEMPLATE @@ -91,8 +91,8 @@ void CB2_InitMysteryEventMenu(void) FillWindowPixelBuffer(i, PIXEL_FILL(0)); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); - LoadUserWindowBorderGfx(0, 1u, 0xD0u); - Menu_LoadStdPalAt(0xE0); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD)); + Menu_LoadStdPalAt(BG_PLTT_ID(0xE)); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON); SetGpuReg(REG_OFFSET_BLDCNT, 0); CreateTask(Task_DestroySelf, 0); @@ -102,7 +102,7 @@ void CB2_InitMysteryEventMenu(void) BuildOamBuffer(); RunTextPrinters(); UpdatePaletteFade(); - FillPalette(RGB_BLACK, 0, 2); + SetBackdropFromColor(RGB_BLACK); SetMainCallback2(CB2_MysteryEventMenu); } } diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index b970711fd3..f9e2c2af9a 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -33,7 +33,7 @@ #include "constants/cable_club.h" #define LIST_MENU_TILE_NUM 10 -#define LIST_MENU_PAL_NUM 224 +#define LIST_MENU_PAL_NUM BG_PLTT_ID(0xE) static void LoadMysteryGiftTextboxBorder(u8 bgId); static void CreateMysteryGiftTask(void); @@ -104,7 +104,7 @@ static const struct WindowTemplate sMainWindows[] = { .tilemapTop = 0, .width = 30, .height = 2, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x0013 }, { .bg = 0, @@ -112,7 +112,7 @@ static const struct WindowTemplate sMainWindows[] = { .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x004f }, { .bg = 0, @@ -120,7 +120,7 @@ static const struct WindowTemplate sMainWindows[] = { .tilemapTop = 15, .width = 30, .height = 5, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 0x004f }, DUMMY_WIN_TEMPLATE @@ -132,7 +132,7 @@ static const struct WindowTemplate sWindowTemplate_YesNoMsg_Wide = { .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x00e5 }; @@ -142,7 +142,7 @@ static const struct WindowTemplate sWindowTemplate_YesNoMsg = { .tilemapTop = 15, .width = 20, .height = 4, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x00e5 }; @@ -152,7 +152,7 @@ static const struct WindowTemplate sWindowTemplate_GiftSelect = { .tilemapTop = 15, .width = 19, .height = 4, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x00e5 }; @@ -162,7 +162,7 @@ static const struct WindowTemplate sWindowTemplate_ThreeOptions = { .tilemapTop = 6, .width = 14, .height = 6, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x0155 }; @@ -172,7 +172,7 @@ static const struct WindowTemplate sWindowTemplate_YesNoBox = { .tilemapTop = 15, .width = 6, .height = 4, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x0155 }; @@ -182,7 +182,7 @@ static const struct WindowTemplate sWindowTemplate_GiftSelect_3Options = { .tilemapTop = 11, .width = 7, .height = 8, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x0155 }; @@ -192,7 +192,7 @@ static const struct WindowTemplate sWindowTemplate_GiftSelect_2Options = { .tilemapTop = 13, .width = 7, .height = 6, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x0155 }; @@ -202,7 +202,7 @@ static const struct WindowTemplate sWindowTemplate_GiftSelect_1Option = { .tilemapTop = 15, .width = 7, .height = 4, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x0155 }; @@ -411,14 +411,14 @@ static bool32 HandleMysteryGiftOrEReaderSetup(s32 isEReader) gMain.state++; break; case 1: - LoadPalette(sTextboxBorder_Pal, 0, 0x20); - LoadPalette(GetTextWindowPalette(2), 0xd0, 0x20); - Menu_LoadStdPalAt(0xC0); - LoadUserWindowBorderGfx(0, 0xA, 0xE0); - LoadUserWindowBorderGfx_(0, 0x1, 0xF0); - FillBgTilemapBufferRect(0, 0x000, 0, 0, 32, 32, 0x11); - FillBgTilemapBufferRect(1, 0x000, 0, 0, 32, 32, 0x11); - FillBgTilemapBufferRect(2, 0x000, 0, 0, 32, 32, 0x11); + LoadPalette(sTextboxBorder_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(GetTextWindowPalette(2), BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); + Menu_LoadStdPalAt(BG_PLTT_ID(0xC)); + LoadUserWindowBorderGfx(0, 0xA, BG_PLTT_ID(0xE)); + LoadUserWindowBorderGfx_(0, 0x1, BG_PLTT_ID(0xF)); + FillBgTilemapBufferRect(0, 0x000, 0, 0, 32, 32, 17); + FillBgTilemapBufferRect(1, 0x000, 0, 0, 32, 32, 17); + FillBgTilemapBufferRect(2, 0x000, 0, 0, 32, 32, 17); MG_DrawCheckerboardPattern(3); PrintMysteryGiftOrEReaderTopMenu(isEReader, FALSE); gMain.state++; @@ -505,16 +505,16 @@ void MG_DrawCheckerboardPattern(u32 bg) { s32 i = 0, j; - FillBgTilemapBufferRect(bg, 0x003, 0, 0, 32, 2, 0x11); + FillBgTilemapBufferRect(bg, 0x003, 0, 0, 32, 2, 17); for (i = 0; i < 18; i++) { for (j = 0; j < 32; j++) { if ((i & 1) != (j & 1)) - FillBgTilemapBufferRect(bg, 1, j, i + 2, 1, 1, 0x11); + FillBgTilemapBufferRect(bg, 1, j, i + 2, 1, 1, 17); else - FillBgTilemapBufferRect(bg, 2, j, i + 2, 1, 1, 0x11); + FillBgTilemapBufferRect(bg, 2, j, i + 2, 1, 1, 17); } } } @@ -524,10 +524,10 @@ static void ClearScreenInBg0(bool32 ignoreTopTwoRows) switch (ignoreTopTwoRows) { case 0: - FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0x11); + FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 17); break; case 1: - FillBgTilemapBufferRect(0, 0, 0, 2, 32, 30, 0x11); + FillBgTilemapBufferRect(0, 0, 0, 2, 32, 30, 17); break; } CopyBgTilemapBufferToVram(0); diff --git a/src/mystery_gift_view.c b/src/mystery_gift_view.c index ff34c88536..d279bb2f54 100644 --- a/src/mystery_gift_view.c +++ b/src/mystery_gift_view.c @@ -96,7 +96,7 @@ static const struct WindowTemplate sCard_WindowTemplates[] = { .tilemapTop = 1, .width = 25, .height = 4, - .paletteNum = 2, + .paletteNum = 0x2, .baseBlock = 0x029c }, [CARD_WIN_BODY] = { @@ -105,7 +105,7 @@ static const struct WindowTemplate sCard_WindowTemplates[] = { .tilemapTop = 6, .width = 28, .height = 8, - .paletteNum = 2, + .paletteNum = 0x2, .baseBlock = 0x01bc }, [CARD_WIN_FOOTER] = { @@ -114,7 +114,7 @@ static const struct WindowTemplate sCard_WindowTemplates[] = { .tilemapTop = 14, .width = 28, .height = 5, - .paletteNum = 2, + .paletteNum = 0x2, .baseBlock = 0x0130 } }; @@ -239,11 +239,11 @@ s32 WonderCard_Enter(void) case 3: if (FreeTempTileDataBuffersIfPossible()) return 0; - LoadPalette(GetTextWindowPalette(1), 0x20, 0x20); + LoadPalette(GetTextWindowPalette(1), BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); gPaletteFade.bufferTransferDisabled = TRUE; - LoadPalette(sWonderCardData->gfx->pal, 0x10, 0x20); + LoadPalette(sWonderCardData->gfx->pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); LZ77UnCompWram(sWonderCardData->gfx->map, sWonderCardData->bgTilemapBuffer); - CopyRectToBgTilemapBufferRect(2, sWonderCardData->bgTilemapBuffer, 0, 0, 30, 20, 0, 0, 30, 20, 1, 0x008, 0); + CopyRectToBgTilemapBufferRect(2, sWonderCardData->bgTilemapBuffer, 0, 0, 30, 20, 0, 0, 30, 20, 0x1, 0x008, 0); CopyBgTilemapBufferToVram(2); break; case 4: @@ -586,7 +586,7 @@ static const struct WindowTemplate sNews_WindowTemplates[] = { .tilemapTop = 0, .width = 28, .height = 3, - .paletteNum = 2, + .paletteNum = 0x2, .baseBlock = 0x2AC }, [NEWS_WIN_BODY] = { @@ -595,7 +595,7 @@ static const struct WindowTemplate sNews_WindowTemplates[] = { .tilemapTop = 3, .width = 28, .height = 20, - .paletteNum = 2, + .paletteNum = 0x2, .baseBlock = 0x07C } }; @@ -702,12 +702,12 @@ s32 WonderNews_Enter(void) case 3: if (FreeTempTileDataBuffersIfPossible()) return 0; - LoadPalette(GetTextWindowPalette(1), 0x20, 0x20); + LoadPalette(GetTextWindowPalette(1), BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); gPaletteFade.bufferTransferDisabled = TRUE; - LoadPalette(sWonderNewsData->gfx->pal, 0x10, 0x20); + LoadPalette(sWonderNewsData->gfx->pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); LZ77UnCompWram(sWonderNewsData->gfx->map, sWonderNewsData->bgTilemapBuffer); - CopyRectToBgTilemapBufferRect(1, sWonderNewsData->bgTilemapBuffer, 0, 0, 30, 3, 0, 0, 30, 3, 1, 8, 0); - CopyRectToBgTilemapBufferRect(3, sWonderNewsData->bgTilemapBuffer, 0, 3, 30, 23, 0, 3, 30, 23, 1, 8, 0); + CopyRectToBgTilemapBufferRect(1, sWonderNewsData->bgTilemapBuffer, 0, 0, 30, 3, 0, 0, 30, 3, 0x1, 8, 0); + CopyRectToBgTilemapBufferRect(3, sWonderNewsData->bgTilemapBuffer, 0, 3, 30, 23, 0, 3, 30, 23, 0x1, 8, 0); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(3); break; diff --git a/src/naming_screen.c b/src/naming_screen.c index b4007b2658..bbdcef5658 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -233,7 +233,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 10, .width = 19, .height = 8, - .paletteNum = 10, + .paletteNum = 0xA, .baseBlock = 0x030 }, [WIN_KB_PAGE_2] = { @@ -242,7 +242,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 10, .width = 19, .height = 8, - .paletteNum = 10, + .paletteNum = 0xA, .baseBlock = 0x0C8 }, [WIN_TEXT_ENTRY] = { @@ -251,7 +251,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 6, .width = 17, .height = 2, - .paletteNum = 10, + .paletteNum = 0xA, .baseBlock = 0x030 }, [WIN_TEXT_ENTRY_BOX] = { @@ -260,7 +260,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 4, .width = 17, .height = 2, - .paletteNum = 10, + .paletteNum = 0xA, .baseBlock = 0x052 }, [WIN_BANNER] = { @@ -269,7 +269,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 0, .width = 30, .height = 2, - .paletteNum = 11, + .paletteNum = 0xB, .baseBlock = 0x074 }, DUMMY_WIN_TEMPLATE @@ -1880,9 +1880,9 @@ static void CreateHelperTasks(void) static void LoadPalettes(void) { - LoadPalette(gNamingScreenMenu_Pal, 0, sizeof(gNamingScreenMenu_Pal)); - LoadPalette(sKeyboard_Pal, 0xA0, sizeof(sKeyboard_Pal)); - LoadPalette(GetTextWindowPalette(2), 0xB0, 0x20); + LoadPalette(gNamingScreenMenu_Pal, BG_PLTT_ID(0x0), sizeof(gNamingScreenMenu_Pal)); + LoadPalette(sKeyboard_Pal, BG_PLTT_ID(0xA), sizeof(sKeyboard_Pal)); + LoadPalette(GetTextWindowPalette(2), BG_PLTT_ID(0xB), PLTT_SIZE_4BPP); } static void DrawBgTilemap(u8 bg, const void *src) diff --git a/src/option_menu.c b/src/option_menu.c index 3ca9857e84..e3d767c5e1 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -102,7 +102,7 @@ static const struct WindowTemplate sOptionMenuWinTemplates[] = .tilemapTop = 1, .width = 26, .height = 2, - .paletteNum = 1, + .paletteNum = 0x1, .baseBlock = 2 }, { @@ -111,7 +111,7 @@ static const struct WindowTemplate sOptionMenuWinTemplates[] = .tilemapTop = 5, .width = 26, .height = 14, - .paletteNum = 1, + .paletteNum = 0x1, .baseBlock = 0x36 }, DUMMY_WIN_TEMPLATE @@ -207,12 +207,12 @@ void CB2_InitOptionMenu(void) gMain.state++; break; case 4: - LoadPalette(sOptionMenuBg_Pal, 0, sizeof(sOptionMenuBg_Pal)); - LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, 0x70, 0x20); + LoadPalette(sOptionMenuBg_Pal, BG_PLTT_ID(0x0), sizeof(sOptionMenuBg_Pal)); + LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, BG_PLTT_ID(0x7), PLTT_SIZE_4BPP); gMain.state++; break; case 5: - LoadPalette(sOptionMenuText_Pal, 16, sizeof(sOptionMenuText_Pal)); + LoadPalette(sOptionMenuText_Pal, BG_PLTT_ID(0x1), sizeof(sOptionMenuText_Pal)); gMain.state++; break; case 6: @@ -529,7 +529,7 @@ static u8 FrameType_ProcessInput(u8 selection) selection = 0; LoadBgTiles(1, GetWindowFrameTilesPal(selection)->tiles, 0x120, 0x1A2); - LoadPalette(GetWindowFrameTilesPal(selection)->pal, 0x70, 0x20); + LoadPalette(GetWindowFrameTilesPal(selection)->pal, BG_PLTT_ID(0x7), PLTT_SIZE_4BPP); sArrowPressed = TRUE; } if (JOY_NEW(DPAD_LEFT)) @@ -540,7 +540,7 @@ static u8 FrameType_ProcessInput(u8 selection) selection = WINDOW_FRAMES_COUNT - 1; LoadBgTiles(1, GetWindowFrameTilesPal(selection)->tiles, 0x120, 0x1A2); - LoadPalette(GetWindowFrameTilesPal(selection)->pal, 0x70, 0x20); + LoadPalette(GetWindowFrameTilesPal(selection)->pal, BG_PLTT_ID(0x7), PLTT_SIZE_4BPP); sArrowPressed = TRUE; } return selection; @@ -653,24 +653,24 @@ static void DrawBgWindowFrames(void) { // bg, tile, x, y, width, height, palNum // Draw title window frame - FillBgTilemapBufferRect(1, TILE_TOP_CORNER_L, 1, 0, 1, 1, 7); - FillBgTilemapBufferRect(1, TILE_TOP_EDGE, 2, 0, 27, 1, 7); - FillBgTilemapBufferRect(1, TILE_TOP_CORNER_R, 28, 0, 1, 1, 7); - FillBgTilemapBufferRect(1, TILE_LEFT_EDGE, 1, 1, 1, 2, 7); - FillBgTilemapBufferRect(1, TILE_RIGHT_EDGE, 28, 1, 1, 2, 7); - FillBgTilemapBufferRect(1, TILE_BOT_CORNER_L, 1, 3, 1, 1, 7); - FillBgTilemapBufferRect(1, TILE_BOT_EDGE, 2, 3, 27, 1, 7); - FillBgTilemapBufferRect(1, TILE_BOT_CORNER_R, 28, 3, 1, 1, 7); + FillBgTilemapBufferRect(1, TILE_TOP_CORNER_L, 1, 0, 1, 1, 0x7); + FillBgTilemapBufferRect(1, TILE_TOP_EDGE, 2, 0, 27, 1, 0x7); + FillBgTilemapBufferRect(1, TILE_TOP_CORNER_R, 28, 0, 1, 1, 0x7); + FillBgTilemapBufferRect(1, TILE_LEFT_EDGE, 1, 1, 1, 2, 0x7); + FillBgTilemapBufferRect(1, TILE_RIGHT_EDGE, 28, 1, 1, 2, 0x7); + FillBgTilemapBufferRect(1, TILE_BOT_CORNER_L, 1, 3, 1, 1, 0x7); + FillBgTilemapBufferRect(1, TILE_BOT_EDGE, 2, 3, 27, 1, 0x7); + FillBgTilemapBufferRect(1, TILE_BOT_CORNER_R, 28, 3, 1, 1, 0x7); // Draw options list window frame - FillBgTilemapBufferRect(1, TILE_TOP_CORNER_L, 1, 4, 1, 1, 7); - FillBgTilemapBufferRect(1, TILE_TOP_EDGE, 2, 4, 26, 1, 7); - FillBgTilemapBufferRect(1, TILE_TOP_CORNER_R, 28, 4, 1, 1, 7); - FillBgTilemapBufferRect(1, TILE_LEFT_EDGE, 1, 5, 1, 18, 7); - FillBgTilemapBufferRect(1, TILE_RIGHT_EDGE, 28, 5, 1, 18, 7); - FillBgTilemapBufferRect(1, TILE_BOT_CORNER_L, 1, 19, 1, 1, 7); - FillBgTilemapBufferRect(1, TILE_BOT_EDGE, 2, 19, 26, 1, 7); - FillBgTilemapBufferRect(1, TILE_BOT_CORNER_R, 28, 19, 1, 1, 7); + FillBgTilemapBufferRect(1, TILE_TOP_CORNER_L, 1, 4, 1, 1, 0x7); + FillBgTilemapBufferRect(1, TILE_TOP_EDGE, 2, 4, 26, 1, 0x7); + FillBgTilemapBufferRect(1, TILE_TOP_CORNER_R, 28, 4, 1, 1, 0x7); + FillBgTilemapBufferRect(1, TILE_LEFT_EDGE, 1, 5, 1, 18, 0x7); + FillBgTilemapBufferRect(1, TILE_RIGHT_EDGE, 28, 5, 1, 18, 0x7); + FillBgTilemapBufferRect(1, TILE_BOT_CORNER_L, 1, 19, 1, 1, 0x7); + FillBgTilemapBufferRect(1, TILE_BOT_EDGE, 2, 19, 26, 1, 0x7); + FillBgTilemapBufferRect(1, TILE_BOT_CORNER_R, 28, 19, 1, 1, 0x7); CopyBgTilemapBufferToVram(1); } diff --git a/src/palette.c b/src/palette.c index 577257eff3..e02e0de5bf 100644 --- a/src/palette.c +++ b/src/palette.c @@ -431,7 +431,7 @@ static u8 UpdateNormalPaletteFade(void) gPaletteFade.delayCounter = 0; } - paletteOffset = 0; + paletteOffset = 0x00; if (!gPaletteFade.objPaletteToggle) { @@ -452,7 +452,7 @@ static u8 UpdateNormalPaletteFade(void) gPaletteFade.y, gPaletteFade.blendColor); selectedPalettes >>= 1; - paletteOffset += 16; + paletteOffset += 0x10; } gPaletteFade.objPaletteToggle ^= 1; @@ -495,7 +495,7 @@ static u8 UpdateNormalPaletteFade(void) void InvertPlttBuffer(u32 selectedPalettes) { - u16 paletteOffset = 0; + u16 paletteOffset = 0x00; while (selectedPalettes) { @@ -506,13 +506,13 @@ void InvertPlttBuffer(u32 selectedPalettes) gPlttBufferFaded[paletteOffset + i] = ~gPlttBufferFaded[paletteOffset + i]; } selectedPalettes >>= 1; - paletteOffset += 16; + paletteOffset += 0x10; } } void TintPlttBuffer(u32 selectedPalettes, s8 r, s8 g, s8 b) { - u16 paletteOffset = 0; + u16 paletteOffset = 0x00; while (selectedPalettes) { @@ -528,13 +528,13 @@ void TintPlttBuffer(u32 selectedPalettes, s8 r, s8 g, s8 b) } } selectedPalettes >>= 1; - paletteOffset += 16; + paletteOffset += 0x10; } } void UnfadePlttBuffer(u32 selectedPalettes) { - u16 paletteOffset = 0; + u16 paletteOffset = 0x00; while (selectedPalettes) { @@ -545,7 +545,7 @@ void UnfadePlttBuffer(u32 selectedPalettes) gPlttBufferFaded[paletteOffset + i] = gPlttBufferUnfaded[paletteOffset + i]; } selectedPalettes >>= 1; - paletteOffset += 16; + paletteOffset += 0x10; } } @@ -835,7 +835,7 @@ void BlendPalettes(u32 selectedPalettes, u8 coeff, u16 color) { u16 paletteOffset; - for (paletteOffset = 0; selectedPalettes; paletteOffset += 16) + for (paletteOffset = 0x00; selectedPalettes; paletteOffset += 0x10) { if (selectedPalettes & 1) BlendPalette(paletteOffset, 16, coeff, color); diff --git a/src/party_menu.c b/src/party_menu.c index 623f2eecab..2a4abef2a8 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -668,8 +668,8 @@ static bool8 AllocPartyMenuBgGfx(void) } break; case 2: - LoadCompressedPalette(gPartyMenuBg_Pal, 0, 0x160); - CpuCopy16(gPlttBufferUnfaded, sPartyMenuInternal->palBuffer, 0x160); + LoadCompressedPalette(gPartyMenuBg_Pal, BG_PLTT_ID(0x0), 11 * PLTT_SIZE_4BPP); + CpuCopy16(gPlttBufferUnfaded, sPartyMenuInternal->palBuffer, 11 * PLTT_SIZE_4BPP); sPartyMenuInternal->data[0]++; break; case 3: @@ -1021,7 +1021,7 @@ static void CreateCancelConfirmPokeballSprites(void) if (gPartyMenu.menuType == PARTY_MENU_TYPE_MULTI_SHOWCASE) { // The showcase has no Cancel/Confirm buttons - FillBgTilemapBufferRect(1, 14, 23, 17, 7, 2, 1); + FillBgTilemapBufferRect(1, 14, 23, 17, 7, 2, 0x1); } else { @@ -2015,9 +2015,9 @@ static void InitPartyMenuWindows(u8 layout) DeactivateAllTextPrinters(); for (i = 0; i < PARTY_SIZE; i++) FillWindowPixelBuffer(i, PIXEL_FILL(0)); - LoadUserWindowBorderGfx(0, 0x4F, 0xD0); - LoadPalette(GetOverworldTextboxPalettePtr(), 0xE0, 0x20); - LoadPalette(gStandardMenuPalette, 0xF0, 0x20); + LoadUserWindowBorderGfx(0, 0x4F, BG_PLTT_ID(0xD)); + LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); } static void CreateCancelConfirmWindows(bool8 chooseHalf) @@ -2119,9 +2119,9 @@ static void DrawEmptySlot(u8 windowId) #define LOAD_PARTY_BOX_PAL(paletteIds, paletteOffsets) \ { \ - LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[0]), paletteOffsets[0] + palNum, 2); \ - LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[1]), paletteOffsets[1] + palNum, 2); \ - LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[2]), paletteOffsets[2] + palNum, 2); \ + LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[0]), paletteOffsets[0] + palNum, PLTT_SIZEOF(1)); \ + LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[1]), paletteOffsets[1] + palNum, PLTT_SIZEOF(1)); \ + LoadPalette(GetPartyMenuPalBufferPtr(paletteIds[2]), paletteOffsets[2] + palNum, PLTT_SIZEOF(1)); \ } static void LoadPartyBoxPalette(struct PartyMenuBox *menuBox, u8 palFlags) @@ -2263,13 +2263,13 @@ static void DisplayPartyPokemonGender(u8 gender, u16 species, u8 *nickname, stru switch (gender) { case MON_MALE: - LoadPalette(GetPartyMenuPalBufferPtr(sGenderMalePalIds[0]), sGenderPalOffsets[0] + palNum, 2); - LoadPalette(GetPartyMenuPalBufferPtr(sGenderMalePalIds[1]), sGenderPalOffsets[1] + palNum, 2); + LoadPalette(GetPartyMenuPalBufferPtr(sGenderMalePalIds[0]), sGenderPalOffsets[0] + palNum, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sGenderMalePalIds[1]), sGenderPalOffsets[1] + palNum, PLTT_SIZEOF(1)); DisplayPartyPokemonBarDetail(menuBox->windowId, gText_MaleSymbol, 2, &menuBox->infoRects->dimensions[8]); break; case MON_FEMALE: - LoadPalette(GetPartyMenuPalBufferPtr(sGenderFemalePalIds[0]), sGenderPalOffsets[0] + palNum, 2); - LoadPalette(GetPartyMenuPalBufferPtr(sGenderFemalePalIds[1]), sGenderPalOffsets[1] + palNum, 2); + LoadPalette(GetPartyMenuPalBufferPtr(sGenderFemalePalIds[0]), sGenderPalOffsets[0] + palNum, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sGenderFemalePalIds[1]), sGenderPalOffsets[1] + palNum, PLTT_SIZEOF(1)); DisplayPartyPokemonBarDetail(menuBox->windowId, gText_FemaleSymbol, 2, &menuBox->infoRects->dimensions[8]); break; } @@ -2330,16 +2330,16 @@ static void DisplayPartyPokemonHPBar(u16 hp, u16 maxhp, struct PartyMenuBox *men { case HP_BAR_GREEN: case HP_BAR_FULL: - LoadPalette(GetPartyMenuPalBufferPtr(sHPBarGreenPalIds[0]), sHPBarPalOffsets[0] + palNum, 2); - LoadPalette(GetPartyMenuPalBufferPtr(sHPBarGreenPalIds[1]), sHPBarPalOffsets[1] + palNum, 2); + LoadPalette(GetPartyMenuPalBufferPtr(sHPBarGreenPalIds[0]), sHPBarPalOffsets[0] + palNum, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sHPBarGreenPalIds[1]), sHPBarPalOffsets[1] + palNum, PLTT_SIZEOF(1)); break; case HP_BAR_YELLOW: - LoadPalette(GetPartyMenuPalBufferPtr(sHPBarYellowPalIds[0]), sHPBarPalOffsets[0] + palNum, 2); - LoadPalette(GetPartyMenuPalBufferPtr(sHPBarYellowPalIds[1]), sHPBarPalOffsets[1] + palNum, 2); + LoadPalette(GetPartyMenuPalBufferPtr(sHPBarYellowPalIds[0]), sHPBarPalOffsets[0] + palNum, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sHPBarYellowPalIds[1]), sHPBarPalOffsets[1] + palNum, PLTT_SIZEOF(1)); break; default: - LoadPalette(GetPartyMenuPalBufferPtr(sHPBarRedPalIds[0]), sHPBarPalOffsets[0] + palNum, 2); - LoadPalette(GetPartyMenuPalBufferPtr(sHPBarRedPalIds[1]), sHPBarPalOffsets[1] + palNum, 2); + LoadPalette(GetPartyMenuPalBufferPtr(sHPBarRedPalIds[0]), sHPBarPalOffsets[0] + palNum, PLTT_SIZEOF(1)); + LoadPalette(GetPartyMenuPalBufferPtr(sHPBarRedPalIds[1]), sHPBarPalOffsets[1] + palNum, PLTT_SIZEOF(1)); break; } @@ -2822,7 +2822,7 @@ static void MoveAndBufferPartySlot(const void *rectSrc, s16 x, s16 y, s16 width, { FillBgTilemapBufferRect_Palette0(0, 0, newX, y, newWidth, height); if (TryMovePartySlot(x + dir, width, &srcX, &newX, &newWidth)) - CopyRectToBgTilemapBufferRect(0, rectSrc, srcX, 0, width, height, newX, y, newWidth, height, 17, 0, 0); + CopyRectToBgTilemapBufferRect(0, rectSrc, srcX, 0, width, height, newX, y, newWidth, height, 17, 0, 0x0); } } diff --git a/src/player_pc.c b/src/player_pc.c index 9ec36d61d2..1998495beb 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -244,7 +244,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenus[] = .tilemapTop = 1, .width = 9, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }, [WIN_MAIN_MENU_BEDROOM] = { @@ -253,7 +253,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenus[] = .tilemapTop = 1, .width = 9, .height = 8, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }, [WIN_ITEM_STORAGE_MENU] = { @@ -262,7 +262,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenus[] = .tilemapTop = 1, .width = 10, .height = 8, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 } }; @@ -302,7 +302,7 @@ static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT .tilemapTop = 1, .width = 13, .height = 18, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0001 }, [ITEMPC_WIN_MESSAGE] = { @@ -311,7 +311,7 @@ static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT .tilemapTop = 13, .width = 13, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x00EB }, [ITEMPC_WIN_ICON] = { @@ -320,7 +320,7 @@ static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT .tilemapTop = 8, .width = 3, .height = 3, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0153 }, [ITEMPC_WIN_TITLE] = { @@ -329,7 +329,7 @@ static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT .tilemapTop = 1, .width = 13, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0139 }, [ITEMPC_WIN_QUANTITY] = { @@ -338,7 +338,7 @@ static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT .tilemapTop = 9, .width = 6, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x015C }, [ITEMPC_WIN_YESNO] = { @@ -347,7 +347,7 @@ static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT .tilemapTop = 7, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0168 } }; diff --git a/src/pokeblock.c b/src/pokeblock.c index cf0513f80e..769363b3eb 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -314,7 +314,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 1, .width = 9, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x1E }, [WIN_LIST] = { @@ -323,7 +323,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 1, .width = 14, .height = 18, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x30 }, [WIN_SPICY] = { @@ -332,7 +332,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 13, .width = 5, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x12C }, [WIN_DRY] = { @@ -341,7 +341,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 5, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x136 }, [WIN_SWEET] = { @@ -350,7 +350,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 17, .width = 5, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x140 }, [WIN_BITTER] = { @@ -359,7 +359,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 13, .width = 5, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x14A }, [WIN_SOUR] = { @@ -368,7 +368,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 5, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x154 }, [WIN_FEEL] = { @@ -377,7 +377,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 17, .width = 2, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x15E }, [WIN_ACTIONS_TALL] = { @@ -386,7 +386,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 5, .width = 6, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x162 }, [WIN_ACTIONS] = { @@ -395,7 +395,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 7, .width = 6, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x186 }, [WIN_TOSS_MSG] = { @@ -404,7 +404,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x19E }, DUMMY_WIN_TEMPLATE @@ -417,7 +417,7 @@ static const struct WindowTemplate sTossPkblockWindowTemplate = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x20A }; @@ -653,7 +653,7 @@ static bool8 LoadPokeblockMenuGfx(void) } break; case 2: - LoadCompressedPalette(gMenuPokeblock_Pal, 0, 0xC0); + LoadCompressedPalette(gMenuPokeblock_Pal, BG_PLTT_ID(0x0), 6 * PLTT_SIZE_4BPP); sPokeblockMenu->gfxState++; break; case 3: @@ -679,9 +679,9 @@ static void HandleInitWindows(void) InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 1, 0xE0); - LoadMessageBoxGfx(0, 0xA, 0xD0); - LoadPalette(gStandardMenuPalette, 0xF0, 0x20); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xE)); + LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(0xD)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); for (i = 0; i < ARRAY_COUNT(sWindowTemplates) - 1; i++) FillWindowPixelBuffer(i, PIXEL_FILL(0)); diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 5267c3b848..53de0ee9a5 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -459,7 +459,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0xA }, DUMMY_WIN_TEMPLATE @@ -771,7 +771,7 @@ static bool8 LoadMonAndSceneGfx(struct Pokemon *mon) } break; case 8: - LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); + LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); sPokeblockFeed->loadGfxState = 0; return TRUE; } @@ -783,8 +783,8 @@ static void HandleInitWindows(void) { InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 1, 0xE0); - LoadPalette(gStandardMenuPalette, 0xF0, 0x20); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xE)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); ScheduleBgCopyTilemapToVram(0); diff --git a/src/pokedex.c b/src/pokedex.c index 8abf972488..6a5de60179 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -831,7 +831,7 @@ static const struct WindowTemplate sPokemonList_WindowTemplate[] = .tilemapTop = 0, .width = 32, .height = 32, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 1, }, DUMMY_WIN_TEMPLATE @@ -902,7 +902,7 @@ static const struct WindowTemplate sInfoScreen_WindowTemplates[] = .tilemapTop = 0, .width = 32, .height = 20, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 1, }, [WIN_FOOTPRINT] = @@ -912,7 +912,7 @@ static const struct WindowTemplate sInfoScreen_WindowTemplates[] = .tilemapTop = 8, .width = 2, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 641, }, [WIN_CRY_WAVE] = @@ -922,7 +922,7 @@ static const struct WindowTemplate sInfoScreen_WindowTemplates[] = .tilemapTop = 12, .width = 32, .height = 7, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 645, }, [WIN_VU_METER] = @@ -932,7 +932,7 @@ static const struct WindowTemplate sInfoScreen_WindowTemplates[] = .tilemapTop = 3, .width = 10, .height = 8, - .paletteNum = 9, + .paletteNum = 0x9, .baseBlock = 869, }, DUMMY_WIN_TEMPLATE @@ -969,7 +969,7 @@ static const struct WindowTemplate sNewEntryInfoScreen_WindowTemplates[] = .tilemapTop = 0, .width = 32, .height = 20, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 1, }, [WIN_FOOTPRINT] = @@ -979,7 +979,7 @@ static const struct WindowTemplate sNewEntryInfoScreen_WindowTemplates[] = .tilemapTop = 8, .width = 2, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 641, }, DUMMY_WIN_TEMPLATE @@ -1490,7 +1490,7 @@ static const struct WindowTemplate sSearchMenu_WindowTemplate[] = .tilemapTop = 0, .width = 32, .height = 20, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 0x0001, }, DUMMY_WIN_TEMPLATE @@ -2145,12 +2145,12 @@ static bool8 LoadPokedexListPage(u8 page) static void LoadPokedexBgPalette(bool8 isSearchResults) { if (isSearchResults == TRUE) - LoadPalette(gPokedexSearchResults_Pal + 1, 1, 0xBE); + LoadPalette(gPokedexSearchResults_Pal + 1, BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(6 * 16 - 1)); else if (!IsNationalPokedexEnabled()) - LoadPalette(gPokedexBgHoenn_Pal + 1, 1, 0xBE); + LoadPalette(gPokedexBgHoenn_Pal + 1, BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(6 * 16 - 1)); else - LoadPalette(gPokedexBgNational_Pal + 1, 1, 0xBE); - LoadPalette(GetOverworldTextboxPalettePtr(), 0xF0, 32); + LoadPalette(gPokedexBgNational_Pal + 1, BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(6 * 16 - 1)); + LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); } static void FreeWindowAndBgBuffers(void) @@ -3264,7 +3264,7 @@ static void Task_LoadInfoScreen(u8 taskId) case 4: PrintMonInfo(sPokedexListItem->dexNum, sPokedexView->dexMode == DEX_MODE_HOENN ? FALSE : TRUE, sPokedexListItem->owned, 0); if (!sPokedexListItem->owned) - LoadPalette(gPlttBufferUnfaded + 1, 0x31, 0x1E); + LoadPalette(gPlttBufferUnfaded + 1, BG_PLTT_ID(0x3) + 1, PLTT_SIZEOF(16 - 1)); CopyWindowToVram(WIN_INFO, COPYWIN_FULL); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(2); @@ -3713,7 +3713,7 @@ static void LoadPlayArrowPalette(bool8 cryPlaying) color = RGB(18, 28, 0); else color = RGB(15, 21, 0); - LoadPalette(&color, 0x5D, 2); + LoadPalette(&color, BG_PLTT_ID(0x5) + 13, PLTT_SIZEOF(1)); } static void Task_LoadSizeScreen(u8 taskId) @@ -3768,7 +3768,7 @@ static void Task_LoadSizeScreen(u8 taskId) gSprites[spriteId].oam.priority = 0; gSprites[spriteId].y2 = gPokedexEntries[sPokedexListItem->dexNum].trainerOffset; SetOamMatrix(1, gPokedexEntries[sPokedexListItem->dexNum].trainerScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].trainerScale); - LoadPalette(sSizeScreenSilhouette_Pal, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20); + LoadPalette(sSizeScreenSilhouette_Pal, OBJ_PLTT_ID2(gSprites[spriteId].oam.paletteNum), PLTT_SIZE_4BPP); gTasks[taskId].tTrainerSpriteId = spriteId; gMain.state++; break; @@ -3779,7 +3779,7 @@ static void Task_LoadSizeScreen(u8 taskId) gSprites[spriteId].oam.priority = 0; gSprites[spriteId].y2 = gPokedexEntries[sPokedexListItem->dexNum].pokemonOffset; SetOamMatrix(2, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale); - LoadPalette(sSizeScreenSilhouette_Pal, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20); + LoadPalette(sSizeScreenSilhouette_Pal, OBJ_PLTT_ID2(gSprites[spriteId].oam.paletteNum), PLTT_SIZE_4BPP); gTasks[taskId].tMonSpriteId = spriteId; CopyWindowToVram(WIN_INFO, COPYWIN_FULL); CopyBgTilemapBufferToVram(1); @@ -4030,11 +4030,11 @@ static void Task_HandleCaughtMonPageInput(u8 taskId) // Flicker caught screen color else if (++gTasks[taskId].tPalTimer & 16) { - LoadPalette(gPokedexBgHoenn_Pal + 1, 0x31, 14); + LoadPalette(gPokedexBgHoenn_Pal + 1, BG_PLTT_ID(0x3) + 1, PLTT_SIZEOF(7)); } else { - LoadPalette(gPokedexCaughtScreen_Pal + 1, 0x31, 14); + LoadPalette(gPokedexCaughtScreen_Pal + 1, BG_PLTT_ID(0x3) + 1, PLTT_SIZEOF(7)); } } @@ -4063,7 +4063,7 @@ static void Task_ExitCaughtMonPage(u8 taskId) personality = ((u16)gTasks[taskId].tPersonalityHi << 16) | (u16)gTasks[taskId].tPersonalityLo; paletteNum = gSprites[gTasks[taskId].tMonSpriteId].oam.paletteNum; lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality); - LoadCompressedPalette(lzPaletteData, 0x100 | paletteNum * 16, 32); + LoadCompressedPalette(lzPaletteData, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP); DestroyTask(taskId); } } @@ -4836,7 +4836,7 @@ static void Task_LoadSearchMenu(u8 taskId) CopyToBgTilemapBuffer(3, gPokedexSearchMenuHoenn_Tilemap, 0, 0); else CopyToBgTilemapBuffer(3, gPokedexSearchMenuNational_Tilemap, 0, 0); - LoadPalette(gPokedexSearchMenu_Pal + 1, 1, 0x7E); + LoadPalette(gPokedexSearchMenu_Pal + 1, BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(4 * 16 - 1)); gMain.state = 1; } break; diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c index 406d1377d6..ed53ebf1ec 100644 --- a/src/pokedex_cry_screen.c +++ b/src/pokedex_cry_screen.c @@ -258,7 +258,7 @@ bool8 LoadCryWaveformWindow(struct CryScreenWindow *window, u8 windowId) break; case 2: DrawWaveformWindow(windowId); - LoadPalette(sCryScreenBg_Pal, window->paletteNo * 16, 32); + LoadPalette(sCryScreenBg_Pal, BG_PLTT_ID(window->paletteNo), PLTT_SIZE_4BPP); finished = TRUE; break; } @@ -458,7 +458,7 @@ bool8 LoadCryMeter(struct CryScreenWindow *window, u8 windowId) sCryMeterNeedle = AllocZeroed(sizeof(*sCryMeterNeedle)); CopyToWindowPixelBuffer(windowId, sCryMeter_Gfx, 0, 0); - LoadPalette(sCryMeter_Pal, window->paletteNo * 16, 32); + LoadPalette(sCryMeter_Pal, BG_PLTT_ID(window->paletteNo), PLTT_SIZE_4BPP); gDexCryScreenState++; break; case 1: diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 9a95edf4b3..ae9df9ba14 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -1,5 +1,6 @@ #include "global.h" #include "battle.h" +#include "palette.h" #include "pokemon.h" #include "pokemon_animation.h" #include "sprite.h" @@ -1538,7 +1539,7 @@ static void Anim_CircleCounterclockwise(struct Sprite *sprite) #define GlowColor(color, colorIncrement, speed) \ { \ if (sprite->data[2] == 0) \ - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; \ + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); \ \ if (sprite->data[2] > 128) \ { \ @@ -2473,7 +2474,7 @@ static void Anim_FlashYellow(struct Sprite *sprite) { if (++sprite->data[2] == 1) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[6] = 0; sprite->data[5] = 0; sprite->data[4] = 0; @@ -5262,7 +5263,7 @@ static void Anim_ShakeFlashYellow_Fast(struct Sprite *sprite) { if (++sprite->data[2] == 1) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[6] = 0; sprite->data[5] = 0; sprite->data[4] = 0; @@ -5276,7 +5277,7 @@ static void Anim_ShakeFlashYellow(struct Sprite *sprite) { if (++sprite->data[2] == 1) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[6] = 0; sprite->data[5] = 0; sprite->data[4] = 0; @@ -5290,7 +5291,7 @@ static void Anim_ShakeFlashYellow_Slow(struct Sprite *sprite) { if (++sprite->data[2] == 1) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[6] = 0; sprite->data[5] = 0; sprite->data[4] = 0; @@ -5356,7 +5357,7 @@ static void Anim_ShakeGlowRed_Fast(struct Sprite *sprite) { if (sprite->data[2] == 0) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[0] = 10; sprite->data[5] = 0; sprite->data[4] = 2; @@ -5377,7 +5378,7 @@ static void Anim_ShakeGlowRed(struct Sprite *sprite) { if (sprite->data[2] == 0) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[0] = 20; sprite->data[5] = 0; sprite->data[4] = 1; @@ -5398,7 +5399,7 @@ static void Anim_ShakeGlowRed_Slow(struct Sprite *sprite) { if (sprite->data[2] == 0) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[0] = 80; sprite->data[5] = 0; sprite->data[4] = 1; @@ -5419,7 +5420,7 @@ static void Anim_ShakeGlowGreen_Fast(struct Sprite *sprite) { if (sprite->data[2] == 0) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[0] = 10; sprite->data[5] = 0; sprite->data[4] = 2; @@ -5440,7 +5441,7 @@ static void Anim_ShakeGlowGreen(struct Sprite *sprite) { if (sprite->data[2] == 0) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[0] = 20; sprite->data[5] = 0; sprite->data[4] = 1; @@ -5461,7 +5462,7 @@ static void Anim_ShakeGlowGreen_Slow(struct Sprite *sprite) { if (sprite->data[2] == 0) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[0] = 80; sprite->data[5] = 0; sprite->data[4] = 1; @@ -5482,7 +5483,7 @@ static void Anim_ShakeGlowBlue_Fast(struct Sprite *sprite) { if (sprite->data[2] == 0) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[0] = 10; sprite->data[5] = 0; sprite->data[4] = 2; @@ -5503,7 +5504,7 @@ static void Anim_ShakeGlowBlue(struct Sprite *sprite) { if (sprite->data[2] == 0) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[0] = 20; sprite->data[5] = 0; sprite->data[4] = 1; @@ -5524,7 +5525,7 @@ static void Anim_ShakeGlowBlue_Slow(struct Sprite *sprite) { if (sprite->data[2] == 0) { - sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; + sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); sprite->data[0] = 80; sprite->data[5] = 0; sprite->data[4] = 1; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 7f9b146a41..92df35ecc7 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1201,12 +1201,12 @@ void TryLoadAllMonIconPalettesAtOffset(u16 offset) s32 i; const struct SpritePalette* monIconPalettePtr; - if (offset <= 0xA0) + if (offset <= BG_PLTT_ID(0xA)) { monIconPalettePtr = gMonIconPaletteTable; - for(i = ARRAY_COUNT(gMonIconPaletteTable) - 1; i >= 0; i--) + for (i = ARRAY_COUNT(gMonIconPaletteTable) - 1; i >= 0; i--) { - LoadPalette(monIconPalettePtr->data, offset, 0x20); + LoadPalette(monIconPalettePtr->data, offset, PLTT_SIZE_4BPP); offset += 0x10; monIconPalettePtr++; } diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 4f2a14fdf0..4039a62c6a 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -3105,7 +3105,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 0, .width = 6, .height = 2, - .paletteNum = 2, + .paletteNum = 0x2, .baseBlock = 0x13, }, [WIN_TIMES] = { @@ -3114,7 +3114,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 0, .width = 6, .height = 2, - .paletteNum = 2, + .paletteNum = 0x2, .baseBlock = 0x1F, }, DUMMY_WIN_TEMPLATE, @@ -3183,21 +3183,21 @@ static void LoadPokeJumpGfx(void) ResetTempTileDataBuffers(); LoadSpriteSheetsAndPalettes(sPokemonJumpGfx); InitDigitPrinters(); - LoadPalette(sBg_Pal, 0, 0x20); + LoadPalette(sBg_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); DecompressAndCopyTileDataToVram(BG_SCENERY, sBg_Gfx, 0, 0, 0); DecompressAndCopyTileDataToVram(BG_SCENERY, sBg_Tilemap, 0, 0, 1); - LoadPalette(sVenusaur_Pal, 0x30, 0x20); + LoadPalette(sVenusaur_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); DecompressAndCopyTileDataToVram(BG_VENUSAUR, sVenusaur_Gfx, 0, 0, 0); DecompressAndCopyTileDataToVram(BG_VENUSAUR, sVenusaur_Tilemap, 0, 0, 1); - LoadPalette(sBonuses_Pal, 0x10, 0x20); + LoadPalette(sBonuses_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); DecompressAndCopyTileDataToVram(BG_BONUSES, sBonuses_Gfx, 0, 0, 0); DecompressAndCopyTileDataToVram(BG_BONUSES, sBonuses_Tilemap, 0, 0, 1); - LoadPalette(sInterface_Pal, 0x20, 0x20); + LoadPalette(sInterface_Pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); SetBgTilemapBuffer(BG_INTERFACE, sPokemonJumpGfx->tilemapBuffer); FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, 0x20, 0x20); PrintScoreSuffixes(); PrintScore(0); - LoadUserWindowBorderGfxOnBg(0, 1, 0xE0); + LoadUserWindowBorderGfxOnBg(0, 1, BG_PLTT_ID(0xE)); CopyBgTilemapBufferToVram(BG_INTERFACE); CopyBgTilemapBufferToVram(BG_VENUSAUR); CopyBgTilemapBufferToVram(BG_BONUSES); @@ -3321,7 +3321,7 @@ static void Msg_WantToPlayAgain(void) if (!IsDma3ManagerBusyWithBgCopy()) { PutWindowTilemap(sPokemonJumpGfx->msgWindowId); - DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE); CreatePokeJumpYesNoMenu(23, 7, 0); CopyBgTilemapBufferToVram(BG_INTERFACE); sPokemonJumpGfx->mainState++; @@ -3348,7 +3348,7 @@ static void Msg_SavingDontTurnOff(void) if (!IsDma3ManagerBusyWithBgCopy()) { PutWindowTilemap(sPokemonJumpGfx->msgWindowId); - DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE); CopyBgTilemapBufferToVram(BG_INTERFACE); sPokemonJumpGfx->mainState++; } @@ -3391,7 +3391,7 @@ static void Msg_SomeoneDroppedOut(void) if (!IsDma3ManagerBusyWithBgCopy()) { PutWindowTilemap(sPokemonJumpGfx->msgWindowId); - DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE); CopyBgTilemapBufferToVram(BG_INTERFACE); sPokemonJumpGfx->mainState++; } @@ -3417,7 +3417,7 @@ static void Msg_CommunicationStandby(void) if (!IsDma3ManagerBusyWithBgCopy()) { PutWindowTilemap(sPokemonJumpGfx->msgWindowId); - DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE); CopyBgTilemapBufferToVram(BG_INTERFACE); sPokemonJumpGfx->mainState++; } @@ -3527,7 +3527,7 @@ static bool32 DoPrizeMessageAndFanfare(void) if (!IsDma3ManagerBusyWithBgCopy()) { PutWindowTilemap(sPokemonJumpGfx->msgWindowId); - DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE); CopyBgTilemapBufferToVram(BG_INTERFACE); sPokemonJumpGfx->msgWindowState++; } @@ -3618,7 +3618,7 @@ static void CreatePokeJumpYesNoMenu(u16 left, u16 top, u8 cursorPos) window.tilemapTop = top; window.width = 6; window.height = 4; - window.paletteNum = 2; + window.paletteNum = 0x2; window.baseBlock = 0x2B; CreateYesNoMenu(&window, 1, 0xD, cursorPos); @@ -3832,7 +3832,7 @@ static void AddPlayerNameWindows(void) window.bg = BG_INTERFACE; window.width = 8; window.height = 2; - window.paletteNum = 2; + window.paletteNum = 0x2; window.baseBlock = 0x2B; for (i = 0; i < playersCount; i++) @@ -4142,7 +4142,7 @@ static const struct WindowTemplate sWindowTemplate_Records = .tilemapTop = 1, .width = 28, .height = 9, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x1, }; @@ -4213,7 +4213,7 @@ static void PrintRecordsText(u16 windowId, int width) recordNums[1] = records->bestJumpScore; recordNums[2] = records->excellentsInRow; - LoadUserWindowBorderGfx_(windowId, 0x21D, 0xD0); + LoadUserWindowBorderGfx_(windowId, 0x21D, BG_PLTT_ID(0xD)); DrawTextBorderOuter(windowId, 0x21D, 0xD); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_PkmnJumpRecords, GetStringCenterAlignXOffset(FONT_NORMAL, gText_PkmnJumpRecords, width * 8), 1, TEXT_SKIP_DRAW, NULL); diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 32069153e6..010ec80f78 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -895,7 +895,7 @@ static const struct WindowTemplate sWindowTemplate_MainMenu = .tilemapTop = 1, .width = 17, .height = 10, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x1, }; @@ -976,7 +976,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 11, .width = 9, .height = 7, - .paletteNum = 3, + .paletteNum = 0x3, .baseBlock = 0xC0, }, [WIN_MESSAGE] = { @@ -985,7 +985,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 17, .width = 18, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x14, }, [WIN_ITEM_DESC] = { @@ -994,7 +994,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 13, .width = 21, .height = 7, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x14, }, DUMMY_WIN_TEMPLATE @@ -1104,7 +1104,7 @@ static const struct WindowTemplate sYesNoWindowTemplate = .tilemapTop = 11, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x5C, }; @@ -2128,7 +2128,7 @@ static void Task_InitPokeStorage(u8 taskId) PutWindowTilemap(WIN_DISPLAY_INFO); ClearWindowTilemap(WIN_MESSAGE); CpuFill32(0, (void *)VRAM, 0x200); - LoadUserWindowBorderGfx(WIN_MESSAGE, 0xB, 0xE0); + LoadUserWindowBorderGfx(WIN_MESSAGE, 0xB, BG_PLTT_ID(0xE)); break; case 3: ResetAllBgCoords(); @@ -3849,13 +3849,13 @@ static void LoadWaveformSpritePalette(void) static void InitPalettesAndSprites(void) { - LoadPalette(sInterface_Pal, 0, sizeof(sInterface_Pal)); - LoadPalette(sPkmnDataGray_Pal, 0x20, sizeof(sPkmnDataGray_Pal)); - LoadPalette(sTextWindows_Pal, 0xF0, sizeof(sTextWindows_Pal)); + LoadPalette(sInterface_Pal, BG_PLTT_ID(0x0), sizeof(sInterface_Pal)); + LoadPalette(sPkmnDataGray_Pal, BG_PLTT_ID(0x2), sizeof(sPkmnDataGray_Pal)); + LoadPalette(sTextWindows_Pal, BG_PLTT_ID(0xF), sizeof(sTextWindows_Pal)); if (sStorage->boxOption != OPTION_MOVE_ITEMS) - LoadPalette(sBg_Pal, 0x30, sizeof(sBg_Pal)); + LoadPalette(sBg_Pal, BG_PLTT_ID(0x3), sizeof(sBg_Pal)); else - LoadPalette(sBgMoveItems_Pal, 0x30, sizeof(sBgMoveItems_Pal)); + LoadPalette(sBgMoveItems_Pal, BG_PLTT_ID(0x3), sizeof(sBgMoveItems_Pal)); SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_16COLOR | BGCNT_SCREENBASE(30)); CreateDisplayMonSprite(); @@ -3958,7 +3958,7 @@ static void CreateDisplayMonSprite(void) break; sStorage->displayMonSprite = &gSprites[spriteId]; - sStorage->displayMonPalOffset = palSlot * 16 + 0x100; + sStorage->displayMonPalOffset = OBJ_PLTT_ID(palSlot); sStorage->displayMonTilePtr = (void *) OBJ_VRAM0 + tileStart * TILE_SIZE_4BPP; } while (0); @@ -3979,7 +3979,7 @@ static void LoadDisplayMonGfx(u16 species, u32 pid) LoadSpecialPokePic(&gMonFrontPicTable[species], sStorage->tileBuffer, species, pid, TRUE); LZ77UnCompWram(sStorage->displayMonPalette, sStorage->displayMonPalBuffer); CpuCopy32(sStorage->tileBuffer, sStorage->displayMonTilePtr, MON_PIC_SIZE); - LoadPalette(sStorage->displayMonPalBuffer, sStorage->displayMonPalOffset, 0x20); + LoadPalette(sStorage->displayMonPalBuffer, sStorage->displayMonPalOffset, PLTT_SIZE_4BPP); sStorage->displayMonSprite->invisible = FALSE; } else @@ -4045,7 +4045,7 @@ static void UpdateWaveformAnimation(void) static void InitSupplementalTilemaps(void) { LZ77UnCompWram(gStorageSystemPartyMenu_Tilemap, sStorage->partyMenuTilemapBuffer); - LoadPalette(gStorageSystemPartyMenu_Pal, 0x10, 0x20); + LoadPalette(gStorageSystemPartyMenu_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); TilemapUtil_SetMap(TILEMAPID_PARTY_MENU, 1, sStorage->partyMenuTilemapBuffer, 12, 22); TilemapUtil_SetMap(TILEMAPID_CLOSE_BUTTON, 1, sCloseBoxButton_Tilemap, 9, 4); TilemapUtil_SetPos(TILEMAPID_PARTY_MENU, 10, 0); @@ -4267,7 +4267,7 @@ static void UpdateBoxToSendMons(void) static void InitPokeStorageBg0(void) { SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(29)); - LoadUserWindowBorderGfx(WIN_MESSAGE, 2, 208); + LoadUserWindowBorderGfx(WIN_MESSAGE, 2, BG_PLTT_ID(0xD)); FillBgTilemapBufferRect(0, 0, 0, 0, 32, 20, 17); CopyBgTilemapBufferToVram(0); } @@ -4308,7 +4308,7 @@ static void PrintMessage(u8 id) DynamicPlaceholderTextUtil_ExpandPlaceholders(sStorage->messageText, sMessages[id].text); FillWindowPixelBuffer(WIN_MESSAGE, PIXEL_FILL(1)); AddTextPrinterParameterized(WIN_MESSAGE, FONT_NORMAL, sStorage->messageText, 0, 1, TEXT_SKIP_DRAW, NULL); - DrawTextBorderOuter(WIN_MESSAGE, 2, 14); + DrawTextBorderOuter(WIN_MESSAGE, 2, 0xE); PutWindowTilemap(WIN_MESSAGE); CopyWindowToVram(WIN_MESSAGE, COPYWIN_GFX); ScheduleBgCopyTilemapToVram(0); @@ -5380,9 +5380,9 @@ static void LoadWallpaperGfx(u8 boxId, s8 direction) DrawWallpaper(sStorage->wallpaperTilemap, sStorage->wallpaperLoadDir, sStorage->wallpaperOffset); if (sStorage->wallpaperLoadDir != 0) - LoadPalette(wallpaper->palettes, (sStorage->wallpaperOffset * 32) + 0x40, 0x40); + LoadPalette(wallpaper->palettes, 0x40 + BG_PLTT_ID(sStorage->wallpaperOffset * 2), 2 * PLTT_SIZE_4BPP); else - CpuCopy16(wallpaper->palettes, &gPlttBufferUnfaded[(sStorage->wallpaperOffset * 32) + 0x40], 0x40); + CpuCopy16(wallpaper->palettes, &gPlttBufferUnfaded[0x40 + BG_PLTT_ID(sStorage->wallpaperOffset * 2)], 2 * PLTT_SIZE_4BPP); sStorage->wallpaperTiles = malloc_and_decompress(wallpaper->tiles, &tilesSize); LoadBgTiles(2, sStorage->wallpaperTiles, tilesSize, sStorage->wallpaperOffset << 8); @@ -5398,9 +5398,9 @@ static void LoadWallpaperGfx(u8 boxId, s8 direction) CpuCopy16(GetWaldaWallpaperColorsPtr(), &sStorage->wallpaperTilemap[17], 4); if (sStorage->wallpaperLoadDir != 0) - LoadPalette(sStorage->wallpaperTilemap, (sStorage->wallpaperOffset * 32) + 0x40, 0x40); + LoadPalette(sStorage->wallpaperTilemap, 0x40 + BG_PLTT_ID(sStorage->wallpaperOffset * 2), 2 * PLTT_SIZE_4BPP); else - CpuCopy16(sStorage->wallpaperTilemap, &gPlttBufferUnfaded[(sStorage->wallpaperOffset * 32) + 0x40], 0x40); + CpuCopy16(sStorage->wallpaperTilemap, &gPlttBufferUnfaded[0x40 + BG_PLTT_ID(sStorage->wallpaperOffset * 2)], 2 * PLTT_SIZE_4BPP); sStorage->wallpaperTiles = malloc_and_decompress(wallpaper->tiles, &tilesSize); iconGfx = malloc_and_decompress(sWaldaWallpaperIcons[GetWaldaWallpaperIconId()], &iconSize); @@ -5437,7 +5437,7 @@ static void DrawWallpaper(const void *tilemap, s8 direction, u8 offset) else x -= 4; - FillBgTilemapBufferRect(2, 0, x, 2, 4, 0x12, 0x11); + FillBgTilemapBufferRect(2, 0, x, 2, 4, 0x12, 17); } static void TrimOldWallpaper(void *tilemap) @@ -5488,7 +5488,7 @@ static void InitBoxTitle(u8 boxId) sStorage->wallpaperPalBits = 0x3f0; tagIndex = IndexOfSpritePaletteTag(PALTAG_BOX_TITLE); - sStorage->boxTitlePalOffset = 0x10e + 16 * tagIndex; + sStorage->boxTitlePalOffset = OBJ_PLTT_ID(tagIndex) + 14; sStorage->wallpaperPalBits |= 0x10000 << tagIndex; // The below seems intended to have separately tracked @@ -5496,7 +5496,7 @@ static void InitBoxTitle(u8 boxId) // share a palette tag, all colors (and fields in some cases) // this is redundant along with the use of boxTitleAltPalOffset tagIndex = IndexOfSpritePaletteTag(PALTAG_BOX_TITLE); - sStorage->boxTitleAltPalOffset = 0x10e + 16 * tagIndex; + sStorage->boxTitleAltPalOffset = OBJ_PLTT_ID(tagIndex) + 14; sStorage->wallpaperPalBits |= 0x10000 << tagIndex; StringCopyPadded(sStorage->boxTitleText, GetBoxNamePtr(boxId), 0, BOX_NAME_LENGTH); @@ -7929,7 +7929,7 @@ static void InitMenu(void) sStorage->menuItemsCount = 0; sStorage->menuWidth = 0; sStorage->menuWindow.bg = 0; - sStorage->menuWindow.paletteNum = 15; + sStorage->menuWindow.paletteNum = 0xF; sStorage->menuWindow.baseBlock = 92; } @@ -8085,7 +8085,7 @@ static const struct WindowTemplate sWindowTemplate_MultiMove = .tilemapTop = 3, .width = 20, .height = 18, - .paletteNum = 9, + .paletteNum = 0x9, .baseBlock = 0xA, }; @@ -8164,7 +8164,7 @@ static bool8 MultiMove_Start(void) { case 0: HideBg(0); - TryLoadAllMonIconPalettesAtOffset(0x80); + TryLoadAllMonIconPalettesAtOffset(BG_PLTT_ID(0x8)); sMultiMove->state++; break; case 1: @@ -8213,7 +8213,7 @@ static bool8 MultiMove_Cancel(void) if (!IsDma3ManagerBusyWithBgCopy()) { SetCursorPriorityTo1(); - LoadPalette(GetTextWindowPalette(3), 0xD0, 0x20); + LoadPalette(GetTextWindowPalette(3), BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); ShowBg(0); return FALSE; } @@ -8319,7 +8319,7 @@ static bool8 MultiMove_PlaceMons(void) case 3: if (!IsDma3ManagerBusyWithBgCopy()) { - LoadPalette(GetTextWindowPalette(3), 0xD0, 0x20); + LoadPalette(GetTextWindowPalette(3), BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); SetCursorPriorityTo1(); ShowBg(0); return FALSE; @@ -9103,7 +9103,7 @@ static void LoadItemIconGfx(u8 id, const u32 *itemTiles, const u32 *itemPal) CpuFastCopy(sStorage->itemIconBuffer, sStorage->itemIcons[id].tiles, 0x200); LZ77UnCompWram(itemPal, sStorage->itemIconBuffer); - LoadPalette(sStorage->itemIconBuffer, sStorage->itemIcons[id].palIndex, 0x20); + LoadPalette(sStorage->itemIconBuffer, sStorage->itemIcons[id].palIndex, PLTT_SIZE_4BPP); } static void SetItemIconAffineAnim(u8 id, u8 animNum) @@ -9236,7 +9236,7 @@ static bool8 UpdateItemInfoWindowSlideOut(void) if (pos >= 0) DrawItemInfoWindow(pos); - FillBgTilemapBufferRect(0, 0, pos + 1, 12, 1, 9, 0x11); + FillBgTilemapBufferRect(0, 0, pos + 1, 12, 1, 9, 17); ScheduleBgCopyTilemapToVram(0); return TRUE; } @@ -9245,12 +9245,12 @@ static void DrawItemInfoWindow(u32 x) { if (x != 0) { - FillBgTilemapBufferRect(0, 0x13A, 0, 0xC, x, 1, 0xFu); - FillBgTilemapBufferRect(0, 0x93A, 0, 0x14, x, 1, 0xFu); + FillBgTilemapBufferRect(0, 0x13A, 0, 0xC, x, 1, 0xF); + FillBgTilemapBufferRect(0, 0x93A, 0, 0x14, x, 1, 0xF); } - FillBgTilemapBufferRect(0, 0x13B, x, 0xD, 1, 7, 0xFu); - FillBgTilemapBufferRect(0, 0x13C, x, 0xC, 1, 1, 0xFu); - FillBgTilemapBufferRect(0, 0x13D, x, 0x14, 1, 1, 0xFu); + FillBgTilemapBufferRect(0, 0x13B, x, 0xD, 1, 7, 0xF); + FillBgTilemapBufferRect(0, 0x13C, x, 0xC, 1, 1, 0xF); + FillBgTilemapBufferRect(0, 0x13D, x, 0x14, 1, 1, 0xF); ScheduleBgCopyTilemapToVram(0); } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index bdbca31d02..e406225062 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -391,7 +391,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 11, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 1, }, [PSS_LABEL_WINDOW_POKEMON_SKILLS_TITLE] = { @@ -400,7 +400,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 11, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 23, }, [PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE] = { @@ -409,7 +409,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 11, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 45, }, [PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE] = { @@ -418,7 +418,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 11, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 67, }, [PSS_LABEL_WINDOW_PROMPT_CANCEL] = { @@ -427,7 +427,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 8, .height = 2, - .paletteNum = 7, + .paletteNum = 0x7, .baseBlock = 89, }, [PSS_LABEL_WINDOW_PROMPT_INFO] = { @@ -436,7 +436,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 8, .height = 2, - .paletteNum = 7, + .paletteNum = 0x7, .baseBlock = 105, }, [PSS_LABEL_WINDOW_PROMPT_SWITCH] = { @@ -445,7 +445,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 8, .height = 2, - .paletteNum = 7, + .paletteNum = 0x7, .baseBlock = 121, }, [PSS_LABEL_WINDOW_UNUSED1] = { @@ -454,7 +454,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 4, .width = 0, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 137, }, [PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL] = { @@ -463,7 +463,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 4, .width = 18, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 137, }, [PSS_LABEL_WINDOW_POKEMON_INFO_TYPE] = { @@ -472,7 +472,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 6, .width = 18, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 173, }, [PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT] = { @@ -481,7 +481,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 7, .width = 6, .height = 6, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 209, }, [PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT] = { @@ -490,7 +490,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 7, .width = 5, .height = 6, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 245, }, [PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP] = { @@ -499,7 +499,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 14, .width = 11, .height = 4, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 275, }, [PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS] = { @@ -508,7 +508,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 18, .width = 6, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 319, }, [PSS_LABEL_WINDOW_MOVES_POWER_ACC] = { @@ -517,7 +517,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 15, .width = 9, .height = 4, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 331, }, [PSS_LABEL_WINDOW_MOVES_APPEAL_JAM] = { @@ -526,7 +526,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 15, .width = 5, .height = 4, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 367, }, [PSS_LABEL_WINDOW_UNUSED2] = { @@ -535,7 +535,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 4, .width = 0, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 387, }, [PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER] = { @@ -544,7 +544,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 2, .width = 4, .height = 2, - .paletteNum = 7, + .paletteNum = 0x7, .baseBlock = 387, }, [PSS_LABEL_WINDOW_PORTRAIT_NICKNAME] = { @@ -553,7 +553,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 12, .width = 9, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 395, }, [PSS_LABEL_WINDOW_PORTRAIT_SPECIES] = { @@ -562,7 +562,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 14, .width = 9, .height = 4, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 413, }, [PSS_LABEL_WINDOW_END] = DUMMY_WIN_TEMPLATE @@ -575,7 +575,7 @@ static const struct WindowTemplate sPageInfoTemplate[] = .tilemapTop = 4, .width = 11, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 449, }, [PSS_DATA_WINDOW_INFO_ID] = { @@ -584,7 +584,7 @@ static const struct WindowTemplate sPageInfoTemplate[] = .tilemapTop = 4, .width = 7, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 471, }, [PSS_DATA_WINDOW_INFO_ABILITY] = { @@ -593,7 +593,7 @@ static const struct WindowTemplate sPageInfoTemplate[] = .tilemapTop = 9, .width = 18, .height = 4, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 485, }, [PSS_DATA_WINDOW_INFO_MEMO] = { @@ -602,7 +602,7 @@ static const struct WindowTemplate sPageInfoTemplate[] = .tilemapTop = 14, .width = 18, .height = 6, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 557, }, }; @@ -614,7 +614,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .tilemapTop = 4, .width = 10, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 449, }, [PSS_DATA_WINDOW_SKILLS_RIBBON_COUNT] = { @@ -623,7 +623,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .tilemapTop = 4, .width = 10, .height = 2, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 469, }, [PSS_DATA_WINDOW_SKILLS_STATS_LEFT] = { @@ -632,7 +632,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .tilemapTop = 7, .width = 6, .height = 6, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 489, }, [PSS_DATA_WINDOW_SKILLS_STATS_RIGHT] = { @@ -641,7 +641,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .tilemapTop = 7, .width = 3, .height = 6, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 525, }, [PSS_DATA_WINDOW_EXP] = { @@ -650,7 +650,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .tilemapTop = 14, .width = 6, .height = 4, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 543, }, }; @@ -662,7 +662,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo .tilemapTop = 4, .width = 9, .height = 10, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 449, }, [PSS_DATA_WINDOW_MOVE_PP] = { @@ -671,7 +671,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo .tilemapTop = 4, .width = 6, .height = 10, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 539, }, [PSS_DATA_WINDOW_MOVE_DESCRIPTION] = { @@ -680,7 +680,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo .tilemapTop = 15, .width = 20, .height = 4, - .paletteNum = 6, + .paletteNum = 0x6, .baseBlock = 599, }, }; @@ -1328,8 +1328,8 @@ static bool8 DecompressGraphics(void) sMonSummaryScreen->switchCounter++; break; case 6: - LoadCompressedPalette(gSummaryScreen_Pal, 0, 0x100); - LoadPalette(&gPPTextPalette, 0x81, 0x1E); + LoadCompressedPalette(gSummaryScreen_Pal, BG_PLTT_ID(0x0), 8 * PLTT_SIZE_4BPP); + LoadPalette(&gPPTextPalette, BG_PLTT_ID(0x8) + 1, PLTT_SIZEOF(16 - 1)); sMonSummaryScreen->switchCounter++; break; case 7: @@ -1353,7 +1353,7 @@ static bool8 DecompressGraphics(void) sMonSummaryScreen->switchCounter++; break; case 12: - LoadCompressedPalette(gMoveTypes_Pal, 0x1D0, 0x60); + LoadCompressedPalette(gMoveTypes_Pal, OBJ_PLTT_ID(0xD), 3 * PLTT_SIZE_4BPP); sMonSummaryScreen->switchCounter = 0; return TRUE; } @@ -4001,7 +4001,7 @@ static void StopPokemonAnimations(void) // A subtle effect, this function stops gSprites[sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_MON]].callback = SpriteCallbackDummy; StopPokemonAnimationDelayTask(); - paletteIndex = (gSprites[sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_MON]].oam.paletteNum * 16) | 0x100; + paletteIndex = OBJ_PLTT_ID(gSprites[sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_MON]].oam.paletteNum); for (i = 0; i < 16; i++) { diff --git a/src/pokenav_conditions_gfx.c b/src/pokenav_conditions_gfx.c index 5631f5bb2a..9ad8854359 100644 --- a/src/pokenav_conditions_gfx.c +++ b/src/pokenav_conditions_gfx.c @@ -68,7 +68,7 @@ static const struct WindowTemplate sMonNameGenderWindowTemplate = .tilemapTop = 1, .width = 13, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 2 }; @@ -79,7 +79,7 @@ static const struct WindowTemplate sListIndexWindowTemplate = .tilemapTop = 6, .width = 7, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x36 }; @@ -90,7 +90,7 @@ static const struct WindowTemplate sUnusedWindowTemplate1 = .tilemapTop = 0x1C, .width = 5, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x44 }; @@ -101,7 +101,7 @@ static const struct WindowTemplate sUnusedWindowTemplate2 = .tilemapTop = 0x1C, .width = 3, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x44 }; @@ -224,8 +224,8 @@ static u32 LoopedTask_OpenConditionGraphMenu(s32 state) CopyToBgTilemapBufferRect(3, gPokenavOptions_Tilemap, 0, 5, 9, 4); CopyBgTilemapBufferToVram(3); - CopyPaletteIntoBufferUnfaded(gPokenavCondition_Pal, 0x10, 0x20); - CopyPaletteIntoBufferUnfaded(gConditionText_Pal, 0xF0, 0x20); + CopyPaletteIntoBufferUnfaded(gPokenavCondition_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(gConditionText_Pal, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); menu->monTransitionX = -80; return LT_INC_AND_PAUSE; case 4: @@ -235,7 +235,7 @@ static u32 LoopedTask_OpenConditionGraphMenu(s32 state) LZ77UnCompVram(sConditionGraphData_Tilemap, menu->tilemapBuffers[2]); SetBgTilemapBuffer(2, menu->tilemapBuffers[2]); CopyBgTilemapBufferToVram(2); - CopyPaletteIntoBufferUnfaded(gConditionGraphData_Pal, 0x30, 0x20); + CopyPaletteIntoBufferUnfaded(gConditionGraphData_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); ConditionGraph_InitWindow(2); return LT_INC_AND_PAUSE; case 5: @@ -827,13 +827,13 @@ static void CreateConditionMonPic(u8 id) menu->monPicSpriteId = spriteId; gSprites[menu->monPicSpriteId].callback = MonPicGfxSpriteCallback; menu->monGfxPtr = (void *)VRAM + BG_VRAM_SIZE + (menu->monGfxTileStart * 32); - menu->monPalIndex = (menu->monPalIndex * 16) + 0x100; + menu->monPalIndex = OBJ_PLTT_ID(menu->monPalIndex); } } else { DmaCopy16Defvars(3, GetConditionMonPicGfx(id), menu->monGfxPtr, MON_PIC_SIZE); - LoadPalette(GetConditionMonPal(id), menu->monPalIndex, 0x20); + LoadPalette(GetConditionMonPal(id), menu->monPalIndex, PLTT_SIZE_4BPP); } } diff --git a/src/pokenav_conditions_search_results.c b/src/pokenav_conditions_search_results.c index d0d2b7c55a..49ce612cc1 100644 --- a/src/pokenav_conditions_search_results.c +++ b/src/pokenav_conditions_search_results.c @@ -2,6 +2,7 @@ #include "pokenav.h" #include "bg.h" #include "menu.h" +#include "palette.h" #include "window.h" #include "sound.h" #include "dynamic_placeholder_text_util.h" @@ -120,7 +121,7 @@ static const struct WindowTemplate sSearchResultListMenuWindowTemplate = .tilemapTop = 6, .width = 7, .height = 2, - .paletteNum = 1, + .paletteNum = 0x1, .baseBlock = 20 }; @@ -431,7 +432,7 @@ static u32 LoopedTask_OpenConditionSearchResults(s32 state) SetBgTilemapBuffer(1, gfx->buff); CopyToBgTilemapBuffer(1, sConditionSearchResultTilemap, 0, 0); CopyBgTilemapBufferToVram(1); - CopyPaletteIntoBufferUnfaded(sConditionSearchResultFramePal, 0x10, 0x20); + CopyPaletteIntoBufferUnfaded(sConditionSearchResultFramePal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; case 1: @@ -443,7 +444,7 @@ static u32 LoopedTask_OpenConditionSearchResults(s32 state) case 2: if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; - CopyPaletteIntoBufferUnfaded(sListBg_Pal, 0x20, 32); + CopyPaletteIntoBufferUnfaded(sListBg_Pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); CreateSearchResultsList(); return LT_INC_AND_PAUSE; case 3: diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index c51ab10bae..3dbc7952d2 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -78,7 +78,7 @@ static const struct WindowTemplate sHelpBarWindowTemplate[] = .tilemapTop = 22, .width = 16, .height = 2, - .paletteNum = 0, + .paletteNum = 0x0, .baseBlock = 0x36, }, DUMMY_WIN_TEMPLATE @@ -349,7 +349,7 @@ static u32 LoopedTask_InitPokenavMenu(s32 state) DecompressAndCopyTileDataToVram(0, &gPokenavHeader_Gfx, 0, 0, 0); SetBgTilemapBuffer(0, menu->tilemapBuffer); CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0); - CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, 0, 0x20); + CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(0); return LT_INC_AND_PAUSE; case 2: @@ -460,8 +460,8 @@ void Pokenav_AllocAndLoadPalettes(const struct SpritePalette *palettes) } else { - index = (index * 16) + 0x100; - CopyPaletteIntoBufferUnfaded(current->data, index, 0x20); + index = OBJ_PLTT_ID(index); + CopyPaletteIntoBufferUnfaded(current->data, index, PLTT_SIZE_4BPP); } } } @@ -683,7 +683,7 @@ static void LoadLeftHeaderGfxForMenu(u32 menuGfxId) menu = GetSubstructPtr(POKENAV_SUBSTRUCT_MAIN_MENU); tag = sMenuLeftHeaderSpriteSheets[menuGfxId].tag; size = GetDecompressedDataSize(sMenuLeftHeaderSpriteSheets[menuGfxId].data); - LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], (IndexOfSpritePaletteTag(1) * 16) + 0x100, 0x20); + LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], OBJ_PLTT_ID(IndexOfSpritePaletteTag(1)), PLTT_SIZE_4BPP); LZ77UnCompWram(sMenuLeftHeaderSpriteSheets[menuGfxId].data, gDecompressionBuffer); RequestDma3Copy(gDecompressionBuffer, (void *)OBJ_VRAM0 + (GetSpriteTileStartByTag(2) * 32), size, 1); menu->leftHeaderSprites[1]->oam.tileNum = GetSpriteTileStartByTag(2) + sMenuLeftHeaderSpriteSheets[menuGfxId].size; @@ -703,7 +703,7 @@ static void LoadLeftHeaderGfxForSubMenu(u32 menuGfxId) tag = sPokenavSubMenuLeftHeaderSpriteSheets[menuGfxId].tag; size = GetDecompressedDataSize(sPokenavSubMenuLeftHeaderSpriteSheets[menuGfxId].data); - LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], (IndexOfSpritePaletteTag(2) * 16) + 0x100, 0x20); + LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], OBJ_PLTT_ID(IndexOfSpritePaletteTag(2)), PLTT_SIZE_4BPP); LZ77UnCompWram(sPokenavSubMenuLeftHeaderSpriteSheets[menuGfxId].data, &gDecompressionBuffer[0x1000]); RequestDma3Copy(&gDecompressionBuffer[0x1000], (void *)OBJ_VRAM0 + 0x800 + (GetSpriteTileStartByTag(2) * 32), size, 1); } diff --git a/src/pokenav_match_call_gfx.c b/src/pokenav_match_call_gfx.c index fd5b36fae0..710aeef17b 100755 --- a/src/pokenav_match_call_gfx.c +++ b/src/pokenav_match_call_gfx.c @@ -182,7 +182,7 @@ static const struct WindowTemplate sMatchCallLocationWindowTemplate = .tilemapTop = 5, .width = 11, .height = 2, - .paletteNum = 2, + .paletteNum = 0x2, .baseBlock = 16 }; @@ -193,7 +193,7 @@ static const struct WindowTemplate sMatchCallInfoBoxWindowTemplate = .tilemapTop = 9, .width = 11, .height = 8, - .paletteNum = 2, + .paletteNum = 0x2, .baseBlock = 38 }; @@ -214,7 +214,7 @@ static const struct WindowTemplate sCallMsgBoxWindowTemplate = .tilemapTop = 12, .width = 28, .height = 4, - .paletteNum = 1, + .paletteNum = 0x1, .baseBlock = 10 }; @@ -333,7 +333,7 @@ static u32 LoopedTask_OpenMatchCall(s32 state) SetBgTilemapBuffer(2, gfx->bgTilemapBuffer2); CopyToBgTilemapBuffer(2, sMatchCallUI_Tilemap, 0, 0); CopyBgTilemapBufferToVram(2); - CopyPaletteIntoBufferUnfaded(sMatchCallUI_Pal, 0x20, 0x20); + CopyPaletteIntoBufferUnfaded(sMatchCallUI_Pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(2); return LT_INC_AND_PAUSE; case 1: @@ -343,7 +343,7 @@ static u32 LoopedTask_OpenMatchCall(s32 state) BgDmaFill(1, 0, 0, 1); SetBgTilemapBuffer(1, gfx->bgTilemapBuffer1); FillBgTilemapBufferRect_Palette0(1, 0x1000, 0, 0, 32, 20); - CopyPaletteIntoBufferUnfaded(sCallWindow_Pal, 0x10, 0x20); + CopyPaletteIntoBufferUnfaded(sCallWindow_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; case 2: @@ -352,8 +352,8 @@ static u32 LoopedTask_OpenMatchCall(s32 state) LoadCallWindowAndFade(gfx); DecompressAndCopyTileDataToVram(3, sPokeball_Gfx, 0, 0, 0); - CopyPaletteIntoBufferUnfaded(sListWindow_Pal, 0x30, 0x20); - CopyPaletteIntoBufferUnfaded(sPokeball_Pal, 0x50, 0x20); + CopyPaletteIntoBufferUnfaded(sListWindow_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sPokeball_Pal, BG_PLTT_ID(0x5), PLTT_SIZE_4BPP); return LT_INC_AND_PAUSE; case 3: if (FreeTempTileDataBuffersIfPossible() || !IsMatchCallListInitFinished()) @@ -1082,15 +1082,15 @@ static void UpdateWindowsToShowCheckPage(struct Pokenav_MatchCallGfx *gfx) static void LoadCallWindowAndFade(struct Pokenav_MatchCallGfx *gfx) { gfx->msgBoxWindowId = AddWindow(&sCallMsgBoxWindowTemplate); - LoadMatchCallWindowGfx(gfx->msgBoxWindowId, 1, 4); + LoadMatchCallWindowGfx(gfx->msgBoxWindowId, 1, 0x4); FadeToBlackExceptPrimary(); } static void DrawMsgBoxForMatchCallMsg(struct Pokenav_MatchCallGfx *gfx) { struct Sprite *sprite; - LoadMatchCallWindowGfx(gfx->msgBoxWindowId, 1, 4); - DrawMatchCallTextBoxBorder(gfx->msgBoxWindowId, 1, 4); + LoadMatchCallWindowGfx(gfx->msgBoxWindowId, 1, 0x4); + DrawMatchCallTextBoxBorder(gfx->msgBoxWindowId, 1, 0x4); FillWindowPixelBuffer(gfx->msgBoxWindowId, PIXEL_FILL(1)); PutWindowTilemap(gfx->msgBoxWindowId); CopyWindowToVram(gfx->msgBoxWindowId, COPYWIN_FULL); @@ -1102,8 +1102,8 @@ static void DrawMsgBoxForMatchCallMsg(struct Pokenav_MatchCallGfx *gfx) static void DrawMsgBoxForCloseByMsg(struct Pokenav_MatchCallGfx *gfx) { - LoadUserWindowBorderGfx(gfx->msgBoxWindowId, 1, 0x40); - DrawTextBorderOuter(gfx->msgBoxWindowId, 1, 4); + LoadUserWindowBorderGfx(gfx->msgBoxWindowId, 1, BG_PLTT_ID(0x4)); + DrawTextBorderOuter(gfx->msgBoxWindowId, 1, 0x4); FillWindowPixelBuffer(gfx->msgBoxWindowId, PIXEL_FILL(1)); PutWindowTilemap(gfx->msgBoxWindowId); CopyWindowToVram(gfx->msgBoxWindowId, COPYWIN_FULL); @@ -1186,7 +1186,7 @@ static void AllocMatchCallSprites(void) spriteSheet.tag = GFXTAG_TRAINER_PIC; gfx->trainerPicGfxPtr = (u8 *)OBJ_VRAM0 + LoadSpriteSheet(&spriteSheet) * 0x20; paletteNum = AllocSpritePalette(PALTAG_TRAINER_PIC); - gfx->trainerPicPalOffset = 0x100 + paletteNum * 0x10; + gfx->trainerPicPalOffset = OBJ_PLTT_ID(paletteNum); gfx->trainerPicSprite = CreateTrainerPicSprite(); gfx->trainerPicSprite->invisible = TRUE; } diff --git a/src/pokenav_menu_handler_gfx.c b/src/pokenav_menu_handler_gfx.c index bc55fa7515..1acd2edf9e 100644 --- a/src/pokenav_menu_handler_gfx.c +++ b/src/pokenav_menu_handler_gfx.c @@ -261,7 +261,7 @@ static const struct WindowTemplate sOptionDescWindowTemplate = .tilemapTop = 17, .width = 24, .height = 2, - .paletteNum = 1, + .paletteNum = 0x1, .baseBlock = 8 }; @@ -457,7 +457,7 @@ static u32 LoopedTask_OpenMenu(s32 state) SetBgTilemapBuffer(1, gfx->bg1TilemapBuffer); CopyToBgTilemapBuffer(1, gPokenavMessageBox_Tilemap, 0, 0); CopyBgTilemapBufferToVram(1); - CopyPaletteIntoBufferUnfaded(gPokenavMessageBox_Pal, 0x10, 0x20); + CopyPaletteIntoBufferUnfaded(gPokenavMessageBox_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); ChangeBgX(1, 0, BG_COORD_SET); ChangeBgY(1, 0, BG_COORD_SET); ChangeBgX(2, 0, BG_COORD_SET); @@ -470,14 +470,14 @@ static u32 LoopedTask_OpenMenu(s32 state) return LT_PAUSE; DecompressAndCopyTileDataToVram(2, sPokenavDeviceBgTiles, 0, 0, 0); DecompressAndCopyTileDataToVram(2, sPokenavDeviceBgTilemap, 0, 0, 1); - CopyPaletteIntoBufferUnfaded(sPokenavDeviceBgPal, 0x20, 0x20); + CopyPaletteIntoBufferUnfaded(sPokenavDeviceBgPal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); return LT_INC_AND_PAUSE; case 2: if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; DecompressAndCopyTileDataToVram(3, sPokenavBgDotsTiles, 0, 0, 0); DecompressAndCopyTileDataToVram(3, sPokenavBgDotsTilemap, 0, 0, 1); - CopyPaletteIntoBufferUnfaded(sPokenavBgDotsPal, 0x30, 0x20); + CopyPaletteIntoBufferUnfaded(sPokenavBgDotsPal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); if (GetPokenavMenuType() == POKENAV_MENU_TYPE_CONDITION || GetPokenavMenuType() == POKENAV_MENU_TYPE_CONDITION_SEARCH) ChangeBgDotsColorToPurple(); return LT_INC_AND_PAUSE; @@ -1270,7 +1270,7 @@ static void CreateBgDotPurplePalTask(void) static void ChangeBgDotsColorToPurple(void) { - CopyPaletteIntoBufferUnfaded(sPokenavBgDotsPal + 7, 0x31, 4); + CopyPaletteIntoBufferUnfaded(sPokenavBgDotsPal + 7, BG_PLTT_ID(0x3) + 1, PLTT_SIZEOF(2)); } static void CreateBgDotLightBluePalTask(void) @@ -1293,7 +1293,7 @@ static void Task_UpdateBgDotsPalette(u8 taskId) const u16 * pal2 = (const u16 *)GetWordTaskArg(taskId, 3); PokenavCopyPalette(pal1, pal2, 2, 12, ++data[0], sp8); - LoadPalette(sp8, 0x31, 4); + LoadPalette(sp8, BG_PLTT_ID(0x3) + 1, PLTT_SIZEOF(2)); if (data[0] == 12) DestroyTask(taskId); } diff --git a/src/pokenav_region_map.c b/src/pokenav_region_map.c index 39c1659a9a..6b3479f10e 100755 --- a/src/pokenav_region_map.c +++ b/src/pokenav_region_map.c @@ -140,7 +140,7 @@ static const struct WindowTemplate sMapSecInfoWindowTemplate = .tilemapTop = 4, .width = 12, .height = 13, - .paletteNum = 1, + .paletteNum = 0x1, .baseBlock = 0x4C }; @@ -509,14 +509,14 @@ static void LoadPokenavRegionMapGfx(struct Pokenav_RegionMapGfx *state) CpuFill16(0x1040, state->tilemapBuffer, 0x800); SetBgTilemapBuffer(1, state->tilemapBuffer); state->infoWindowId = AddWindow(&sMapSecInfoWindowTemplate); - LoadUserWindowBorderGfx_(state->infoWindowId, 0x42, 0x40); - DrawTextBorderOuter(state->infoWindowId, 0x42, 4); + LoadUserWindowBorderGfx_(state->infoWindowId, 0x42, BG_PLTT_ID(0x4)); + DrawTextBorderOuter(state->infoWindowId, 0x42, 0x4); DecompressAndCopyTileDataToVram(1, sRegionMapCityZoomTiles_Gfx, 0, 0, 0); FillWindowPixelBuffer(state->infoWindowId, PIXEL_FILL(1)); PutWindowTilemap(state->infoWindowId); CopyWindowToVram(state->infoWindowId, COPYWIN_FULL); - CopyPaletteIntoBufferUnfaded(sMapSecInfoWindow_Pal, 0x10, 0x20); - CopyPaletteIntoBufferUnfaded(gRegionMapCityZoomTiles_Pal, 0x30, 0x20); + CopyPaletteIntoBufferUnfaded(sMapSecInfoWindow_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(gRegionMapCityZoomTiles_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); if (!IsRegionMapZoomed()) ChangeBgY(1, -0x6000, BG_COORD_SET); else diff --git a/src/pokenav_ribbons_list.c b/src/pokenav_ribbons_list.c index ca5559d966..5f5cf083ff 100644 --- a/src/pokenav_ribbons_list.c +++ b/src/pokenav_ribbons_list.c @@ -2,6 +2,7 @@ #include "pokenav.h" #include "bg.h" #include "menu.h" +#include "palette.h" #include "window.h" #include "sound.h" #include "string_util.h" @@ -431,7 +432,7 @@ static u32 LoopedTask_OpenRibbonsMonList(s32 state) DecompressAndCopyTileDataToVram(1, sMonRibbonListFrameTiles, 0, 0, 0); SetBgTilemapBuffer(1, menu->buff); CopyToBgTilemapBuffer(1, sMonRibbonListFrameTilemap, 0, 0); - CopyPaletteIntoBufferUnfaded(sMonRibbonListFramePal, 0x10, 0x20); + CopyPaletteIntoBufferUnfaded(sMonRibbonListFramePal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; case 1: @@ -446,7 +447,7 @@ static u32 LoopedTask_OpenRibbonsMonList(s32 state) case 2: if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; - CopyPaletteIntoBufferUnfaded(sMonRibbonListUi_Pal, 0x20, 0x20); + CopyPaletteIntoBufferUnfaded(sMonRibbonListUi_Pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); CreateRibbonMonsList(); return LT_INC_AND_PAUSE; case 3: diff --git a/src/pokenav_ribbons_summary.c b/src/pokenav_ribbons_summary.c index 15f9db5e6a..d5e04a5025 100644 --- a/src/pokenav_ribbons_summary.c +++ b/src/pokenav_ribbons_summary.c @@ -3,6 +3,7 @@ #include "dynamic_placeholder_text_util.h" #include "graphics.h" #include "international_string_util.h" +#include "palette.h" #include "pokenav.h" #include "sound.h" #include "sprite.h" @@ -572,7 +573,7 @@ static u32 LoopedTask_OpenRibbonsSummaryMenu(s32 state) DecompressAndCopyTileDataToVram(2, gPokenavRibbonsSummaryBg_Gfx, 0, 0, 0); SetBgTilemapBuffer(2, menu->tilemapBuffers[0]); CopyToBgTilemapBuffer(2, gPokenavRibbonsSummaryBg_Tilemap, 0, 0); - CopyPaletteIntoBufferUnfaded(gPokenavRibbonsSummaryBg_Pal, 0x10, 0x20); + CopyPaletteIntoBufferUnfaded(gPokenavRibbonsSummaryBg_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(2); return LT_INC_AND_PAUSE; case 1: @@ -582,8 +583,8 @@ static u32 LoopedTask_OpenRibbonsSummaryMenu(s32 state) DecompressAndCopyTileDataToVram(1, sRibbonIconsSmall_Gfx, 0, 1, 0); SetBgTilemapBuffer(1, menu->tilemapBuffers[1]); FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, 32, 20); - CopyPaletteIntoBufferUnfaded(sRibbonIcons1_Pal, 0x20, 0xA0); - CopyPaletteIntoBufferUnfaded(sMonInfo_Pal, 0xA0, 0x20); + CopyPaletteIntoBufferUnfaded(sRibbonIcons1_Pal, BG_PLTT_ID(0x2), 5 * PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sMonInfo_Pal, BG_PLTT_ID(0xA), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; } @@ -789,7 +790,7 @@ static const struct WindowTemplate sRibbonCountWindowTemplate = .tilemapTop = 13, .width = 16, .height = 4, - .paletteNum = 1, + .paletteNum = 0x1, .baseBlock = 0x14, }; @@ -853,7 +854,7 @@ static const struct WindowTemplate sRibbonSummaryMonNameWindowTemplate = .tilemapTop = 1, .width = 13, .height = 2, - .paletteNum = 10, + .paletteNum = 0xA, .baseBlock = 0x54, }; @@ -908,7 +909,7 @@ static const struct WindowTemplate sRibbonMonListIndexWindowTemplate[] = .tilemapTop = 5, .width = 7, .height = 2, - .paletteNum = 1, + .paletteNum = 0x1, .baseBlock = 0x6E, }, {}, diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index 83298b03df..ca50ed8f2c 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -1301,7 +1301,7 @@ static void CB2_InitRayquazaScene(void) ResetPaletteFade(); ResetSpriteData(); ResetTasks(); - FillPalette(RGB_BLACK, 0xF0, 32); + FillPalette(RGB_BLACK, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); CreateTask(sTasksForAnimations[sRayScene->animId], 0); SetMainCallback2(CB2_RayquazaScene); } @@ -1592,7 +1592,7 @@ static void LoadDuoFightSceneGfx(void) LZDecompressWram(gRaySceneDuoFight_Clouds2_Tilemap, sRayScene->tilemapBuffers[0]); LZDecompressWram(gRaySceneDuoFight_Clouds1_Tilemap, sRayScene->tilemapBuffers[1]); LZDecompressWram(gRaySceneDuoFight_Clouds3_Tilemap, sRayScene->tilemapBuffers[2]); - LoadCompressedPalette(gRaySceneDuoFight_Clouds_Pal, 0, 0x40); + LoadCompressedPalette(gRaySceneDuoFight_Clouds_Pal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); LoadCompressedSpriteSheet(&sSpriteSheet_DuoFight_Groudon); LoadCompressedSpriteSheet(&sSpriteSheet_DuoFight_GroudonShoulder); LoadCompressedSpriteSheet(&sSpriteSheet_DuoFight_GroudonClaw); @@ -2032,7 +2032,7 @@ static void LoadTakesFlightSceneGfx(void) LZDecompressWram(gRaySceneDuoFight_Clouds2_Tilemap, sRayScene->tilemapBuffers[0]); LZDecompressWram(gRaySceneTakesFlight_Bg_Tilemap, sRayScene->tilemapBuffers[1]); LZDecompressWram(gRaySceneTakesFlight_Rayquaza_Tilemap, sRayScene->tilemapBuffers[2]); - LoadCompressedPalette(gRaySceneTakesFlight_Rayquaza_Pal, 0, 64); + LoadCompressedPalette(gRaySceneTakesFlight_Rayquaza_Pal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); LoadCompressedSpriteSheet(&sSpriteSheet_TakesFlight_Smoke); LoadCompressedSpritePalette(&sSpritePal_TakesFlight_Smoke); } @@ -2238,7 +2238,7 @@ static void LoadDescendsSceneGfx(void) CpuFastCopy(sRayScene->tilemapBuffers[3], sRayScene->tilemapBuffers[1], BG_SCREEN_SIZE); CpuFastFill16(0, &sRayScene->tilemapBuffers[1][0x100], 0x340); - LoadCompressedPalette(gRaySceneDescends_Bg_Pal, 0, 0x40); + LoadCompressedPalette(gRaySceneDescends_Bg_Pal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); gPlttBufferUnfaded[0] = RGB_WHITE; gPlttBufferFaded[0] = RGB_WHITE; LoadCompressedSpriteSheet(&sSpriteSheet_Descends_Rayquaza); @@ -2487,7 +2487,7 @@ static void LoadChargesSceneGfx(void) LZDecompressWram(gRaySceneCharges_Rayquaza_Tilemap, sRayScene->tilemapBuffers[1]); LZDecompressWram(gRaySceneCharges_Streaks_Tilemap, sRayScene->tilemapBuffers[2]); LZDecompressWram(gRaySceneCharges_Bg_Tilemap, sRayScene->tilemapBuffers[3]); - LoadCompressedPalette(gRaySceneCharges_Bg_Pal, 0, 0x80); + LoadCompressedPalette(gRaySceneCharges_Bg_Pal, BG_PLTT_ID(0x0), 4 * PLTT_SIZE_4BPP); } #define tState data[0] @@ -2671,7 +2671,7 @@ static void LoadChasesAwaySceneGfx(void) LZDecompressWram(gRaySceneChasesAway_Bg_Tilemap, sRayScene->tilemapBuffers[1]); LZDecompressWram(gRaySceneChasesAway_Light_Tilemap, sRayScene->tilemapBuffers[0]); LZDecompressWram(gRaySceneChasesAway_Ring_Tilemap, sRayScene->tilemapBuffers[2]); - LoadCompressedPalette(gRaySceneChasesAway_Bg_Pal, 0, 0x60); + LoadCompressedPalette(gRaySceneChasesAway_Bg_Pal, BG_PLTT_ID(0x0), 3 * PLTT_SIZE_4BPP); LoadCompressedSpriteSheet(&sSpriteSheet_ChasesAway_Groudon); LoadCompressedSpriteSheet(&sSpriteSheet_ChasesAway_GroudonTail); LoadCompressedSpriteSheet(&sSpriteSheet_ChasesAway_Kyogre); diff --git a/src/region_map.c b/src/region_map.c index a4db1cb048..379cc247e4 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -392,7 +392,7 @@ static const struct WindowTemplate sFlyMapWindowTemplates[] = .tilemapTop = 17, .width = 12, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x01 }, { @@ -401,7 +401,7 @@ static const struct WindowTemplate sFlyMapWindowTemplates[] = .tilemapTop = 15, .width = 12, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x19 }, { @@ -410,7 +410,7 @@ static const struct WindowTemplate sFlyMapWindowTemplates[] = .tilemapTop = 18, .width = 14, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x49 }, DUMMY_WIN_TEMPLATE @@ -567,7 +567,7 @@ bool8 LoadRegionMapGfx(void) break; case 2: if (!FreeTempTileDataBuffersIfPossible()) - LoadPalette(sRegionMapBg_Pal, 0x70, 0x60); + LoadPalette(sRegionMapBg_Pal, BG_PLTT_ID(0x7), 3 * PLTT_SIZE_4BPP); break; case 3: LZ77UnCompWram(sRegionMapCursorSmallGfxLZ, sRegionMap->cursorSmallImage); @@ -1689,7 +1689,7 @@ void CB2_OpenFlyMap(void) gMain.state++; break; case 3: - LoadUserWindowBorderGfx(0, 0x65, 0xd0); + LoadUserWindowBorderGfx(0, 0x65, BG_PLTT_ID(0xD)); ClearScheduledBgCopiesToVram(); gMain.state++; break; @@ -1712,7 +1712,7 @@ void CB2_OpenFlyMap(void) gMain.state++; break; case 7: - LoadPalette(sRegionMapFramePal, 0x10, sizeof(sRegionMapFramePal)); + LoadPalette(sRegionMapFramePal, BG_PLTT_ID(0x1), sizeof(sRegionMapFramePal)); PutWindowTilemap(2); FillWindowPixelBuffer(2, PIXEL_FILL(0)); AddTextPrinterParameterized(2, FONT_NORMAL, gText_FlyToWhere, 0, 1, 0, NULL); diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 0a9ec49113..2c7566a66c 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -85,7 +85,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 1, .width = 19, .height = 9, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x155 }, { @@ -94,7 +94,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0xE9 }, DUMMY_WIN_TEMPLATE @@ -106,7 +106,7 @@ static const struct WindowTemplate sInputTimeWindow = { .tilemapTop = 9, .width = 21, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0xBF }; diff --git a/src/roulette.c b/src/roulette.c index e96ec30b07..3e37ba5d60 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -460,7 +460,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 24, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0xC5 }, #ifdef UBFIX @@ -1195,7 +1195,7 @@ static void CB2_LoadRoulette(void) ResetTempTileDataBuffers(); break; case 3: - LoadPalette(&sWheel_Pal, 0, 0x1C0); + LoadPalette(&sWheel_Pal, BG_PLTT_ID(0x0), 14 * PLTT_SIZE_4BPP); DecompressAndCopyTileDataToVram(1, gRouletteMenu_Gfx, 0, 0, 0); DecompressAndCopyTileDataToVram(2, gRouletteWheel_Gfx, 0, 0, 0); break; @@ -2167,16 +2167,16 @@ static void FlashSelectionOnWheel(u8 selectionId) // The specific color of the poke it references doesn't matter, because the icons of a poke share a palette // So it just uses the first sprite ID of each case COL_WYNAUT: - palOffset = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_ORANGE_WYNAUT]].oam.paletteNum * 16; + palOffset = PLTT_ID(gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_ORANGE_WYNAUT]].oam.paletteNum); break; case COL_AZURILL: - palOffset = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_GREEN_AZURILL]].oam.paletteNum * 16; + palOffset = PLTT_ID(gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_GREEN_AZURILL]].oam.paletteNum); break; case COL_SKITTY: - palOffset = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_PURPLE_SKITTY]].oam.paletteNum * 16; + palOffset = PLTT_ID(gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_PURPLE_SKITTY]].oam.paletteNum); break; case COL_MAKUHITA: - palOffset = gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_ORANGE_MAKUHITA]].oam.paletteNum * 16; + palOffset = PLTT_ID(gSprites[sRoulette->spriteIds[SPR_WHEEL_ICON_ORANGE_MAKUHITA]].oam.paletteNum); break; } if (numSelected == 1) diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 877482728f..f039cf324d 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -103,7 +103,7 @@ static const struct WindowTemplate sWindowTemplate_Text[] = .tilemapTop = 13, .width = 28, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1, } }; @@ -116,7 +116,7 @@ static const struct WindowTemplate sWindowTemplate_Clock[] = .tilemapTop = 9, .width = 2, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 169, } }; @@ -214,10 +214,10 @@ static void CB2_SaveFailedScreen(void) ResetSpriteData(); ResetTasks(); ResetPaletteFade(); - LoadPalette(gBirchBagGrassPal, 0, 0x40); - LoadPalette(sSaveFailedClockPal, 0x100, 0x20); - LoadPalette(gTextWindowFrame1_Pal, 0xE0, 0x20); - LoadPalette(gStandardMenuPalette, 0xF0, 0x20); + LoadPalette(gBirchBagGrassPal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadPalette(sSaveFailedClockPal, OBJ_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(gTextWindowFrame1_Pal, BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); DrawStdFrameWithCustomTileAndPalette(sWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE); DrawStdFrameWithCustomTileAndPalette(sWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE); FillWindowPixelBuffer(sWindowIds[CLOCK_WIN_ID], PIXEL_FILL(1)); // backwards? diff --git a/src/scrcmd.c b/src/scrcmd.c index 6ca02019d8..91ab4ebfb6 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1526,7 +1526,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) winTemplate = CreateWindowTemplate(0, xWindow, yWindow + 1, width, height, 0xF, 0x1); sBrailleWindowId = AddWindow(&winTemplate); - LoadUserWindowBorderGfx(sBrailleWindowId, 0x214, 0xE0); + LoadUserWindowBorderGfx(sBrailleWindowId, 0x214, BG_PLTT_ID(0xE)); DrawStdWindowFrame(sBrailleWindowId, FALSE); PutWindowTilemap(sBrailleWindowId); FillWindowPixelBuffer(sBrailleWindowId, PIXEL_FILL(1)); diff --git a/src/secret_base.c b/src/secret_base.c index 74129d3ff5..61d426ea64 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -181,7 +181,7 @@ static const struct WindowTemplate sRegistryWindowTemplates[] = .tilemapTop = 1, .width = 11, .height = 18, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x01, }, { @@ -190,7 +190,7 @@ static const struct WindowTemplate sRegistryWindowTemplates[] = .tilemapTop = 1, .width = 28, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0xc7, } }; diff --git a/src/shop.c b/src/shop.c index 451fa171cb..3fd29a3f37 100755 --- a/src/shop.c +++ b/src/shop.c @@ -120,7 +120,7 @@ static const struct WindowTemplate sShopMenuWindowTemplates[] = .tilemapTop = 1, .width = 9, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0008, }, { @@ -129,7 +129,7 @@ static const struct WindowTemplate sShopMenuWindowTemplates[] = .tilemapTop = 1, .width = 9, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0008, } }; @@ -204,7 +204,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] = .tilemapTop = 1, .width = 10, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x001E, }, { @@ -213,7 +213,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] = .tilemapTop = 2, .width = 15, .height = 16, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0032, }, { @@ -222,7 +222,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] = .tilemapTop = 13, .width = 14, .height = 6, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0122, }, { @@ -231,7 +231,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] = .tilemapTop = 11, .width = 12, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0176, }, { @@ -240,7 +240,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] = .tilemapTop = 11, .width = 10, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x018E, }, { @@ -249,7 +249,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x01A2, }, DUMMY_WIN_TEMPLATE @@ -262,7 +262,7 @@ static const struct WindowTemplate sShopBuyMenuYesNoWindowTemplates = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x020E, }; @@ -676,15 +676,15 @@ static void BuyMenuDecompressBgGraphics(void) { DecompressAndCopyTileDataToVram(1, gShopMenu_Gfx, 0x3A0, 0x3E3, 0); LZDecompressWram(gShopMenu_Tilemap, sShopData->tilemapBuffers[0]); - LoadCompressedPalette(gShopMenu_Pal, 0xC0, 0x20); + LoadCompressedPalette(gShopMenu_Pal, BG_PLTT_ID(0xC), PLTT_SIZE_4BPP); } static void BuyMenuInitWindows(void) { InitWindows(sShopBuyMenuWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 1, 0xD0); - LoadMessageBoxGfx(0, 0xA, 0xE0); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD)); + LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(0xE)); PutWindowTilemap(0); PutWindowTilemap(1); PutWindowTilemap(2); diff --git a/src/slot_machine.c b/src/slot_machine.c index dd2622e2be..94cc7dfaed 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -789,7 +789,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x194 }, DUMMY_WIN_TEMPLATE @@ -802,7 +802,7 @@ static const struct WindowTemplate sWindowTemplate_InfoBox = .tilemapTop = 3, .width = 20, .height = 13, - .paletteNum = 13, + .paletteNum = 0xD, .baseBlock = 1 }; @@ -1247,8 +1247,8 @@ static void SlotMachineSetup_LoadGfxAndTilemaps(void) LoadMenuGfx(); LoadMenuAndReelOverlayTilemaps(); LoadSlotMachineGfx(); - LoadMessageBoxGfx(0, 0x200, 0xF0); - LoadUserWindowBorderGfx(0, 0x214, 0xE0); + LoadMessageBoxGfx(0, 0x200, BG_PLTT_ID(0xF)); + LoadUserWindowBorderGfx(0, 0x214, BG_PLTT_ID(0xE)); PutWindowTilemap(0); } @@ -3211,12 +3211,12 @@ static void StopReelButton_Unpress(struct Task *task, u8 taskId) static void LightenMatchLine(u8 matchLineId) { - LoadPalette(sLitMatchLinePalTable[matchLineId], sMatchLinePalOffsets[matchLineId], 2); + LoadPalette(sLitMatchLinePalTable[matchLineId], sMatchLinePalOffsets[matchLineId], PLTT_SIZEOF(1)); } static void DarkenMatchLine(u8 matchLineId) { - LoadPalette(sDarkMatchLinePalTable[matchLineId], sMatchLinePalOffsets[matchLineId], 2); + LoadPalette(sDarkMatchLinePalTable[matchLineId], sMatchLinePalOffsets[matchLineId], PLTT_SIZEOF(1)); } // light up the match line for each bet by the player @@ -3360,7 +3360,7 @@ static bool8 TryStopSlotMachineLights(void) if (gTasks[taskId].sFlashState == 0) { DestroyTask(taskId); - LoadPalette(sSlotMachineMenu_Pal, 0x10, 0x20); + LoadPalette(sSlotMachineMenu_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); return TRUE; } return FALSE; @@ -3376,7 +3376,7 @@ static void Task_FlashSlotMachineLights(u8 taskId) if (task->sFlashState == 0 || task->sFlashState == 2) task->sFlashDir = -task->sFlashDir; } - LoadPalette(sFlashingLightsPalTable[task->sFlashState], 0x10, 0x20); + LoadPalette(sFlashingLightsPalTable[task->sFlashState], BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); } #undef sDelayTimer @@ -4857,7 +4857,7 @@ static void SpriteCB_DigitalDisplay_PokeballShining(struct Sprite *sprite) { if (sprite->sCounter < 3) { - LoadPalette(sPokeballShiningPalTable[sprite->sCounter], (IndexOfSpritePaletteTag(PALTAG_DIG_DISPLAY) << 4) + 0x100, 32); + LoadPalette(sPokeballShiningPalTable[sprite->sCounter], OBJ_PLTT_ID(IndexOfSpritePaletteTag(PALTAG_DIG_DISPLAY)), PLTT_SIZE_4BPP); if (++sprite->data[2] >= 4) { sprite->data[1]++; @@ -4866,7 +4866,7 @@ static void SpriteCB_DigitalDisplay_PokeballShining(struct Sprite *sprite) } else { - LoadPalette(sPokeballShiningPalTable[sprite->sCounter], (IndexOfSpritePaletteTag(PALTAG_DIG_DISPLAY) << 4) + 0x100, 32); + LoadPalette(sPokeballShiningPalTable[sprite->sCounter], OBJ_PLTT_ID(IndexOfSpritePaletteTag(PALTAG_DIG_DISPLAY)), PLTT_SIZE_4BPP); if (++sprite->data[2] >= 25) { sprite->sCounter = 0; @@ -4995,7 +4995,7 @@ static void EndDigitalDisplayScene_StopReel(void) static void EndDigitalDisplayScene_Win(void) { - LoadPalette(sDigitalDisplay_Pal, (IndexOfSpritePaletteTag(PALTAG_DIG_DISPLAY) << 4) + 0x100, 0x20); + LoadPalette(sDigitalDisplay_Pal, OBJ_PLTT_ID(IndexOfSpritePaletteTag(PALTAG_DIG_DISPLAY)), PLTT_SIZE_4BPP); } static void EndDigitalDisplayScene_InsertBet(void) @@ -5054,8 +5054,8 @@ static void LoadMenuGfx(void) sMenuGfx = Alloc(0x2200); LZDecompressWram(gSlotMachineMenu_Gfx, sMenuGfx); LoadBgTiles(2, sMenuGfx, 0x2200, 0); - LoadPalette(gSlotMachineMenu_Pal, 0, 160); - LoadPalette(sUnkPalette, 208, 32); + LoadPalette(gSlotMachineMenu_Pal, BG_PLTT_ID(0x0), 5 * PLTT_SIZE_4BPP); + LoadPalette(sUnkPalette, BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); } static void LoadMenuAndReelOverlayTilemaps(void) @@ -7728,19 +7728,19 @@ static const u16 *const sLitMatchLinePalTable[NUM_MATCH_LINES] = static const u16 *const sDarkMatchLinePalTable[NUM_MATCH_LINES] = { - [MATCH_MIDDLE_ROW] = &gSlotMachineMenu_Pal[74], - [MATCH_TOP_ROW] = &gSlotMachineMenu_Pal[75], - [MATCH_BOTTOM_ROW] = &gSlotMachineMenu_Pal[76], - [MATCH_NWSE_DIAG] = &gSlotMachineMenu_Pal[77], - [MATCH_NESW_DIAG] = &gSlotMachineMenu_Pal[78], + [MATCH_MIDDLE_ROW] = &gSlotMachineMenu_Pal[BG_PLTT_ID(0x4) + 10], + [MATCH_TOP_ROW] = &gSlotMachineMenu_Pal[BG_PLTT_ID(0x4) + 11], + [MATCH_BOTTOM_ROW] = &gSlotMachineMenu_Pal[BG_PLTT_ID(0x4) + 12], + [MATCH_NWSE_DIAG] = &gSlotMachineMenu_Pal[BG_PLTT_ID(0x4) + 13], + [MATCH_NESW_DIAG] = &gSlotMachineMenu_Pal[BG_PLTT_ID(0x4) + 14], }; static const u8 sMatchLinePalOffsets[NUM_MATCH_LINES] = { - [MATCH_MIDDLE_ROW] = 74, - [MATCH_TOP_ROW] = 75, - [MATCH_BOTTOM_ROW] = 76, - [MATCH_NWSE_DIAG] = 78, // Diag colors flipped for some reason - [MATCH_NESW_DIAG] = 77 // Doesn't matter as both are identical + [MATCH_MIDDLE_ROW] = BG_PLTT_ID(0x4) + 10, + [MATCH_TOP_ROW] = BG_PLTT_ID(0x4) + 11, + [MATCH_BOTTOM_ROW] = BG_PLTT_ID(0x4) + 12, + [MATCH_NWSE_DIAG] = BG_PLTT_ID(0x4) + 14, // Diag colors flipped for some reason + [MATCH_NESW_DIAG] = BG_PLTT_ID(0x4) + 13 // Doesn't matter as both are identical }; static const u8 sBetToMatchLineIds[MAX_BET][2] = diff --git a/src/start_menu.c b/src/start_menu.c index 2a45f8d69c..34e7e5b2bd 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -192,7 +192,7 @@ static const struct WindowTemplate sWindowTemplates_LinkBattleSave[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x194 }, DUMMY_WIN_TEMPLATE @@ -204,7 +204,7 @@ static const struct WindowTemplate sSaveInfoWindowTemplate = { .tilemapTop = 1, .width = 14, .height = 10, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 8 }; @@ -1196,8 +1196,8 @@ static bool32 InitSaveWindowAfterLinkBattle(u8 *state) ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sBgTemplates_LinkBattleSave, ARRAY_COUNT(sBgTemplates_LinkBattleSave)); InitWindows(sWindowTemplates_LinkBattleSave); - LoadUserWindowBorderGfx_(0, 8, 224); - Menu_LoadStdPalAt(240); + LoadUserWindowBorderGfx_(0, 8, BG_PLTT_ID(0xE)); + Menu_LoadStdPalAt(BG_PLTT_ID(0xF)); break; case 3: ShowBg(0); @@ -1246,7 +1246,7 @@ static void Task_SaveAfterLinkBattle(u8 taskId) TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); - DrawTextBorderOuter(0, 8, 14); + DrawTextBorderOuter(0, 8, 0xE); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); diff --git a/src/starter_choose.c b/src/starter_choose.c index cbe0c7ee61..fc626e13a1 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -73,7 +73,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 24, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x0200 }, DUMMY_WIN_TEMPLATE, @@ -86,7 +86,7 @@ static const struct WindowTemplate sWindowTemplate_ConfirmStarter = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x0260 }; @@ -97,7 +97,7 @@ static const struct WindowTemplate sWindowTemplate_StarterLabel = .tilemapTop = 0, .width = 13, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x0274 }; @@ -411,7 +411,7 @@ void CB2_ChooseStarter(void) InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 0x2A8, 0xD0); + LoadUserWindowBorderGfx(0, 0x2A8, BG_PLTT_ID(0xD)); ClearScheduledBgCopiesToVram(); ScanlineEffect_Stop(); ResetTasks(); @@ -420,8 +420,8 @@ void CB2_ChooseStarter(void) FreeAllSpritePalettes(); ResetAllPicSprites(); - LoadPalette(GetOverworldTextboxPalettePtr(), 0xE0, 0x20); - LoadPalette(gBirchBagGrassPal, 0, 0x40); + LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); + LoadPalette(gBirchBagGrassPal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); LoadCompressedSpriteSheet(&sSpriteSheet_PokeballSelect[0]); LoadCompressedSpriteSheet(&sSpriteSheet_StarterCircle[0]); LoadSpritePalettes(sSpritePalettes_StarterChoose); diff --git a/src/text_window.c b/src/text_window.c index 798b791ced..df06837299 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -93,7 +93,7 @@ const struct TilesPal *GetWindowFrameTilesPal(u8 id) void LoadMessageBoxGfx(u8 windowId, u16 destOffset, u8 palOffset) { LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gMessageBox_Gfx, 0x1C0, destOffset); - LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20); + LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, PLTT_SIZE_4BPP); } void LoadUserWindowBorderGfx_(u8 windowId, u16 destOffset, u8 palOffset) @@ -104,7 +104,7 @@ void LoadUserWindowBorderGfx_(u8 windowId, u16 destOffset, u8 palOffset) void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset) { LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), sWindowFrames[frameId].tiles, 0x120, destOffset); - LoadPalette(sWindowFrames[frameId].pal, palOffset, 0x20); + LoadPalette(sWindowFrames[frameId].pal, palOffset, PLTT_SIZE_4BPP); } void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palOffset) @@ -164,7 +164,7 @@ const u16 *GetTextWindowPalette(u8 id) switch (id) { case 0: - id = 0; + id = 0x00; break; case 1: id = 0x10; @@ -193,5 +193,5 @@ const u16 *GetOverworldTextboxPalettePtr(void) void LoadUserWindowBorderGfxOnBg(u8 bg, u16 destOffset, u8 palOffset) { LoadBgTiles(bg, sWindowFrames[gSaveBlock2Ptr->optionsWindowFrameType].tiles, 0x120, destOffset); - LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, palOffset, 0x20); + LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, palOffset, PLTT_SIZE_4BPP); } diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 6a7589e36f..018ac5d881 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -1168,7 +1168,7 @@ static void QueueAnimTiles_BattlePyramid_StatueShadow(u16 timer) static void BlendAnimPalette_BattleDome_FloorLights(u16 timer) { CpuCopy16(sTilesetAnims_BattleDomeFloorLightPals[timer % ARRAY_COUNT(sTilesetAnims_BattleDomeFloorLightPals)], &gPlttBufferUnfaded[0x80], 32); - BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); + BlendPalette(BG_PLTT_ID(0x8), 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if ((u8)FindTaskIdByFunc(Task_BattleTransition_Intro) != TASK_NONE) { sSecondaryTilesetAnimCallback = TilesetAnim_BattleDome2; @@ -1181,7 +1181,7 @@ static void BlendAnimPalette_BattleDome_FloorLightsNoBlend(u16 timer) CpuCopy16(sTilesetAnims_BattleDomeFloorLightPals[timer % ARRAY_COUNT(sTilesetAnims_BattleDomeFloorLightPals)], &gPlttBufferUnfaded[0x80], 32); if ((u8)FindTaskIdByFunc(Task_BattleTransition_Intro) == TASK_NONE) { - BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); + BlendPalette(BG_PLTT_ID(0x8), 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if (!--sSecondaryTilesetAnimCounterMax) sSecondaryTilesetAnimCallback = NULL; } diff --git a/src/title_screen.c b/src/title_screen.c index 25a1d60d05..7f7205d9d4 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -548,7 +548,7 @@ void CB2_InitTitleScreen(void) // bg2 LZ77UnCompVram(gTitleScreenPokemonLogoGfx, (void *)(BG_CHAR_ADDR(0))); LZ77UnCompVram(gTitleScreenPokemonLogoTilemap, (void *)(BG_SCREEN_ADDR(9))); - LoadPalette(gTitleScreenBgPalettes, 0, 0x1E0); + LoadPalette(gTitleScreenBgPalettes, BG_PLTT_ID(0x0), 15 * PLTT_SIZE_4BPP); // bg3 LZ77UnCompVram(sTitleScreenRayquazaGfx, (void *)(BG_CHAR_ADDR(2))); LZ77UnCompVram(sTitleScreenRayquazaTilemap, (void *)(BG_SCREEN_ADDR(26))); @@ -563,7 +563,7 @@ void CB2_InitTitleScreen(void) LoadCompressedSpriteSheet(&sSpriteSheet_EmeraldVersion[0]); LoadCompressedSpriteSheet(&sSpriteSheet_PressStart[0]); LoadCompressedSpriteSheet(&sPokemonLogoShineSpriteSheet[0]); - LoadPalette(gTitleScreenEmeraldVersionPal, 0x100, 0x20); + LoadPalette(gTitleScreenEmeraldVersionPal, OBJ_PLTT_ID(0x0), PLTT_SIZE_4BPP); LoadSpritePalette(&sSpritePalette_PressStart[0]); gMain.state = 2; break; @@ -812,6 +812,6 @@ static void UpdateLegendaryMarkingColor(u8 frameNum) s32 b = 12; u16 color = RGB(r, g, b); - LoadPalette(&color, 0xEF, sizeof(color)); + LoadPalette(&color, BG_PLTT_ID(0xE) + 15, sizeof(color)); } } diff --git a/src/trade.c b/src/trade.c index 7c712b5803..1c4d0d5e33 100644 --- a/src/trade.c +++ b/src/trade.c @@ -333,8 +333,8 @@ static void InitTradeMenu(void) gPaletteFade.bufferTransferDisabled = TRUE; SetVBlankCallback(VBlankCB_TradeMenu); - LoadPalette(gStandardMenuPalette, 0xF0, 20); - LoadPalette(gStandardMenuPalette, 0xD0, 20); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZEOF(10)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xD), PLTT_SIZEOF(10)); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sTradeMenuBgTemplates, ARRAY_COUNT(sTradeMenuBgTemplates)); SetBgTilemapBuffer(1, sTradeMenuData->tilemapBuffer); @@ -351,9 +351,9 @@ static void InitTradeMenu(void) FillWindowPixelBuffer(i, PIXEL_FILL(0)); } - FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 15); - LoadUserWindowBorderGfx_(0, 20, 0xC0); - LoadUserWindowBorderGfx(2, 1, 0xE0); + FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 0xF); + LoadUserWindowBorderGfx_(0, 20, BG_PLTT_ID(0xC)); + LoadUserWindowBorderGfx(2, 1, BG_PLTT_ID(0xE)); LoadMonIconPalettes(); sTradeMenuData->bufferPartyState = 0; sTradeMenuData->tradeMenuFunc = 0; @@ -910,7 +910,7 @@ static void LoadTradeBgGfx(u8 state) switch (state) { case 0: - LoadPalette(gTradeMenu_Pal, 0, 0x60); + LoadPalette(gTradeMenu_Pal, BG_PLTT_ID(0x0), 3 * PLTT_SIZE_4BPP); LoadBgTiles(1, gTradeMenu_Gfx, 0x1280, 0); CopyToBgTilemapBufferRect_ChangePalette(1, gTradeMenu_Tilemap, 0, 0, 32, 20, 0); LoadBgTilemap(2, sTradeStripesBG2Tilemap, 0x800, 0); @@ -1391,7 +1391,7 @@ static void TradeMenuProcessInput(void) // Cursor is in player's party if (sTradeMenuData->cursorPosition < PARTY_SIZE) { - DrawTextBorderOuter(1, 1, 14); + DrawTextBorderOuter(1, 1, 0xE); FillWindowPixelBuffer(1, PIXEL_FILL(1)); PrintMenuTable(1, ARRAY_COUNT(sSelectTradeMonActions), sSelectTradeMonActions); InitMenuInUpperLeftCornerNormal(1, ARRAY_COUNT(sSelectTradeMonActions), 0); @@ -2153,7 +2153,7 @@ static void PrintTradeMessage(u8 messageId) { FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized(0, FONT_NORMAL, sTradeMessages[messageId], 0, 1, TEXT_SKIP_DRAW, NULL); - DrawTextBorderOuter(0, 20, 12); + DrawTextBorderOuter(0, 20, 0xC); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); } @@ -2605,7 +2605,7 @@ static void SpriteCB_LinkMonShadow(struct Sprite *sprite) if (++sprite->data[0] == 12) sprite->data[0] = 0; - LoadPalette(&sLinkMonShadow_Pal[sprite->data[0]], (sprite->oam.paletteNum + 16) * 16 + 4, 2); + LoadPalette(&sLinkMonShadow_Pal[sprite->data[0]], OBJ_PLTT_ID2(sprite->oam.paletteNum) + 4, PLTT_SIZEOF(1)); } } @@ -2915,12 +2915,12 @@ static void InitTradeBgInternal(void) DecompressAndLoadBgGfxUsingHeap(0, gBattleTextboxTiles, 0, 0, 0); LZDecompressWram(gBattleTextboxTilemap, gDecompressionBuffer); CopyToBgTilemapBuffer(0, gDecompressionBuffer, 0x800, 0); - LoadCompressedPalette(gBattleTextboxPalette, 0, 0x20); + LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); InitWindows(sTradeSequenceWindowTemplates); DecompressAndLoadBgGfxUsingHeap(0, gBattleTextboxTiles, 0, 0, 0); LZDecompressWram(gBattleTextboxTilemap, gDecompressionBuffer); CopyToBgTilemapBuffer(0, gDecompressionBuffer, 0x800, 0); - LoadCompressedPalette(gBattleTextboxPalette, 0, 0x20); + LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); } static void CB2_InGameTrade(void) @@ -3100,7 +3100,7 @@ static void SetTradeSequenceBgGpuRegs(u8 state) BGCNT_16COLOR | BGCNT_SCREENBASE(18) | BGCNT_TXT512x256); - LoadPalette(gTradeGba2_Pal, 16, 0x60); + LoadPalette(gTradeGba2_Pal, BG_PLTT_ID(0x1), 3 * PLTT_SIZE_4BPP); DmaCopyLarge16(3, gTradeGba_Gfx, (void *) BG_CHAR_ADDR(1), 0x1420, 0x1000); DmaCopy16Defvars(3, gTradePlatform_Tilemap, (void *) BG_SCREEN_ADDR(18), 0x1000); break; @@ -3157,7 +3157,7 @@ static void SetTradeSequenceBgGpuRegs(u8 state) } break; case 3: - LoadPalette(sWirelessSignalNone_Pal, 48, 0x20); + LoadPalette(sWirelessSignalNone_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); LZ77UnCompVram(sWirelessSignal_Gfx, (void *) BG_CHAR_ADDR(1)); LZ77UnCompVram(sWirelessSignal_Tilemap, (void *) BG_SCREEN_ADDR(18)); sTradeData->bg2vofs = 80; @@ -3236,7 +3236,7 @@ static void SetTradeSequenceBgGpuRegs(u8 state) BGCNT_16COLOR | BGCNT_SCREENBASE(18) | BGCNT_TXT512x256); - LoadPalette(gTradeGba2_Pal, 16, 0x60); + LoadPalette(gTradeGba2_Pal, BG_PLTT_ID(0x1), 3 * PLTT_SIZE_4BPP); DmaCopyLarge16(3, gTradeGba_Gfx, (void *) BG_CHAR_ADDR(1), 0x1420, 0x1000); DmaCopy16Defvars(3, gTradePlatform_Tilemap, (void *) BG_SCREEN_ADDR(18), 0x1000); break; @@ -4849,16 +4849,16 @@ static void Task_AnimateWirelessSignal(u8 taskId) if (!signalComingBack) { if (paletteIdx == 256) - LoadPalette(sWirelessSignalNone_Pal, 0x30, 32); + LoadPalette(sWirelessSignalNone_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); else - LoadPalette(&sWirelessSignalSend_Pal[paletteIdx], 0x30, 32); + LoadPalette(&sWirelessSignalSend_Pal[paletteIdx], BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); } else { if (paletteIdx == 256) - LoadPalette(sWirelessSignalNone_Pal, 0x30, 32); + LoadPalette(sWirelessSignalNone_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); else - LoadPalette(&sWirelessSignalRecv_Pal[paletteIdx], 0x30, 32); + LoadPalette(&sWirelessSignalRecv_Pal[paletteIdx], BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); } if (sWirelessSignalTiming[idx][0] == 0 && counter == 0) diff --git a/src/trader.c b/src/trader.c index 254d809458..b16297c109 100644 --- a/src/trader.c +++ b/src/trader.c @@ -66,7 +66,7 @@ void CreateAvailableDecorationsMenu(u8 taskId) .tilemapTop = 1, .width = 10, .height = 10, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }; s32 windowWidth = GetStringWidth(FONT_NORMAL, gText_Exit, 0); diff --git a/src/trainer_card.c b/src/trainer_card.c index ab7b3c9131..94fcdaf6e5 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -231,7 +231,7 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x253, }, { @@ -240,7 +240,7 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[] = .tilemapTop = 1, .width = 28, .height = 18, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x1, }, { @@ -249,7 +249,7 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[] = .tilemapTop = 5, .width = 9, .height = 10, - .paletteNum = 8, + .paletteNum = 0x8, .baseBlock = 0x150, }, DUMMY_WIN_TEMPLATE @@ -1371,7 +1371,7 @@ static void LoadMonIconGfx(void) TintPalette_SepiaTone(sData->monIconPal, 96); break; } - LoadPalette(sData->monIconPal, 80, 192); + LoadPalette(sData->monIconPal, BG_PLTT_ID(0x5), 6 * PLTT_SIZE_4BPP); for (i = 0; i < PARTY_SIZE; i++) { @@ -1398,10 +1398,10 @@ static void PrintStickersOnCard(void) static void LoadStickerGfx(void) { - LoadPalette(sTrainerCardSticker1_Pal, 176, 32); - LoadPalette(sTrainerCardSticker2_Pal, 192, 32); - LoadPalette(sTrainerCardSticker3_Pal, 208, 32); - LoadPalette(sTrainerCardSticker4_Pal, 224, 32); + LoadPalette(sTrainerCardSticker1_Pal, BG_PLTT_ID(0xB), PLTT_SIZE_4BPP); + LoadPalette(sTrainerCardSticker2_Pal, BG_PLTT_ID(0xC), PLTT_SIZE_4BPP); + LoadPalette(sTrainerCardSticker3_Pal, BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); + LoadPalette(sTrainerCardSticker4_Pal, BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); LoadBgTiles(3, sData->stickerTiles, 1024, 128); } @@ -1424,19 +1424,19 @@ static u8 SetCardBgsAndPals(void) case 2: if (sData->cardType != CARD_TYPE_FRLG) { - LoadPalette(sHoennTrainerCardStarPals[sData->trainerCard.stars], 0, 96); - LoadPalette(sHoennTrainerCardBadges_Pal, 48, 32); + LoadPalette(sHoennTrainerCardStarPals[sData->trainerCard.stars], BG_PLTT_ID(0x0), 3 * PLTT_SIZE_4BPP); + LoadPalette(sHoennTrainerCardBadges_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); if (sData->trainerCard.gender != MALE) - LoadPalette(sHoennTrainerCardFemaleBg_Pal, 16, 32); + LoadPalette(sHoennTrainerCardFemaleBg_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); } else { - LoadPalette(sKantoTrainerCardStarPals[sData->trainerCard.stars], 0, 96); - LoadPalette(sKantoTrainerCardBadges_Pal, 48, 32); + LoadPalette(sKantoTrainerCardStarPals[sData->trainerCard.stars], BG_PLTT_ID(0x0), 3 * PLTT_SIZE_4BPP); + LoadPalette(sKantoTrainerCardBadges_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); if (sData->trainerCard.gender != MALE) - LoadPalette(sKantoTrainerCardFemaleBg_Pal, 16, 32); + LoadPalette(sKantoTrainerCardFemaleBg_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); } - LoadPalette(sTrainerCardGold_Pal, 64, 32); + LoadPalette(sTrainerCardGold_Pal, BG_PLTT_ID(0x4), PLTT_SIZE_4BPP); break; case 3: SetBgTilemapBuffer(0, sData->cardTilemapBuffer); @@ -1495,9 +1495,9 @@ static void DrawStarsAndBadgesOnCard(void) s16 i, x; u16 tileNum = 192; - u8 palNum = 3; + u8 palNum = 0x3; - FillBgTilemapBufferRect(3, 143, 15, yOffsets[sData->isHoenn], sData->trainerCard.stars, 1, 4); + FillBgTilemapBufferRect(3, 143, 15, yOffsets[sData->isHoenn], sData->trainerCard.stars, 1, 0x4); if (!sData->isLink) { x = 4; @@ -1521,38 +1521,38 @@ static void DrawCardBackStats(void) { if (sData->hasTrades) { - FillBgTilemapBufferRect(3, 141, 27, 9, 1, 1, 1); - FillBgTilemapBufferRect(3, 157, 27, 10, 1, 1, 1); + FillBgTilemapBufferRect(3, 141, 27, 9, 1, 1, 0x1); + FillBgTilemapBufferRect(3, 157, 27, 10, 1, 1, 0x1); } if (sData->trainerCard.linkPoints.berryCrush) { - FillBgTilemapBufferRect(3, 141, 21, 13, 1, 1, 1); - FillBgTilemapBufferRect(3, 157, 21, 14, 1, 1, 1); + FillBgTilemapBufferRect(3, 141, 21, 13, 1, 1, 0x1); + FillBgTilemapBufferRect(3, 157, 21, 14, 1, 1, 0x1); } if (sData->trainerCard.unionRoomNum) { - FillBgTilemapBufferRect(3, 141, 27, 11, 1, 1, 1); - FillBgTilemapBufferRect(3, 157, 27, 12, 1, 1, 1); + FillBgTilemapBufferRect(3, 141, 27, 11, 1, 1, 0x1); + FillBgTilemapBufferRect(3, 157, 27, 12, 1, 1, 0x1); } } else { if (sData->hasTrades) { - FillBgTilemapBufferRect(3, 141, 27, 9, 1, 1, 0); - FillBgTilemapBufferRect(3, 157, 27, 10, 1, 1, 0); + FillBgTilemapBufferRect(3, 141, 27, 9, 1, 1, 0x0); + FillBgTilemapBufferRect(3, 157, 27, 10, 1, 1, 0x0); } if (sData->trainerCard.contestsWithFriends) { - FillBgTilemapBufferRect(3, 141, 27, 13, 1, 1, 0); - FillBgTilemapBufferRect(3, 157, 27, 14, 1, 1, 0); + FillBgTilemapBufferRect(3, 141, 27, 13, 1, 1, 0x0); + FillBgTilemapBufferRect(3, 157, 27, 14, 1, 1, 0x0); } if (sData->hasBattleTowerWins) { - FillBgTilemapBufferRect(3, 141, 17, 15, 1, 1, 0); - FillBgTilemapBufferRect(3, 157, 17, 16, 1, 1, 0); - FillBgTilemapBufferRect(3, 140, 27, 15, 1, 1, 0); - FillBgTilemapBufferRect(3, 156, 27, 16, 1, 1, 0); + FillBgTilemapBufferRect(3, 141, 17, 15, 1, 1, 0x0); + FillBgTilemapBufferRect(3, 157, 17, 16, 1, 1, 0x0); + FillBgTilemapBufferRect(3, 140, 27, 15, 1, 1, 0x0); + FillBgTilemapBufferRect(3, 156, 27, 16, 1, 1, 0x0); } } CopyBgTilemapBufferToVram(3); diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 4549166ac4..bb606f37bd 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -951,7 +951,7 @@ static void SetAllTrainerFlags(void) void TryLoadTrainerHillEReaderPalette(void) { if (OnTrainerHillEReaderChallengeFloor() == TRUE) - LoadPalette(sEReader_Pal, 0x70, 0x20); + LoadPalette(sEReader_Pal, BG_PLTT_ID(0x7), PLTT_SIZE_4BPP); } static void GetGameSaved(void) diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index a7289677e6..d81fac54c7 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -94,7 +94,7 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 if (paletteTag == TAG_NONE) { sCreatingSpriteTemplate.paletteTag = TAG_NONE; - LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20); + LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), OBJ_PLTT_ID(paletteSlot), PLTT_SIZE_4BPP); } else { @@ -107,7 +107,7 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 if (paletteTag == TAG_NONE) { sCreatingSpriteTemplate.paletteTag = TAG_NONE; - LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, 0x100 + paletteSlot * 0x10, 0x20); + LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, OBJ_PLTT_ID(paletteSlot), PLTT_SIZE_4BPP); } else { @@ -120,9 +120,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 static void LoadPicPaletteBySlot(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 isTrainer) { if (!isTrainer) - LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), paletteSlot * 0x10, 0x20); + LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), PLTT_ID(paletteSlot), PLTT_SIZE_4BPP); else - LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, paletteSlot * 0x10, 0x20); + LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, PLTT_ID(paletteSlot), PLTT_SIZE_4BPP); } static void AssignSpriteAnimsTable(bool8 isTrainer) diff --git a/src/union_room.c b/src/union_room.c index 67d1059ee0..299171325e 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -1910,7 +1910,7 @@ static void Task_SendMysteryGift(u8 taskId) winTemplate = sWindowTemplate_PlayerList; winTemplate.baseBlock = GetMysteryGiftBaseBlock(); - winTemplate.paletteNum = 12; + winTemplate.paletteNum = 0xC; data->listWindowId = AddWindow(&winTemplate); MG_DrawTextBorder(data->listWindowId); gMultiuseListMenuTemplate = sListMenuTemplate_PossibleGroupMembers; @@ -2114,11 +2114,11 @@ static void Task_CardOrNewsWithFriend(u8 taskId) listWinTemplate = sWindowTemplate_GroupList; listWinTemplate.baseBlock = GetMysteryGiftBaseBlock(); - listWinTemplate.paletteNum = 12; + listWinTemplate.paletteNum = 0xC; data->listWindowId = AddWindow(&listWinTemplate); playerNameWinTemplate = sWindowTemplate_PlayerNameAndId; - playerNameWinTemplate.paletteNum = 12; + playerNameWinTemplate.paletteNum = 0xC; data->playerNameAndIdWindowId = AddWindow(&playerNameWinTemplate); MG_DrawTextBorder(data->listWindowId); @@ -2439,7 +2439,7 @@ void RunUnionRoom(void) uroom->unreadPlayerId = 0; gSpecialVar_Result = 0; - ListMenuLoadStdPalAt(0xD0, 1); + ListMenuLoadStdPalAt(BG_PLTT_ID(0xD), 1); } static u16 ReadAsU16(const u8 *ptr) @@ -3775,7 +3775,7 @@ static s32 TradeBoardMenuHandler(u8 *state, u8 *mainWindowId, u8 *listMenuId, u8 static void UR_ClearBg0(void) { - FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0); + FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0x0); CopyBgTilemapBufferToVram(0); } diff --git a/src/union_room_battle.c b/src/union_room_battle.c index 1ec8be77b5..f4ad73b32b 100644 --- a/src/union_room_battle.c +++ b/src/union_room_battle.c @@ -130,8 +130,8 @@ void CB2_UnionRoomBattle(void) FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 0xF); - LoadUserWindowBorderGfx(0, 1, 0xD0); - LoadUserWindowBorderGfx_(0, 1, 0xD0); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD)); + LoadUserWindowBorderGfx_(0, 1, BG_PLTT_ID(0xD)); Menu_LoadStdPal(); SetVBlankCallback(VBlankCB_UnionRoomBattle); gMain.state++; diff --git a/src/union_room_chat.c b/src/union_room_chat.c index f8513b9f46..98af18cde6 100755 --- a/src/union_room_chat.c +++ b/src/union_room_chat.c @@ -566,7 +566,7 @@ static const struct WindowTemplate sWinTemplates[] = { .tilemapTop = 1, .width = 21, .height = 19, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0001, }, { .bg = 1, @@ -574,7 +574,7 @@ static const struct WindowTemplate sWinTemplates[] = { .tilemapTop = 18, .width = 15, .height = 2, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 0x007a, }, { .bg = 1, @@ -582,7 +582,7 @@ static const struct WindowTemplate sWinTemplates[] = { .tilemapTop = 2, .width = 6, .height = 15, - .paletteNum = 7, + .paletteNum = 0x7, .baseBlock = 0x0020, }, { .bg = 0, @@ -590,7 +590,7 @@ static const struct WindowTemplate sWinTemplates[] = { .tilemapTop = 2, .width = 7, .height = 9, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 0x0013, }, DUMMY_WIN_TEMPLATE }; @@ -2732,7 +2732,7 @@ static void AddYesNoMenuAt(u8 left, u8 top, u8 initialCursorPos) template.tilemapTop = top; template.width = 6; template.height = 4; - template.paletteNum = 14; + template.paletteNum = 0xE; template.baseBlock = 0x52; sDisplay->yesNoMenuWindowId = AddWindow(&template); if (sDisplay->yesNoMenuWindowId != WINDOW_NONE) @@ -2741,7 +2741,7 @@ static void AddYesNoMenuAt(u8 left, u8 top, u8 initialCursorPos) PutWindowTilemap(sDisplay->yesNoMenuWindowId); AddTextPrinterParameterized(sDisplay->yesNoMenuWindowId, FONT_NORMAL, gText_Yes, 8, 1, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sDisplay->yesNoMenuWindowId, FONT_NORMAL, gText_No, 8, 17, TEXT_SKIP_DRAW, NULL); - DrawTextBorderOuter(sDisplay->yesNoMenuWindowId, 1, 13); + DrawTextBorderOuter(sDisplay->yesNoMenuWindowId, 1, 0xD); InitMenuInUpperLeftCornerNormal(sDisplay->yesNoMenuWindowId, 2, initialCursorPos); } } @@ -2779,7 +2779,7 @@ static void AddStdMessageWindow(int msgId, u16 bg0vofs) template.tilemapTop = 16; template.width = 21; template.height = 4; - template.paletteNum = 14; + template.paletteNum = 0xE; template.baseBlock = 0x6A; if (sDisplayStdMessages[msgId].useWiderBox) { @@ -3050,8 +3050,8 @@ static void ClearBg0(void) static void LoadChatWindowBorderGfx(void) { - LoadPalette(gUnionRoomChat_Window_Pal2, 0x70, 0x20); - LoadPalette(gUnionRoomChat_Window_Pal1, 0xC0, 0x20); + LoadPalette(gUnionRoomChat_Window_Pal2, BG_PLTT_ID(0x7), PLTT_SIZE_4BPP); + LoadPalette(gUnionRoomChat_Window_Pal1, BG_PLTT_ID(0xC), PLTT_SIZE_4BPP); DecompressAndCopyTileDataToVram(1, gUnionRoomChat_Border_Gfx, 0, 0, 0); CopyToBgTilemapBuffer(1, gUnionRoomChat_Border_Tilemap, 0, 0); CopyBgTilemapBufferToVram(1); @@ -3061,7 +3061,7 @@ static void LoadChatWindowGfx(void) { u8 *ptr; - LoadPalette(gUnionRoomChat_Background_Pal, 0, 0x20); + LoadPalette(gUnionRoomChat_Background_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); ptr = DecompressAndCopyTileDataToVram(2, gUnionRoomChat_Background_Gfx, 0, 0, 0); if (ptr) { @@ -3075,13 +3075,13 @@ static void LoadChatWindowGfx(void) static void LoadChatUnkPalette(void) { - LoadPalette(sUnk_Palette1, 0x80, sizeof(sUnk_Palette1)); + LoadPalette(sUnk_Palette1, BG_PLTT_ID(0x8), sizeof(sUnk_Palette1)); RequestDma3Fill(0, (void *)BG_CHAR_ADDR(1) + 0x20, 0x20, 1); } static void LoadChatMessagesWindow(void) { - LoadPalette(sUnk_Palette2, 0xF0, sizeof(sUnk_Palette2)); + LoadPalette(sUnk_Palette2, BG_PLTT_ID(0xF), sizeof(sUnk_Palette2)); PutWindowTilemap(0); FillWindowPixelBuffer(0, PIXEL_FILL(1)); CopyWindowToVram(0, COPYWIN_FULL); @@ -3112,9 +3112,9 @@ static void LoadTextEntryWindow(void) static void LoadKeyboardSwapWindow(void) { FillWindowPixelBuffer(3, PIXEL_FILL(1)); - LoadUserWindowBorderGfx(3, 1, 0xD0); - LoadUserWindowBorderGfx_(3, 0xA, 0x20); - LoadPalette(gStandardMenuPalette, 0xE0, 0x20); + LoadUserWindowBorderGfx(3, 1, BG_PLTT_ID(0xD)); + LoadUserWindowBorderGfx_(3, 0xA, BG_PLTT_ID(0x2)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); } static void InitScanlineEffect(void) @@ -3197,7 +3197,7 @@ static void SetRegisteredTextPalette(bool32 registering) { const u16 *palette = &sUnionRoomChatInterfacePal[registering * 2 + 1]; u8 index = IndexOfSpritePaletteTag(PALTAG_INTERFACE); - LoadPalette(palette, index * 16 + 0x101, 4); + LoadPalette(palette, OBJ_PLTT_ID(index) + 1, PLTT_SIZEOF(2)); } static void StartKeyboardCursorAnim(void) diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 2f16f220aa..85d1a477f7 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -251,7 +251,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 1, .width = 13, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 1 }, [WIN_NATURE] = { @@ -260,7 +260,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 14, .width = 11, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x35 }, [WIN_TEXT] = { @@ -269,7 +269,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 17, .width = 28, .height = 2, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x4B }, DUMMY_WIN_TEMPLATE @@ -282,7 +282,7 @@ static const struct WindowTemplate sUsePokeblockYesNoWinTemplate = .tilemapTop = 11, .width = 5, .height = 4, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x83 }; @@ -505,7 +505,7 @@ static void LoadUsePokeblockMenu(void) InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates)); InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 0x97, 0xE0); + LoadUserWindowBorderGfx(0, 0x97, BG_PLTT_ID(0xE)); sInfo->mainState++; break; case 4: @@ -1233,13 +1233,13 @@ static void UpdateMonPic(u8 loadId) gSprites[sMenu->curMonSpriteId].callback = SpriteCB_MonPic; gSprites[sMenu->curMonSpriteId].y2 -= 34; sMenu->curMonTileStart = (void *)(OBJ_VRAM0 + (sMenu->curMonSheet * 32)); - sMenu->curMonPalette = (sMenu->curMonPalette * 16) + 0x100; + sMenu->curMonPalette = OBJ_PLTT_ID(sMenu->curMonPalette); } } else { Dma3CopyLarge16_(sMenu->partySheets[loadId], sMenu->curMonTileStart, MON_PIC_SIZE); - LoadPalette(sMenu->partyPalettes[loadId], sMenu->curMonPalette, 32); + LoadPalette(sMenu->partyPalettes[loadId], sMenu->curMonPalette, PLTT_SIZE_4BPP); } } @@ -1340,7 +1340,7 @@ static bool8 LoadUsePokeblockMenuGfx(void) LoadBgTilemap(3, sMonFrame_TilemapPtr, 1280, 0); break; case 5: - LoadPalette(sMonFrame_Pal, 208, 32); + LoadPalette(sMonFrame_Pal, BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); sMenu->curMonXOffset = -80; break; case 6: @@ -1348,7 +1348,7 @@ static bool8 LoadUsePokeblockMenuGfx(void) break; case 7: LZ77UnCompVram(gUsePokeblockGraph_Tilemap, sGraph_Tilemap); - LoadPalette(gUsePokeblockGraph_Pal, 32, 32); + LoadPalette(gUsePokeblockGraph_Pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); break; case 8: LoadBgTiles(1, sGraph_Gfx, 6656, 160 << 2); @@ -1363,8 +1363,8 @@ static bool8 LoadUsePokeblockMenuGfx(void) break; case 11: LoadBgTilemap(2, sMenu->tilemapBuffer, 1280, 0); - LoadPalette(gConditionGraphData_Pal, 48, 32); - LoadPalette(gConditionText_Pal, 240, 32); + LoadPalette(gConditionGraphData_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + LoadPalette(gConditionText_Pal, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); ConditionGraph_InitWindow(2); break; default: diff --git a/src/wallclock.c b/src/wallclock.c index 5e0fae3a13..52566eddc8 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -79,7 +79,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 17, .width = 24, .height = 2, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 512 }, { @@ -88,7 +88,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 16, .width = 6, .height = 2, - .paletteNum = 12, + .paletteNum = 0xC, .baseBlock = 560 }, DUMMY_WIN_TEMPLATE @@ -101,7 +101,7 @@ static const struct WindowTemplate sWindowTemplate_ConfirmYesNo = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 14, + .paletteNum = 0xE, .baseBlock = 572 }; @@ -644,17 +644,17 @@ static void LoadWallClockGraphics(void) LZ77UnCompVram(gWallClock_Gfx, (void *)VRAM); if (gSpecialVar_0x8004 == MALE) - LoadPalette(gWallClockMale_Pal, 0, 32); + LoadPalette(gWallClockMale_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); else - LoadPalette(gWallClockFemale_Pal, 0, 32); + LoadPalette(gWallClockFemale_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); - LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 32); - LoadPalette(sTextPrompt_Pal, 0xc0, 8); + LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); + LoadPalette(sTextPrompt_Pal, BG_PLTT_ID(0xC), PLTT_SIZEOF(4)); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates)); InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 0x250, 0xd0); + LoadUserWindowBorderGfx(0, 0x250, BG_PLTT_ID(0xD)); ClearScheduledBgCopiesToVram(); ScanlineEffect_Stop(); ResetTasks(); diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index 1fbd83fcda..bab3ec6345 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -76,7 +76,7 @@ static const struct WindowTemplate sWindowTemplates[] = { .tilemapTop = 0, .width = 24, .height = 3, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0001 }, { .bg = 0, @@ -84,7 +84,7 @@ static const struct WindowTemplate sWindowTemplates[] = { .tilemapTop = 4, .width = 21, .height = 15, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0049 }, { .bg = 0, @@ -92,7 +92,7 @@ static const struct WindowTemplate sWindowTemplates[] = { .tilemapTop = 4, .width = 3, .height = 15, - .paletteNum = 15, + .paletteNum = 0xF, .baseBlock = 0x0184 }, DUMMY_WIN_TEMPLATE }; @@ -193,10 +193,10 @@ static void CB2_InitWirelessCommunicationScreen(void) ChangeBgY(0, 0, BG_COORD_SET); ChangeBgX(1, 0, BG_COORD_SET); ChangeBgY(1, 0, BG_COORD_SET); - LoadPalette(sBgTiles_Pal, 0x00, 0x20); + LoadPalette(sBgTiles_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); Menu_LoadStdPalAt(0xF0); DynamicPlaceholderTextUtil_Reset(); - FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0x0F); + FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0xF); CopyBgTilemapBufferToVram(1); SetMainCallback2(CB2_RunWirelessCommunicationScreen); RunTasks(); @@ -227,7 +227,7 @@ static void WCSS_CyclePalette(s16 * counter, s16 * palIdx) *counter = 0; } - LoadPalette(sBgTiles_Pal + 16 * (*palIdx + 2), 0, 0x10); + LoadPalette(sBgTiles_Pal + 16 * (*palIdx + 2), BG_PLTT_ID(0x0), PLTT_SIZEOF(8)); } static void PrintHeaderTexts(void) From 5719a7f7bc9a543a9aa575ae4590487a8bfb965e Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Fri, 19 Aug 2022 15:47:50 +0100 Subject: [PATCH 04/13] Use static inline instead of extern inline for modern --- include/palette.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/palette.h b/include/palette.h index b94cf6aa84..ed6256947a 100644 --- a/include/palette.h +++ b/include/palette.h @@ -81,12 +81,12 @@ void TintPalette_GrayScale2(u16 *palette, u16 count); void TintPalette_SepiaTone(u16 *palette, u16 count); void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 bTone); -extern inline void SetBackdropFromColor(u16 color) +static inline void SetBackdropFromColor(u16 color) { FillPalette(color, 0x00, PLTT_SIZEOF(1)); } -extern inline void SetBackdropFromPalette(const u16 *palette) +static inline void SetBackdropFromPalette(const u16 *palette) { LoadPalette(palette, 0x00, PLTT_SIZEOF(1)); } From d57442a511d6bbaef426a14f112254a46f30d582 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Fri, 19 Aug 2022 16:32:00 +0100 Subject: [PATCH 05/13] Decimal paletteNums --- include/palette.h | 4 +- src/battle_anim.c | 6 +- src/battle_anim_dark.c | 4 +- src/battle_anim_utility_funcs.c | 4 +- src/battle_arena.c | 6 +- src/battle_bg.c | 172 ++++++++++----------- src/battle_dome.c | 48 +++--- src/battle_factory_screen.c | 52 +++---- src/battle_gfx_sfx_util.c | 4 +- src/battle_main.c | 2 +- src/battle_pyramid_bag.c | 26 ++-- src/battle_records.c | 8 +- src/battle_script_commands.c | 2 +- src/battle_transition.c | 72 ++++----- src/battle_transition_frontier.c | 2 +- src/berry_blender.c | 28 ++-- src/berry_crush.c | 28 ++-- src/berry_fix_program.c | 8 +- src/berry_powder.c | 16 +- src/berry_tag_screen.c | 12 +- src/cable_car.c | 2 +- src/cable_club.c | 2 +- src/clear_save_data_screen.c | 8 +- src/contest.c | 56 +++---- src/contest_painting.c | 6 +- src/contest_util.c | 30 ++-- src/credits.c | 8 +- src/data/party_menu.h | 86 +++++------ src/data/trade.h | 42 ++--- src/data/union_room.h | 24 +-- src/daycare.c | 2 +- src/decoration.c | 12 +- src/diploma.c | 6 +- src/dodrio_berry_picking.c | 34 ++-- src/easy_chat.c | 30 ++-- src/egg_hatch.c | 10 +- src/evolution_scene.c | 20 +-- src/field_effect.c | 6 +- src/field_region_map.c | 6 +- src/field_screen_effect.c | 2 +- src/field_specials.c | 12 +- src/field_weather.c | 8 +- src/fieldmap.c | 2 +- src/fldeff_flash.c | 16 +- src/frontier_pass.c | 22 +-- src/frontier_util.c | 6 +- src/hall_of_fame.c | 8 +- src/intro.c | 14 +- src/intro_credits_graphics.c | 42 ++--- src/item_menu.c | 44 +++--- src/link.c | 8 +- src/mail.c | 6 +- src/main_menu.c | 76 ++++----- src/map_name_popup.c | 20 +-- src/match_call.c | 6 +- src/menu.c | 18 +-- src/menu_specialized.c | 22 +-- src/mystery_event_menu.c | 8 +- src/mystery_gift_menu.c | 34 ++-- src/mystery_gift_view.c | 24 +-- src/naming_screen.c | 16 +- src/option_menu.c | 46 +++--- src/palette.c | 18 +-- src/party_menu.c | 14 +- src/player_pc.c | 18 +-- src/pokeblock.c | 32 ++-- src/pokeblock_feed.c | 8 +- src/pokedex.c | 34 ++-- src/pokemon_icon.c | 2 +- src/pokemon_jump.c | 36 ++--- src/pokemon_storage_system.c | 56 +++---- src/pokemon_summary_screen.c | 70 ++++----- src/pokenav_conditions_gfx.c | 14 +- src/pokenav_conditions_search_results.c | 6 +- src/pokenav_main_menu.c | 4 +- src/pokenav_match_call_gfx.c | 24 +-- src/pokenav_menu_handler_gfx.c | 12 +- src/pokenav_region_map.c | 10 +- src/pokenav_ribbons_list.c | 4 +- src/pokenav_ribbons_summary.c | 12 +- src/rayquaza_scene.c | 12 +- src/region_map.c | 12 +- src/reset_rtc_screen.c | 6 +- src/roulette.c | 4 +- src/save_failed_screen.c | 12 +- src/scrcmd.c | 2 +- src/secret_base.c | 4 +- src/shop.c | 24 +-- src/slot_machine.c | 36 ++--- src/start_menu.c | 10 +- src/starter_choose.c | 12 +- src/tileset_anims.c | 4 +- src/title_screen.c | 6 +- src/trade.c | 34 ++-- src/trader.c | 2 +- src/trainer_card.c | 62 ++++---- src/trainer_hill.c | 2 +- src/union_room.c | 10 +- src/union_room_battle.c | 6 +- src/union_room_chat.c | 30 ++-- src/use_pokeblock.c | 18 +-- src/wallclock.c | 16 +- src/wireless_communication_status_screen.c | 12 +- 103 files changed, 1032 insertions(+), 1032 deletions(-) diff --git a/include/palette.h b/include/palette.h index ed6256947a..40a200d8d1 100644 --- a/include/palette.h +++ b/include/palette.h @@ -83,12 +83,12 @@ void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 b static inline void SetBackdropFromColor(u16 color) { - FillPalette(color, 0x00, PLTT_SIZEOF(1)); + FillPalette(color, 0, PLTT_SIZEOF(1)); } static inline void SetBackdropFromPalette(const u16 *palette) { - LoadPalette(palette, 0x00, PLTT_SIZEOF(1)); + LoadPalette(palette, 0, PLTT_SIZEOF(1)); } #endif // GUARD_PALETTE_H diff --git a/src/battle_anim.c b/src/battle_anim.c index a5e487af26..cee119a4de 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -741,8 +741,8 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible) SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X); SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y); - LoadPalette(&gPlttBufferUnfaded[OBJ_PLTT_ID(battlerId)], BG_PLTT_ID(0x9), PLTT_SIZE_4BPP); - CpuCopy32(&gPlttBufferUnfaded[OBJ_PLTT_ID(battlerId)], (void *)(BG_PLTT + PLTT_OFFSET_4BPP(0x9)), PLTT_SIZE_4BPP); + LoadPalette(&gPlttBufferUnfaded[OBJ_PLTT_ID(battlerId)], BG_PLTT_ID(9), PLTT_SIZE_4BPP); + CpuCopy32(&gPlttBufferUnfaded[OBJ_PLTT_ID(battlerId)], (void *)(BG_PLTT + PLTT_OFFSET_4BPP(9)), PLTT_SIZE_4BPP); DrawBattlerOnBg(2, 0, 0, GetBattlerPosition(battlerId), animBg.paletteId, animBg.bgTiles + 0x1000, animBg.bgTilemap + 0x400, animBg.tilesOffset); } @@ -1214,7 +1214,7 @@ static void LoadMoveBg(u16 bgId) { LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)BG_SCREEN_ADDR(26)); LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)BG_CHAR_ADDR(2)); - LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, BG_PLTT_ID(2), PLTT_SIZE_4BPP); } } diff --git a/src/battle_anim_dark.c b/src/battle_anim_dark.c index 4106a7485e..cf3aaf5561 100644 --- a/src/battle_anim_dark.c +++ b/src/battle_anim_dark.c @@ -436,7 +436,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId) { task->data[10] = gBattle_BG2_Y; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG2); - FillPalette(RGB_BLACK, BG_PLTT_ID(0x9), PLTT_SIZE_4BPP); + FillPalette(RGB_BLACK, BG_PLTT_ID(9), PLTT_SIZE_4BPP); scanlineParams.dmaDest = ®_BG2VOFS; var0 = WINOUT_WIN01_BG2; if (!IsContest()) @@ -571,7 +571,7 @@ void AnimTask_MoveTargetMementoShadow(u8 taskId) else { task->data[10] = gBattle_BG2_Y; - FillPalette(RGB_BLACK, BG_PLTT_ID(0x9), PLTT_SIZE_4BPP); + FillPalette(RGB_BLACK, BG_PLTT_ID(9), PLTT_SIZE_4BPP); } SetAllBattlersSpritePriority(3); diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 197443aa85..54dcc7614d 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -166,7 +166,7 @@ void StartBlendAnimSpriteColor(u8 taskId, u32 selectedPalettes) static void AnimTask_BlendSpriteColor_Step2(u8 taskId) { u32 selectedPalettes; - u16 singlePaletteOffset = 0x00; + u16 singlePaletteOffset = 0; if (gTasks[taskId].data[9] == gTasks[taskId].data[2]) { @@ -176,7 +176,7 @@ static void AnimTask_BlendSpriteColor_Step2(u8 taskId) { if (selectedPalettes & 1) BlendPalette(singlePaletteOffset, 16, gTasks[taskId].data[10], gTasks[taskId].data[5]); - singlePaletteOffset += 0x10; + singlePaletteOffset += 16; selectedPalettes >>= 1; } diff --git a/src/battle_arena.c b/src/battle_arena.c index 8139325191..b19ba95e35 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -514,7 +514,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) BeginNormalPaletteFade(0x7FFFFF1C, 4, 0, 8, RGB_BLACK); SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); LoadCompressedSpriteSheet(sBattleArenaJudgementSymbolsSpriteSheet); - LoadCompressedPalette(gBattleArenaJudgementSymbolsPalette, OBJ_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleArenaJudgementSymbolsPalette, OBJ_PLTT_ID(15), PLTT_SIZE_4BPP); gBattle_WIN0H = 0xFF; gBattle_WIN0V = 0x70; (*state)++; @@ -894,7 +894,7 @@ static void BufferArenaOpponentName(void) void DrawArenaRefereeTextBox(void) { u8 width = 27; - u8 palNum = 0x7; + u8 palNum = 7; FillBgTilemapBufferRect(0, 0, 254, 14, 1, 6, palNum); FillBgTilemapBufferRect(0, 0, 32, 14, 1, 6, palNum); @@ -918,7 +918,7 @@ void EraseArenaRefereeTextBox(void) { u8 width; u8 height; - u8 palNum = 0x0; + u8 palNum = 0; FillBgTilemapBufferRect(0, 3, 0, 14, 1, 1, palNum); height = 4; diff --git a/src/battle_bg.c b/src/battle_bg.c index 163b77a517..3a03fabcca 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -167,7 +167,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 0x0090, }, [B_WIN_ACTION_PROMPT] = { @@ -176,7 +176,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 35, .width = 14, .height = 4, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 0x01c0, }, [B_WIN_ACTION_MENU] = { @@ -185,7 +185,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 35, .width = 12, .height = 4, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0190, }, [B_WIN_MOVE_NAME_1] = { @@ -194,7 +194,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 55, .width = 8, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0300, }, [B_WIN_MOVE_NAME_2] = { @@ -203,7 +203,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 55, .width = 8, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0310, }, [B_WIN_MOVE_NAME_3] = { @@ -212,7 +212,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 57, .width = 8, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0320, }, [B_WIN_MOVE_NAME_4] = { @@ -221,7 +221,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 57, .width = 8, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0330, }, [B_WIN_PP] = { @@ -230,7 +230,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 55, .width = 4, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0290, }, [B_WIN_DUMMY] = { @@ -239,7 +239,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 57, .width = 0, .height = 0, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0298, }, [B_WIN_PP_REMAINING] = { @@ -248,7 +248,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 55, .width = 4, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0298, }, [B_WIN_MOVE_TYPE] = { @@ -257,7 +257,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 57, .width = 8, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x02a0, }, [B_WIN_SWITCH_PROMPT] = { @@ -266,7 +266,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 55, .width = 8, .height = 4, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x02b0, }, [B_WIN_YESNO] = { @@ -275,7 +275,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 9, .width = 3, .height = 4, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0100, }, [B_WIN_LEVEL_UP_BOX] = { @@ -284,7 +284,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 8, .width = 10, .height = 11, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0100, }, [B_WIN_LEVEL_UP_BANNER] = { @@ -293,7 +293,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 0, .width = 12, .height = 3, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 0x016e, }, [B_WIN_VS_PLAYER] = { @@ -302,7 +302,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 3, .width = 6, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0020, }, [B_WIN_VS_OPPONENT] = { @@ -311,7 +311,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 3, .width = 6, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0040, }, [B_WIN_VS_MULTI_PLAYER_1] = { @@ -320,7 +320,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 2, .width = 6, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0020, }, [B_WIN_VS_MULTI_PLAYER_2] = { @@ -329,7 +329,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 2, .width = 6, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0040, }, [B_WIN_VS_MULTI_PLAYER_3] = { @@ -338,7 +338,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 6, .width = 6, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0060, }, [B_WIN_VS_MULTI_PLAYER_4] = { @@ -347,7 +347,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 6, .width = 6, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0080, }, [B_WIN_VS_OUTCOME_DRAW] = { @@ -356,7 +356,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 2, .width = 6, .height = 2, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 0x00a0, }, [B_WIN_VS_OUTCOME_LEFT] = { @@ -365,7 +365,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 2, .width = 7, .height = 2, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 0x00a0, }, [B_WIN_VS_OUTCOME_RIGHT] = { @@ -374,7 +374,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] = .tilemapTop = 2, .width = 7, .height = 2, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 0x00b0, }, DUMMY_WIN_TEMPLATE @@ -388,7 +388,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 0x0090, }, [B_WIN_ACTION_PROMPT] = { @@ -397,7 +397,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 35, .width = 14, .height = 4, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 0x01c0, }, [B_WIN_ACTION_MENU] = { @@ -406,7 +406,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 35, .width = 12, .height = 4, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0190, }, [B_WIN_MOVE_NAME_1] = { @@ -415,7 +415,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 55, .width = 8, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0300, }, [B_WIN_MOVE_NAME_2] = { @@ -424,7 +424,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 55, .width = 8, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0310, }, [B_WIN_MOVE_NAME_3] = { @@ -433,7 +433,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 57, .width = 8, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0320, }, [B_WIN_MOVE_NAME_4] = { @@ -442,7 +442,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 57, .width = 8, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0330, }, [B_WIN_PP] = { @@ -451,7 +451,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 55, .width = 4, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0290, }, [B_WIN_DUMMY] = { @@ -460,7 +460,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 57, .width = 0, .height = 0, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0298, }, [B_WIN_PP_REMAINING] = { @@ -469,7 +469,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 55, .width = 4, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0298, }, [B_WIN_MOVE_TYPE] = { @@ -478,7 +478,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 57, .width = 8, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x02a0, }, [B_WIN_SWITCH_PROMPT] = { @@ -487,7 +487,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 55, .width = 8, .height = 4, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x02b0, }, [B_WIN_YESNO] = { @@ -496,7 +496,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 9, .width = 3, .height = 4, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0100, }, [B_WIN_LEVEL_UP_BOX] = { @@ -505,7 +505,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 8, .width = 10, .height = 11, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0100, }, [B_WIN_LEVEL_UP_BANNER] = { @@ -514,7 +514,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 0, .width = 12, .height = 3, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 0x016e, }, [ARENA_WIN_PLAYER_NAME] = { @@ -523,7 +523,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 1, .width = 8, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0100, }, [ARENA_WIN_VS] = { @@ -532,7 +532,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 1, .width = 2, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0110, }, [ARENA_WIN_OPPONENT_NAME] = { @@ -541,7 +541,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 1, .width = 8, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0114, }, [ARENA_WIN_MIND] = { @@ -550,7 +550,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 4, .width = 6, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0124, }, [ARENA_WIN_SKILL] = { @@ -559,7 +559,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 6, .width = 6, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0130, }, [ARENA_WIN_BODY] = { @@ -568,7 +568,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 8, .width = 6, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x013c, }, [ARENA_WIN_JUDGEMENT_TITLE] = { @@ -577,7 +577,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 11, .width = 14, .height = 2, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0x0148, }, [ARENA_WIN_JUDGEMENT_TEXT] = { @@ -586,7 +586,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 0x7, + .paletteNum = 7, .baseBlock = 0x0090, }, DUMMY_WIN_TEMPLATE @@ -742,17 +742,17 @@ void InitBattleBgsVideo(void) void LoadBattleMenuWindowGfx(void) { - LoadUserWindowBorderGfx(2, 0x12, BG_PLTT_ID(0x1)); - LoadUserWindowBorderGfx(2, 0x22, BG_PLTT_ID(0x1)); - LoadCompressedPalette(gBattleWindowTextPalette, BG_PLTT_ID(0x5), PLTT_SIZE_4BPP); + LoadUserWindowBorderGfx(2, 0x12, BG_PLTT_ID(1)); + LoadUserWindowBorderGfx(2, 0x22, BG_PLTT_ID(1)); + LoadCompressedPalette(gBattleWindowTextPalette, BG_PLTT_ID(5), PLTT_SIZE_4BPP); if (gBattleTypeFlags & BATTLE_TYPE_ARENA) { // Load graphics for the Battle Arena referee's mid-battle messages. - Menu_LoadStdPalAt(BG_PLTT_ID(0x7)); - LoadMessageBoxGfx(0, 0x30, BG_PLTT_ID(0x7)); - gPlttBufferUnfaded[BG_PLTT_ID(0x7) + 6] = 0; - CpuCopy16(&gPlttBufferUnfaded[BG_PLTT_ID(0x7) + 6], &gPlttBufferFaded[BG_PLTT_ID(0x7) + 6], PLTT_SIZEOF(1)); + Menu_LoadStdPalAt(BG_PLTT_ID(7)); + LoadMessageBoxGfx(0, 0x30, BG_PLTT_ID(7)); + gPlttBufferUnfaded[BG_PLTT_ID(7) + 6] = 0; + CpuCopy16(&gPlttBufferUnfaded[BG_PLTT_ID(7) + 6], &gPlttBufferFaded[BG_PLTT_ID(7) + 6], PLTT_SIZEOF(1)); } } @@ -762,25 +762,25 @@ void DrawMainBattleBackground(void) { LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); } else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON) { LZDecompressVram(gBattleTerrainTiles_Cave, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Cave, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_Groudon, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_Groudon, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); } else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE) { LZDecompressVram(gBattleTerrainTiles_Water, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Water, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_Kyogre, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_Kyogre, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); } else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA) { LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); } else { @@ -791,14 +791,14 @@ void DrawMainBattleBackground(void) { LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); return; } else if (trainerClass == TRAINER_CLASS_CHAMPION) { LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); return; } } @@ -809,47 +809,47 @@ void DrawMainBattleBackground(void) case MAP_BATTLE_SCENE_NORMAL: LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tileset, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tilemap, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_GYM: LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_MAGMA: LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_AQUA: LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_SIDNEY: LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_PHOEBE: LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_GLACIA: LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_DRAKE: LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_FRONTIER: LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; } } @@ -860,7 +860,7 @@ void LoadBattleTextboxAndBackground(void) LZDecompressVram(gBattleTextboxTiles, (void *)(BG_CHAR_ADDR(0))); CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); CopyBgTilemapBufferToVram(0); - LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); LoadBattleMenuWindowGfx(); DrawMainBattleBackground(); } @@ -1126,7 +1126,7 @@ void DrawBattleEntryBackground(void) { LZDecompressVram(gBattleVSFrame_Gfx, (void *)(BG_CHAR_ADDR(1))); LZDecompressVram(gVsLettersGfx, (void *)OBJ_VRAM0); - LoadCompressedPalette(gBattleVSFrame_Pal, BG_PLTT_ID(0x6), PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleVSFrame_Pal, BG_PLTT_ID(6), PLTT_SIZE_4BPP); SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1); SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04); CopyToBgTilemapBuffer(1, gBattleVSFrame_Tilemap, 0, 0); @@ -1219,7 +1219,7 @@ bool8 LoadChosenBattleElement(u8 caseId) CopyBgTilemapBufferToVram(0); break; case 2: - LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); break; case 3: if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER)) @@ -1345,14 +1345,14 @@ bool8 LoadChosenBattleElement(u8 caseId) case 5: if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER)) { - LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); } else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) { if (gGameVersion == VERSION_RUBY) - LoadCompressedPalette(gBattleTerrainPalette_Groudon, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_Groudon, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); else - LoadCompressedPalette(gBattleTerrainPalette_Kyogre, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_Kyogre, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); } else { @@ -1361,12 +1361,12 @@ bool8 LoadChosenBattleElement(u8 caseId) u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; if (trainerClass == TRAINER_CLASS_LEADER) { - LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; } else if (trainerClass == TRAINER_CLASS_CHAMPION) { - LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; } } @@ -1375,31 +1375,31 @@ bool8 LoadChosenBattleElement(u8 caseId) { default: case MAP_BATTLE_SCENE_NORMAL: - LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_GYM: - LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_MAGMA: - LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_AQUA: - LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_SIDNEY: - LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_PHOEBE: - LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_GLACIA: - LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_DRAKE: - LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_FRONTIER: - LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; } } diff --git a/src/battle_dome.c b/src/battle_dome.c index 4293e5e19b..9f781adb20 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -676,7 +676,7 @@ static const struct WindowTemplate sTourneyTreeWindowTemplates[] = .tilemapTop = 3, .width = 8, .height = 16, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 16, }, { @@ -685,7 +685,7 @@ static const struct WindowTemplate sTourneyTreeWindowTemplates[] = .tilemapTop = 3, .width = 8, .height = 16, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 144, }, { @@ -694,7 +694,7 @@ static const struct WindowTemplate sTourneyTreeWindowTemplates[] = .tilemapTop = 1, .width = 14, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 272, }, DUMMY_WIN_TEMPLATE, @@ -708,7 +708,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 2, .width = 26, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1, }, { @@ -717,7 +717,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 53, }, { @@ -726,7 +726,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 7, .width = 9, .height = 3, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 69, }, { @@ -735,7 +735,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 10, .width = 8, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 96, }, { @@ -744,7 +744,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 12, .width = 26, .height = 7, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 112, }, { @@ -753,7 +753,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 2, .width = 23, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 294, }, { @@ -762,7 +762,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 340, }, { @@ -771,7 +771,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 356, }, { @@ -780,7 +780,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 16, .width = 26, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 372, }, { @@ -789,7 +789,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 2, .width = 26, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1, }, { @@ -798,7 +798,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 53, }, { @@ -807,7 +807,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 7, .width = 9, .height = 3, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 69, }, { @@ -816,7 +816,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 10, .width = 8, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 96, }, { @@ -825,7 +825,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 12, .width = 26, .height = 7, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 112, }, { @@ -834,7 +834,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 2, .width = 23, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 294, }, { @@ -843,7 +843,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 340, }, { @@ -852,7 +852,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 356, }, { @@ -861,7 +861,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] = .tilemapTop = 16, .width = 26, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 372, }, #ifdef UBFIX @@ -3050,9 +3050,9 @@ static void Task_ShowTourneyInfoCard(u8 taskId) LoadCompressedSpriteSheet(sTourneyTreeButtonsSpriteSheet); LoadCompressedPalette(gDomeTourneyTree_Pal, BG_PLTT_OFFSET, BG_PLTT_SIZE); LoadCompressedPalette(gDomeTourneyTreeButtons_Pal, OBJ_PLTT_OFFSET, OBJ_PLTT_SIZE); - LoadCompressedPalette(gBattleWindowTextPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleWindowTextPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); if (mode == INFOCARD_MATCH) - LoadCompressedPalette(gDomeTourneyMatchCardBg_Pal, BG_PLTT_ID(0x5), PLTT_SIZE_4BPP); // Changes the moving info card bg to orange when in match card mode + LoadCompressedPalette(gDomeTourneyMatchCardBg_Pal, BG_PLTT_ID(5), PLTT_SIZE_4BPP); // Changes the moving info card bg to orange when in match card mode CpuFill32(0, gPlttBufferFaded, PLTT_SIZE); ShowBg(0); ShowBg(1); @@ -5329,7 +5329,7 @@ static void Task_ShowTourneyTree(u8 taskId) DecompressAndLoadBgGfxUsingHeap(3, gDomeTourneyLineUp_Tilemap, 0x2000, 0, 1); LoadCompressedPalette(gDomeTourneyTree_Pal, BG_PLTT_OFFSET, BG_PLTT_SIZE); LoadCompressedPalette(gDomeTourneyTreeButtons_Pal, OBJ_PLTT_OFFSET, OBJ_PLTT_SIZE); - LoadCompressedPalette(gBattleWindowTextPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleWindowTextPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); CpuFill32(0, gPlttBufferFaded, PLTT_SIZE); ShowBg(0); ShowBg(1); diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index c6843e7533..16f702c72c 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -350,7 +350,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .tilemapTop = 2, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0001, }, [SELECT_WIN_SPECIES] = { @@ -359,7 +359,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .tilemapTop = 2, .width = 11, .height = 2, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x0019, }, [SELECT_WIN_INFO] = { @@ -368,7 +368,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .tilemapTop = 15, .width = 20, .height = 3, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x002f, }, [SELECT_WIN_OPTIONS] = { @@ -377,7 +377,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .tilemapTop = 14, .width = 8, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x006b, }, [SELECT_WIN_YES_NO] = { @@ -386,7 +386,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .tilemapTop = 14, .width = 8, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x009b, }, [SELECT_WIN_MON_CATEGORY] = { @@ -395,7 +395,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .tilemapTop = 0, .width = 15, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x00bb, }, DUMMY_WIN_TEMPLATE, @@ -945,7 +945,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 2, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0001, }, [SWAP_WIN_SPECIES] = { @@ -954,7 +954,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 2, .width = 11, .height = 2, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x0019, }, [SWAP_WIN_INFO] = { @@ -963,7 +963,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 15, .width = 20, .height = 3, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x002f, }, [SWAP_WIN_OPTIONS] = { @@ -972,7 +972,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 14, .width = 9, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x006b, }, [SWAP_WIN_YES_NO] = { @@ -981,7 +981,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 14, .width = 8, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x00a1, }, [SWAP_WIN_ACTION_FADE] = { @@ -990,7 +990,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 15, .width = 9, .height = 5, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x006b, }, [SWAP_WIN_UNUSED] = { @@ -999,7 +999,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 2, .width = 4, .height = 2, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x00c1, }, [SWAP_WIN_SPECIES_AT_FADE] = { @@ -1008,7 +1008,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 2, .width = 11, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x00c9, }, [SWAP_WIN_MON_CATEGORY] = { @@ -1017,7 +1017,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .tilemapTop = 0, .width = 15, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x00df, }, DUMMY_WIN_TEMPLATE, @@ -1176,15 +1176,15 @@ static void CB2_InitSelectScreen(void) CpuCopy16(gFrontierFactorySelectMenu_Tilemap, sSelectMenuTilemapBuffer, BG_SCREEN_SIZE); LoadBgTilemap(1, sSelectMenuTilemapBuffer, BG_SCREEN_SIZE, 0); LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 2 * PLTT_SIZE_4BPP); - LoadPalette(sSelectText_Pal, BG_PLTT_ID(0xF), PLTT_SIZEOF(4)); - LoadPalette(sSelectText_Pal, BG_PLTT_ID(0xE), PLTT_SIZEOF(5)); + LoadPalette(sSelectText_Pal, BG_PLTT_ID(15), PLTT_SIZEOF(4)); + LoadPalette(sSelectText_Pal, BG_PLTT_ID(14), PLTT_SIZEOF(5)); #ifdef UBFIX if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) #else if (sFactorySelectScreen->fromSummaryScreen == TRUE) #endif gPlttBufferUnfaded[228] = sFactorySelectScreen->speciesNameColorBackup; - LoadPalette(sMonPicBg_Pal, BG_PLTT_ID(0x2), PLTT_SIZEOF(2)); + LoadPalette(sMonPicBg_Pal, BG_PLTT_ID(2), PLTT_SIZEOF(2)); gMain.state++; break; case 3: @@ -2748,7 +2748,7 @@ static void Swap_Task_FadeOutSpeciesName(u8 taskId) gTasks[taskId].tState++; break; case 1: - LoadPalette(&gPlttBufferUnfaded[BG_PLTT_ID(0xF)], BG_PLTT_ID(0xE), PLTT_SIZEOF(5)); + LoadPalette(&gPlttBufferUnfaded[BG_PLTT_ID(15)], BG_PLTT_ID(14), PLTT_SIZEOF(5)); gTasks[taskId].tState++; break; case 2: @@ -2994,7 +2994,7 @@ static void Swap_Task_ScreenInfoTransitionOut(u8 taskId) switch (gTasks[taskId].tState) { case 0: - LoadPalette(sSwapText_Pal, BG_PLTT_ID(0xE), sizeof(sSwapText_Pal)); + LoadPalette(sSwapText_Pal, BG_PLTT_ID(14), sizeof(sSwapText_Pal)); Swap_PrintActionStrings(); PutWindowTilemap(SWAP_WIN_ACTION_FADE); gTasks[taskId].tState++; @@ -3310,9 +3310,9 @@ static void CB2_InitSwapScreen(void) CpuCopy16(gFrontierFactorySelectMenu_Tilemap, sSwapMenuTilemapBuffer, BG_SCREEN_SIZE); LoadBgTilemap(1, sSwapMenuTilemapBuffer, BG_SCREEN_SIZE, 0); LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 2 * PLTT_SIZE_4BPP); - LoadPalette(sSwapText_Pal, BG_PLTT_ID(0xF), sizeof(sSwapText_Pal)); - LoadPalette(sSwapText_Pal, BG_PLTT_ID(0xE), sizeof(sSwapText_Pal)); - LoadPalette(sMonPicBg_Pal, BG_PLTT_ID(0x2), PLTT_SIZEOF(2)); + LoadPalette(sSwapText_Pal, BG_PLTT_ID(15), sizeof(sSwapText_Pal)); + LoadPalette(sSwapText_Pal, BG_PLTT_ID(14), sizeof(sSwapText_Pal)); + LoadPalette(sMonPicBg_Pal, BG_PLTT_ID(2), PLTT_SIZEOF(2)); gMain.state++; break; case 3: @@ -3867,7 +3867,7 @@ static void Swap_PrintMonSpeciesAtFade(void) pal[4] = gPlttBufferFaded[228]; else pal[4] = sFactorySwapScreen->speciesNameColorBackup; - LoadPalette(pal, BG_PLTT_ID(0xF), sizeof(sSwapText_Pal)); + LoadPalette(pal, BG_PLTT_ID(15), sizeof(sSwapText_Pal)); PutWindowTilemap(SWAP_WIN_SPECIES_AT_FADE); FillWindowPixelBuffer(SWAP_WIN_SPECIES_AT_FADE, PIXEL_FILL(0)); @@ -3895,8 +3895,8 @@ static void Swap_PrintMonSpeciesForTransition(void) u16 species; u8 x; - LoadPalette(sSwapText_Pal, BG_PLTT_ID(0xE), sizeof(sSwapText_Pal)); - CpuCopy16(&gPlttBufferUnfaded[BG_PLTT_ID(0xF)], &gPlttBufferFaded[BG_PLTT_ID(0xE)], PLTT_SIZEOF(5)); + LoadPalette(sSwapText_Pal, BG_PLTT_ID(14), sizeof(sSwapText_Pal)); + CpuCopy16(&gPlttBufferUnfaded[BG_PLTT_ID(15)], &gPlttBufferFaded[BG_PLTT_ID(14)], PLTT_SIZEOF(5)); if (sFactorySwapScreen->cursorPos >= FRONTIER_PARTY_SIZE) { diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 42f3805aa0..fba0966c57 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -585,7 +585,7 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battlerId) LZDecompressWram(lzPaletteData, gDecompressionBuffer); LoadPalette(gDecompressionBuffer, paletteOffset, PLTT_SIZE_4BPP); - LoadPalette(gDecompressionBuffer, 0x80 + BG_PLTT_ID(battlerId), PLTT_SIZE_4BPP); + LoadPalette(gDecompressionBuffer, BG_PLTT_ID(8) + BG_PLTT_ID(battlerId), PLTT_SIZE_4BPP); if (species == SPECIES_CASTFORM) { @@ -648,7 +648,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId) LZDecompressWram(lzPaletteData, gDecompressionBuffer); LoadPalette(gDecompressionBuffer, paletteOffset, PLTT_SIZE_4BPP); - LoadPalette(gDecompressionBuffer, 0x80 + BG_PLTT_ID(battlerId), PLTT_SIZE_4BPP); + LoadPalette(gDecompressionBuffer, BG_PLTT_ID(8) + BG_PLTT_ID(battlerId), PLTT_SIZE_4BPP); if (species == SPECIES_CASTFORM) { diff --git a/src/battle_main.c b/src/battle_main.c index 879d9113d3..483c083f06 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2215,7 +2215,7 @@ void CB2_InitEndLinkBattle(void) gBattle_BG3_Y = 0; InitBattleBgsVideo(); - LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); LoadBattleMenuWindowGfx(); ResetSpriteData(); ResetTasks(); diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 93c7df06ac..2ff5828b74 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -214,7 +214,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 2, .width = 15, .height = 16, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 30 }, [WIN_INFO] = { @@ -223,7 +223,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 13, .width = 14, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 270 }, [WIN_MSG] = { @@ -232,7 +232,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 354 }, [WIN_TOSS_NUM] = { @@ -241,7 +241,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 17, .width = 5, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 462 }, DUMMY_WIN_TEMPLATE, @@ -263,7 +263,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] = .tilemapTop = 17, .width = 7, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 472 }, [MENU_WIN_1x2] = { @@ -272,7 +272,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] = .tilemapTop = 15, .width = 7, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 472 }, [MENU_WIN_2x2] = { @@ -281,7 +281,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] = .tilemapTop = 15, .width = 14, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 472 }, [MENU_WIN_2x3] = { // Unused @@ -290,7 +290,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] = .tilemapTop = 13, .width = 14, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 472 }, [MENU_WIN_YESNO] = { @@ -299,7 +299,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] = .tilemapTop = 15, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 472 }, }; @@ -578,7 +578,7 @@ static bool8 LoadPyramidBagGfx(void) } break; case 2: - LoadCompressedPalette(gBattlePyramidBagInterface_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattlePyramidBagInterface_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); gPyramidBagMenu->state++; break; case 3: @@ -1439,9 +1439,9 @@ static void InitPyramidBagWindows(void) InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 0x1, BG_PLTT_ID(0xE)); - LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(0xD)); - LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadUserWindowBorderGfx(0, 0x1, BG_PLTT_ID(14)); + LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(13)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); for (i = 0; i < ARRAY_COUNT(sWindowTemplates); i++) FillWindowPixelBuffer(i, PIXEL_FILL(0)); diff --git a/src/battle_records.c b/src/battle_records.c index c6becd6d7d..4463a9ebfc 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -67,7 +67,7 @@ static const struct WindowTemplate sTrainerHillRecordsWindowTemplates[] = .tilemapTop = 1, .width = 26, .height = 18, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 20 }, DUMMY_WIN_TEMPLATE @@ -80,7 +80,7 @@ static const struct WindowTemplate sLinkBattleRecordsWindow = .tilemapTop = 1, .width = 26, .height = 17, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }; @@ -444,7 +444,7 @@ static void LoadTrainerHillRecordsWindowGfx(u8 bgId) { LoadBgTiles(bgId, sTrainerHillWindowTileset, sizeof(sTrainerHillWindowTileset), 0); CopyToBgTilemapBufferRect(bgId, sTrainerHillWindowTilemap, 0, 0, 0x20, 0x20); - LoadPalette(sTrainerHillWindowPalette, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(sTrainerHillWindowPalette, BG_PLTT_ID(0), PLTT_SIZE_4BPP); } static void VblankCB_TrainerHillRecords(void) @@ -491,7 +491,7 @@ static void CB2_ShowTrainerHillRecords(void) break; case 3: LoadTrainerHillRecordsWindowGfx(3); - LoadPalette(GetTextWindowPalette(0), BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(GetTextWindowPalette(0), BG_PLTT_ID(15), PLTT_SIZE_4BPP); gMain.state++; break; case 4: diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index e3bba69624..90d91fcc98 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6013,7 +6013,7 @@ static void InitLevelUpBanner(void) gBattle_BG2_Y = 0; gBattle_BG2_X = LEVEL_UP_BANNER_START; - LoadPalette(sLevelUpBanner_Pal, BG_PLTT_ID(0x6), PLTT_SIZE_4BPP); + LoadPalette(sLevelUpBanner_Pal, BG_PLTT_ID(6), PLTT_SIZE_4BPP); CopyToWindowPixelBuffer(B_WIN_LEVEL_UP_BANNER, sLevelUpBanner_Gfx, 0, 0); PutWindowTilemap(B_WIN_LEVEL_UP_BANNER); CopyWindowToVram(B_WIN_LEVEL_UP_BANNER, COPYWIN_FULL); diff --git a/src/battle_transition.c b/src/battle_transition.c index 31363f4a9c..65bc8a16ec 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1406,7 +1406,7 @@ static bool8 Aqua_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuFill16(0, tilemap, BG_SCREEN_SIZE); LZ77UnCompVram(sTeamAqua_Tileset, tileset); - LoadPalette(sEvilTeam_Palette, BG_PLTT_ID(0xF), sizeof(sEvilTeam_Palette)); + LoadPalette(sEvilTeam_Palette, BG_PLTT_ID(15), sizeof(sEvilTeam_Palette)); task->tState++; return FALSE; @@ -1421,7 +1421,7 @@ static bool8 Magma_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuFill16(0, tilemap, BG_SCREEN_SIZE); LZ77UnCompVram(sTeamMagma_Tileset, tileset); - LoadPalette(sEvilTeam_Palette, BG_PLTT_ID(0xF), sizeof(sEvilTeam_Palette)); + LoadPalette(sEvilTeam_Palette, BG_PLTT_ID(15), sizeof(sEvilTeam_Palette)); task->tState++; return FALSE; @@ -1449,7 +1449,7 @@ static bool8 BigPokeball_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuFill16(0, tilemap, BG_SCREEN_SIZE); CpuCopy16(sBigPokeball_Tileset, tileset, sizeof(sBigPokeball_Tileset)); - LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(0xF), sizeof(sFieldEffectPal_Pokeball)); + LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(15), sizeof(sFieldEffectPal_Pokeball)); task->tState++; return FALSE; @@ -1504,7 +1504,7 @@ static bool8 Regice_SetGfx(struct Task *task) u16 *tilemap, *tileset; GetBg0TilesDst(&tilemap, &tileset); - LoadPalette(sRegice_Palette, BG_PLTT_ID(0xF), sizeof(sRegice_Palette)); + LoadPalette(sRegice_Palette, BG_PLTT_ID(15), sizeof(sRegice_Palette)); CpuCopy16(sRegice_Tilemap, tilemap, 0x500); SetSinWave(gScanlineEffectRegBuffers[0], 0, task->tSinIndex, 132, task->tAmplitude, DISPLAY_HEIGHT); @@ -1517,7 +1517,7 @@ static bool8 Registeel_SetGfx(struct Task *task) u16 *tilemap, *tileset; GetBg0TilesDst(&tilemap, &tileset); - LoadPalette(sRegisteel_Palette, BG_PLTT_ID(0xF), sizeof(sRegisteel_Palette)); + LoadPalette(sRegisteel_Palette, BG_PLTT_ID(15), sizeof(sRegisteel_Palette)); CpuCopy16(sRegisteel_Tilemap, tilemap, 0x500); SetSinWave(gScanlineEffectRegBuffers[0], 0, task->tSinIndex, 132, task->tAmplitude, DISPLAY_HEIGHT); @@ -1530,7 +1530,7 @@ static bool8 Regirock_SetGfx(struct Task *task) u16 *tilemap, *tileset; GetBg0TilesDst(&tilemap, &tileset); - LoadPalette(sRegirock_Palette, BG_PLTT_ID(0xF), sizeof(sRegirock_Palette)); + LoadPalette(sRegirock_Palette, BG_PLTT_ID(15), sizeof(sRegirock_Palette)); CpuCopy16(sRegirock_Tilemap, tilemap, 0x500); SetSinWave(gScanlineEffectRegBuffers[0], 0, task->tSinIndex, 132, task->tAmplitude, DISPLAY_HEIGHT); @@ -1559,7 +1559,7 @@ static bool8 Kyogre_PaletteFlash(struct Task *task) { u16 offset = task->tTimer % 30; offset /= 3; - LoadPalette(&sKyogre1_Palette[offset * 16], BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(&sKyogre1_Palette[offset * 16], BG_PLTT_ID(15), PLTT_SIZE_4BPP); } if (++task->tTimer > 58) { @@ -1575,7 +1575,7 @@ static bool8 Kyogre_PaletteBrighten(struct Task *task) if (task->tTimer % 5 == 0) { s16 offset = task->tTimer / 5; - LoadPalette(&sKyogre2_Palette[offset * 16], BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(&sKyogre2_Palette[offset * 16], BG_PLTT_ID(15), PLTT_SIZE_4BPP); } if (++task->tTimer > 68) { @@ -1776,7 +1776,7 @@ static bool8 PokeballsTrail_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuSet(sPokeballTrail_Tileset, tileset, 0x20); CpuFill32(0, tilemap, BG_SCREEN_SIZE); - LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(0xF), sizeof(sFieldEffectPal_Pokeball)); + LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(15), sizeof(sFieldEffectPal_Pokeball)); task->tState++; return FALSE; @@ -2328,8 +2328,8 @@ static bool8 Mugshot_SetGfx(struct Task *task) mugshotsMap = sMugshotsTilemap; GetBg0TilesDst(&tilemap, &tileset); CpuSet(sEliteFour_Tileset, tileset, 0xF0); - LoadPalette(sOpponentMugshotsPals[task->tMugshotId], BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); - LoadPalette(sPlayerMugshotsPals[gSaveBlock2Ptr->playerGender], BG_PLTT_ID(0xF) + 10, PLTT_SIZEOF(6)); + LoadPalette(sOpponentMugshotsPals[task->tMugshotId], BG_PLTT_ID(15), PLTT_SIZE_4BPP); + LoadPalette(sPlayerMugshotsPals[gSaveBlock2Ptr->playerGender], BG_PLTT_ID(15) + 10, PLTT_SIZEOF(6)); for (i = 0; i < 20; i++) { @@ -3193,7 +3193,7 @@ static bool8 RectangularSpiral_Init(struct Task *task) CpuCopy16(sShrinkingBoxTileset, tileset, 0x20); CpuCopy16(&sShrinkingBoxTileset[0x70], &tileset[0x20], 0x20); CpuFill16(0xF0 << 8, tilemap, BG_SCREEN_SIZE); - LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(0xF), sizeof(sFieldEffectPal_Pokeball)); + LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(15), sizeof(sFieldEffectPal_Pokeball)); task->data[3] = 1; task->tState++; @@ -3389,7 +3389,7 @@ static bool8 Groudon_PaletteFlash(struct Task *task) if (task->tTimer % 3 == 0) { u16 offset = (task->tTimer % 30) / 3; - LoadPalette(&sGroudon1_Palette[offset * 16], BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(&sGroudon1_Palette[offset * 16], BG_PLTT_ID(15), PLTT_SIZE_4BPP); } if (++task->tTimer > 58) { @@ -3405,7 +3405,7 @@ static bool8 Groudon_PaletteBrighten(struct Task *task) if (task->tTimer % 5 == 0) { s16 offset = task->tTimer / 5; - LoadPalette(&sGroudon2_Palette[offset * 16], BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(&sGroudon2_Palette[offset * 16], BG_PLTT_ID(15), PLTT_SIZE_4BPP); } if (++task->tTimer > 68) { @@ -3448,7 +3448,7 @@ static bool8 Rayquaza_Init(struct Task *task) sTransitionData->counter = 0; task->tState++; - LoadPalette(&sRayquaza_Palette[0x50], BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(&sRayquaza_Palette[80], BG_PLTT_ID(15), PLTT_SIZE_4BPP); for (i = 0; i < DISPLAY_HEIGHT; i++) { @@ -3476,7 +3476,7 @@ static bool8 Rayquaza_PaletteFlash(struct Task *task) { u16 value = task->tTimer / 4; const u16 *palPtr = &sRayquaza_Palette[(value + 5) * 16]; - LoadPalette(palPtr, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(palPtr, BG_PLTT_ID(15), PLTT_SIZE_4BPP); } if (++task->tTimer > 40) { @@ -3524,7 +3524,7 @@ static bool8 Rayquaza_TriRing(struct Task *task) { u16 value = task->tTimer / 3; const u16 *palPtr = &sRayquaza_Palette[(value + 0) * 16]; - LoadPalette(palPtr, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(palPtr, BG_PLTT_ID(15), PLTT_SIZE_4BPP); } if (++task->tTimer >= 40) { @@ -3775,7 +3775,7 @@ static bool8 GridSquares_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuSet(sShrinkingBoxTileset, tileset, 16); CpuFill16(0xF0 << 8, tilemap, BG_SCREEN_SIZE); - LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(0xF), sizeof(sFieldEffectPal_Pokeball)); + LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(15), sizeof(sFieldEffectPal_Pokeball)); task->tState++; return FALSE; @@ -4242,7 +4242,7 @@ static bool8 FrontierLogoWiggle_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuFill16(0, tilemap, BG_SCREEN_SIZE); LZ77UnCompVram(sFrontierLogo_Tileset, tileset); - LoadPalette(sFrontierLogo_Palette, BG_PLTT_ID(0xF), sizeof(sFrontierLogo_Palette)); + LoadPalette(sFrontierLogo_Palette, BG_PLTT_ID(15), sizeof(sFrontierLogo_Palette)); task->tState++; return FALSE; @@ -4304,7 +4304,7 @@ static bool8 FrontierLogoWave_Init(struct Task *task) GetBg0TilesDst(&tilemap, &tileset); CpuFill16(0, tilemap, BG_SCREEN_SIZE); LZ77UnCompVram(sFrontierLogo_Tileset, tileset); - LoadPalette(sFrontierLogo_Palette, BG_PLTT_ID(0xF), sizeof(sFrontierLogo_Palette)); + LoadPalette(sFrontierLogo_Palette, BG_PLTT_ID(15), sizeof(sFrontierLogo_Palette)); sTransitionData->cameraY = 0; task->tState++; @@ -4451,10 +4451,10 @@ static bool8 FrontierSquares_Init(struct Task *task) LZ77UnCompVram(sFrontierSquares_FilledBg_Tileset, tileset); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32); - FillBgTilemapBufferRect(0, 1, 0, 0, MARGIN_SIZE, 32, 0xF); - FillBgTilemapBufferRect(0, 1, 30 - MARGIN_SIZE, 0, MARGIN_SIZE, 32, 0xF); + FillBgTilemapBufferRect(0, 1, 0, 0, MARGIN_SIZE, 32, 15); + FillBgTilemapBufferRect(0, 1, 30 - MARGIN_SIZE, 0, MARGIN_SIZE, 32, 15); CopyBgTilemapBufferToVram(0); - LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(0xF), sizeof(sFrontierSquares_Palette)); + LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(15), sizeof(sFrontierSquares_Palette)); task->tPosX = MARGIN_SIZE; task->tPosY = 0; @@ -4471,7 +4471,7 @@ static bool8 FrontierSquares_Draw(struct Task *task) SQUARE_SIZE, SQUARE_SIZE, task->tPosX, task->tPosY, SQUARE_SIZE, SQUARE_SIZE, - 0xF, 0, 0); + 15, 0, 0); CopyBgTilemapBufferToVram(0); task->tPosX += SQUARE_SIZE; @@ -4546,12 +4546,12 @@ static bool8 FrontierSquaresSpiral_Init(struct Task *task) LZ77UnCompVram(sFrontierSquares_FilledBg_Tileset, tileset); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32); - FillBgTilemapBufferRect(0, 1, 0, 0, MARGIN_SIZE, 32, 0xF); - FillBgTilemapBufferRect(0, 1, 30 - MARGIN_SIZE, 0, MARGIN_SIZE, 32, 0xF); + FillBgTilemapBufferRect(0, 1, 0, 0, MARGIN_SIZE, 32, 15); + FillBgTilemapBufferRect(0, 1, 30 - MARGIN_SIZE, 0, MARGIN_SIZE, 32, 15); CopyBgTilemapBufferToVram(0); - LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(0xE), sizeof(sFrontierSquares_Palette)); - LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(0xF), sizeof(sFrontierSquares_Palette)); - BlendPalette(BG_PLTT_ID(0xE), 16, 8, RGB_BLACK); + LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(14), sizeof(sFrontierSquares_Palette)); + LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(15), sizeof(sFrontierSquares_Palette)); + BlendPalette(BG_PLTT_ID(14), 16, 8, RGB_BLACK); task->tSquareNum = NUM_SQUARES - 1; task->tFadeFlag = 0; @@ -4569,7 +4569,7 @@ static bool8 FrontierSquaresSpiral_Outward(struct Task *task) SQUARE_SIZE, SQUARE_SIZE, SQUARE_SIZE * x + MARGIN_SIZE, SQUARE_SIZE * y, SQUARE_SIZE, SQUARE_SIZE, - 0xF, 0, 0); + 15, 0, 0); CopyBgTilemapBufferToVram(0); if (--task->tSquareNum < 0) @@ -4581,7 +4581,7 @@ static bool8 FrontierSquaresSpiral_Outward(struct Task *task) // set it to black so it's not revealed when the squares are removed. static bool8 FrontierSquaresSpiral_SetBlack(struct Task *task) { - BlendPalette(BG_PLTT_ID(0xE), 16, 3, RGB_BLACK); + BlendPalette(BG_PLTT_ID(14), 16, 3, RGB_BLACK); BlendPalettes(PALETTES_ALL & ~(1 << 15 | 1 << 14), 16, RGB_BLACK); task->tSquareNum = 0; @@ -4603,7 +4603,7 @@ static bool8 FrontierSquaresSpiral_Inward(struct Task *task) SQUARE_SIZE * (sFrontierSquaresSpiral_Positions[task->tSquareNum] % NUM_SQUARES_PER_ROW) + MARGIN_SIZE, SQUARE_SIZE * (sFrontierSquaresSpiral_Positions[task->tSquareNum] / NUM_SQUARES_PER_ROW), SQUARE_SIZE, SQUARE_SIZE, - 0xE, 0, 0); + 14, 0, 0); } else { @@ -4614,7 +4614,7 @@ static bool8 FrontierSquaresSpiral_Inward(struct Task *task) SQUARE_SIZE * (sFrontierSquaresSpiral_Positions[task->tSquareNum - 1] % NUM_SQUARES_PER_ROW) + MARGIN_SIZE, SQUARE_SIZE * (sFrontierSquaresSpiral_Positions[task->tSquareNum - 1] / NUM_SQUARES_PER_ROW), SQUARE_SIZE, SQUARE_SIZE, - 0xF); + 15); } task->tSquareNum++; } @@ -4664,7 +4664,7 @@ static bool8 FrontierSquaresScroll_Init(struct Task *task) LZ77UnCompVram(sFrontierSquares_FilledBg_Tileset, tileset); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32); CopyBgTilemapBufferToVram(0); - LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(0xF), sizeof(sFrontierSquares_Palette)); + LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(15), sizeof(sFrontierSquares_Palette)); gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -4709,7 +4709,7 @@ static bool8 FrontierSquaresScroll_Draw(struct Task *task) SQUARE_SIZE, SQUARE_SIZE, SQUARE_SIZE * x + MARGIN_SIZE, SQUARE_SIZE * y, SQUARE_SIZE, SQUARE_SIZE, - 0xF, 0, 0); + 15, 0, 0); CopyBgTilemapBufferToVram(0); if (++task->tSquareNum >= (int)ARRAY_COUNT(sFrontierSquaresScroll_Positions)) @@ -4738,7 +4738,7 @@ static bool8 FrontierSquaresScroll_Erase(struct Task *task) FillBgTilemapBufferRect(0, 1, SQUARE_SIZE * x + MARGIN_SIZE, SQUARE_SIZE * y, SQUARE_SIZE, SQUARE_SIZE, - 0xF); + 15); CopyBgTilemapBufferToVram(0); if (++task->tSquareNum >= (int)ARRAY_COUNT(sFrontierSquaresScroll_Positions)) diff --git a/src/battle_transition_frontier.c b/src/battle_transition_frontier.c index 107e9067db..2527211296 100644 --- a/src/battle_transition_frontier.c +++ b/src/battle_transition_frontier.c @@ -226,7 +226,7 @@ static void LoadLogoGfx(void) GetBg0TilesDst(&tilemap, &tileset); LZ77UnCompVram(sLogoCenter_Gfx, tileset); LZ77UnCompVram(sLogoCenter_Tilemap, tilemap); - LoadPalette(sLogo_Pal, BG_PLTT_ID(0xF), sizeof(sLogo_Pal)); + LoadPalette(sLogo_Pal, BG_PLTT_ID(15), sizeof(sLogo_Pal)); LoadCompressedSpriteSheet(&sSpriteSheet_LogoCircles); LoadSpritePalette(&sSpritePalette_LogoCircles); } diff --git a/src/berry_blender.c b/src/berry_blender.c index defc5ac963..c7185dd8eb 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -338,7 +338,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 6, .width = 7, .height = 2, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x28, }, { @@ -347,7 +347,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 6, .width = 7, .height = 2, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x36, }, { @@ -356,7 +356,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 12, .width = 7, .height = 2, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x44, }, { @@ -365,7 +365,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 12, .width = 7, .height = 2, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x52, }, { @@ -374,7 +374,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x60, }, { @@ -383,7 +383,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 3, .width = 21, .height = 14, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x60, }, DUMMY_WIN_TEMPLATE @@ -396,7 +396,7 @@ static const struct WindowTemplate sYesNoWindowTemplate_ContinuePlaying = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0xCC }; @@ -926,7 +926,7 @@ static const struct WindowTemplate sBlenderRecordWindowTemplate = .tilemapTop = 4, .width = 18, .height = 11, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 8 }; @@ -959,7 +959,7 @@ static bool8 LoadBerryBlenderGfx(void) case 1: CopyToBgTilemapBuffer(2, sBlenderCenter_Tilemap, 0x400, 0); CopyBgTilemapBufferToVram(2); - LoadPalette(sBlenderCenter_Pal, BG_PLTT_ID(0x0), 8 * PLTT_SIZE_4BPP); + LoadPalette(sBlenderCenter_Pal, BG_PLTT_ID(0), 8 * PLTT_SIZE_4BPP); sBerryBlender->loadGfxState++; break; case 2: @@ -984,7 +984,7 @@ static bool8 LoadBerryBlenderGfx(void) sBerryBlender->loadGfxState++; break; case 7: - LoadPalette(sBlenderOuter_Pal, BG_PLTT_ID(0x8), PLTT_SIZE_4BPP); + LoadPalette(sBlenderOuter_Pal, BG_PLTT_ID(8), PLTT_SIZE_4BPP); sBerryBlender->loadGfxState++; break; case 8: @@ -1065,8 +1065,8 @@ static void CB2_LoadBerryBlender(void) InitBgsFromTemplates(1, sBgTemplates, ARRAY_COUNT(sBgTemplates)); SetBgTilemapBuffer(1, sBerryBlender->tilemapBuffers[0]); SetBgTilemapBuffer(2, sBerryBlender->tilemapBuffers[1]); - LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD)); - LoadMessageBoxGfx(0, 0x14, BG_PLTT_ID(0xF)); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(13)); + LoadMessageBoxGfx(0, 0x14, BG_PLTT_ID(15)); InitBerryBlenderWindows(); sBerryBlender->mainState++; @@ -1502,8 +1502,8 @@ static void InitBlenderBgs(void) SetBgTilemapBuffer(1, sBerryBlender->tilemapBuffers[0]); SetBgTilemapBuffer(2, sBerryBlender->tilemapBuffers[1]); - LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD)); - LoadMessageBoxGfx(0, 0x14, BG_PLTT_ID(0xF)); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(13)); + LoadMessageBoxGfx(0, 0x14, BG_PLTT_ID(15)); InitBerryBlenderWindows(); sBerryBlender->unk0 = 0; diff --git a/src/berry_crush.c b/src/berry_crush.c index a100b72358..e5390f591a 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -473,7 +473,7 @@ static const struct WindowTemplate sWindowTemplate_Rankings = .tilemapTop = 4, .width = 24, .height = 13, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }; @@ -485,7 +485,7 @@ static const struct WindowTemplate sWindowTemplates_PlayerNames[MAX_RFU_PLAYERS .tilemapTop = 0, .width = 9, .height = 2, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 1005 }, { @@ -494,7 +494,7 @@ static const struct WindowTemplate sWindowTemplates_PlayerNames[MAX_RFU_PLAYERS .tilemapTop = 3, .width = 9, .height = 2, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 987 }, { @@ -503,7 +503,7 @@ static const struct WindowTemplate sWindowTemplates_PlayerNames[MAX_RFU_PLAYERS .tilemapTop = 6, .width = 9, .height = 2, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 969 }, { @@ -512,7 +512,7 @@ static const struct WindowTemplate sWindowTemplates_PlayerNames[MAX_RFU_PLAYERS .tilemapTop = 3, .width = 9, .height = 2, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 951 }, { @@ -521,7 +521,7 @@ static const struct WindowTemplate sWindowTemplates_PlayerNames[MAX_RFU_PLAYERS .tilemapTop = 6, .width = 9, .height = 2, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 933 }, DUMMY_WIN_TEMPLATE, @@ -535,7 +535,7 @@ static const struct WindowTemplate sWindowTemplates_Results[] = .tilemapTop = 2, .width = 20, .height = 16, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }, [STATE_RESULTS_RANDOM - RESULTS_STATE_START] = { @@ -544,7 +544,7 @@ static const struct WindowTemplate sWindowTemplates_Results[] = .tilemapTop = 2, .width = 20, .height = 16, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }, [STATE_RESULTS_CRUSHING - RESULTS_STATE_START] = { @@ -553,7 +553,7 @@ static const struct WindowTemplate sWindowTemplates_Results[] = .tilemapTop = 2, .width = 22, .height = 16, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }, DUMMY_WIN_TEMPLATE, @@ -1235,7 +1235,7 @@ static s32 ShowGameDisplay(void) gPaletteFade.bufferTransferDisabled = TRUE; break; case 7: - LoadPalette(gBerryCrush_Crusher_Pal, BG_PLTT_ID(0x0), 12 * PLTT_SIZE_4BPP); + LoadPalette(gBerryCrush_Crusher_Pal, BG_PLTT_ID(0), 12 * PLTT_SIZE_4BPP); CopyToBgTilemapBuffer(1, sCrusherTop_Tilemap, 0, 0); CopyToBgTilemapBuffer(2, sContainerCap_Tilemap, 0, 0); CopyToBgTilemapBuffer(3, sBg_Tilemap, 0, 0); @@ -1751,8 +1751,8 @@ static bool32 OpenResultsWindow(struct BerryCrushGame *game, struct BerryCrushGa FillWindowPixelBuffer(gfx->resultsWindowId, PIXEL_FILL(0)); break; case 2: - LoadUserWindowBorderGfx_(gfx->resultsWindowId, 541, BG_PLTT_ID(0xD)); - DrawStdFrameWithCustomTileAndPalette(gfx->resultsWindowId, FALSE, 541, 0xD); + LoadUserWindowBorderGfx_(gfx->resultsWindowId, 541, BG_PLTT_ID(13)); + DrawStdFrameWithCustomTileAndPalette(gfx->resultsWindowId, FALSE, 541, 13); break; case 3: playerCountIdx = game->playerCount - 2; @@ -1809,8 +1809,8 @@ static void Task_ShowRankings(u8 taskId) tWindowId = AddWindow(&sWindowTemplate_Rankings); PutWindowTilemap(tWindowId); FillWindowPixelBuffer(tWindowId, PIXEL_FILL(0)); - LoadUserWindowBorderGfx_(tWindowId, 541, BG_PLTT_ID(0xD)); - DrawStdFrameWithCustomTileAndPalette(tWindowId, FALSE, 541, 0xD); + LoadUserWindowBorderGfx_(tWindowId, 541, BG_PLTT_ID(13)); + DrawStdFrameWithCustomTileAndPalette(tWindowId, FALSE, 541, 13); break; case 1: // Print header text diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index 149e5d5116..e8c4bc7e68 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -77,7 +77,7 @@ static const struct WindowTemplate sBerryFixWindowTemplates[] = { .tilemapTop = 4, .width = 26, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }, { @@ -86,7 +86,7 @@ static const struct WindowTemplate sBerryFixWindowTemplates[] = { .tilemapTop = 11, .width = 28, .height = 8, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 53 }, { @@ -95,7 +95,7 @@ static const struct WindowTemplate sBerryFixWindowTemplates[] = { .tilemapTop = 8, .width = 30, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 277 }, { @@ -104,7 +104,7 @@ static const struct WindowTemplate sBerryFixWindowTemplates[] = { .tilemapTop = 0, .width = 14, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 337 }, DUMMY_WIN_TEMPLATE diff --git a/src/berry_powder.c b/src/berry_powder.c index 70a8960f76..7066f9d95c 100755 --- a/src/berry_powder.c +++ b/src/berry_powder.c @@ -68,7 +68,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 1, .width = 28, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 19 }, { @@ -77,7 +77,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 5, .width = 28, .height = 14, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 75 }, { @@ -86,7 +86,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 5, .width = 28, .height = 7, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 75 }, { @@ -95,7 +95,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 8, .width = 19, .height = 3, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 19 }, { @@ -104,7 +104,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 7, .width = 6, .height = 4, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 76 }, { @@ -113,7 +113,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 6, .width = 22, .height = 5, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 19 }, { @@ -122,7 +122,7 @@ static const struct WindowTemplate sBerryPowderWindowTemplates[] = .tilemapTop = 8, .width = 19, .height = 3, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 19 }, }; @@ -229,7 +229,7 @@ void DisplayBerryPowderVendorMenu(void) sBerryPowderVendorWindowId = AddWindow(&template); FillWindowPixelBuffer(sBerryPowderVendorWindowId, PIXEL_FILL(0)); PutWindowTilemap(sBerryPowderVendorWindowId); - LoadUserWindowBorderGfx_(sBerryPowderVendorWindowId, 0x21D, BG_PLTT_ID(0xD)); + LoadUserWindowBorderGfx_(sBerryPowderVendorWindowId, 0x21D, BG_PLTT_ID(13)); DrawPlayerPowderAmount(sBerryPowderVendorWindowId, 0x21D, 13, GetBerryPowder()); } diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 70d88b3133..6c6d207ba7 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -108,7 +108,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 4, .width = 8, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 69, }, { // WIN_SIZE_FIRM @@ -117,7 +117,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 7, .width = 18, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 85, }, { // WIN_DESC @@ -126,7 +126,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 14, .width = 25, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 157, }, { // WIN_BERRY_TAG @@ -135,7 +135,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 0, .width = 8, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 257, }, DUMMY_WIN_TEMPLATE @@ -346,7 +346,7 @@ static bool8 LoadBerryTagGfx(void) sBerryTag->gfxState++; break; case 4: - LoadCompressedPalette(gBerryCheck_Pal, BG_PLTT_ID(0x0), 6 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBerryCheck_Pal, BG_PLTT_ID(0), 6 * PLTT_SIZE_4BPP); sBerryTag->gfxState++; break; case 5: @@ -367,7 +367,7 @@ static void HandleInitWindows(void) InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadPalette(sFontPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(sFontPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); for (i = 0; i < ARRAY_COUNT(sWindowTemplates) - 1; i++) PutWindowTilemap(i); ScheduleBgCopyTilemapToVram(0); diff --git a/src/cable_car.c b/src/cable_car.c index 8485c2352a..700d2175aa 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -306,7 +306,7 @@ static void CB2_LoadCableCar(void) case 3: if (!FreeTempTileDataBuffersIfPossible()) { - LoadPalette(gCableCarBg_Pal, BG_PLTT_ID(0x0), 4 * PLTT_SIZE_4BPP); + LoadPalette(gCableCarBg_Pal, BG_PLTT_ID(0), 4 * PLTT_SIZE_4BPP); gMain.state++; } break; diff --git a/src/cable_club.c b/src/cable_club.c index 762bd4ec35..913a1b7287 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -41,7 +41,7 @@ static const struct WindowTemplate sWindowTemplate_LinkPlayerCount = { .tilemapTop = 11, .width = 11, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0125, }; diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index 42930777ba..d9fa23537e 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -52,7 +52,7 @@ static const struct WindowTemplate sClearSaveTextWindow[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 11, }, DUMMY_WIN_TEMPLATE @@ -66,7 +66,7 @@ static const struct WindowTemplate sClearSaveYesNo[] = .tilemapTop = 2, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 115, } }; @@ -204,6 +204,6 @@ static void InitClearSaveDataScreenWindows(void) InitWindows(sClearSaveTextWindow); DeactivateAllTextPrinters(); FillWindowPixelBuffer(0, PIXEL_FILL(0)); - LoadWindowGfx(0, 0, 2, BG_PLTT_ID(0xE)); - LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadWindowGfx(0, 0, 2, BG_PLTT_ID(14)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); } diff --git a/src/contest.c b/src/contest.c index 7a7db4f5f3..5bd903e476 100644 --- a/src/contest.c +++ b/src/contest.c @@ -733,7 +733,7 @@ static const struct WindowTemplate sContestWindowTemplates[] = .tilemapTop = 0, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x200 }, [WIN_CONTESTANT1_NAME] = { @@ -742,7 +742,7 @@ static const struct WindowTemplate sContestWindowTemplates[] = .tilemapTop = 5, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x218 }, [WIN_CONTESTANT2_NAME] = { @@ -751,7 +751,7 @@ static const struct WindowTemplate sContestWindowTemplates[] = .tilemapTop = 10, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x230 }, [WIN_CONTESTANT3_NAME] = { @@ -760,7 +760,7 @@ static const struct WindowTemplate sContestWindowTemplates[] = .tilemapTop = 15, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x248 }, [WIN_GENERAL_TEXT] = { @@ -769,7 +769,7 @@ static const struct WindowTemplate sContestWindowTemplates[] = .tilemapTop = 15, .width = 17, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x260 }, [WIN_MOVE0] = { @@ -778,7 +778,7 @@ static const struct WindowTemplate sContestWindowTemplates[] = .tilemapTop = 31, .width = 9, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x2A4 }, [WIN_MOVE1] = { @@ -787,7 +787,7 @@ static const struct WindowTemplate sContestWindowTemplates[] = .tilemapTop = 33, .width = 9, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x2B6 }, [WIN_MOVE2] = { @@ -796,7 +796,7 @@ static const struct WindowTemplate sContestWindowTemplates[] = .tilemapTop = 35, .width = 9, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x2C8 }, [WIN_MOVE3] = { @@ -805,7 +805,7 @@ static const struct WindowTemplate sContestWindowTemplates[] = .tilemapTop = 37, .width = 9, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x2DA }, [WIN_SLASH] = { @@ -814,7 +814,7 @@ static const struct WindowTemplate sContestWindowTemplates[] = .tilemapTop = 31, .width = 1, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x2EC }, [WIN_MOVE_DESCRIPTION] = { @@ -823,7 +823,7 @@ static const struct WindowTemplate sContestWindowTemplates[] = .tilemapTop = 35, .width = 18, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x2EE }, DUMMY_WIN_TEMPLATE @@ -1038,7 +1038,7 @@ void LoadContestBgAfterMoveAnim(void) { u32 contestantWindowId = 5 + i; - LoadPalette(eContestTempSave.cachedWindowPalettes[contestantWindowId], BG_PLTT_ID(0x5 + gContestantTurnOrder[i]), sizeof((eContestTempSave.cachedWindowPalettes[contestantWindowId]))); + LoadPalette(eContestTempSave.cachedWindowPalettes[contestantWindowId], BG_PLTT_ID(5 + gContestantTurnOrder[i]), sizeof((eContestTempSave.cachedWindowPalettes[contestantWindowId]))); } } @@ -1073,11 +1073,11 @@ static void LoadContestPalettes(void) { s32 i; - LoadPalette(sText_Pal, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(sText_Pal, BG_PLTT_ID(15), PLTT_SIZE_4BPP); SetBackdropFromColor(RGB_BLACK); for (i = 10; i < 14; i++) - LoadPalette(gPlttBufferUnfaded + BG_PLTT_ID(0xF) + 1, BG_PLTT_ID(0xF) + i, PLTT_SIZEOF(1)); - FillPalette(RGB(31, 17, 31), BG_PLTT_ID(0xF) + 3, PLTT_SIZEOF(1)); + LoadPalette(gPlttBufferUnfaded + BG_PLTT_ID(15) + 1, BG_PLTT_ID(15) + i, PLTT_SIZEOF(1)); + FillPalette(RGB(31, 17, 31), BG_PLTT_ID(15) + 3, PLTT_SIZEOF(1)); } static void InitContestResources(void) @@ -1328,10 +1328,10 @@ static bool8 SetupContestGraphics(u8 *stateVar) break; case 5: LoadCompressedPalette(gContestInterfaceAudiencePalette, BG_PLTT_OFFSET, BG_PLTT_SIZE); - CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(0x8), tempPalette1, PLTT_SIZE_4BPP); - CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(0x5 + gContestPlayerMonIndex), tempPalette2, 16 * sizeof(u16)); - CpuCopy32(tempPalette2, gPlttBufferUnfaded + BG_PLTT_ID(0x8), PLTT_SIZE_4BPP); - CpuCopy32(tempPalette1, gPlttBufferUnfaded + BG_PLTT_ID(0x5 + gContestPlayerMonIndex), PLTT_SIZE_4BPP); + CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(8), tempPalette1, PLTT_SIZE_4BPP); + CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(5 + gContestPlayerMonIndex), tempPalette2, PLTT_SIZE_4BPP); + CpuCopy32(tempPalette2, gPlttBufferUnfaded + BG_PLTT_ID(8), PLTT_SIZE_4BPP); + CpuCopy32(tempPalette1, gPlttBufferUnfaded + BG_PLTT_ID(5 + gContestPlayerMonIndex), PLTT_SIZE_4BPP); DmaCopy32Defvars(3, gPlttBufferUnfaded, eContestTempSave.cachedWindowPalettes, sizeof(eContestTempSave.cachedWindowPalettes)); LoadContestPalettes(); break; @@ -3097,7 +3097,7 @@ static u8 CreateJudgeSprite(void) u8 spriteId; LoadCompressedSpriteSheet(&sSpriteSheet_Judge); - LoadCompressedPalette(gContest2Pal, OBJ_PLTT_ID(0x1), PLTT_SIZE_4BPP); + LoadCompressedPalette(gContest2Pal, OBJ_PLTT_ID(1), PLTT_SIZE_4BPP); spriteId = CreateSprite(&sSpriteTemplate_Judge, 112, 36, 30); gSprites[spriteId].oam.paletteNum = 1; gSprites[spriteId].callback = SpriteCallbackDummy; @@ -3126,7 +3126,7 @@ static u8 CreateContestantSprite(u16 species, u32 otId, u32 personality, u32 ind else HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species], gMonSpritesGfxPtr->sprites.ptr[B_POSITION_PLAYER_LEFT], species, personality); - LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), OBJ_PLTT_ID(0x2), PLTT_SIZE_4BPP); + LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), OBJ_PLTT_ID(2), PLTT_SIZE_4BPP); SetMultiuseSpriteTemplateToPokemon(species, B_POSITION_PLAYER_LEFT); spriteId = CreateSprite(&gMultiuseSpriteTemplate, 0x70, GetBattlerSpriteFinal_Y(2, species, FALSE), 30); @@ -3997,7 +3997,7 @@ static void Task_StopFlashJudgeAttentionEye(u8 taskId) { gTasks[eContest.judgeAttentionTaskId].data[contestant * 4 + 0] = 0xFF; gTasks[eContest.judgeAttentionTaskId].data[contestant * 4 + 1] = 0; - BlendPalette(BG_PLTT_ID(0x5 + eContest.prevTurnOrder[contestant]) + 6, 2, 0, RGB(31, 31, 18)); + BlendPalette(BG_PLTT_ID(5 + eContest.prevTurnOrder[contestant]) + 6, 2, 0, RGB(31, 31, 18)); DestroyTask(taskId); } } @@ -4021,7 +4021,7 @@ static void Task_FlashJudgeAttentionEye(u8 taskId) || gTasks[taskId].data[offset + 0] == 0) gTasks[taskId].data[offset + 1] ^= 1; - BlendPalette(BG_PLTT_ID(0x5 + eContest.prevTurnOrder[i]) + 6, 2, gTasks[taskId].data[offset + 0], RGB(31, 31, 18)); + BlendPalette(BG_PLTT_ID(5 + eContest.prevTurnOrder[i]) + 6, 2, gTasks[taskId].data[offset + 0], RGB(31, 31, 18)); } } } @@ -4100,8 +4100,8 @@ static void Task_UnusedBlend(u8 taskId) || gTasks[taskId].data[idx] == 0) gTasks[taskId].data[idx + 1] ^= 1; - BlendPalette(BG_PLTT_ID(0x5 + i) + 10, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18)); - BlendPalette(BG_PLTT_ID(0x5 + i) + 12 + i, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18)); + BlendPalette(BG_PLTT_ID(5 + i) + 10, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18)); + BlendPalette(BG_PLTT_ID(5 + i) + 12 + i, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18)); } } } @@ -4414,7 +4414,7 @@ static void DrawContestantWindows(void) for (i = 0; i < CONTESTANT_COUNT; i++) { s32 windowId = i + 5; - LoadPalette(eContestTempSave.cachedWindowPalettes[windowId], BG_PLTT_ID(0x5 + gContestantTurnOrder[i]), sizeof(eContestTempSave.cachedWindowPalettes[0])); + LoadPalette(eContestTempSave.cachedWindowPalettes[windowId], BG_PLTT_ID(5 + gContestantTurnOrder[i]), sizeof(eContestTempSave.cachedWindowPalettes[0])); } DrawContestantWindowText(); } @@ -4992,8 +4992,8 @@ static void Task_BlendAudienceBackground(u8 taskId) else gTasks[taskId].tBlendCoeff--; - BlendPalette(BG_PLTT_ID(0x1) + 1, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor); - BlendPalette(BG_PLTT_ID(0x1) + 10, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor); + BlendPalette(BG_PLTT_ID(1) + 1, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor); + BlendPalette(BG_PLTT_ID(1) + 10, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor); if (gTasks[taskId].tBlendCoeff == gTasks[taskId].tTargetBlendCoeff) { diff --git a/src/contest_painting.c b/src/contest_painting.c index d995749bb2..a1a8a51975 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -121,7 +121,7 @@ static const struct WindowTemplate sWindowTemplate = .tilemapTop = 14, .width = 26, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1, }; @@ -420,7 +420,7 @@ static void LoadContestPaintingFrame(u8 contestWinnerId, bool8 isForArtist) { u8 x, y; - LoadPalette(sPictureFramePalettes, BG_PLTT_ID(0x0), 8 * PLTT_SIZE_4BPP); + LoadPalette(sPictureFramePalettes, BG_PLTT_ID(0), 8 * PLTT_SIZE_4BPP); if (isForArtist == TRUE) { // Load Artist's frame @@ -586,7 +586,7 @@ static void DoContestPaintingImageProcessing(u8 imageEffect) ApplyImageProcessingEffects(&gImageProcessingContext); ApplyImageProcessingQuantization(&gImageProcessingContext); ConvertImageProcessingToGBA(&gImageProcessingContext); - LoadPalette(gContestPaintingMonPalette, OBJ_PLTT_ID(0x0), 16 * PLTT_SIZE_4BPP); + LoadPalette(gContestPaintingMonPalette, OBJ_PLTT_ID(0), 16 * PLTT_SIZE_4BPP); } static void CreateContestPaintingPicture(u8 contestWinnerId, bool8 isForArtist) diff --git a/src/contest_util.c b/src/contest_util.c index bbb4ba5bdd..5a00253291 100644 --- a/src/contest_util.c +++ b/src/contest_util.c @@ -327,7 +327,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 4, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 770 }, { @@ -336,7 +336,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 7, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 794 }, { @@ -345,7 +345,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 10, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 818 }, { @@ -354,7 +354,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 13, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 842 }, DUMMY_WIN_TEMPLATE, @@ -455,8 +455,8 @@ static void LoadContestResultsBgGfx(void) CopyToBgTilemapBuffer(2, gContestResults_Interface_Tilemap, 0, 0); CopyToBgTilemapBuffer(0, gContestResults_WinnerBanner_Tilemap, 0, 0); LoadContestResultsTitleBarTilemaps(); - LoadCompressedPalette(gContestResults_Pal, BG_PLTT_ID(0x0), 16 * PLTT_SIZE_4BPP); - LoadPalette(sResultsTextWindow_Pal, BG_PLTT_ID(0xF), sizeof(sResultsTextWindow_Pal)); + LoadCompressedPalette(gContestResults_Pal, BG_PLTT_ID(0), 16 * PLTT_SIZE_4BPP); + LoadPalette(sResultsTextWindow_Pal, BG_PLTT_ID(15), sizeof(sResultsTextWindow_Pal)); for (i = 0; i < CONTESTANT_COUNT; i++) { @@ -1092,9 +1092,9 @@ static void Task_FlashStarsAndHearts(u8 taskId) else if (gTasks[taskId].tCoeff == 0) gTasks[taskId].tDecreasing = FALSE; - BlendPalette(BG_PLTT_ID(0x6) + 11, 1, gTasks[taskId].tCoeff, RGB(30, 22, 11)); - BlendPalette(BG_PLTT_ID(0x6) + 8, 1, gTasks[taskId].tCoeff, RGB_WHITE); - BlendPalette(BG_PLTT_ID(0x6) + 14, 1, gTasks[taskId].tCoeff, RGB(30, 29, 29)); + BlendPalette(BG_PLTT_ID(6) + 11, 1, gTasks[taskId].tCoeff, RGB(30, 22, 11)); + BlendPalette(BG_PLTT_ID(6) + 8, 1, gTasks[taskId].tCoeff, RGB_WHITE); + BlendPalette(BG_PLTT_ID(6) + 14, 1, gTasks[taskId].tCoeff, RGB(30, 29, 29)); } if (gTasks[taskId].tCoeff == 0) @@ -1143,7 +1143,7 @@ static void LoadAllContestMonIconPalettes(void) for (i = 0; i < CONTESTANT_COUNT; i++) { species = gContestMons[i].species; - LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[GetIconSpecies(species, 0)]], BG_PLTT_ID(0xA + i), PLTT_SIZE_4BPP); + LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[GetIconSpecies(species, 0)]], BG_PLTT_ID(10 + i), PLTT_SIZE_4BPP); } } @@ -1561,7 +1561,7 @@ static void Task_HighlightWinnersBox(u8 taskId) if (++gTasks[taskId].data[11] == 1) { gTasks[taskId].data[11] = 0; - BlendPalette(BG_PLTT_ID(0x9) + 1, 1, gTasks[taskId].data[12], RGB(13, 28, 27)); + BlendPalette(BG_PLTT_ID(9) + 1, 1, gTasks[taskId].data[12], RGB(13, 28, 27)); if (gTasks[taskId].data[13] == 0) { if (++gTasks[taskId].data[12] == 16) @@ -2525,16 +2525,16 @@ void LoadLinkContestPlayerPalettes(void) if (version == VERSION_RUBY || version == VERSION_SAPPHIRE) { if (gLinkPlayers[i].gender == MALE) - LoadPalette(gObjectEventPal_RubySapphireBrendan, OBJ_PLTT_ID(0x6 + i), PLTT_SIZE_4BPP); + LoadPalette(gObjectEventPal_RubySapphireBrendan, OBJ_PLTT_ID(6 + i), PLTT_SIZE_4BPP); else - LoadPalette(gObjectEventPal_RubySapphireMay, OBJ_PLTT_ID(0x6 + i), PLTT_SIZE_4BPP); + LoadPalette(gObjectEventPal_RubySapphireMay, OBJ_PLTT_ID(6 + i), PLTT_SIZE_4BPP); } else { if (gLinkPlayers[i].gender == MALE) - LoadPalette(gObjectEventPal_Brendan, OBJ_PLTT_ID(0x6 + i), PLTT_SIZE_4BPP); + LoadPalette(gObjectEventPal_Brendan, OBJ_PLTT_ID(6 + i), PLTT_SIZE_4BPP); else - LoadPalette(gObjectEventPal_May, OBJ_PLTT_ID(0x6 + i), PLTT_SIZE_4BPP); + LoadPalette(gObjectEventPal_May, OBJ_PLTT_ID(6 + i), PLTT_SIZE_4BPP); } } } diff --git a/src/credits.c b/src/credits.c index 0764e185db..16c9152dab 100644 --- a/src/credits.c +++ b/src/credits.c @@ -185,7 +185,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 9, .width = 30, .height = 12, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 1 }, DUMMY_WIN_TEMPLATE, @@ -365,7 +365,7 @@ static void InitCreditsBgsAndWindows(void) ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sBackgroundTemplates, ARRAY_COUNT(sBackgroundTemplates)); SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE)); - LoadPalette(sCredits_Pal, BG_PLTT_ID(0x8), 2 * PLTT_SIZE_4BPP); + LoadPalette(sCredits_Pal, BG_PLTT_ID(8), 2 * PLTT_SIZE_4BPP); InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); PutWindowTilemap(0); @@ -549,7 +549,7 @@ static void Task_LoadShowMons(u8 taskId) gReservedSpritePaletteCount = 8; LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7))); - LoadPalette(gBirchBagGrassPal[0] + 1, BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(2 * 16 - 1)); + LoadPalette(gBirchBagGrassPal[0] + 1, BG_PLTT_ID(0) + 1, PLTT_SIZEOF(2 * 16 - 1)); for (i = 0; i < MON_PIC_SIZE; i++) gDecompressionBuffer[i] = 0x11; @@ -624,7 +624,7 @@ static void Task_CreditsTheEnd3(u8 taskId) { ResetGpuAndVram(); ResetPaletteFade(); - LoadTheEndScreen(0, 0x3800, BG_PLTT_ID(0x0)); + LoadTheEndScreen(0, 0x3800, BG_PLTT_ID(0)); ResetSpriteData(); FreeAllSpritePalettes(); BeginNormalPaletteFade(PALETTES_ALL, 8, 16, 0, RGB_BLACK); diff --git a/src/data/party_menu.h b/src/data/party_menu.h index a3cf30fc13..fdceb9b7d9 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -140,7 +140,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 3, .width = 10, .height = 7, - .paletteNum = 0x3, + .paletteNum = 3, .baseBlock = 0x63, }, { @@ -149,7 +149,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 1, .width = 18, .height = 3, - .paletteNum = 0x4, + .paletteNum = 4, .baseBlock = 0xA9, }, { @@ -158,7 +158,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 4, .width = 18, .height = 3, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0xDF, }, { @@ -167,7 +167,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 7, .width = 18, .height = 3, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 0x115, }, { @@ -176,7 +176,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 10, .width = 18, .height = 3, - .paletteNum = 0x7, + .paletteNum = 7, .baseBlock = 0x14B, }, { @@ -185,7 +185,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 13, .width = 18, .height = 3, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 0x181, }, { @@ -194,7 +194,7 @@ static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x1DF, }, DUMMY_WIN_TEMPLATE @@ -208,7 +208,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 1, .width = 10, .height = 7, - .paletteNum = 0x3, + .paletteNum = 3, .baseBlock = 0x63, }, { @@ -217,7 +217,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 8, .width = 10, .height = 7, - .paletteNum = 0x4, + .paletteNum = 4, .baseBlock = 0xA9, }, { @@ -226,7 +226,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 1, .width = 18, .height = 3, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0xEF, }, { @@ -235,7 +235,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 5, .width = 18, .height = 3, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 0x125, }, { @@ -244,7 +244,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 9, .width = 18, .height = 3, - .paletteNum = 0x7, + .paletteNum = 7, .baseBlock = 0x15B, }, { @@ -253,7 +253,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 13, .width = 18, .height = 3, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 0x191, }, { @@ -262,7 +262,7 @@ static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] = .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x1DF, }, DUMMY_WIN_TEMPLATE @@ -276,7 +276,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 1, .width = 10, .height = 7, - .paletteNum = 0x3, + .paletteNum = 3, .baseBlock = 0x63, }, { @@ -285,7 +285,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 8, .width = 10, .height = 7, - .paletteNum = 0x4, + .paletteNum = 4, .baseBlock = 0xA9, }, { @@ -294,7 +294,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 2, .width = 18, .height = 3, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0xEF, }, { @@ -303,7 +303,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 5, .width = 18, .height = 3, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 0x125, }, { @@ -312,7 +312,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 9, .width = 18, .height = 3, - .paletteNum = 0x7, + .paletteNum = 7, .baseBlock = 0x15B, }, { @@ -321,7 +321,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 12, .width = 18, .height = 3, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 0x191, }, { @@ -330,7 +330,7 @@ static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] = .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x1DF, }, DUMMY_WIN_TEMPLATE @@ -344,7 +344,7 @@ static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] = .tilemapTop = 2, .width = 10, .height = 7, - .paletteNum = 0x3, + .paletteNum = 3, .baseBlock = 0x63, }, { @@ -353,7 +353,7 @@ static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] = .tilemapTop = 3, .width = 18, .height = 3, - .paletteNum = 0x5, + .paletteNum = 5, .baseBlock = 0xA9, }, { @@ -362,7 +362,7 @@ static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] = .tilemapTop = 6, .width = 18, .height = 3, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 0xDF, }, { @@ -371,7 +371,7 @@ static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] = .tilemapTop = 11, .width = 10, .height = 7, - .paletteNum = 0x4, + .paletteNum = 4, .baseBlock = 0x115, }, { @@ -380,7 +380,7 @@ static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] = .tilemapTop = 12, .width = 18, .height = 3, - .paletteNum = 0x7, + .paletteNum = 7, .baseBlock = 0x16B, }, { @@ -389,7 +389,7 @@ static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] = .tilemapTop = 15, .width = 18, .height = 3, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 0x1A1, }, DUMMY_WIN_TEMPLATE @@ -402,7 +402,7 @@ static const struct WindowTemplate sCancelButtonWindowTemplate = .tilemapTop = 17, .width = 6, .height = 2, - .paletteNum = 0x3, + .paletteNum = 3, .baseBlock = 0x1C7, }; @@ -413,7 +413,7 @@ static const struct WindowTemplate sMultiCancelButtonWindowTemplate = .tilemapTop = 18, .width = 6, .height = 2, - .paletteNum = 0x3, + .paletteNum = 3, .baseBlock = 0x1C7, }; @@ -424,7 +424,7 @@ static const struct WindowTemplate sConfirmButtonWindowTemplate = .tilemapTop = 16, .width = 6, .height = 2, - .paletteNum = 0x3, + .paletteNum = 3, .baseBlock = 0x1D3, }; @@ -435,7 +435,7 @@ static const struct WindowTemplate sDefaultPartyMsgWindowTemplate = .tilemapTop = 17, .width = 21, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x24F, }; @@ -446,7 +446,7 @@ static const struct WindowTemplate sDoWhatWithMonMsgWindowTemplate = .tilemapTop = 17, .width = 16, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x279, }; @@ -457,7 +457,7 @@ static const struct WindowTemplate sDoWhatWithItemMsgWindowTemplate = .tilemapTop = 17, .width = 20, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x299, }; @@ -468,7 +468,7 @@ static const struct WindowTemplate sDoWhatWithMailMsgWindowTemplate = .tilemapTop = 17, .width = 18, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x299, }; @@ -479,7 +479,7 @@ static const struct WindowTemplate sWhichMoveMsgWindowTemplate = .tilemapTop = 17, .width = 16, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x299, }; @@ -490,7 +490,7 @@ static const struct WindowTemplate sAlreadyHoldingOneMsgWindowTemplate = .tilemapTop = 15, .width = 20, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x299, }; @@ -501,7 +501,7 @@ static const struct WindowTemplate sItemGiveTakeWindowTemplate = .tilemapTop = 13, .width = 6, .height = 6, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x39D, }; @@ -512,7 +512,7 @@ static const struct WindowTemplate sMailReadTakeWindowTemplate = .tilemapTop = 13, .width = 8, .height = 6, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x39D, }; @@ -523,7 +523,7 @@ static const struct WindowTemplate sMoveSelectWindowTemplate = .tilemapTop = 11, .width = 10, .height = 8, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x2E9, }; @@ -534,7 +534,7 @@ static const struct WindowTemplate sPartyMenuYesNoWindowTemplate = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x2E9, }; @@ -545,7 +545,7 @@ static const struct WindowTemplate sLevelUpStatsWindowTemplate = .tilemapTop = 1, .width = 10, .height = 11, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x2E9, }; @@ -556,7 +556,7 @@ static const struct WindowTemplate sUnusedWindowTemplate1 = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x1DF, }; @@ -567,7 +567,7 @@ static const struct WindowTemplate sUnusedWindowTemplate2 = .tilemapTop = 13, .width = 18, .height = 3, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x39D, }; diff --git a/src/data/trade.h b/src/data/trade.h index 9cf4955bcc..80d17a49ba 100644 --- a/src/data/trade.h +++ b/src/data/trade.h @@ -463,7 +463,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 7, .width = 22, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 30 }, { @@ -472,7 +472,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 15, .width = 10, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 118 }, { @@ -481,7 +481,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 158 }, { @@ -490,7 +490,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 174 }, { @@ -499,7 +499,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 10, .width = 8, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 190 }, { @@ -508,7 +508,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 10, .width = 8, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 206 }, { @@ -517,7 +517,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 15, .width = 8, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 222 }, { @@ -526,7 +526,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 15, .width = 8, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 238 }, { @@ -535,7 +535,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 254 }, { @@ -544,7 +544,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 5, .width = 8, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 270 }, { @@ -553,7 +553,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 10, .width = 8, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 286 }, { @@ -562,7 +562,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 10, .width = 8, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 302 }, { @@ -571,7 +571,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 15, .width = 8, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 318 }, { @@ -580,7 +580,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 15, .width = 8, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 334 }, { @@ -589,7 +589,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 5, .width = 14, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 350 }, { @@ -598,7 +598,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 8, .width = 11, .height = 8, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 378 }, { @@ -607,7 +607,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 5, .width = 14, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 466 }, { @@ -616,7 +616,7 @@ static const struct WindowTemplate sTradeMenuWindowTemplates[] = .tilemapTop = 8, .width = 11, .height = 8, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 494 }, DUMMY_WIN_TEMPLATE, @@ -629,7 +629,7 @@ static const struct WindowTemplate sTradeYesNoWindowTemplate = .tilemapTop = 13, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 582 }; @@ -1112,7 +1112,7 @@ static const struct WindowTemplate sTradeSequenceWindowTemplates[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 64 }, DUMMY_WIN_TEMPLATE @@ -1125,7 +1125,7 @@ const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 188 }; diff --git a/src/data/union_room.h b/src/data/union_room.h index 804a8435ff..cf4b12b5d5 100644 --- a/src/data/union_room.h +++ b/src/data/union_room.h @@ -627,7 +627,7 @@ static const struct WindowTemplate sWindowTemplate_BButtonCancel = { .tilemapTop = 0, .width = 30, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0008 }; @@ -669,7 +669,7 @@ static const struct WindowTemplate sWindowTemplate_PlayerList = { .tilemapTop = 3, .width = 13, .height = 8, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0044 }; @@ -679,7 +679,7 @@ static const struct WindowTemplate sWindowTemplate_5PlayerList = { .tilemapTop = 3, .width = 13, .height = 10, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0044 }; @@ -689,7 +689,7 @@ static const struct WindowTemplate sWindowTemplate_NumPlayerMode = { .tilemapTop = 3, .width = 7, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x00c6 }; @@ -728,7 +728,7 @@ static const struct WindowTemplate sWindowTemplate_GroupList = { .tilemapTop = 3, .width = 17, .height = 10, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0044 }; @@ -738,7 +738,7 @@ static const struct WindowTemplate sWindowTemplate_PlayerNameAndId = { .tilemapTop = 3, .width = 7, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x00ee }; @@ -788,7 +788,7 @@ static const struct WindowTemplate sWindowTemplate_InviteToActivity = { .tilemapTop = 5, .width = 16, .height = 8, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0001 }; @@ -826,7 +826,7 @@ static const struct WindowTemplate sWindowTemplate_RegisterForTrade = { .tilemapTop = 7, .width = 16, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0001 }; @@ -863,7 +863,7 @@ static const struct WindowTemplate sWindowTemplate_TradingBoardRequestType = { .tilemapTop = 1, .width = 16, .height = 12, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0001 }; @@ -915,7 +915,7 @@ static const struct WindowTemplate sWindowTemplate_TradingBoardHeader = { .tilemapTop = 1, .width = 28, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 0x0001 }; @@ -925,7 +925,7 @@ static const struct WindowTemplate sWindowTemplate_TradingBoardMain = { .tilemapTop = 5, .width = 28, .height = 12, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 0x0039 }; @@ -970,7 +970,7 @@ static const struct WindowTemplate sWindowTemplate_Unused = { .tilemapTop = 5, .width = 28, .height = 12, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 0x0039 }; diff --git a/src/daycare.c b/src/daycare.c index 57119c3ca7..19d5edbb2c 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -46,7 +46,7 @@ static const struct WindowTemplate sDaycareLevelMenuWindowTemplate = .tilemapTop = 1, .width = 14, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 8 }; diff --git a/src/decoration.c b/src/decoration.c index 684e67bc87..165c7aa990 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -263,7 +263,7 @@ static const struct WindowTemplate sDecorationWindowTemplates[WINDOW_COUNT] = .tilemapTop = 1, .width = 18, .height = 2 * ARRAY_COUNT(sDecorationMainMenuActions), - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0001 }, { @@ -272,7 +272,7 @@ static const struct WindowTemplate sDecorationWindowTemplates[WINDOW_COUNT] = .tilemapTop = 1, .width = 13, .height = 18, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 0x0091 }, { @@ -281,7 +281,7 @@ static const struct WindowTemplate sDecorationWindowTemplates[WINDOW_COUNT] = .tilemapTop = 1, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x017b }, { @@ -290,7 +290,7 @@ static const struct WindowTemplate sDecorationWindowTemplates[WINDOW_COUNT] = .tilemapTop = 13, .width = 13, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0193 } }; @@ -687,7 +687,7 @@ static void ReturnToDecorationActionsAfterInvalidSelection(u8 taskId) static void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId) { - LoadPalette(sDecorationMenuPalette, BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); + LoadPalette(sDecorationMenuPalette, BG_PLTT_ID(13), PLTT_SIZE_4BPP); ClearDialogWindowAndFrame(0, FALSE); RemoveDecorationWindow(WINDOW_MAIN_MENU); InitDecorationCategoriesWindow(taskId); @@ -833,7 +833,7 @@ static void ReturnToActionsMenuFromCategories(u8 taskId) void ShowDecorationCategoriesWindow(u8 taskId) { - LoadPalette(sDecorationMenuPalette, BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); + LoadPalette(sDecorationMenuPalette, BG_PLTT_ID(13), PLTT_SIZE_4BPP); ClearDialogWindowAndFrame(0, FALSE); gTasks[taskId].tDecorationMenuCommand = DECOR_MENU_TRADE; sCurDecorationCategory = DECORCAT_DESK; diff --git a/src/diploma.c b/src/diploma.c index 5fe8aef83d..e964a9cb3e 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -72,7 +72,7 @@ void CB2_ShowDiploma(void) ResetSpriteData(); ResetPaletteFade(); FreeAllSpritePalettes(); - LoadPalette(sDiplomaPalettes, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadPalette(sDiplomaPalettes, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); sDiplomaTilemapPtr = malloc(0x1000); InitDiplomaBg(); InitDiplomaWindow(); @@ -186,7 +186,7 @@ static const struct WindowTemplate sDiplomaWinTemplates[2] = .tilemapTop = 2, .width = 20, .height = 16, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1, }, DUMMY_WIN_TEMPLATE, @@ -196,7 +196,7 @@ static void InitDiplomaWindow(void) { InitWindows(sDiplomaWinTemplates); DeactivateAllTextPrinters(); - LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); } diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index e1fe5248f1..54a3a531bc 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -2931,7 +2931,7 @@ static const struct WindowTemplate sWindowTemplates_Records = .tilemapTop = 1, .width = 20, .height = 11, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x1, }; @@ -3005,8 +3005,8 @@ static void PrintRecordsText(u8 windowId, s32 width) recordNums[1] = gSaveBlock2Ptr->berryPick.bestScore; recordNums[2] = gSaveBlock2Ptr->berryPick.berriesPickedInRow; - LoadUserWindowBorderGfx_(windowId, 0x21D, BG_PLTT_ID(0xD)); - DrawTextBorderOuter(windowId, 0x21D, 0xD); + LoadUserWindowBorderGfx_(windowId, 0x21D, BG_PLTT_ID(13)); + DrawTextBorderOuter(windowId, 0x21D, 13); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_BerryPickingRecords, GetStringCenterAlignXOffset(FONT_NORMAL, gText_BerryPickingRecords, width * 8), 1, TEXT_SKIP_DRAW, NULL); for (i = 0; i < NUM_RECORD_TYPES; i++) @@ -3401,7 +3401,7 @@ static const struct WindowTemplate sWindowTemplates_Results[] = .tilemapTop = 1, .width = 28, .height = 2, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 0x13, }, { @@ -3410,7 +3410,7 @@ static const struct WindowTemplate sWindowTemplates_Results[] = .tilemapTop = 5, .width = 28, .height = 14, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 0x4B, } }; @@ -3422,7 +3422,7 @@ static const struct WindowTemplate sWindowTemplate_Prize = .tilemapTop = 5, .width = 28, .height = 7, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 0x4B, }; @@ -3439,7 +3439,7 @@ static const struct WindowTemplate sWindowTemplates_PlayAgain[] = .tilemapTop = 8, .width = 19, .height = 3, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 0x13, }, [WIN_YES_NO] = { @@ -3448,7 +3448,7 @@ static const struct WindowTemplate sWindowTemplates_PlayAgain[] = .tilemapTop = 7, .width = 6, .height = 4, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 0x4C, } }; @@ -3460,7 +3460,7 @@ static const struct WindowTemplate sWindowTemplate_DroppedOut = .tilemapTop = 6, .width = 22, .height = 5, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 0x13, }; @@ -3471,7 +3471,7 @@ static const struct WindowTemplate sWindowTemplate_CommStandby = .tilemapTop = 8, .width = 19, .height = 3, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 0x13, }; @@ -4429,12 +4429,12 @@ static void ResetBerryAndStatusBarSprites(void) static void LoadWindowFrameGfx(u8 frameId) { LoadBgTiles(BG_INTERFACE, GetWindowFrameTilesPal(frameId)->tiles, 0x120, 1); - LoadPalette(GetWindowFrameTilesPal(frameId)->pal, BG_PLTT_ID(0xA), PLTT_SIZE_4BPP); + LoadPalette(GetWindowFrameTilesPal(frameId)->pal, BG_PLTT_ID(10), PLTT_SIZE_4BPP); } static void LoadUserWindowFrameGfx(void) { - LoadUserWindowBorderGfx_(0, 0xA, BG_PLTT_ID(0xB)); + LoadUserWindowBorderGfx_(0, 0xA, BG_PLTT_ID(11)); } static void ResetGfxState(void) @@ -4448,7 +4448,7 @@ static void ResetGfxState(void) static void DrawYesNoMessageWindow(const struct WindowTemplate *template) { - u8 pal = 0xA; + u8 pal = 10; FillBgTilemapBufferRect(BG_INTERFACE, 1, template->tilemapLeft - 1, template->tilemapTop - 1, 1, 1, pal); FillBgTilemapBufferRect(BG_INTERFACE, 2, template->tilemapLeft, template->tilemapTop - 1, template->width, 1, pal); @@ -4462,7 +4462,7 @@ static void DrawYesNoMessageWindow(const struct WindowTemplate *template) static void DrawMessageWindow(const struct WindowTemplate *template) { - u8 pal = 0xB; + u8 pal = 11; FillBgTilemapBufferRect(BG_INTERFACE, 10, template->tilemapLeft - 1, template->tilemapTop - 1, 1, 1, pal); FillBgTilemapBufferRect(BG_INTERFACE, 11, template->tilemapLeft, template->tilemapTop - 1, template->width, 1, pal); @@ -4634,7 +4634,7 @@ static void ShowNames(void) window.bg = BG_INTERFACE; window.width = 7; window.height = 2; - window.paletteNum = 0xD; + window.paletteNum = 13; window.baseBlock = 0x13; for (i = 0; i < numPlayers; coords++, i++) { @@ -5193,7 +5193,7 @@ static bool32 LoadBgGfx(void) switch (sGfx->loadState) { case 0: - LoadPalette(sBg_Pal, BG_PLTT_ID(0x0), sizeof(sBg_Pal)); + LoadPalette(sBg_Pal, BG_PLTT_ID(0), sizeof(sBg_Pal)); break; case 1: ResetTempTileDataBuffers(); @@ -5209,7 +5209,7 @@ static bool32 LoadBgGfx(void) return FALSE; break; case 5: - LoadPalette(GetTextWindowPalette(3), BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); + LoadPalette(GetTextWindowPalette(3), BG_PLTT_ID(13), PLTT_SIZE_4BPP); break; default: sGfx->loadState = 0; diff --git a/src/easy_chat.c b/src/easy_chat.c index 574ed22ee5..b74edcf842 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -820,7 +820,7 @@ static const struct WindowTemplate sEasyChatWindowTemplates[] = { .tilemapTop = 0, .width = 18, .height = 2, - .paletteNum = 0xA, + .paletteNum = 10, .baseBlock = 0x10, }, { @@ -829,7 +829,7 @@ static const struct WindowTemplate sEasyChatWindowTemplates[] = { .tilemapTop = 15, .width = 24, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0xA, }, { @@ -838,7 +838,7 @@ static const struct WindowTemplate sEasyChatWindowTemplates[] = { .tilemapTop = 0, .width = 28, .height = 32, - .paletteNum = 0x3, + .paletteNum = 3, .baseBlock = 0, }, DUMMY_WIN_TEMPLATE, @@ -850,7 +850,7 @@ static const struct WindowTemplate sEasyChatYesNoWindowTemplate = { .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x6A, }; @@ -3911,13 +3911,13 @@ static void InitEasyChatBgs(void) static void LoadEasyChatPalettes(void) { ResetPaletteFade(); - LoadPalette(gEasyChatMode_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); - LoadPalette(sTextInputFrameOrange_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); - LoadPalette(sTextInputFrameGreen_Pal, BG_PLTT_ID(0x4), PLTT_SIZE_4BPP); - LoadPalette(sTitleText_Pal, BG_PLTT_ID(0xA), PLTT_SIZEOF(4)); - LoadPalette(sText_Pal, BG_PLTT_ID(0xB), PLTT_SIZEOF(6)); - LoadPalette(sText_Pal, BG_PLTT_ID(0xF), PLTT_SIZEOF(6)); - LoadPalette(sText_Pal, BG_PLTT_ID(0x3), PLTT_SIZEOF(6)); + LoadPalette(gEasyChatMode_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); + LoadPalette(sTextInputFrameOrange_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); + LoadPalette(sTextInputFrameGreen_Pal, BG_PLTT_ID(4), PLTT_SIZE_4BPP); + LoadPalette(sTitleText_Pal, BG_PLTT_ID(10), PLTT_SIZEOF(4)); + LoadPalette(sText_Pal, BG_PLTT_ID(11), PLTT_SIZEOF(6)); + LoadPalette(sText_Pal, BG_PLTT_ID(15), PLTT_SIZEOF(6)); + LoadPalette(sText_Pal, BG_PLTT_ID(3), PLTT_SIZEOF(6)); } static void PrintTitle(void) @@ -3951,8 +3951,8 @@ static void PrintEasyChatTextWithColors(u8 windowId, u8 fontId, const u8 *str, u static void PrintInitialInstructions(void) { FillBgTilemapBufferRect(0, 0, 0, 0, 32, 20, 17); - LoadUserWindowBorderGfx(1, 1, BG_PLTT_ID(0xE)); - DrawTextBorderOuter(1, 1, 0xE); + LoadUserWindowBorderGfx(1, 1, BG_PLTT_ID(14)); + DrawTextBorderOuter(1, 1, 14); PrintEasyChatStdMessage(MSG_INSTRUCTIONS); PutWindowTilemap(1); CopyBgTilemapBufferToVram(0); @@ -4024,7 +4024,7 @@ static void AddPhraseWindow(void) template.tilemapTop = sPhraseFrameDimensions[frameId].top; template.width = sPhraseFrameDimensions[frameId].width; template.height = sPhraseFrameDimensions[frameId].height; - template.paletteNum = 0xB; + template.paletteNum = 11; template.baseBlock = 0x6C; sScreenControl->windowId = AddWindow(&template); PutWindowTilemap(sScreenControl->windowId); @@ -5069,7 +5069,7 @@ static void AddMainScreenButtonWindow(void) template.tilemapTop = 11; template.width = 28; template.height = 2; - template.paletteNum = 0xB; + template.paletteNum = 11; template.baseBlock = 0x34; windowId = AddWindow(&template); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 1832ec2156..08c4d1feed 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -264,7 +264,7 @@ static const struct WindowTemplate sWinTemplates_EggHatch[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 64 }, DUMMY_WIN_TEMPLATE @@ -277,7 +277,7 @@ static const struct WindowTemplate sYesNoWinTemplate = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 424 }; @@ -532,7 +532,7 @@ static void CB2_LoadEggHatch(void) case 2: DecompressAndLoadBgGfxUsingHeap(0, gBattleTextboxTiles, 0, 0, 0); CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); - LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0), PLTT_SIZE_4BPP); gMain.state++; break; case 3: @@ -556,7 +556,7 @@ static void CB2_LoadEggHatch(void) break; case 7: SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); - LoadPalette(gTradeGba2_Pal, BG_PLTT_ID(0x1), 5 * PLTT_SIZE_4BPP); + LoadPalette(gTradeGba2_Pal, BG_PLTT_ID(1), 5 * PLTT_SIZE_4BPP); LoadBgTiles(1, gTradeGba_Gfx, 0x1420, 0); CopyToBgTilemapBuffer(1, gTradePlatform_Tilemap, 0x1000, 0); CopyBgTilemapBufferToVram(1); @@ -678,7 +678,7 @@ static void CB2_EggHatch(void) // Print the nickname prompt if (!IsTextPrinterActive(sEggHatchData->windowId)) { - LoadUserWindowBorderGfx(sEggHatchData->windowId, 0x140, BG_PLTT_ID(0xE)); + LoadUserWindowBorderGfx(sEggHatchData->windowId, 0x140, BG_PLTT_ID(14)); CreateYesNoMenu(&sYesNoWinTemplate, 0x140, 0xE, 0); sEggHatchData->state++; } diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 9ca441bc4f..eeb22edd24 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -263,7 +263,7 @@ void EvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, bool8 canStopEvo, u gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_LEFT], currSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(currSpecies, trainerId, personality); - LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(0x1), PLTT_SIZE_4BPP); + LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(1), PLTT_SIZE_4BPP); SetMultiuseSpriteTemplateToPokemon(currSpecies, B_POSITION_OPPONENT_LEFT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; @@ -278,7 +278,7 @@ void EvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, bool8 canStopEvo, u gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT], postEvoSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); - LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(0x2), PLTT_SIZE_4BPP); + LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(2), PLTT_SIZE_4BPP); SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; @@ -356,7 +356,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) postEvoSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); - LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(0x2), PLTT_SIZE_4BPP); + LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(2), PLTT_SIZE_4BPP); SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; @@ -427,7 +427,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT], postEvoSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); - LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(0x2), PLTT_SIZE_4BPP); + LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(2), PLTT_SIZE_4BPP); gMain.state++; } break; @@ -492,7 +492,7 @@ void TradeEvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, u8 preEvoSprit postEvoSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); - LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(0x2), PLTT_SIZE_4BPP); + LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(2), PLTT_SIZE_4BPP); SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_LEFT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; @@ -1301,7 +1301,7 @@ static void Task_TradeEvolutionScene(u8 taskId) case T_MVSTATE_PRINT_YES_NO: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - LoadUserWindowBorderGfx(0, 0xA8, BG_PLTT_ID(0xE)); + LoadUserWindowBorderGfx(0, 0xA8, BG_PLTT_ID(14)); CreateYesNoMenu(&gTradeEvolutionSceneYesNoWindowTemplate, 0xA8, 0xE, 0); sEvoCursorPos = 0; gTasks[taskId].tLearnMoveState++; @@ -1507,7 +1507,7 @@ static void Task_UpdateBgPalette(u8 taskId) else { // Haven't reached final palette in current stage, load the current palette - LoadPalette(&sBgAnimPal[tPalStage * 16], BG_PLTT_ID(0xA), PLTT_SIZE_4BPP); + LoadPalette(&sBgAnimPal[tPalStage * 16], BG_PLTT_ID(10), PLTT_SIZE_4BPP); tCycleTimer = 0; tPalStage++; } @@ -1605,7 +1605,7 @@ static void StartBgAnimation(bool8 isLink) else innerBgId = 1, outerBgId = 3; - LoadPalette(sBgAnim_Intro_Pal, BG_PLTT_ID(0xA), PLTT_SIZE_4BPP); + LoadPalette(sBgAnim_Intro_Pal, BG_PLTT_ID(10), PLTT_SIZE_4BPP); DecompressAndLoadBgGfxUsingHeap(1, sBgAnim_Gfx, FALSE, 0, 0); CopyToBgTilemapBuffer(innerBgId, sBgAnim_Inner_Tilemap, 0, 0); @@ -1644,7 +1644,7 @@ static void PauseBgPaletteAnim(void) if (taskId != TASK_NONE) gTasks[taskId].tPaused = TRUE; - FillPalette(RGB_BLACK, BG_PLTT_ID(0xA), PLTT_SIZE_4BPP); + FillPalette(RGB_BLACK, BG_PLTT_ID(10), PLTT_SIZE_4BPP); } #undef tPaused @@ -1658,7 +1658,7 @@ static void StopBgAnimation(void) if ((taskId = FindTaskIdByFunc(Task_AnimateBg)) != TASK_NONE) DestroyTask(taskId); - FillPalette(RGB_BLACK, BG_PLTT_ID(0xA), PLTT_SIZE_4BPP); + FillPalette(RGB_BLACK, BG_PLTT_ID(10), PLTT_SIZE_4BPP); RestoreBgAfterAnim(); } diff --git a/src/field_effect.c b/src/field_effect.c index 242d55770f..0b155d935c 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2620,7 +2620,7 @@ static void FieldMoveShowMonOutdoorsEffect_LoadGfx(struct Task *task) u16 delta = ((REG_BG0CNT >> 8) << 11); CpuCopy16(sFieldMoveStreaksOutdoors_Gfx, (void *)(VRAM + offset), 0x200); CpuFill32(0, (void *)(VRAM + delta), 0x800); - LoadPalette(sFieldMoveStreaksOutdoors_Pal, BG_PLTT_ID(0xF), sizeof(sFieldMoveStreaksOutdoors_Pal)); + LoadPalette(sFieldMoveStreaksOutdoors_Pal, BG_PLTT_ID(15), sizeof(sFieldMoveStreaksOutdoors_Pal)); LoadFieldMoveOutdoorStreaksTilemap(delta); task->tState++; } @@ -2783,7 +2783,7 @@ static void FieldMoveShowMonIndoorsEffect_LoadGfx(struct Task *task) task->data[12] = delta; CpuCopy16(sFieldMoveStreaksIndoors_Gfx, (void *)(VRAM + offset), 0x80); CpuFill32(0, (void *)(VRAM + delta), 0x800); - LoadPalette(sFieldMoveStreaksIndoors_Pal, BG_PLTT_ID(0xF), sizeof(sFieldMoveStreaksIndoors_Pal)); + LoadPalette(sFieldMoveStreaksIndoors_Pal, BG_PLTT_ID(15), sizeof(sFieldMoveStreaksIndoors_Pal)); task->tState++; } @@ -3082,7 +3082,7 @@ u8 FldEff_RayquazaSpotlight(void) SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(14, 14)); SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); - LoadPalette(sSpotlight_Pal, BG_PLTT_ID(0xC), sizeof(sSpotlight_Pal)); + LoadPalette(sSpotlight_Pal, BG_PLTT_ID(12), sizeof(sSpotlight_Pal)); SetGpuReg(REG_OFFSET_BG0VOFS, 120); for (i = 3; i < 15; i++) { diff --git a/src/field_region_map.c b/src/field_region_map.c index cd728aef79..4a3c2bfd16 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -72,7 +72,7 @@ static const struct WindowTemplate sFieldRegionMapWindowTemplates[] = .tilemapTop = 17, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }, { @@ -81,7 +81,7 @@ static const struct WindowTemplate sFieldRegionMapWindowTemplates[] = .tilemapTop = 1, .width = 7, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 25 }, DUMMY_WIN_TEMPLATE @@ -115,7 +115,7 @@ static void MCB2_InitRegionMapRegisters(void) InitBgsFromTemplates(1, sFieldRegionMapBgTemplates, ARRAY_COUNT(sFieldRegionMapBgTemplates)); InitWindows(sFieldRegionMapWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 0x27, BG_PLTT_ID(0xD)); + LoadUserWindowBorderGfx(0, 0x27, BG_PLTT_ID(13)); ClearScheduledBgCopiesToVram(); SetMainCallback2(MCB2_FieldUpdateRegionMap); SetVBlankCallback(VBCB_FieldUpdateRegionMap); diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 2192aa574b..b09eeaa6be 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -1079,7 +1079,7 @@ static void LoadOrbEffectPalette(bool8 blueOrb) color[0] = RGB_BLUE; for (i = 0; i < 16; i++) - LoadPalette(color, BG_PLTT_ID(0xF) + i, PLTT_SIZEOF(1)); + LoadPalette(color, BG_PLTT_ID(15) + i, PLTT_SIZEOF(1)); } static bool8 UpdateOrbEffectBlend(u16 shakeDir) diff --git a/src/field_specials.c b/src/field_specials.c index 74c4a5e7ac..ed5592614d 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1638,7 +1638,7 @@ const struct WindowTemplate gElevatorFloor_WindowTemplate = .tilemapTop = 1, .width = 8, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 8, }; @@ -2845,7 +2845,7 @@ void ShowBattlePointsWindow(void) .tilemapTop = 1, .width = 6, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 8, }; @@ -2891,7 +2891,7 @@ void ShowFrontierExchangeCornerItemIconWindow(void) .tilemapTop = 9, .width = 4, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 20, }; @@ -3031,7 +3031,7 @@ static void ShowBattleFrontierTutorWindow(u8 menu, u16 selection) .tilemapTop = 7, .width = 12, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 28, }; @@ -3266,7 +3266,7 @@ static void Task_DeoxysRockInteraction(u8 taskId) static void ChangeDeoxysRockLevel(u8 rockLevel) { u8 objectEventId; - LoadPalette(&sDeoxysRockPalettes[rockLevel], OBJ_PLTT_ID(0xA), PLTT_SIZEOF(4)); + LoadPalette(&sDeoxysRockPalettes[rockLevel], OBJ_PLTT_ID(10), PLTT_SIZEOF(4)); TryGetObjectEventIdByLocalIdAndMap(LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); if (rockLevel == 0) @@ -3314,7 +3314,7 @@ void IncrementBirthIslandRockStepCount(void) void SetDeoxysRockPalette(void) { - LoadPalette(&sDeoxysRockPalettes[(u8)VarGet(VAR_DEOXYS_ROCK_LEVEL)], OBJ_PLTT_ID(0xA), PLTT_SIZEOF(4)); + LoadPalette(&sDeoxysRockPalettes[(u8)VarGet(VAR_DEOXYS_ROCK_LEVEL)], OBJ_PLTT_ID(10), PLTT_SIZEOF(4)); BlendPalettes(0x04000000, 16, 0); } diff --git a/src/field_weather.c b/src/field_weather.c index 164da8343d..13271f435f 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -556,7 +556,7 @@ static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaI { // No gamma shift. Simply blend the colors. BlendPalette(palOffset, 16, blendCoeff, blendColor); - palOffset += 0x10; + palOffset += 16; } else { @@ -601,14 +601,14 @@ static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 bl rBlend = color.r; gBlend = color.g; bBlend = color.b; - palOffset = 0x00; + palOffset = 0; for (curPalIndex = 0; curPalIndex < 32; curPalIndex++) { if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) { // No gamma shift. Simply blend the colors. BlendPalette(palOffset, 16, blendCoeff, blendColor); - palOffset += 0x10; + palOffset += 16; } else { @@ -649,7 +649,7 @@ static void ApplyFogBlend(u8 blendCoeff, u16 blendColor) u8 bBlend; u16 curPalIndex; - BlendPalette(BG_PLTT_ID(0x0), 16 * 16, blendCoeff, blendColor); + BlendPalette(BG_PLTT_ID(0), 16 * 16, blendCoeff, blendColor); color = *(struct RGBColor *)&blendColor; rBlend = color.r; gBlend = color.g; diff --git a/src/fieldmap.c b/src/fieldmap.c index 479150d489..ef890273f1 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -912,7 +912,7 @@ void CopySecondaryTilesetToVramUsingHeap(struct MapLayout const *mapLayout) static void LoadPrimaryTilesetPalette(struct MapLayout const *mapLayout) { - LoadTilesetPalette(mapLayout->primaryTileset, BG_PLTT_ID(0x0), NUM_PALS_IN_PRIMARY * PLTT_SIZE_4BPP); + LoadTilesetPalette(mapLayout->primaryTileset, BG_PLTT_ID(0), NUM_PALS_IN_PRIMARY * PLTT_SIZE_4BPP); } void LoadSecondaryTilesetPalette(struct MapLayout const *mapLayout) diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 3790636ea2..87d0117410 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -218,8 +218,8 @@ static void Task_ExitCaveTransition2(u8 taskId) SetGpuReg(REG_OFFSET_DISPCNT, 0); LZ77UnCompVram(sCaveTransitionTiles, (void *)(VRAM + 0xC000)); LZ77UnCompVram(sCaveTransitionTilemap, (void *)(VRAM + 0xF800)); - LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); - LoadPalette(sCaveTransitionPalette_Exit, BG_PLTT_ID(0xE), 0x10); + LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(14), PLTT_SIZE_4BPP); + LoadPalette(sCaveTransitionPalette_Exit, BG_PLTT_ID(14), PLTT_SIZEOF(8)); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 @@ -270,11 +270,11 @@ static void Task_ExitCaveTransition4(u8 taskId) if (count < 8) { gTasks[taskId].data[2]++; - LoadPalette(&sCaveTransitionPalette_Exit[count], BG_PLTT_ID(0xE), PLTT_SIZEOF(8) - PLTT_SIZEOF(count)); + LoadPalette(&sCaveTransitionPalette_Exit[count], BG_PLTT_ID(14), PLTT_SIZEOF(8) - PLTT_SIZEOF(count)); } else { - LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(0), PLTT_SIZE_4BPP); gTasks[taskId].func = Task_ExitCaveTransition5; gTasks[taskId].data[2] = 8; } @@ -315,8 +315,8 @@ static void Task_EnterCaveTransition2(u8 taskId) | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_OBJ_ON); - LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); - LoadPalette(sCaveTransitionPalette_Black, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(14), PLTT_SIZE_4BPP); + LoadPalette(sCaveTransitionPalette_Black, BG_PLTT_ID(0), PLTT_SIZE_4BPP); gTasks[taskId].func = Task_EnterCaveTransition3; gTasks[taskId].data[0] = 16; gTasks[taskId].data[1] = 0; @@ -331,7 +331,7 @@ static void Task_EnterCaveTransition3(u8 taskId) { gTasks[taskId].data[2]++; gTasks[taskId].data[2]++; - LoadPalette(&sCaveTransitionPalette_Enter[15 - count], BG_PLTT_ID(0xE), PLTT_SIZEOF(count + 1)); + LoadPalette(&sCaveTransitionPalette_Enter[15 - count], BG_PLTT_ID(14), PLTT_SIZEOF(count + 1)); } else { @@ -359,7 +359,7 @@ static void Task_EnterCaveTransition4(u8 taskId) } else { - LoadPalette(sCaveTransitionPalette_Black, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(sCaveTransitionPalette_Black, BG_PLTT_ID(0), PLTT_SIZE_4BPP); SetMainCallback2(gMain.savedCallback); } } diff --git a/src/frontier_pass.c b/src/frontier_pass.c index 48d4a5fce2..337fb7a653 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -253,7 +253,7 @@ static const struct WindowTemplate sPassWindowTemplates[WINDOW_COUNT] = .tilemapTop = 3, .width = 12, .height = 3, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x1, }, [WINDOW_BATTLE_RECORD] = { @@ -262,7 +262,7 @@ static const struct WindowTemplate sPassWindowTemplates[WINDOW_COUNT] = .tilemapTop = 10, .width = 12, .height = 3, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x26, }, [WINDOW_BATTLE_POINTS] = { @@ -271,7 +271,7 @@ static const struct WindowTemplate sPassWindowTemplates[WINDOW_COUNT] = .tilemapTop = 13, .width = 12, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x4B, }, [WINDOW_DESCRIPTION] = { @@ -280,7 +280,7 @@ static const struct WindowTemplate sPassWindowTemplates[WINDOW_COUNT] = .tilemapTop = 18, .width = 30, .height = 3, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x7C, }, DUMMY_WIN_TEMPLATE @@ -294,7 +294,7 @@ static const struct WindowTemplate sMapWindowTemplates[] = .tilemapTop = 1, .width = 15, .height = 5, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x1, }, [MAP_WINDOW_NAME] = { @@ -303,7 +303,7 @@ static const struct WindowTemplate sMapWindowTemplates[] = .tilemapTop = 1, .width = 10, .height = 14, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x4D, }, [MAP_WINDOW_DESCRIPTION] = { @@ -312,7 +312,7 @@ static const struct WindowTemplate sMapWindowTemplates[] = .tilemapTop = 16, .width = 26, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0xDA, }, DUMMY_WIN_TEMPLATE @@ -769,8 +769,8 @@ static bool32 InitFrontierPass(void) break; case 8: LoadPalette(gFrontierPassBg_Pal[0], 0, 13 * PLTT_SIZE_4BPP); - LoadPalette(gFrontierPassBg_Pal[1 + sPassData->trainerStars], BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); - LoadPalette(GetTextWindowPalette(0), BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(gFrontierPassBg_Pal[1 + sPassData->trainerStars], BG_PLTT_ID(1), PLTT_SIZE_4BPP); + LoadPalette(GetTextWindowPalette(0), BG_PLTT_ID(15), PLTT_SIZE_4BPP); DrawFrontierPassBg(); UpdateAreaHighlight(sPassData->cursorArea, sPassData->previousCursorArea); if (sPassData->areaToShow == CURSOR_AREA_MAP || sPassData->areaToShow == CURSOR_AREA_CARD) @@ -1412,8 +1412,8 @@ static bool32 InitFrontierMap(void) case 5: if (FreeTempTileDataBuffersIfPossible()) return FALSE; - LoadPalette(gFrontierPassBg_Pal[0], BG_PLTT_ID(0x0), 13 * PLTT_SIZE_4BPP); - LoadPalette(GetTextWindowPalette(0), BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(gFrontierPassBg_Pal[0], BG_PLTT_ID(0), 13 * PLTT_SIZE_4BPP); + LoadPalette(GetTextWindowPalette(0), BG_PLTT_ID(15), PLTT_SIZE_4BPP); CopyToBgTilemapBuffer(2, sMapScreen_Tilemap, 0, 0); CopyBgTilemapBufferToVram(2); break; diff --git a/src/frontier_util.c b/src/frontier_util.c index 9f8c030231..f5dde452fc 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -638,7 +638,7 @@ static const struct WindowTemplate sFrontierResultsWindowTemplate = .tilemapTop = 1, .width = 28, .height = 18, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }; @@ -649,7 +649,7 @@ static const struct WindowTemplate sLinkContestResultsWindowTemplate = .tilemapTop = 2, .width = 26, .height = 15, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }; @@ -660,7 +660,7 @@ static const struct WindowTemplate sRankingHallRecordsWindowTemplate = .tilemapTop = 1, .width = 26, .height = 17, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 07bbf9bb88..18aa19cce2 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -140,7 +140,7 @@ static const struct WindowTemplate sHof_WindowTemplate = { .tilemapTop = 2, .width = 14, .height = 6, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 1 }; @@ -702,8 +702,8 @@ static void Task_Hof_DisplayPlayer(u8 taskId) ShowBg(3); gTasks[taskId].tPlayerSpriteID = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId_Debug(gSaveBlock2Ptr->playerGender, TRUE), TRUE, 120, 72, 6, TAG_NONE); AddWindow(&sHof_WindowTemplate); - LoadWindowGfx(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, BG_PLTT_ID(0xD)); - LoadPalette(GetTextWindowPalette(1), BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); + LoadWindowGfx(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, BG_PLTT_ID(13)); + LoadPalette(GetTextWindowPalette(1), BG_PLTT_ID(14), PLTT_SIZE_4BPP); gTasks[taskId].tFrameCount = 120; gTasks[taskId].func = Task_Hof_WaitAndPrintPlayerInfo; } @@ -1269,7 +1269,7 @@ static void ClearVramOamPltt_LoadHofPal(void) DmaFill16(3, 0, plttOffset, plttSize); ResetPaletteFade(); - LoadPalette(sHallOfFame_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(sHallOfFame_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); } static void LoadHofGfx(void) diff --git a/src/intro.c b/src/intro.c index 06c5adba5d..5ae2fce8f4 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1080,7 +1080,7 @@ static u8 SetUpCopyrightScreen(void) CpuFill32(0, (void *)OAM, OAM_SIZE); CpuFill16(0, (void *)(PLTT + 2), PLTT_SIZE - 2); ResetPaletteFade(); - LoadCopyrightGraphics(0, 0x3800, BG_PLTT_ID(0x0)); + LoadCopyrightGraphics(0, 0x3800, BG_PLTT_ID(0)); ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); @@ -1178,7 +1178,7 @@ static void Task_Scene1_Load(u8 taskId) DmaClear16(3, BG_SCREEN_ADDR(21), BG_SCREEN_SIZE); LZ77UnCompVram(sIntro1Bg3_Tilemap, (void *)(BG_SCREEN_ADDR(22))); DmaClear16(3, BG_SCREEN_ADDR(23), BG_SCREEN_SIZE); - LoadPalette(sIntro1Bg_Pal, BG_PLTT_ID(0x0), sizeof(sIntro1Bg_Pal)); + LoadPalette(sIntro1Bg_Pal, BG_PLTT_ID(0), sizeof(sIntro1Bg_Pal)); SetGpuReg(REG_OFFSET_BG3CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(22) | BGCNT_16COLOR | BGCNT_TXT256x512); SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(20) | BGCNT_16COLOR | BGCNT_TXT256x512); SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(18) | BGCNT_16COLOR | BGCNT_TXT256x512); @@ -1717,7 +1717,7 @@ static void Task_Scene3_Load(u8 taskId) IntroResetGpuRegs(); LZ77UnCompVram(sIntroPokeball_Gfx, (void *)VRAM); LZ77UnCompVram(sIntroPokeball_Tilemap, (void *)(BG_CHAR_ADDR(1))); - LoadPalette(sIntroPokeball_Pal, BG_PLTT_ID(0x0), sizeof(sIntroPokeball_Pal)); + LoadPalette(sIntroPokeball_Pal, BG_PLTT_ID(0), sizeof(sIntroPokeball_Pal)); gTasks[taskId].tAlpha = 0; gTasks[taskId].tZoomDiv = 0; gTasks[taskId].tZoomDivSpeed = 0; @@ -2663,10 +2663,10 @@ static void Task_RayquazaAttack(u8 taskId) { if (--data[3] != 0) { - BlendPalette(BG_PLTT_ID(0x5), 16, data[3], RGB(9, 10, 10)); - CpuCopy16(&gIntro3Bg_Pal[0x1AC], &gPlttBufferFaded[BG_PLTT_ID(0x5) + 14], PLTT_SIZEOF(1)); - CpuCopy16(&gIntro3Bg_Pal[0x1AC], &gPlttBufferFaded[BG_PLTT_ID(0x5) + 8], PLTT_SIZEOF(1)); - CpuCopy16(&gIntro3Bg_Pal[0x18C], &gPlttBufferFaded[BG_PLTT_ID(0x5) + 12], PLTT_SIZEOF(1)); + BlendPalette(BG_PLTT_ID(5), 16, data[3], RGB(9, 10, 10)); + CpuCopy16(&gIntro3Bg_Pal[428], &gPlttBufferFaded[BG_PLTT_ID(5) + 14], PLTT_SIZEOF(1)); + CpuCopy16(&gIntro3Bg_Pal[428], &gPlttBufferFaded[BG_PLTT_ID(5) + 8], PLTT_SIZEOF(1)); + CpuCopy16(&gIntro3Bg_Pal[396], &gPlttBufferFaded[BG_PLTT_ID(5) + 12], PLTT_SIZEOF(1)); } else { diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 2851f8638d..7593a296e8 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -730,7 +730,7 @@ void LoadIntroPart2Graphics(u8 scenery) { LZ77UnCompVram(sGrass_Gfx, (void *)(BG_CHAR_ADDR(1))); LZ77UnCompVram(sGrass_Tilemap, (void *)(BG_SCREEN_ADDR(15))); - LoadPalette(&sGrass_Pal, BG_PLTT_ID(0xF), sizeof(sGrass_Pal)); + LoadPalette(&sGrass_Pal, BG_PLTT_ID(15), sizeof(sGrass_Pal)); switch (scenery) { case 0: @@ -739,17 +739,17 @@ void LoadIntroPart2Graphics(u8 scenery) // Clouds are never used in this part of the intro LZ77UnCompVram(sCloudsBg_Gfx, (void *)(VRAM)); LZ77UnCompVram(sCloudsBg_Tilemap, (void *)(BG_SCREEN_ADDR(6))); - LoadPalette(&sCloudsBg_Pal, BG_PLTT_ID(0x0), sizeof(sCloudsBg_Pal)); + LoadPalette(&sCloudsBg_Pal, BG_PLTT_ID(0), sizeof(sCloudsBg_Pal)); LoadCompressedSpriteSheet(sSpriteSheet_Clouds); - LoadPalette(&sClouds_Pal, OBJ_PLTT_ID(0x0), sizeof(sClouds_Pal)); + LoadPalette(&sClouds_Pal, OBJ_PLTT_ID(0), sizeof(sClouds_Pal)); CreateCloudSprites(); break; case 1: LZ77UnCompVram(sTrees_Gfx, (void *)(VRAM)); LZ77UnCompVram(sTrees_Tilemap, (void *)(BG_SCREEN_ADDR(6))); - LoadPalette(&sTrees_Pal, BG_PLTT_ID(0x0), sizeof(sTrees_Pal)); + LoadPalette(&sTrees_Pal, BG_PLTT_ID(0), sizeof(sTrees_Pal)); LoadCompressedSpriteSheet(sSpriteSheet_TreesSmall); - LoadPalette(&sTreesSmall_Pal, OBJ_PLTT_ID(0x0), sizeof(sTreesSmall_Pal)); + LoadPalette(&sTreesSmall_Pal, OBJ_PLTT_ID(0), sizeof(sTreesSmall_Pal)); CreateTreeSprites(); break; } @@ -843,42 +843,42 @@ void LoadCreditsSceneGraphics(u8 scene) { case SCENE_OCEAN_MORNING: default: - LoadPalette(&sGrass_Pal, BG_PLTT_ID(0xF), sizeof(sGrass_Pal)); + LoadPalette(&sGrass_Pal, BG_PLTT_ID(15), sizeof(sGrass_Pal)); LZ77UnCompVram(sCloudsBg_Gfx, (void *)(VRAM)); LZ77UnCompVram(sCloudsBg_Tilemap, (void *)(BG_SCREEN_ADDR(6))); - LoadPalette(&sCloudsBg_Pal, BG_PLTT_ID(0x0), sizeof(sCloudsBg_Pal)); + LoadPalette(&sCloudsBg_Pal, BG_PLTT_ID(0), sizeof(sCloudsBg_Pal)); LoadCompressedSpriteSheet(sSpriteSheet_Clouds); LZ77UnCompVram(sClouds_Gfx, (void *)(OBJ_VRAM0)); - LoadPalette(&sClouds_Pal, OBJ_PLTT_ID(0x0), sizeof(sClouds_Pal)); + LoadPalette(&sClouds_Pal, OBJ_PLTT_ID(0), sizeof(sClouds_Pal)); CreateCloudSprites(); break; case SCENE_OCEAN_SUNSET: - LoadPalette(&sGrassSunset_Pal, BG_PLTT_ID(0xF), sizeof(sGrassSunset_Pal)); + LoadPalette(&sGrassSunset_Pal, BG_PLTT_ID(15), sizeof(sGrassSunset_Pal)); LZ77UnCompVram(sCloudsBg_Gfx, (void *)(VRAM)); LZ77UnCompVram(sCloudsBg_Tilemap, (void *)(BG_SCREEN_ADDR(6))); - LoadPalette(&sCloudsBgSunset_Pal, BG_PLTT_ID(0x0), sizeof(sCloudsBgSunset_Pal)); + LoadPalette(&sCloudsBgSunset_Pal, BG_PLTT_ID(0), sizeof(sCloudsBgSunset_Pal)); LoadCompressedSpriteSheet(sSpriteSheet_Clouds); LZ77UnCompVram(sClouds_Gfx, (void *)(OBJ_VRAM0)); - LoadPalette(&sCloudsSunset_Pal, OBJ_PLTT_ID(0x0), sizeof(sCloudsSunset_Pal)); + LoadPalette(&sCloudsSunset_Pal, OBJ_PLTT_ID(0), sizeof(sCloudsSunset_Pal)); CreateCloudSprites(); break; case SCENE_FOREST_RIVAL_ARRIVE: case SCENE_FOREST_CATCH_RIVAL: - LoadPalette(&sGrassSunset_Pal, BG_PLTT_ID(0xF), sizeof(sGrassSunset_Pal)); + LoadPalette(&sGrassSunset_Pal, BG_PLTT_ID(15), sizeof(sGrassSunset_Pal)); LZ77UnCompVram(sTrees_Gfx, (void *)(VRAM)); LZ77UnCompVram(sTrees_Tilemap, (void *)(BG_SCREEN_ADDR(6))); - LoadPalette(&sTreesSunset_Pal, BG_PLTT_ID(0x0), sizeof(sTreesSunset_Pal)); + LoadPalette(&sTreesSunset_Pal, BG_PLTT_ID(0), sizeof(sTreesSunset_Pal)); LoadCompressedSpriteSheet(sSpriteSheet_TreesSmall); - LoadPalette(&sTreesSunset_Pal, OBJ_PLTT_ID(0x0), sizeof(sTreesSunset_Pal)); + LoadPalette(&sTreesSunset_Pal, OBJ_PLTT_ID(0), sizeof(sTreesSunset_Pal)); CreateTreeSprites(); break; case SCENE_CITY_NIGHT: - LoadPalette(&sGrassNight_Pal, BG_PLTT_ID(0xF), sizeof(sGrassNight_Pal)); + LoadPalette(&sGrassNight_Pal, BG_PLTT_ID(15), sizeof(sGrassNight_Pal)); LZ77UnCompVram(sHouses_Gfx, (void *)(VRAM)); LZ77UnCompVram(sHouses_Tilemap, (void *)(BG_SCREEN_ADDR(6))); - LoadPalette(&sHouses_Pal, BG_PLTT_ID(0x0), sizeof(sHouses_Pal)); + LoadPalette(&sHouses_Pal, BG_PLTT_ID(0), sizeof(sHouses_Pal)); LoadCompressedSpriteSheet(sSpriteSheet_HouseSilhouette); - LoadPalette(&sHouseSilhouette_Pal, OBJ_PLTT_ID(0x0), sizeof(sHouseSilhouette_Pal)); + LoadPalette(&sHouseSilhouette_Pal, OBJ_PLTT_ID(0), sizeof(sHouseSilhouette_Pal)); CreateHouseSprites(); break; } @@ -1006,8 +1006,8 @@ void CycleSceneryPalette(u8 mode) x = gPlttBufferUnfaded[10]; y = gPlttBufferUnfaded[9]; } - LoadPalette(&x, BG_PLTT_ID(0x0) + 9, sizeof(x)); - LoadPalette(&y, BG_PLTT_ID(0x0) + 10, sizeof(y)); + LoadPalette(&x, BG_PLTT_ID(0) + 9, sizeof(x)); + LoadPalette(&y, BG_PLTT_ID(0) + 10, sizeof(y)); break; case 2: if (gMain.vblankCounter1 & 3 || gPaletteFade.active) @@ -1022,8 +1022,8 @@ void CycleSceneryPalette(u8 mode) x = RGB(28, 24, 0); y = RGB(7, 9, 15); } - LoadPalette(&x, BG_PLTT_ID(0x0) + 12, sizeof(x)); - LoadPalette(&y, BG_PLTT_ID(0x0) + 13, sizeof(y)); + LoadPalette(&x, BG_PLTT_ID(0) + 12, sizeof(x)); + LoadPalette(&y, BG_PLTT_ID(0) + 13, sizeof(y)); break; case 1: break; diff --git a/src/item_menu.c b/src/item_menu.c index 33b204291f..51d4f4a8ec 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -399,7 +399,7 @@ static const struct WindowTemplate sDefaultBagWindows[] = .tilemapTop = 2, .width = 15, .height = 16, - .paletteNum = 0x1, + .paletteNum = 1, .baseBlock = 0x27, }, [WIN_DESCRIPTION] = { @@ -408,7 +408,7 @@ static const struct WindowTemplate sDefaultBagWindows[] = .tilemapTop = 13, .width = 14, .height = 6, - .paletteNum = 0x1, + .paletteNum = 1, .baseBlock = 0x117, }, [WIN_POCKET_NAME] = { @@ -417,7 +417,7 @@ static const struct WindowTemplate sDefaultBagWindows[] = .tilemapTop = 1, .width = 8, .height = 2, - .paletteNum = 0x1, + .paletteNum = 1, .baseBlock = 0x1A1, }, [WIN_TMHM_INFO_ICONS] = { @@ -426,7 +426,7 @@ static const struct WindowTemplate sDefaultBagWindows[] = .tilemapTop = 13, .width = 5, .height = 6, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x16B, }, [WIN_TMHM_INFO] = { @@ -435,7 +435,7 @@ static const struct WindowTemplate sDefaultBagWindows[] = .tilemapTop = 13, .width = 4, .height = 6, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x189, }, [WIN_MESSAGE] = { @@ -444,7 +444,7 @@ static const struct WindowTemplate sDefaultBagWindows[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x1B1, }, DUMMY_WIN_TEMPLATE, @@ -458,7 +458,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 17, .width = 7, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x21D, }, [ITEMWIN_1x2] = { @@ -467,7 +467,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 15, .width = 7, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x21D, }, [ITEMWIN_2x2] = { @@ -476,7 +476,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 15, .width = 14, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x21D, }, [ITEMWIN_2x3] = { @@ -485,7 +485,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 13, .width = 14, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x21D, }, [ITEMWIN_MESSAGE] = { @@ -494,7 +494,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x1B1, }, [ITEMWIN_YESNO_LOW] = { // Yes/No tucked in corner, for toss confirm @@ -503,7 +503,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 15, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x21D, }, [ITEMWIN_YESNO_HIGH] = { // Yes/No higher up, positioned above a lower message box @@ -512,7 +512,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x21D, }, [ITEMWIN_QUANTITY] = { // Used for quantity of items to Toss/Deposit @@ -521,7 +521,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 17, .width = 5, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x21D, }, [ITEMWIN_QUANTITY_WIDE] = { // Used for quantity and price of items to Sell @@ -530,7 +530,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 11, .width = 10, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x245, }, [ITEMWIN_MONEY] = { @@ -539,7 +539,7 @@ static const struct WindowTemplate sContextMenuWindowTemplates[] = .tilemapTop = 1, .width = 10, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x231, }, }; @@ -818,9 +818,9 @@ static bool8 LoadBagMenu_Graphics(void) break; case 2: if (!IsWallysBag() && gSaveBlock2Ptr->playerGender != MALE) - LoadCompressedPalette(gBagScreenFemale_Pal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBagScreenFemale_Pal, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); else - LoadCompressedPalette(gBagScreenMale_Pal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBagScreenMale_Pal, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); gBagMenu->graphicsLoadState++; break; case 3: @@ -2448,10 +2448,10 @@ static void LoadBagMenuTextWindows(void) InitWindows(sDefaultBagWindows); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xE)); - LoadMessageBoxGfx(0, 10, BG_PLTT_ID(0xD)); - ListMenuLoadStdPalAt(BG_PLTT_ID(0xC), 1); - LoadPalette(&gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(14)); + LoadMessageBoxGfx(0, 10, BG_PLTT_ID(13)); + ListMenuLoadStdPalAt(BG_PLTT_ID(12), 1); + LoadPalette(&gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); for (i = 0; i <= WIN_POCKET_NAME; i++) { FillWindowPixelBuffer(i, PIXEL_FILL(0)); diff --git a/src/link.c b/src/link.c index a78849ddbe..c1344cb7b4 100644 --- a/src/link.c +++ b/src/link.c @@ -200,7 +200,7 @@ static const struct WindowTemplate sLinkErrorWindowTemplates[] = { .tilemapTop = 0, .width = 30, .height = 5, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x002 }, { .bg = 0, @@ -208,7 +208,7 @@ static const struct WindowTemplate sLinkErrorWindowTemplates[] = { .tilemapTop = 6, .width = 30, .height = 7, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x098 }, { .bg = 0, @@ -216,7 +216,7 @@ static const struct WindowTemplate sLinkErrorWindowTemplates[] = { .tilemapTop = 13, .width = 30, .height = 7, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x16A }, DUMMY_WIN_TEMPLATE }; @@ -1621,7 +1621,7 @@ void CB2_LinkError(void) SetGpuReg(REG_OFFSET_BG1HOFS, 0); SetGpuReg(REG_OFFSET_BG1VOFS, 0); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON | DISPCNT_WIN1_ON | DISPCNT_OBJWIN_ON); - LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); gSoftResetDisabled = FALSE; CreateTask(Task_DestroySelf, 0); StopMapMusic(); diff --git a/src/mail.c b/src/mail.c index 52ce8df5ea..a652131f61 100644 --- a/src/mail.c +++ b/src/mail.c @@ -113,7 +113,7 @@ static const struct WindowTemplate sWindowTemplates[] = { .tilemapTop = 3, .width = 26, .height = 15, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }, DUMMY_WIN_TEMPLATE @@ -566,13 +566,13 @@ static bool8 MailReadBuildGraphics(void) CopyBgTilemapBufferToVram(2); break; case 12: - LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(15), PLTT_SIZE_4BPP); gPlttBufferUnfaded[250] = sMailGraphics[sMailRead->mailType].textColor; gPlttBufferFaded[250] = sMailGraphics[sMailRead->mailType].textColor; gPlttBufferUnfaded[251] = sMailGraphics[sMailRead->mailType].textShadow; gPlttBufferFaded[251] = sMailGraphics[sMailRead->mailType].textShadow; - LoadPalette(sMailGraphics[sMailRead->mailType].palette, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(sMailGraphics[sMailRead->mailType].palette, BG_PLTT_ID(0), PLTT_SIZE_4BPP); gPlttBufferUnfaded[10] = sBgColors[gSaveBlock2Ptr->playerGender][0]; gPlttBufferFaded[10] = sBgColors[gSaveBlock2Ptr->playerGender][0]; diff --git a/src/main_menu.c b/src/main_menu.c index 381676c0da..9937a6426b 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -294,7 +294,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN0, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN0, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }, // OPTIONS @@ -304,7 +304,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN1, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN1, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x35 }, // Has saved game @@ -315,7 +315,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN2, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }, // NEW GAME @@ -325,7 +325,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN3, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN3, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x9D }, // OPTION / MYSTERY GIFT @@ -335,7 +335,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN4, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0xD1 }, // OPTION / MYSTERY EVENTS @@ -345,7 +345,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN5, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN5, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x105 }, // OPTION @@ -355,7 +355,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_WIN6, .width = MENU_WIDTH, .height = MENU_HEIGHT_WIN6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x139 }, // Error message window @@ -365,7 +365,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = .tilemapTop = MENU_TOP_ERROR, .width = MENU_WIDTH_ERROR, .height = MENU_HEIGHT_ERROR, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x16D }, DUMMY_WIN_TEMPLATE @@ -379,7 +379,7 @@ static const struct WindowTemplate sNewGameBirchSpeechTextWindows[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }, { @@ -388,7 +388,7 @@ static const struct WindowTemplate sNewGameBirchSpeechTextWindows[] = .tilemapTop = 5, .width = 6, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x6D }, { @@ -397,7 +397,7 @@ static const struct WindowTemplate sNewGameBirchSpeechTextWindows[] = .tilemapTop = 2, .width = 9, .height = 10, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x85 }, DUMMY_WIN_TEMPLATE @@ -571,8 +571,8 @@ static u32 InitMainMenu(bool8 returningFromOptionsMenu) DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2); ResetPaletteFade(); - LoadPalette(sMainMenuBgPal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); - LoadPalette(sMainMenuTextPal, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(sMainMenuBgPal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); + LoadPalette(sMainMenuTextPal, BG_PLTT_ID(15), PLTT_SIZE_4BPP); ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); @@ -750,28 +750,28 @@ static void Task_DisplayMainMenu(u8 taskId) SetGpuReg(REG_OFFSET_BLDY, 7); palette = RGB_BLACK; - LoadPalette(&palette, BG_PLTT_ID(0xF) + 14, PLTT_SIZEOF(1)); + LoadPalette(&palette, BG_PLTT_ID(15) + 14, PLTT_SIZEOF(1)); palette = RGB_WHITE; - LoadPalette(&palette, BG_PLTT_ID(0xF) + 10, PLTT_SIZEOF(1)); + LoadPalette(&palette, BG_PLTT_ID(15) + 10, PLTT_SIZEOF(1)); palette = RGB(12, 12, 12); - LoadPalette(&palette, BG_PLTT_ID(0xF) + 11, PLTT_SIZEOF(1)); + LoadPalette(&palette, BG_PLTT_ID(15) + 11, PLTT_SIZEOF(1)); palette = RGB(26, 26, 25); - LoadPalette(&palette, BG_PLTT_ID(0xF) + 12, PLTT_SIZEOF(1)); + LoadPalette(&palette, BG_PLTT_ID(15) + 12, PLTT_SIZEOF(1)); // Note: If there is no save file, the save block is zeroed out, // so the default gender is MALE. if (gSaveBlock2Ptr->playerGender == MALE) { palette = RGB(4, 16, 31); - LoadPalette(&palette, BG_PLTT_ID(0xF) + 1, PLTT_SIZEOF(1)); + LoadPalette(&palette, BG_PLTT_ID(15) + 1, PLTT_SIZEOF(1)); } else { palette = RGB(31, 3, 21); - LoadPalette(&palette, BG_PLTT_ID(0xF) + 1, PLTT_SIZEOF(1)); + LoadPalette(&palette, BG_PLTT_ID(15) + 1, PLTT_SIZEOF(1)); } switch (gTasks[taskId].tMenuType) @@ -1274,8 +1274,8 @@ static void Task_NewGameBirchSpeech_Init(u8 taskId) LZ77UnCompVram(sBirchSpeechShadowGfx, (void *)VRAM); LZ77UnCompVram(sBirchSpeechBgMap, (void *)(BG_SCREEN_ADDR(7))); - LoadPalette(sBirchSpeechBgPals, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); - LoadPalette(sBirchSpeechPlatformBlackPal, BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(8)); + LoadPalette(sBirchSpeechBgPals, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); + LoadPalette(sBirchSpeechPlatformBlackPal, BG_PLTT_ID(0) + 1, PLTT_SIZEOF(8)); ScanlineEffect_Stop(); ResetSpriteData(); FreeAllSpritePalettes(); @@ -1327,7 +1327,7 @@ static void Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome(u8 taskId) { InitWindows(sNewGameBirchSpeechTextWindows); LoadMainMenuWindowFrameTiles(0, 0xF3); - LoadMessageBoxGfx(0, 0xFC, BG_PLTT_ID(0xF)); + LoadMessageBoxGfx(0, 0xFC, BG_PLTT_ID(15)); NewGameBirchSpeech_ShowDialogueWindow(0, 1); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_GFX); @@ -1809,8 +1809,8 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void) ResetPaletteFade(); LZ77UnCompVram(sBirchSpeechShadowGfx, (u8 *)VRAM); LZ77UnCompVram(sBirchSpeechBgMap, (u8 *)(BG_SCREEN_ADDR(7))); - LoadPalette(sBirchSpeechBgPals, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); - LoadPalette(&sBirchSpeechBgGradientPal[1], BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(8)); + LoadPalette(sBirchSpeechBgPals, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); + LoadPalette(&sBirchSpeechBgGradientPal[1], BG_PLTT_ID(0) + 1, PLTT_SIZEOF(8)); ResetTasks(); taskId = CreateTask(Task_NewGameBirchSpeech_ReturnFromNamingScreenShowTextbox, 0); gTasks[taskId].tTimer = 5; @@ -1853,7 +1853,7 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void) SetMainCallback2(CB2_MainMenu); InitWindows(sNewGameBirchSpeechTextWindows); LoadMainMenuWindowFrameTiles(0, 0xF3); - LoadMessageBoxGfx(0, 0xFC, BG_PLTT_ID(0xF)); + LoadMessageBoxGfx(0, 0xFC, BG_PLTT_ID(15)); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); } @@ -2029,7 +2029,7 @@ static void Task_NewGameBirchSpeech_FadePlatformIn(u8 taskId) { gTasks[taskId].tDelayTimer = gTasks[taskId].tDelay; gTasks[taskId].tPalIndex++; - LoadPalette(&sBirchSpeechBgGradientPal[gTasks[taskId].tPalIndex], BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(8)); + LoadPalette(&sBirchSpeechBgGradientPal[gTasks[taskId].tPalIndex], BG_PLTT_ID(0) + 1, PLTT_SIZEOF(8)); } } @@ -2063,7 +2063,7 @@ static void Task_NewGameBirchSpeech_FadePlatformOut(u8 taskId) { gTasks[taskId].tDelayTimer = gTasks[taskId].tDelay; gTasks[taskId].tPalIndex--; - LoadPalette(&sBirchSpeechBgGradientPal[gTasks[taskId].tPalIndex], BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(8)); + LoadPalette(&sBirchSpeechBgGradientPal[gTasks[taskId].tPalIndex], BG_PLTT_ID(0) + 1, PLTT_SIZEOF(8)); } } @@ -2191,7 +2191,7 @@ static void MainMenu_FormatSavegameBadges(void) static void LoadMainMenuWindowFrameTiles(u8 bgId, u16 tileOffset) { LoadBgTiles(bgId, GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->tiles, 0x120, tileOffset); - LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); + LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, BG_PLTT_ID(2), PLTT_SIZE_4BPP); } static void DrawMainMenuWindowBorder(const struct WindowTemplate *template, u16 baseTileNum) @@ -2204,26 +2204,26 @@ static void DrawMainMenuWindowBorder(const struct WindowTemplate *template, u16 u16 sp14 = 7 + baseTileNum; u16 r6 = 8 + baseTileNum; - FillBgTilemapBufferRect(template->bg, baseTileNum, template->tilemapLeft - 1, template->tilemapTop - 1, 1, 1, 0x2); - FillBgTilemapBufferRect(template->bg, r9, template->tilemapLeft, template->tilemapTop - 1, template->width, 1, 0x2); - FillBgTilemapBufferRect(template->bg, r10, template->tilemapLeft + template->width, template->tilemapTop - 1, 1, 1, 0x2); - FillBgTilemapBufferRect(template->bg, sp18, template->tilemapLeft - 1, template->tilemapTop, 1, template->height, 0x2); - FillBgTilemapBufferRect(template->bg, spC, template->tilemapLeft + template->width, template->tilemapTop, 1, template->height, 0x2); - FillBgTilemapBufferRect(template->bg, sp10, template->tilemapLeft - 1, template->tilemapTop + template->height, 1, 1, 0x2); - FillBgTilemapBufferRect(template->bg, sp14, template->tilemapLeft, template->tilemapTop + template->height, template->width, 1, 0x2); - FillBgTilemapBufferRect(template->bg, r6, template->tilemapLeft + template->width, template->tilemapTop + template->height, 1, 1, 0x2); + FillBgTilemapBufferRect(template->bg, baseTileNum, template->tilemapLeft - 1, template->tilemapTop - 1, 1, 1, 2); + FillBgTilemapBufferRect(template->bg, r9, template->tilemapLeft, template->tilemapTop - 1, template->width, 1, 2); + FillBgTilemapBufferRect(template->bg, r10, template->tilemapLeft + template->width, template->tilemapTop - 1, 1, 1, 2); + FillBgTilemapBufferRect(template->bg, sp18, template->tilemapLeft - 1, template->tilemapTop, 1, template->height, 2); + FillBgTilemapBufferRect(template->bg, spC, template->tilemapLeft + template->width, template->tilemapTop, 1, template->height, 2); + FillBgTilemapBufferRect(template->bg, sp10, template->tilemapLeft - 1, template->tilemapTop + template->height, 1, 1, 2); + FillBgTilemapBufferRect(template->bg, sp14, template->tilemapLeft, template->tilemapTop + template->height, template->width, 1, 2); + FillBgTilemapBufferRect(template->bg, r6, template->tilemapLeft + template->width, template->tilemapTop + template->height, 1, 1, 2); CopyBgTilemapBufferToVram(template->bg); } static void ClearMainMenuWindowTilemap(const struct WindowTemplate *template) { - FillBgTilemapBufferRect(template->bg, 0, template->tilemapLeft - 1, template->tilemapTop - 1, template->tilemapLeft + template->width + 1, template->tilemapTop + template->height + 1, 0x2); + FillBgTilemapBufferRect(template->bg, 0, template->tilemapLeft - 1, template->tilemapTop - 1, template->tilemapLeft + template->width + 1, template->tilemapTop + template->height + 1, 2); CopyBgTilemapBufferToVram(template->bg); } static void NewGameBirchSpeech_ClearGenderWindowTilemap(u8 bg, u8 x, u8 y, u8 width, u8 height, u8 unused) { - FillBgTilemapBufferRect(bg, 0, x + 255, y + 255, width + 2, height + 2, 0x2); + FillBgTilemapBufferRect(bg, 0, x + 255, y + 255, width + 2, height + 2, 2); } static void NewGameBirchSpeech_ClearGenderWindow(u8 windowId, bool8 copyToVram) diff --git a/src/map_name_popup.c b/src/map_name_popup.c index f7d5320d34..93a2825833 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -351,19 +351,19 @@ static void DrawMapNamePopUpFrame(u8 bg, u8 x, u8 y, u8 deltaX, u8 deltaY, u8 un // Draw top edge for (i = 0; i < 1 + TILE_TOP_EDGE_END - TILE_TOP_EDGE_START; i++) - FillBgTilemapBufferRect(bg, TILE_TOP_EDGE_START + i, i - 1 + x, y - 1, 1, 1, 0xE); + FillBgTilemapBufferRect(bg, TILE_TOP_EDGE_START + i, i - 1 + x, y - 1, 1, 1, 14); // Draw sides - FillBgTilemapBufferRect(bg, TILE_LEFT_EDGE_TOP, x - 1, y, 1, 1, 0xE); - FillBgTilemapBufferRect(bg, TILE_RIGHT_EDGE_TOP, deltaX + x, y, 1, 1, 0xE); - FillBgTilemapBufferRect(bg, TILE_LEFT_EDGE_MID, x - 1, y + 1, 1, 1, 0xE); - FillBgTilemapBufferRect(bg, TILE_RIGHT_EDGE_MID, deltaX + x, y + 1, 1, 1, 0xE); - FillBgTilemapBufferRect(bg, TILE_LEFT_EDGE_BOT, x - 1, y + 2, 1, 1, 0xE); - FillBgTilemapBufferRect(bg, TILE_RIGHT_EDGE_BOT, deltaX + x, y + 2, 1, 1, 0xE); + FillBgTilemapBufferRect(bg, TILE_LEFT_EDGE_TOP, x - 1, y, 1, 1, 14); + FillBgTilemapBufferRect(bg, TILE_RIGHT_EDGE_TOP, deltaX + x, y, 1, 1, 14); + FillBgTilemapBufferRect(bg, TILE_LEFT_EDGE_MID, x - 1, y + 1, 1, 1, 14); + FillBgTilemapBufferRect(bg, TILE_RIGHT_EDGE_MID, deltaX + x, y + 1, 1, 1, 14); + FillBgTilemapBufferRect(bg, TILE_LEFT_EDGE_BOT, x - 1, y + 2, 1, 1, 14); + FillBgTilemapBufferRect(bg, TILE_RIGHT_EDGE_BOT, deltaX + x, y + 2, 1, 1, 14); // Draw bottom edge for (i = 0; i < 1 + TILE_BOT_EDGE_END - TILE_BOT_EDGE_START; i++) - FillBgTilemapBufferRect(bg, TILE_BOT_EDGE_START + i, i - 1 + x, y + deltaY, 1, 1, 0xE); + FillBgTilemapBufferRect(bg, TILE_BOT_EDGE_START + i, i - 1 + x, y + deltaY, 1, 1, 14); } static void LoadMapNamePopUpWindowBg(void) @@ -385,8 +385,8 @@ static void LoadMapNamePopUpWindowBg(void) CallWindowFunction(popupWindowId, DrawMapNamePopUpFrame); PutWindowTilemap(popupWindowId); if (gMapHeader.weather == WEATHER_UNDERWATER_BUBBLES) - LoadPalette(&sMapPopUp_Palette_Underwater, BG_PLTT_ID(0xE), sizeof(sMapPopUp_Palette_Underwater)); + LoadPalette(&sMapPopUp_Palette_Underwater, BG_PLTT_ID(14), sizeof(sMapPopUp_Palette_Underwater)); else - LoadPalette(sMapPopUp_PaletteTable[popUpThemeId], BG_PLTT_ID(0xE), sizeof(sMapPopUp_PaletteTable[0])); + LoadPalette(sMapPopUp_PaletteTable[popUpThemeId], BG_PLTT_ID(14), sizeof(sMapPopUp_PaletteTable[0])); BlitBitmapToWindow(popupWindowId, sMapPopUp_Table[popUpThemeId], 0, 0, 80, 24); } diff --git a/src/match_call.c b/src/match_call.c index 5d92e55b9f..a9d18b3477 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1235,7 +1235,7 @@ static const struct WindowTemplate sMatchCallTextWindow = .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x200 }; @@ -1267,8 +1267,8 @@ static bool32 MatchCall_LoadGfx(u8 taskId) } FillWindowPixelBuffer(tWindowId, PIXEL_FILL(8)); - LoadPalette(sMatchCallWindow_Pal, BG_PLTT_ID(0xE), sizeof(sMatchCallWindow_Pal)); - LoadPalette(sPokenavIcon_Pal, BG_PLTT_ID(0xF), sizeof(sPokenavIcon_Pal)); + LoadPalette(sMatchCallWindow_Pal, BG_PLTT_ID(14), sizeof(sMatchCallWindow_Pal)); + LoadPalette(sPokenavIcon_Pal, BG_PLTT_ID(15), sizeof(sPokenavIcon_Pal)); ChangeBgY(0, -0x2000, BG_COORD_SET); return TRUE; } diff --git a/src/menu.c b/src/menu.c index 2a8b2f565b..ad3381de9b 100644 --- a/src/menu.c +++ b/src/menu.c @@ -20,9 +20,9 @@ #include "window.h" #include "constants/songs.h" -#define DLG_WINDOW_PALETTE_NUM 0xF +#define DLG_WINDOW_PALETTE_NUM 15 #define DLG_WINDOW_BASE_TILE_NUM 0x200 -#define STD_WINDOW_PALETTE_NUM 0xE +#define STD_WINDOW_PALETTE_NUM 14 #define STD_WINDOW_PALETTE_SIZE PLTT_SIZEOF(10) #define STD_WINDOW_BASE_TILE_NUM 0x214 @@ -89,7 +89,7 @@ static const struct WindowTemplate sStandardTextBox_WindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x194 }, DUMMY_WIN_TEMPLATE @@ -102,7 +102,7 @@ static const struct WindowTemplate sYesNo_WindowTemplates = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x125 }; @@ -429,7 +429,7 @@ void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram) void LoadMessageBoxAndFrameGfx(u8 windowId, bool8 copyToVram) { LoadMessageBoxGfx(windowId, DLG_WINDOW_BASE_TILE_NUM, BG_PLTT_ID(DLG_WINDOW_PALETTE_NUM)); - DrawDialogFrameWithCustomTileAndPalette(windowId, copyToVram, DLG_WINDOW_BASE_TILE_NUM, 0xF); + DrawDialogFrameWithCustomTileAndPalette(windowId, copyToVram, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM); } void Menu_LoadStdPal(void) @@ -686,7 +686,7 @@ void ClearDialogWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram) static void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { - FillBgTilemapBufferRect(bg, 0, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, 0x0); + FillBgTilemapBufferRect(bg, 0, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, 0); } void DrawStdFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 baseTileNum, u8 paletteNum) @@ -783,7 +783,7 @@ void ClearStdWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram) static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { - FillBgTilemapBufferRect(bg, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, 0x0); + FillBgTilemapBufferRect(bg, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, 0); } // Creates the window used to display the info bar at the top of the HOF PC that shows the controls and team number. @@ -806,8 +806,8 @@ u8 HofPCTopBar_AddWindow(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile) sHofPCTopBarWindowId = AddWindow(&window); - if (palette > 0xF) - palette = BG_PLTT_ID(0xF); + if (palette > 15) + palette = BG_PLTT_ID(15); else palette = BG_PLTT_ID(palette); diff --git a/src/menu_specialized.c b/src/menu_specialized.c index f4d3493d7c..10c57f6e27 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -48,7 +48,7 @@ static const struct WindowTemplate sWindowTemplates_MailboxMenu[MAILBOXWIN_COUNT .tilemapTop = 1, .width = 8, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x8 }, [MAILBOXWIN_LIST] = { @@ -57,7 +57,7 @@ static const struct WindowTemplate sWindowTemplates_MailboxMenu[MAILBOXWIN_COUNT .tilemapTop = 1, .width = 8, .height = 18, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x18 }, [MAILBOXWIN_OPTIONS] = { @@ -66,7 +66,7 @@ static const struct WindowTemplate sWindowTemplates_MailboxMenu[MAILBOXWIN_COUNT .tilemapTop = 1, .width = 11, .height = 8, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x18 } }; @@ -114,7 +114,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] = .tilemapTop = 1, .width = 16, .height = 12, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0xA }, { @@ -123,7 +123,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] = .tilemapTop = 1, .width = 16, .height = 12, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0xCA }, { @@ -132,7 +132,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] = .tilemapTop = 1, .width = 10, .height = 12, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x18A }, { @@ -141,7 +141,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] = .tilemapTop = 15, .width = 22, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x202 }, { @@ -150,7 +150,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] = .tilemapTop = 8, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x25A }, DUMMY_WIN_TEMPLATE @@ -163,7 +163,7 @@ static const struct WindowTemplate sMoveRelearnerYesNoMenuTemplate = .tilemapTop = 8, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x25A }; @@ -707,8 +707,8 @@ void InitMoveRelearnerWindows(bool8 useContextWindow) InitWindows(sMoveRelearnerWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xE)); - LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(14)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); for (i = 0; i < ARRAY_COUNT(sMoveRelearnerWindowTemplates) - 1; i++) FillWindowPixelBuffer(i, PIXEL_FILL(1)); diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 59e6d999e2..eecfe20dbd 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -46,7 +46,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 22, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 20 }, { @@ -55,7 +55,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 6, .width = 16, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x6C }, DUMMY_WIN_TEMPLATE @@ -91,8 +91,8 @@ void CB2_InitMysteryEventMenu(void) FillWindowPixelBuffer(i, PIXEL_FILL(0)); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); - LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD)); - Menu_LoadStdPalAt(BG_PLTT_ID(0xE)); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(13)); + Menu_LoadStdPalAt(BG_PLTT_ID(14)); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON); SetGpuReg(REG_OFFSET_BLDCNT, 0); CreateTask(Task_DestroySelf, 0); diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index f9e2c2af9a..b12d6735c6 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -33,7 +33,7 @@ #include "constants/cable_club.h" #define LIST_MENU_TILE_NUM 10 -#define LIST_MENU_PAL_NUM BG_PLTT_ID(0xE) +#define LIST_MENU_PAL_NUM BG_PLTT_ID(14) static void LoadMysteryGiftTextboxBorder(u8 bgId); static void CreateMysteryGiftTask(void); @@ -104,7 +104,7 @@ static const struct WindowTemplate sMainWindows[] = { .tilemapTop = 0, .width = 30, .height = 2, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x0013 }, { .bg = 0, @@ -112,7 +112,7 @@ static const struct WindowTemplate sMainWindows[] = { .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x004f }, { .bg = 0, @@ -120,7 +120,7 @@ static const struct WindowTemplate sMainWindows[] = { .tilemapTop = 15, .width = 30, .height = 5, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 0x004f }, DUMMY_WIN_TEMPLATE @@ -132,7 +132,7 @@ static const struct WindowTemplate sWindowTemplate_YesNoMsg_Wide = { .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x00e5 }; @@ -142,7 +142,7 @@ static const struct WindowTemplate sWindowTemplate_YesNoMsg = { .tilemapTop = 15, .width = 20, .height = 4, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x00e5 }; @@ -152,7 +152,7 @@ static const struct WindowTemplate sWindowTemplate_GiftSelect = { .tilemapTop = 15, .width = 19, .height = 4, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x00e5 }; @@ -162,7 +162,7 @@ static const struct WindowTemplate sWindowTemplate_ThreeOptions = { .tilemapTop = 6, .width = 14, .height = 6, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x0155 }; @@ -172,7 +172,7 @@ static const struct WindowTemplate sWindowTemplate_YesNoBox = { .tilemapTop = 15, .width = 6, .height = 4, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x0155 }; @@ -182,7 +182,7 @@ static const struct WindowTemplate sWindowTemplate_GiftSelect_3Options = { .tilemapTop = 11, .width = 7, .height = 8, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x0155 }; @@ -192,7 +192,7 @@ static const struct WindowTemplate sWindowTemplate_GiftSelect_2Options = { .tilemapTop = 13, .width = 7, .height = 6, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x0155 }; @@ -202,7 +202,7 @@ static const struct WindowTemplate sWindowTemplate_GiftSelect_1Option = { .tilemapTop = 15, .width = 7, .height = 4, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x0155 }; @@ -411,11 +411,11 @@ static bool32 HandleMysteryGiftOrEReaderSetup(s32 isEReader) gMain.state++; break; case 1: - LoadPalette(sTextboxBorder_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); - LoadPalette(GetTextWindowPalette(2), BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); - Menu_LoadStdPalAt(BG_PLTT_ID(0xC)); - LoadUserWindowBorderGfx(0, 0xA, BG_PLTT_ID(0xE)); - LoadUserWindowBorderGfx_(0, 0x1, BG_PLTT_ID(0xF)); + LoadPalette(sTextboxBorder_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); + LoadPalette(GetTextWindowPalette(2), BG_PLTT_ID(13), PLTT_SIZE_4BPP); + Menu_LoadStdPalAt(BG_PLTT_ID(12)); + LoadUserWindowBorderGfx(0, 0xA, BG_PLTT_ID(14)); + LoadUserWindowBorderGfx_(0, 0x1, BG_PLTT_ID(15)); FillBgTilemapBufferRect(0, 0x000, 0, 0, 32, 32, 17); FillBgTilemapBufferRect(1, 0x000, 0, 0, 32, 32, 17); FillBgTilemapBufferRect(2, 0x000, 0, 0, 32, 32, 17); diff --git a/src/mystery_gift_view.c b/src/mystery_gift_view.c index d279bb2f54..4427373165 100644 --- a/src/mystery_gift_view.c +++ b/src/mystery_gift_view.c @@ -96,7 +96,7 @@ static const struct WindowTemplate sCard_WindowTemplates[] = { .tilemapTop = 1, .width = 25, .height = 4, - .paletteNum = 0x2, + .paletteNum = 2, .baseBlock = 0x029c }, [CARD_WIN_BODY] = { @@ -105,7 +105,7 @@ static const struct WindowTemplate sCard_WindowTemplates[] = { .tilemapTop = 6, .width = 28, .height = 8, - .paletteNum = 0x2, + .paletteNum = 2, .baseBlock = 0x01bc }, [CARD_WIN_FOOTER] = { @@ -114,7 +114,7 @@ static const struct WindowTemplate sCard_WindowTemplates[] = { .tilemapTop = 14, .width = 28, .height = 5, - .paletteNum = 0x2, + .paletteNum = 2, .baseBlock = 0x0130 } }; @@ -239,11 +239,11 @@ s32 WonderCard_Enter(void) case 3: if (FreeTempTileDataBuffersIfPossible()) return 0; - LoadPalette(GetTextWindowPalette(1), BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); + LoadPalette(GetTextWindowPalette(1), BG_PLTT_ID(2), PLTT_SIZE_4BPP); gPaletteFade.bufferTransferDisabled = TRUE; - LoadPalette(sWonderCardData->gfx->pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + LoadPalette(sWonderCardData->gfx->pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); LZ77UnCompWram(sWonderCardData->gfx->map, sWonderCardData->bgTilemapBuffer); - CopyRectToBgTilemapBufferRect(2, sWonderCardData->bgTilemapBuffer, 0, 0, 30, 20, 0, 0, 30, 20, 0x1, 0x008, 0); + CopyRectToBgTilemapBufferRect(2, sWonderCardData->bgTilemapBuffer, 0, 0, 30, 20, 0, 0, 30, 20, 1, 0x008, 0); CopyBgTilemapBufferToVram(2); break; case 4: @@ -586,7 +586,7 @@ static const struct WindowTemplate sNews_WindowTemplates[] = { .tilemapTop = 0, .width = 28, .height = 3, - .paletteNum = 0x2, + .paletteNum = 2, .baseBlock = 0x2AC }, [NEWS_WIN_BODY] = { @@ -595,7 +595,7 @@ static const struct WindowTemplate sNews_WindowTemplates[] = { .tilemapTop = 3, .width = 28, .height = 20, - .paletteNum = 0x2, + .paletteNum = 2, .baseBlock = 0x07C } }; @@ -702,12 +702,12 @@ s32 WonderNews_Enter(void) case 3: if (FreeTempTileDataBuffersIfPossible()) return 0; - LoadPalette(GetTextWindowPalette(1), BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); + LoadPalette(GetTextWindowPalette(1), BG_PLTT_ID(2), PLTT_SIZE_4BPP); gPaletteFade.bufferTransferDisabled = TRUE; - LoadPalette(sWonderNewsData->gfx->pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + LoadPalette(sWonderNewsData->gfx->pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); LZ77UnCompWram(sWonderNewsData->gfx->map, sWonderNewsData->bgTilemapBuffer); - CopyRectToBgTilemapBufferRect(1, sWonderNewsData->bgTilemapBuffer, 0, 0, 30, 3, 0, 0, 30, 3, 0x1, 8, 0); - CopyRectToBgTilemapBufferRect(3, sWonderNewsData->bgTilemapBuffer, 0, 3, 30, 23, 0, 3, 30, 23, 0x1, 8, 0); + CopyRectToBgTilemapBufferRect(1, sWonderNewsData->bgTilemapBuffer, 0, 0, 30, 3, 0, 0, 30, 3, 1, 8, 0); + CopyRectToBgTilemapBufferRect(3, sWonderNewsData->bgTilemapBuffer, 0, 3, 30, 23, 0, 3, 30, 23, 1, 8, 0); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(3); break; diff --git a/src/naming_screen.c b/src/naming_screen.c index bbdcef5658..4cd03ffba8 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -233,7 +233,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 10, .width = 19, .height = 8, - .paletteNum = 0xA, + .paletteNum = 10, .baseBlock = 0x030 }, [WIN_KB_PAGE_2] = { @@ -242,7 +242,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 10, .width = 19, .height = 8, - .paletteNum = 0xA, + .paletteNum = 10, .baseBlock = 0x0C8 }, [WIN_TEXT_ENTRY] = { @@ -251,7 +251,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 6, .width = 17, .height = 2, - .paletteNum = 0xA, + .paletteNum = 10, .baseBlock = 0x030 }, [WIN_TEXT_ENTRY_BOX] = { @@ -260,7 +260,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 4, .width = 17, .height = 2, - .paletteNum = 0xA, + .paletteNum = 10, .baseBlock = 0x052 }, [WIN_BANNER] = { @@ -269,7 +269,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 0, .width = 30, .height = 2, - .paletteNum = 0xB, + .paletteNum = 11, .baseBlock = 0x074 }, DUMMY_WIN_TEMPLATE @@ -1880,9 +1880,9 @@ static void CreateHelperTasks(void) static void LoadPalettes(void) { - LoadPalette(gNamingScreenMenu_Pal, BG_PLTT_ID(0x0), sizeof(gNamingScreenMenu_Pal)); - LoadPalette(sKeyboard_Pal, BG_PLTT_ID(0xA), sizeof(sKeyboard_Pal)); - LoadPalette(GetTextWindowPalette(2), BG_PLTT_ID(0xB), PLTT_SIZE_4BPP); + LoadPalette(gNamingScreenMenu_Pal, BG_PLTT_ID(0), sizeof(gNamingScreenMenu_Pal)); + LoadPalette(sKeyboard_Pal, BG_PLTT_ID(10), sizeof(sKeyboard_Pal)); + LoadPalette(GetTextWindowPalette(2), BG_PLTT_ID(11), PLTT_SIZE_4BPP); } static void DrawBgTilemap(u8 bg, const void *src) diff --git a/src/option_menu.c b/src/option_menu.c index e3d767c5e1..d2f1bc4ce0 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -102,7 +102,7 @@ static const struct WindowTemplate sOptionMenuWinTemplates[] = .tilemapTop = 1, .width = 26, .height = 2, - .paletteNum = 0x1, + .paletteNum = 1, .baseBlock = 2 }, { @@ -111,7 +111,7 @@ static const struct WindowTemplate sOptionMenuWinTemplates[] = .tilemapTop = 5, .width = 26, .height = 14, - .paletteNum = 0x1, + .paletteNum = 1, .baseBlock = 0x36 }, DUMMY_WIN_TEMPLATE @@ -207,12 +207,12 @@ void CB2_InitOptionMenu(void) gMain.state++; break; case 4: - LoadPalette(sOptionMenuBg_Pal, BG_PLTT_ID(0x0), sizeof(sOptionMenuBg_Pal)); - LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, BG_PLTT_ID(0x7), PLTT_SIZE_4BPP); + LoadPalette(sOptionMenuBg_Pal, BG_PLTT_ID(0), sizeof(sOptionMenuBg_Pal)); + LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, BG_PLTT_ID(7), PLTT_SIZE_4BPP); gMain.state++; break; case 5: - LoadPalette(sOptionMenuText_Pal, BG_PLTT_ID(0x1), sizeof(sOptionMenuText_Pal)); + LoadPalette(sOptionMenuText_Pal, BG_PLTT_ID(1), sizeof(sOptionMenuText_Pal)); gMain.state++; break; case 6: @@ -529,7 +529,7 @@ static u8 FrameType_ProcessInput(u8 selection) selection = 0; LoadBgTiles(1, GetWindowFrameTilesPal(selection)->tiles, 0x120, 0x1A2); - LoadPalette(GetWindowFrameTilesPal(selection)->pal, BG_PLTT_ID(0x7), PLTT_SIZE_4BPP); + LoadPalette(GetWindowFrameTilesPal(selection)->pal, BG_PLTT_ID(7), PLTT_SIZE_4BPP); sArrowPressed = TRUE; } if (JOY_NEW(DPAD_LEFT)) @@ -540,7 +540,7 @@ static u8 FrameType_ProcessInput(u8 selection) selection = WINDOW_FRAMES_COUNT - 1; LoadBgTiles(1, GetWindowFrameTilesPal(selection)->tiles, 0x120, 0x1A2); - LoadPalette(GetWindowFrameTilesPal(selection)->pal, BG_PLTT_ID(0x7), PLTT_SIZE_4BPP); + LoadPalette(GetWindowFrameTilesPal(selection)->pal, BG_PLTT_ID(7), PLTT_SIZE_4BPP); sArrowPressed = TRUE; } return selection; @@ -653,24 +653,24 @@ static void DrawBgWindowFrames(void) { // bg, tile, x, y, width, height, palNum // Draw title window frame - FillBgTilemapBufferRect(1, TILE_TOP_CORNER_L, 1, 0, 1, 1, 0x7); - FillBgTilemapBufferRect(1, TILE_TOP_EDGE, 2, 0, 27, 1, 0x7); - FillBgTilemapBufferRect(1, TILE_TOP_CORNER_R, 28, 0, 1, 1, 0x7); - FillBgTilemapBufferRect(1, TILE_LEFT_EDGE, 1, 1, 1, 2, 0x7); - FillBgTilemapBufferRect(1, TILE_RIGHT_EDGE, 28, 1, 1, 2, 0x7); - FillBgTilemapBufferRect(1, TILE_BOT_CORNER_L, 1, 3, 1, 1, 0x7); - FillBgTilemapBufferRect(1, TILE_BOT_EDGE, 2, 3, 27, 1, 0x7); - FillBgTilemapBufferRect(1, TILE_BOT_CORNER_R, 28, 3, 1, 1, 0x7); + FillBgTilemapBufferRect(1, TILE_TOP_CORNER_L, 1, 0, 1, 1, 7); + FillBgTilemapBufferRect(1, TILE_TOP_EDGE, 2, 0, 27, 1, 7); + FillBgTilemapBufferRect(1, TILE_TOP_CORNER_R, 28, 0, 1, 1, 7); + FillBgTilemapBufferRect(1, TILE_LEFT_EDGE, 1, 1, 1, 2, 7); + FillBgTilemapBufferRect(1, TILE_RIGHT_EDGE, 28, 1, 1, 2, 7); + FillBgTilemapBufferRect(1, TILE_BOT_CORNER_L, 1, 3, 1, 1, 7); + FillBgTilemapBufferRect(1, TILE_BOT_EDGE, 2, 3, 27, 1, 7); + FillBgTilemapBufferRect(1, TILE_BOT_CORNER_R, 28, 3, 1, 1, 7); // Draw options list window frame - FillBgTilemapBufferRect(1, TILE_TOP_CORNER_L, 1, 4, 1, 1, 0x7); - FillBgTilemapBufferRect(1, TILE_TOP_EDGE, 2, 4, 26, 1, 0x7); - FillBgTilemapBufferRect(1, TILE_TOP_CORNER_R, 28, 4, 1, 1, 0x7); - FillBgTilemapBufferRect(1, TILE_LEFT_EDGE, 1, 5, 1, 18, 0x7); - FillBgTilemapBufferRect(1, TILE_RIGHT_EDGE, 28, 5, 1, 18, 0x7); - FillBgTilemapBufferRect(1, TILE_BOT_CORNER_L, 1, 19, 1, 1, 0x7); - FillBgTilemapBufferRect(1, TILE_BOT_EDGE, 2, 19, 26, 1, 0x7); - FillBgTilemapBufferRect(1, TILE_BOT_CORNER_R, 28, 19, 1, 1, 0x7); + FillBgTilemapBufferRect(1, TILE_TOP_CORNER_L, 1, 4, 1, 1, 7); + FillBgTilemapBufferRect(1, TILE_TOP_EDGE, 2, 4, 26, 1, 7); + FillBgTilemapBufferRect(1, TILE_TOP_CORNER_R, 28, 4, 1, 1, 7); + FillBgTilemapBufferRect(1, TILE_LEFT_EDGE, 1, 5, 1, 18, 7); + FillBgTilemapBufferRect(1, TILE_RIGHT_EDGE, 28, 5, 1, 18, 7); + FillBgTilemapBufferRect(1, TILE_BOT_CORNER_L, 1, 19, 1, 1, 7); + FillBgTilemapBufferRect(1, TILE_BOT_EDGE, 2, 19, 26, 1, 7); + FillBgTilemapBufferRect(1, TILE_BOT_CORNER_R, 28, 19, 1, 1, 7); CopyBgTilemapBufferToVram(1); } diff --git a/src/palette.c b/src/palette.c index e02e0de5bf..577257eff3 100644 --- a/src/palette.c +++ b/src/palette.c @@ -431,7 +431,7 @@ static u8 UpdateNormalPaletteFade(void) gPaletteFade.delayCounter = 0; } - paletteOffset = 0x00; + paletteOffset = 0; if (!gPaletteFade.objPaletteToggle) { @@ -452,7 +452,7 @@ static u8 UpdateNormalPaletteFade(void) gPaletteFade.y, gPaletteFade.blendColor); selectedPalettes >>= 1; - paletteOffset += 0x10; + paletteOffset += 16; } gPaletteFade.objPaletteToggle ^= 1; @@ -495,7 +495,7 @@ static u8 UpdateNormalPaletteFade(void) void InvertPlttBuffer(u32 selectedPalettes) { - u16 paletteOffset = 0x00; + u16 paletteOffset = 0; while (selectedPalettes) { @@ -506,13 +506,13 @@ void InvertPlttBuffer(u32 selectedPalettes) gPlttBufferFaded[paletteOffset + i] = ~gPlttBufferFaded[paletteOffset + i]; } selectedPalettes >>= 1; - paletteOffset += 0x10; + paletteOffset += 16; } } void TintPlttBuffer(u32 selectedPalettes, s8 r, s8 g, s8 b) { - u16 paletteOffset = 0x00; + u16 paletteOffset = 0; while (selectedPalettes) { @@ -528,13 +528,13 @@ void TintPlttBuffer(u32 selectedPalettes, s8 r, s8 g, s8 b) } } selectedPalettes >>= 1; - paletteOffset += 0x10; + paletteOffset += 16; } } void UnfadePlttBuffer(u32 selectedPalettes) { - u16 paletteOffset = 0x00; + u16 paletteOffset = 0; while (selectedPalettes) { @@ -545,7 +545,7 @@ void UnfadePlttBuffer(u32 selectedPalettes) gPlttBufferFaded[paletteOffset + i] = gPlttBufferUnfaded[paletteOffset + i]; } selectedPalettes >>= 1; - paletteOffset += 0x10; + paletteOffset += 16; } } @@ -835,7 +835,7 @@ void BlendPalettes(u32 selectedPalettes, u8 coeff, u16 color) { u16 paletteOffset; - for (paletteOffset = 0x00; selectedPalettes; paletteOffset += 0x10) + for (paletteOffset = 0; selectedPalettes; paletteOffset += 16) { if (selectedPalettes & 1) BlendPalette(paletteOffset, 16, coeff, color); diff --git a/src/party_menu.c b/src/party_menu.c index 2a4abef2a8..1526f36f20 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -668,7 +668,7 @@ static bool8 AllocPartyMenuBgGfx(void) } break; case 2: - LoadCompressedPalette(gPartyMenuBg_Pal, BG_PLTT_ID(0x0), 11 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gPartyMenuBg_Pal, BG_PLTT_ID(0), 11 * PLTT_SIZE_4BPP); CpuCopy16(gPlttBufferUnfaded, sPartyMenuInternal->palBuffer, 11 * PLTT_SIZE_4BPP); sPartyMenuInternal->data[0]++; break; @@ -1021,7 +1021,7 @@ static void CreateCancelConfirmPokeballSprites(void) if (gPartyMenu.menuType == PARTY_MENU_TYPE_MULTI_SHOWCASE) { // The showcase has no Cancel/Confirm buttons - FillBgTilemapBufferRect(1, 14, 23, 17, 7, 2, 0x1); + FillBgTilemapBufferRect(1, 14, 23, 17, 7, 2, 1); } else { @@ -2015,9 +2015,9 @@ static void InitPartyMenuWindows(u8 layout) DeactivateAllTextPrinters(); for (i = 0; i < PARTY_SIZE; i++) FillWindowPixelBuffer(i, PIXEL_FILL(0)); - LoadUserWindowBorderGfx(0, 0x4F, BG_PLTT_ID(0xD)); - LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); - LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadUserWindowBorderGfx(0, 0x4F, BG_PLTT_ID(13)); + LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(14), PLTT_SIZE_4BPP); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); } static void CreateCancelConfirmWindows(bool8 chooseHalf) @@ -2417,7 +2417,7 @@ void DisplayPartyMenuStdMessage(u32 stringId) else if (!ShouldUseChooseMonText()) stringId = PARTY_MSG_CHOOSE_MON_OR_CANCEL; } - DrawStdFrameWithCustomTileAndPalette(*windowPtr, FALSE, 0x4F, 0xD); + DrawStdFrameWithCustomTileAndPalette(*windowPtr, FALSE, 0x4F, 13); StringExpandPlaceholders(gStringVar4, sActionStringTable[stringId]); AddTextPrinterParameterized(*windowPtr, FONT_NORMAL, gStringVar4, 0, 1, 0, 0); ScheduleBgCopyTilemapToVram(2); @@ -2822,7 +2822,7 @@ static void MoveAndBufferPartySlot(const void *rectSrc, s16 x, s16 y, s16 width, { FillBgTilemapBufferRect_Palette0(0, 0, newX, y, newWidth, height); if (TryMovePartySlot(x + dir, width, &srcX, &newX, &newWidth)) - CopyRectToBgTilemapBufferRect(0, rectSrc, srcX, 0, width, height, newX, y, newWidth, height, 17, 0, 0x0); + CopyRectToBgTilemapBufferRect(0, rectSrc, srcX, 0, width, height, newX, y, newWidth, height, 17, 0, 0); } } diff --git a/src/player_pc.c b/src/player_pc.c index 1998495beb..9ec36d61d2 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -244,7 +244,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenus[] = .tilemapTop = 1, .width = 9, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }, [WIN_MAIN_MENU_BEDROOM] = { @@ -253,7 +253,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenus[] = .tilemapTop = 1, .width = 9, .height = 8, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }, [WIN_ITEM_STORAGE_MENU] = { @@ -262,7 +262,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenus[] = .tilemapTop = 1, .width = 10, .height = 8, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 } }; @@ -302,7 +302,7 @@ static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT .tilemapTop = 1, .width = 13, .height = 18, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0001 }, [ITEMPC_WIN_MESSAGE] = { @@ -311,7 +311,7 @@ static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT .tilemapTop = 13, .width = 13, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x00EB }, [ITEMPC_WIN_ICON] = { @@ -320,7 +320,7 @@ static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT .tilemapTop = 8, .width = 3, .height = 3, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0153 }, [ITEMPC_WIN_TITLE] = { @@ -329,7 +329,7 @@ static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT .tilemapTop = 1, .width = 13, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0139 }, [ITEMPC_WIN_QUANTITY] = { @@ -338,7 +338,7 @@ static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT .tilemapTop = 9, .width = 6, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x015C }, [ITEMPC_WIN_YESNO] = { @@ -347,7 +347,7 @@ static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT .tilemapTop = 7, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0168 } }; diff --git a/src/pokeblock.c b/src/pokeblock.c index 769363b3eb..f698a25f32 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -314,7 +314,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 1, .width = 9, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x1E }, [WIN_LIST] = { @@ -323,7 +323,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 1, .width = 14, .height = 18, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x30 }, [WIN_SPICY] = { @@ -332,7 +332,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 13, .width = 5, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x12C }, [WIN_DRY] = { @@ -341,7 +341,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 5, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x136 }, [WIN_SWEET] = { @@ -350,7 +350,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 17, .width = 5, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x140 }, [WIN_BITTER] = { @@ -359,7 +359,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 13, .width = 5, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x14A }, [WIN_SOUR] = { @@ -368,7 +368,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 5, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x154 }, [WIN_FEEL] = { @@ -377,7 +377,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 17, .width = 2, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x15E }, [WIN_ACTIONS_TALL] = { @@ -386,7 +386,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 5, .width = 6, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x162 }, [WIN_ACTIONS] = { @@ -395,7 +395,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 7, .width = 6, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x186 }, [WIN_TOSS_MSG] = { @@ -404,7 +404,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x19E }, DUMMY_WIN_TEMPLATE @@ -417,7 +417,7 @@ static const struct WindowTemplate sTossPkblockWindowTemplate = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x20A }; @@ -653,7 +653,7 @@ static bool8 LoadPokeblockMenuGfx(void) } break; case 2: - LoadCompressedPalette(gMenuPokeblock_Pal, BG_PLTT_ID(0x0), 6 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gMenuPokeblock_Pal, BG_PLTT_ID(0), 6 * PLTT_SIZE_4BPP); sPokeblockMenu->gfxState++; break; case 3: @@ -679,9 +679,9 @@ static void HandleInitWindows(void) InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xE)); - LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(0xD)); - LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(14)); + LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(13)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); for (i = 0; i < ARRAY_COUNT(sWindowTemplates) - 1; i++) FillWindowPixelBuffer(i, PIXEL_FILL(0)); diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 53de0ee9a5..7117be8856 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -459,7 +459,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 28, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0xA }, DUMMY_WIN_TEMPLATE @@ -771,7 +771,7 @@ static bool8 LoadMonAndSceneGfx(struct Pokemon *mon) } break; case 8: - LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(0x2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); sPokeblockFeed->loadGfxState = 0; return TRUE; } @@ -783,8 +783,8 @@ static void HandleInitWindows(void) { InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xE)); - LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(14)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); ScheduleBgCopyTilemapToVram(0); diff --git a/src/pokedex.c b/src/pokedex.c index 6a5de60179..bf1ff370c6 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -831,7 +831,7 @@ static const struct WindowTemplate sPokemonList_WindowTemplate[] = .tilemapTop = 0, .width = 32, .height = 32, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 1, }, DUMMY_WIN_TEMPLATE @@ -902,7 +902,7 @@ static const struct WindowTemplate sInfoScreen_WindowTemplates[] = .tilemapTop = 0, .width = 32, .height = 20, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 1, }, [WIN_FOOTPRINT] = @@ -912,7 +912,7 @@ static const struct WindowTemplate sInfoScreen_WindowTemplates[] = .tilemapTop = 8, .width = 2, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 641, }, [WIN_CRY_WAVE] = @@ -922,7 +922,7 @@ static const struct WindowTemplate sInfoScreen_WindowTemplates[] = .tilemapTop = 12, .width = 32, .height = 7, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 645, }, [WIN_VU_METER] = @@ -932,7 +932,7 @@ static const struct WindowTemplate sInfoScreen_WindowTemplates[] = .tilemapTop = 3, .width = 10, .height = 8, - .paletteNum = 0x9, + .paletteNum = 9, .baseBlock = 869, }, DUMMY_WIN_TEMPLATE @@ -969,7 +969,7 @@ static const struct WindowTemplate sNewEntryInfoScreen_WindowTemplates[] = .tilemapTop = 0, .width = 32, .height = 20, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 1, }, [WIN_FOOTPRINT] = @@ -979,7 +979,7 @@ static const struct WindowTemplate sNewEntryInfoScreen_WindowTemplates[] = .tilemapTop = 8, .width = 2, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 641, }, DUMMY_WIN_TEMPLATE @@ -1490,7 +1490,7 @@ static const struct WindowTemplate sSearchMenu_WindowTemplate[] = .tilemapTop = 0, .width = 32, .height = 20, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 0x0001, }, DUMMY_WIN_TEMPLATE @@ -2145,12 +2145,12 @@ static bool8 LoadPokedexListPage(u8 page) static void LoadPokedexBgPalette(bool8 isSearchResults) { if (isSearchResults == TRUE) - LoadPalette(gPokedexSearchResults_Pal + 1, BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(6 * 16 - 1)); + LoadPalette(gPokedexSearchResults_Pal + 1, BG_PLTT_ID(0) + 1, PLTT_SIZEOF(6 * 16 - 1)); else if (!IsNationalPokedexEnabled()) - LoadPalette(gPokedexBgHoenn_Pal + 1, BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(6 * 16 - 1)); + LoadPalette(gPokedexBgHoenn_Pal + 1, BG_PLTT_ID(0) + 1, PLTT_SIZEOF(6 * 16 - 1)); else - LoadPalette(gPokedexBgNational_Pal + 1, BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(6 * 16 - 1)); - LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(gPokedexBgNational_Pal + 1, BG_PLTT_ID(0) + 1, PLTT_SIZEOF(6 * 16 - 1)); + LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(15), PLTT_SIZE_4BPP); } static void FreeWindowAndBgBuffers(void) @@ -3264,7 +3264,7 @@ static void Task_LoadInfoScreen(u8 taskId) case 4: PrintMonInfo(sPokedexListItem->dexNum, sPokedexView->dexMode == DEX_MODE_HOENN ? FALSE : TRUE, sPokedexListItem->owned, 0); if (!sPokedexListItem->owned) - LoadPalette(gPlttBufferUnfaded + 1, BG_PLTT_ID(0x3) + 1, PLTT_SIZEOF(16 - 1)); + LoadPalette(gPlttBufferUnfaded + 1, BG_PLTT_ID(3) + 1, PLTT_SIZEOF(16 - 1)); CopyWindowToVram(WIN_INFO, COPYWIN_FULL); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(2); @@ -3713,7 +3713,7 @@ static void LoadPlayArrowPalette(bool8 cryPlaying) color = RGB(18, 28, 0); else color = RGB(15, 21, 0); - LoadPalette(&color, BG_PLTT_ID(0x5) + 13, PLTT_SIZEOF(1)); + LoadPalette(&color, BG_PLTT_ID(5) + 13, PLTT_SIZEOF(1)); } static void Task_LoadSizeScreen(u8 taskId) @@ -4030,11 +4030,11 @@ static void Task_HandleCaughtMonPageInput(u8 taskId) // Flicker caught screen color else if (++gTasks[taskId].tPalTimer & 16) { - LoadPalette(gPokedexBgHoenn_Pal + 1, BG_PLTT_ID(0x3) + 1, PLTT_SIZEOF(7)); + LoadPalette(gPokedexBgHoenn_Pal + 1, BG_PLTT_ID(3) + 1, PLTT_SIZEOF(7)); } else { - LoadPalette(gPokedexCaughtScreen_Pal + 1, BG_PLTT_ID(0x3) + 1, PLTT_SIZEOF(7)); + LoadPalette(gPokedexCaughtScreen_Pal + 1, BG_PLTT_ID(3) + 1, PLTT_SIZEOF(7)); } } @@ -4836,7 +4836,7 @@ static void Task_LoadSearchMenu(u8 taskId) CopyToBgTilemapBuffer(3, gPokedexSearchMenuHoenn_Tilemap, 0, 0); else CopyToBgTilemapBuffer(3, gPokedexSearchMenuNational_Tilemap, 0, 0); - LoadPalette(gPokedexSearchMenu_Pal + 1, BG_PLTT_ID(0x0) + 1, PLTT_SIZEOF(4 * 16 - 1)); + LoadPalette(gPokedexSearchMenu_Pal + 1, BG_PLTT_ID(0) + 1, PLTT_SIZEOF(4 * 16 - 1)); gMain.state = 1; } break; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 92df35ecc7..237f728381 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1201,7 +1201,7 @@ void TryLoadAllMonIconPalettesAtOffset(u16 offset) s32 i; const struct SpritePalette* monIconPalettePtr; - if (offset <= BG_PLTT_ID(0xA)) + if (offset <= BG_PLTT_ID(10)) { monIconPalettePtr = gMonIconPaletteTable; for (i = ARRAY_COUNT(gMonIconPaletteTable) - 1; i >= 0; i--) diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 4039a62c6a..963552d7df 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -3105,7 +3105,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 0, .width = 6, .height = 2, - .paletteNum = 0x2, + .paletteNum = 2, .baseBlock = 0x13, }, [WIN_TIMES] = { @@ -3114,7 +3114,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 0, .width = 6, .height = 2, - .paletteNum = 0x2, + .paletteNum = 2, .baseBlock = 0x1F, }, DUMMY_WIN_TEMPLATE, @@ -3183,21 +3183,21 @@ static void LoadPokeJumpGfx(void) ResetTempTileDataBuffers(); LoadSpriteSheetsAndPalettes(sPokemonJumpGfx); InitDigitPrinters(); - LoadPalette(sBg_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(sBg_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); DecompressAndCopyTileDataToVram(BG_SCENERY, sBg_Gfx, 0, 0, 0); DecompressAndCopyTileDataToVram(BG_SCENERY, sBg_Tilemap, 0, 0, 1); - LoadPalette(sVenusaur_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + LoadPalette(sVenusaur_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); DecompressAndCopyTileDataToVram(BG_VENUSAUR, sVenusaur_Gfx, 0, 0, 0); DecompressAndCopyTileDataToVram(BG_VENUSAUR, sVenusaur_Tilemap, 0, 0, 1); - LoadPalette(sBonuses_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + LoadPalette(sBonuses_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); DecompressAndCopyTileDataToVram(BG_BONUSES, sBonuses_Gfx, 0, 0, 0); DecompressAndCopyTileDataToVram(BG_BONUSES, sBonuses_Tilemap, 0, 0, 1); - LoadPalette(sInterface_Pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); + LoadPalette(sInterface_Pal, BG_PLTT_ID(2), PLTT_SIZE_4BPP); SetBgTilemapBuffer(BG_INTERFACE, sPokemonJumpGfx->tilemapBuffer); FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, 0x20, 0x20); PrintScoreSuffixes(); PrintScore(0); - LoadUserWindowBorderGfxOnBg(0, 1, BG_PLTT_ID(0xE)); + LoadUserWindowBorderGfxOnBg(0, 1, BG_PLTT_ID(14)); CopyBgTilemapBufferToVram(BG_INTERFACE); CopyBgTilemapBufferToVram(BG_VENUSAUR); CopyBgTilemapBufferToVram(BG_BONUSES); @@ -3321,7 +3321,7 @@ static void Msg_WantToPlayAgain(void) if (!IsDma3ManagerBusyWithBgCopy()) { PutWindowTilemap(sPokemonJumpGfx->msgWindowId); - DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); CreatePokeJumpYesNoMenu(23, 7, 0); CopyBgTilemapBufferToVram(BG_INTERFACE); sPokemonJumpGfx->mainState++; @@ -3348,7 +3348,7 @@ static void Msg_SavingDontTurnOff(void) if (!IsDma3ManagerBusyWithBgCopy()) { PutWindowTilemap(sPokemonJumpGfx->msgWindowId); - DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); CopyBgTilemapBufferToVram(BG_INTERFACE); sPokemonJumpGfx->mainState++; } @@ -3391,7 +3391,7 @@ static void Msg_SomeoneDroppedOut(void) if (!IsDma3ManagerBusyWithBgCopy()) { PutWindowTilemap(sPokemonJumpGfx->msgWindowId); - DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); CopyBgTilemapBufferToVram(BG_INTERFACE); sPokemonJumpGfx->mainState++; } @@ -3417,7 +3417,7 @@ static void Msg_CommunicationStandby(void) if (!IsDma3ManagerBusyWithBgCopy()) { PutWindowTilemap(sPokemonJumpGfx->msgWindowId); - DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); CopyBgTilemapBufferToVram(BG_INTERFACE); sPokemonJumpGfx->mainState++; } @@ -3527,7 +3527,7 @@ static bool32 DoPrizeMessageAndFanfare(void) if (!IsDma3ManagerBusyWithBgCopy()) { PutWindowTilemap(sPokemonJumpGfx->msgWindowId); - DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); CopyBgTilemapBufferToVram(BG_INTERFACE); sPokemonJumpGfx->msgWindowState++; } @@ -3601,7 +3601,7 @@ static u32 AddMessageWindow(u32 left, u32 top, u32 width, u32 height) window.tilemapTop = top; window.width = width; window.height = height; - window.paletteNum = 0xF; + window.paletteNum = 15; window.baseBlock = 0x43; windowId = AddWindow(&window); @@ -3618,7 +3618,7 @@ static void CreatePokeJumpYesNoMenu(u16 left, u16 top, u8 cursorPos) window.tilemapTop = top; window.width = 6; window.height = 4; - window.paletteNum = 0x2; + window.paletteNum = 2; window.baseBlock = 0x2B; CreateYesNoMenu(&window, 1, 0xD, cursorPos); @@ -3832,7 +3832,7 @@ static void AddPlayerNameWindows(void) window.bg = BG_INTERFACE; window.width = 8; window.height = 2; - window.paletteNum = 0x2; + window.paletteNum = 2; window.baseBlock = 0x2B; for (i = 0; i < playersCount; i++) @@ -4142,7 +4142,7 @@ static const struct WindowTemplate sWindowTemplate_Records = .tilemapTop = 1, .width = 28, .height = 9, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x1, }; @@ -4213,8 +4213,8 @@ static void PrintRecordsText(u16 windowId, int width) recordNums[1] = records->bestJumpScore; recordNums[2] = records->excellentsInRow; - LoadUserWindowBorderGfx_(windowId, 0x21D, BG_PLTT_ID(0xD)); - DrawTextBorderOuter(windowId, 0x21D, 0xD); + LoadUserWindowBorderGfx_(windowId, 0x21D, BG_PLTT_ID(13)); + DrawTextBorderOuter(windowId, 0x21D, 13); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_PkmnJumpRecords, GetStringCenterAlignXOffset(FONT_NORMAL, gText_PkmnJumpRecords, width * 8), 1, TEXT_SKIP_DRAW, NULL); for (i = 0; i < ARRAY_COUNT(sRecordsTexts); i++) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 010ec80f78..80b03590d7 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -895,7 +895,7 @@ static const struct WindowTemplate sWindowTemplate_MainMenu = .tilemapTop = 1, .width = 17, .height = 10, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x1, }; @@ -976,7 +976,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 11, .width = 9, .height = 7, - .paletteNum = 0x3, + .paletteNum = 3, .baseBlock = 0xC0, }, [WIN_MESSAGE] = { @@ -985,7 +985,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 17, .width = 18, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x14, }, [WIN_ITEM_DESC] = { @@ -994,7 +994,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 13, .width = 21, .height = 7, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x14, }, DUMMY_WIN_TEMPLATE @@ -1104,7 +1104,7 @@ static const struct WindowTemplate sYesNoWindowTemplate = .tilemapTop = 11, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x5C, }; @@ -2128,7 +2128,7 @@ static void Task_InitPokeStorage(u8 taskId) PutWindowTilemap(WIN_DISPLAY_INFO); ClearWindowTilemap(WIN_MESSAGE); CpuFill32(0, (void *)VRAM, 0x200); - LoadUserWindowBorderGfx(WIN_MESSAGE, 0xB, BG_PLTT_ID(0xE)); + LoadUserWindowBorderGfx(WIN_MESSAGE, 0xB, BG_PLTT_ID(14)); break; case 3: ResetAllBgCoords(); @@ -3849,13 +3849,13 @@ static void LoadWaveformSpritePalette(void) static void InitPalettesAndSprites(void) { - LoadPalette(sInterface_Pal, BG_PLTT_ID(0x0), sizeof(sInterface_Pal)); - LoadPalette(sPkmnDataGray_Pal, BG_PLTT_ID(0x2), sizeof(sPkmnDataGray_Pal)); - LoadPalette(sTextWindows_Pal, BG_PLTT_ID(0xF), sizeof(sTextWindows_Pal)); + LoadPalette(sInterface_Pal, BG_PLTT_ID(0), sizeof(sInterface_Pal)); + LoadPalette(sPkmnDataGray_Pal, BG_PLTT_ID(2), sizeof(sPkmnDataGray_Pal)); + LoadPalette(sTextWindows_Pal, BG_PLTT_ID(15), sizeof(sTextWindows_Pal)); if (sStorage->boxOption != OPTION_MOVE_ITEMS) - LoadPalette(sBg_Pal, BG_PLTT_ID(0x3), sizeof(sBg_Pal)); + LoadPalette(sBg_Pal, BG_PLTT_ID(3), sizeof(sBg_Pal)); else - LoadPalette(sBgMoveItems_Pal, BG_PLTT_ID(0x3), sizeof(sBgMoveItems_Pal)); + LoadPalette(sBgMoveItems_Pal, BG_PLTT_ID(3), sizeof(sBgMoveItems_Pal)); SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_16COLOR | BGCNT_SCREENBASE(30)); CreateDisplayMonSprite(); @@ -4045,7 +4045,7 @@ static void UpdateWaveformAnimation(void) static void InitSupplementalTilemaps(void) { LZ77UnCompWram(gStorageSystemPartyMenu_Tilemap, sStorage->partyMenuTilemapBuffer); - LoadPalette(gStorageSystemPartyMenu_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + LoadPalette(gStorageSystemPartyMenu_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); TilemapUtil_SetMap(TILEMAPID_PARTY_MENU, 1, sStorage->partyMenuTilemapBuffer, 12, 22); TilemapUtil_SetMap(TILEMAPID_CLOSE_BUTTON, 1, sCloseBoxButton_Tilemap, 9, 4); TilemapUtil_SetPos(TILEMAPID_PARTY_MENU, 10, 0); @@ -4267,7 +4267,7 @@ static void UpdateBoxToSendMons(void) static void InitPokeStorageBg0(void) { SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(29)); - LoadUserWindowBorderGfx(WIN_MESSAGE, 2, BG_PLTT_ID(0xD)); + LoadUserWindowBorderGfx(WIN_MESSAGE, 2, BG_PLTT_ID(13)); FillBgTilemapBufferRect(0, 0, 0, 0, 32, 20, 17); CopyBgTilemapBufferToVram(0); } @@ -4308,7 +4308,7 @@ static void PrintMessage(u8 id) DynamicPlaceholderTextUtil_ExpandPlaceholders(sStorage->messageText, sMessages[id].text); FillWindowPixelBuffer(WIN_MESSAGE, PIXEL_FILL(1)); AddTextPrinterParameterized(WIN_MESSAGE, FONT_NORMAL, sStorage->messageText, 0, 1, TEXT_SKIP_DRAW, NULL); - DrawTextBorderOuter(WIN_MESSAGE, 2, 0xE); + DrawTextBorderOuter(WIN_MESSAGE, 2, 14); PutWindowTilemap(WIN_MESSAGE); CopyWindowToVram(WIN_MESSAGE, COPYWIN_GFX); ScheduleBgCopyTilemapToVram(0); @@ -5380,9 +5380,9 @@ static void LoadWallpaperGfx(u8 boxId, s8 direction) DrawWallpaper(sStorage->wallpaperTilemap, sStorage->wallpaperLoadDir, sStorage->wallpaperOffset); if (sStorage->wallpaperLoadDir != 0) - LoadPalette(wallpaper->palettes, 0x40 + BG_PLTT_ID(sStorage->wallpaperOffset * 2), 2 * PLTT_SIZE_4BPP); + LoadPalette(wallpaper->palettes, BG_PLTT_ID(4) + BG_PLTT_ID(sStorage->wallpaperOffset * 2), 2 * PLTT_SIZE_4BPP); else - CpuCopy16(wallpaper->palettes, &gPlttBufferUnfaded[0x40 + BG_PLTT_ID(sStorage->wallpaperOffset * 2)], 2 * PLTT_SIZE_4BPP); + CpuCopy16(wallpaper->palettes, &gPlttBufferUnfaded[BG_PLTT_ID(4) + BG_PLTT_ID(sStorage->wallpaperOffset * 2)], 2 * PLTT_SIZE_4BPP); sStorage->wallpaperTiles = malloc_and_decompress(wallpaper->tiles, &tilesSize); LoadBgTiles(2, sStorage->wallpaperTiles, tilesSize, sStorage->wallpaperOffset << 8); @@ -5398,9 +5398,9 @@ static void LoadWallpaperGfx(u8 boxId, s8 direction) CpuCopy16(GetWaldaWallpaperColorsPtr(), &sStorage->wallpaperTilemap[17], 4); if (sStorage->wallpaperLoadDir != 0) - LoadPalette(sStorage->wallpaperTilemap, 0x40 + BG_PLTT_ID(sStorage->wallpaperOffset * 2), 2 * PLTT_SIZE_4BPP); + LoadPalette(sStorage->wallpaperTilemap, BG_PLTT_ID(4) + BG_PLTT_ID(sStorage->wallpaperOffset * 2), 2 * PLTT_SIZE_4BPP); else - CpuCopy16(sStorage->wallpaperTilemap, &gPlttBufferUnfaded[0x40 + BG_PLTT_ID(sStorage->wallpaperOffset * 2)], 2 * PLTT_SIZE_4BPP); + CpuCopy16(sStorage->wallpaperTilemap, &gPlttBufferUnfaded[BG_PLTT_ID(4) + BG_PLTT_ID(sStorage->wallpaperOffset * 2)], 2 * PLTT_SIZE_4BPP); sStorage->wallpaperTiles = malloc_and_decompress(wallpaper->tiles, &tilesSize); iconGfx = malloc_and_decompress(sWaldaWallpaperIcons[GetWaldaWallpaperIconId()], &iconSize); @@ -7929,7 +7929,7 @@ static void InitMenu(void) sStorage->menuItemsCount = 0; sStorage->menuWidth = 0; sStorage->menuWindow.bg = 0; - sStorage->menuWindow.paletteNum = 0xF; + sStorage->menuWindow.paletteNum = 15; sStorage->menuWindow.baseBlock = 92; } @@ -8085,7 +8085,7 @@ static const struct WindowTemplate sWindowTemplate_MultiMove = .tilemapTop = 3, .width = 20, .height = 18, - .paletteNum = 0x9, + .paletteNum = 9, .baseBlock = 0xA, }; @@ -8164,7 +8164,7 @@ static bool8 MultiMove_Start(void) { case 0: HideBg(0); - TryLoadAllMonIconPalettesAtOffset(BG_PLTT_ID(0x8)); + TryLoadAllMonIconPalettesAtOffset(BG_PLTT_ID(8)); sMultiMove->state++; break; case 1: @@ -8213,7 +8213,7 @@ static bool8 MultiMove_Cancel(void) if (!IsDma3ManagerBusyWithBgCopy()) { SetCursorPriorityTo1(); - LoadPalette(GetTextWindowPalette(3), BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); + LoadPalette(GetTextWindowPalette(3), BG_PLTT_ID(13), PLTT_SIZE_4BPP); ShowBg(0); return FALSE; } @@ -8319,7 +8319,7 @@ static bool8 MultiMove_PlaceMons(void) case 3: if (!IsDma3ManagerBusyWithBgCopy()) { - LoadPalette(GetTextWindowPalette(3), BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); + LoadPalette(GetTextWindowPalette(3), BG_PLTT_ID(13), PLTT_SIZE_4BPP); SetCursorPriorityTo1(); ShowBg(0); return FALSE; @@ -9245,12 +9245,12 @@ static void DrawItemInfoWindow(u32 x) { if (x != 0) { - FillBgTilemapBufferRect(0, 0x13A, 0, 0xC, x, 1, 0xF); - FillBgTilemapBufferRect(0, 0x93A, 0, 0x14, x, 1, 0xF); + FillBgTilemapBufferRect(0, 0x13A, 0, 0xC, x, 1, 15); + FillBgTilemapBufferRect(0, 0x93A, 0, 0x14, x, 1, 15); } - FillBgTilemapBufferRect(0, 0x13B, x, 0xD, 1, 7, 0xF); - FillBgTilemapBufferRect(0, 0x13C, x, 0xC, 1, 1, 0xF); - FillBgTilemapBufferRect(0, 0x13D, x, 0x14, 1, 1, 0xF); + FillBgTilemapBufferRect(0, 0x13B, x, 0xD, 1, 7, 15); + FillBgTilemapBufferRect(0, 0x13C, x, 0xC, 1, 1, 15); + FillBgTilemapBufferRect(0, 0x13D, x, 0x14, 1, 1, 15); ScheduleBgCopyTilemapToVram(0); } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index e406225062..c7dcff3370 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -391,7 +391,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 11, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 1, }, [PSS_LABEL_WINDOW_POKEMON_SKILLS_TITLE] = { @@ -400,7 +400,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 11, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 23, }, [PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE] = { @@ -409,7 +409,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 11, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 45, }, [PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE] = { @@ -418,7 +418,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 11, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 67, }, [PSS_LABEL_WINDOW_PROMPT_CANCEL] = { @@ -427,7 +427,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 8, .height = 2, - .paletteNum = 0x7, + .paletteNum = 7, .baseBlock = 89, }, [PSS_LABEL_WINDOW_PROMPT_INFO] = { @@ -436,7 +436,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 8, .height = 2, - .paletteNum = 0x7, + .paletteNum = 7, .baseBlock = 105, }, [PSS_LABEL_WINDOW_PROMPT_SWITCH] = { @@ -445,7 +445,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 0, .width = 8, .height = 2, - .paletteNum = 0x7, + .paletteNum = 7, .baseBlock = 121, }, [PSS_LABEL_WINDOW_UNUSED1] = { @@ -454,7 +454,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 4, .width = 0, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 137, }, [PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL] = { @@ -463,7 +463,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 4, .width = 18, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 137, }, [PSS_LABEL_WINDOW_POKEMON_INFO_TYPE] = { @@ -472,7 +472,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 6, .width = 18, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 173, }, [PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT] = { @@ -481,7 +481,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 7, .width = 6, .height = 6, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 209, }, [PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT] = { @@ -490,7 +490,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 7, .width = 5, .height = 6, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 245, }, [PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP] = { @@ -499,7 +499,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 14, .width = 11, .height = 4, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 275, }, [PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS] = { @@ -508,7 +508,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 18, .width = 6, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 319, }, [PSS_LABEL_WINDOW_MOVES_POWER_ACC] = { @@ -517,7 +517,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 15, .width = 9, .height = 4, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 331, }, [PSS_LABEL_WINDOW_MOVES_APPEAL_JAM] = { @@ -526,7 +526,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 15, .width = 5, .height = 4, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 367, }, [PSS_LABEL_WINDOW_UNUSED2] = { @@ -535,7 +535,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 4, .width = 0, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 387, }, [PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER] = { @@ -544,7 +544,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 2, .width = 4, .height = 2, - .paletteNum = 0x7, + .paletteNum = 7, .baseBlock = 387, }, [PSS_LABEL_WINDOW_PORTRAIT_NICKNAME] = { @@ -553,7 +553,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 12, .width = 9, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 395, }, [PSS_LABEL_WINDOW_PORTRAIT_SPECIES] = { @@ -562,7 +562,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .tilemapTop = 14, .width = 9, .height = 4, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 413, }, [PSS_LABEL_WINDOW_END] = DUMMY_WIN_TEMPLATE @@ -575,7 +575,7 @@ static const struct WindowTemplate sPageInfoTemplate[] = .tilemapTop = 4, .width = 11, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 449, }, [PSS_DATA_WINDOW_INFO_ID] = { @@ -584,7 +584,7 @@ static const struct WindowTemplate sPageInfoTemplate[] = .tilemapTop = 4, .width = 7, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 471, }, [PSS_DATA_WINDOW_INFO_ABILITY] = { @@ -593,7 +593,7 @@ static const struct WindowTemplate sPageInfoTemplate[] = .tilemapTop = 9, .width = 18, .height = 4, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 485, }, [PSS_DATA_WINDOW_INFO_MEMO] = { @@ -602,7 +602,7 @@ static const struct WindowTemplate sPageInfoTemplate[] = .tilemapTop = 14, .width = 18, .height = 6, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 557, }, }; @@ -614,7 +614,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .tilemapTop = 4, .width = 10, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 449, }, [PSS_DATA_WINDOW_SKILLS_RIBBON_COUNT] = { @@ -623,7 +623,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .tilemapTop = 4, .width = 10, .height = 2, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 469, }, [PSS_DATA_WINDOW_SKILLS_STATS_LEFT] = { @@ -632,7 +632,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .tilemapTop = 7, .width = 6, .height = 6, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 489, }, [PSS_DATA_WINDOW_SKILLS_STATS_RIGHT] = { @@ -641,7 +641,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .tilemapTop = 7, .width = 3, .height = 6, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 525, }, [PSS_DATA_WINDOW_EXP] = { @@ -650,7 +650,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .tilemapTop = 14, .width = 6, .height = 4, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 543, }, }; @@ -662,7 +662,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo .tilemapTop = 4, .width = 9, .height = 10, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 449, }, [PSS_DATA_WINDOW_MOVE_PP] = { @@ -671,7 +671,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo .tilemapTop = 4, .width = 6, .height = 10, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 539, }, [PSS_DATA_WINDOW_MOVE_DESCRIPTION] = { @@ -680,7 +680,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo .tilemapTop = 15, .width = 20, .height = 4, - .paletteNum = 0x6, + .paletteNum = 6, .baseBlock = 599, }, }; @@ -1328,8 +1328,8 @@ static bool8 DecompressGraphics(void) sMonSummaryScreen->switchCounter++; break; case 6: - LoadCompressedPalette(gSummaryScreen_Pal, BG_PLTT_ID(0x0), 8 * PLTT_SIZE_4BPP); - LoadPalette(&gPPTextPalette, BG_PLTT_ID(0x8) + 1, PLTT_SIZEOF(16 - 1)); + LoadCompressedPalette(gSummaryScreen_Pal, BG_PLTT_ID(0), 8 * PLTT_SIZE_4BPP); + LoadPalette(&gPPTextPalette, BG_PLTT_ID(8) + 1, PLTT_SIZEOF(16 - 1)); sMonSummaryScreen->switchCounter++; break; case 7: @@ -1353,7 +1353,7 @@ static bool8 DecompressGraphics(void) sMonSummaryScreen->switchCounter++; break; case 12: - LoadCompressedPalette(gMoveTypes_Pal, OBJ_PLTT_ID(0xD), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gMoveTypes_Pal, OBJ_PLTT_ID(13), 3 * PLTT_SIZE_4BPP); sMonSummaryScreen->switchCounter = 0; return TRUE; } diff --git a/src/pokenav_conditions_gfx.c b/src/pokenav_conditions_gfx.c index 9ad8854359..e382cbf699 100644 --- a/src/pokenav_conditions_gfx.c +++ b/src/pokenav_conditions_gfx.c @@ -68,7 +68,7 @@ static const struct WindowTemplate sMonNameGenderWindowTemplate = .tilemapTop = 1, .width = 13, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 2 }; @@ -79,7 +79,7 @@ static const struct WindowTemplate sListIndexWindowTemplate = .tilemapTop = 6, .width = 7, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x36 }; @@ -90,7 +90,7 @@ static const struct WindowTemplate sUnusedWindowTemplate1 = .tilemapTop = 0x1C, .width = 5, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x44 }; @@ -101,7 +101,7 @@ static const struct WindowTemplate sUnusedWindowTemplate2 = .tilemapTop = 0x1C, .width = 3, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x44 }; @@ -224,8 +224,8 @@ static u32 LoopedTask_OpenConditionGraphMenu(s32 state) CopyToBgTilemapBufferRect(3, gPokenavOptions_Tilemap, 0, 5, 9, 4); CopyBgTilemapBufferToVram(3); - CopyPaletteIntoBufferUnfaded(gPokenavCondition_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); - CopyPaletteIntoBufferUnfaded(gConditionText_Pal, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(gPokenavCondition_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(gConditionText_Pal, BG_PLTT_ID(15), PLTT_SIZE_4BPP); menu->monTransitionX = -80; return LT_INC_AND_PAUSE; case 4: @@ -235,7 +235,7 @@ static u32 LoopedTask_OpenConditionGraphMenu(s32 state) LZ77UnCompVram(sConditionGraphData_Tilemap, menu->tilemapBuffers[2]); SetBgTilemapBuffer(2, menu->tilemapBuffers[2]); CopyBgTilemapBufferToVram(2); - CopyPaletteIntoBufferUnfaded(gConditionGraphData_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(gConditionGraphData_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); ConditionGraph_InitWindow(2); return LT_INC_AND_PAUSE; case 5: diff --git a/src/pokenav_conditions_search_results.c b/src/pokenav_conditions_search_results.c index 49ce612cc1..d3764cb802 100644 --- a/src/pokenav_conditions_search_results.c +++ b/src/pokenav_conditions_search_results.c @@ -121,7 +121,7 @@ static const struct WindowTemplate sSearchResultListMenuWindowTemplate = .tilemapTop = 6, .width = 7, .height = 2, - .paletteNum = 0x1, + .paletteNum = 1, .baseBlock = 20 }; @@ -432,7 +432,7 @@ static u32 LoopedTask_OpenConditionSearchResults(s32 state) SetBgTilemapBuffer(1, gfx->buff); CopyToBgTilemapBuffer(1, sConditionSearchResultTilemap, 0, 0); CopyBgTilemapBufferToVram(1); - CopyPaletteIntoBufferUnfaded(sConditionSearchResultFramePal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sConditionSearchResultFramePal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; case 1: @@ -444,7 +444,7 @@ static u32 LoopedTask_OpenConditionSearchResults(s32 state) case 2: if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; - CopyPaletteIntoBufferUnfaded(sListBg_Pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sListBg_Pal, BG_PLTT_ID(2), PLTT_SIZE_4BPP); CreateSearchResultsList(); return LT_INC_AND_PAUSE; case 3: diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index 3dbc7952d2..bfc5ba0cb4 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -78,7 +78,7 @@ static const struct WindowTemplate sHelpBarWindowTemplate[] = .tilemapTop = 22, .width = 16, .height = 2, - .paletteNum = 0x0, + .paletteNum = 0, .baseBlock = 0x36, }, DUMMY_WIN_TEMPLATE @@ -349,7 +349,7 @@ static u32 LoopedTask_InitPokenavMenu(s32 state) DecompressAndCopyTileDataToVram(0, &gPokenavHeader_Gfx, 0, 0, 0); SetBgTilemapBuffer(0, menu->tilemapBuffer); CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0); - CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(0); return LT_INC_AND_PAUSE; case 2: diff --git a/src/pokenav_match_call_gfx.c b/src/pokenav_match_call_gfx.c index 710aeef17b..626e584b70 100755 --- a/src/pokenav_match_call_gfx.c +++ b/src/pokenav_match_call_gfx.c @@ -182,7 +182,7 @@ static const struct WindowTemplate sMatchCallLocationWindowTemplate = .tilemapTop = 5, .width = 11, .height = 2, - .paletteNum = 0x2, + .paletteNum = 2, .baseBlock = 16 }; @@ -193,7 +193,7 @@ static const struct WindowTemplate sMatchCallInfoBoxWindowTemplate = .tilemapTop = 9, .width = 11, .height = 8, - .paletteNum = 0x2, + .paletteNum = 2, .baseBlock = 38 }; @@ -214,7 +214,7 @@ static const struct WindowTemplate sCallMsgBoxWindowTemplate = .tilemapTop = 12, .width = 28, .height = 4, - .paletteNum = 0x1, + .paletteNum = 1, .baseBlock = 10 }; @@ -333,7 +333,7 @@ static u32 LoopedTask_OpenMatchCall(s32 state) SetBgTilemapBuffer(2, gfx->bgTilemapBuffer2); CopyToBgTilemapBuffer(2, sMatchCallUI_Tilemap, 0, 0); CopyBgTilemapBufferToVram(2); - CopyPaletteIntoBufferUnfaded(sMatchCallUI_Pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sMatchCallUI_Pal, BG_PLTT_ID(2), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(2); return LT_INC_AND_PAUSE; case 1: @@ -343,7 +343,7 @@ static u32 LoopedTask_OpenMatchCall(s32 state) BgDmaFill(1, 0, 0, 1); SetBgTilemapBuffer(1, gfx->bgTilemapBuffer1); FillBgTilemapBufferRect_Palette0(1, 0x1000, 0, 0, 32, 20); - CopyPaletteIntoBufferUnfaded(sCallWindow_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sCallWindow_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; case 2: @@ -352,8 +352,8 @@ static u32 LoopedTask_OpenMatchCall(s32 state) LoadCallWindowAndFade(gfx); DecompressAndCopyTileDataToVram(3, sPokeball_Gfx, 0, 0, 0); - CopyPaletteIntoBufferUnfaded(sListWindow_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); - CopyPaletteIntoBufferUnfaded(sPokeball_Pal, BG_PLTT_ID(0x5), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sListWindow_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sPokeball_Pal, BG_PLTT_ID(5), PLTT_SIZE_4BPP); return LT_INC_AND_PAUSE; case 3: if (FreeTempTileDataBuffersIfPossible() || !IsMatchCallListInitFinished()) @@ -1082,15 +1082,15 @@ static void UpdateWindowsToShowCheckPage(struct Pokenav_MatchCallGfx *gfx) static void LoadCallWindowAndFade(struct Pokenav_MatchCallGfx *gfx) { gfx->msgBoxWindowId = AddWindow(&sCallMsgBoxWindowTemplate); - LoadMatchCallWindowGfx(gfx->msgBoxWindowId, 1, 0x4); + LoadMatchCallWindowGfx(gfx->msgBoxWindowId, 1, 4); FadeToBlackExceptPrimary(); } static void DrawMsgBoxForMatchCallMsg(struct Pokenav_MatchCallGfx *gfx) { struct Sprite *sprite; - LoadMatchCallWindowGfx(gfx->msgBoxWindowId, 1, 0x4); - DrawMatchCallTextBoxBorder(gfx->msgBoxWindowId, 1, 0x4); + LoadMatchCallWindowGfx(gfx->msgBoxWindowId, 1, 4); + DrawMatchCallTextBoxBorder(gfx->msgBoxWindowId, 1, 4); FillWindowPixelBuffer(gfx->msgBoxWindowId, PIXEL_FILL(1)); PutWindowTilemap(gfx->msgBoxWindowId); CopyWindowToVram(gfx->msgBoxWindowId, COPYWIN_FULL); @@ -1102,8 +1102,8 @@ static void DrawMsgBoxForMatchCallMsg(struct Pokenav_MatchCallGfx *gfx) static void DrawMsgBoxForCloseByMsg(struct Pokenav_MatchCallGfx *gfx) { - LoadUserWindowBorderGfx(gfx->msgBoxWindowId, 1, BG_PLTT_ID(0x4)); - DrawTextBorderOuter(gfx->msgBoxWindowId, 1, 0x4); + LoadUserWindowBorderGfx(gfx->msgBoxWindowId, 1, BG_PLTT_ID(4)); + DrawTextBorderOuter(gfx->msgBoxWindowId, 1, 4); FillWindowPixelBuffer(gfx->msgBoxWindowId, PIXEL_FILL(1)); PutWindowTilemap(gfx->msgBoxWindowId); CopyWindowToVram(gfx->msgBoxWindowId, COPYWIN_FULL); diff --git a/src/pokenav_menu_handler_gfx.c b/src/pokenav_menu_handler_gfx.c index 1acd2edf9e..a9275bcf7b 100644 --- a/src/pokenav_menu_handler_gfx.c +++ b/src/pokenav_menu_handler_gfx.c @@ -261,7 +261,7 @@ static const struct WindowTemplate sOptionDescWindowTemplate = .tilemapTop = 17, .width = 24, .height = 2, - .paletteNum = 0x1, + .paletteNum = 1, .baseBlock = 8 }; @@ -457,7 +457,7 @@ static u32 LoopedTask_OpenMenu(s32 state) SetBgTilemapBuffer(1, gfx->bg1TilemapBuffer); CopyToBgTilemapBuffer(1, gPokenavMessageBox_Tilemap, 0, 0); CopyBgTilemapBufferToVram(1); - CopyPaletteIntoBufferUnfaded(gPokenavMessageBox_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(gPokenavMessageBox_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); ChangeBgX(1, 0, BG_COORD_SET); ChangeBgY(1, 0, BG_COORD_SET); ChangeBgX(2, 0, BG_COORD_SET); @@ -470,14 +470,14 @@ static u32 LoopedTask_OpenMenu(s32 state) return LT_PAUSE; DecompressAndCopyTileDataToVram(2, sPokenavDeviceBgTiles, 0, 0, 0); DecompressAndCopyTileDataToVram(2, sPokenavDeviceBgTilemap, 0, 0, 1); - CopyPaletteIntoBufferUnfaded(sPokenavDeviceBgPal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sPokenavDeviceBgPal, BG_PLTT_ID(2), PLTT_SIZE_4BPP); return LT_INC_AND_PAUSE; case 2: if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; DecompressAndCopyTileDataToVram(3, sPokenavBgDotsTiles, 0, 0, 0); DecompressAndCopyTileDataToVram(3, sPokenavBgDotsTilemap, 0, 0, 1); - CopyPaletteIntoBufferUnfaded(sPokenavBgDotsPal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sPokenavBgDotsPal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); if (GetPokenavMenuType() == POKENAV_MENU_TYPE_CONDITION || GetPokenavMenuType() == POKENAV_MENU_TYPE_CONDITION_SEARCH) ChangeBgDotsColorToPurple(); return LT_INC_AND_PAUSE; @@ -1270,7 +1270,7 @@ static void CreateBgDotPurplePalTask(void) static void ChangeBgDotsColorToPurple(void) { - CopyPaletteIntoBufferUnfaded(sPokenavBgDotsPal + 7, BG_PLTT_ID(0x3) + 1, PLTT_SIZEOF(2)); + CopyPaletteIntoBufferUnfaded(sPokenavBgDotsPal + 7, BG_PLTT_ID(3) + 1, PLTT_SIZEOF(2)); } static void CreateBgDotLightBluePalTask(void) @@ -1293,7 +1293,7 @@ static void Task_UpdateBgDotsPalette(u8 taskId) const u16 * pal2 = (const u16 *)GetWordTaskArg(taskId, 3); PokenavCopyPalette(pal1, pal2, 2, 12, ++data[0], sp8); - LoadPalette(sp8, BG_PLTT_ID(0x3) + 1, PLTT_SIZEOF(2)); + LoadPalette(sp8, BG_PLTT_ID(3) + 1, PLTT_SIZEOF(2)); if (data[0] == 12) DestroyTask(taskId); } diff --git a/src/pokenav_region_map.c b/src/pokenav_region_map.c index 6b3479f10e..1bb52767db 100755 --- a/src/pokenav_region_map.c +++ b/src/pokenav_region_map.c @@ -140,7 +140,7 @@ static const struct WindowTemplate sMapSecInfoWindowTemplate = .tilemapTop = 4, .width = 12, .height = 13, - .paletteNum = 0x1, + .paletteNum = 1, .baseBlock = 0x4C }; @@ -509,14 +509,14 @@ static void LoadPokenavRegionMapGfx(struct Pokenav_RegionMapGfx *state) CpuFill16(0x1040, state->tilemapBuffer, 0x800); SetBgTilemapBuffer(1, state->tilemapBuffer); state->infoWindowId = AddWindow(&sMapSecInfoWindowTemplate); - LoadUserWindowBorderGfx_(state->infoWindowId, 0x42, BG_PLTT_ID(0x4)); - DrawTextBorderOuter(state->infoWindowId, 0x42, 0x4); + LoadUserWindowBorderGfx_(state->infoWindowId, 0x42, BG_PLTT_ID(4)); + DrawTextBorderOuter(state->infoWindowId, 0x42, 4); DecompressAndCopyTileDataToVram(1, sRegionMapCityZoomTiles_Gfx, 0, 0, 0); FillWindowPixelBuffer(state->infoWindowId, PIXEL_FILL(1)); PutWindowTilemap(state->infoWindowId); CopyWindowToVram(state->infoWindowId, COPYWIN_FULL); - CopyPaletteIntoBufferUnfaded(sMapSecInfoWindow_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); - CopyPaletteIntoBufferUnfaded(gRegionMapCityZoomTiles_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sMapSecInfoWindow_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(gRegionMapCityZoomTiles_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); if (!IsRegionMapZoomed()) ChangeBgY(1, -0x6000, BG_COORD_SET); else diff --git a/src/pokenav_ribbons_list.c b/src/pokenav_ribbons_list.c index 5f5cf083ff..c1ca7f9d92 100644 --- a/src/pokenav_ribbons_list.c +++ b/src/pokenav_ribbons_list.c @@ -432,7 +432,7 @@ static u32 LoopedTask_OpenRibbonsMonList(s32 state) DecompressAndCopyTileDataToVram(1, sMonRibbonListFrameTiles, 0, 0, 0); SetBgTilemapBuffer(1, menu->buff); CopyToBgTilemapBuffer(1, sMonRibbonListFrameTilemap, 0, 0); - CopyPaletteIntoBufferUnfaded(sMonRibbonListFramePal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sMonRibbonListFramePal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; case 1: @@ -447,7 +447,7 @@ static u32 LoopedTask_OpenRibbonsMonList(s32 state) case 2: if (FreeTempTileDataBuffersIfPossible()) return LT_PAUSE; - CopyPaletteIntoBufferUnfaded(sMonRibbonListUi_Pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sMonRibbonListUi_Pal, BG_PLTT_ID(2), PLTT_SIZE_4BPP); CreateRibbonMonsList(); return LT_INC_AND_PAUSE; case 3: diff --git a/src/pokenav_ribbons_summary.c b/src/pokenav_ribbons_summary.c index d5e04a5025..4861b8e0ea 100644 --- a/src/pokenav_ribbons_summary.c +++ b/src/pokenav_ribbons_summary.c @@ -573,7 +573,7 @@ static u32 LoopedTask_OpenRibbonsSummaryMenu(s32 state) DecompressAndCopyTileDataToVram(2, gPokenavRibbonsSummaryBg_Gfx, 0, 0, 0); SetBgTilemapBuffer(2, menu->tilemapBuffers[0]); CopyToBgTilemapBuffer(2, gPokenavRibbonsSummaryBg_Tilemap, 0, 0); - CopyPaletteIntoBufferUnfaded(gPokenavRibbonsSummaryBg_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(gPokenavRibbonsSummaryBg_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(2); return LT_INC_AND_PAUSE; case 1: @@ -583,8 +583,8 @@ static u32 LoopedTask_OpenRibbonsSummaryMenu(s32 state) DecompressAndCopyTileDataToVram(1, sRibbonIconsSmall_Gfx, 0, 1, 0); SetBgTilemapBuffer(1, menu->tilemapBuffers[1]); FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, 32, 20); - CopyPaletteIntoBufferUnfaded(sRibbonIcons1_Pal, BG_PLTT_ID(0x2), 5 * PLTT_SIZE_4BPP); - CopyPaletteIntoBufferUnfaded(sMonInfo_Pal, BG_PLTT_ID(0xA), PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sRibbonIcons1_Pal, BG_PLTT_ID(2), 5 * PLTT_SIZE_4BPP); + CopyPaletteIntoBufferUnfaded(sMonInfo_Pal, BG_PLTT_ID(10), PLTT_SIZE_4BPP); CopyBgTilemapBufferToVram(1); return LT_INC_AND_PAUSE; } @@ -790,7 +790,7 @@ static const struct WindowTemplate sRibbonCountWindowTemplate = .tilemapTop = 13, .width = 16, .height = 4, - .paletteNum = 0x1, + .paletteNum = 1, .baseBlock = 0x14, }; @@ -854,7 +854,7 @@ static const struct WindowTemplate sRibbonSummaryMonNameWindowTemplate = .tilemapTop = 1, .width = 13, .height = 2, - .paletteNum = 0xA, + .paletteNum = 10, .baseBlock = 0x54, }; @@ -909,7 +909,7 @@ static const struct WindowTemplate sRibbonMonListIndexWindowTemplate[] = .tilemapTop = 5, .width = 7, .height = 2, - .paletteNum = 0x1, + .paletteNum = 1, .baseBlock = 0x6E, }, {}, diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index ca50ed8f2c..c984dfec8a 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -1301,7 +1301,7 @@ static void CB2_InitRayquazaScene(void) ResetPaletteFade(); ResetSpriteData(); ResetTasks(); - FillPalette(RGB_BLACK, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + FillPalette(RGB_BLACK, BG_PLTT_ID(15), PLTT_SIZE_4BPP); CreateTask(sTasksForAnimations[sRayScene->animId], 0); SetMainCallback2(CB2_RayquazaScene); } @@ -1592,7 +1592,7 @@ static void LoadDuoFightSceneGfx(void) LZDecompressWram(gRaySceneDuoFight_Clouds2_Tilemap, sRayScene->tilemapBuffers[0]); LZDecompressWram(gRaySceneDuoFight_Clouds1_Tilemap, sRayScene->tilemapBuffers[1]); LZDecompressWram(gRaySceneDuoFight_Clouds3_Tilemap, sRayScene->tilemapBuffers[2]); - LoadCompressedPalette(gRaySceneDuoFight_Clouds_Pal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gRaySceneDuoFight_Clouds_Pal, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); LoadCompressedSpriteSheet(&sSpriteSheet_DuoFight_Groudon); LoadCompressedSpriteSheet(&sSpriteSheet_DuoFight_GroudonShoulder); LoadCompressedSpriteSheet(&sSpriteSheet_DuoFight_GroudonClaw); @@ -2032,7 +2032,7 @@ static void LoadTakesFlightSceneGfx(void) LZDecompressWram(gRaySceneDuoFight_Clouds2_Tilemap, sRayScene->tilemapBuffers[0]); LZDecompressWram(gRaySceneTakesFlight_Bg_Tilemap, sRayScene->tilemapBuffers[1]); LZDecompressWram(gRaySceneTakesFlight_Rayquaza_Tilemap, sRayScene->tilemapBuffers[2]); - LoadCompressedPalette(gRaySceneTakesFlight_Rayquaza_Pal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gRaySceneTakesFlight_Rayquaza_Pal, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); LoadCompressedSpriteSheet(&sSpriteSheet_TakesFlight_Smoke); LoadCompressedSpritePalette(&sSpritePal_TakesFlight_Smoke); } @@ -2238,7 +2238,7 @@ static void LoadDescendsSceneGfx(void) CpuFastCopy(sRayScene->tilemapBuffers[3], sRayScene->tilemapBuffers[1], BG_SCREEN_SIZE); CpuFastFill16(0, &sRayScene->tilemapBuffers[1][0x100], 0x340); - LoadCompressedPalette(gRaySceneDescends_Bg_Pal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gRaySceneDescends_Bg_Pal, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); gPlttBufferUnfaded[0] = RGB_WHITE; gPlttBufferFaded[0] = RGB_WHITE; LoadCompressedSpriteSheet(&sSpriteSheet_Descends_Rayquaza); @@ -2487,7 +2487,7 @@ static void LoadChargesSceneGfx(void) LZDecompressWram(gRaySceneCharges_Rayquaza_Tilemap, sRayScene->tilemapBuffers[1]); LZDecompressWram(gRaySceneCharges_Streaks_Tilemap, sRayScene->tilemapBuffers[2]); LZDecompressWram(gRaySceneCharges_Bg_Tilemap, sRayScene->tilemapBuffers[3]); - LoadCompressedPalette(gRaySceneCharges_Bg_Pal, BG_PLTT_ID(0x0), 4 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gRaySceneCharges_Bg_Pal, BG_PLTT_ID(0), 4 * PLTT_SIZE_4BPP); } #define tState data[0] @@ -2671,7 +2671,7 @@ static void LoadChasesAwaySceneGfx(void) LZDecompressWram(gRaySceneChasesAway_Bg_Tilemap, sRayScene->tilemapBuffers[1]); LZDecompressWram(gRaySceneChasesAway_Light_Tilemap, sRayScene->tilemapBuffers[0]); LZDecompressWram(gRaySceneChasesAway_Ring_Tilemap, sRayScene->tilemapBuffers[2]); - LoadCompressedPalette(gRaySceneChasesAway_Bg_Pal, BG_PLTT_ID(0x0), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(gRaySceneChasesAway_Bg_Pal, BG_PLTT_ID(0), 3 * PLTT_SIZE_4BPP); LoadCompressedSpriteSheet(&sSpriteSheet_ChasesAway_Groudon); LoadCompressedSpriteSheet(&sSpriteSheet_ChasesAway_GroudonTail); LoadCompressedSpriteSheet(&sSpriteSheet_ChasesAway_Kyogre); diff --git a/src/region_map.c b/src/region_map.c index 379cc247e4..06408942aa 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -392,7 +392,7 @@ static const struct WindowTemplate sFlyMapWindowTemplates[] = .tilemapTop = 17, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x01 }, { @@ -401,7 +401,7 @@ static const struct WindowTemplate sFlyMapWindowTemplates[] = .tilemapTop = 15, .width = 12, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x19 }, { @@ -410,7 +410,7 @@ static const struct WindowTemplate sFlyMapWindowTemplates[] = .tilemapTop = 18, .width = 14, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x49 }, DUMMY_WIN_TEMPLATE @@ -567,7 +567,7 @@ bool8 LoadRegionMapGfx(void) break; case 2: if (!FreeTempTileDataBuffersIfPossible()) - LoadPalette(sRegionMapBg_Pal, BG_PLTT_ID(0x7), 3 * PLTT_SIZE_4BPP); + LoadPalette(sRegionMapBg_Pal, BG_PLTT_ID(7), 3 * PLTT_SIZE_4BPP); break; case 3: LZ77UnCompWram(sRegionMapCursorSmallGfxLZ, sRegionMap->cursorSmallImage); @@ -1689,7 +1689,7 @@ void CB2_OpenFlyMap(void) gMain.state++; break; case 3: - LoadUserWindowBorderGfx(0, 0x65, BG_PLTT_ID(0xD)); + LoadUserWindowBorderGfx(0, 0x65, BG_PLTT_ID(13)); ClearScheduledBgCopiesToVram(); gMain.state++; break; @@ -1712,7 +1712,7 @@ void CB2_OpenFlyMap(void) gMain.state++; break; case 7: - LoadPalette(sRegionMapFramePal, BG_PLTT_ID(0x1), sizeof(sRegionMapFramePal)); + LoadPalette(sRegionMapFramePal, BG_PLTT_ID(1), sizeof(sRegionMapFramePal)); PutWindowTilemap(2); FillWindowPixelBuffer(2, PIXEL_FILL(0)); AddTextPrinterParameterized(2, FONT_NORMAL, gText_FlyToWhere, 0, 1, 0, NULL); diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 2c7566a66c..0a9ec49113 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -85,7 +85,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 1, .width = 19, .height = 9, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x155 }, { @@ -94,7 +94,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0xE9 }, DUMMY_WIN_TEMPLATE @@ -106,7 +106,7 @@ static const struct WindowTemplate sInputTimeWindow = { .tilemapTop = 9, .width = 21, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0xBF }; diff --git a/src/roulette.c b/src/roulette.c index 3e37ba5d60..5182dabaed 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -460,7 +460,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 24, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0xC5 }, #ifdef UBFIX @@ -1195,7 +1195,7 @@ static void CB2_LoadRoulette(void) ResetTempTileDataBuffers(); break; case 3: - LoadPalette(&sWheel_Pal, BG_PLTT_ID(0x0), 14 * PLTT_SIZE_4BPP); + LoadPalette(&sWheel_Pal, BG_PLTT_ID(0), 14 * PLTT_SIZE_4BPP); DecompressAndCopyTileDataToVram(1, gRouletteMenu_Gfx, 0, 0, 0); DecompressAndCopyTileDataToVram(2, gRouletteWheel_Gfx, 0, 0, 0); break; diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index f039cf324d..dc079ad830 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -103,7 +103,7 @@ static const struct WindowTemplate sWindowTemplate_Text[] = .tilemapTop = 13, .width = 28, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1, } }; @@ -116,7 +116,7 @@ static const struct WindowTemplate sWindowTemplate_Clock[] = .tilemapTop = 9, .width = 2, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 169, } }; @@ -214,10 +214,10 @@ static void CB2_SaveFailedScreen(void) ResetSpriteData(); ResetTasks(); ResetPaletteFade(); - LoadPalette(gBirchBagGrassPal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); - LoadPalette(sSaveFailedClockPal, OBJ_PLTT_ID(0x0), PLTT_SIZE_4BPP); - LoadPalette(gTextWindowFrame1_Pal, BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); - LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(gBirchBagGrassPal, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); + LoadPalette(sSaveFailedClockPal, OBJ_PLTT_ID(0), PLTT_SIZE_4BPP); + LoadPalette(gTextWindowFrame1_Pal, BG_PLTT_ID(14), PLTT_SIZE_4BPP); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP); DrawStdFrameWithCustomTileAndPalette(sWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE); DrawStdFrameWithCustomTileAndPalette(sWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE); FillWindowPixelBuffer(sWindowIds[CLOCK_WIN_ID], PIXEL_FILL(1)); // backwards? diff --git a/src/scrcmd.c b/src/scrcmd.c index 91ab4ebfb6..3874b2e840 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1526,7 +1526,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) winTemplate = CreateWindowTemplate(0, xWindow, yWindow + 1, width, height, 0xF, 0x1); sBrailleWindowId = AddWindow(&winTemplate); - LoadUserWindowBorderGfx(sBrailleWindowId, 0x214, BG_PLTT_ID(0xE)); + LoadUserWindowBorderGfx(sBrailleWindowId, 0x214, BG_PLTT_ID(14)); DrawStdWindowFrame(sBrailleWindowId, FALSE); PutWindowTilemap(sBrailleWindowId); FillWindowPixelBuffer(sBrailleWindowId, PIXEL_FILL(1)); diff --git a/src/secret_base.c b/src/secret_base.c index 61d426ea64..74129d3ff5 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -181,7 +181,7 @@ static const struct WindowTemplate sRegistryWindowTemplates[] = .tilemapTop = 1, .width = 11, .height = 18, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x01, }, { @@ -190,7 +190,7 @@ static const struct WindowTemplate sRegistryWindowTemplates[] = .tilemapTop = 1, .width = 28, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0xc7, } }; diff --git a/src/shop.c b/src/shop.c index 3fd29a3f37..b9fb2dbc50 100755 --- a/src/shop.c +++ b/src/shop.c @@ -120,7 +120,7 @@ static const struct WindowTemplate sShopMenuWindowTemplates[] = .tilemapTop = 1, .width = 9, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0008, }, { @@ -129,7 +129,7 @@ static const struct WindowTemplate sShopMenuWindowTemplates[] = .tilemapTop = 1, .width = 9, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0008, } }; @@ -204,7 +204,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] = .tilemapTop = 1, .width = 10, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x001E, }, { @@ -213,7 +213,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] = .tilemapTop = 2, .width = 15, .height = 16, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0032, }, { @@ -222,7 +222,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] = .tilemapTop = 13, .width = 14, .height = 6, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0122, }, { @@ -231,7 +231,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] = .tilemapTop = 11, .width = 12, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0176, }, { @@ -240,7 +240,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] = .tilemapTop = 11, .width = 10, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x018E, }, { @@ -249,7 +249,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x01A2, }, DUMMY_WIN_TEMPLATE @@ -262,7 +262,7 @@ static const struct WindowTemplate sShopBuyMenuYesNoWindowTemplates = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x020E, }; @@ -676,15 +676,15 @@ static void BuyMenuDecompressBgGraphics(void) { DecompressAndCopyTileDataToVram(1, gShopMenu_Gfx, 0x3A0, 0x3E3, 0); LZDecompressWram(gShopMenu_Tilemap, sShopData->tilemapBuffers[0]); - LoadCompressedPalette(gShopMenu_Pal, BG_PLTT_ID(0xC), PLTT_SIZE_4BPP); + LoadCompressedPalette(gShopMenu_Pal, BG_PLTT_ID(12), PLTT_SIZE_4BPP); } static void BuyMenuInitWindows(void) { InitWindows(sShopBuyMenuWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD)); - LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(0xE)); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(13)); + LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(14)); PutWindowTilemap(0); PutWindowTilemap(1); PutWindowTilemap(2); diff --git a/src/slot_machine.c b/src/slot_machine.c index 94cc7dfaed..0fe4bade2b 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -789,7 +789,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x194 }, DUMMY_WIN_TEMPLATE @@ -802,7 +802,7 @@ static const struct WindowTemplate sWindowTemplate_InfoBox = .tilemapTop = 3, .width = 20, .height = 13, - .paletteNum = 0xD, + .paletteNum = 13, .baseBlock = 1 }; @@ -1247,8 +1247,8 @@ static void SlotMachineSetup_LoadGfxAndTilemaps(void) LoadMenuGfx(); LoadMenuAndReelOverlayTilemaps(); LoadSlotMachineGfx(); - LoadMessageBoxGfx(0, 0x200, BG_PLTT_ID(0xF)); - LoadUserWindowBorderGfx(0, 0x214, BG_PLTT_ID(0xE)); + LoadMessageBoxGfx(0, 0x200, BG_PLTT_ID(15)); + LoadUserWindowBorderGfx(0, 0x214, BG_PLTT_ID(14)); PutWindowTilemap(0); } @@ -3360,7 +3360,7 @@ static bool8 TryStopSlotMachineLights(void) if (gTasks[taskId].sFlashState == 0) { DestroyTask(taskId); - LoadPalette(sSlotMachineMenu_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + LoadPalette(sSlotMachineMenu_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); return TRUE; } return FALSE; @@ -3376,7 +3376,7 @@ static void Task_FlashSlotMachineLights(u8 taskId) if (task->sFlashState == 0 || task->sFlashState == 2) task->sFlashDir = -task->sFlashDir; } - LoadPalette(sFlashingLightsPalTable[task->sFlashState], BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + LoadPalette(sFlashingLightsPalTable[task->sFlashState], BG_PLTT_ID(1), PLTT_SIZE_4BPP); } #undef sDelayTimer @@ -5054,8 +5054,8 @@ static void LoadMenuGfx(void) sMenuGfx = Alloc(0x2200); LZDecompressWram(gSlotMachineMenu_Gfx, sMenuGfx); LoadBgTiles(2, sMenuGfx, 0x2200, 0); - LoadPalette(gSlotMachineMenu_Pal, BG_PLTT_ID(0x0), 5 * PLTT_SIZE_4BPP); - LoadPalette(sUnkPalette, BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); + LoadPalette(gSlotMachineMenu_Pal, BG_PLTT_ID(0), 5 * PLTT_SIZE_4BPP); + LoadPalette(sUnkPalette, BG_PLTT_ID(13), PLTT_SIZE_4BPP); } static void LoadMenuAndReelOverlayTilemaps(void) @@ -7728,19 +7728,19 @@ static const u16 *const sLitMatchLinePalTable[NUM_MATCH_LINES] = static const u16 *const sDarkMatchLinePalTable[NUM_MATCH_LINES] = { - [MATCH_MIDDLE_ROW] = &gSlotMachineMenu_Pal[BG_PLTT_ID(0x4) + 10], - [MATCH_TOP_ROW] = &gSlotMachineMenu_Pal[BG_PLTT_ID(0x4) + 11], - [MATCH_BOTTOM_ROW] = &gSlotMachineMenu_Pal[BG_PLTT_ID(0x4) + 12], - [MATCH_NWSE_DIAG] = &gSlotMachineMenu_Pal[BG_PLTT_ID(0x4) + 13], - [MATCH_NESW_DIAG] = &gSlotMachineMenu_Pal[BG_PLTT_ID(0x4) + 14], + [MATCH_MIDDLE_ROW] = &gSlotMachineMenu_Pal[BG_PLTT_ID(4) + 10], + [MATCH_TOP_ROW] = &gSlotMachineMenu_Pal[BG_PLTT_ID(4) + 11], + [MATCH_BOTTOM_ROW] = &gSlotMachineMenu_Pal[BG_PLTT_ID(4) + 12], + [MATCH_NWSE_DIAG] = &gSlotMachineMenu_Pal[BG_PLTT_ID(4) + 13], + [MATCH_NESW_DIAG] = &gSlotMachineMenu_Pal[BG_PLTT_ID(4) + 14], }; static const u8 sMatchLinePalOffsets[NUM_MATCH_LINES] = { - [MATCH_MIDDLE_ROW] = BG_PLTT_ID(0x4) + 10, - [MATCH_TOP_ROW] = BG_PLTT_ID(0x4) + 11, - [MATCH_BOTTOM_ROW] = BG_PLTT_ID(0x4) + 12, - [MATCH_NWSE_DIAG] = BG_PLTT_ID(0x4) + 14, // Diag colors flipped for some reason - [MATCH_NESW_DIAG] = BG_PLTT_ID(0x4) + 13 // Doesn't matter as both are identical + [MATCH_MIDDLE_ROW] = BG_PLTT_ID(4) + 10, + [MATCH_TOP_ROW] = BG_PLTT_ID(4) + 11, + [MATCH_BOTTOM_ROW] = BG_PLTT_ID(4) + 12, + [MATCH_NWSE_DIAG] = BG_PLTT_ID(4) + 14, // Diag colors flipped for some reason + [MATCH_NESW_DIAG] = BG_PLTT_ID(4) + 13 // Doesn't matter as both are identical }; static const u8 sBetToMatchLineIds[MAX_BET][2] = diff --git a/src/start_menu.c b/src/start_menu.c index 34e7e5b2bd..63cfd0acec 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -192,7 +192,7 @@ static const struct WindowTemplate sWindowTemplates_LinkBattleSave[] = .tilemapTop = 15, .width = 26, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x194 }, DUMMY_WIN_TEMPLATE @@ -204,7 +204,7 @@ static const struct WindowTemplate sSaveInfoWindowTemplate = { .tilemapTop = 1, .width = 14, .height = 10, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 8 }; @@ -1196,8 +1196,8 @@ static bool32 InitSaveWindowAfterLinkBattle(u8 *state) ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sBgTemplates_LinkBattleSave, ARRAY_COUNT(sBgTemplates_LinkBattleSave)); InitWindows(sWindowTemplates_LinkBattleSave); - LoadUserWindowBorderGfx_(0, 8, BG_PLTT_ID(0xE)); - Menu_LoadStdPalAt(BG_PLTT_ID(0xF)); + LoadUserWindowBorderGfx_(0, 8, BG_PLTT_ID(14)); + Menu_LoadStdPalAt(BG_PLTT_ID(15)); break; case 3: ShowBg(0); @@ -1246,7 +1246,7 @@ static void Task_SaveAfterLinkBattle(u8 taskId) TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); - DrawTextBorderOuter(0, 8, 0xE); + DrawTextBorderOuter(0, 8, 14); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); diff --git a/src/starter_choose.c b/src/starter_choose.c index fc626e13a1..2e8533e173 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -73,7 +73,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 15, .width = 24, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x0200 }, DUMMY_WIN_TEMPLATE, @@ -86,7 +86,7 @@ static const struct WindowTemplate sWindowTemplate_ConfirmStarter = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x0260 }; @@ -97,7 +97,7 @@ static const struct WindowTemplate sWindowTemplate_StarterLabel = .tilemapTop = 0, .width = 13, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x0274 }; @@ -411,7 +411,7 @@ void CB2_ChooseStarter(void) InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 0x2A8, BG_PLTT_ID(0xD)); + LoadUserWindowBorderGfx(0, 0x2A8, BG_PLTT_ID(13)); ClearScheduledBgCopiesToVram(); ScanlineEffect_Stop(); ResetTasks(); @@ -420,8 +420,8 @@ void CB2_ChooseStarter(void) FreeAllSpritePalettes(); ResetAllPicSprites(); - LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); - LoadPalette(gBirchBagGrassPal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP); + LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(14), PLTT_SIZE_4BPP); + LoadPalette(gBirchBagGrassPal, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP); LoadCompressedSpriteSheet(&sSpriteSheet_PokeballSelect[0]); LoadCompressedSpriteSheet(&sSpriteSheet_StarterCircle[0]); LoadSpritePalettes(sSpritePalettes_StarterChoose); diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 018ac5d881..165648d0e5 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -1168,7 +1168,7 @@ static void QueueAnimTiles_BattlePyramid_StatueShadow(u16 timer) static void BlendAnimPalette_BattleDome_FloorLights(u16 timer) { CpuCopy16(sTilesetAnims_BattleDomeFloorLightPals[timer % ARRAY_COUNT(sTilesetAnims_BattleDomeFloorLightPals)], &gPlttBufferUnfaded[0x80], 32); - BlendPalette(BG_PLTT_ID(0x8), 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); + BlendPalette(BG_PLTT_ID(8), 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if ((u8)FindTaskIdByFunc(Task_BattleTransition_Intro) != TASK_NONE) { sSecondaryTilesetAnimCallback = TilesetAnim_BattleDome2; @@ -1181,7 +1181,7 @@ static void BlendAnimPalette_BattleDome_FloorLightsNoBlend(u16 timer) CpuCopy16(sTilesetAnims_BattleDomeFloorLightPals[timer % ARRAY_COUNT(sTilesetAnims_BattleDomeFloorLightPals)], &gPlttBufferUnfaded[0x80], 32); if ((u8)FindTaskIdByFunc(Task_BattleTransition_Intro) == TASK_NONE) { - BlendPalette(BG_PLTT_ID(0x8), 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); + BlendPalette(BG_PLTT_ID(8), 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if (!--sSecondaryTilesetAnimCounterMax) sSecondaryTilesetAnimCallback = NULL; } diff --git a/src/title_screen.c b/src/title_screen.c index 7f7205d9d4..68b080b24a 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -548,7 +548,7 @@ void CB2_InitTitleScreen(void) // bg2 LZ77UnCompVram(gTitleScreenPokemonLogoGfx, (void *)(BG_CHAR_ADDR(0))); LZ77UnCompVram(gTitleScreenPokemonLogoTilemap, (void *)(BG_SCREEN_ADDR(9))); - LoadPalette(gTitleScreenBgPalettes, BG_PLTT_ID(0x0), 15 * PLTT_SIZE_4BPP); + LoadPalette(gTitleScreenBgPalettes, BG_PLTT_ID(0), 15 * PLTT_SIZE_4BPP); // bg3 LZ77UnCompVram(sTitleScreenRayquazaGfx, (void *)(BG_CHAR_ADDR(2))); LZ77UnCompVram(sTitleScreenRayquazaTilemap, (void *)(BG_SCREEN_ADDR(26))); @@ -563,7 +563,7 @@ void CB2_InitTitleScreen(void) LoadCompressedSpriteSheet(&sSpriteSheet_EmeraldVersion[0]); LoadCompressedSpriteSheet(&sSpriteSheet_PressStart[0]); LoadCompressedSpriteSheet(&sPokemonLogoShineSpriteSheet[0]); - LoadPalette(gTitleScreenEmeraldVersionPal, OBJ_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(gTitleScreenEmeraldVersionPal, OBJ_PLTT_ID(0), PLTT_SIZE_4BPP); LoadSpritePalette(&sSpritePalette_PressStart[0]); gMain.state = 2; break; @@ -812,6 +812,6 @@ static void UpdateLegendaryMarkingColor(u8 frameNum) s32 b = 12; u16 color = RGB(r, g, b); - LoadPalette(&color, BG_PLTT_ID(0xE) + 15, sizeof(color)); + LoadPalette(&color, BG_PLTT_ID(14) + 15, sizeof(color)); } } diff --git a/src/trade.c b/src/trade.c index 1c4d0d5e33..7216ecb414 100644 --- a/src/trade.c +++ b/src/trade.c @@ -333,8 +333,8 @@ static void InitTradeMenu(void) gPaletteFade.bufferTransferDisabled = TRUE; SetVBlankCallback(VBlankCB_TradeMenu); - LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZEOF(10)); - LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xD), PLTT_SIZEOF(10)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZEOF(10)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(13), PLTT_SIZEOF(10)); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sTradeMenuBgTemplates, ARRAY_COUNT(sTradeMenuBgTemplates)); SetBgTilemapBuffer(1, sTradeMenuData->tilemapBuffer); @@ -351,9 +351,9 @@ static void InitTradeMenu(void) FillWindowPixelBuffer(i, PIXEL_FILL(0)); } - FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 0xF); - LoadUserWindowBorderGfx_(0, 20, BG_PLTT_ID(0xC)); - LoadUserWindowBorderGfx(2, 1, BG_PLTT_ID(0xE)); + FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 15); + LoadUserWindowBorderGfx_(0, 20, BG_PLTT_ID(12)); + LoadUserWindowBorderGfx(2, 1, BG_PLTT_ID(14)); LoadMonIconPalettes(); sTradeMenuData->bufferPartyState = 0; sTradeMenuData->tradeMenuFunc = 0; @@ -910,7 +910,7 @@ static void LoadTradeBgGfx(u8 state) switch (state) { case 0: - LoadPalette(gTradeMenu_Pal, BG_PLTT_ID(0x0), 3 * PLTT_SIZE_4BPP); + LoadPalette(gTradeMenu_Pal, BG_PLTT_ID(0), 3 * PLTT_SIZE_4BPP); LoadBgTiles(1, gTradeMenu_Gfx, 0x1280, 0); CopyToBgTilemapBufferRect_ChangePalette(1, gTradeMenu_Tilemap, 0, 0, 32, 20, 0); LoadBgTilemap(2, sTradeStripesBG2Tilemap, 0x800, 0); @@ -1391,7 +1391,7 @@ static void TradeMenuProcessInput(void) // Cursor is in player's party if (sTradeMenuData->cursorPosition < PARTY_SIZE) { - DrawTextBorderOuter(1, 1, 0xE); + DrawTextBorderOuter(1, 1, 14); FillWindowPixelBuffer(1, PIXEL_FILL(1)); PrintMenuTable(1, ARRAY_COUNT(sSelectTradeMonActions), sSelectTradeMonActions); InitMenuInUpperLeftCornerNormal(1, ARRAY_COUNT(sSelectTradeMonActions), 0); @@ -2153,7 +2153,7 @@ static void PrintTradeMessage(u8 messageId) { FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized(0, FONT_NORMAL, sTradeMessages[messageId], 0, 1, TEXT_SKIP_DRAW, NULL); - DrawTextBorderOuter(0, 20, 0xC); + DrawTextBorderOuter(0, 20, 12); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); } @@ -2915,12 +2915,12 @@ static void InitTradeBgInternal(void) DecompressAndLoadBgGfxUsingHeap(0, gBattleTextboxTiles, 0, 0, 0); LZDecompressWram(gBattleTextboxTilemap, gDecompressionBuffer); CopyToBgTilemapBuffer(0, gDecompressionBuffer, 0x800, 0); - LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0), PLTT_SIZE_4BPP); InitWindows(sTradeSequenceWindowTemplates); DecompressAndLoadBgGfxUsingHeap(0, gBattleTextboxTiles, 0, 0, 0); LZDecompressWram(gBattleTextboxTilemap, gDecompressionBuffer); CopyToBgTilemapBuffer(0, gDecompressionBuffer, 0x800, 0); - LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0), PLTT_SIZE_4BPP); } static void CB2_InGameTrade(void) @@ -3100,7 +3100,7 @@ static void SetTradeSequenceBgGpuRegs(u8 state) BGCNT_16COLOR | BGCNT_SCREENBASE(18) | BGCNT_TXT512x256); - LoadPalette(gTradeGba2_Pal, BG_PLTT_ID(0x1), 3 * PLTT_SIZE_4BPP); + LoadPalette(gTradeGba2_Pal, BG_PLTT_ID(1), 3 * PLTT_SIZE_4BPP); DmaCopyLarge16(3, gTradeGba_Gfx, (void *) BG_CHAR_ADDR(1), 0x1420, 0x1000); DmaCopy16Defvars(3, gTradePlatform_Tilemap, (void *) BG_SCREEN_ADDR(18), 0x1000); break; @@ -3157,7 +3157,7 @@ static void SetTradeSequenceBgGpuRegs(u8 state) } break; case 3: - LoadPalette(sWirelessSignalNone_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + LoadPalette(sWirelessSignalNone_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); LZ77UnCompVram(sWirelessSignal_Gfx, (void *) BG_CHAR_ADDR(1)); LZ77UnCompVram(sWirelessSignal_Tilemap, (void *) BG_SCREEN_ADDR(18)); sTradeData->bg2vofs = 80; @@ -3236,7 +3236,7 @@ static void SetTradeSequenceBgGpuRegs(u8 state) BGCNT_16COLOR | BGCNT_SCREENBASE(18) | BGCNT_TXT512x256); - LoadPalette(gTradeGba2_Pal, BG_PLTT_ID(0x1), 3 * PLTT_SIZE_4BPP); + LoadPalette(gTradeGba2_Pal, BG_PLTT_ID(1), 3 * PLTT_SIZE_4BPP); DmaCopyLarge16(3, gTradeGba_Gfx, (void *) BG_CHAR_ADDR(1), 0x1420, 0x1000); DmaCopy16Defvars(3, gTradePlatform_Tilemap, (void *) BG_SCREEN_ADDR(18), 0x1000); break; @@ -4849,16 +4849,16 @@ static void Task_AnimateWirelessSignal(u8 taskId) if (!signalComingBack) { if (paletteIdx == 256) - LoadPalette(sWirelessSignalNone_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + LoadPalette(sWirelessSignalNone_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); else - LoadPalette(&sWirelessSignalSend_Pal[paletteIdx], BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + LoadPalette(&sWirelessSignalSend_Pal[paletteIdx], BG_PLTT_ID(3), PLTT_SIZE_4BPP); } else { if (paletteIdx == 256) - LoadPalette(sWirelessSignalNone_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + LoadPalette(sWirelessSignalNone_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); else - LoadPalette(&sWirelessSignalRecv_Pal[paletteIdx], BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + LoadPalette(&sWirelessSignalRecv_Pal[paletteIdx], BG_PLTT_ID(3), PLTT_SIZE_4BPP); } if (sWirelessSignalTiming[idx][0] == 0 && counter == 0) diff --git a/src/trader.c b/src/trader.c index b16297c109..254d809458 100644 --- a/src/trader.c +++ b/src/trader.c @@ -66,7 +66,7 @@ void CreateAvailableDecorationsMenu(u8 taskId) .tilemapTop = 1, .width = 10, .height = 10, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }; s32 windowWidth = GetStringWidth(FONT_NORMAL, gText_Exit, 0); diff --git a/src/trainer_card.c b/src/trainer_card.c index 94fcdaf6e5..bbd3ef340f 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -231,7 +231,7 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[] = .tilemapTop = 15, .width = 27, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x253, }, { @@ -240,7 +240,7 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[] = .tilemapTop = 1, .width = 28, .height = 18, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x1, }, { @@ -249,7 +249,7 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[] = .tilemapTop = 5, .width = 9, .height = 10, - .paletteNum = 0x8, + .paletteNum = 8, .baseBlock = 0x150, }, DUMMY_WIN_TEMPLATE @@ -1371,7 +1371,7 @@ static void LoadMonIconGfx(void) TintPalette_SepiaTone(sData->monIconPal, 96); break; } - LoadPalette(sData->monIconPal, BG_PLTT_ID(0x5), 6 * PLTT_SIZE_4BPP); + LoadPalette(sData->monIconPal, BG_PLTT_ID(5), 6 * PLTT_SIZE_4BPP); for (i = 0; i < PARTY_SIZE; i++) { @@ -1398,10 +1398,10 @@ static void PrintStickersOnCard(void) static void LoadStickerGfx(void) { - LoadPalette(sTrainerCardSticker1_Pal, BG_PLTT_ID(0xB), PLTT_SIZE_4BPP); - LoadPalette(sTrainerCardSticker2_Pal, BG_PLTT_ID(0xC), PLTT_SIZE_4BPP); - LoadPalette(sTrainerCardSticker3_Pal, BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); - LoadPalette(sTrainerCardSticker4_Pal, BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); + LoadPalette(sTrainerCardSticker1_Pal, BG_PLTT_ID(11), PLTT_SIZE_4BPP); + LoadPalette(sTrainerCardSticker2_Pal, BG_PLTT_ID(12), PLTT_SIZE_4BPP); + LoadPalette(sTrainerCardSticker3_Pal, BG_PLTT_ID(13), PLTT_SIZE_4BPP); + LoadPalette(sTrainerCardSticker4_Pal, BG_PLTT_ID(14), PLTT_SIZE_4BPP); LoadBgTiles(3, sData->stickerTiles, 1024, 128); } @@ -1424,19 +1424,19 @@ static u8 SetCardBgsAndPals(void) case 2: if (sData->cardType != CARD_TYPE_FRLG) { - LoadPalette(sHoennTrainerCardStarPals[sData->trainerCard.stars], BG_PLTT_ID(0x0), 3 * PLTT_SIZE_4BPP); - LoadPalette(sHoennTrainerCardBadges_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + LoadPalette(sHoennTrainerCardStarPals[sData->trainerCard.stars], BG_PLTT_ID(0), 3 * PLTT_SIZE_4BPP); + LoadPalette(sHoennTrainerCardBadges_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); if (sData->trainerCard.gender != MALE) - LoadPalette(sHoennTrainerCardFemaleBg_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + LoadPalette(sHoennTrainerCardFemaleBg_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); } else { - LoadPalette(sKantoTrainerCardStarPals[sData->trainerCard.stars], BG_PLTT_ID(0x0), 3 * PLTT_SIZE_4BPP); - LoadPalette(sKantoTrainerCardBadges_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); + LoadPalette(sKantoTrainerCardStarPals[sData->trainerCard.stars], BG_PLTT_ID(0), 3 * PLTT_SIZE_4BPP); + LoadPalette(sKantoTrainerCardBadges_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); if (sData->trainerCard.gender != MALE) - LoadPalette(sKantoTrainerCardFemaleBg_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP); + LoadPalette(sKantoTrainerCardFemaleBg_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP); } - LoadPalette(sTrainerCardGold_Pal, BG_PLTT_ID(0x4), PLTT_SIZE_4BPP); + LoadPalette(sTrainerCardGold_Pal, BG_PLTT_ID(4), PLTT_SIZE_4BPP); break; case 3: SetBgTilemapBuffer(0, sData->cardTilemapBuffer); @@ -1495,9 +1495,9 @@ static void DrawStarsAndBadgesOnCard(void) s16 i, x; u16 tileNum = 192; - u8 palNum = 0x3; + u8 palNum = 3; - FillBgTilemapBufferRect(3, 143, 15, yOffsets[sData->isHoenn], sData->trainerCard.stars, 1, 0x4); + FillBgTilemapBufferRect(3, 143, 15, yOffsets[sData->isHoenn], sData->trainerCard.stars, 1, 4); if (!sData->isLink) { x = 4; @@ -1521,38 +1521,38 @@ static void DrawCardBackStats(void) { if (sData->hasTrades) { - FillBgTilemapBufferRect(3, 141, 27, 9, 1, 1, 0x1); - FillBgTilemapBufferRect(3, 157, 27, 10, 1, 1, 0x1); + FillBgTilemapBufferRect(3, 141, 27, 9, 1, 1, 1); + FillBgTilemapBufferRect(3, 157, 27, 10, 1, 1, 1); } if (sData->trainerCard.linkPoints.berryCrush) { - FillBgTilemapBufferRect(3, 141, 21, 13, 1, 1, 0x1); - FillBgTilemapBufferRect(3, 157, 21, 14, 1, 1, 0x1); + FillBgTilemapBufferRect(3, 141, 21, 13, 1, 1, 1); + FillBgTilemapBufferRect(3, 157, 21, 14, 1, 1, 1); } if (sData->trainerCard.unionRoomNum) { - FillBgTilemapBufferRect(3, 141, 27, 11, 1, 1, 0x1); - FillBgTilemapBufferRect(3, 157, 27, 12, 1, 1, 0x1); + FillBgTilemapBufferRect(3, 141, 27, 11, 1, 1, 1); + FillBgTilemapBufferRect(3, 157, 27, 12, 1, 1, 1); } } else { if (sData->hasTrades) { - FillBgTilemapBufferRect(3, 141, 27, 9, 1, 1, 0x0); - FillBgTilemapBufferRect(3, 157, 27, 10, 1, 1, 0x0); + FillBgTilemapBufferRect(3, 141, 27, 9, 1, 1, 0); + FillBgTilemapBufferRect(3, 157, 27, 10, 1, 1, 0); } if (sData->trainerCard.contestsWithFriends) { - FillBgTilemapBufferRect(3, 141, 27, 13, 1, 1, 0x0); - FillBgTilemapBufferRect(3, 157, 27, 14, 1, 1, 0x0); + FillBgTilemapBufferRect(3, 141, 27, 13, 1, 1, 0); + FillBgTilemapBufferRect(3, 157, 27, 14, 1, 1, 0); } if (sData->hasBattleTowerWins) { - FillBgTilemapBufferRect(3, 141, 17, 15, 1, 1, 0x0); - FillBgTilemapBufferRect(3, 157, 17, 16, 1, 1, 0x0); - FillBgTilemapBufferRect(3, 140, 27, 15, 1, 1, 0x0); - FillBgTilemapBufferRect(3, 156, 27, 16, 1, 1, 0x0); + FillBgTilemapBufferRect(3, 141, 17, 15, 1, 1, 0); + FillBgTilemapBufferRect(3, 157, 17, 16, 1, 1, 0); + FillBgTilemapBufferRect(3, 140, 27, 15, 1, 1, 0); + FillBgTilemapBufferRect(3, 156, 27, 16, 1, 1, 0); } } CopyBgTilemapBufferToVram(3); diff --git a/src/trainer_hill.c b/src/trainer_hill.c index bb606f37bd..db0e849f9f 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -951,7 +951,7 @@ static void SetAllTrainerFlags(void) void TryLoadTrainerHillEReaderPalette(void) { if (OnTrainerHillEReaderChallengeFloor() == TRUE) - LoadPalette(sEReader_Pal, BG_PLTT_ID(0x7), PLTT_SIZE_4BPP); + LoadPalette(sEReader_Pal, BG_PLTT_ID(7), PLTT_SIZE_4BPP); } static void GetGameSaved(void) diff --git a/src/union_room.c b/src/union_room.c index 299171325e..e0df278dff 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -1910,7 +1910,7 @@ static void Task_SendMysteryGift(u8 taskId) winTemplate = sWindowTemplate_PlayerList; winTemplate.baseBlock = GetMysteryGiftBaseBlock(); - winTemplate.paletteNum = 0xC; + winTemplate.paletteNum = 12; data->listWindowId = AddWindow(&winTemplate); MG_DrawTextBorder(data->listWindowId); gMultiuseListMenuTemplate = sListMenuTemplate_PossibleGroupMembers; @@ -2114,11 +2114,11 @@ static void Task_CardOrNewsWithFriend(u8 taskId) listWinTemplate = sWindowTemplate_GroupList; listWinTemplate.baseBlock = GetMysteryGiftBaseBlock(); - listWinTemplate.paletteNum = 0xC; + listWinTemplate.paletteNum = 12; data->listWindowId = AddWindow(&listWinTemplate); playerNameWinTemplate = sWindowTemplate_PlayerNameAndId; - playerNameWinTemplate.paletteNum = 0xC; + playerNameWinTemplate.paletteNum = 12; data->playerNameAndIdWindowId = AddWindow(&playerNameWinTemplate); MG_DrawTextBorder(data->listWindowId); @@ -2439,7 +2439,7 @@ void RunUnionRoom(void) uroom->unreadPlayerId = 0; gSpecialVar_Result = 0; - ListMenuLoadStdPalAt(BG_PLTT_ID(0xD), 1); + ListMenuLoadStdPalAt(BG_PLTT_ID(13), 1); } static u16 ReadAsU16(const u8 *ptr) @@ -3775,7 +3775,7 @@ static s32 TradeBoardMenuHandler(u8 *state, u8 *mainWindowId, u8 *listMenuId, u8 static void UR_ClearBg0(void) { - FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0x0); + FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0); CopyBgTilemapBufferToVram(0); } diff --git a/src/union_room_battle.c b/src/union_room_battle.c index f4ad73b32b..f8381b2f70 100644 --- a/src/union_room_battle.c +++ b/src/union_room_battle.c @@ -43,7 +43,7 @@ static const struct WindowTemplate sWindowTemplates[] = { .tilemapTop = 15, .width = 24, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x014 }, DUMMY_WIN_TEMPLATE @@ -130,8 +130,8 @@ void CB2_UnionRoomBattle(void) FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 0xF); - LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD)); - LoadUserWindowBorderGfx_(0, 1, BG_PLTT_ID(0xD)); + LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(13)); + LoadUserWindowBorderGfx_(0, 1, BG_PLTT_ID(13)); Menu_LoadStdPal(); SetVBlankCallback(VBlankCB_UnionRoomBattle); gMain.state++; diff --git a/src/union_room_chat.c b/src/union_room_chat.c index 98af18cde6..72d36ae6bb 100755 --- a/src/union_room_chat.c +++ b/src/union_room_chat.c @@ -566,7 +566,7 @@ static const struct WindowTemplate sWinTemplates[] = { .tilemapTop = 1, .width = 21, .height = 19, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0001, }, { .bg = 1, @@ -574,7 +574,7 @@ static const struct WindowTemplate sWinTemplates[] = { .tilemapTop = 18, .width = 15, .height = 2, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 0x007a, }, { .bg = 1, @@ -582,7 +582,7 @@ static const struct WindowTemplate sWinTemplates[] = { .tilemapTop = 2, .width = 6, .height = 15, - .paletteNum = 0x7, + .paletteNum = 7, .baseBlock = 0x0020, }, { .bg = 0, @@ -590,7 +590,7 @@ static const struct WindowTemplate sWinTemplates[] = { .tilemapTop = 2, .width = 7, .height = 9, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 0x0013, }, DUMMY_WIN_TEMPLATE }; @@ -2732,7 +2732,7 @@ static void AddYesNoMenuAt(u8 left, u8 top, u8 initialCursorPos) template.tilemapTop = top; template.width = 6; template.height = 4; - template.paletteNum = 0xE; + template.paletteNum = 14; template.baseBlock = 0x52; sDisplay->yesNoMenuWindowId = AddWindow(&template); if (sDisplay->yesNoMenuWindowId != WINDOW_NONE) @@ -2741,7 +2741,7 @@ static void AddYesNoMenuAt(u8 left, u8 top, u8 initialCursorPos) PutWindowTilemap(sDisplay->yesNoMenuWindowId); AddTextPrinterParameterized(sDisplay->yesNoMenuWindowId, FONT_NORMAL, gText_Yes, 8, 1, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sDisplay->yesNoMenuWindowId, FONT_NORMAL, gText_No, 8, 17, TEXT_SKIP_DRAW, NULL); - DrawTextBorderOuter(sDisplay->yesNoMenuWindowId, 1, 0xD); + DrawTextBorderOuter(sDisplay->yesNoMenuWindowId, 1, 13); InitMenuInUpperLeftCornerNormal(sDisplay->yesNoMenuWindowId, 2, initialCursorPos); } } @@ -2779,7 +2779,7 @@ static void AddStdMessageWindow(int msgId, u16 bg0vofs) template.tilemapTop = 16; template.width = 21; template.height = 4; - template.paletteNum = 0xE; + template.paletteNum = 14; template.baseBlock = 0x6A; if (sDisplayStdMessages[msgId].useWiderBox) { @@ -3050,8 +3050,8 @@ static void ClearBg0(void) static void LoadChatWindowBorderGfx(void) { - LoadPalette(gUnionRoomChat_Window_Pal2, BG_PLTT_ID(0x7), PLTT_SIZE_4BPP); - LoadPalette(gUnionRoomChat_Window_Pal1, BG_PLTT_ID(0xC), PLTT_SIZE_4BPP); + LoadPalette(gUnionRoomChat_Window_Pal2, BG_PLTT_ID(7), PLTT_SIZE_4BPP); + LoadPalette(gUnionRoomChat_Window_Pal1, BG_PLTT_ID(12), PLTT_SIZE_4BPP); DecompressAndCopyTileDataToVram(1, gUnionRoomChat_Border_Gfx, 0, 0, 0); CopyToBgTilemapBuffer(1, gUnionRoomChat_Border_Tilemap, 0, 0); CopyBgTilemapBufferToVram(1); @@ -3061,7 +3061,7 @@ static void LoadChatWindowGfx(void) { u8 *ptr; - LoadPalette(gUnionRoomChat_Background_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(gUnionRoomChat_Background_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); ptr = DecompressAndCopyTileDataToVram(2, gUnionRoomChat_Background_Gfx, 0, 0, 0); if (ptr) { @@ -3075,13 +3075,13 @@ static void LoadChatWindowGfx(void) static void LoadChatUnkPalette(void) { - LoadPalette(sUnk_Palette1, BG_PLTT_ID(0x8), sizeof(sUnk_Palette1)); + LoadPalette(sUnk_Palette1, BG_PLTT_ID(8), sizeof(sUnk_Palette1)); RequestDma3Fill(0, (void *)BG_CHAR_ADDR(1) + 0x20, 0x20, 1); } static void LoadChatMessagesWindow(void) { - LoadPalette(sUnk_Palette2, BG_PLTT_ID(0xF), sizeof(sUnk_Palette2)); + LoadPalette(sUnk_Palette2, BG_PLTT_ID(15), sizeof(sUnk_Palette2)); PutWindowTilemap(0); FillWindowPixelBuffer(0, PIXEL_FILL(1)); CopyWindowToVram(0, COPYWIN_FULL); @@ -3112,9 +3112,9 @@ static void LoadTextEntryWindow(void) static void LoadKeyboardSwapWindow(void) { FillWindowPixelBuffer(3, PIXEL_FILL(1)); - LoadUserWindowBorderGfx(3, 1, BG_PLTT_ID(0xD)); - LoadUserWindowBorderGfx_(3, 0xA, BG_PLTT_ID(0x2)); - LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); + LoadUserWindowBorderGfx(3, 1, BG_PLTT_ID(13)); + LoadUserWindowBorderGfx_(3, 0xA, BG_PLTT_ID(2)); + LoadPalette(gStandardMenuPalette, BG_PLTT_ID(14), PLTT_SIZE_4BPP); } static void InitScanlineEffect(void) diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 85d1a477f7..be6fc89349 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -251,7 +251,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 1, .width = 13, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 1 }, [WIN_NATURE] = { @@ -260,7 +260,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 14, .width = 11, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x35 }, [WIN_TEXT] = { @@ -269,7 +269,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = .tilemapTop = 17, .width = 28, .height = 2, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x4B }, DUMMY_WIN_TEMPLATE @@ -282,7 +282,7 @@ static const struct WindowTemplate sUsePokeblockYesNoWinTemplate = .tilemapTop = 11, .width = 5, .height = 4, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x83 }; @@ -505,7 +505,7 @@ static void LoadUsePokeblockMenu(void) InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates)); InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 0x97, BG_PLTT_ID(0xE)); + LoadUserWindowBorderGfx(0, 0x97, BG_PLTT_ID(14)); sInfo->mainState++; break; case 4: @@ -1340,7 +1340,7 @@ static bool8 LoadUsePokeblockMenuGfx(void) LoadBgTilemap(3, sMonFrame_TilemapPtr, 1280, 0); break; case 5: - LoadPalette(sMonFrame_Pal, BG_PLTT_ID(0xD), PLTT_SIZE_4BPP); + LoadPalette(sMonFrame_Pal, BG_PLTT_ID(13), PLTT_SIZE_4BPP); sMenu->curMonXOffset = -80; break; case 6: @@ -1348,7 +1348,7 @@ static bool8 LoadUsePokeblockMenuGfx(void) break; case 7: LZ77UnCompVram(gUsePokeblockGraph_Tilemap, sGraph_Tilemap); - LoadPalette(gUsePokeblockGraph_Pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP); + LoadPalette(gUsePokeblockGraph_Pal, BG_PLTT_ID(2), PLTT_SIZE_4BPP); break; case 8: LoadBgTiles(1, sGraph_Gfx, 6656, 160 << 2); @@ -1363,8 +1363,8 @@ static bool8 LoadUsePokeblockMenuGfx(void) break; case 11: LoadBgTilemap(2, sMenu->tilemapBuffer, 1280, 0); - LoadPalette(gConditionGraphData_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP); - LoadPalette(gConditionText_Pal, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP); + LoadPalette(gConditionGraphData_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP); + LoadPalette(gConditionText_Pal, BG_PLTT_ID(15), PLTT_SIZE_4BPP); ConditionGraph_InitWindow(2); break; default: diff --git a/src/wallclock.c b/src/wallclock.c index 52566eddc8..571748d114 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -79,7 +79,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 17, .width = 24, .height = 2, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 512 }, { @@ -88,7 +88,7 @@ static const struct WindowTemplate sWindowTemplates[] = .tilemapTop = 16, .width = 6, .height = 2, - .paletteNum = 0xC, + .paletteNum = 12, .baseBlock = 560 }, DUMMY_WIN_TEMPLATE @@ -101,7 +101,7 @@ static const struct WindowTemplate sWindowTemplate_ConfirmYesNo = .tilemapTop = 9, .width = 5, .height = 4, - .paletteNum = 0xE, + .paletteNum = 14, .baseBlock = 572 }; @@ -644,17 +644,17 @@ static void LoadWallClockGraphics(void) LZ77UnCompVram(gWallClock_Gfx, (void *)VRAM); if (gSpecialVar_0x8004 == MALE) - LoadPalette(gWallClockMale_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(gWallClockMale_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); else - LoadPalette(gWallClockFemale_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(gWallClockFemale_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); - LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(0xE), PLTT_SIZE_4BPP); - LoadPalette(sTextPrompt_Pal, BG_PLTT_ID(0xC), PLTT_SIZEOF(4)); + LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(14), PLTT_SIZE_4BPP); + LoadPalette(sTextPrompt_Pal, BG_PLTT_ID(12), PLTT_SIZEOF(4)); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates)); InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - LoadUserWindowBorderGfx(0, 0x250, BG_PLTT_ID(0xD)); + LoadUserWindowBorderGfx(0, 0x250, BG_PLTT_ID(13)); ClearScheduledBgCopiesToVram(); ScanlineEffect_Stop(); ResetTasks(); diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index bab3ec6345..b5da0dac03 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -76,7 +76,7 @@ static const struct WindowTemplate sWindowTemplates[] = { .tilemapTop = 0, .width = 24, .height = 3, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0001 }, { .bg = 0, @@ -84,7 +84,7 @@ static const struct WindowTemplate sWindowTemplates[] = { .tilemapTop = 4, .width = 21, .height = 15, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0049 }, { .bg = 0, @@ -92,7 +92,7 @@ static const struct WindowTemplate sWindowTemplates[] = { .tilemapTop = 4, .width = 3, .height = 15, - .paletteNum = 0xF, + .paletteNum = 15, .baseBlock = 0x0184 }, DUMMY_WIN_TEMPLATE }; @@ -193,10 +193,10 @@ static void CB2_InitWirelessCommunicationScreen(void) ChangeBgY(0, 0, BG_COORD_SET); ChangeBgX(1, 0, BG_COORD_SET); ChangeBgY(1, 0, BG_COORD_SET); - LoadPalette(sBgTiles_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP); + LoadPalette(sBgTiles_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); Menu_LoadStdPalAt(0xF0); DynamicPlaceholderTextUtil_Reset(); - FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0xF); + FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 15); CopyBgTilemapBufferToVram(1); SetMainCallback2(CB2_RunWirelessCommunicationScreen); RunTasks(); @@ -227,7 +227,7 @@ static void WCSS_CyclePalette(s16 * counter, s16 * palIdx) *counter = 0; } - LoadPalette(sBgTiles_Pal + 16 * (*palIdx + 2), BG_PLTT_ID(0x0), PLTT_SIZEOF(8)); + LoadPalette(sBgTiles_Pal + 16 * (*palIdx + 2), BG_PLTT_ID(0), PLTT_SIZEOF(8)); } static void PrintHeaderTexts(void) From ba6d4866e41d32f1778dcf26d2bc3a0bc00461cf Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Sun, 21 Aug 2022 09:45:55 +0100 Subject: [PATCH 06/13] Options menu: standardize task data --- src/option_menu.c | 143 +++++++++++++++++++++++----------------------- 1 file changed, 70 insertions(+), 73 deletions(-) diff --git a/src/option_menu.c b/src/option_menu.c index d2f1bc4ce0..64e805ebad 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -17,16 +17,13 @@ #include "constants/rgb.h" // Task data -enum -{ - TD_MENUSELECTION, - TD_TEXTSPEED, - TD_BATTLESCENE, - TD_BATTLESTYLE, - TD_SOUND, - TD_BUTTONMODE, - TD_FRAMETYPE, -}; +#define tMenuSelection data[0] +#define tTextSpeed data[1] +#define tBattleSceneOff data[2] +#define tBattleStyle data[3] +#define tSound data[4] +#define tButtonMode data[5] +#define tWindowFrameType data[6] // Menu items enum @@ -44,7 +41,7 @@ enum // Window Ids enum { - WIN_TEXT_OPTION, + WIN_HEADER, WIN_OPTIONS }; @@ -73,7 +70,7 @@ static u8 FrameType_ProcessInput(u8 selection); static void FrameType_DrawChoices(u8 selection); static u8 ButtonMode_ProcessInput(u8 selection); static void ButtonMode_DrawChoices(u8 selection); -static void DrawTextOption(void); +static void DrawHeaderText(void); static void DrawOptionMenuTexts(void); static void DrawBgWindowFrames(void); @@ -96,7 +93,7 @@ static const u8 *const sOptionMenuItemsNames[MENUITEM_COUNT] = static const struct WindowTemplate sOptionMenuWinTemplates[] = { - { + [WIN_HEADER] = { .bg = 1, .tilemapLeft = 2, .tilemapTop = 1, @@ -105,7 +102,7 @@ static const struct WindowTemplate sOptionMenuWinTemplates[] = .paletteNum = 1, .baseBlock = 2 }, - { + [WIN_OPTIONS] = { .bg = 0, .tilemapLeft = 2, .tilemapTop = 5, @@ -217,7 +214,7 @@ void CB2_InitOptionMenu(void) break; case 6: PutWindowTilemap(0); - DrawTextOption(); + DrawHeaderText(); gMain.state++; break; case 7: @@ -235,21 +232,21 @@ void CB2_InitOptionMenu(void) { u8 taskId = CreateTask(Task_OptionMenuFadeIn, 0); - gTasks[taskId].data[TD_MENUSELECTION] = 0; - gTasks[taskId].data[TD_TEXTSPEED] = gSaveBlock2Ptr->optionsTextSpeed; - gTasks[taskId].data[TD_BATTLESCENE] = gSaveBlock2Ptr->optionsBattleSceneOff; - gTasks[taskId].data[TD_BATTLESTYLE] = gSaveBlock2Ptr->optionsBattleStyle; - gTasks[taskId].data[TD_SOUND] = gSaveBlock2Ptr->optionsSound; - gTasks[taskId].data[TD_BUTTONMODE] = gSaveBlock2Ptr->optionsButtonMode; - gTasks[taskId].data[TD_FRAMETYPE] = gSaveBlock2Ptr->optionsWindowFrameType; + gTasks[taskId].tMenuSelection = 0; + gTasks[taskId].tTextSpeed = gSaveBlock2Ptr->optionsTextSpeed; + gTasks[taskId].tBattleSceneOff = gSaveBlock2Ptr->optionsBattleSceneOff; + gTasks[taskId].tBattleStyle = gSaveBlock2Ptr->optionsBattleStyle; + gTasks[taskId].tSound = gSaveBlock2Ptr->optionsSound; + gTasks[taskId].tButtonMode = gSaveBlock2Ptr->optionsButtonMode; + gTasks[taskId].tWindowFrameType = gSaveBlock2Ptr->optionsWindowFrameType; - TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]); - BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]); - BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]); - Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]); - ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]); - FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]); - HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]); + TextSpeed_DrawChoices(gTasks[taskId].tTextSpeed); + BattleScene_DrawChoices(gTasks[taskId].tBattleSceneOff); + BattleStyle_DrawChoices(gTasks[taskId].tBattleStyle); + Sound_DrawChoices(gTasks[taskId].tSound); + ButtonMode_DrawChoices(gTasks[taskId].tButtonMode); + FrameType_DrawChoices(gTasks[taskId].tWindowFrameType); + HighlightOptionMenuItem(gTasks[taskId].tMenuSelection); CopyWindowToVram(WIN_OPTIONS, COPYWIN_FULL); gMain.state++; @@ -273,7 +270,7 @@ static void Task_OptionMenuProcessInput(u8 taskId) { if (JOY_NEW(A_BUTTON)) { - if (gTasks[taskId].data[TD_MENUSELECTION] == MENUITEM_CANCEL) + if (gTasks[taskId].tMenuSelection == MENUITEM_CANCEL) gTasks[taskId].func = Task_OptionMenuSave; } else if (JOY_NEW(B_BUTTON)) @@ -282,67 +279,67 @@ static void Task_OptionMenuProcessInput(u8 taskId) } else if (JOY_NEW(DPAD_UP)) { - if (gTasks[taskId].data[TD_MENUSELECTION] > 0) - gTasks[taskId].data[TD_MENUSELECTION]--; + if (gTasks[taskId].tMenuSelection > 0) + gTasks[taskId].tMenuSelection--; else - gTasks[taskId].data[TD_MENUSELECTION] = MENUITEM_CANCEL; - HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]); + gTasks[taskId].tMenuSelection = MENUITEM_CANCEL; + HighlightOptionMenuItem(gTasks[taskId].tMenuSelection); } else if (JOY_NEW(DPAD_DOWN)) { - if (gTasks[taskId].data[TD_MENUSELECTION] < MENUITEM_CANCEL) - gTasks[taskId].data[TD_MENUSELECTION]++; + if (gTasks[taskId].tMenuSelection < MENUITEM_CANCEL) + gTasks[taskId].tMenuSelection++; else - gTasks[taskId].data[TD_MENUSELECTION] = 0; - HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]); + gTasks[taskId].tMenuSelection = 0; + HighlightOptionMenuItem(gTasks[taskId].tMenuSelection); } else { u8 previousOption; - switch (gTasks[taskId].data[TD_MENUSELECTION]) + switch (gTasks[taskId].tMenuSelection) { case MENUITEM_TEXTSPEED: - previousOption = gTasks[taskId].data[TD_TEXTSPEED]; - gTasks[taskId].data[TD_TEXTSPEED] = TextSpeed_ProcessInput(gTasks[taskId].data[TD_TEXTSPEED]); + previousOption = gTasks[taskId].tTextSpeed; + gTasks[taskId].tTextSpeed = TextSpeed_ProcessInput(gTasks[taskId].tTextSpeed); - if (previousOption != gTasks[taskId].data[TD_TEXTSPEED]) - TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]); + if (previousOption != gTasks[taskId].tTextSpeed) + TextSpeed_DrawChoices(gTasks[taskId].tTextSpeed); break; case MENUITEM_BATTLESCENE: - previousOption = gTasks[taskId].data[TD_BATTLESCENE]; - gTasks[taskId].data[TD_BATTLESCENE] = BattleScene_ProcessInput(gTasks[taskId].data[TD_BATTLESCENE]); + previousOption = gTasks[taskId].tBattleSceneOff; + gTasks[taskId].tBattleSceneOff = BattleScene_ProcessInput(gTasks[taskId].tBattleSceneOff); - if (previousOption != gTasks[taskId].data[TD_BATTLESCENE]) - BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]); + if (previousOption != gTasks[taskId].tBattleSceneOff) + BattleScene_DrawChoices(gTasks[taskId].tBattleSceneOff); break; case MENUITEM_BATTLESTYLE: - previousOption = gTasks[taskId].data[TD_BATTLESTYLE]; - gTasks[taskId].data[TD_BATTLESTYLE] = BattleStyle_ProcessInput(gTasks[taskId].data[TD_BATTLESTYLE]); + previousOption = gTasks[taskId].tBattleStyle; + gTasks[taskId].tBattleStyle = BattleStyle_ProcessInput(gTasks[taskId].tBattleStyle); - if (previousOption != gTasks[taskId].data[TD_BATTLESTYLE]) - BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]); + if (previousOption != gTasks[taskId].tBattleStyle) + BattleStyle_DrawChoices(gTasks[taskId].tBattleStyle); break; case MENUITEM_SOUND: - previousOption = gTasks[taskId].data[TD_SOUND]; - gTasks[taskId].data[TD_SOUND] = Sound_ProcessInput(gTasks[taskId].data[TD_SOUND]); + previousOption = gTasks[taskId].tSound; + gTasks[taskId].tSound = Sound_ProcessInput(gTasks[taskId].tSound); - if (previousOption != gTasks[taskId].data[TD_SOUND]) - Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]); + if (previousOption != gTasks[taskId].tSound) + Sound_DrawChoices(gTasks[taskId].tSound); break; case MENUITEM_BUTTONMODE: - previousOption = gTasks[taskId].data[TD_BUTTONMODE]; - gTasks[taskId].data[TD_BUTTONMODE] = ButtonMode_ProcessInput(gTasks[taskId].data[TD_BUTTONMODE]); + previousOption = gTasks[taskId].tButtonMode; + gTasks[taskId].tButtonMode = ButtonMode_ProcessInput(gTasks[taskId].tButtonMode); - if (previousOption != gTasks[taskId].data[TD_BUTTONMODE]) - ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]); + if (previousOption != gTasks[taskId].tButtonMode) + ButtonMode_DrawChoices(gTasks[taskId].tButtonMode); break; case MENUITEM_FRAMETYPE: - previousOption = gTasks[taskId].data[TD_FRAMETYPE]; - gTasks[taskId].data[TD_FRAMETYPE] = FrameType_ProcessInput(gTasks[taskId].data[TD_FRAMETYPE]); + previousOption = gTasks[taskId].tWindowFrameType; + gTasks[taskId].tWindowFrameType = FrameType_ProcessInput(gTasks[taskId].tWindowFrameType); - if (previousOption != gTasks[taskId].data[TD_FRAMETYPE]) - FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]); + if (previousOption != gTasks[taskId].tWindowFrameType) + FrameType_DrawChoices(gTasks[taskId].tWindowFrameType); break; default: return; @@ -358,12 +355,12 @@ static void Task_OptionMenuProcessInput(u8 taskId) static void Task_OptionMenuSave(u8 taskId) { - gSaveBlock2Ptr->optionsTextSpeed = gTasks[taskId].data[TD_TEXTSPEED]; - gSaveBlock2Ptr->optionsBattleSceneOff = gTasks[taskId].data[TD_BATTLESCENE]; - gSaveBlock2Ptr->optionsBattleStyle = gTasks[taskId].data[TD_BATTLESTYLE]; - gSaveBlock2Ptr->optionsSound = gTasks[taskId].data[TD_SOUND]; - gSaveBlock2Ptr->optionsButtonMode = gTasks[taskId].data[TD_BUTTONMODE]; - gSaveBlock2Ptr->optionsWindowFrameType = gTasks[taskId].data[TD_FRAMETYPE]; + gSaveBlock2Ptr->optionsTextSpeed = gTasks[taskId].tTextSpeed; + gSaveBlock2Ptr->optionsBattleSceneOff = gTasks[taskId].tBattleSceneOff; + gSaveBlock2Ptr->optionsBattleStyle = gTasks[taskId].tBattleStyle; + gSaveBlock2Ptr->optionsSound = gTasks[taskId].tSound; + gSaveBlock2Ptr->optionsButtonMode = gTasks[taskId].tButtonMode; + gSaveBlock2Ptr->optionsWindowFrameType = gTasks[taskId].tWindowFrameType; BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_OptionMenuFadeOut; @@ -623,11 +620,11 @@ static void ButtonMode_DrawChoices(u8 selection) DrawOptionMenuChoice(gText_ButtonTypeLEqualsA, GetStringRightAlignXOffset(FONT_NORMAL, gText_ButtonTypeLEqualsA, 198), YPOS_BUTTONMODE, styles[2]); } -static void DrawTextOption(void) +static void DrawHeaderText(void) { - FillWindowPixelBuffer(WIN_TEXT_OPTION, PIXEL_FILL(1)); - AddTextPrinterParameterized(WIN_TEXT_OPTION, FONT_NORMAL, gText_Option, 8, 1, TEXT_SKIP_DRAW, NULL); - CopyWindowToVram(WIN_TEXT_OPTION, COPYWIN_FULL); + FillWindowPixelBuffer(WIN_HEADER, PIXEL_FILL(1)); + AddTextPrinterParameterized(WIN_HEADER, FONT_NORMAL, gText_Option, 8, 1, TEXT_SKIP_DRAW, NULL); + CopyWindowToVram(WIN_HEADER, COPYWIN_FULL); } static void DrawOptionMenuTexts(void) From 2aa821176bd40abe843874e31b7386e7053704e6 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Sun, 21 Aug 2022 09:49:40 +0100 Subject: [PATCH 07/13] Options menu: sort #includes --- src/option_menu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/option_menu.c b/src/option_menu.c index 64e805ebad..c9c7bce048 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -1,18 +1,18 @@ #include "global.h" #include "option_menu.h" -#include "main.h" -#include "menu.h" -#include "scanline_effect.h" -#include "palette.h" -#include "sprite.h" -#include "task.h" #include "bg.h" #include "gpu_regs.h" -#include "window.h" +#include "international_string_util.h" +#include "main.h" +#include "menu.h" +#include "palette.h" +#include "scanline_effect.h" +#include "sprite.h" +#include "strings.h" +#include "task.h" #include "text.h" #include "text_window.h" -#include "international_string_util.h" -#include "strings.h" +#include "window.h" #include "gba/m4a_internal.h" #include "constants/rgb.h" From f4a2040843ad72ec3ab51b61ce2da90f3ccd43ff Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Sun, 21 Aug 2022 15:10:18 +0100 Subject: [PATCH 08/13] Options menu: cleanup --- src/option_menu.c | 69 ++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 37 deletions(-) diff --git a/src/option_menu.c b/src/option_menu.c index c9c7bce048..67169b1f9b 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -16,7 +16,6 @@ #include "gba/m4a_internal.h" #include "constants/rgb.h" -// Task data #define tMenuSelection data[0] #define tTextSpeed data[1] #define tBattleSceneOff data[2] @@ -25,7 +24,6 @@ #define tButtonMode data[5] #define tWindowFrameType data[6] -// Menu items enum { MENUITEM_TEXTSPEED, @@ -38,7 +36,6 @@ enum MENUITEM_COUNT, }; -// Window Ids enum { WIN_HEADER, @@ -52,23 +49,22 @@ enum #define YPOS_BUTTONMODE (MENUITEM_BUTTONMODE * 16) #define YPOS_FRAMETYPE (MENUITEM_FRAMETYPE * 16) -// this file's functions static void Task_OptionMenuFadeIn(u8 taskId); static void Task_OptionMenuProcessInput(u8 taskId); static void Task_OptionMenuSave(u8 taskId); static void Task_OptionMenuFadeOut(u8 taskId); static void HighlightOptionMenuItem(u8 selection); -static u8 TextSpeed_ProcessInput(u8 selection); +static u8 TextSpeed_ProcessInput(u8 selection); static void TextSpeed_DrawChoices(u8 selection); -static u8 BattleScene_ProcessInput(u8 selection); +static u8 BattleScene_ProcessInput(u8 selection); static void BattleScene_DrawChoices(u8 selection); -static u8 BattleStyle_ProcessInput(u8 selection); +static u8 BattleStyle_ProcessInput(u8 selection); static void BattleStyle_DrawChoices(u8 selection); -static u8 Sound_ProcessInput(u8 selection); +static u8 Sound_ProcessInput(u8 selection); static void Sound_DrawChoices(u8 selection); -static u8 FrameType_ProcessInput(u8 selection); +static u8 FrameType_ProcessInput(u8 selection); static void FrameType_DrawChoices(u8 selection); -static u8 ButtonMode_ProcessInput(u8 selection); +static u8 ButtonMode_ProcessInput(u8 selection); static void ButtonMode_DrawChoices(u8 selection); static void DrawHeaderText(void); static void DrawOptionMenuTexts(void); @@ -116,29 +112,28 @@ static const struct WindowTemplate sOptionMenuWinTemplates[] = static const struct BgTemplate sOptionMenuBgTemplates[] = { - { - .bg = 1, - .charBaseIndex = 1, - .mapBaseIndex = 30, - .screenSize = 0, - .paletteMode = 0, - .priority = 0, - .baseTile = 0 - }, - { - .bg = 0, - .charBaseIndex = 1, - .mapBaseIndex = 31, - .screenSize = 0, - .paletteMode = 0, - .priority = 1, - .baseTile = 0 - } + { + .bg = 1, + .charBaseIndex = 1, + .mapBaseIndex = 30, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0 + }, + { + .bg = 0, + .charBaseIndex = 1, + .mapBaseIndex = 31, + .screenSize = 0, + .paletteMode = 0, + .priority = 1, + .baseTile = 0 + } }; static const u16 sOptionMenuBg_Pal[] = {RGB(17, 18, 31)}; -// code static void MainCB2(void) { RunTasks(); @@ -213,7 +208,7 @@ void CB2_InitOptionMenu(void) gMain.state++; break; case 6: - PutWindowTilemap(0); + PutWindowTilemap(WIN_HEADER); DrawHeaderText(); gMain.state++; break; @@ -221,7 +216,7 @@ void CB2_InitOptionMenu(void) gMain.state++; break; case 8: - PutWindowTilemap(1); + PutWindowTilemap(WIN_OPTIONS); DrawOptionMenuTexts(); gMain.state++; case 9: @@ -253,7 +248,7 @@ void CB2_InitOptionMenu(void) break; } case 11: - BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); SetVBlankCallback(VBlankCB); SetMainCallback2(MainCB2); return; @@ -362,7 +357,7 @@ static void Task_OptionMenuSave(u8 taskId) gSaveBlock2Ptr->optionsButtonMode = gTasks[taskId].tButtonMode; gSaveBlock2Ptr->optionsWindowFrameType = gTasks[taskId].tWindowFrameType; - BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_OptionMenuFadeOut; } @@ -387,13 +382,13 @@ static void DrawOptionMenuChoice(const u8 *text, u8 x, u8 y, u8 style) u8 dst[16]; u16 i; - for (i = 0; *text != EOS && i <= 14; i++) + for (i = 0; *text != EOS && i < ARRAY_COUNT(dst) - 1; i++) dst[i] = *(text++); if (style != 0) { - dst[2] = 4; - dst[5] = 5; + dst[2] = TEXT_COLOR_RED; + dst[5] = TEXT_COLOR_LIGHT_RED; } dst[i] = EOS; @@ -564,7 +559,7 @@ static void FrameType_DrawChoices(u8 selection) { text[i] = n % 10 + CHAR_0; i++; - text[i] = 0x77; + text[i] = CHAR_SPACER; i++; } From 33f3a7c11a1b4bfc6eb973c3345c1504b4675d7a Mon Sep 17 00:00:00 2001 From: tustin2121 Date: Mon, 7 Nov 2022 06:09:21 -0500 Subject: [PATCH 09/13] Adding FindObjectEventPaletteIndexByTag bugfix The code in event_object_movement.c indicates that OBJ_EVENT_PAL_TAG_NONE was meant to be a sentinel for the bottom of each of the tables involving palettes in there. sObjectEventSpritePalettes is the exception, but the functions that access it look for OBJ_EVENT_PAL_TAG_NONE even though it's not in the table. If the palette tag isn't in the table, the functions which scan it fall off the bottom of the table into an infinite loop of scanning 256 "entries" of the table (because it uses a u8 index), and the game locks up. In vanilla, the search simply never falls off the bottom of the table. It seems the developers intended for that last entry to be {NULL, OBJ_EVENT_PAL_TAG_NONE}. --- src/event_object_movement.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 3429b2049d..e277e2a48a 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -497,7 +497,12 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = { {gObjectEventPal_Lugia, OBJ_EVENT_PAL_TAG_LUGIA}, {gObjectEventPal_RubySapphireBrendan, OBJ_EVENT_PAL_TAG_RS_BRENDAN}, {gObjectEventPal_RubySapphireMay, OBJ_EVENT_PAL_TAG_RS_MAY}, - {}, +#ifdef BUGFIX + {NULL, OBJ_EVENT_PAL_TAG_NONE}, +#else + {}, // BUG: FindObjectEventPaletteIndexByTag looks for OBJ_EVENT_PAL_TAG_NONE and not 0x0. + // If it's looking for a tag that isn't in this table, the game locks in an infinite loop. +#endif }; static const u16 sReflectionPaletteTags_Brendan[] = { From d68e81c2becd249c45c43733d1b4775749212353 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 17 Jan 2023 21:09:17 -0500 Subject: [PATCH 10/13] Clarify MB_SEMI_DEEP_WATER name --- include/constants/metatile_behaviors.h | 2 +- src/metatile_behavior.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index 86f35ce50d..1f6d4e87cb 100755 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -18,7 +18,7 @@ #define MB_MOSSDEEP_GYM_WARP 0x0E #define MB_MT_PYRE_HOLE 0x0F #define MB_POND_WATER 0x10 -#define MB_SEMI_DEEP_WATER 0x11 +#define MB_INTERIOR_DEEP_WATER 0x11 // Used by interior maps; functionally the same as MB_DEEP_WATER #define MB_DEEP_WATER 0x12 #define MB_WATERFALL 0x13 #define MB_SOOTOPOLIS_DEEP_WATER 0x14 diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index e35a5b29ac..924428aea4 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -23,7 +23,7 @@ static const u8 sTileBitAttributes[NUM_METATILE_BEHAVIORS] = [MB_MOSSDEEP_GYM_WARP] = TILE_FLAG_UNUSED, [MB_MT_PYRE_HOLE] = TILE_FLAG_UNUSED, [MB_POND_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS, - [MB_SEMI_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS, + [MB_INTERIOR_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS, [MB_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS, [MB_WATERFALL] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE, [MB_SOOTOPOLIS_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE, @@ -852,7 +852,7 @@ bool8 MetatileBehavior_IsMountain(u8 metatileBehavior) bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior) { - if (metatileBehavior == MB_SEMI_DEEP_WATER + if (metatileBehavior == MB_INTERIOR_DEEP_WATER || metatileBehavior == MB_DEEP_WATER || metatileBehavior == MB_SOOTOPOLIS_DEEP_WATER) return TRUE; @@ -905,7 +905,7 @@ bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior) bool8 MetatileBehavior_IsDeepOrOceanWater(u8 metatileBehavior) { if (metatileBehavior == MB_OCEAN_WATER - || metatileBehavior == MB_SEMI_DEEP_WATER + || metatileBehavior == MB_INTERIOR_DEEP_WATER || metatileBehavior == MB_DEEP_WATER) return TRUE; else @@ -1163,7 +1163,7 @@ bool8 MetatileBehavior_IsSurfableFishableWater(u8 metatileBehavior) { if (metatileBehavior == MB_POND_WATER || metatileBehavior == MB_OCEAN_WATER - || metatileBehavior == MB_SEMI_DEEP_WATER + || metatileBehavior == MB_INTERIOR_DEEP_WATER || metatileBehavior == MB_DEEP_WATER || metatileBehavior == MB_SOOTOPOLIS_DEEP_WATER || (metatileBehavior == MB_EASTWARD_CURRENT From a203c03eacb138e9bf9155a4e16503c09dd57c7f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 18 Jan 2023 10:33:39 -0500 Subject: [PATCH 11/13] Add bugfix to LoadObjectEventPalette --- src/event_object_movement.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index e277e2a48a..af78b4f7ca 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1998,7 +1998,12 @@ static void LoadObjectEventPalette(u16 paletteTag) { u16 i = FindObjectEventPaletteIndexByTag(paletteTag); - if (i != OBJ_EVENT_PAL_TAG_NONE) // always true +// FindObjectEventPaletteIndexByTag returns 0xFF on failure, not OBJ_EVENT_PAL_TAG_NONE. +#ifdef BUGFIX + if (i != 0xFF) +#else + if (i != OBJ_EVENT_PAL_TAG_NONE) +#endif LoadSpritePaletteIfTagExists(&sObjectEventSpritePalettes[i]); } @@ -2021,6 +2026,7 @@ static u8 LoadSpritePaletteIfTagExists(const struct SpritePalette *spritePalette void PatchObjectPalette(u16 paletteTag, u8 paletteSlot) { + // paletteTag is assumed to exist in sObjectEventSpritePalettes u8 paletteIndex = FindObjectEventPaletteIndexByTag(paletteTag); LoadPalette(sObjectEventSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20); From d1e4bd44cea2837768d25d8d5254a0bcfa81f914 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 18 Jan 2023 11:54:06 -0500 Subject: [PATCH 12/13] Correct comment in maps.h --- include/constants/maps.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/constants/maps.h b/include/constants/maps.h index 626054b43f..1bf11fa5cc 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -14,8 +14,8 @@ // IDs for dynamic warps. Both are used in the dest_warp_id field for warp events, but they // are never read in practice. A dest_map of MAP_DYNAMIC is used to indicate that a -// dynamic warp should be used, at which point the warp id is ignored. It can be passed to -// SetDynamicWarp/SetDynamicWarpWithCoords as the first argument, but this argument is unused. +// dynamic warp should be used, at which point the warp id is ignored. They can be passed +// as the argument to SetWarpDestinationToDynamicWarp, but this argument is unused. // As only one dynamic warp is saved at a time there's no need to distinguish between them. #define WARP_ID_SECRET_BASE 0x7E #define WARP_ID_DYNAMIC 0x7F From b7d92e85373b0014487a13aa4f849240f4b0c9d7 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 18 Jan 2023 12:11:09 -0500 Subject: [PATCH 13/13] Revert incorrect constant usage, add new correct ones --- data/battle_anim_scripts.s | 34 ++++++++++++++++----------------- include/constants/battle_anim.h | 12 +++++++----- src/battle_anim_dark.c | 8 ++++---- src/battle_anim_mon_movement.c | 10 +++++----- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 9568a3e5c0..4519761845 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -2597,8 +2597,8 @@ Move_LOW_KICK: end Move_EARTHQUAKE: - createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 10, 50 - createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 10, 50 + createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 10, 50 + createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 10, 50 playsewithpan SE_M_EARTHQUAKE, 0 delay 10 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 1, RGB_BLACK, 14, RGB_WHITE, 14 @@ -2608,7 +2608,7 @@ Move_EARTHQUAKE: Move_FISSURE: loadspritegfx ANIM_TAG_MUD_SAND - createvisualtask AnimTask_HorizontalShake, 3, ANIM_PLAYER_RIGHT, 10, 50 + createvisualtask AnimTask_HorizontalShake, 3, (MAX_BATTLERS_COUNT + 1), 10, 50 createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 50 playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET delay 8 @@ -2953,7 +2953,7 @@ SkyAttackSetUpAgainstPartner: delay 20 createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 15, 0, RGB_WHITE waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_PLAYER_LEFT, 1, 8, 0, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 1, 8, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -3182,15 +3182,15 @@ Move_DESTINY_BOND: playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER delay 48 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1 - createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, ANIM_OPPONENT_LEFT, 1, 0, 12, RGB(29, 29, 29) + createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 0, 12, RGB(29, 29, 29) delay 24 - createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, ANIM_OPPONENT_LEFT, 1, 12, 0, RGB(29, 29, 29) + createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 12, 0, RGB(29, 29, 29) playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein blendoff - clearmonbg ANIM_PLAYER_RIGHT + clearmonbg 5 end Move_ENDURE: @@ -3323,13 +3323,13 @@ Move_MAGNITUDE: MagnitudeEnd: end MagnitudeRegular: - createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 0, 50 - createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 0, 50 + createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 0, 50 + createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 0, 50 loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 goto MagnitudeEnd MagnitudeIntense: - createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 0, 50 - createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 0, 50 + createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 0, 50 + createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 0, 50 loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 delay 10 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 1, RGB_BLACK, 14, RGB_WHITE, 14 @@ -3814,8 +3814,8 @@ Move_ERUPTION: createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 110, -32, 64, 50, 0 createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 60, -32, 80, 70, 1 delay 22 - createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 8, 60 - createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 8, 60 + createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 8, 60 + createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 8, 60 loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 16, 12 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, F_PAL_BG | F_PAL_BATTLERS, 4, 4, 0, RGB_RED @@ -3845,7 +3845,7 @@ Move_IMPRISON: waitforvisualfinish delay 4 createsprite gRedXSpriteTemplate, ANIM_ATTACKER, 5, ANIM_ATTACKER, 40 - createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 1, 10 + createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 1, 10 playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER clearmonbg ANIM_DEF_PARTNER call UnsetPsychicBackground @@ -3915,7 +3915,7 @@ Move_LUSTER_PURGE: playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER createsprite gLusterPurgeCircleSpriteTemplate, ANIM_ATTACKER, 41, 0, 0, 0, 0 delay 20 - createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, ANIM_PLAYER_RIGHT, 2, 0, 16, RGB_WHITEALPHA + createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, 2, 0, 16, RGB_WHITEALPHA waitforvisualfinish createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23) @@ -7740,12 +7740,12 @@ Move_HEAL_BELL: unloadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_THIN_RING playsewithpan SE_SHINY, SOUND_PAN_ATTACKER - createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_PLAYER_LEFT, 3, 10, 0, RGB(12, 24, 30) + createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 3, 10, 0, RGB(12, 24, 30) createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATK_SIDE, 3, 10, 0, RGB_WHITE createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 end HealBellRing: - createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_PLAYER_LEFT, 3, 8, 0, RGB(12, 24, 30) + createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 3, 8, 0, RGB(12, 24, 30) createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATK_SIDE, 3, 2, 10, RGB_WHITE createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1 playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 3952f8acde..c1cb42a41d 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -302,11 +302,13 @@ #define ANIM_TARGET 1 #define ANIM_ATK_PARTNER 2 #define ANIM_DEF_PARTNER 3 -#define ANIM_PLAYER_LEFT 4 -#define ANIM_PLAYER_RIGHT 5 -#define ANIM_OPPONENT_LEFT 6 -#define ANIM_OPPONENT_RIGHT 7 -#define ANIM_ATTACKER_FORCE 8 + +// Below are used by AnimTask_ShakeMon2 and AnimTask_SetGrayscaleOrOriginalPal +#define ANIM_PLAYER_LEFT (MAX_BATTLERS_COUNT + 0) +#define ANIM_PLAYER_RIGHT (MAX_BATTLERS_COUNT + 1) +#define ANIM_OPPONENT_LEFT (MAX_BATTLERS_COUNT + 2) +#define ANIM_OPPONENT_RIGHT (MAX_BATTLERS_COUNT + 3) +#define ANIM_ATTACKER_FORCE (MAX_BATTLERS_COUNT + 4) // stereo panning constants [0-255] // diff --git a/src/battle_anim_dark.c b/src/battle_anim_dark.c index deedccc6a9..03df99e135 100644 --- a/src/battle_anim_dark.c +++ b/src/battle_anim_dark.c @@ -943,19 +943,19 @@ void AnimTask_SetGrayscaleOrOriginalPal(u8 taskId) case ANIM_DEF_PARTNER: spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); break; - case 4: + case ANIM_PLAYER_LEFT: position = B_POSITION_PLAYER_LEFT; calcSpriteId = TRUE; break; - case 5: + case ANIM_PLAYER_RIGHT: position = B_POSITION_PLAYER_RIGHT; calcSpriteId = TRUE; break; - case 6: + case ANIM_OPPONENT_LEFT: position = B_POSITION_OPPONENT_LEFT; calcSpriteId = TRUE; break; - case 7: + case ANIM_OPPONENT_RIGHT: position = B_POSITION_OPPONENT_RIGHT; calcSpriteId = TRUE; break; diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c index 8a11c2c5b5..247aba1a42 100644 --- a/src/battle_anim_mon_movement.c +++ b/src/battle_anim_mon_movement.c @@ -164,20 +164,20 @@ void AnimTask_ShakeMon2(u8 taskId) if (spriteId == SPRITE_NONE) abort = TRUE; } - else if (gBattleAnimArgs[0] != 8) + else if (gBattleAnimArgs[0] != ANIM_ATTACKER_FORCE) { switch (gBattleAnimArgs[0]) { - case 4: + case ANIM_PLAYER_LEFT: battlerId = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); break; - case 5: + case ANIM_PLAYER_RIGHT: battlerId = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); break; - case 6: + case ANIM_OPPONENT_LEFT: battlerId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); break; - case 7: + case ANIM_OPPONENT_RIGHT: default: battlerId = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); break;