diff options
| author | yenatch <yenatch@gmail.com> | 2015-02-07 11:16:00 -0800 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-02-07 11:18:28 -0800 |
| commit | 451f7fce291cf038240f7b5cd4ce404b8222b6c7 (patch) | |
| tree | 32b69e3cdf64e5a578b205f1580f06ed7c488fb6 | |
| parent | c9b778fb008ebc845219a2b787ea6beb04ae29f8 (diff) | |
Pick off some more static map ids.
| -rwxr-xr-x | data/super_rod.asm | 15 | ||||
| -rwxr-xr-x | engine/hidden_object_functions7.asm | 2 | ||||
| -rwxr-xr-x | scripts/pokemontower7.asm | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/data/super_rod.asm b/data/super_rod.asm index ead970d8..2b0646fc 100755 --- a/data/super_rod.asm +++ b/data/super_rod.asm @@ -25,16 +25,15 @@ SuperRodData: ; e919 (3:6919) dbw ROUTE_25, FishingGroup3 dbw CERULEAN_GYM, FishingGroup3 dbw VERMILION_DOCK, FishingGroup4 -;XXX syntax errors on the rest? - dbw $A1, FishingGroup8 ; SEAFOAM_ISLANDS_4 - dbw $A2, FishingGroup8 ; SEAFOAM_ISLANDS_5 + dbw SEAFOAM_ISLANDS_4, FishingGroup8 + dbw SEAFOAM_ISLANDS_5, FishingGroup8 dbw SAFARI_ZONE_EAST, FishingGroup6 - dbw $DA, FishingGroup6 ; SAFARI_ZONE_NORTH + dbw SAFARI_ZONE_NORTH, FishingGroup6 dbw SAFARI_ZONE_WEST, FishingGroup6 - dbw $DC, FishingGroup6 ; SAFARI_ZONE_CENTER - dbw $E2, FishingGroup9 ; UNKNOWN_DUNGEON_2 - dbw $E3, FishingGroup9 ; UNKNOWN_DUNGEON_3 - dbw $E4, FishingGroup9 ; UNKNOWN_DUNGEON_1 + dbw SAFARI_ZONE_CENTER, FishingGroup6 + dbw UNKNOWN_DUNGEON_2, FishingGroup9 + dbw UNKNOWN_DUNGEON_3, FishingGroup9 + dbw UNKNOWN_DUNGEON_1, FishingGroup9 db $FF ; fishing groups diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 012e941d..f97190de 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -80,7 +80,7 @@ asm_1e9b0: ; 1e9b0 (7:69b0) call DisplayTextID xor a ld [wd528], a - ld a, $9c + ld a, SAFARI_ZONE_ENTRANCE ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld a, $3 ld [wDestinationWarpID], a diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 4d1012b7..ab42121d 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -71,7 +71,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86) predef HideObject ld a, $4 ld [wSpriteStateData1 + 9], a - ld a, $95 + ld a, LAVENDER_HOUSE_1 ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld a, $1 ld [wDestinationWarpID], a |