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/Route15Gate2F.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/Route15Gate2F.asm')
| -rw-r--r-- | scripts/Route15Gate2F.asm | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/scripts/Route15Gate2F.asm b/scripts/Route15Gate2F.asm index 1b85e34e..0e04367b 100644 --- a/scripts/Route15Gate2F.asm +++ b/scripts/Route15Gate2F.asm @@ -2,10 +2,11 @@ Route15Gate2F_Script: jp DisableAutoTextBoxDrawing Route15Gate2F_TextPointers: - dw Route15GateUpstairsText1 - dw Route15GateUpstairsText2 + def_text_pointers + dw_const Route15Gate2FOaksAideText, TEXT_ROUTE15GATE2F_OAKS_AIDE + dw_const Route15Gate2FBinocularsText, TEXT_ROUTE15GATE2F_BINOCULARS -Route15GateUpstairsText1: +Route15Gate2FOaksAideText: text_asm CheckEvent EVENT_GOT_EXP_ALL jr nz, .got_item @@ -25,20 +26,20 @@ Route15GateUpstairsText1: jr nz, .no_item SetEvent EVENT_GOT_EXP_ALL .got_item - ld hl, Route15GateUpstairsText_4968c + ld hl, .ExpAllText call PrintText .no_item jp TextScriptEnd -Route15GateUpstairsText_4968c: - text_far _Route15GateUpstairsText_4968c +.ExpAllText: + text_far _Route15Gate2FOaksAideExpAllText text_end -Route15GateUpstairsText2: +Route15Gate2FBinocularsText: text_asm - ld hl, Route15GateUpstairsText_49698 + ld hl, .Text jp GateUpstairsScript_PrintIfFacingUp -Route15GateUpstairsText_49698: - text_far _Route15GateUpstairsText_49698 +.Text: + text_far _Route15Gate2FBinocularsText text_end |