diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-19 16:49:29 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-19 16:49:29 -0400 |
| commit | 6c25592b8c43afe9780968da88f9b06cbb526e72 (patch) | |
| tree | 30449a14d2a1158ce785f4d92da3ab01c11d0f27 /engine/scripting.asm | |
| parent | 0a244e043c83dff064d7e3ec054a587c7f999d0d (diff) | |
So very jumb
Diffstat (limited to 'engine/scripting.asm')
| -rw-r--r-- | engine/scripting.asm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index 5cd62a22d..351dcc744 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1558,23 +1558,25 @@ Script_returnafterbattle: ; 0x97459 ld a, [wd0ee] and $3f cp $1 - jr nz, .asm_97470 ; 0x97466 $8 + jr nz, .notblackedout ; 0x97466 $8 ld b, BANK(UnknownScript_0x124c1) ld hl, UnknownScript_0x124c1 jp ScriptJump -.asm_97470 + +.notblackedout bit 0, d jr z, .asm_9747c ; 0x97472 $8 - callba Functionfcfec - jr .asm_9748e ; 0x9747a $12 + callba MomTriesToBuySomething + jr .done ; 0x9747a $12 + .asm_9747c ld a, [wd0ee] bit 7, a - jr z, .asm_9748e ; 0x97481 $b - ld b, BANK(UnknownScript_0x90255) - ld de, UnknownScript_0x90255 + jr z, .done ; 0x97481 $b + ld b, BANK(Script_SpecialBillCall) + ld de, Script_SpecialBillCall callba Function97c4f -.asm_9748e +.done jp Script_reloadmap ; 0x97491 |