From f00dbc8015612a50cdffc12d2ec4b644605ca56b Mon Sep 17 00:00:00 2001 From: Pokeglitch Date: Sun, 17 Jun 2018 08:23:27 -0400 Subject: Added some constants, removed todos for overworld.asm --- constants/music_constants.asm | 2 ++ constants/wram_constants.asm | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'constants') 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 -- cgit v1.2.3