thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-26 20:30:31 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of yellow ifdefs in wild Pokémon.

Browse source
This commit is contained in:
IIMarckus 2016-02-12 21:10:58 -07:00
parent 360a2200b1
commit 757114cad2
59 changed files with 364 additions and 1514 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/wildPokemon/diglettscave.asm
View file

@ -11,4 +11,3 @@ CaveMons:
db 29,DUGTRIO
db 31,DUGTRIO
db $00

18
data/wildPokemon/mansion1.asm
View file

@ -12,8 +12,7 @@ MansionMons1:
db 37,WEEZING
db 39,MUK
ENDC
IF DEF(_GREEN) || DEF(_BLUE)
IF DEF(_BLUE)
db 32,GRIMER
db 30,GRIMER
db 34,PONYTA
@ -25,19 +24,4 @@ MansionMons1:
db 37,MUK
db 39,WEEZING
ENDC
IF DEF(_YELLOW)
db 34,RATTATA
db 34,RATICATE
db 23,GRIMER
db 26,GROWLITHE
db 37,RATTATA
db 37,RATICATE
db 30,GROWLITHE
db 26,GRIMER
db 34,GROWLITHE
db 38,GROWLITHE
ENDC
db $00

31
data/wildPokemon/mansion2.asm
View file

@ -12,8 +12,7 @@ MansionMons2:
db 39,WEEZING
db 37,MUK
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 32,VULPIX
db 34,GRIMER
db 34,GRIMER
@ -25,32 +24,4 @@ MansionMons2:
db 39,MUK
db 37,WEEZING
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 32,GROWLITHE
db 34,GRIMER
db 34,GRIMER
db 30,PONYTA
db 30,GRIMER
db 32,PONYTA
db 30,KOFFING
db 28,PONYTA
db 39,MUK
db 37,WEEZING
ENDC
IF DEF(_YELLOW)
db 37,RATTATA
db 37,RATICATE
db 26,GRIMER
db 29,GRIMER
db 40,RATTATA
db 40,RATICATE
db 32,GRIMER
db 35,GRIMER
db 35,MUK
db 38,MUK
ENDC
db $00

31
data/wildPokemon/mansion3.asm
View file

@ -12,8 +12,7 @@ MansionMons3:
db 36,PONYTA
db 42,MUK
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 31,GRIMER
db 33,VULPIX
db 35,GRIMER
@ -25,32 +24,4 @@ MansionMons3:
db 36,PONYTA
db 42,WEEZING
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 31,GRIMER
db 33,GROWLITHE
db 35,GRIMER
db 32,PONYTA
db 34,PONYTA
db 40,MUK
db 34,KOFFING
db 38,MUK
db 36,PONYTA
db 42,WEEZING
ENDC
IF DEF(_YELLOW)
db 40,RATTATA
db 40,RATICATE
db 32,GRIMER
db 35,GRIMER
db 43,RATTATA
db 43,RATICATE
db 38,GRIMER
db 38,GRIMER
db 38,MUK
db 41,MUK
ENDC
db $00

30
data/wildPokemon/mansionb1.asm
View file

@ -12,8 +12,7 @@ MansionMonsB1:
db 42,WEEZING
db 42,MUK
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 33,GRIMER
db 31,GRIMER
db 35,VULPIX
@ -25,31 +24,4 @@ MansionMonsB1:
db 38,MAGMAR
db 42,WEEZING
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 33,GRIMER
db 31,GRIMER
db 35,GROWLITHE
db 32,PONYTA
db 31,GRIMER
db 40,MUK
db 34,PONYTA
db 35,KOFFING
db 38,MUK
db 42,WEEZING
ENDC
IF DEF(_YELLOW)
db 35,GRIMER
db 38,GRIMER
db 37,RATICATE
db 40,RATICATE
db 41,MUK
db 43,RATICATE
db 24,DITTO
db 46,RATICATE
db 18,DITTO
db 12,DITTO
ENDC
db $00

34
data/wildPokemon/mtmoon1.asm
View file

@ -1,27 +1,13 @@
MoonMons1:
db $0A
IF DEF(_YELLOW)
db 8,ZUBAT
db 9,ZUBAT
db 10,GEODUDE
db 6,ZUBAT
db 7,ZUBAT
db 10,ZUBAT
db 10,GEODUDE
db 11,ZUBAT
db 12,SANDSHREW
db 11,CLEFAIRY
ELSE
db 8,ZUBAT
db 7,ZUBAT
db 9,ZUBAT
db 8,GEODUDE
db 6,ZUBAT
db 10,ZUBAT
db 10,GEODUDE
db 8,PARAS
db 11,ZUBAT
db 8,CLEFAIRY
ENDC
db 8,ZUBAT
db 7,ZUBAT
db 9,ZUBAT
db 8,GEODUDE
db 6,ZUBAT
db 10,ZUBAT
db 10,GEODUDE
db 8,PARAS
db 11,ZUBAT
db 8,CLEFAIRY
db $00

34
data/wildPokemon/mtmoonb1.asm
View file

@ -1,27 +1,13 @@
MoonMonsB1:
db $0A
IF DEF(_YELLOW)
db 8,ZUBAT
db 9,ZUBAT
db 10,GEODUDE
db 6,ZUBAT
db 7,ZUBAT
db 10,ZUBAT
db 10,GEODUDE
db 11,ZUBAT
db 12,SANDSHREW
db 11,CLEFAIRY
ELSE
db 8,ZUBAT
db 7,ZUBAT
db 7,GEODUDE
db 8,GEODUDE
db 9,ZUBAT
db 10,PARAS
db 10,ZUBAT
db 11,ZUBAT
db 9,CLEFAIRY
db 9,GEODUDE
ENDC
db 8,ZUBAT
db 7,ZUBAT
db 7,GEODUDE
db 8,GEODUDE
db 9,ZUBAT
db 10,PARAS
db 10,ZUBAT
db 11,ZUBAT
db 9,CLEFAIRY
db 9,GEODUDE
db $00

34
data/wildPokemon/mtmoonb2.asm
View file

@ -1,27 +1,13 @@
MoonMonsB2:
db $0A
IF DEF(_YELLOW)
db 10,ZUBAT
db 11,GEODUDE
db 13,PARAS
db 11,ZUBAT
db 11,ZUBAT
db 12,ZUBAT
db 13,ZUBAT
db 9,CLEFAIRY
db 11,CLEFAIRY
db 13,CLEFAIRY
ELSE
db 9,ZUBAT
db 9,GEODUDE
db 10,ZUBAT
db 10,GEODUDE
db 11,ZUBAT
db 10,PARAS
db 12,PARAS
db 10,CLEFAIRY
db 12,ZUBAT
db 12,CLEFAIRY
ENDC
db 9,ZUBAT
db 9,GEODUDE
db 10,ZUBAT
db 10,GEODUDE
db 11,ZUBAT
db 10,PARAS
db 12,PARAS
db 10,CLEFAIRY
db 12,ZUBAT
db 12,CLEFAIRY
db $00

1
data/wildPokemon/nomons.asm
View file

@ -1,4 +1,3 @@
NoMons:
db $00
db $00

1
data/wildPokemon/pokemontower1.asm
View file

@ -1,4 +1,3 @@
TowerMons1:
db $00
db $00

1
data/wildPokemon/pokemontower2.asm
View file

@ -1,4 +1,3 @@
TowerMons2:
db $00
db $00

36
data/wildPokemon/pokemontower3.asm
View file

@ -1,29 +1,13 @@
TowerMons3:
db $0A
IF DEF(_YELLOW)
db 20,GASTLY
db 21,GASTLY
db 22,GASTLY
db 23,GASTLY
db 24,GASTLY
db 19,GASTLY
db 18,GASTLY
db 25,GASTLY
db 20,HAUNTER
db 25,HAUNTER
ELSE
db 20,GASTLY
db 21,GASTLY
db 22,GASTLY
db 23,GASTLY
db 19,GASTLY
db 18,GASTLY
db 24,GASTLY
db 20,CUBONE
db 22,CUBONE
db 25,HAUNTER
ENDC
db 20,GASTLY
db 21,GASTLY
db 22,GASTLY
db 23,GASTLY
db 19,GASTLY
db 18,GASTLY
db 24,GASTLY
db 20,CUBONE
db 22,CUBONE
db 25,HAUNTER
db $00

36
data/wildPokemon/pokemontower4.asm
View file

@ -1,29 +1,13 @@
TowerMons4:
db $0A
IF DEF(_YELLOW)
db 20,GASTLY
db 21,GASTLY
db 22,GASTLY
db 23,GASTLY
db 24,GASTLY
db 19,GASTLY
db 18,GASTLY
db 25,GASTLY
db 20,HAUNTER
db 25,HAUNTER
ELSE
db 20,GASTLY
db 21,GASTLY
db 22,GASTLY
db 23,GASTLY
db 19,GASTLY
db 18,GASTLY
db 25,HAUNTER
db 20,CUBONE
db 22,CUBONE
db 24,GASTLY
ENDC
db 20,GASTLY
db 21,GASTLY
db 22,GASTLY
db 23,GASTLY
db 19,GASTLY
db 18,GASTLY
db 25,HAUNTER
db 20,CUBONE
db 22,CUBONE
db 24,GASTLY
db $00

36
data/wildPokemon/pokemontower5.asm
View file

@ -1,29 +1,13 @@
TowerMons5:
db $0A
IF DEF(_YELLOW)
db 22,GASTLY
db 23,GASTLY
db 24,GASTLY
db 25,GASTLY
db 26,GASTLY
db 21,GASTLY
db 20,CUBONE
db 27,GASTLY
db 22,HAUNTER
db 27,HAUNTER
ELSE
db 20,GASTLY
db 21,GASTLY
db 22,GASTLY
db 23,GASTLY
db 19,GASTLY
db 18,GASTLY
db 25,HAUNTER
db 20,CUBONE
db 22,CUBONE
db 24,GASTLY
ENDC
db 20,GASTLY
db 21,GASTLY
db 22,GASTLY
db 23,GASTLY
db 19,GASTLY
db 18,GASTLY
db 25,HAUNTER
db 20,CUBONE
db 22,CUBONE
db 24,GASTLY
db $00

36
data/wildPokemon/pokemontower6.asm
View file

@ -1,29 +1,13 @@
TowerMons6:
db $0F
IF DEF(_YELLOW)
db 22,GASTLY
db 23,GASTLY
db 24,GASTLY
db 25,GASTLY
db 26,GASTLY
db 21,GASTLY
db 22,CUBONE
db 27,GASTLY
db 22,HAUNTER
db 27,HAUNTER
ELSE
db 21,GASTLY
db 22,GASTLY
db 23,GASTLY
db 24,GASTLY
db 20,GASTLY
db 19,GASTLY
db 26,HAUNTER
db 22,CUBONE
db 24,CUBONE
db 28,HAUNTER
ENDC
db 21,GASTLY
db 22,GASTLY
db 23,GASTLY
db 24,GASTLY
db 20,GASTLY
db 19,GASTLY
db 26,HAUNTER
db 22,CUBONE
db 24,CUBONE
db 28,HAUNTER
db $00

36
data/wildPokemon/pokemontower7.asm
View file

@ -1,29 +1,13 @@
TowerMons7:
db $0F
IF DEF(_YELLOW)
db 24,GASTLY
db 25,GASTLY
db 26,GASTLY
db 27,GASTLY
db 28,GASTLY
db 23,GASTLY
db 24,CUBONE
db 29,GASTLY
db 24,HAUNTER
db 29,HAUNTER
ELSE
db 21,GASTLY
db 22,GASTLY
db 23,GASTLY
db 24,GASTLY
db 20,GASTLY
db 28,HAUNTER
db 22,CUBONE
db 24,CUBONE
db 28,HAUNTER
db 30,HAUNTER
ENDC
db 21,GASTLY
db 22,GASTLY
db 23,GASTLY
db 24,GASTLY
db 20,GASTLY
db 28,HAUNTER
db 22,CUBONE
db 24,CUBONE
db 28,HAUNTER
db 30,HAUNTER
db $00

45
data/wildPokemon/powerplant.asm
View file

@ -1,34 +1,19 @@
PowerPlantMons:
db $0A
IF DEF(_YELLOW)
db 30,MAGNEMITE
db 35,MAGNEMITE
db 33,MAGNETON
db 33,VOLTORB
db 37,VOLTORB
db 33,GRIMER
db 37,GRIMER
db 38,MAGNETON
db 33,MUK
db 37,MUK
ELSE
db 21,VOLTORB
db 21,MAGNEMITE
db 20,PIKACHU
db 24,PIKACHU
db 23,MAGNEMITE
db 23,VOLTORB
db 32,MAGNETON
db 35,MAGNETON
IF DEF(_RED)
db 33,ELECTABUZZ
db 36,ELECTABUZZ
ENDC
IF DEF(_GREEN) || DEF(_BLUE)
db 33,RAICHU
db 36,RAICHU
ENDC
db 21,VOLTORB
db 21,MAGNEMITE
db 20,PIKACHU
db 24,PIKACHU
db 23,MAGNEMITE
db 23,VOLTORB
db 32,MAGNETON
db 35,MAGNETON
IF DEF(_RED)
db 33,ELECTABUZZ
db 36,ELECTABUZZ
ENDC
IF DEF(_BLUE)
db 33,RAICHU
db 36,RAICHU
ENDC
db $00

41
data/wildPokemon/rocktunnel1.asm
View file

@ -1,34 +1,13 @@
TunnelMonsB1:
db $0F
IF DEF(_YELLOW)
db 15,ZUBAT
db 16,GEODUDE
db 17,ZUBAT
db 19,ZUBAT
db 18,GEODUDE
db 20,GEODUDE
db 21,ZUBAT
db 17,MACHOP
db 19,MACHOP
db 21,MACHOP
ELSE
db 16,ZUBAT
db 17,ZUBAT
db 17,GEODUDE
db 15,MACHOP
db 16,GEODUDE
IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN))
db 18,ZUBAT
ENDC
IF (DEF(_BLUE) && DEF(_JAPAN))
db 18,DITTO
ENDC
db 15,ZUBAT
db 17,MACHOP
db 13,ONIX
db 15,ONIX
ENDC
db 16,ZUBAT
db 17,ZUBAT
db 17,GEODUDE
db 15,MACHOP
db 16,GEODUDE
db 18,ZUBAT
db 15,ZUBAT
db 17,MACHOP
db 13,ONIX
db 15,ONIX
db $00

41
data/wildPokemon/rocktunnel2.asm
View file

@ -1,34 +1,13 @@
TunnelMonsB2:
db $0F
IF DEF(_YELLOW)
db 20,ZUBAT
db 17,GEODUDE
db 18,MACHOP
db 21,ZUBAT
db 22,ZUBAT
db 21,GEODUDE
db 20,MACHOP
db 14,ONIX
db 18,ONIX
db 22,ONIX
ELSE
db 16,ZUBAT
db 17,ZUBAT
db 17,GEODUDE
db 15,MACHOP
db 16,GEODUDE
IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN))
db 18,ZUBAT
ENDC
IF DEF(_BLUE) && DEF(_JAPAN)
db 18,DITTO
ENDC
db 17,MACHOP
db 17,ONIX
db 13,ONIX
db 18,GEODUDE
ENDC
db 16,ZUBAT
db 17,ZUBAT
db 17,GEODUDE
db 15,MACHOP
db 16,GEODUDE
db 18,ZUBAT
db 17,MACHOP
db 17,ONIX
db 13,ONIX
db 18,GEODUDE
db $00

34
data/wildPokemon/route1.asm
View file

@ -1,27 +1,13 @@
Route1Mons:
db $19
IF DEF(_YELLOW)
db 3,PIDGEY
db 4,PIDGEY
db 2,RATTATA
db 3,RATTATA
db 2,PIDGEY
db 3,PIDGEY
db 5,PIDGEY
db 4,RATTATA
db 6,PIDGEY
db 7,PIDGEY
ELSE
db 3,PIDGEY
db 3,RATTATA
db 3,RATTATA
db 2,RATTATA
db 2,PIDGEY
db 3,PIDGEY
db 3,PIDGEY
db 4,RATTATA
db 4,PIDGEY
db 5,PIDGEY
ENDC
db 3,PIDGEY
db 3,RATTATA
db 3,RATTATA
db 2,RATTATA
db 2,PIDGEY
db 3,PIDGEY
db 3,PIDGEY
db 4,RATTATA
db 4,PIDGEY
db 5,PIDGEY
db $00

19
data/wildPokemon/route10.asm
View file

@ -1,6 +1,5 @@
Route10Mons:
db $0F
IF DEF(_RED)
db 16,VOLTORB
db 16,SPEAROW
@ -13,8 +12,7 @@ Route10Mons:
db 13,EKANS
db 17,EKANS
ENDC
IF DEF(_BLUE) || DEF(_GREEN)
IF DEF(_BLUE)
db 16,VOLTORB
db 16,SPEAROW
db 14,VOLTORB
@ -26,19 +24,4 @@ Route10Mons:
db 13,SANDSHREW
db 17,SANDSHREW
ENDC
IF DEF(_YELLOW)
db 16,MAGNEMITE
db 18,RATTATA
db 18,MAGNEMITE
db 20,MAGNEMITE
db 17,NIDORAN_M
db 17,NIDORAN_F
db 22,MAGNEMITE
db 20,RATICATE
db 16,MACHOP
db 18,MACHOP
ENDC
db $00

19
data/wildPokemon/route11.asm
View file

@ -1,6 +1,5 @@
Route11Mons:
db $0F
IF DEF(_RED)
db 14,EKANS
db 15,SPEAROW
@ -13,8 +12,7 @@ Route11Mons:
db 11,DROWZEE
db 15,DROWZEE
ENDC
IF DEF(_GREEN) || DEF(_BLUE)
IF DEF(_BLUE)
db 14,SANDSHREW
db 15,SPEAROW
db 12,SANDSHREW
@ -26,19 +24,4 @@ Route11Mons:
db 11,DROWZEE
db 15,DROWZEE
ENDC
IF DEF(_YELLOW)
db 16,PIDGEY
db 15,RATTATA
db 18,PIDGEY
db 15,DROWZEE
db 17,RATTATA
db 17,DROWZEE
db 18,PIDGEOTTO
db 20,PIDGEOTTO
db 19,DROWZEE
db 17,RATICATE
ENDC
db $00

35
data/wildPokemon/route12.asm
View file

@ -1,7 +1,6 @@
Route12Mons:
db $0F
IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_RED)
db 24,ODDISH
db 25,PIDGEY
db 23,PIDGEY
@ -12,10 +11,8 @@ Route12Mons:
db 27,PIDGEY
db 28,GLOOM
db 30,GLOOM
db $00
ENDC
IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_BLUE)
db 24,BELLSPROUT
db 25,PIDGEY
db 23,PIDGEY
@ -26,31 +23,5 @@ Route12Mons:
db 27,PIDGEY
db 28,WEEPINBELL
db 30,WEEPINBELL
db $00
ENDC
IF DEF(_YELLOW)
db 25,ODDISH
db 25,BELLSPROUT
db 28,PIDGEY
db 28,PIDGEOTTO
db 27,ODDISH
db 27,BELLSPROUT
db 29,GLOOM
db 29,WEEPINBELL
db 26,FARFETCHD
db 31,FARFETCHD
db $03
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWBRO
db 20,SLOWBRO
ENDC
db $00

35
data/wildPokemon/route13.asm
View file

@ -1,5 +1,5 @@
Route13Mons:
IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_RED)
db $14
db 24,ODDISH
db 25,PIDGEY
@ -11,10 +11,8 @@ Route13Mons:
db 25,DITTO
db 28,GLOOM
db 30,GLOOM
db $00
ENDC
IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_BLUE)
db $14
db 24,BELLSPROUT
db 25,PIDGEY
@ -26,32 +24,5 @@ Route13Mons:
db 25,DITTO
db 28,WEEPINBELL
db 30,WEEPINBELL
db $00
ENDC
IF DEF(_YELLOW)
db $0F
db 25,ODDISH
db 25,BELLSPROUT
db 28,PIDGEOTTO
db 28,PIDGEY
db 27,ODDISH
db 27,BELLSPROUT
db 29,GLOOM
db 29,WEEPINBELL
db 26,FARFETCHD
db 31,FARFETCHD
db $03
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWPOKE
db 15,SLOWBRO
db 20,SLOWBRO
ENDC
db $00

20
data/wildPokemon/route14.asm
View file

@ -1,6 +1,6 @@
Route14Mons:
db $0F
IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_RED)
db 24,ODDISH
db 26,PIDGEY
db 23,DITTO
@ -12,8 +12,7 @@ Route14Mons:
db 28,PIDGEOTTO
db 30,PIDGEOTTO
ENDC
IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_BLUE)
db 24,BELLSPROUT
db 26,PIDGEY
db 23,DITTO
@ -25,19 +24,4 @@ Route14Mons:
db 28,PIDGEOTTO
db 30,PIDGEOTTO
ENDC
IF DEF(_YELLOW)
db 26,ODDISH
db 26,BELLSPROUT
db 24,VENONAT
db 30,PIDGEOTTO
db 28,ODDISH
db 28,BELLSPROUT
db 30,GLOOM
db 30,WEEPINBELL
db 27,VENONAT
db 30,VENOMOTH
ENDC
db $00

20
data/wildPokemon/route15.asm
View file

@ -1,6 +1,6 @@
Route15Mons:
db $0F
IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_RED)
db 24,ODDISH
db 26,DITTO
db 23,PIDGEY
@ -12,8 +12,7 @@ Route15Mons:
db 28,PIDGEOTTO
db 30,PIDGEOTTO
ENDC
IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_BLUE)
db 24,BELLSPROUT
db 26,DITTO
db 23,PIDGEY
@ -25,19 +24,4 @@ Route15Mons:
db 28,PIDGEOTTO
db 30,PIDGEOTTO
ENDC
IF DEF(_YELLOW)
db 26,ODDISH
db 26,BELLSPROUT
db 24,VENONAT
db 32,PIDGEOTTO
db 28,ODDISH
db 28,BELLSPROUT
db 30,GLOOM
db 30,WEEPINBELL
db 27,VENONAT
db 30,VENOMOTH
ENDC
db $00

35
data/wildPokemon/route16.asm
View file

@ -1,28 +1,13 @@
Route16Mons:
db $19
IF DEF(_YELLOW)
db 22,SPEAROW
db 22,DODUO
db 23,RATTATA
db 24,DODUO
db 24,RATTATA
db 26,DODUO
db 23,SPEAROW
db 24,FEAROW
db 25,RATICATE
db 26,RATICATE
ELSE
db 20,SPEAROW
db 22,SPEAROW
db 18,RATTATA
db 20,DODUO
db 20,RATTATA
db 18,DODUO
db 22,DODUO
db 22,RATTATA
db 23,RATICATE
db 25,RATICATE
ENDC
db 20,SPEAROW
db 22,SPEAROW
db 18,RATTATA
db 20,DODUO
db 20,RATTATA
db 18,DODUO
db 22,DODUO
db 22,RATTATA
db 23,RATICATE
db 25,RATICATE
db $00

36
data/wildPokemon/route17.asm
View file

@ -1,29 +1,13 @@
Route17Mons:
db $19
IF DEF(_YELLOW)
db 26,DODUO
db 27,FEAROW
db 27,DODUO
db 28,DODUO
db 28,PONYTA
db 30,PONYTA
db 29,FEAROW
db 28,DODUO
db 32,PONYTA
db 29,DODRIO
ELSE
db 20,SPEAROW
db 22,SPEAROW
db 25,RATICATE
db 24,DODUO
db 27,RATICATE
db 26,DODUO
db 28,DODUO
db 29,RATICATE
db 25,FEAROW
db 27,FEAROW
ENDC
db 20,SPEAROW
db 22,SPEAROW
db 25,RATICATE
db 24,DODUO
db 27,RATICATE
db 26,DODUO
db 28,DODUO
db 29,RATICATE
db 25,FEAROW
db 27,FEAROW
db $00

36
data/wildPokemon/route18.asm
View file

@ -1,29 +1,13 @@
Route18Mons:
db $19
IF DEF(_YELLOW)
db 22,SPEAROW
db 22,DODUO
db 23,RATTATA
db 24,DODUO
db 24,RATTATA
db 26,DODUO
db 23,SPEAROW
db 24,FEAROW
db 25,RATICATE
db 26,RATICATE
ELSE
db 20,SPEAROW
db 22,SPEAROW
db 25,RATICATE
db 24,DODUO
db 25,FEAROW
db 26,DODUO
db 28,DODUO
db 29,RATICATE
db 27,FEAROW
db 29,FEAROW
ENDC
db 20,SPEAROW
db 22,SPEAROW
db 25,RATICATE
db 24,DODUO
db 25,FEAROW
db 26,DODUO
db 28,DODUO
db 29,RATICATE
db 27,FEAROW
db 29,FEAROW
db $00

55
data/wildPokemon/route2.asm
View file

@ -1,39 +1,24 @@
Route2Mons:
db $19
IF DEF(_YELLOW)
db 3,RATTATA
db 3,PIDGEY
db 4,RATTATA
db 4,NIDORAN_M
db 4,NIDORAN_F
db 5,PIDGEY
db 6,NIDORAN_M
db 6,NIDORAN_F
db 7,PIDGEY
db 7,PIDGEY
ELSE
db 3,RATTATA
db 3,PIDGEY
db 4,PIDGEY
db 4,RATTATA
db 5,PIDGEY
if DEF(_RED)
db 3,WEEDLE
ENDC
if DEF(_BLUE)
db 3,CATERPIE
ENDC
db 2,RATTATA
db 5,RATTATA
if DEF(_RED)
db 4,WEEDLE
db 5,WEEDLE
ENDC
if DEF(_BLUE)
db 4,CATERPIE
db 5,CATERPIE
ENDC
db 3,RATTATA
db 3,PIDGEY
db 4,PIDGEY
db 4,RATTATA
db 5,PIDGEY
if DEF(_RED)
db 3,WEEDLE
ENDC
if DEF(_BLUE)
db 3,CATERPIE
ENDC
db 2,RATTATA
db 5,RATTATA
if DEF(_RED)
db 4,WEEDLE
db 5,WEEDLE
ENDC
if DEF(_BLUE)
db 4,CATERPIE
db 5,CATERPIE
ENDC
db $00

36
data/wildPokemon/route21.asm
View file

@ -1,30 +1,15 @@
Route21Mons:
db $19
IF DEF(_YELLOW)
db 15,PIDGEY
db 13,RATTATA
db 13,PIDGEY
db 11,PIDGEY
db 17,PIDGEY
db 15,RATTATA
db 15,RATICATE
db 17,PIDGEOTTO
db 19,PIDGEOTTO
db 15,PIDGEOTTO
ELSE
db 21,RATTATA
db 23,PIDGEY
db 30,RATICATE
db 23,RATTATA
db 21,PIDGEY
db 30,PIDGEOTTO
db 32,PIDGEOTTO
db 28,TANGELA
db 30,TANGELA
db 32,TANGELA
ENDC
db 21,RATTATA
db 23,PIDGEY
db 30,RATICATE
db 23,RATTATA
db 21,PIDGEY
db 30,PIDGEOTTO
db 32,PIDGEOTTO
db 28,TANGELA
db 30,TANGELA
db 32,TANGELA
db $05
db 5,TENTACOOL
db 10,TENTACOOL
@ -36,4 +21,3 @@ Route21Mons:
db 30,TENTACOOL
db 35,TENTACOOL
db 40,TENTACOOL

5
data/wildPokemon/route22.asm
View file

@ -1,6 +1,6 @@
Route22Mons:
db $19
IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_RED)
db 3,RATTATA
db 3,NIDORAN_M
db 4,RATTATA
@ -12,7 +12,7 @@ Route22Mons:
db 3,NIDORAN_F
db 4,NIDORAN_F
ENDC
IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_BLUE)
db 3,RATTATA
db 3,NIDORAN_F
db 4,RATTATA
@ -37,4 +37,3 @@ Route22Mons:
db 6,SPEAROW
ENDC
db $00

54
data/wildPokemon/route23.asm
View file

@ -1,39 +1,23 @@
Route23Mons:
db $0A
IF DEF(_YELLOW)
db 41,NIDORINO
db 41,NIDORINA
db 36,MANKEY
db 44,NIDORINO
db 44,NIDORINA
db 40,FEAROW
db 41,MANKEY
db 45,FEAROW
db 41,PRIMEAPE
db 46,PRIMEAPE
ELSE
IF DEF(_RED)
db 26,EKANS
ENDC
IF !DEF(_RED)
db 26,SANDSHREW
ENDC
db 33,DITTO
db 26,SPEAROW
db 38,FEAROW
db 38,DITTO
db 38,FEAROW
IF DEF(_RED)
db 41,ARBOK
ENDC
IF !DEF(_RED)
db 41,SANDSLASH
ENDC
db 43,DITTO
db 41,FEAROW
db 43,FEAROW
IF DEF(_RED)
db 26,EKANS
ENDC
IF !DEF(_RED)
db 26,SANDSHREW
ENDC
db 33,DITTO
db 26,SPEAROW
db 38,FEAROW
db 38,DITTO
db 38,FEAROW
IF DEF(_RED)
db 41,ARBOK
ENDC
IF !DEF(_RED)
db 41,SANDSLASH
ENDC
db 43,DITTO
db 41,FEAROW
db 43,FEAROW
db $00

32
data/wildPokemon/route24.asm
View file

@ -1,6 +1,5 @@
Route24Mons:
db $19
IF DEF(_RED)
db 7,WEEDLE
db 8,KAKUNA
@ -13,8 +12,7 @@ Route24Mons:
db 8,ABRA
db 12,ABRA
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 7,CATERPIE
db 8,METAPOD
db 12,PIDGEY
@ -26,32 +24,4 @@ Route24Mons:
db 8,ABRA
db 12,ABRA
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 7,CATERPIE
db 8,METAPOD
db 12,PIDGEY
db 12,ODDISH
db 13,ODDISH
db 10,ABRA
db 14,ODDISH
db 13,PIDGEY
db 8,ABRA
db 12,ABRA
ENDC
IF DEF(_YELLOW)
db 12,ODDISH
db 12,BELLSPROUT
db 13,PIDGEY
db 14,ODDISH
db 14,BELLSPROUT
db 15,PIDGEY
db 13,VENONAT
db 16,VENONAT
db 17,PIDGEY
db 17,PIDGEOTTO
ENDC
db $00

32
data/wildPokemon/route25.asm
View file

@ -1,6 +1,5 @@
Route25Mons:
db $0F
IF DEF(_RED)
db 8,WEEDLE
db 9,KAKUNA
@ -13,8 +12,7 @@ Route25Mons:
db 7,METAPOD
db 8,CATERPIE
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 8,CATERPIE
db 9,METAPOD
db 13,PIDGEY
@ -26,32 +24,4 @@ Route25Mons:
db 7,KAKUNA
db 8,WEEDLE
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 8,CATERPIE
db 9,METAPOD
db 13,PIDGEY
db 12,ODDISH
db 13,ODDISH
db 12,ABRA
db 14,ODDISH
db 10,ABRA
db 7,KAKUNA
db 8,WEEDLE
ENDC
IF DEF(_YELLOW)
db 12,ODDISH
db 12,BELLSPROUT
db 13,PIDGEY
db 14,ODDISH
db 14,BELLSPROUT
db 15,PIDGEY
db 13,VENONAT
db 16,VENONAT
db 17,PIDGEY
db 17,PIDGEOTTO
ENDC
db $00

34
data/wildPokemon/route3.asm
View file

@ -1,27 +1,13 @@
Route3Mons:
db $14
IF DEF(_YELLOW)
db 8,SPEAROW
db 9,SPEAROW
db 9,MANKEY
db 10,SPEAROW
db 8,SANDSHREW
db 10,RATTATA
db 10,SANDSHREW
db 12,RATTATA
db 11,SPEAROW
db 12,SPEAROW
ELSE
db 6,PIDGEY
db 5,SPEAROW
db 7,PIDGEY
db 6,SPEAROW
db 7,SPEAROW
db 8,PIDGEY
db 8,SPEAROW
db 3,JIGGLYPUFF
db 5,JIGGLYPUFF
db 7,JIGGLYPUFF
ENDC
db 6,PIDGEY
db 5,SPEAROW
db 7,PIDGEY
db 6,SPEAROW
db 7,SPEAROW
db 8,PIDGEY
db 8,SPEAROW
db 3,JIGGLYPUFF
db 5,JIGGLYPUFF
db 7,JIGGLYPUFF
db $00

19
data/wildPokemon/route4.asm
View file

@ -1,6 +1,5 @@
Route4Mons:
db $14
IF DEF(_RED)
db 10,RATTATA
db 10,SPEAROW
@ -13,8 +12,7 @@ Route4Mons:
db 8,EKANS
db 12,EKANS
ENDC
IF DEF(_BLUE) || DEF(_GREEN)
IF DEF(_BLUE)
db 10,RATTATA
db 10,SPEAROW
db 8,RATTATA
@ -26,19 +24,4 @@ Route4Mons:
db 8,SANDSHREW
db 12,SANDSHREW
ENDC
IF DEF(_YELLOW)
db 8,SPEAROW
db 9,SPEAROW
db 9,MANKEY
db 10,SPEAROW
db 8,SANDSHREW
db 10,RATTATA
db 10,SANDSHREW
db 12,RATTATA
db 11,SPEAROW
db 12,SPEAROW
ENDC
db $00

32
data/wildPokemon/route5.asm
View file

@ -1,6 +1,5 @@
Route5Mons:
db $0F
IF DEF(_RED)
db 13,ODDISH
db 13,PIDGEY
@ -13,8 +12,7 @@ Route5Mons:
db 14,MANKEY
db 16,MANKEY
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 13,BELLSPROUT
db 13,PIDGEY
db 15,PIDGEY
@ -26,32 +24,4 @@ Route5Mons:
db 14,MEOWTH
db 16,MEOWTH
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 13,ODDISH
db 13,PIDGEY
db 15,PIDGEY
db 10,MEOWTH
db 12,MEOWTH
db 15,ODDISH
db 16,ODDISH
db 16,PIDGEY
db 14,MEOWTH
db 16,MEOWTH
ENDC
IF DEF(_YELLOW)
db 15,PIDGEY
db 14,RATTATA
db 7,ABRA
db 16,PIDGEY
db 16,RATTATA
db 17,PIDGEY
db 17,PIDGEOTTO
db 3,JIGGLYPUFF
db 5,JIGGLYPUFF
db 7,JIGGLYPUFF
ENDC
db $00

47
data/wildPokemon/route6.asm
View file

@ -1,6 +1,5 @@
Route6Mons:
db $0F
IF DEF(_RED)
db 13,ODDISH
db 13,PIDGEY
@ -12,10 +11,8 @@ Route6Mons:
db 16,PIDGEY
db 14,MANKEY
db 16,MANKEY
db $00
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 13,BELLSPROUT
db 13,PIDGEY
db 15,PIDGEY
@ -26,45 +23,5 @@ Route6Mons:
db 16,PIDGEY
db 14,MEOWTH
db 16,MEOWTH
db $00
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 13,ODDISH
db 13,PIDGEY
db 15,PIDGEY
db 10,MEOWTH
db 12,MEOWTH
db 15,ODDISH
db 16,ODDISH
db 16,PIDGEY
db 14,MEOWTH
db 16,MEOWTH
db $00
ENDC
IF DEF(_YELLOW)
db 15,PIDGEY
db 14,RATTATA
db 7,ABRA
db 16,PIDGEY
db 16,RATTATA
db 17,PIDGEY
db 17,PIDGEOTTO
db 3,JIGGLYPUFF
db 5,JIGGLYPUFF
db 7,JIGGLYPUFF
db $03
db 15,PSYDUCK
db 15,PSYDUCK
db 15,PSYDUCK
db 15,PSYDUCK
db 15,PSYDUCK
db 15,PSYDUCK
db 15,PSYDUCK
db 15,PSYDUCK
db 15,GOLDUCK
db 20,GOLDUCK
ENDC
db $00

32
data/wildPokemon/route7.asm
View file

@ -1,6 +1,5 @@
Route7Mons:
db $0F
IF DEF(_RED)
db 19,PIDGEY
db 19,ODDISH
@ -13,8 +12,7 @@ Route7Mons:
db 19,MANKEY
db 20,MANKEY
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 19,PIDGEY
db 19,BELLSPROUT
db 17,MEOWTH
@ -26,32 +24,4 @@ Route7Mons:
db 19,MEOWTH
db 20,MEOWTH
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 19,PIDGEY
db 19,ODDISH
db 17,MEOWTH
db 22,ODDISH
db 22,PIDGEY
db 18,MEOWTH
db 18,GROWLITHE
db 20,GROWLITHE
db 19,MEOWTH
db 20,MEOWTH
ENDC
IF DEF(_YELLOW)
db 20,PIDGEY
db 22,PIDGEY
db 20,RATTATA
db 15,ABRA
db 19,ABRA
db 24,PIDGEOTTO
db 26,ABRA
db 19,JIGGLYPUFF
db 24,JIGGLYPUFF
db 24,JIGGLYPUFF
ENDC
db $00

32
data/wildPokemon/route8.asm
View file

@ -1,6 +1,5 @@
Route8Mons:
db $0F
IF DEF(_RED)
db 18,PIDGEY
db 18,MANKEY
@ -13,8 +12,7 @@ Route8Mons:
db 15,GROWLITHE
db 18,GROWLITHE
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 18,PIDGEY
db 18,MEOWTH
db 17,SANDSHREW
@ -26,32 +24,4 @@ Route8Mons:
db 15,VULPIX
db 18,VULPIX
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 18,PIDGEY
db 18,MEOWTH
db 17,SANDSHREW
db 16,GROWLITHE
db 20,PIDGEY
db 20,MEOWTH
db 19,SANDSHREW
db 17,GROWLITHE
db 15,GROWLITHE
db 18,GROWLITHE
ENDC
IF DEF(_YELLOW)
db 20,PIDGEY
db 22,PIDGEY
db 20,RATTATA
db 15,ABRA
db 19,ABRA
db 24,PIDGEOTTO
db 19,JIGGLYPUFF
db 24,JIGGLYPUFF
db 20,KADABRA
db 27,KADABRA
ENDC
db $00

19
data/wildPokemon/route9.asm
View file

@ -1,6 +1,5 @@
Route9Mons:
db $0F
IF DEF(_RED)
db 16,RATTATA
db 16,SPEAROW
@ -13,8 +12,7 @@ Route9Mons:
db 13,EKANS
db 17,EKANS
ENDC
IF DEF(_GREEN) || DEF(_BLUE)
IF DEF(_BLUE)
db 16,RATTATA
db 16,SPEAROW
db 14,RATTATA
@ -26,19 +24,4 @@ Route9Mons:
db 13,SANDSHREW
db 17,SANDSHREW
ENDC
IF DEF(_YELLOW)
db 16,NIDORAN_M
db 16,NIDORAN_F
db 18,RATTATA
db 18,NIDORAN_M
db 18,NIDORAN_F
db 17,SPEAROW
db 18,NIDORINO
db 18,NIDORINA
db 20,RATICATE
db 19,FEAROW
ENDC
db $00

27
data/wildPokemon/safarizone1.asm
View file

@ -1,6 +1,6 @@
ZoneMons1:
db $1E
IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_RED)
db 24,NIDORAN_M
db 26,DODUO
db 22,PARAS
@ -9,16 +9,10 @@ ZoneMons1:
db 23,EXEGGCUTE
db 24,NIDORAN_F
db 25,PARASECT
IF DEF(_RED)
db 25,KANGASKHAN
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 25,LICKITUNG
ENDC
db 25,KANGASKHAN
db 28,SCYTHER
ENDC
IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_BLUE)
db 24,NIDORAN_F
db 26,DODUO
db 22,PARAS
@ -30,19 +24,4 @@ ZoneMons1:
db 25,KANGASKHAN
db 28,PINSIR
ENDC
IF DEF(_YELLOW)
db 21,NIDORAN_M
db 29,NIDORAN_F
db 22,EXEGGCUTE
db 21,TAUROS
db 32,NIDORINA
db 19,CUBONE
db 26,EXEGGCUTE
db 24,MAROWAK
db 21,CHANSEY
db 15,SCYTHER
ENDC
db $00

68
data/wildPokemon/safarizone2.asm
View file

@ -1,48 +1,28 @@
ZoneMons2:
db $1E
IF DEF(_YELLOW)
db 36,NIDORAN_M
db 14,NIDORAN_F
db 20,EXEGGCUTE
db 25,RHYHORN
db 23,NIDORINA
db 28,KANGASKHAN
db 16,CUBONE
db 33,KANGASKHAN
db 25,SCYTHER
db 15,PINSIR
ELSE
IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
db 22,NIDORAN_M
ENDC
IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
db 22,NIDORAN_F
ENDC
db 26,RHYHORN
db 23,PARAS
db 25,EXEGGCUTE
IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
db 30,NIDORINO
ENDC
IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
db 30,NIDORINA
ENDC
db 27,EXEGGCUTE
IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
db 30,NIDORINA
ENDC
IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
db 30,NIDORINO
ENDC
db 32,VENOMOTH
db 26,CHANSEY
IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
db 28,TAUROS
ENDC
IF (DEF(_JAPAN) && DEF(_BLUE))
db 28,PINSIR
ENDC
IF DEF(_RED)
db 22,NIDORAN_M
ENDC
IF DEF(_BLUE)
db 22,NIDORAN_F
ENDC
db 26,RHYHORN
db 23,PARAS
db 25,EXEGGCUTE
IF DEF(_RED)
db 30,NIDORINO
ENDC
IF DEF(_BLUE)
db 30,NIDORINA
ENDC
db 27,EXEGGCUTE
IF DEF(_RED)
db 30,NIDORINA
ENDC
IF DEF(_BLUE)
db 30,NIDORINO
ENDC
db 32,VENOMOTH
db 26,CHANSEY
db 28,TAUROS
db $00

31
data/wildPokemon/safarizone3.asm
View file

@ -12,8 +12,7 @@ ZoneMons3:
db 26,TAUROS
db 28,KANGASKHAN
ENDC
IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_BLUE)
db 25,NIDORAN_F
db 26,DODUO
db 23,VENONAT
@ -25,32 +24,4 @@ ZoneMons3:
db 26,TAUROS
db 28,KANGASKHAN
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 25,NIDORAN_M
db 26,DODUO
db 23,VENONAT
db 24,EXEGGCUTE
db 33,NIDORINO
db 26,EXEGGCUTE
db 25,NIDORAN_F
db 31,VENOMOTH
db 26,PINSIR
db 28,LICKITUNG
ENDC
IF DEF(_YELLOW)
db 29,NIDORAN_M
db 21,NIDORAN_F
db 22,EXEGGCUTE
db 21,TAUROS
db 32,NIDORINO
db 19,CUBONE
db 26,EXEGGCUTE
db 24,MAROWAK
db 25,PINSIR
db 27,TANGELA
ENDC
db $00

31
data/wildPokemon/safarizonecenter.asm
View file

@ -12,8 +12,7 @@ ZoneMonsCenter:
db 23,SCYTHER
db 23,CHANSEY
ENDC
IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
IF DEF(_BLUE)
db 22,NIDORAN_F
db 25,RHYHORN
db 22,VENONAT
@ -25,32 +24,4 @@ ZoneMonsCenter:
db 23,PINSIR
db 23,CHANSEY
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 22,NIDORAN_M
db 25,RHYHORN
db 22,VENONAT
db 24,EXEGGCUTE
db 31,NIDORINO
db 25,EXEGGCUTE
db 31,NIDORINA
db 30,PARASECT
db 23,SCYTHER
db 23,CHANSEY
ENDC
IF DEF(_YELLOW)
db 14,NIDORAN_M
db 36,NIDORAN_F
db 24,EXEGGCUTE
db 20,RHYHORN
db 23,NIDORINO
db 27,PARASECT
db 27,PARAS
db 32,PARASECT
db 22,TANGELA
db 7,CHANSEY
ENDC
db $00

31
data/wildPokemon/seafoamisland1.asm
View file

@ -12,8 +12,7 @@ IslandMons1:
db 28,SHELLDER
db 38,GOLDUCK
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 30,SEEL
db 30,PSYDUCK
db 30,STARYU
@ -25,32 +24,4 @@ IslandMons1:
db 28,STARYU
db 38,SLOWBRO
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 30,SEEL
db 30,HORSEA
db 30,STARYU
db 30,KRABBY
db 28,KRABBY
db 21,ZUBAT
db 29,GOLBAT
db 28,SLOWPOKE
db 28,STARYU
db 38,SLOWBRO
ENDC
IF DEF(_YELLOW)
db 18,ZUBAT
db 25,KRABBY
db 27,KRABBY
db 27,ZUBAT
db 36,ZUBAT
db 28,SLOWPOKE
db 30,SLOWPOKE
db 9,ZUBAT
db 27,GOLBAT
db 36,GOLBAT
ENDC
db $00

31
data/wildPokemon/seafoamislandb1.asm
View file

@ -12,8 +12,7 @@ IslandMonsB1:
db 38,DEWGONG
db 37,SEADRA
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 30,SHELLDER
db 30,KRABBY
db 32,STARYU
@ -25,32 +24,4 @@ IslandMonsB1:
db 38,DEWGONG
db 37,KINGLER
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 30,SHELLDER
db 30,KRABBY
db 32,STARYU
db 32,KRABBY
db 28,HORSEA
db 30,SEEL
db 30,HORSEA
db 28,SEEL
db 38,DEWGONG
db 37,KINGLER
ENDC
IF DEF(_YELLOW)
db 27,ZUBAT
db 26,KRABBY
db 36,ZUBAT
db 28,KRABBY
db 27,GOLBAT
db 29,SLOWPOKE
db 18,ZUBAT
db 28,KINGLER
db 22,SEEL
db 26,SEEL
ENDC
db $00

31
data/wildPokemon/seafoamislandb2.asm
View file

@ -12,8 +12,7 @@ IslandMonsB2:
db 30,GOLBAT
db 37,SLOWBRO
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 30,SEEL
db 30,PSYDUCK
db 32,SEEL
@ -25,32 +24,4 @@ IslandMonsB2:
db 30,GOLBAT
db 37,GOLDUCK
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 30,SEEL
db 30,HORSEA
db 32,SEEL
db 32,HORSEA
db 28,KRABBY
db 30,SHELLDER
db 30,KRABBY
db 28,STARYU
db 30,GOLBAT
db 37,JYNX
ENDC
IF DEF(_YELLOW)
db 27,ZUBAT
db 27,KRABBY
db 36,ZUBAT
db 27,GOLBAT
db 28,KINGLER
db 24,SEEL
db 29,KRABBY
db 36,GOLBAT
db 31,SLOWPOKE
db 31,SLOWBRO
ENDC
db $00

43
data/wildPokemon/seafoamislandb3.asm
View file

@ -12,8 +12,7 @@ IslandMonsB3:
db 39,SEADRA
db 37,DEWGONG
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 31,PSYDUCK
db 31,SEEL
db 33,PSYDUCK
@ -25,44 +24,4 @@ IslandMonsB3:
db 39,KINGLER
db 37,DEWGONG
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 31,HORSEA
db 31,SEEL
db 33,HORSEA
db 33,SEEL
db 29,KRABBY
db 31,STARYU
db 31,KRABBY
db 29,STARYU
db 39,KINGLER
db 37,DEWGONG
ENDC
IF DEF(_YELLOW)
db 27,GOLBAT
db 36,ZUBAT
db 29,KRABBY
db 27,ZUBAT
db 30,KINGLER
db 26,SEEL
db 31,KRABBY
db 30,SEEL
db 28,DEWGONG
db 32,DEWGONG
db $05
db 25,TENTACOOL
db 30,TENTACOOL
db 20,TENTACOOL
db 30,STARYU
db 35,TENTACOOL
db 30,STARYU
db 40,TENTACOOL
db 30,STARYU
db 30,STARYU
db 30,STARYU
ENDC
db $00

43
data/wildPokemon/seafoamislandb4.asm
View file

@ -12,8 +12,7 @@ IslandMonsB4:
db 39,SLOWBRO
db 32,GOLBAT
ENDC
IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
IF DEF(_BLUE)
db 31,KRABBY
db 31,STARYU
db 33,KRABBY
@ -25,44 +24,4 @@ IslandMonsB4:
db 39,GOLDUCK
db 32,GOLBAT
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 31,KRABBY
db 31,STARYU
db 33,KRABBY
db 33,STARYU
db 29,HORSEA
db 31,SEEL
db 31,HORSEA
db 29,SEEL
db 39,JYNX
db 32,GOLBAT
ENDC
IF DEF(_YELLOW)
db 36,GOLBAT
db 36,ZUBAT
db 30,KRABBY
db 32,KINGLER
db 28,SEEL
db 32,SEEL
db 27,GOLBAT
db 45,ZUBAT
db 30,DEWGONG
db 34,DEWGONG
db $05
db 25,TENTACOOL
db 30,TENTACOOL
db 20,TENTACOOL
db 30,STARYU
db 35,TENTACOOL
db 30,STARYU
db 40,TENTACOOL
db 30,STARYU
db 30,STARYU
db 30,STARYU
ENDC
db $00

48
data/wildPokemon/unknowndungeon1.asm
View file

@ -1,38 +1,18 @@
DungeonMons1:
db $0A
IF DEF(_YELLOW)
db 50,GOLBAT
db 55,GOLBAT
db 45,GRAVELER
db 55,GLOOM
db 55,WEEPINBELL
db 52,SANDSLASH
db 54,VENOMOTH
db 54,PARASECT
db 55,DITTO
db 60,DITTO
ELSE
db 46,GOLBAT
db 46,HYPNO
db 46,MAGNETON
IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
db 49,DODRIO
ENDC
IF DEF(_JAPAN) && DEF(_BLUE)
db 49,RAPIDASH
ENDC
db 49,VENOMOTH
IF DEF(_RED)
db 52,ARBOK
ENDC
IF !DEF(_RED)
db 52,SANDSLASH
ENDC
db 49,KADABRA
db 52,PARASECT
db 53,RAICHU
db 53,DITTO
db 46,GOLBAT
db 46,HYPNO
db 46,MAGNETON
db 49,DODRIO
db 49,VENOMOTH
IF DEF(_RED)
db 52,ARBOK
ENDC
IF !DEF(_RED)
db 52,SANDSLASH
ENDC
db 49,KADABRA
db 52,PARASECT
db 53,RAICHU
db 53,DITTO
db $00

40
data/wildPokemon/unknowndungeon2.asm
View file

@ -1,33 +1,13 @@
DungeonMons2:
db $0F
IF DEF(_YELLOW)
db 52,GOLBAT
db 57,GOLBAT
db 50,GRAVELER
db 56,SANDSLASH
db 50,RHYHORN
db 60,DITTO
db 58,GLOOM
db 58,WEEPINBELL
db 60,RHYDON
db 58,RHYDON
ELSE
db 51,DODRIO
db 51,VENOMOTH
db 51,KADABRA
db 52,RHYDON
IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN))
db 52,MAROWAK
ENDC
IF (DEF(_BLUE) && DEF(_JAPAN))
db 52,MAROWAK
ENDC
db 52,ELECTRODE
db 56,CHANSEY
db 54,WIGGLYTUFF
db 55,DITTO
db 60,DITTO
ENDC
db 51,DODRIO
db 51,VENOMOTH
db 51,KADABRA
db 52,RHYDON
db 52,MAROWAK
db 52,ELECTRODE
db 56,CHANSEY
db 54,WIGGLYTUFF
db 55,DITTO
db 60,DITTO
db $00

43
data/wildPokemon/unknowndungeonb1.asm
View file

@ -1,33 +1,18 @@
DungeonMonsB1:
db $19
IF DEF(_YELLOW)
db 54,GOLBAT
db 59,GOLBAT
db 55,GRAVELER
db 52,RHYHORN
db 62,RHYDON
db 60,DITTO
db 56,CHANSEY
db 65,DITTO
db 55,LICKITUNG
db 50,LICKITUNG
ELSE
db 55,RHYDON
db 55,MAROWAK
db 55,ELECTRODE
db 64,CHANSEY
db 64,PARASECT
db 64,RAICHU
IF DEF(_RED)
db 57,ARBOK
ENDC
IF DEF(_BLUE) || DEF(_GREEN)
db 57,SANDSLASH
ENDC
db 65,DITTO
db 63,DITTO
db 67,DITTO
db 55,RHYDON
db 55,MAROWAK
db 55,ELECTRODE
db 64,CHANSEY
db 64,PARASECT
db 64,RAICHU
IF DEF(_RED)
db 57,ARBOK
ENDC
IF DEF(_BLUE)
db 57,SANDSLASH
ENDC
db 65,DITTO
db 63,DITTO
db 67,DITTO
db $00

36
data/wildPokemon/victoryroad1.asm
View file

@ -1,29 +1,13 @@
PlateauMons1:
db $0F
IF DEF(_YELLOW)
db 26,GEODUDE
db 31,GEODUDE
db 36,GEODUDE
db 39,ZUBAT
db 44,ZUBAT
db 41,GEODUDE
db 43,ONIX
db 45,ONIX
db 41,GRAVELER
db 47,GRAVELER
ELSE
db 24,MACHOP
db 26,GEODUDE
db 22,ZUBAT
db 36,ONIX
db 39,ONIX
db 42,ONIX
db 41,GRAVELER
db 41,GOLBAT
db 42,MACHOKE
db 43,MAROWAK
ENDC
db 24,MACHOP
db 26,GEODUDE
db 22,ZUBAT
db 36,ONIX
db 39,ONIX
db 42,ONIX
db 41,GRAVELER
db 41,GOLBAT
db 42,MACHOKE
db 43,MAROWAK
db $00

36
data/wildPokemon/victoryroad2.asm
View file

@ -1,29 +1,13 @@
PlateauMons2:
db $0A
IF DEF(_YELLOW)
db 31,GEODUDE
db 36,GEODUDE
db 41,GEODUDE
db 44,ZUBAT
db 39,GOLBAT
db 44,GRAVELER
db 45,ONIX
db 47,ONIX
db 39,MACHOKE
db 42,MACHOKE
ELSE
db 22,MACHOP
db 24,GEODUDE
db 26,ZUBAT
db 36,ONIX
db 39,ONIX
db 42,ONIX
db 41,MACHOKE
db 40,GOLBAT
db 40,MAROWAK
db 43,GRAVELER
ENDC
db 22,MACHOP
db 24,GEODUDE
db 26,ZUBAT
db 36,ONIX
db 39,ONIX
db 42,ONIX
db 41,MACHOKE
db 40,GOLBAT
db 40,MAROWAK
db 43,GRAVELER
db $00

36
data/wildPokemon/victoryroad3.asm
View file

@ -1,29 +1,13 @@
PlateauMons3:
db $0F
IF DEF(_YELLOW)
db 36,GEODUDE
db 44,GOLBAT
db 41,GEODUDE
db 49,ONIX
db 46,GEODUDE
db 41,GRAVELER
db 42,MACHOKE
db 45,MACHOKE
db 47,GRAVELER
db 47,GRAVELER
ELSE
db 24,MACHOP
db 26,GEODUDE
db 22,ZUBAT
db 42,ONIX
db 40,VENOMOTH
db 45,ONIX
db 43,GRAVELER
db 41,GOLBAT
db 42,MACHOKE
db 45,MACHOKE
ENDC
db 24,MACHOP
db 26,GEODUDE
db 22,ZUBAT
db 42,ONIX
db 40,VENOMOTH
db 45,ONIX
db 43,GRAVELER
db 41,GOLBAT
db 42,MACHOKE
db 45,MACHOKE
db $00

60
data/wildPokemon/viridianforest.asm
View file

@ -1,43 +1,25 @@
ForestMons:
IF DEF(_YELLOW)
db $19
db 3,CATERPIE
db $08
IF DEF(_RED)
db 4,WEEDLE
db 5,KAKUNA
db 3,WEEDLE
db 5,WEEDLE
db 4,KAKUNA
db 6,KAKUNA
db 4,METAPOD
db 4,CATERPIE
db 5,CATERPIE
db 4,PIDGEY
db 6,PIDGEY
db 6,CATERPIE
db 6,METAPOD
db 8,PIDGEY
db 9,PIDGEOTTO
ELSE
db $08
IF DEF(_RED)
db 4,WEEDLE
db 5,KAKUNA
db 3,WEEDLE
db 5,WEEDLE
db 4,KAKUNA
db 6,KAKUNA
db 4,METAPOD
db 3,CATERPIE
ENDC
IF DEF(_BLUE) || DEF(_GREEN)
db 4,CATERPIE
db 5,METAPOD
db 3,CATERPIE
db 5,CATERPIE
db 4,METAPOD
db 6,METAPOD
db 4,KAKUNA
db 3,WEEDLE
ENDC
db 3,PIKACHU
db 5,PIKACHU
db 3,CATERPIE
ENDC
IF DEF(_BLUE)
db 4,CATERPIE
db 5,METAPOD
db 3,CATERPIE
db 5,CATERPIE
db 4,METAPOD
db 6,METAPOD
db 4,KAKUNA
db 3,WEEDLE
ENDC
db 3,PIKACHU
db 5,PIKACHU
db $00

2
data/wildPokemon/waterpokemon.asm
View file

@ -1,6 +1,5 @@
WaterMons:
db $00
db $05
db 5,TENTACOOL
db 10,TENTACOOL
@ -12,4 +11,3 @@ WaterMons:
db 30,TENTACOOL
db 35,TENTACOOL
db 40,TENTACOOL