From 58cb655302471718a139602cf47a600ae236919b Mon Sep 17 00:00:00 2001 From: dreams897 Date: Thu, 2 May 2024 21:00:03 -0700 Subject: [PATCH] Revert "Replace 'Rock' NPC palette with 'Lab' palette" This reverts commit e26cb828be0c95e5fac4b05e49e989c5e6050e4e. --- constants/sprite_data_constants.asm | 4 ++-- data/sprites/sprites.asm | 8 ++++---- engine/battle/battle_transition.asm | 4 ++-- gfx/overworld/npc_sprites.pal | 16 ++++++++-------- gfx/sprites/oak.png | Bin 1840 -> 305 bytes maps/OaksLab.asm | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm index ba8c44751d6..a17d73c1a63 100644 --- a/constants/sprite_data_constants.asm +++ b/constants/sprite_data_constants.asm @@ -22,7 +22,7 @@ DEF NUM_SPRITEDATA_FIELDS EQU _RS const PAL_OW_PURPLE ; 4 const PAL_OW_EMOTE ; 5 const PAL_OW_TREE ; 6 - const PAL_OW_LAB ; 7 + const PAL_OW_ROCK ; 7 ; object_events set bit 3 so as not to use the sprite's default palette ; MapObjectPals indexes (see gfx/overworld/npc_sprites.pal) @@ -34,4 +34,4 @@ DEF NUM_SPRITEDATA_FIELDS EQU _RS const PAL_NPC_PURPLE ; c const PAL_NPC_EMOTE ; d const PAL_NPC_TREE ; e - const PAL_NPC_LAB ; f + const PAL_NPC_ROCK ; f diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index 38fefd06651..f82d9040279 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -11,7 +11,7 @@ OverworldSprites: overworld_sprite RedBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite GameboyKidSpriteGFX, 12, STANDING_SPRITE, PAL_OW_GREEN overworld_sprite RivalSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED - overworld_sprite OakSpriteGFX, 12, WALKING_SPRITE, PAL_OW_LAB + overworld_sprite OakSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN overworld_sprite BlueSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE overworld_sprite BillSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite ElderSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN @@ -66,7 +66,7 @@ OverworldSprites: overworld_sprite ClerkSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN overworld_sprite FisherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE overworld_sprite FishingGuruSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite ScientistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_LAB + overworld_sprite ScientistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE overworld_sprite KimonoGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite SageSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN overworld_sprite UnusedGuySpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED @@ -96,8 +96,8 @@ OverworldSprites: overworld_sprite PaperSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE overworld_sprite VirtualBoySpriteGFX, 4, STILL_SPRITE, PAL_OW_RED overworld_sprite OldLinkReceptionistSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED - overworld_sprite RockSpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN - overworld_sprite BoulderSpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN + overworld_sprite RockSpriteGFX, 4, STILL_SPRITE, PAL_OW_ROCK + overworld_sprite BoulderSpriteGFX, 4, STILL_SPRITE, PAL_OW_ROCK overworld_sprite SnesSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE overworld_sprite FamicomSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED overworld_sprite FruitTreeSpriteGFX, 4, STILL_SPRITE, PAL_OW_TREE diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 2b6490959ce..0c446732c1c 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -726,9 +726,9 @@ StartTrainerBattle_LoadPokeBallGraphics: call .copy ld de, wOBPals2 palette PAL_OW_TREE call .copy - ld de, wOBPals1 palette PAL_OW_BROWN + ld de, wOBPals1 palette PAL_OW_ROCK call .copy - ld de, wOBPals2 palette PAL_OW_BROWN + ld de, wOBPals2 palette PAL_OW_ROCK .copy push hl diff --git a/gfx/overworld/npc_sprites.pal b/gfx/overworld/npc_sprites.pal index 548792477d5..cdef96c26fe 100644 --- a/gfx/overworld/npc_sprites.pal +++ b/gfx/overworld/npc_sprites.pal @@ -4,9 +4,9 @@ RGB 28,31,16, 31,19,10, 07,23,03, 00,00,00 ; green RGB 28,31,16, 31,19,10, 15,10,03, 00,00,00 ; brown RGB 28,31,16, 31,19,10, 19,04,21, 00,00,00 ; purple - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; emote + RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree - RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; lab + RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; rock ; day RGB 27,31,27, 31,19,10, 31,07,01, 00,00,00 ; red @@ -14,9 +14,9 @@ RGB 27,31,27, 31,19,10, 07,23,03, 00,00,00 ; green RGB 27,31,27, 31,19,10, 15,10,03, 00,00,00 ; brown RGB 27,31,27, 31,19,10, 19,04,21, 00,00,00 ; purple - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; emote + RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree - RGB 31,31,31, 31,23,17, 08,16,06, 00,00,00 ; lab + RGB 27,31,27, 24,18,07, 20,15,03, 07,07,07 ; rock ; nite RGB 15,14,24, 31,19,10, 31,07,01, 00,00,00 ; red @@ -24,9 +24,9 @@ RGB 15,14,24, 31,19,10, 07,23,03, 00,00,00 ; green RGB 15,14,24, 31,19,10, 15,10,03, 00,00,00 ; brown RGB 15,14,24, 31,19,10, 19,04,21, 00,00,00 ; purple - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; emote + RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; tree - RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; lab + RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; rock ; dark RGB 01,01,02, 31,19,10, 31,07,01, 00,00,00 ; red @@ -34,6 +34,6 @@ RGB 01,01,02, 31,19,10, 07,23,03, 00,00,00 ; green RGB 01,01,02, 31,19,10, 15,10,03, 00,00,00 ; brown RGB 01,01,02, 31,19,10, 19,04,21, 00,00,00 ; purple - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; emote + RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; tree - RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; lab + RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; rock diff --git a/gfx/sprites/oak.png b/gfx/sprites/oak.png index ca2e705ba608c73acd3cab30a3f1c2be9f6dbe37..7a76574d0929ee373f08c2f3dfc1366e924c99fd 100644 GIT binary patch delta 290 zcmV+-0p0$v4zU7|7=Ho)0001c3bow;008(&L_t(|+Le&8Zi6rohW}zULMW1Vrbt;_ zzl5cZyhfHj1}Ym1%$a~h5xS?aPzREyLCi?*9W2e(c=!hU?(=_#;8nn6`+(&;a#&37 zFcE2t=i3pFHoM^7m8b1)`1mSd^2oq6iGgo3g}F&8EC9DDuYa-ng6%aHBDZ1l5wXwq z>?=F=T~iHjdxb;2i*X=|F%T7)uj#W-OTJ6MgE-`j)o0m!%Nbe8D9`c{zlOA6_*l>| zemaLRBn;2K09FM)cy;I##vDh??PrBKk0jq-r0%cpzeA5Qw6AwYN{kdMEN^vq%Jma|n&>W!@}iQ&5_ zm3CcAVwhYm7tHZN(@rt0D2fc=7>=Vcf_6p?7v^chX_#Y(AxE)w%hgST^cbOR4!cnb zTP?KMT`8@y;Nsoh4>Gs-6)4N8fs!A9ah5v=2C&o^K)*Vv~~QU!OVPC&y|W9fr4OI zR%Ke`1(xR35TZo@d0G<{2zV$6LKu48TxbxfOLuVTMoZsEAKF@4WpuL86B1OsUXN0W zS7fA8rN{aL`M4wH(*9f;VbWU^zo_n*nwx_*YD?kV-L|=yo0)gu$gQp4St*O2=38H| z8UK&GR`#{H+R zZ@a=Q34Hj))QYEmTygIDE7PZ2uD$f#&Z`yvAGp@%O^y4fKC7edKC|_i6Qghcye!t-w<~gCU*WGX-q9U9{`laoe*jY#Sb+cl diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index a33dad1b96e..11d8ce3255b 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1262,8 +1262,8 @@ OaksLab_MapEvents: object_event 5, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfOakScript, -1 object_event 5, 10, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OaksLabWalkUpToOakScript, -1 object_event 1, 9, SPRITE_GIRL, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OaksLabGirlScript, -1 - object_event 2, 10, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OaksAideScript, EVENT_OAKS_AIDE_IN_LAB - object_event 8, 10, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OaksAideScript, -1 + object_event 2, 10, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAideScript, EVENT_OAKS_AIDE_IN_LAB + object_event 8, 10, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAideScript, -1 object_event 4, 3, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OaksLabRivalScript, -1 object_event 6, 3, SPRITE_POKE_BALL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharmanderPokeBallScript, EVENT_CHARMANDER_POKEBALL_IN_OAKS_LAB object_event 7, 3, SPRITE_POKE_BALL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SquirtlePokeBallScript, EVENT_SQUIRTLE_POKEBALL_IN_OAKS_LAB