diff options
Diffstat (limited to 'scripts/SafariZoneGate.asm')
| -rwxr-xr-x | scripts/SafariZoneGate.asm | 104 |
1 files changed, 6 insertions, 98 deletions
diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm index fd9a0884..9e4cc5dd 100755 --- a/scripts/SafariZoneGate.asm +++ b/scripts/SafariZoneGate.asm @@ -2,7 +2,8 @@ SafariZoneGate_Script: call EnableAutoTextBoxDrawing ld hl, SafariZoneGate_ScriptPointers ld a, [wSafariZoneGateCurScript] - jp CallFunctionInTable + call CallFunctionInTable + ret SafariZoneGate_ScriptPointers: dw .SafariZoneEntranceScript0 @@ -85,6 +86,8 @@ SafariZoneGate_ScriptPointers: call DisplayTextID xor a ld [wNumSafariBalls], a + ld [wSafariSteps], a + ld [wSafariSteps], a ; ????? ld a, D_DOWN ld c, $3 call SafariZoneEntranceAutoWalk @@ -143,84 +146,10 @@ SafariZoneGate_TextPointers: text_end .SafariZoneEntranceText4 - text_far SafariZoneEntranceText_9e6e4 text_asm - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jp nz, .PleaseComeAgain - xor a - ldh [hMoney], a - ld a, $05 - ldh [hMoney + 1], a - ld a, $00 - ldh [hMoney + 2], a - call HasEnoughMoney - jr nc, .success - ld hl, .NotEnoughMoneyText - call PrintText - jr .CantPayWalkDown - -.success - xor a - ld [wPriceTemp], a - ld a, $05 - ld [wPriceTemp + 1], a - ld a, $00 - ld [wPriceTemp + 2], a - ld hl, wPriceTemp + 2 - ld de, wPlayerMoney + 2 - ld c, 3 - predef SubBCDPredef - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - ld hl, .MakePaymentText - call PrintText - ld a, 30 - ld [wNumSafariBalls], a - ld a, HIGH(502) - ld [wSafariSteps], a - ld a, LOW(502) - ld [wSafariSteps + 1], a - ld a, D_UP - ld c, 3 - call SafariZoneEntranceAutoWalk - SetEvent EVENT_IN_SAFARI_ZONE - ResetEventReuseHL EVENT_SAFARI_GAME_OVER - ld a, 3 - ld [wSafariZoneGateCurScript], a - jr .done - -.PleaseComeAgain - ld hl, .PleaseComeAgainText - call PrintText -.CantPayWalkDown - ld a, D_DOWN - ld c, 1 - call SafariZoneEntranceAutoWalk - ld a, 4 - ld [wSafariZoneGateCurScript], a -.done + callfar Func_f1f77 jp TextScriptEnd -.MakePaymentText - text_far SafariZoneEntranceText_9e747 - sound_get_item_1 - text_far _SafariZoneEntranceText_75360 - text_end - -.PleaseComeAgainText - text_far _SafariZoneEntranceText_75365 - text_end - -.NotEnoughMoneyText - text_far _SafariZoneEntranceText_7536a - text_end - .SafariZoneEntranceText5 text_far SafariZoneEntranceText_9e814 text_asm @@ -268,26 +197,5 @@ SafariZoneGate_TextPointers: .SafariZoneEntranceText2 text_asm - ld hl, .FirstTimeQuestionText - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - ld hl, .RegularText - jr nz, .Explanation - ld hl, .ExplanationText -.Explanation - call PrintText + callfar Func_f203e jp TextScriptEnd - -.FirstTimeQuestionText - text_far _SafariZoneEntranceText_753e6 - text_end - -.ExplanationText - text_far _SafariZoneEntranceText_753eb - text_end - -.RegularText - text_far _SafariZoneEntranceText_753f0 - text_end |