diff options
| author | YamaArashi <shadow962@live.com> | 2015-08-07 04:24:06 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-08-07 04:24:06 -0700 |
| commit | 525f1b96f390a7b7625574405cad56277f200ef3 (patch) | |
| tree | a715da91e46ebd5ba8a2e5eb808f49cf7ff854a2 /scripts | |
| parent | 8d30191707758a36b513c4368b9fdb7705730865 (diff) | |
named CountSetBits output variable
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/celadonmansion3.asm | 2 | ||||
| -rwxr-xr-x | scripts/oakslab.asm | 4 | ||||
| -rwxr-xr-x | scripts/route11gateupstairs.asm | 8 | ||||
| -rwxr-xr-x | scripts/route15gateupstairs.asm | 8 | ||||
| -rwxr-xr-x | scripts/route2gate.asm | 8 |
5 files changed, 15 insertions, 15 deletions
diff --git a/scripts/celadonmansion3.asm b/scripts/celadonmansion3.asm index 0dadd20a..11a8646d 100755 --- a/scripts/celadonmansion3.asm +++ b/scripts/celadonmansion3.asm @@ -30,7 +30,7 @@ DirectorText: ; 487b2 (12:47b2) ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits - ld a, [wd11e] + ld a, [wNumSetBits] cp 150 jr nc, .CompletedDex ld hl, .GameDesigner diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 996ab754..c52f00cf 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -969,8 +969,8 @@ OaksLabText5: ; 1d248 (7:5248) ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits - ld a, [wd11e] - cp $2 + ld a, [wNumSetBits] + cp 2 jr c, .asm_1d279 CheckEvent EVENT_GOT_POKEDEX jr z, .asm_1d279 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 diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm index cedabdc0..0fc806da 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/route15gateupstairs.asm @@ -10,17 +10,17 @@ Route15GateUpstairsText1: ; 49651 (12:5651) CheckEvent EVENT_GOT_EXP_ALL jr nz, .asm_49683 ld a, 50 ; pokemon needed - ld [$ffdb], a + ld [hOaksAideRequirement], a ld a, EXP__ALL ; oak's aide reward - ld [$ffdc], a + ld [hOaksAideItemReward], a ld [wd11e], a call GetItemName ld hl, wcd6d ld de, wcc5b ld bc, $000d call CopyData - predef OaksAideScript ; call oak's aide script - ld a, [$ffdb] + predef OaksAideScript + ld a, [hOaksAideResult] cp $1 jr nz, .asm_49689 SetEvent EVENT_GOT_EXP_ALL diff --git a/scripts/route2gate.asm b/scripts/route2gate.asm index 789482dc..65d53bc7 100755 --- a/scripts/route2gate.asm +++ b/scripts/route2gate.asm @@ -10,17 +10,17 @@ Route2GateText1: ; 5d5db (17:55db) CheckEvent EVENT_GOT_HM05 jr nz, .asm_5d60d ld a, 10 ; pokemon needed - ld [$ffdb], a + ld [hOaksAideRequirement], a ld a, HM_05 ; oak's aide reward - ld [$ffdc], a + ld [hOaksAideItemReward], a ld [wd11e], a call GetItemName ld hl, wcd6d ld de, wcc5b ld bc, $000d call CopyData - predef OaksAideScript ; call oak's aide script - ld a, [$ffdb] + predef OaksAideScript + ld a, [hOaksAideResult] cp $1 jr nz, .asm_5d613 SetEvent EVENT_GOT_HM05 |