diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-16 11:19:05 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-16 11:19:05 -0400 |
commit | 594c58a289cbad3954899d76ed000f483389472f (patch) | |
tree | 31c04c8930d25b68819d47b627a252ec271be849 /scripts/Route12Gate2F.asm | |
parent | 58f10893707004fe353422e19f3d1f2b89e60a6c (diff) |
Revise some map scripts, mostly for getting items
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 |