diff options
| -rw-r--r-- | engine/battle/battle_transition.asm | 11 | ||||
| -rwxr-xr-x | engine/events/heal_machine_anim.asm | 7 | ||||
| -rwxr-xr-x | engine/init_gender.asm | 5 | ||||
| -rw-r--r-- | gfx/intro/gender_screen.pal | 4 | ||||
| -rw-r--r-- | gfx/overworld/heal_machine.pal | 4 | ||||
| -rw-r--r-- | gfx/overworld/trainer_battle_day.pal | 4 | ||||
| -rw-r--r-- | gfx/overworld/trainer_battle_nite.pal | 4 |
7 files changed, 22 insertions, 17 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 4c05112ac..16c9df2c1 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -691,17 +691,12 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) ; 8c6a1 (23:46a1) .daypals ; 8c6a1 - RGB 31, 18, 29 - RGB 31, 11, 15 - RGB 31, 05, 05 - RGB 07, 07, 07 +INCLUDE "gfx/overworld/trainer_battle_day.pal" ; 8c6a9 .nightpals ; 8c6a9 - RGB 31, 18, 29 - RGB 31, 05, 05 - RGB 31, 05, 05 - RGB 31, 05, 05 +INCLUDE "gfx/overworld/trainer_battle_nite.pal" +; 8c6b1 .loadpokeballgfx ld a, [OtherTrainerClass] diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm index 0f20d76b6..bd7ba792d 100755 --- a/engine/events/heal_machine_anim.asm +++ b/engine/events/heal_machine_anim.asm @@ -169,14 +169,11 @@ INCBIN "gfx/overworld/heal_machine.2bpp" ; 12451 .palettes ; 12451 - RGB 31, 31, 31 - RGB 31, 19, 10 - RGB 31, 07, 01 - RGB 00, 00, 00 +INCLUDE "gfx/overworld/heal_machine.pal" ; 12459 .FlashPalettes8Times: ; 12459 - ld c, $8 + ld c, 8 .palette_loop push bc call .FlashPalettes diff --git a/engine/init_gender.asm b/engine/init_gender.asm index 588709b88..f38139b2e 100755 --- a/engine/init_gender.asm +++ b/engine/init_gender.asm @@ -97,10 +97,7 @@ LoadGenderScreenPal: ; 48e47 (12:4e47) ; 48e5c (12:4e5c) .Palette: ; 48e5c - RGB 31, 31, 31 - RGB 09, 30, 31 - RGB 01, 11, 31 - RGB 00, 00, 00 +INCLUDE "gfx/intro/gender_screen.pal" ; 48e64 LoadGenderScreenLightBlueTile: ; 48e64 (12:4e64) diff --git a/gfx/intro/gender_screen.pal b/gfx/intro/gender_screen.pal new file mode 100644 index 000000000..ca8ae04aa --- /dev/null +++ b/gfx/intro/gender_screen.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 09, 30, 31 + RGB 01, 11, 31 + RGB 00, 00, 00 diff --git a/gfx/overworld/heal_machine.pal b/gfx/overworld/heal_machine.pal new file mode 100644 index 000000000..28a76de40 --- /dev/null +++ b/gfx/overworld/heal_machine.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 31, 19, 10 + RGB 31, 07, 01 + RGB 00, 00, 00 diff --git a/gfx/overworld/trainer_battle_day.pal b/gfx/overworld/trainer_battle_day.pal new file mode 100644 index 000000000..b7d67891e --- /dev/null +++ b/gfx/overworld/trainer_battle_day.pal @@ -0,0 +1,4 @@ + RGB 31, 18, 29 + RGB 31, 11, 15 + RGB 31, 05, 05 + RGB 07, 07, 07 diff --git a/gfx/overworld/trainer_battle_nite.pal b/gfx/overworld/trainer_battle_nite.pal new file mode 100644 index 000000000..d1a35f33b --- /dev/null +++ b/gfx/overworld/trainer_battle_nite.pal @@ -0,0 +1,4 @@ + RGB 31, 18, 29 + RGB 31, 05, 05 + RGB 31, 05, 05 + RGB 31, 05, 05 |