summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2018-08-16 04:08:15 -0600
committerIIMarckus <iimarckus@gmail.com>2018-08-16 04:08:15 -0600
commita80832dce09f5da3f8f952b7583a85014ecd1df2 (patch)
treee4efbb204528f3195df64417cdbf0f11a709e4c0 /engine
parentce0a831a597b05850d846aef28cb0292068409ea (diff)
Shuffle around a couple of files to match pokecrystal.
Diffstat (limited to 'engine')
-rwxr-xr-xengine/overworld/map_object_action.asm (renamed from engine/map_object_action.asm)0
-rwxr-xr-xengine/overworld/map_objects.asm (renamed from engine/map_objects.asm)4
-rwxr-xr-xengine/overworld/movement.asm (renamed from engine/movement.asm)0
-rwxr-xr-xengine/overworld/npc_movement.asm (renamed from engine/npc_movement.asm)0
-rwxr-xr-xengine/overworld/player_movement.asm (renamed from engine/player_movement.asm)0
-rwxr-xr-xengine/overworld/player_object.asm (renamed from engine/player_object.asm)0
-rwxr-xr-xengine/overworld/player_step.asm (renamed from engine/player_step.asm)0
-rwxr-xr-xengine/overworld/time.asm (renamed from engine/time.asm)0
8 files changed, 2 insertions, 2 deletions
diff --git a/engine/map_object_action.asm b/engine/overworld/map_object_action.asm
index 40499b50..40499b50 100755
--- a/engine/map_object_action.asm
+++ b/engine/overworld/map_object_action.asm
diff --git a/engine/map_objects.asm b/engine/overworld/map_objects.asm
index 20d75238..1c118ed6 100755
--- a/engine/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -163,7 +163,7 @@ asm_4449
jr asm_444e
asm_444e
-INCLUDE "engine/map_object_action.asm"
+INCLUDE "engine/overworld/map_object_action.asm"
CopyNextCoordsTileToStandingCoordsTile: ; 45d9 (1:45d9)
ld hl, $10
@@ -400,7 +400,7 @@ Function4732:
INCLUDE "engine/movement_pattern.asm"
INCLUDE "engine/step_types.asm"
-INCLUDE "engine/movement.asm"
+INCLUDE "engine/overworld/movement.asm"
Function5429: ; 5429 (1:5429)
call InitStep
diff --git a/engine/movement.asm b/engine/overworld/movement.asm
index 74e44cd3..74e44cd3 100755
--- a/engine/movement.asm
+++ b/engine/overworld/movement.asm
diff --git a/engine/npc_movement.asm b/engine/overworld/npc_movement.asm
index e776402a..e776402a 100755
--- a/engine/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
diff --git a/engine/player_movement.asm b/engine/overworld/player_movement.asm
index 61b45a72..61b45a72 100755
--- a/engine/player_movement.asm
+++ b/engine/overworld/player_movement.asm
diff --git a/engine/player_object.asm b/engine/overworld/player_object.asm
index 45562e8e..45562e8e 100755
--- a/engine/player_object.asm
+++ b/engine/overworld/player_object.asm
diff --git a/engine/player_step.asm b/engine/overworld/player_step.asm
index c856a78a..c856a78a 100755
--- a/engine/player_step.asm
+++ b/engine/overworld/player_step.asm
diff --git a/engine/time.asm b/engine/overworld/time.asm
index 7ad065fc..7ad065fc 100755
--- a/engine/time.asm
+++ b/engine/overworld/time.asm