summaryrefslogtreecommitdiff
path: root/constants/script_constants.asm
diff options
context:
space:
mode:
Diffstat (limited to 'constants/script_constants.asm')
-rw-r--r--constants/script_constants.asm53
1 files changed, 30 insertions, 23 deletions
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index 989306d0..56e2a12b 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -34,7 +34,13 @@ NUM_STRING_BUFFERS EQU const_value
const PHONE_CONTACTS_FULL ; 1
const PHONE_CONTACT_REFUSED ; 2
-; writecode/checkcode arguments
+; trainertext arguments
+ const_def
+ const TRAINERTEXT_SEEN
+ const TRAINERTEXT_WIN
+ const TRAINERTEXT_LOSS
+
+; readvar/writevar/loadvar arguments
; _GetVarAction.VarActionTable indexes (see engine/overworld/variables.asm)
const_def
const VAR_STRINGBUFFER2 ; 00
@@ -66,7 +72,7 @@ RETVAR_ADDR_DE EQU (1 << 6)
RETVAR_EXECUTE EQU (2 << 6)
; PlayerEventScriptPointers indexes (see engine/overworld/events.asm)
-const_value SET -1
+ const_def -1
const PLAYEREVENT_MAPSCRIPT
const PLAYEREVENT_NONE
const PLAYEREVENT_SEENBYTRAINER
@@ -80,6 +86,17 @@ const_value SET -1
const PLAYEREVENT_JOYCHANGEFACING
NUM_PLAYER_EVENTS EQU const_value
+; PlayerMovement.pointers indexes (see engine/overworld/events.asm)
+ const_def
+ const PLAYERMOVEMENT_NORMAL
+ const PLAYERMOVEMENT_WARP
+ const PLAYERMOVEMENT_TURN
+ const PLAYERMOVEMENT_FORCE_TURN
+ const PLAYERMOVEMENT_FINISH
+ const PLAYERMOVEMENT_CONTINUE
+ const PLAYERMOVEMENT_EXIT_WATER
+ const PLAYERMOVEMENT_JUMP
+
; script data sizes (see macros/scripts/maps.asm)
SCENE_SCRIPT_SIZE EQU 4 ; scene_script
CALLBACK_SIZE EQU 3 ; callback
@@ -115,6 +132,7 @@ OBJECT_EVENT_SIZE EQU 13 ; object_event
; command queue members
CMDQUEUE_TYPE EQU 0
CMDQUEUE_ADDR EQU 1
+CMDQUEUE_02 EQU 2
CMDQUEUE_03 EQU 3
CMDQUEUE_04 EQU 4
CMDQUEUE_05 EQU 5
@@ -165,7 +183,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)
@@ -200,7 +218,7 @@ EMOTE_MEM EQU -1
const FRUITTREE_PEWTER_CITY_1 ; 1c
const FRUITTREE_PEWTER_CITY_2 ; 1d
const FRUITTREE_FUCHSIA_CITY ; 1e
-NUM_FRUIT_TREES EQU const_value + -1
+NUM_FRUIT_TREES EQU const_value - 1
; describedecoration arguments
; DescribeDecoration.JumpTable indexes (see engine/overworld/decorations.asm)
@@ -213,11 +231,14 @@ NUM_FRUIT_TREES EQU const_value + -1
; swarm arguments
; StoreSwarmMapIndices arguments
+; tentative/placeholder, this is just the order from swarm_grass.asm
const_def
- const SWARM_DUNSPARCE ; 0
- const SWARM_YANMA ; 1
+ const SWARM_YANMA ; 0
+ const SWARM_SNUBBULL ; 1
+ const SWARM_DUNSPARCE ; 2
+ const SWARM_MARILL ; 3
-; ActivateFishingSwarm writebyte arguments
+; ActivateFishingSwarm setval arguments
const_def
const FISHSWARM_NONE ; 0
const FISHSWARM_QWILFISH ; 1
@@ -250,14 +271,14 @@ NUM_FRUIT_TREES EQU const_value + -1
const BUGCONTEST_BOXED_MON ; 1
const BUGCONTEST_NO_CATCH ; 2
-; HealMachineAnim writebyte arguments
+; HealMachineAnim setval arguments
; HealMachineAnim.Pointers indexes (see engine/events/heal_machine_anim.asm)
const_def
const HEALMACHINE_POKECENTER ; 0
const HEALMACHINE_ELMS_LAB ; 1
const HEALMACHINE_HALL_OF_FAME ; 2
-; UnownPuzzle writebyte arguments
+; UnownPuzzle setval arguments
; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/games/unown_puzzle.asm)
const_def
const UNOWNPUZZLE_KABUTO ; 0
@@ -265,17 +286,3 @@ NUM_FRUIT_TREES EQU const_value + -1
const UNOWNPUZZLE_AERODACTYL ; 2
const UNOWNPUZZLE_HO_OH ; 3
NUM_UNOWN_PUZZLES EQU const_value
-
-; DisplayUnownWords writebyte arguments
-; UnownWalls and MenuHeaders_UnownWalls indexes (see data/events/unown_walls.asm)
- const_def
- const UNOWNWORDS_ESCAPE ; 0
- const UNOWNWORDS_LIGHT ; 1
- const UNOWNWORDS_WATER ; 2
- const UNOWNWORDS_HO_OH ; 3
-
-; MoveTutor writebyte arguments
- const_def 1
- const MOVETUTOR_FLAMETHROWER ; 1
- const MOVETUTOR_THUNDERBOLT ; 2
- const MOVETUTOR_ICE_BEAM ; 3 \ No newline at end of file