diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-16 17:00:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 17:00:57 -0400 |
| commit | d44c7c305c3f94b59e3e2c008408779836a0020a (patch) | |
| tree | 2cdc51be4a22992701038b959d6c964e9ee8fc58 /scripts/Route12Gate2F.asm | |
| parent | b9a113a9f4712771e37313a4c8a76f7ef23cebb2 (diff) | |
| parent | 7306c1dc2dca5666a5276a6758d1a64e1ddeae20 (diff) | |
Merge pull request #277 from Rangi42/master
Miscellaneous constant and label updates
Diffstat (limited to 'scripts/Route12Gate2F.asm')
| -rwxr-xr-x | scripts/Route12Gate2F.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/Route12Gate2F.asm b/scripts/Route12Gate2F.asm index a7e426c9..2174fba8 100755 --- a/scripts/Route12Gate2F.asm +++ b/scripts/Route12Gate2F.asm @@ -9,24 +9,24 @@ Route12Gate2F_TextPointers: Route12GateUpstairsText1: text_asm CheckEvent EVENT_GOT_TM39, 1 - jr c, .asm_0ad3c + jr c, .got_item ld hl, TM39PreReceiveText call PrintText lb bc, TM_SWIFT, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, ReceivedTM39Text call PrintText SetEvent EVENT_GOT_TM39 - jr .asm_4ba56 -.BagFull + jr .done +.bag_full ld hl, TM39NoRoomText call PrintText - jr .asm_4ba56 -.asm_0ad3c + jr .done +.got_item ld hl, TM39ExplanationText call PrintText -.asm_4ba56 +.done jp TextScriptEnd TM39PreReceiveText: @@ -68,7 +68,7 @@ GateUpstairsScript_PrintIfFacingUp: ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP jr z, .up - ld a, $1 + ld a, TRUE jr .done .up call PrintText |