Skip to content

Commit

Permalink
Revert "Replace 'Rock' NPC palette with 'Lab' palette"
Browse files Browse the repository at this point in the history 
This reverts commit e26cb82.
  • Loading branch information
@dreams897
dreams897 committed May 3, 2024
1 parent ad3e352 commit 58cb655
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions constants/sprite_data_constants.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
8 changes: 4 additions & 4 deletions data/sprites/sprites.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions engine/battle/battle_transition.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions gfx/overworld/npc_sprites.pal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@
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
RGB 27,31,27, 31,19,10, 10,10,31, 00,00,00 ; blue
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
RGB 15,14,24, 31,19,10, 10,10,31, 00,00,00 ; blue
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
RGB 01,01,02, 31,19,10, 10,10,31, 00,00,00 ; blue
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
Binary file modified gfx/sprites/oak.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions maps/OaksLab.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 58cb655

Please sign in to comment.