summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-05-11 16:06:49 -0400
committerentrpntr <entrpntr@gmail.com>2020-05-11 16:06:49 -0400
commitf2d087165f870dbf55794064dedff4116596258d (patch)
treebec8f8649a4d4e0e1ee420fba569d2dfa7c27958 /main.asm
parent6de1f826f638e5eb4f0177334c9682e1246fa9f5 (diff)
Clean up engine/menus/intro_menu.asm.
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm10
1 files changed, 7 insertions, 3 deletions
diff --git a/main.asm b/main.asm
index 7ccd3f32..65b0ef5f 100644
--- a/main.asm
+++ b/main.asm
@@ -6,6 +6,7 @@ SECTION "bank1", ROMX
INCLUDE "engine/link/place_waiting_text.asm"
INCLUDE "engine/gfx/load_push_oam.asm"
INCLUDE "engine/overworld/map_objects.asm"
+INCLUDE "engine/menus/main_menu.asm"
INCLUDE "engine/menus/intro_menu.asm"
INCLUDE "engine/overworld/init_map.asm"
INCLUDE "engine/pokemon/learn.asm"
@@ -180,7 +181,10 @@ TilesetDarkCaveColl::
SECTION "bank8", ROMX
- dr $20000, $20181
+RestartClock_GetWraparoundTime::
+ dr $20000, $20021
+RestartClock::
+ dr $20021, $20181
TilesetTowerGFX::
dr $20181, $205b1
TilesetTowerMeta::
@@ -498,9 +502,9 @@ SaveMenu_CopyTilemapAtOnce::
dr $8c000, $8c0b9
PhoneRing_CopyTilemapAtOnce::
dr $8c0b9, $8c17a
-ResetClock_::
+_ResetClock::
dr $8c17a, $8c310
-DeleteSaveData_::
+_DeleteSaveData::
dr $8c310, $8c355
DummyPredef35::
DummyPredef36::