shithub: pokered

Download patch

ref: 451f7fce291cf038240f7b5cd4ce404b8222b6c7
parent: c9b778fb008ebc845219a2b787ea6beb04ae29f8
author: yenatch <yenatch@gmail.com>
date: Sat Feb 7 06:16:00 EST 2015

Pick off some more static map ids.

--- a/data/super_rod.asm
+++ b/data/super_rod.asm
@@ -25,16 +25,15 @@
 	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
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -80,7 +80,7 @@
 	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
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -71,7 +71,7 @@
 	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