From 2cb260953de9bc2f05e7016427b4d8e57c451fab Mon Sep 17 00:00:00 2001
From: Pokeglitch <pokeglitchx@gmail.com>
Date: Sun, 17 Jun 2018 07:38:57 -0400
Subject: Added constants, removed TODOs to health.asm

---
 constants/pokemon_data_constants.asm |  5 +++++
 constants/script_constants.asm       | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'constants')

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 8045cc4..4a6390e 100755
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -9,10 +9,14 @@
 	const SCRIPT_ID_05   ; 05
 	
 ; Flags
-SCRIPT_FINISHED_FLAG      EQU 7
+SCRIPT_FINISHED_F      EQU 7
 
 ; Masks/Return Values
-SCRIPT_FINISHED_MASK EQU 1 << SCRIPT_FINISHED_FLAG
+SCRIPT_FINISHED_MASK EQU 1 << SCRIPT_FINISHED_F
 SCRIPT_SUCCESS  EQU $f
 SCRIPT_FAIL     EQU 0
-SCRIPT_FINISHED EQU $FF
\ No newline at end of file
+
+; 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
-- 
cgit v1.2.3