diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-08-10 00:00:12 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-08-10 00:00:12 -0500 |
| commit | 66bc517605860c9f716a176ed467d34097985895 (patch) | |
| tree | 4c126cbb3bbdb2b0a236375c2140e7a6c25260a6 /scripts/route11gateupstairs.asm | |
| parent | Replace some hardcoded data sizes (diff) | |
| parent | commented audio code (diff) | |
| download | pokeyellow-66bc517605860c9f716a176ed467d34097985895.tar.gz pokeyellow-66bc517605860c9f716a176ed467d34097985895.tar.xz pokeyellow-66bc517605860c9f716a176ed467d34097985895.zip | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Diffstat (limited to 'scripts/route11gateupstairs.asm')
| -rwxr-xr-x | scripts/route11gateupstairs.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm index 9bae1398..a1906c5d 100755 --- a/scripts/route11gateupstairs.asm +++ b/scripts/route11gateupstairs.asm @@ -20,9 +20,9 @@ Route11GateUpstairsText2: ; 4946c (12:546c) CheckEvent EVENT_GOT_ITEMFINDER, 1 jr c, .asm_4949b ld a, 30 ; pokemon needed - ld [$ffdb], a + ld [hOaksAideRequirement], a ld a, ITEMFINDER ; oak's aide reward - ld [$ffdc], a + ld [hOaksAideItemReward], a ld [wd11e], a call GetItemName ld h, d @@ -30,8 +30,8 @@ Route11GateUpstairsText2: ; 4946c (12:546c) ld de, wcc5b ld bc, $000d call CopyData - predef OaksAideScript ; call oak's aide script - ld a, [$ffdb] + predef OaksAideScript + ld a, [hOaksAideResult] dec a jr nz, .asm_494a1 SetEvent EVENT_GOT_ITEMFINDER |