From 5c181f2d68525ec0ce58dc06accf12d528bcf046 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sat, 10 Oct 2015 16:54:00 -0400 Subject: More bank3 documentation LoadWildData, data/wild_mons.asm, also no more wram_constants.asm and complete bank1b documentation --- data/wildPokemon/mtmoonb1.asm | 10 +++++----- data/wildPokemon/pokemontower5.asm | 2 +- data/wildPokemon/pokemontower7.asm | 2 +- data/wildPokemon/route19.asm | 15 +++++++++++++++ data/wildPokemon/route20.asm | 15 +++++++++++++++ data/wildPokemon/waterpokemon.asm | 15 --------------- data/wild_mons.asm | 9 +++++---- 7 files changed, 42 insertions(+), 26 deletions(-) create mode 100644 data/wildPokemon/route19.asm create mode 100644 data/wildPokemon/route20.asm delete mode 100755 data/wildPokemon/waterpokemon.asm (limited to 'data') diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wildPokemon/mtmoonb1.asm index fd75f72b..61c0b05c 100755 --- a/data/wildPokemon/mtmoonb1.asm +++ b/data/wildPokemon/mtmoonb1.asm @@ -2,13 +2,13 @@ MoonMonsB1: db $0A db 8,ZUBAT db 9,ZUBAT - db 10,GEODUDE - db 6,ZUBAT - db 7,ZUBAT db 10,ZUBAT db 10,GEODUDE + db 11,GEODUDE db 11,ZUBAT - db 12,SANDSHREW - db 11,CLEFAIRY + db 9,PARAS + db 11,PARAS + db 10,CLEFAIRY + db 12,CLEFAIRY db $00 diff --git a/data/wildPokemon/pokemontower5.asm b/data/wildPokemon/pokemontower5.asm index b6c34941..55fe2e27 100755 --- a/data/wildPokemon/pokemontower5.asm +++ b/data/wildPokemon/pokemontower5.asm @@ -1,5 +1,5 @@ TowerMons5: - db $0A + db $0F db 22,GASTLY db 23,GASTLY db 24,GASTLY diff --git a/data/wildPokemon/pokemontower7.asm b/data/wildPokemon/pokemontower7.asm index 9b99d518..34ca6225 100755 --- a/data/wildPokemon/pokemontower7.asm +++ b/data/wildPokemon/pokemontower7.asm @@ -1,5 +1,5 @@ TowerMons7: - db $0F + db $14 db 24,GASTLY db 25,GASTLY db 26,GASTLY diff --git a/data/wildPokemon/route19.asm b/data/wildPokemon/route19.asm new file mode 100644 index 00000000..77e1e3ef --- /dev/null +++ b/data/wildPokemon/route19.asm @@ -0,0 +1,15 @@ +Route19Mons: + db $00 + + db $05 + db 5,TENTACOOL + db 10,TENTACOOL + db 15,TENTACOOL + db 5,TENTACOOL + db 10,TENTACOOL + db 15,TENTACOOL + db 20,TENTACOOL + db 30,TENTACOOL + db 35,TENTACOOL + db 40,TENTACOOL + diff --git a/data/wildPokemon/route20.asm b/data/wildPokemon/route20.asm new file mode 100644 index 00000000..b955c330 --- /dev/null +++ b/data/wildPokemon/route20.asm @@ -0,0 +1,15 @@ +Route20Mons: + db $00 + + db $05 + db 5,TENTACOOL + db 10,TENTACOOL + db 15,TENTACOOL + db 5,TENTACOOL + db 10,TENTACOOL + db 15,TENTACOOL + db 20,TENTACOOL + db 30,TENTACOOL + db 35,TENTACOOL + db 40,TENTACOOL + diff --git a/data/wildPokemon/waterpokemon.asm b/data/wildPokemon/waterpokemon.asm deleted file mode 100755 index ef2d39ea..00000000 --- a/data/wildPokemon/waterpokemon.asm +++ /dev/null @@ -1,15 +0,0 @@ -WaterMons: - db $00 - - db $05 - db 5,TENTACOOL - db 10,TENTACOOL - db 15,TENTACOOL - db 5,TENTACOOL - db 10,TENTACOOL - db 15,TENTACOOL - db 20,TENTACOOL - db 30,TENTACOOL - db 35,TENTACOOL - db 40,TENTACOOL - diff --git a/data/wild_mons.asm b/data/wild_mons.asm index e1c81b8b..15cbccc7 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -1,4 +1,4 @@ -WildDataPointers: ; ceeb (3:4eeb) +WildDataPointers: ; cb95 (3:4b95) dw NoMons ; PALLET_TOWN dw NoMons ; VIRIDIAN_CITY dw NoMons ; PEWTER_CITY @@ -29,8 +29,8 @@ WildDataPointers: ; ceeb (3:4eeb) dw Route16Mons ; ROUTE_16 dw Route17Mons ; ROUTE_17 dw Route18Mons ; ROUTE_18 - dw WaterMons ; ROUTE_19 - dw WaterMons ; ROUTE_20 + dw Route19Mons ; ROUTE_19 + dw Route20Mons ; ROUTE_20 dw Route21Mons ; ROUTE_21 dw Route22Mons ; ROUTE_22 dw Route23Mons ; ROUTE_23 @@ -300,7 +300,8 @@ INCLUDE "data/wildPokemon/safarizonecenter.asm" INCLUDE "data/wildPokemon/safarizone1.asm" INCLUDE "data/wildPokemon/safarizone2.asm" INCLUDE "data/wildPokemon/safarizone3.asm" -INCLUDE "data/wildPokemon/waterpokemon.asm" +INCLUDE "data/wildPokemon/route19.asm" +INCLUDE "data/wildPokemon/route20.asm" INCLUDE "data/wildPokemon/seafoamisland1.asm" INCLUDE "data/wildPokemon/seafoamislandb1.asm" INCLUDE "data/wildPokemon/seafoamislandb2.asm" -- cgit v1.2.3