diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_object_constants.asm | 3 | ||||
| -rw-r--r-- | constants/script_constants.asm | 2 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 28 |
3 files changed, 28 insertions, 5 deletions
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 55a3f358b..00ddb772a 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -70,6 +70,9 @@ EMOTE_OBJECT EQU 1 << EMOTE_OBJECT_F const OBJ_FLAGS2_2 ; 2 const OVERHEAD_F ; 3 const USE_OBP1_F ; 4 + const OBJ_FLAGS2_5 ; 5 + const OBJ_FLAGS2_6 ; 6 + const OBJ_FLAGS2_7 ; 7 LOW_PRIORITY EQU 1 << LOW_PRIORITY_F HIGH_PRIORITY EQU 1 << HIGH_PRIORITY_F diff --git a/constants/script_constants.asm b/constants/script_constants.asm index a31394a36..34f2bc864 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -163,7 +163,7 @@ NUM_CMDQUEUE_TYPES EQU const_value const EMOTE_ROD ; 9 const EMOTE_BOULDER_DUST ; 10 const EMOTE_GRASS_RUSTLE ; 11 -EMOTE_MEM EQU -1 +EMOTE_FROM_MEM EQU -1 ; fruittree arguments ; FruitTreeItems indexes (see data/items/fruit_trees.asm) diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index abdef53e9..1c8ff5192 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -94,6 +94,13 @@ REMOVE_BOX EQU 1 DAY_CARE_WITHDRAW EQU 2 DAY_CARE_DEPOSIT EQU 3 +; wPlayerStepFlags:: ; d150 + const_def 4 + const PLAYERSTEP_MIDAIR_F ; 4 + const PLAYERSTEP_CONTINUE_F ; 5 + const PLAYERSTEP_STOP_F ; 6 + const PLAYERSTEP_START_F ; 7 + ; wInitListType:: ; d263 INIT_ENEMYOT_LIST EQU 1 INIT_BAG_ITEM_LIST EQU 2 @@ -126,14 +133,27 @@ PLAYERSPRITESETUP_RESET_ACTION_F EQU 7 ; wPlayerGender:: ; d472 PLAYERGENDER_FEMALE_F EQU 0 +; wMapStatus:: ; d432 + const_def + const MAPSTATUS_START ; 0 + const MAPSTATUS_ENTER ; 1 + const MAPSTATUS_HANDLE ; 2 + const MAPSTATUS_DONE ; 3 + +; wMapEventStatus:: ; d433 + const_def + const MAPEVENTS_ON ; 0 + const MAPEVENTS_OFF ; 1 + ; wScriptFlags:: ; d434 SCRIPT_RUNNING EQU 2 ; wScriptMode:: ; d437 -SCRIPT_OFF EQU 0 -SCRIPT_READ EQU 1 -SCRIPT_WAIT_MOVEMENT EQU 2 -SCRIPT_WAIT EQU 3 + const_def + const SCRIPT_OFF + const SCRIPT_READ + const SCRIPT_WAIT_MOVEMENT + const SCRIPT_WAIT ; wSpawnAfterChampion:: ; d4b5 SPAWN_LANCE EQU 1 |