diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_data_constants.asm | 2 | ||||
| -rw-r--r-- | constants/move_constants.asm | 3 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.asm | 5 | ||||
| -rwxr-xr-x | constants/script_constants.asm | 15 |
4 files changed, 21 insertions, 4 deletions
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index ac9908a..e711e1d 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -12,5 +12,7 @@ const_value = -1 const SPAWN_N_A +NUM_SPAWNS EQU 18 + ; size of each spawn point data SPAWN_POINT_SIZE EQU 4
\ No newline at end of file diff --git a/constants/move_constants.asm b/constants/move_constants.asm index b7daf0e..dee94ff 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -294,3 +294,6 @@ NUM_ATTACKS EQU const_value + -1 const BATTLEANIM_WOBBLE const BATTLEANIM_SHAKE const BATTLEANIM_HIT_CONFUSION + + +MOVE_DATA_SIZE EQU 7
\ No newline at end of file diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 0b00f47..9038685 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -130,3 +130,8 @@ WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2 PP_UP_MASK EQU %11000000 PP_UP_ONE EQU %01000000 PP_MASK EQU %00111111 + +; HP +ENEMY_HP_BAR EQU 0 +BATTLE_HP_BAR EQU 1 +POKEMON_MENU_HP_BAR EQU 2
\ No newline at end of file diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 3aa19b5..4a6390e 100755 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -5,11 +5,18 @@ const SCRIPT_ID_01 ; 01
const SCRIPT_ID_02 ; 02
const SCRIPT_ID_03 ; 03
+ const SCRIPT_ID_04 ; 04
+ const SCRIPT_ID_05 ; 05
; Flags
-SCRIPT_FINISHED EQU 7
+SCRIPT_FINISHED_F EQU 7
; Masks/Return Values
-SCRIPT_FINISHED_MASK = 1 << SCRIPT_FINISHED
-SCRIPT_SUCCESS EQU SCRIPT_FINISHED_MASK | $f
-SCRIPT_FAIL EQU SCRIPT_FINISHED_MASK | 0
\ No newline at end of file +SCRIPT_FINISHED_MASK EQU 1 << SCRIPT_FINISHED_F
+SCRIPT_SUCCESS EQU $f
+SCRIPT_FAIL EQU 0
+
+; Some script don't combine the return value with the flag
+; Instead, they load this into the wFieldMoveScriptID, and keep
+; the return value in a
+SCRIPT_FINISHED EQU -1
\ No newline at end of file |