diff options
| author | 2Tie <foxman95@ymail.com> | 2018-06-18 22:53:06 -0600 |
|---|---|---|
| committer | 2Tie <foxman95@ymail.com> | 2018-06-18 22:53:06 -0600 |
| commit | 2f0b152e5a52d39bfe938f8f19cdd49d3dcd4671 (patch) | |
| tree | 65ee75fd312bfb8d325a494569c8776cdd4ed16c /constants | |
| parent | b44077ed3180b57a852db48f784312f6a1b0221a (diff) | |
this is how you fix conflicts, right?
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/wram_constants.asm | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 4b63ba7..18b7e4a 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -7,6 +7,22 @@ const RIGHT ; 3 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 + +; wDebugFlags:: ; ce63 const_def const DEBUG_BATTLE_F const DEBUG_FIELD_F |