Bank3d addresses and fixes.

Also documentation of new super rod code and slight more documentation
of multiply_divide.asm

1 files changed, 33 insertions, 100 deletions

diff --git a/data/super_rod.asm b/data/super_rod.asm
index 2b0646fc..cacb8ffd 100755
--- a/data/super_rod.asm
+++ b/data/super_rod.asm
@@ -1,100 +1,33 @@
-; super rod data
-; format: map, pointer to fishing group
-SuperRodData: ; e919 (3:6919)
-	dbw PALLET_TOWN, FishingGroup1
-	dbw VIRIDIAN_CITY, FishingGroup1
-	dbw CERULEAN_CITY, FishingGroup3
-	dbw VERMILION_CITY, FishingGroup4
-	dbw CELADON_CITY, FishingGroup5
-	dbw FUCHSIA_CITY, FishingGroup10
-	dbw CINNABAR_ISLAND, FishingGroup8
-	dbw ROUTE_4, FishingGroup3
-	dbw ROUTE_6, FishingGroup4
-	dbw ROUTE_10, FishingGroup5
-	dbw ROUTE_11, FishingGroup4
-	dbw ROUTE_12, FishingGroup7
-	dbw ROUTE_13, FishingGroup7
-	dbw ROUTE_17, FishingGroup7
-	dbw ROUTE_18, FishingGroup7
-	dbw ROUTE_19, FishingGroup8
-	dbw ROUTE_20, FishingGroup8
-	dbw ROUTE_21, FishingGroup8
-	dbw ROUTE_22, FishingGroup2
-	dbw ROUTE_23, FishingGroup9
-	dbw ROUTE_24, FishingGroup3
-	dbw ROUTE_25, FishingGroup3
-	dbw CERULEAN_GYM, FishingGroup3
-	dbw VERMILION_DOCK, FishingGroup4
-	dbw SEAFOAM_ISLANDS_4, FishingGroup8
-	dbw SEAFOAM_ISLANDS_5, FishingGroup8
-	dbw SAFARI_ZONE_EAST, FishingGroup6
-	dbw SAFARI_ZONE_NORTH, FishingGroup6
-	dbw SAFARI_ZONE_WEST, FishingGroup6
-	dbw SAFARI_ZONE_CENTER, FishingGroup6
-	dbw UNKNOWN_DUNGEON_2, FishingGroup9
-	dbw UNKNOWN_DUNGEON_3, FishingGroup9
-	dbw UNKNOWN_DUNGEON_1, FishingGroup9
-	db $FF
-
-; fishing groups
-; number of monsters, followed by level/monster pairs
-FishingGroup1: ; e97d (3:697d)
-	db 2
-	db 15,TENTACOOL
-	db 15,POLIWAG
-
-FishingGroup2: ; e982 (3:6982)
-	db 2
-	db 15,GOLDEEN
-	db 15,POLIWAG
-
-FishingGroup3: ; e987 (3:6987)
-	db 3
-	db 15,PSYDUCK
-	db 15,GOLDEEN
-	db 15,KRABBY
-
-FishingGroup4: ; e98e (3:698e)
-	db 2
-	db 15,KRABBY
-	db 15,SHELLDER
-
-FishingGroup5: ; e993 (3:6993)
-	db 2
-	db 23,POLIWHIRL
-	db 15,SLOWPOKE
-
-FishingGroup6: ; e998 (3:6998)
-	db 4
-	db 15,DRATINI
-	db 15,KRABBY
-	db 15,PSYDUCK
-	db 15,SLOWPOKE
-
-FishingGroup7: ; e9a1 (3:69a1)
-	db 4
-	db 5,TENTACOOL
-	db 15,KRABBY
-	db 15,GOLDEEN
-	db 15,MAGIKARP
-
-FishingGroup8: ; e9aa (3:69aa)
-	db 4
-	db 15,STARYU
-	db 15,HORSEA
-	db 15,SHELLDER
-	db 15,GOLDEEN
-
-FishingGroup9: ; e9b3 (3:69b3)
-	db 4
-	db 23,SLOWBRO
-	db 23,SEAKING
-	db 23,KINGLER
-	db 23,SEADRA
-
-FishingGroup10: ; e9bc (3:69bc)
-	db 4
-	db 23,SEAKING
-	db 15,KRABBY
-	db 15,GOLDEEN
-	db 15,MAGIKARP
+FishingSlots:: ; f5eda (3d:5eda)
+	db PALLET_TOWN,STARYU,10,TENTACOOL,10,STARYU,5,TENTACOOL,20
+	db VIRIDIAN_CITY,POLIWAG,5,POLIWAG,10,POLIWAG,15,POLIWAG,10
+	db CERULEAN_CITY,GOLDEEN,25,GOLDEEN,30,SEAKING,30,SEAKING,40
+	db VERMILION_CITY,TENTACOOL,15,TENTACOOL,20,TENTACOOL,10,HORSEA,5
+	db CELADON_CITY,GOLDEEN,5,GOLDEEN,10,GOLDEEN,15,GOLDEEN,20
+	db FUCHSIA_CITY,MAGIKARP,5,MAGIKARP,10,MAGIKARP,15,GYARADOS,15
+	db CINNABAR_ISLAND,STARYU,15,TENTACOOL,15,STARYU,10,TENTACOOL,30
+	db ROUTE_4,GOLDEEN,20,GOLDEEN,25,GOLDEEN,30,SEAKING,30
+	db ROUTE_6,GOLDEEN,5,GOLDEEN,10,GOLDEEN,15,GOLDEEN,20
+	db ROUTE_24,GOLDEEN,20,GOLDEEN,25,GOLDEEN,30,SEAKING,30
+	db ROUTE_25,KRABBY,10,KRABBY,15,KINGLER,15,KINGLER,25
+	db ROUTE_10,KRABBY,15,KRABBY,20,HORSEA,10,KINGLER,25
+	db ROUTE_11,TENTACOOL,15,TENTACOOL,20,TENTACOOL,10,HORSEA,5
+	db ROUTE_12,HORSEA,20,HORSEA,25,SEADRA,25,SEADRA,35
+	db ROUTE_13,HORSEA,15,HORSEA,20,TENTACOOL,10,SEADRA,20
+	db ROUTE_17,TENTACOOL,5,TENTACOOL,15,SHELLDER,25,SHELLDER,35
+	db ROUTE_18,TENTACOOL,15,SHELLDER,20,SHELLDER,30,SHELLDER,40
+	db ROUTE_19,TENTACOOL,15,STARYU,20,TENTACOOL,30,TENTACRUEL,30
+	db ROUTE_20,TENTACOOL,20,TENTACRUEL,20,STARYU,30,TENTACRUEL,40
+	db ROUTE_21,TENTACOOL,15,STARYU,20,TENTACOOL,30,TENTACRUEL,30
+	db ROUTE_22,POLIWAG,5,POLIWAG,10,POLIWAG,15,POLIWHIRL,15
+	db ROUTE_23,POLIWAG,25,POLIWAG,30,POLIWHIRL,30,POLIWHIRL,40
+	db VERMILION_DOCK,TENTACOOL,10,TENTACOOL,15,STARYU,15,SHELLDER,10
+	db SAFARI_ZONE_CENTER,MAGIKARP,5,MAGIKARP,10,DRATINI,10,DRAGONAIR,15
+	db SAFARI_ZONE_EAST,MAGIKARP,5,MAGIKARP,10,MAGIKARP,15,DRATINI,15
+	db SAFARI_ZONE_NORTH,MAGIKARP,5,MAGIKARP,10,MAGIKARP,15,DRATINI,15
+	db SAFARI_ZONE_WEST,MAGIKARP,5,MAGIKARP,10,MAGIKARP,15,DRATINI,15
+	db SEAFOAM_ISLANDS_4,KRABBY,25,STARYU,20,KINGLER,35,STARYU,40
+	db SEAFOAM_ISLANDS_5,KRABBY,25,STARYU,20,KINGLER,35,STARYU,40
+	db UNKNOWN_DUNGEON_2,GOLDEEN,25,SEAKING,35,SEAKING,45,SEAKING,55
+	db UNKNOWN_DUNGEON_3,GOLDEEN,30,SEAKING,40,SEAKING,50,SEAKING,60
+	db $ff
\ No newline at end of file