pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename PAL_NPC_SILVER to PAL_NPC_EMOTE (#1053)

Browse Source
This commit is contained in:
vulcandth 2023-06-01 07:47:53 -05:00 committed by GitHub
parent 5e983d32aa
commit 438c48daad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 10 deletions
Show Stats 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_GREEN ; 2
const PAL_OW_BROWN ; 3 const PAL_OW_BROWN ; 3
const PAL_OW_PINK ; 4 const PAL_OW_PINK ; 4
const PAL_OW_SILVER ; 5 const PAL_OW_EMOTE ; 5
const PAL_OW_TREE ; 6 const PAL_OW_TREE ; 6
const PAL_OW_ROCK ; 7 const PAL_OW_ROCK ; 7
@ -32,6 +32,6 @@ DEF NUM_SPRITEDATA_FIELDS EQU _RS
const PAL_NPC_GREEN ; a const PAL_NPC_GREEN ; a
const PAL_NPC_BROWN ; b const PAL_NPC_BROWN ; b
const PAL_NPC_PINK ; c const PAL_NPC_PINK ; c
const PAL_NPC_SILVER ; d const PAL_NPC_EMOTE ; d
const PAL_NPC_TREE ; e const PAL_NPC_TREE ; e
const PAL_NPC_ROCK ; f const PAL_NPC_ROCK ; f

2
data/sprites/sprites.asm
View File

@ -101,7 +101,7 @@ OverworldSprites:
overworld_sprite FamicomSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED overworld_sprite FamicomSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
overworld_sprite FruitTreeSpriteGFX, 4, STILL_SPRITE, PAL_OW_TREE overworld_sprite FruitTreeSpriteGFX, 4, STILL_SPRITE, PAL_OW_TREE
overworld_sprite GoldTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN 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 KrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
overworld_sprite KrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE overworld_sprite KrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
overworld_sprite KurtOutsideSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BROWN overworld_sprite KurtOutsideSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BROWN

8
engine/overworld/map_objects.asm
View File

@ -2034,7 +2034,7 @@ SpawnShadow:
.ShadowObject: .ShadowObject:
; vtile, palette, movement ; vtile, palette, movement
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SHADOW db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_SHADOW
SpawnStrengthBoulderDust: SpawnStrengthBoulderDust:
push bc push bc
@ -2046,7 +2046,7 @@ SpawnStrengthBoulderDust:
.BoulderDustObject: .BoulderDustObject:
; vtile, palette, movement ; vtile, palette, movement
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_BOULDERDUST db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_BOULDERDUST
SpawnEmote: SpawnEmote:
push bc push bc
@ -2058,7 +2058,7 @@ SpawnEmote:
.EmoteObject: .EmoteObject:
; vtile, palette, movement ; vtile, palette, movement
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_EMOTE db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_EMOTE
ShakeGrass: ShakeGrass:
push bc push bc
@ -2085,7 +2085,7 @@ ShakeScreen:
.ScreenShakeObject: .ScreenShakeObject:
; vtile, palette, movement ; vtile, palette, movement
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SCREENSHAKE db $00, PAL_OW_EMOTE, SPRITEMOVEDATA_SCREENSHAKE
DespawnEmote: DespawnEmote:
push bc push bc

3
macros/legacy.asm
View File

@ -402,3 +402,6 @@ DEF happinesschecknpc EQUS "HappinessCheckScript"
; constants/sprite_constants.asm ; constants/sprite_constants.asm
DEF SPRITE_BUENA EQUS "SPRITE_BEAUTY" DEF SPRITE_BUENA EQUS "SPRITE_BEAUTY"
DEF PAL_NPC_SILVER EQUS "PAL_NPC_EMOTE"
DEF PAL_OW_SILVER EQUS "PAL_OW_EMOTE"

6
maps/BurnedTowerB1F.asm
View File

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