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 | |
| parent | b44077ed3180b57a852db48f784312f6a1b0221a (diff) | |
this is how you fix conflicts, right?
| -rw-r--r-- | constants/wram_constants.asm | 16 | ||||
| -rw-r--r-- | data/predef_pointers.inc | 16 | ||||
| -rw-r--r-- | wram.asm | 3 |
3 files changed, 26 insertions, 9 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 diff --git a/data/predef_pointers.inc b/data/predef_pointers.inc index 3f5e848..7d2e65a 100644 --- a/data/predef_pointers.inc +++ b/data/predef_pointers.inc @@ -16,14 +16,14 @@ PredefPointers:: ; 1:62d3 add_predef Function6713 add_predef Function66b1 add_predef DebugMenu - add_predef Functionce10 - add_predef Functioncd6f - add_predef Functioncde3 - add_predef Functioncde3_2 ; 8 - add_predef Functioncde3_3 - add_predef Functioncdf9 - add_predef Functionce10_2 - add_predef Functioncd33 + add_predef GetItemAmount + add_predef HealParty + add_predef AddBCD + dba AddBCD ; 8 + dba AddBCD + add_predef SubBCD + dba GetItemAmount + add_predef SmallFarFlagAction GiveItemPredef:: dbw 3, GiveItem add_predef Functionce3c @@ -595,7 +595,8 @@ wDebugFlags:: db ; ce63 ; | \-- debug field indicator ; \---- loaded/continued game -SECTION "Player And Mom Names", WRAM0[$CE67] + ds 3 + wPlayerName:: ds 6 ; ce67 wMomsName:: ds 6 ; ce6d |