diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/wild | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rw-r--r--[-rwxr-xr-x] | data/wildPokemon/ceruleancave1.asm (renamed from data/wildPokemon/unknowndungeon1.asm) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/wildPokemon/ceruleancave2.asm (renamed from data/wildPokemon/unknowndungeon2.asm) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/wildPokemon/ceruleancaveb1.asm (renamed from data/wildPokemon/unknowndungeonb1.asm) | 0 | ||||
| -rwxr-xr-x | data/wild_mons.asm | 18 |
4 files changed, 9 insertions, 9 deletions
diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/ceruleancave1.asm index ff7be04e..ff7be04e 100755..100644 --- a/data/wildPokemon/unknowndungeon1.asm +++ b/data/wildPokemon/ceruleancave1.asm diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/ceruleancave2.asm index 1fd20019..1fd20019 100755..100644 --- a/data/wildPokemon/unknowndungeon2.asm +++ b/data/wildPokemon/ceruleancave2.asm diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/ceruleancaveb1.asm index 5848678f..5848678f 100755..100644 --- a/data/wildPokemon/unknowndungeonb1.asm +++ b/data/wildPokemon/ceruleancaveb1.asm diff --git a/data/wild_mons.asm b/data/wild_mons.asm index c1c44e95..ac4a8897 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -254,12 +254,12 @@ WildDataPointers: ; first part: pokemon found in grass ; second part: pokemon found while surfing ; each part goes as follows: - ; if first byte == 00, then - ; no wild pokemon on this map - ; if first byte != 00, then - ; first byte is encounter rate - ; followed by 20 bytes: - ; level, species (ten times) + ; if first byte == 00, then + ; no wild pokemon on this map + ; if first byte != 00, then + ; first byte is encounter rate + ; followed by 20 bytes: + ; level, species (ten times) INCLUDE "data/wildPokemon/nomons.asm" INCLUDE "data/wildPokemon/route1.asm" @@ -312,9 +312,9 @@ INCLUDE "data/wildPokemon/mansion2.asm" INCLUDE "data/wildPokemon/mansion3.asm" INCLUDE "data/wildPokemon/mansionb1.asm" INCLUDE "data/wildPokemon/route21.asm" -INCLUDE "data/wildPokemon/unknowndungeon1.asm" -INCLUDE "data/wildPokemon/unknowndungeon2.asm" -INCLUDE "data/wildPokemon/unknowndungeonb1.asm" +INCLUDE "data/wildPokemon/ceruleancave1.asm" +INCLUDE "data/wildPokemon/ceruleancave2.asm" +INCLUDE "data/wildPokemon/ceruleancaveb1.asm" INCLUDE "data/wildPokemon/powerplant.asm" INCLUDE "data/wildPokemon/route23.asm" INCLUDE "data/wildPokemon/victoryroad2.asm" |