diff options
| author | IIMarckus <iimarckus@gmail.com> | 2014-10-20 18:56:21 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2014-10-20 18:56:21 -0600 |
| commit | 5459477ecd3c60342f31881343bc921b41b94eb0 (patch) | |
| tree | aed48bfac6aee9ccad16d3de004c1014550bacd5 /scripts/route25.asm | |
| parent | 519dd7fd56c4688ead80e444d945fc188cea5b66 (diff) | |
| parent | 0991bd3abed50f4d249da1ef38d77cd5cd39a77e (diff) | |
Merge branch 'master' of https://github.com/dannye/pokered
Diffstat (limited to 'scripts/route25.asm')
| -rwxr-xr-x | scripts/route25.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/route25.asm b/scripts/route25.asm index 720259ca..b915bdee 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -19,20 +19,20 @@ Route25Script_515e1: ; 515e1 (14:55e1) bit 5, [hl] jr nz, .asm_515ff res 6, [hl] - ld a, $61 + ld a, HS_BILL_POKEMON ld [wcc4d], a predef_jump ShowObject .asm_515ff bit 4, [hl] ret z set 7, [hl] - ld a, $24 + ld a, HS_NUGGET_BRIDGE_GUY ld [wcc4d], a predef HideObject - ld a, $62 + ld a, HS_BILL_1 ld [wcc4d], a predef HideObject - ld a, $63 + ld a, HS_BILL_2 ld [wcc4d], a predef_jump ShowObject |