diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-06 13:51:06 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:32:39 -0400 |
| commit | 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 (patch) | |
| tree | 08106f9eec9cff1137269c20ccf848cfeffa71c6 /data/wildPokemon/mansion2.asm | |
| parent | text.o (diff) | |
| download | pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.tar.gz pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.tar.xz pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.zip | |
Build only Yellow
Conflicts:
gfx/intro_nido_1.6x6.png
gfx/intro_nido_2.6x6.png
gfx/intro_nido_3.6x6.png
gfx/redgreenversion.png
text.asm
text/maps/cerulean_trade_house.asm
text/maps/copycats_house_1f.asm
text/maps/daycare_2.asm
text/maps/museum_2f.asm
text/maps/oaks_lab.asm
text/maps/pewter_gym.asm
text/maps/route_9_1.asm
text/maps/school.asm
text/maps/vermilion_gym_1.asm
yellow/main.asm
Diffstat (limited to 'data/wildPokemon/mansion2.asm')
| -rwxr-xr-x | data/wildPokemon/mansion2.asm | 62 |
1 files changed, 10 insertions, 52 deletions
diff --git a/data/wildPokemon/mansion2.asm b/data/wildPokemon/mansion2.asm index 77cce408..e830560a 100755 --- a/data/wildPokemon/mansion2.asm +++ b/data/wildPokemon/mansion2.asm @@ -1,56 +1,14 @@ MansionMons2: db $0A - IF DEF(_RED) - db 32,GROWLITHE - db 34,KOFFING - db 34,KOFFING - db 30,PONYTA - db 30,KOFFING - db 32,PONYTA - db 30,GRIMER - db 28,PONYTA - db 39,WEEZING - db 37,MUK - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 32,VULPIX - 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(_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 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 db $00 |