Itemfinder and hidden item coords

3 files changed, 67 insertions, 68 deletions

diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm
index 54c785f5..051fdfe5 100755
--- a/data/hidden_item_coords.asm
+++ b/data/hidden_item_coords.asm
@@ -1,57 +1,58 @@
-HiddenItemCoords: ; 766b8 (1d:66b8)
+HiddenItemCoords: ; 75faa (1d:5faa)
 ; map ID, then coords
-	db VIRIDIAN_FOREST,$12,$01
-	db VIRIDIAN_FOREST,$2a,$10
-	db MT_MOON_3,$0c,$12
-	db ROUTE_25,$03,$26
-	db ROUTE_9,$07,$0e
-	db SS_ANNE_6,$09,$0d
-	db SS_ANNE_10,$01,$03
-	db ROUTE_10,$11,$09
-	db ROUTE_10,$35,$10
-	db ROCKET_HIDEOUT_1,$0f,$15
-	db ROCKET_HIDEOUT_3,$11,$1b
-	db ROCKET_HIDEOUT_4,$01,$19
-	db POKEMONTOWER_5,$0c,$04
-	db ROUTE_13,$0e,$01
-	db ROUTE_13,$0d,$10
-	db MANSION_4,$09,$01
-	db SAFARI_ZONE_ENTRANCE,$01,$0a
-	db SAFARI_ZONE_WEST,$05,$06
-	db SILPH_CO_5F,$03,$0c
-	db SILPH_CO_9F,$0f,$02
-	db COPYCATS_HOUSE_2F,$01,$01
-	db UNKNOWN_DUNGEON_1,$0b,$0e
-	db UNKNOWN_DUNGEON_3,$03,$1b
-	db POWER_PLANT,$10,$11
-	db POWER_PLANT,$01,$0c
-	db SEAFOAM_ISLANDS_3,$0f,$0f
-	db SEAFOAM_ISLANDS_5,$11,$19
-	db MANSION_1,$10,$08
-	db MANSION_3,$09,$01
-	db ROUTE_23,$2c,$09
-	db ROUTE_23,$46,$13
-	db ROUTE_23,$5a,$08
-	db VICTORY_ROAD_2,$02,$05
-	db VICTORY_ROAD_2,$07,$1a
-	db $6f,$0b,$0e
-	db VIRIDIAN_CITY,$04,$0e
-	db ROUTE_11,$05,$30
-	db ROUTE_12,$3f,$02
-	db ROUTE_17,$0e,$0f
-	db ROUTE_17,$2d,$08
-	db ROUTE_17,$48,$11
-	db ROUTE_17,$5b,$04
-	db ROUTE_17,$79,$08
-	db UNDERGROUND_PATH_NS,$04,$03
-	db UNDERGROUND_PATH_NS,$22,$04
-	db UNDERGROUND_PATH_WE,$02,$0c
-	db UNDERGROUND_PATH_WE,$05,$15
-	db CELADON_CITY,$0f,$30
-	db ROUTE_25,$01,$0a
-	db MT_MOON_3,$09,$21
-	db SEAFOAM_ISLANDS_4,$10,$09
-	db VERMILION_CITY,$0b,$0e
-	db CERULEAN_CITY,$08,$0f
-	db ROUTE_4,$03,$28
+	db SILPH_CO_5F, $03, $0c
+	db SILPH_CO_9F, $0f, $02
+	db MANSION_3, $09, $01
+	db MANSION_4, $09, $01
+	db SAFARI_ZONE_WEST, $05, $06
+	db UNKNOWN_DUNGEON_2, $0d, $10
+	db UNKNOWN_DUNGEON_3, $0e, $08
+	db UNUSED_MAP_6F, $0b, $0e
+	db SEAFOAM_ISLANDS_3, $0f, $0f
+	db SEAFOAM_ISLANDS_4, $10, $09
+	db SEAFOAM_ISLANDS_5, $11, $19
+	db VIRIDIAN_FOREST, $12, $01
+	db VIRIDIAN_FOREST, $2a, $10
+	db MT_MOON_3, $0c, $12
+	db MT_MOON_3, $09, $21
+	db SS_ANNE_10, $01, $03
+	db SS_ANNE_6, $09, $0d
+	db UNDERGROUND_PATH_NS, $04, $03
+	db UNDERGROUND_PATH_NS, $22, $04
+	db UNDERGROUND_PATH_WE, $02, $0c
+	db UNDERGROUND_PATH_WE, $05, $15
+	db ROCKET_HIDEOUT_1, $0f, $15
+	db ROCKET_HIDEOUT_3, $11, $1b
+	db ROCKET_HIDEOUT_4, $01, $19
+	db ROUTE_10, $11, $09
+	db ROUTE_10, $35, $10
+	db POWER_PLANT, $10, $11
+	db POWER_PLANT, $01, $0c
+	db ROUTE_11, $05, $30
+	db ROUTE_12, $3f, $02
+	db ROUTE_13, $0e, $01
+	db ROUTE_13, $0d, $10
+	db ROUTE_17, $0e, $0f
+	db ROUTE_17, $2d, $08
+	db ROUTE_17, $48, $11
+	db ROUTE_17, $5b, $04
+	db ROUTE_17, $79, $08
+	db ROUTE_23, $2c, $09
+	db ROUTE_23, $46, $13
+	db ROUTE_23, $5a, $08
+	db VICTORY_ROAD_2, $02, $05
+	db VICTORY_ROAD_2, $07, $1a
+	db ROUTE_25, $03, $26
+	db ROUTE_25, $01, $0a
+	db ROUTE_4, $03, $28
+	db ROUTE_9, $07, $0e
+	db COPYCATS_HOUSE_2F, $01, $01
+	db VIRIDIAN_CITY, $04, $0e
+	db CERULEAN_CITY, $08, $0f
+	db UNKNOWN_DUNGEON_1, $07, $12
+	db POKEMONTOWER_5, $0c, $04
+	db VERMILION_CITY, $0b, $0e
+	db CELADON_CITY, $0f, $30
+	db SAFARI_ZONE_ENTRANCE, $01, $0a
+	db MANSION_1, $10, $08
 	db $ff
diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm
index d638b0b8..7b479462 100755
--- a/engine/items/itemfinder.asm
+++ b/engine/items/itemfinder.asm
@@ -1,4 +1,4 @@
-HiddenItemNear: ; 7481f (1d:481f)
+HiddenItemNear: ; 7405c (1d:405c)
 	ld hl, HiddenItemCoords
 	ld b, 0
 .loop
@@ -43,7 +43,7 @@ HiddenItemNear: ; 7481f (1d:481f)
 	scf
 	ret
 
-Sub5ClampTo0: ; 7486b (1d:486b)
+Sub5ClampTo0: ; 740a8 (1d:40a8)
 ; subtract 5 but clamp to 0
 	sub 5
 	cp $f0
diff --git a/main.asm b/main.asm
index 988323fc..79b08454 100755
--- a/main.asm
+++ b/main.asm
@@ -835,12 +835,18 @@ INCLUDE "engine/save.asm"
 SECTION "bank1D",ROMX,BANK[$1D]
 
 	dr $74000,$7405c
-HiddenItemNear: ; 7405c (1d:405c)
-	dr $7405c,$74726
+
+INCLUDE "engine/items/itemfinder.asm"
+
+	dr $740af,$74726
 VendingMachineMenu: ; 74726 (1d:4726)
 	dr $74726,$75dfe
 PKMNLeaguePC: ; 75dfe (1d:5dfe)
-	dr $75dfe,$76177
+	dr $75dfe,$75faa
+
+INCLUDE "data/hidden_item_coords.asm"
+
+	dr $76050,$76177
 
 SECTION "bank1E",ROMX,BANK[$1E]
 
@@ -856,14 +862,6 @@ RedFishingTilesSide:  INCBIN "gfx/red_fishing_tile_side.2bpp"
 RedFishingRodTiles:   INCBIN "gfx/red_fishingrod_tiles.2bpp"
 
 INCLUDE "data/animations.asm"
-;AttackAnimationPointers: ; 7a22a (1e:622a)
-;	dr $7a22a,$7a915
-;SubanimationPointers: ; 7a915 (1e:6915)
-;	dr $7a915,$7b11c
-;FrameBlockPointers: ; 7b11c (1e:711c)
-;	dr $7b11c,$7be2d
-;FrameBlockBaseCoords: ; 7be2d (1e:7e2d)
-;	dr $7be2d,$7c000
 
 SECTION "bank2f",ROMX[$5000],BANK[$2F]