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/Route15Gate2F.asm | |
| parent | 58f10893707004fe353422e19f3d1f2b89e60a6c (diff) | |
Revise some map scripts, mostly for getting items
Diffstat (limited to 'scripts/Route15Gate2F.asm')
| -rwxr-xr-x | scripts/Route15Gate2F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/Route15Gate2F.asm b/scripts/Route15Gate2F.asm index 9887fbc1..1b85e34e 100755 --- a/scripts/Route15Gate2F.asm +++ b/scripts/Route15Gate2F.asm @@ -8,10 +8,10 @@ Route15Gate2F_TextPointers: Route15GateUpstairsText1: text_asm CheckEvent EVENT_GOT_EXP_ALL - jr nz, .asm_49683 - ld a, 50 ; pokemon needed + jr nz, .got_item + ld a, 50 ldh [hOaksAideRequirement], a - ld a, EXP_ALL ; oak's aide reward + ld a, EXP_ALL ldh [hOaksAideRewardItem], a ld [wd11e], a call GetItemName @@ -21,13 +21,13 @@ Route15GateUpstairsText1: call CopyData predef OaksAideScript ldh a, [hOaksAideResult] - cp $1 - jr nz, .asm_49689 + cp OAKS_AIDE_GOT_ITEM + jr nz, .no_item SetEvent EVENT_GOT_EXP_ALL -.asm_49683 +.got_item ld hl, Route15GateUpstairsText_4968c call PrintText -.asm_49689 +.no_item jp TextScriptEnd Route15GateUpstairsText_4968c: |