diff options
| author | 2Tie <foxman95@ymail.com> | 2018-06-18 23:25:39 -0600 |
|---|---|---|
| committer | 2Tie <foxman95@ymail.com> | 2018-06-18 23:25:39 -0600 |
| commit | beae22ccbd4c43c15f9100dd6cbe983d545e5e97 (patch) | |
| tree | 65829029d94036c922debd77b36b6a9a38570e55 | |
| parent | 2f0b152e5a52d39bfe938f8f19cdd49d3dcd4671 (diff) | |
spoilers: it wasn't
| -rw-r--r-- | data/predef_pointers.inc | 16 | ||||
| -rw-r--r-- | engine/menu/main_menu.asm | 2 | ||||
| -rw-r--r-- | shim.sym | 1 | ||||
| -rw-r--r-- | wram.asm | 25 |
4 files changed, 29 insertions, 15 deletions
diff --git a/data/predef_pointers.inc b/data/predef_pointers.inc index 7d2e65a..3f5e848 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 GetItemAmount - add_predef HealParty - add_predef AddBCD - dba AddBCD ; 8 - dba AddBCD - add_predef SubBCD - dba GetItemAmount - add_predef SmallFarFlagAction + 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 GiveItemPredef:: dbw 3, GiveItem add_predef Functionce3c diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index d710b1c..85e1078 100644 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -466,7 +466,7 @@ GiveRandomJohto:: ; 57B0 ld b, $08 call GivePokemon ld a, $8D - ld [wd6b3], a + ld [wPartyMon1 + 1], a ret GiveKantoStarters:: ; 57C8 @@ -463,5 +463,4 @@ ; The starting house's map script number is stored at d29a. Others are probably nearby. 01:D35F wOptions 01:D513 wWarpNumber -01:D7D2 wPartyMonOT 01:DA3B wOTPartyMonOT @@ -838,11 +838,26 @@ wTilesetCollisionAddress:: ; d6a4 ds 4 ; TODO wTilesetEnd:: ; d6aa -SECTION "D6B3", WRAM0[$D6B3] - -wd6b3 :: db ; d6b3 - -SECTION "PokeDexFlags", WRAM0[$D81A] +wPartyCount:: db +wPartySpecies:: ds PARTY_LENGTH +wPartyEnd:: db + +wPartyMons:: +wPartyMon1:: party_struct wPartyMon1 ; d6b2 +wPartyMon2:: party_struct wPartyMon2 ; d6e2 +wPartyMon3:: party_struct wPartyMon3 ; d712 +wPartyMon4:: party_struct wPartyMon4 ; d742 +wPartyMon5:: party_struct wPartyMon5 ; d772 +wPartyMon6:: party_struct wPartyMon6 ; d7a2 +wPlayerPartyEnd:: ; d7d2 + +wPartyMonOT:: ; d7d2 + ds PARTY_LENGTH * 6 +wPartyMonOTEnd:: ; d7f6 + +wPartyMonNicknames:: ; d7f6 + ds PARTY_LENGTH * MON_NAME_LENGTH ; = $24 +wPartyMonNicknamesEnd:: ; d81a wPokedexOwned:: ; d81a flag_array NUM_POKEMON |