diff options
| author | Daniel Harding <33dannye@gmail.com> | 2021-05-30 11:07:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-30 11:07:54 -0500 |
| commit | e8cbcea8e76004a9cef04499301cec5755dcc942 (patch) | |
| tree | c8ed944e6ea43d03cee5367603e40881b6ac17bb /src/constants/npc_constants.asm | |
| parent | 0a3b84155b53785c974a2b352a6473124c56631b (diff) | |
| parent | 63f0559573cbec5a199645263a36b51b503d4ed1 (diff) | |
Merge pull request #105 from ElectroDeoxys/master
Work on Bank $7 (NPCs, Start Menu and Opening/Credits sequences)
Diffstat (limited to 'src/constants/npc_constants.asm')
| -rw-r--r-- | src/constants/npc_constants.asm | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm index 4a64993..1aac946 100644 --- a/src/constants/npc_constants.asm +++ b/src/constants/npc_constants.asm @@ -7,12 +7,12 @@ LOADED_NPC_MAX EQU $08 const LOADED_NPC_COORD_X const LOADED_NPC_COORD_Y const LOADED_NPC_DIRECTION - const LOADED_NPC_FIELD_05 - const LOADED_NPC_FIELD_06 - const LOADED_NPC_FIELD_07 - const LOADED_NPC_FIELD_08 - const LOADED_NPC_FIELD_09 - const LOADED_NPC_FIELD_0A + const LOADED_NPC_FLAGS + const LOADED_NPC_ANIM + const LOADED_NPC_UNKNOWN + const LOADED_NPC_MOVEMENT_STEP + const LOADED_NPC_MOVEMENT_PTR +const_value = const_value+1 const LOADED_NPC_FIELD_0B LOADED_NPC_LENGTH EQU const_value @@ -20,9 +20,9 @@ LOADED_NPC_LENGTH EQU const_value const_def 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_ANIM + const NPC_DATA_ANIM_CGB + const NPC_DATA_FLAGS const NPC_DATA_SCRIPT_PTR const_value = const_value+1 const NPC_DATA_NAME_TEXT @@ -191,4 +191,14 @@ NPC_DATA_LENGTH EQU const_value const NPC_MURRAY2 ; $70 const NPC_RONALD2 ; $71 const NPC_RONALD3 ; $72 - const NPC_73 ; $73 (unused) + const NPC_PLAYER_CREDITS ; $73 + +; flags in LOADED_NPC_FLAGS + const_def 4 + const NPC_FLAG_DIRECTIONLESS_F ; $4 + const NPC_FLAG_MOVING_F ; $5 + const NPC_FLAG_UNKNOWN_F ; $6 + +NPC_FLAG_DIRECTIONLESS EQU 1 << NPC_FLAG_DIRECTIONLESS_F +NPC_FLAG_MOVING EQU 1 << NPC_FLAG_MOVING_F +NPC_FLAG_UNKNOWN EQU 1 << NPC_FLAG_UNKNOWN_F |