diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/OaksLab.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/OaksLab.asm (renamed from scripts/oakslab.asm) | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/scripts/oakslab.asm b/scripts/OaksLab.asm index ad9572e7..04f31d2a 100755 --- a/scripts/oakslab.asm +++ b/scripts/OaksLab.asm @@ -1,16 +1,16 @@ -OaksLabScript: +OaksLab_Script: CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 call nz, OaksLabScript_1d076 ld a, $1 ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, OaksLabScriptPointers + ld hl, OaksLab_ScriptPointers ld a, [wOaksLabCurScript] - call JumpTable + call CallFunctionInTable ret -OaksLabScriptPointers: +OaksLab_ScriptPointers: dw OaksLabScript0 dw OaksLabScript1 dw OaksLabScript2 @@ -444,23 +444,21 @@ OaksLabScript16: ld a, $11 ld [wOaksLabCurScript], a ret - +; make the player keep facing the rival as he walks away .checkRivalPosition ld a, [wNPCNumScriptedSteps] - cp 5 + cp $5 jr nz, .turnPlayerDown ld a, [wXCoord] - cp 4 + cp $4 jr nz, .turnPlayerLeft ld a, SPRITE_FACING_RIGHT jr .done - .turnPlayerLeft ld a, SPRITE_FACING_LEFT jr .done - .turnPlayerDown - cp 4 + cp $4 ret nz xor a .done @@ -698,14 +696,14 @@ OaksLabScript_1c8b9: ret OaksLabScript_1d076: - ld hl, OaksLabTextPointers2 + ld hl, OaksLab_TextPointers2 ld a, l ld [wMapTextPtr], a ld a, h ld [wMapTextPtr + 1], a ret -OaksLabTextPointers: +OaksLab_TextPointers: dw OaksLabText1 dw OaksLabText2 dw OaksLabText3 @@ -734,7 +732,7 @@ OaksLabTextPointers: dw OaksLabText26 dw OaksLabText27 -OaksLabTextPointers2: +OaksLab_TextPointers2: dw OaksLabText1 dw OaksLabText2 dw OaksLabText3 @@ -751,19 +749,17 @@ OaksLabText1: jr nz, .beforeChooseMon ld hl, OaksLabGaryText1 call PrintText - jr .asm_1c97a - + jr .done .beforeChooseMon CheckEventReuseA EVENT_GOT_STARTER jr nz, .afterChooseMon ld hl, OaksLabText40 call PrintText - jr .asm_1c97a - + jr .done .afterChooseMon ld hl, OaksLabText41 call PrintText -.asm_1c97a +.done jp TextScriptEnd OaksLabGaryText1: |