From dc1c8d32cb8a473e4ef3509726c66b8826afa641 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Fri, 17 Nov 2023 18:25:00 +0000 Subject: [PATCH] Improve use of palette macro and use PAL_* constants (#1087) * Improve use of palette macro and use PAL_* constants * Use proper constant for battle stats (#1088) * Add suggestions about function names and variables * Add colors macro --------- Co-authored-by: vulcandth --- pokecrystal.map | 4 ++-- pokecrystal.sym | 4 ++-- pokecrystal11.map | 4 ++-- pokecrystal11.sym | 4 ++-- pokecrystal11_debug.map | 4 ++-- pokecrystal11_debug.sym | 4 ++-- pokecrystal11_vc.map | 4 ++-- pokecrystal11_vc.sym | 4 ++-- pokecrystal_au.map | 4 ++-- pokecrystal_au.sym | 4 ++-- pokecrystal_debug.map | 4 ++-- pokecrystal_debug.sym | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pokecrystal.map b/pokecrystal.map index 3e3c71291d2..c92d5bbb9e8 100644 --- a/pokecrystal.map +++ b/pokecrystal.map @@ -23100,8 +23100,8 @@ ROMX bank #50: $4e35 = BGEffect_RapidCyclePals.okay_3_cgb $4e43 = BGEffect_RapidCyclePals.okay_4_cgb $4e49 = BGEffect_RapidCyclePals.four_cgb - $4e52 = BGEffects_LoadBGPal0_OBPal1 - $4e7f = BGEffects_LoadBGPal1_OBPal0 + $4e52 = BGEffects_LoadPlayerPals + $4e7f = BGEffects_LoadEnemyPals $4eac = BattleBGEffect_GetFirstDMGPal $4eb2 = BattleBGEffect_GetNextDMGPal $4ec6 = BattleBGEffect_GetNextDMGPal.repeat diff --git a/pokecrystal.sym b/pokecrystal.sym index e9ca796af4d..91415693205 100644 --- a/pokecrystal.sym +++ b/pokecrystal.sym @@ -22813,8 +22813,8 @@ 32:4e35 BGEffect_RapidCyclePals.okay_3_cgb 32:4e43 BGEffect_RapidCyclePals.okay_4_cgb 32:4e49 BGEffect_RapidCyclePals.four_cgb -32:4e52 BGEffects_LoadBGPal0_OBPal1 -32:4e7f BGEffects_LoadBGPal1_OBPal0 +32:4e52 BGEffects_LoadPlayerPals +32:4e7f BGEffects_LoadEnemyPals 32:4eac BattleBGEffect_GetFirstDMGPal 32:4eb2 BattleBGEffect_GetNextDMGPal 32:4ec6 BattleBGEffect_GetNextDMGPal.repeat diff --git a/pokecrystal11.map b/pokecrystal11.map index 3cddecbb1b0..733666fc798 100644 --- a/pokecrystal11.map +++ b/pokecrystal11.map @@ -23100,8 +23100,8 @@ ROMX bank #50: $4e35 = BGEffect_RapidCyclePals.okay_3_cgb $4e43 = BGEffect_RapidCyclePals.okay_4_cgb $4e49 = BGEffect_RapidCyclePals.four_cgb - $4e52 = BGEffects_LoadBGPal0_OBPal1 - $4e7f = BGEffects_LoadBGPal1_OBPal0 + $4e52 = BGEffects_LoadPlayerPals + $4e7f = BGEffects_LoadEnemyPals $4eac = BattleBGEffect_GetFirstDMGPal $4eb2 = BattleBGEffect_GetNextDMGPal $4ec6 = BattleBGEffect_GetNextDMGPal.repeat diff --git a/pokecrystal11.sym b/pokecrystal11.sym index de982622f1d..34960587189 100644 --- a/pokecrystal11.sym +++ b/pokecrystal11.sym @@ -22813,8 +22813,8 @@ 32:4e35 BGEffect_RapidCyclePals.okay_3_cgb 32:4e43 BGEffect_RapidCyclePals.okay_4_cgb 32:4e49 BGEffect_RapidCyclePals.four_cgb -32:4e52 BGEffects_LoadBGPal0_OBPal1 -32:4e7f BGEffects_LoadBGPal1_OBPal0 +32:4e52 BGEffects_LoadPlayerPals +32:4e7f BGEffects_LoadEnemyPals 32:4eac BattleBGEffect_GetFirstDMGPal 32:4eb2 BattleBGEffect_GetNextDMGPal 32:4ec6 BattleBGEffect_GetNextDMGPal.repeat diff --git a/pokecrystal11_debug.map b/pokecrystal11_debug.map index a49bb0a6578..ce703499724 100644 --- a/pokecrystal11_debug.map +++ b/pokecrystal11_debug.map @@ -23112,8 +23112,8 @@ ROMX bank #50: $4e35 = BGEffect_RapidCyclePals.okay_3_cgb $4e43 = BGEffect_RapidCyclePals.okay_4_cgb $4e49 = BGEffect_RapidCyclePals.four_cgb - $4e52 = BGEffects_LoadBGPal0_OBPal1 - $4e7f = BGEffects_LoadBGPal1_OBPal0 + $4e52 = BGEffects_LoadPlayerPals + $4e7f = BGEffects_LoadEnemyPals $4eac = BattleBGEffect_GetFirstDMGPal $4eb2 = BattleBGEffect_GetNextDMGPal $4ec6 = BattleBGEffect_GetNextDMGPal.repeat diff --git a/pokecrystal11_debug.sym b/pokecrystal11_debug.sym index d3558969106..a0ebca4a3e2 100644 --- a/pokecrystal11_debug.sym +++ b/pokecrystal11_debug.sym @@ -22825,8 +22825,8 @@ 32:4e35 BGEffect_RapidCyclePals.okay_3_cgb 32:4e43 BGEffect_RapidCyclePals.okay_4_cgb 32:4e49 BGEffect_RapidCyclePals.four_cgb -32:4e52 BGEffects_LoadBGPal0_OBPal1 -32:4e7f BGEffects_LoadBGPal1_OBPal0 +32:4e52 BGEffects_LoadPlayerPals +32:4e7f BGEffects_LoadEnemyPals 32:4eac BattleBGEffect_GetFirstDMGPal 32:4eb2 BattleBGEffect_GetNextDMGPal 32:4ec6 BattleBGEffect_GetNextDMGPal.repeat diff --git a/pokecrystal11_vc.map b/pokecrystal11_vc.map index 9ce8ff8417f..2921d21e1b9 100644 --- a/pokecrystal11_vc.map +++ b/pokecrystal11_vc.map @@ -23152,8 +23152,8 @@ ROMX bank #50: $4e35 = BGEffect_RapidCyclePals.okay_3_cgb $4e43 = BGEffect_RapidCyclePals.okay_4_cgb $4e49 = BGEffect_RapidCyclePals.four_cgb - $4e52 = BGEffects_LoadBGPal0_OBPal1 - $4e7f = BGEffects_LoadBGPal1_OBPal0 + $4e52 = BGEffects_LoadPlayerPals + $4e7f = BGEffects_LoadEnemyPals $4eac = BattleBGEffect_GetFirstDMGPal $4eb2 = BattleBGEffect_GetNextDMGPal $4ec6 = BattleBGEffect_GetNextDMGPal.repeat diff --git a/pokecrystal11_vc.sym b/pokecrystal11_vc.sym index 5b1fc86bec8..07bb78ee20e 100644 --- a/pokecrystal11_vc.sym +++ b/pokecrystal11_vc.sym @@ -22865,8 +22865,8 @@ 32:4e35 BGEffect_RapidCyclePals.okay_3_cgb 32:4e43 BGEffect_RapidCyclePals.okay_4_cgb 32:4e49 BGEffect_RapidCyclePals.four_cgb -32:4e52 BGEffects_LoadBGPal0_OBPal1 -32:4e7f BGEffects_LoadBGPal1_OBPal0 +32:4e52 BGEffects_LoadPlayerPals +32:4e7f BGEffects_LoadEnemyPals 32:4eac BattleBGEffect_GetFirstDMGPal 32:4eb2 BattleBGEffect_GetNextDMGPal 32:4ec6 BattleBGEffect_GetNextDMGPal.repeat diff --git a/pokecrystal_au.map b/pokecrystal_au.map index 28d12529435..29a8b1d8c18 100644 --- a/pokecrystal_au.map +++ b/pokecrystal_au.map @@ -23100,8 +23100,8 @@ ROMX bank #50: $4e35 = BGEffect_RapidCyclePals.okay_3_cgb $4e43 = BGEffect_RapidCyclePals.okay_4_cgb $4e49 = BGEffect_RapidCyclePals.four_cgb - $4e52 = BGEffects_LoadBGPal0_OBPal1 - $4e7f = BGEffects_LoadBGPal1_OBPal0 + $4e52 = BGEffects_LoadPlayerPals + $4e7f = BGEffects_LoadEnemyPals $4eac = BattleBGEffect_GetFirstDMGPal $4eb2 = BattleBGEffect_GetNextDMGPal $4ec6 = BattleBGEffect_GetNextDMGPal.repeat diff --git a/pokecrystal_au.sym b/pokecrystal_au.sym index 9a3357f1307..7ba16b1f4a5 100644 --- a/pokecrystal_au.sym +++ b/pokecrystal_au.sym @@ -22813,8 +22813,8 @@ 32:4e35 BGEffect_RapidCyclePals.okay_3_cgb 32:4e43 BGEffect_RapidCyclePals.okay_4_cgb 32:4e49 BGEffect_RapidCyclePals.four_cgb -32:4e52 BGEffects_LoadBGPal0_OBPal1 -32:4e7f BGEffects_LoadBGPal1_OBPal0 +32:4e52 BGEffects_LoadPlayerPals +32:4e7f BGEffects_LoadEnemyPals 32:4eac BattleBGEffect_GetFirstDMGPal 32:4eb2 BattleBGEffect_GetNextDMGPal 32:4ec6 BattleBGEffect_GetNextDMGPal.repeat diff --git a/pokecrystal_debug.map b/pokecrystal_debug.map index 8683c7631d5..d4fbb7868bd 100644 --- a/pokecrystal_debug.map +++ b/pokecrystal_debug.map @@ -23112,8 +23112,8 @@ ROMX bank #50: $4e35 = BGEffect_RapidCyclePals.okay_3_cgb $4e43 = BGEffect_RapidCyclePals.okay_4_cgb $4e49 = BGEffect_RapidCyclePals.four_cgb - $4e52 = BGEffects_LoadBGPal0_OBPal1 - $4e7f = BGEffects_LoadBGPal1_OBPal0 + $4e52 = BGEffects_LoadPlayerPals + $4e7f = BGEffects_LoadEnemyPals $4eac = BattleBGEffect_GetFirstDMGPal $4eb2 = BattleBGEffect_GetNextDMGPal $4ec6 = BattleBGEffect_GetNextDMGPal.repeat diff --git a/pokecrystal_debug.sym b/pokecrystal_debug.sym index da8b3c5d53b..943d43eff37 100644 --- a/pokecrystal_debug.sym +++ b/pokecrystal_debug.sym @@ -22825,8 +22825,8 @@ 32:4e35 BGEffect_RapidCyclePals.okay_3_cgb 32:4e43 BGEffect_RapidCyclePals.okay_4_cgb 32:4e49 BGEffect_RapidCyclePals.four_cgb -32:4e52 BGEffects_LoadBGPal0_OBPal1 -32:4e7f BGEffects_LoadBGPal1_OBPal0 +32:4e52 BGEffects_LoadPlayerPals +32:4e7f BGEffects_LoadEnemyPals 32:4eac BattleBGEffect_GetFirstDMGPal 32:4eb2 BattleBGEffect_GetNextDMGPal 32:4ec6 BattleBGEffect_GetNextDMGPal.repeat