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/pokemontower7.asm | |
| parent | 519dd7fd56c4688ead80e444d945fc188cea5b66 (diff) | |
| parent | 0991bd3abed50f4d249da1ef38d77cd5cd39a77e (diff) | |
Merge branch 'master' of https://github.com/dannye/pokered
Diffstat (limited to 'scripts/pokemontower7.asm')
| -rwxr-xr-x | scripts/pokemontower7.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index cc736a08..5f0ed521 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -66,7 +66,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56) PokemonTower7Script4: ; 60d86 (18:4d86) ld a, $ff ld [wJoyIgnore], a - ld a, $43 + ld a, HS_POKEMONTOWER_7_MR_FUJI ld [wcc4d], a predef HideObject ld a, $4 @@ -222,13 +222,13 @@ PokemonTower7Text4: ; 60e8a (18:4e8a) set 7, [hl] ld hl, wd769 set 7, [hl] - ld a, $44 + ld a, HS_LAVENDER_HOUSE_1_MR_FUJI ld [wcc4d], a predef ShowObject - ld a, $17 + ld a, HS_SAFFRON_CITY_E ld [wcc4d], a predef HideObject - ld a, $18 + ld a, HS_SAFFRON_CITY_F ld [wcc4d], a predef ShowObject ld a, $4 |