diff options
Diffstat (limited to 'scripts/route11gateupstairs.asm')
| -rwxr-xr-x | scripts/route11gateupstairs.asm | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm index d8740986..6c8d6e99 100755 --- a/scripts/route11gateupstairs.asm +++ b/scripts/route11gateupstairs.asm @@ -1,59 +1,56 @@ -Route11GateUpstairsScript: ; 49454 (12:5454) +Route11GateUpstairsScript: jp DisableAutoTextBoxDrawing -Route11GateUpstairsTextPointers: ; 49457 (12:5457) +Route11GateUpstairsTextPointers: dw Route11GateUpstairsText1 dw Route11GateUpstairsText2 dw Route11GateUpstairsText3 dw Route11GateUpstairsText4 -Route11GateUpstairsText1: ; 4945f (12:545f) - db $08 ; asm +Route11GateUpstairsText1: + TX_ASM xor a ld [wWhichTrade], a predef DoInGameTradeDialogue -asm_49469: ; 49469 (12:5469) +Route11GateUpstairsScriptEnd: jp TextScriptEnd -Route11GateUpstairsText2: ; 4946c (12:546c) - db $8 - ld a, [wd7d6] - add a - jr c, .asm_4949b ; 0x49471 $28 +Route11GateUpstairsText2: + TX_ASM + CheckEvent EVENT_GOT_ITEMFINDER, 1 + jr c, .asm_4949b ld a, 30 ; pokemon needed - ld [$ffdb], a + ld [hOaksAideRequirement], a ld a, ITEMFINDER ; oak's aide reward - ld [$ffdc], a + ld [hOaksAideRewardItem], a ld [wd11e], a call GetItemName ld h, d ld l, e - ld de, wcc5b - ld bc, $000d + ld de, wOaksAideRewardItemName + ld bc, ITEM_NAME_LENGTH call CopyData - predef OaksAideScript ; call oak's aide script - ld a, [$ffdb] + predef OaksAideScript + ld a, [hOaksAideResult] dec a - jr nz, .asm_494a1 ; 0x49494 $b - ld hl, wd7d6 - set 7, [hl] + jr nz, .asm_494a1 + SetEvent EVENT_GOT_ITEMFINDER .asm_4949b ld hl, Route11GateUpstairsText_494a3 call PrintText .asm_494a1 - jr asm_49469 ; 0x494a1 $c6 + jr Route11GateUpstairsScriptEnd -Route11GateUpstairsText_494a3: ; 494a3 (12:54a3) +Route11GateUpstairsText_494a3: TX_FAR _Route11GateUpstairsText_494a3 db "@" -Route11GateUpstairsText3: ; 494a8 (12:54a8) - db $08 ; asm +Route11GateUpstairsText3: + TX_ASM ld a, [wSpriteStateData1 + 9] - cp $4 - jp nz, Route12GateUpstairsScript_495c9 - ld a, [wd7d8] - bit 7, a ; fought snorlax? + cp SPRITE_FACING_UP + jp nz, GateUpstairsScript_PrintIfFacingUp + CheckEvent EVENT_BEAT_ROUTE12_SNORLAX ld hl, BinocularsSnorlaxText jr z, .print ld hl, BinocularsNoSnorlaxText @@ -69,11 +66,11 @@ BinocularsNoSnorlaxText: TX_FAR _BinocularsNoSnorlaxText db "@" -Route11GateUpstairsText4: ; 494ce (12:54ce) - db $8 - ld hl, Route11GateUpstairsText_494d5 ; $54d5 - jp Route12GateUpstairsScript_495c9 +Route11GateUpstairsText4: + TX_ASM + ld hl, Route11GateUpstairsText_494d5 + jp GateUpstairsScript_PrintIfFacingUp -Route11GateUpstairsText_494d5: ; 494d5 (12:54d5) +Route11GateUpstairsText_494d5: TX_FAR _Route11GateUpstairsText_494d5 db "@" |