diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-03-22 18:37:40 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-03-22 18:37:40 -0400 |
| commit | db8db97aa341f52174a14d415ca680656f0bcf64 (patch) | |
| tree | ce6b343e20e393e929ea0d8509e69b7c04ae83dd /data | |
| parent | 15890237493f06d266a3197357d42edf883355e2 (diff) | |
Clean up makefile, submodules, root dir; Python 3 compatibility.
Diffstat (limited to 'data')
| -rwxr-xr-x | data/events/collision_stdscripts.asm | 2 | ||||
| -rw-r--r-- | data/events/happiness_probabilities.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/dex_entries.asm | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/events/collision_stdscripts.asm b/data/events/collision_stdscripts.asm index 7e208d2f..dff26dd8 100755 --- a/data/events/collision_stdscripts.asm +++ b/data/events/collision_stdscripts.asm @@ -10,4 +10,4 @@ TileCollisionStdScripts: dbw COLL_TV, tv dbw COLL_WINDOW, window dbw COLL_INCENSE_BURNER, incenseburner - db -1 ; end
\ No newline at end of file + db -1 ; end diff --git a/data/events/happiness_probabilities.asm b/data/events/happiness_probabilities.asm index 798c56fa..0dc08ac7 100644 --- a/data/events/happiness_probabilities.asm +++ b/data/events/happiness_probabilities.asm @@ -9,4 +9,4 @@ HappinessData_OlderHaircutBrother: db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance HappinessData_DaisysGrooming: - db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance
\ No newline at end of file + db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 3dd456e2..6550eae4 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -IF DEF(GOLD) +IF DEF(_GOLD) SECTION "Pokedex Entries 001-064", ROMX BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bulbasaur.asm" @@ -268,7 +268,7 @@ HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ho_oh.asm" CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/celebi.asm" ENDC -IF DEF(SILVER) +IF DEF(_SILVER) SECTION "Pokedex Entries 001-064", ROMX BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/silver/bulbasaur.asm" |