summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorPokeglitch <pokeglitchx@gmail.com>2018-06-17 08:23:27 -0400
committerPokeglitch <pokeglitchx@gmail.com>2018-06-17 08:23:27 -0400
commitf00dbc8015612a50cdffc12d2ec4b644605ca56b (patch)
treea8e94ef0e83a0406ace4a2a7b96d9e08ad9ce808 /constants
parentd0e5e20dfebdb6cd386c85bed03356a9973c0228 (diff)
Added some constants, removed todos for overworld.asm
Diffstat (limited to 'constants')
-rwxr-xr-xconstants/music_constants.asm2
-rw-r--r--constants/wram_constants.asm17
2 files changed, 18 insertions, 1 deletions
diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index 5009983..c304fbb 100755
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -14,4 +14,6 @@
const MUSIC_VICTORY_TRAINER ; 0B
const MUSIC_EVOLUTION ; 0C
+MUSIC_SURF EQU $62
+
SE_SELECT EQU 5
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index a5e3044..32a0379 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -5,4 +5,19 @@
const UP ; 1
const LEFT ; 2
const RIGHT ; 3
-NUM_DIRECTIONS EQU const_value \ No newline at end of file
+NUM_DIRECTIONS EQU const_value
+
+; wMonType:: ; cb5a
+ const_def
+ const PARTYMON ; 0
+ const OTPARTYMON ; 1
+ const BOXMON ; 2
+ const TEMPMON ; 3
+ const WILDMON ; 4
+
+; wPlayerState:: ; d95d
+PLAYER_NORMAL EQU 0
+PLAYER_BIKE EQU 1
+PLAYER_SKATE EQU 2
+PLAYER_SURF EQU 4
+PLAYER_SURF_PIKA EQU 8 \ No newline at end of file