From 802b7e9fc437b16bc5bec8ad25a8c3b3affbe6b8 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 13 May 2018 12:14:31 -0700 Subject: Label evolution trinket palettes --- engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm | 4 ++-- engine/pinball_game/evolution_mode/evolution_mode_red_field.asm | 4 ++-- engine/pinball_game/load_stage_data/load_blue_field.asm | 4 ++-- engine/pinball_game/load_stage_data/load_red_field.asm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'engine') 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 -- cgit v1.2.3