diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
| commit | f5983c0f813d3d908b6016db3ed866e4ca9437dc (patch) | |
| tree | d6888723f443557ce45c9a00d873caa5e7a8930e /engine/overworld/cinnabar_lab.asm | |
| parent | Character dict; surfing minigame; printer debug (diff) | |
| parent | More syncing with pokered (diff) | |
| download | pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.gz pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.xz pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/overworld/cinnabar_lab.asm')
| -rwxr-xr-x | engine/overworld/cinnabar_lab.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm index f81324e0..f7c5e326 100755 --- a/engine/overworld/cinnabar_lab.asm +++ b/engine/overworld/cinnabar_lab.asm @@ -48,9 +48,9 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) .choseDomeFossil ld b, KABUTO .fossilSelected - ld [W_FOSSILITEM], a + ld [wFossilItem], a ld a, b - ld [W_FOSSILMON], a + ld [wFossilMon], a call LoadFossilItemAndMonName ld hl, LabFossil_610ae call PrintText @@ -60,7 +60,7 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) jr nz, .cancelledGivingFossil ld hl, LabFossil_610b3 call PrintText - ld a, [W_FOSSILITEM] + ld a, [wFossilItem] ld [hItemToRemoveID], a callba RemoveItemByID ld hl, LabFossil_610b8 @@ -113,11 +113,11 @@ PrintFossilsInBag: ; 610c2 (18:50c2) ; loads the names of the fossil item and the resulting mon LoadFossilItemAndMonName: ; 610eb (18:50eb) - ld a, [W_FOSSILMON] + ld a, [wFossilMon] ld [wd11e], a call GetMonName call CopyStringToCF4B - ld a, [W_FOSSILITEM] + ld a, [wFossilItem] ld [wd11e], a call GetItemName ret |