From 438c48daad9a2b52a3e770def77efa43fa0f3222 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Thu, 1 Jun 2023 07:47:53 -0500 Subject: [PATCH] Rename PAL_NPC_SILVER to PAL_NPC_EMOTE (#1053) --- constants/sprite_data_constants.asm | 4 ++-- data/sprites/sprites.asm | 2 +- engine/overworld/map_objects.asm | 8 ++++---- macros/legacy.asm | 3 +++ maps/BurnedTowerB1F.asm | 6 +++--- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm index 407252bed..a7dc809b5 100644 --- a/constants/sprite_data_constants.asm +++ b/constants/sprite_data_constants.asm @@ -20,7 +20,7 @@ DEF NUM_SPRITEDATA_FIELDS EQU _RS const PAL_OW_GREEN ; 2 const PAL_OW_BROWN ; 3 const PAL_OW_PINK ; 4 - const PAL_OW_SILVER ; 5 + const PAL_OW_EMOTE ; 5 const PAL_OW_TREE ; 6 const PAL_OW_ROCK ; 7 @@ -32,6 +32,6 @@ DEF NUM_SPRITEDATA_FIELDS EQU _RS const PAL_NPC_GREEN ; a const PAL_NPC_BROWN ; b const PAL_NPC_PINK ; c - const PAL_NPC_SILVER ; d + const PAL_NPC_EMOTE ; d const PAL_NPC_TREE ; e const PAL_NPC_ROCK ; f diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index 04a5c8907..25281c22d 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -101,7 +101,7 @@ OverworldSprites: overworld_sprite FamicomSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED overworld_sprite FruitTreeSpriteGFX, 4, STILL_SPRITE, PAL_OW_TREE overworld_sprite GoldTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN - overworld_sprite SilverTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_SILVER + overworld_sprite SilverTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_EMOTE overworld_sprite KrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE overworld_sprite KrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE overworld_sprite KurtOutsideSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BROWN diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 6d9a460c0..990d7f838 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -2034,7 +2034,7 @@ SpawnShadow: .ShadowObject: ; vtile, palette, movement - db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SHADOW + db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_SHADOW SpawnStrengthBoulderDust: push bc @@ -2046,7 +2046,7 @@ SpawnStrengthBoulderDust: .BoulderDustObject: ; vtile, palette, movement - db $00, PAL_OW_SILVER, SPRITEMOVEDATA_BOULDERDUST + db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_BOULDERDUST SpawnEmote: push bc @@ -2058,7 +2058,7 @@ SpawnEmote: .EmoteObject: ; vtile, palette, movement - db $00, PAL_OW_SILVER, SPRITEMOVEDATA_EMOTE + db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_EMOTE ShakeGrass: push bc @@ -2085,7 +2085,7 @@ ShakeScreen: .ScreenShakeObject: ; vtile, palette, movement - db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SCREENSHAKE + db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_SCREENSHAKE DespawnEmote: push bc diff --git a/macros/legacy.asm b/macros/legacy.asm index f3dcb6164..68310da68 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -402,3 +402,6 @@ DEF happinesschecknpc EQUS "HappinessCheckScript" ; constants/sprite_constants.asm DEF SPRITE_BUENA EQUS "SPRITE_BEAUTY" + +DEF PAL_NPC_SILVER EQUS "PAL_NPC_EMOTE" +DEF PAL_OW_SILVER EQUS "PAL_OW_EMOTE" diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 521e9d3cd..c3d148bcc 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -254,8 +254,8 @@ BurnedTowerB1F_MapEvents: object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 object_event 16, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE object_event 10, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER