summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-15 12:31:18 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-15 12:31:18 -0500
commit94722aa8f08ceaef8233d73a87f534b6c3f0475f (patch)
tree5cf3287bec399ededa7e397812d1a06d7533641a /main.asm
parent2b6dd505c1674e0d99d649515a8efe868035db09 (diff)
Move predef/ files into engine/
Get rid of single-file engine/ subdirectories Move tilesets/ palettes unrelated to individual tilesets into data/palettes/ (more from engine/colors.asm can be moved here too)
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/main.asm b/main.asm
index 3deb21334..5049540d8 100644
--- a/main.asm
+++ b/main.asm
@@ -612,7 +612,7 @@ INCLUDE "data/items/marts.asm"
INCLUDE "event/mom.asm"
INCLUDE "event/daycare.asm"
INCLUDE "event/photo.asm"
-INCLUDE "engine/breeding/egg.asm"
+INCLUDE "engine/breeding.asm"
INCLUDE "tilesets/data.asm"
@@ -1771,7 +1771,7 @@ CheckCanLearnMoveTutorMove: ; 492b9
db 12, 00 ; start coords
db 17, 19 ; end coords
-INCLUDE "predef/crystal.asm"
+INCLUDE "engine/crystal_colors.asm"
Unknown_4985a: ; unreferenced
db $ab, $03, $57, $24, $ac, $0e, $13, $32
@@ -5073,7 +5073,7 @@ INCLUDE "engine/crystal_intro.asm"
SECTION "bank3E", ROMX
INCLUDE "gfx/font.asm"
-INCLUDE "engine/time_capsule/conversion.asm"
+INCLUDE "engine/time_capsule.asm"
INCLUDE "engine/unowndex.asm"
INCLUDE "event/magikarp.asm"
INCLUDE "battle/hidden_power.asm"