diff options
| author | IIMarckus <iimarckus@gmail.com> | 2018-08-16 04:08:15 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2018-08-16 04:08:15 -0600 |
| commit | a80832dce09f5da3f8f952b7583a85014ecd1df2 (patch) | |
| tree | e4efbb204528f3195df64417cdbf0f11a709e4c0 /main.asm | |
| parent | ce0a831a597b05850d846aef28cb0292068409ea (diff) | |
Shuffle around a couple of files to match pokecrystal.
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -49,7 +49,7 @@ PushOAM: PushOAMEnd -INCLUDE "engine/map_objects.asm" +INCLUDE "engine/overworld/map_objects.asm" INCLUDE "engine/main_menu.asm" INCLUDE "engine/title.asm" @@ -204,7 +204,7 @@ CheckNickErrors:: ; 677e (1:677e) INCLUDE "engine/math.asm" ItemAttributes: INCLUDE "items/item_attributes.asm" -INCLUDE "engine/npc_movement.asm" +INCLUDE "engine/overworld/npc_movement.asm" INCLUDE "event/happiness_egg.asm" INCLUDE "event/special.asm" @@ -321,7 +321,7 @@ Unknown85d7: db PAL_BG_ROOF endr -INCLUDE "engine/player_object.asm" +INCLUDE "engine/overworld/player_object.asm" INCLUDE "engine/sine.asm" INCLUDE "engine/predef.asm" INCLUDE "engine/color.asm" @@ -409,7 +409,7 @@ FlagPredef: INCLUDE "engine/health.asm" INCLUDE "event/overworld.asm" INCLUDE "engine/items.asm" -INCLUDE "engine/player_step.asm" +INCLUDE "engine/overworld/player_step.asm" INCLUDE "engine/anim_hp_bar.asm" INCLUDE "engine/move_mon.asm" INCLUDE "engine/billspctop.asm" @@ -634,9 +634,9 @@ Text_KnowsMove: SECTION "bank4", ROMX, BANK[$4] -INCLUDE "engine/player_movement.asm" +INCLUDE "engine/overworld/player_movement.asm" INCLUDE "engine/pack.asm" -INCLUDE "engine/time.asm" +INCLUDE "engine/overworld/time.asm" INCLUDE "engine/learn_tm.asm" INCLUDE "engine/namingscreen.asm" |