Label evolution trinket palettes

6 files changed, 22 insertions, 18 deletions

diff --git a/data/evolution_trinket_palettes.asm b/data/evolution_trinket_palettes.asm
new file mode 100755
index 0000000..b8cc2f0
--- /dev/null
+++ b/data/evolution_trinket_palettes.asm
@@ -0,0 +1,13 @@
+; First palette is the Red/Yellow palette, used by most trinkets

+; Second palette is the Green/Blue palette, used by Water Stone and Leaf Stone trinkets.

+EvolutionTrinketPalettes:

+EvolutionTrinketPalette1: ; 0xdd188

+	RGB 31, 31, 31

+    RGB 31, 29, 0

+    RGB 29, 3, 2

+    RGB 2, 2, 2

+EvolutionTrinketPalette2: ; 0xdd190

+    RGB 31, 31, 31

+    RGB 9, 22, 6

+    RGB 4, 13, 31

+    RGB 2, 2, 2

diff --git a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
index 0ec3bf8..fe4433a 100644
--- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
+++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
@@ -474,8 +474,8 @@ CreateEvolutionTrinket_BlueField: ; 0x20f75
 	ld a, [hGameBoyColorFlag]

 	and a

 	jr z, .asm_20fc3

-	ld a, BANK(PaletteData_dd188)

-	ld hl, PaletteData_dd188

+	ld a, BANK(EvolutionTrinketPalettes)

+	ld hl, EvolutionTrinketPalettes

 	ld de, $0070

 	ld bc, $0010

 	call Func_7dc

diff --git a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
index cebfcc8..722f936 100644
--- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
+++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
@@ -496,8 +496,8 @@ CreateEvolutionTrinket_RedField: ; 0x20977
 	ld a, [hGameBoyColorFlag]

 	and a

 	jr z, .asm_209bf

-	ld a, BANK(PaletteData_dd188)

-	ld hl, PaletteData_dd188

+	ld a, BANK(EvolutionTrinketPalettes)

+	ld hl, EvolutionTrinketPalettes

 	ld de, $0070

 	ld bc, $0010

 	call Func_7dc

diff --git a/engine/pinball_game/load_stage_data/load_blue_field.asm b/engine/pinball_game/load_stage_data/load_blue_field.asm
index c7abaea..c1e3d0a 100644
--- a/engine/pinball_game/load_stage_data/load_blue_field.asm
+++ b/engine/pinball_game/load_stage_data/load_blue_field.asm
@@ -346,8 +346,8 @@ LoadEvolutionTrinketGraphics_BlueField: ; 0x1c3ee
 	ld a, [hGameBoyColorFlag]

 	and a

 	ret z

-	ld a, BANK(PaletteData_dd188)

-	ld hl, PaletteData_dd188

+	ld a, BANK(EvolutionTrinketPalettes)

+	ld hl, EvolutionTrinketPalettes

 	ld de, $0070

 	ld bc, $0010

 	call FarCopyCGBPals

diff --git a/engine/pinball_game/load_stage_data/load_red_field.asm b/engine/pinball_game/load_stage_data/load_red_field.asm
index 7a802d2..a939d4e 100644
--- a/engine/pinball_game/load_stage_data/load_red_field.asm
+++ b/engine/pinball_game/load_stage_data/load_red_field.asm
@@ -295,8 +295,8 @@ LoadEvolutionTrinketGraphics_RedField: ; 0x14234
 	ld a, [hGameBoyColorFlag]

 	and a

 	ret z

-	ld a, BANK(PaletteData_dd188)

-	ld hl, PaletteData_dd188

+	ld a, BANK(EvolutionTrinketPalettes)

+	ld hl, EvolutionTrinketPalettes

 	ld de, $0070

 	ld bc, $0010

 	call FarCopyCGBPals

diff --git a/main.asm b/main.asm
index c77ee8b..309276f 100644
--- a/main.asm
+++ b/main.asm
@@ -1052,17 +1052,8 @@ INCLUDE "data/mon_gfx/mon_billboard_palettes_6.asm"
 INCLUDE "data/stage_palettes.asm"
 INCLUDE "data/billboard/map_palettes_2.asm"
 INCLUDE "data/ball_palettes.asm"
+INCLUDE "data/evolution_trinket_palettes.asm"
 
-PaletteData_dd188: ; 0xdd188
-	RGB 31, 31, 31
-    RGB 31, 29, 0
-    RGB 29, 3, 2
-    RGB 2, 2, 2
-PaletteData_dd190: ; 0xdd190
-    RGB 31, 31, 31
-    RGB 9, 22, 6
-    RGB 4, 13, 31
-    RGB 2, 2, 2
 SlotOnBillboardBGPalette: ; 0xdd198
     RGB 31, 31, 31
     RGB 31, 26, 2