summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-03 02:23:54 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-03 02:23:54 -0500
commit10bd011d0619996783e370a602619ea802833600 (patch)
treed7892f9c07f6815d6efa8475032eb7de24ffa4f5
parent0b6857b1a9c3e170e78f65695e437150ab1e500f (diff)
More relevant data file locations
-rw-r--r--constants/pokemon_constants.asm2
-rw-r--r--data/items/catch_rate_items.asm (renamed from data/time_capsule/catch_rate_items.asm)0
-rw-r--r--data/pokemon/rby_base_special.asm (renamed from data/time_capsule/special_stats.asm)0
-rw-r--r--data/pokemon/rby_order.asm (renamed from data/time_capsule/mon_order.asm)0
-rwxr-xr-xengine/link.asm2
-rwxr-xr-xengine/time_capsule.asm2
-rw-r--r--engine/time_capsule_2.asm2
7 files changed, 4 insertions, 4 deletions
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 54be7c1e5..fc9a5c08d 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -12,7 +12,7 @@
; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm)
; - EZChat_SortedPokemon (see data/pokemon/ezchat_order.asm)
; - NewPokedexOrder (see data/pokemon/dex_order_new.asm)
-; - Pokered_MonIndices (see data/time_capsule/mon_order.asm)
+; - Pokered_MonIndices (see data/pokemon/rby_order.asm)
; - AnimationPointers (see gfx/pokemon/anim_pointers.asm)
; - AnimationIdlePointers (see gfx/pokemon/idle_pointers.asm)
; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
diff --git a/data/time_capsule/catch_rate_items.asm b/data/items/catch_rate_items.asm
index fbab7d434..fbab7d434 100644
--- a/data/time_capsule/catch_rate_items.asm
+++ b/data/items/catch_rate_items.asm
diff --git a/data/time_capsule/special_stats.asm b/data/pokemon/rby_base_special.asm
index 9998692ab..9998692ab 100644
--- a/data/time_capsule/special_stats.asm
+++ b/data/pokemon/rby_base_special.asm
diff --git a/data/time_capsule/mon_order.asm b/data/pokemon/rby_order.asm
index e40ba0273..e40ba0273 100644
--- a/data/time_capsule/mon_order.asm
+++ b/data/pokemon/rby_order.asm
diff --git a/engine/link.asm b/engine/link.asm
index 5c45707d7..e45f62dfd 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -1130,7 +1130,7 @@ TimeCapsule_ReplaceTeruSama: ; 28771
ret
-INCLUDE "data/time_capsule/catch_rate_items.asm"
+INCLUDE "data/items/catch_rate_items.asm"
Link_CopyOTData: ; 2879e
diff --git a/engine/time_capsule.asm b/engine/time_capsule.asm
index 577b2dce8..96f61833b 100755
--- a/engine/time_capsule.asm
+++ b/engine/time_capsule.asm
@@ -144,4 +144,4 @@ PlaceTradePartnerNamesAndParty: ; fb60d
jr .loop
; fb656
-INCLUDE "data/time_capsule/special_stats.asm"
+INCLUDE "data/pokemon/rby_base_special.asm"
diff --git a/engine/time_capsule_2.asm b/engine/time_capsule_2.asm
index 5da72e7c8..0378ed697 100644
--- a/engine/time_capsule_2.asm
+++ b/engine/time_capsule_2.asm
@@ -36,4 +36,4 @@ ConvertMon_1to2: ; fb908
; fb91c
-INCLUDE "data/time_capsule/mon_order.asm"
+INCLUDE "data/pokemon/rby_order.asm"