diff options
| author | IIMarckus <iimarckus@gmail.com> | 2016-02-12 21:10:58 -0700 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2016-02-12 21:10:58 -0700 |
| commit | 757114cad28d59eacdf22f26cd175aca17cb5407 (patch) | |
| tree | 9c8ad00dd63e38acd27e080fc67e80900cdc47f1 /data/wildPokemon/route6.asm | |
| parent | Remove misleading (unreferenced) labels. (diff) | |
| download | pokeyellow-757114cad28d59eacdf22f26cd175aca17cb5407.tar.gz pokeyellow-757114cad28d59eacdf22f26cd175aca17cb5407.tar.xz pokeyellow-757114cad28d59eacdf22f26cd175aca17cb5407.zip | |
Get rid of yellow ifdefs in wild Pokémon.
Diffstat (limited to 'data/wildPokemon/route6.asm')
| -rwxr-xr-x | data/wildPokemon/route6.asm | 47 |
1 files changed, 2 insertions, 45 deletions
diff --git a/data/wildPokemon/route6.asm b/data/wildPokemon/route6.asm index 86e0c05f..92512ffb 100755 --- a/data/wildPokemon/route6.asm +++ b/data/wildPokemon/route6.asm @@ -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 |