diff options
| author | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
| commit | e668b6cf3a7760303edd181baa69901a94a7d653 (patch) | |
| tree | b9de2e272aceb5ca4d24830a64ee4fd87e9fb40e /engine/routines/initlist.asm | |
| parent | 2edf131b056c6d2b1ec9eb48b97fba31b0f953c7 (diff) | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/routines/initlist.asm')
| -rw-r--r-- | engine/routines/initlist.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/routines/initlist.asm b/engine/routines/initlist.asm index b7260e552..26c77b5bb 100644 --- a/engine/routines/initlist.asm +++ b/engine/routines/initlist.asm @@ -3,23 +3,23 @@ InitList: ; 50db9 cp INIT_ENEMYOT_LIST jr nz, .check_party_ot_name - ld hl, OTPartyCount - ld de, OTPartyMonOT + ld hl, wOTPartyCount + ld de, wOTPartyMonOT ld a, ENEMY_OT_NAME jr .done .check_party_ot_name cp INIT_PLAYEROT_LIST jr nz, .check_mon_name - ld hl, PartyCount - ld de, PartyMonOT + ld hl, wPartyCount + ld de, wPartyMonOT ld a, PARTY_OT_NAME jr .done .check_mon_name cp INIT_MON_LIST jr nz, .check_item_name - ld hl, CurMart + ld hl, wCurMart ld de, PokemonNames ld a, MON_NAME jr .done @@ -27,13 +27,13 @@ InitList: ; 50db9 .check_item_name cp INIT_BAG_ITEM_LIST jr nz, .check_ob_item_name - ld hl, NumItems + ld hl, wNumItems ld de, ItemNames ld a, ITEM_NAME jr .done .check_ob_item_name - ld hl, CurMart + ld hl, wCurMart ld de, ItemNames ld a, ITEM_NAME .done |