diff options
Diffstat (limited to 'src/constants')
| -rw-r--r-- | src/constants/npc_constants.asm | 27 | ||||
| -rw-r--r-- | src/constants/sprite_constants.asm | 38 |
2 files changed, 51 insertions, 14 deletions
diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm index eb7b75b..4a64993 100644 --- a/src/constants/npc_constants.asm +++ b/src/constants/npc_constants.asm @@ -18,19 +18,19 @@ LOADED_NPC_LENGTH EQU const_value ; npc_struct constants const_def - const NPC_TRAINER_ID - const NPC_DATA_FIELD_01 ; 01-03 Seem to relate to sprites - const NPC_DATA_FIELD_02 + const NPC_DATA_ID + const NPC_DATA_SPRITE_ID + const NPC_DATA_FIELD_02 ; 02-04 Seem to relate to sprites const NPC_DATA_FIELD_03 const NPC_DATA_FIELD_04 - const NPC_DATA_OWSEQUENCE_PTR + const NPC_DATA_SCRIPT_PTR const_value = const_value+1 const NPC_DATA_NAME_TEXT const_value = const_value+1 - const NPC_DATA_BATTLE_PICTURE - const NPC_DATA_FIELD_0A - const NPC_DATA_FIELD_0B - const NPC_DATA_FIELD_0C + const NPC_DATA_DUELIST_PICTURE + const NPC_DATA_DECK_ID + const NPC_DATA_DUEL_THEME_ID + const NPC_DATA_MATCH_START_ID NPC_DATA_LENGTH EQU const_value const_def 1 @@ -81,8 +81,8 @@ NPC_DATA_LENGTH EQU const_value const NPC_RONALD1 ; $02 const NPC_ISHIHARA ; $03 const NPC_IMAKUNI ; $04 -const_value = const_value+1 ; DRMASON duplicate -const_value = const_value+1 ; DRMASON duplicate + const NPC_05 ; $05 (unused) + const NPC_06 ; $06 (unused) const NPC_SAM ; $07 const NPC_TECH1 ; $08 const NPC_TECH2 ; $09 @@ -186,10 +186,9 @@ const_value = const_value+1 ; DRMASON duplicate const NPC_LEGENDARY_CARD_BOTTOM_LEFT ; $6b const NPC_LEGENDARY_CARD_BOTTOM_RIGHT ; $6c const NPC_LEGENDARY_CARD_RIGHT_SPARK ; $6d - const NPC_11F49 ; $6e -const_value = const_value+1 ; NPC_11F49 duplicate + const NPC_6E ; $6e (unused) + const NPC_6F ; $6f (unused) const NPC_MURRAY2 ; $70 const NPC_RONALD2 ; $71 const NPC_RONALD3 ; $72 -const_value = const_value+1 ; NPC_11f49 duplicate - + const NPC_73 ; $73 (unused) diff --git a/src/constants/sprite_constants.asm b/src/constants/sprite_constants.asm index dc051d9..c4d219d 100644 --- a/src/constants/sprite_constants.asm +++ b/src/constants/sprite_constants.asm @@ -20,3 +20,41 @@ SPRITE_ANIM_BUFFER_CAPACITY EQU 16 ; sprites const SPRITE_ANIM_MOVEMENT_COUNTER const SPRITE_ANIM_FIELD_0F SPRITE_ANIM_LENGTH EQU const_value + + const_def 1 + const SPRITE_RONALD ; $01 + const SPRITE_DRMASON ; $02 + const SPRITE_ISHIHARA ; $03 + const SPRITE_IMAKUNI ; $04 + const SPRITE_NIKKI ; $05 + const SPRITE_RICK ; $06 + const SPRITE_KEN ; $07 + const SPRITE_AMY ; $08 + const SPRITE_ISAAC ; $09 + const SPRITE_MITCH ; $0A + const SPRITE_GENE ; $0B + const SPRITE_MURRAY ; $0C + const SPRITE_COURTNEY ; $0D + const SPRITE_STEVE ; $0E + const SPRITE_JACK ; $0F + const SPRITE_ROD ; $10 + const SPRITE_BOY1 ; $11 + const SPRITE_BOY2 ; $12 + const SPRITE_BOY3 ; $13 + const SPRITE_BUTCH ; $14 + const SPRITE_BOY4 ; $15 + const SPRITE_JOSHUA ; $16 + const SPRITE_BOY5 ; $17 + const SPRITE_TECH ; $18 + const SPRITE_CHAP ; $19 + const SPRITE_GUIDE ; $1A + const SPRITE_PAPPY ; $1B + const SPRITE_GIRL1 ; $1C + const SPRITE_GIRL2 ; $1D + const SPRITE_GIRL3 ; $1E + const SPRITE_GIRL4 ; $1F + const SPRITE_GIRL5 ; $20 + const SPRITE_CLERK ; $21 + const SPRITE_HOST ; $22 + const SPRITE_WOMAN ; $23 + const SPRITE_GRANNY ; $24 |