Leahnaya/pokegold
1
0
Fork 0
mirror of https://github.com/pret/pokegold.git synced 2026-08-20 15:44:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename PAL_NPC_SILVER to PAL_NPC_EMOTE (pret/pokecrystal#1053)

Browse Source
This commit is contained in:
vulcandth
2023-06-01 07:47:53 -05:00
parent be7c950f05
commit 3edd4eb48d
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
constants/sprite_data_constants.asm
View File

@@ -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

2
data/sprites/sprites.asm
View File

@@ -101,5 +101,5 @@ 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
assert_table_length NUM_OVERWORLD_SPRITES

8
engine/overworld/map_objects.asm
View File

@@ -2002,7 +2002,7 @@ SpawnShadow:
.ShadowObject:
; vtile, palette, movement
db $fc, PAL_OW_SILVER, SPRITEMOVEDATA_SHADOW
db $fc, PAL_OW_EMOTE, SPRITEMOVEDATA_SHADOW
SpawnStrengthBoulderDust:
push bc
@@ -2014,7 +2014,7 @@ SpawnStrengthBoulderDust:
.BoulderDustObject:
; vtile, palette, movement
db $fe, PAL_OW_SILVER, SPRITEMOVEDATA_BOULDERDUST
db $fe, PAL_OW_EMOTE, SPRITEMOVEDATA_BOULDERDUST
SpawnEmote:
push bc
@@ -2026,7 +2026,7 @@ SpawnEmote:
.EmoteObject:
; vtile, palette, movement
db $f8, PAL_OW_SILVER, SPRITEMOVEDATA_EMOTE
db $f8, PAL_OW_EMOTE, SPRITEMOVEDATA_EMOTE
ShakeGrass:
push bc
@@ -2053,7 +2053,7 @@ ShakeScreen:
.ScreenShakeObject:
; vtile, palette, movement
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SCREENSHAKE
db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_SCREENSHAKE
DespawnEmote:
push bc

3
macros/legacy.asm
View File

@@ -397,3 +397,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"

2
maps/BurnedTower1F.asm
View File

@@ -307,6 +307,6 @@ BurnedTower1F_MapEvents:
object_event 4, 3, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
object_event 16, 13, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
object_event 9, 12, SPRITE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
object_event 8, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, FirebreatherDickPostBattle, EVENT_BURNED_TOWER_FIREBREATHER_DICK_ASHES
object_event 8, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_SCRIPT, 0, FirebreatherDickPostBattle, EVENT_BURNED_TOWER_FIREBREATHER_DICK_ASHES
object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FBurnHeal, EVENT_BURNED_TOWER_1F_X_SPEED
object_event 7, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FXSpeed, EVENT_BURNED_TOWER_1F_BURN_HEAL

6
maps/BurnedTowerB1F.asm
View File

@@ -152,8 +152,8 @@ BurnedTowerB1F_MapEvents:
object_event 10, 3, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
object_event 8, 4, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
object_event 7, 2, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
object_event 10, 3, SPRITE_GROWLITHE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
object_event 8, 4, SPRITE_GROWLITHE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
object_event 7, 2, SPRITE_GROWLITHE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
object_event 10, 3, SPRITE_GROWLITHE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
object_event 8, 4, SPRITE_GROWLITHE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
object_event 7, 2, SPRITE_GROWLITHE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
object_event 4, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FHPUp, EVENT_BURNED_TOWER_B1F_HP_UP
object_event 15, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE