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/mansion1.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/mansion1.asm')
| -rwxr-xr-x | data/wildPokemon/mansion1.asm | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/data/wildPokemon/mansion1.asm b/data/wildPokemon/mansion1.asm index e96b9d42..22ad032b 100755 --- a/data/wildPokemon/mansion1.asm +++ b/data/wildPokemon/mansion1.asm @@ -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 - |