diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-26 18:11:55 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-26 19:22:27 -0500 |
| commit | 2bd45ca574aab251b91c24837b102c9c2a5e76a0 (patch) | |
| tree | bd8c568b9e43f7467ff4822080c6228c29bca2b9 /event | |
| parent | f485a45cda5f84e6909997147b1e6c9a9a538d9b (diff) | |
Move effects; no more reloadmapmusic, returnafterbattle
Diffstat (limited to 'event')
| -rwxr-xr-x | event/mom_phone.asm | 25 | ||||
| -rwxr-xr-x | event/sweet_scent.asm | 2 |
2 files changed, 13 insertions, 14 deletions
diff --git a/event/mom_phone.asm b/event/mom_phone.asm index 5cbe44e95..e7d2a1493 100755 --- a/event/mom_phone.asm +++ b/event/mom_phone.asm @@ -6,7 +6,7 @@ MomTriesToBuySomething:: ; fcfec and a ret nz xor a - ld [wdc18], a + ld [wWhichMomItemSet], a call CheckBalance_MomItem2 ret nc call Mom_GiveItemOrDoll @@ -26,10 +26,10 @@ MomTriesToBuySomething:: ; fcfec .ASMFunction: ; fd017 call MomBuysItem_DeductFunds call Mom_GetScriptPointer - ld a, [wdc18] + ld a, [wWhichMomItemSet] and a jr nz, .ok - ld hl, wdc17 + ld hl, wWhichMomItem inc [hl] .ok ld a, PHONE_MOM @@ -52,7 +52,7 @@ MomTriesToBuySomething:: ; fcfec ; fd044 CheckBalance_MomItem2: ; fd044 - ld a, [wdc17] + ld a, [wWhichMomItem] cp 10 jr nc, .nope call GetItemFromMom @@ -82,12 +82,12 @@ CheckBalance_MomItem2: ; fd044 inc hl ld [hl], (2300 % $100) ; $fc .loop - ld de, wdc19 + ld de, MomItemTriggerBalance ld bc, wMomsMoney callba CompareMoney jr z, .exact jr nc, .less_than - call Functionfd099 + call .AddMoney jr .loop .less_than @@ -95,17 +95,16 @@ CheckBalance_MomItem2: ; fd044 ret .exact - call Functionfd099 + call .AddMoney ld a, 5 call RandomRange inc a - ld [wdc18], a + ld [wWhichMomItemSet], a scf ret -; fd099 -Functionfd099: ; fd099 - ld de, wdc19 +.AddMoney + ld de, MomItemTriggerBalance ld bc, hMoneyTemp callba AddMoney ret @@ -183,7 +182,7 @@ Mom_GetScriptPointer: ; fd0eb (3f:50eb) GetItemFromMom: ; fd117 - ld a, [wdc18] + ld a, [wWhichMomItemSet] and a jr z, .zero dec a @@ -191,7 +190,7 @@ GetItemFromMom: ; fd117 jr .GetFromList1 .zero - ld a, [wdc17] + ld a, [wWhichMomItem] cp 10 ; length of MomItems_2 jr c, .ok xor a diff --git a/event/sweet_scent.asm b/event/sweet_scent.asm index 79a4b5819..01c43f8b9 100755 --- a/event/sweet_scent.asm +++ b/event/sweet_scent.asm @@ -18,7 +18,7 @@ UnknownScript_0x506c8: ; 0x506c8 iftrue UnknownScript_0x506e5 randomwildmon startbattle - returnafterbattle + reloadmapafterbattle end ; 0x506e5 |