diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-07-02 14:55:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-02 14:55:09 -0500 |
| commit | c8599831992c91e521cf1d467ccae3d9498e42ef (patch) | |
| tree | 9aab5255e6e78666eec624f1311aa6b17559b022 | |
| parent | 6ba3765c5932996f5da6417ae703794ff10bb1cb (diff) | |
| parent | b4ab6dc7016063ecdff0a33d6a34d16070834d48 (diff) | |
Merge pull request #185 from UrsSchmidt/master
Fixed some inconsistencies in the usage of the if-def directive.
| -rwxr-xr-x | data/wildPokemon/route2.asm | 8 | ||||
| -rwxr-xr-x | data/wildPokemon/route23.asm | 4 | ||||
| -rwxr-xr-x | data/wildPokemon/unknowndungeon1.asm | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm index fb3a5e82..ad958ea5 100755 --- a/data/wildPokemon/route2.asm +++ b/data/wildPokemon/route2.asm @@ -5,19 +5,19 @@ Route2Mons: db 4,PIDGEY db 4,RATTATA db 5,PIDGEY - if DEF(_RED) + IF DEF(_RED) db 3,WEEDLE ENDC - if DEF(_BLUE) + IF DEF(_BLUE) db 3,CATERPIE ENDC db 2,RATTATA db 5,RATTATA - if DEF(_RED) + IF DEF(_RED) db 4,WEEDLE db 5,WEEDLE ENDC - if DEF(_BLUE) + IF DEF(_BLUE) db 4,CATERPIE db 5,CATERPIE ENDC diff --git a/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm index a96a0d3c..a057d24d 100755 --- a/data/wildPokemon/route23.asm +++ b/data/wildPokemon/route23.asm @@ -3,7 +3,7 @@ Route23Mons: IF DEF(_RED) db 26,EKANS ENDC - IF !DEF(_RED) + IF DEF(_BLUE) db 26,SANDSHREW ENDC db 33,DITTO @@ -14,7 +14,7 @@ Route23Mons: IF DEF(_RED) db 41,ARBOK ENDC - IF !DEF(_RED) + IF DEF(_BLUE) db 41,SANDSLASH ENDC db 43,DITTO diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm index 70f680b7..20e8643a 100755 --- a/data/wildPokemon/unknowndungeon1.asm +++ b/data/wildPokemon/unknowndungeon1.asm @@ -8,7 +8,7 @@ DungeonMons1: IF DEF(_RED) db 52,ARBOK ENDC - IF !DEF(_RED) + IF DEF(_BLUE) db 52,SANDSLASH ENDC db 49,KADABRA |