diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-13 17:59:46 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-13 17:59:46 -0400 |
| commit | 31b118ab428a7ed88a62b31870a1946f7dbcd2d2 (patch) | |
| tree | 6941b2b38a2615223b30e8cceb7aab636768dabd /data/wildPokemon/mansionb1.asm | |
| parent | Split default names strings into separate lines to make it less unpleasant to... (diff) | |
| parent | Fix typo: ninetails.asm -> ninetales.asm (diff) | |
| download | pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.gz pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.xz pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/wildPokemon/mansionb1.asm')
| -rwxr-xr-x | data/wildPokemon/mansionb1.asm | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/data/wildPokemon/mansionb1.asm b/data/wildPokemon/mansionb1.asm index 9dcd9893..83266ddd 100755 --- a/data/wildPokemon/mansionb1.asm +++ b/data/wildPokemon/mansionb1.asm @@ -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 |