mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Rename PAL_NPC_SILVER to PAL_NPC_EMOTE (#1053)
This commit is contained in:
parent
5e983d32aa
commit
438c48daad
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user