diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2014-09-25 19:21:49 -0400 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2014-09-25 19:21:49 -0400 |
| commit | de39851f4a06da54856b1da36edf92e3ab9fb9cc (patch) | |
| tree | 407034e78decc6bd2f2848dd8a1c46a0020b8d35 /scripts/oakslab.asm | |
| parent | 070c9649645f564c081bfaedbe07b64191868e2d (diff) | |
Make Hide/Show objects more dynamic
be on the look out for more static ids in the wild
unused constants are still included because a
script could be written to check whether the player
has picked up an item/fought a legendary etc.
Diffstat (limited to 'scripts/oakslab.asm')
| -rwxr-xr-x | scripts/oakslab.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 574c6814..6b7d5e1e 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -38,7 +38,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e) ld a, [wNPCMovementScriptFunctionNum] and a ret nz - ld a, $31 + ld a, HS_OAKS_LAB_OAK_2 ld [wcc4d], a predef ShowObject ld hl, wd72e @@ -65,10 +65,10 @@ OaksLabScript2: ; 1cb82 (7:4b82) ld a, [wd730] bit 0, a ret nz - ld a, $31 + ld a, HS_OAKS_LAB_OAK_2 ld [wcc4d], a predef HideObject - ld a, $2e + ld a, HS_OAKS_LAB_OAK_1 ld [wcc4d], a predef ShowObject @@ -280,15 +280,15 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld a, [wTrainerEngageDistance] cp $2 jr nz, .asm_1cd28 ; 0x1cd22 $4 - ld a, $2b + ld a, HS_STARTER_BALL_1 jr .asm_1cd32 ; 0x1cd26 $a .asm_1cd28 cp $3 jr nz, .asm_1cd30 ; 0x1cd2a $4 - ld a, $2c + ld a, HS_STARTER_BALL_2 jr .asm_1cd32 ; 0x1cd2e $2 .asm_1cd30 - ld a, $2d + ld a, HS_STARTER_BALL_3 .asm_1cd32 ld [wcc4d], a predef HideObject @@ -445,7 +445,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d) ld a, [wd730] bit 0, a jr nz, .asm_1ce8c ; 0x1ce72 $18 - ld a, $2a + ld a, HS_OAKS_LAB_RIVAL ld [wcc4d], a predef HideObject xor a @@ -488,7 +488,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0) ld [$ff8c], a call DisplayTextID call OaksLabScript_1d02b - ld a, $2a + ld a, HS_OAKS_LAB_RIVAL ld [wcc4d], a predef ShowObject ld a, [wNPCMovementDirections2Index] @@ -547,10 +547,10 @@ OaksLabScript16: ; 1cf12 (7:4f12) ld [$ff8c], a call DisplayTextID call Delay3 - ld a, $2f + ld a, HS_POKEDEX_1 ld [wcc4d], a predef HideObject - ld a, $30 + ld a, HS_POKEDEX_2 ld [wcc4d], a predef HideObject call OaksLabScript_1cefd @@ -570,10 +570,10 @@ OaksLabScript16: ; 1cf12 (7:4f12) set 5, [hl] ld hl, wd74e set 0, [hl] - ld a, $1 + ld a, HS_LYING_OLD_MAN ld [wcc4d], a predef HideObject - ld a, $2 + ld a, HS_OLD_MAN ld [wcc4d], a predef ShowObject ld a, [wd157] @@ -601,14 +601,14 @@ OaksLabScript17: ; 1cfd4 (7:4fd4) bit 0, a ret nz call PlayDefaultMusic - ld a, $2a + ld a, HS_OAKS_LAB_RIVAL ld [wcc4d], a predef HideObject ld hl, wd7eb set 0, [hl] res 1, [hl] set 7, [hl] - ld a, $22 + ld a, HS_ROUTE_22_RIVAL_1 ld [wcc4d], a predef ShowObject ld a, $5 @@ -880,15 +880,15 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3) ld a, [wSpriteIndex] cp $2 jr nz, asm_1d1db ; 0x1d1d5 $4 - ld a, $2b + ld a, HS_STARTER_BALL_1 jr asm_1d1e5 ; 0x1d1d9 $a asm_1d1db: ; 1d1db (7:51db) cp $3 jr nz, asm_1d1e3 ; 0x1d1dd $4 - ld a, $2c + ld a, HS_STARTER_BALL_2 jr asm_1d1e5 ; 0x1d1e1 $2 asm_1d1e3: ; 1d1e3 (7:51e3) - ld a, $2d + ld a, HS_STARTER_BALL_3 asm_1d1e5: ; 1d1e5 (7:51e5) ld [wcc4d], a predef HideObject |