diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/Route11Gate2F.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/Route11Gate2F.asm')
| -rw-r--r-- | scripts/Route11Gate2F.asm | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/scripts/Route11Gate2F.asm b/scripts/Route11Gate2F.asm index 4026dbc9..da690ad6 100644 --- a/scripts/Route11Gate2F.asm +++ b/scripts/Route11Gate2F.asm @@ -2,20 +2,21 @@ Route11Gate2F_Script: jp DisableAutoTextBoxDrawing Route11Gate2F_TextPointers: - dw Route11GateUpstairsText1 - dw Route11GateUpstairsText2 - dw Route11GateUpstairsText3 - dw Route11GateUpstairsText4 + def_text_pointers + dw_const Route11Gate2FYoungsterText, TEXT_ROUTE11GATE2F_YOUNGSTER + dw_const Route11Gate2FOaksAideText, TEXT_ROUTE11GATE2F_OAKS_AIDE + dw_const Route11Gate2FLeftBinocularsText, TEXT_ROUTE11GATE2F_LEFT_BINOCULARS + dw_const Route11Gate2FRightBinocularsText, TEXT_ROUTE11GATE2F_RIGHT_BINOCULARS -Route11GateUpstairsText1: +Route11Gate2FYoungsterText: text_asm ld a, TRADE_FOR_GURIO ld [wWhichTrade], a predef DoInGameTradeDialogue -Route11GateUpstairsScriptEnd: +Route11Gate2FScriptEnd: jp TextScriptEnd -Route11GateUpstairsText2: +Route11Gate2FOaksAideText: text_asm CheckEvent EVENT_GOT_ITEMFINDER, 1 jr c, .got_item @@ -36,41 +37,41 @@ Route11GateUpstairsText2: jr nz, .no_item SetEvent EVENT_GOT_ITEMFINDER .got_item - ld hl, Route11GateUpstairsText_494a3 + ld hl, .ItemfinderDescriptionText call PrintText .no_item - jr Route11GateUpstairsScriptEnd + jr Route11Gate2FScriptEnd -Route11GateUpstairsText_494a3: - text_far _Route11GateUpstairsText_494a3 +.ItemfinderDescriptionText: + text_far _Route11Gate2FOaksAideItemfinderDescriptionText text_end -Route11GateUpstairsText3: +Route11Gate2FLeftBinocularsText: text_asm ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP jp nz, GateUpstairsScript_PrintIfFacingUp CheckEvent EVENT_BEAT_ROUTE12_SNORLAX - ld hl, BinocularsSnorlaxText + ld hl, .SnorlaxText jr z, .print - ld hl, BinocularsNoSnorlaxText + ld hl, .NoSnorlaxText .print call PrintText jp TextScriptEnd -BinocularsSnorlaxText: - text_far _BinocularsSnorlaxText +.SnorlaxText: + text_far _Route11Gate2FLeftBinocularsSnorlaxText text_end -BinocularsNoSnorlaxText: - text_far _BinocularsNoSnorlaxText +.NoSnorlaxText: + text_far _Route11Gate2FLeftBinocularsNoSnorlaxText text_end -Route11GateUpstairsText4: +Route11Gate2FRightBinocularsText: text_asm - ld hl, Route11GateUpstairsText_494d5 + ld hl, .Text jp GateUpstairsScript_PrintIfFacingUp -Route11GateUpstairsText_494d5: - text_far _Route11GateUpstairsText_494d5 +.Text: + text_far _Route11Gate2FRightBinocularsText text_end |