13 files changed, 52 insertions, 53 deletions
diff --git a/engine/routines/unreferenced_getgen1trainerclassname.asm b/engine/battle/unreferenced_getgen1trainerclassname.asm
index da8e98b61..da8e98b61 100644
--- a/engine/routines/unreferenced_getgen1trainerclassname.asm
+++ b/engine/battle/unreferenced_getgen1trainerclassname.asm
diff --git a/engine/routines/flagpredef.asm b/engine/flagpredef.asm
index 2a6d91ee1..2a6d91ee1 100644
--- a/engine/routines/flagpredef.asm
+++ b/engine/flagpredef.asm
diff --git a/engine/routines/initlist.asm b/engine/link/initlist.asm
index 26c77b5bb..26c77b5bb 100644
--- a/engine/routines/initlist.asm
+++ b/engine/link/initlist.asm
diff --git a/engine/routines/getsquareroot.asm b/engine/math/getsquareroot.asm
index 412fd04ff..412fd04ff 100644
--- a/engine/routines/getsquareroot.asm
+++ b/engine/math/getsquareroot.asm
diff --git a/engine/routines/math.asm b/engine/math/math.asm
index 0cd6b0b47..0cd6b0b47 100755
--- a/engine/routines/math.asm
+++ b/engine/math/math.asm
diff --git a/engine/routines/printnum.asm b/engine/math/printnum.asm
index fec798d5c..fec798d5c 100755
--- a/engine/routines/printnum.asm
+++ b/engine/math/printnum.asm
diff --git a/engine/routines/sine.asm b/engine/math/sine.asm
index 23e86c015..23e86c015 100755
--- a/engine/routines/sine.asm
+++ b/engine/math/sine.asm
diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm
new file mode 100644
index 000000000..a86faf06a
--- /dev/null
+++ b/engine/menus/delete_save.asm
@@ -0,0 +1,36 @@
+_DeleteSaveData: ; 4d54c
+	farcall BlankScreen
+	ld b, SCGB_DIPLOMA
+	call GetSGBLayout
+	call LoadStandardFont
+	call LoadFontsExtra
+	ld de, MUSIC_MAIN_MENU
+	call PlayMusic
+	ld hl, .Text_ClearAllSaveData
+	call PrintText
+	ld hl, .NoYesMenuHeader
+	call CopyMenuHeader
+	call VerticalMenu
+	ret c
+	ld a, [wMenuCursorY]
+	cp $1
+	ret z
+	farcall EmptyAllSRAMBanks
+	ret
+
+.Text_ClearAllSaveData: ; 0x4d580
+	; Clear all save data?
+	text_jump UnknownText_0x1c564a
+	db "@"
+
+.NoYesMenuHeader: ; 0x4d585
+	db 0 ; flags
+	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
+	dw .MenuData
+	db 1 ; default option
+
+.MenuData: ; 0x4d58d
+	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
+	db 2 ; items
+	db "NO@"
+	db "YES@"
diff --git a/engine/routines/emptyallsrambanks.asm b/engine/menus/emptyallsrambanks.asm
index 8b060f3ef..8b060f3ef 100644
--- a/engine/routines/emptyallsrambanks.asm
+++ b/engine/menus/emptyallsrambanks.asm
diff --git a/engine/routines/predef.asm b/engine/predef.asm
index 13c593c90..13c593c90 100644
--- a/engine/routines/predef.asm
+++ b/engine/predef.asm
diff --git a/engine/rtc/delete_save_change_clock.asm b/engine/rtc/reset_password.asm
index 431dc6034..fd5007ba7 100755
--- a/engine/rtc/delete_save_change_clock.asm
+++ b/engine/rtc/reset_password.asm
@@ -257,40 +257,3 @@ ClockResetPassword: ; 4d41e
 	dec c
 	jr nz, .ComponentFromString
 	ret
-
-_DeleteSaveData: ; 4d54c
-	farcall BlankScreen
-	ld b, SCGB_DIPLOMA
-	call GetSGBLayout
-	call LoadStandardFont
-	call LoadFontsExtra
-	ld de, MUSIC_MAIN_MENU
-	call PlayMusic
-	ld hl, .Text_ClearAllSaveData
-	call PrintText
-	ld hl, .NoYesMenuHeader
-	call CopyMenuHeader
-	call VerticalMenu
-	ret c
-	ld a, [wMenuCursorY]
-	cp $1
-	ret z
-	farcall EmptyAllSRAMBanks
-	ret
-
-.Text_ClearAllSaveData: ; 0x4d580
-	; Clear all save data?
-	text_jump UnknownText_0x1c564a
-	db "@"
-
-.NoYesMenuHeader: ; 0x4d585
-	db 0 ; flags
-	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData
-	db 1 ; default option
-
-.MenuData: ; 0x4d58d
-	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
-	db 2 ; items
-	db "NO@"
-	db "YES@"
diff --git a/engine/rtc/clock_reset.asm b/engine/rtc/restart_clock.asm
index c05129349..5fbac80dd 100755
--- a/engine/rtc/clock_reset.asm
+++ b/engine/rtc/restart_clock.asm
@@ -1,5 +1,4 @@
-
-ResetClock_GetWraparoundTime: ; 20000 (8:4000)
+RestartClock_GetWraparoundTime: ; 20000 (8:4000)
 	push hl
 	dec a
 	ld e, a
@@ -152,7 +151,7 @@ RestartClock: ; 20021 (8:4021)
 
 .pressed_up
 	ld a, [wBuffer1]
-	call ResetClock_GetWraparoundTime
+	call RestartClock_GetWraparoundTime
 	ld a, [de]
 	inc a
 	ld [de], a
@@ -164,7 +163,7 @@ RestartClock: ; 20021 (8:4021)
 
 .pressed_down
 	ld a, [wBuffer1]
-	call ResetClock_GetWraparoundTime
+	call RestartClock_GetWraparoundTime
 	ld a, [de]
 	dec a
 	ld [de], a
@@ -230,7 +229,7 @@ RestartClock: ; 20021 (8:4021)
 
 .PlaceChars: ; 20168 (8:4168)
 	push de
-	call ResetClock_GetWraparoundTime
+	call RestartClock_GetWraparoundTime
 	ld a, [wBuffer3]
 	dec a
 	ld b, a
diff --git a/main.asm b/main.asm
index 4980beee4..2420bd414 100644
--- a/main.asm
+++ b/main.asm
@@ -10,7 +10,7 @@ INCLUDE "engine/menus/intro_menu.asm"
 INCLUDE "engine/overworld/init_map.asm"
 INCLUDE "engine/pokemon/learn.asm"
 INCLUDE "engine/pokemon/checknickerrors.asm"
-INCLUDE "engine/routines/math.asm"
+INCLUDE "engine/math/math.asm"
 INCLUDE "data/items/attributes.asm"
 INCLUDE "engine/overworld/npc_movement.asm"
 INCLUDE "engine/events/happiness_egg.asm"
@@ -20,8 +20,8 @@ INCLUDE "engine/events/specials_2.asm"
 SECTION "bank2", ROMX
 
 INCLUDE "engine/overworld/player_object.asm"
-INCLUDE "engine/routines/sine.asm"
-INCLUDE "engine/routines/predef.asm"
+INCLUDE "engine/math/sine.asm"
+INCLUDE "engine/predef.asm"
 INCLUDE "engine/gfx/color.asm"
 
 
@@ -29,7 +29,7 @@ SECTION "bank3", ROMX
 
 INCLUDE "engine/events/checktime.asm"
 INCLUDE "engine/events/specials.asm"
-INCLUDE "engine/routines/printnum.asm"
+INCLUDE "engine/math/printnum.asm"
 INCLUDE "engine/pokemon/health.asm"
 INCLUDE "engine/events/overworld.asm"
 INCLUDE "engine/items/items.asm"
@@ -65,7 +65,7 @@ INCLUDE "engine/events/bug_contest/judging.asm"
 INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm"
 INCLUDE "engine/events/bug_contest/contest_2.asm"
 INCLUDE "engine/pokemon/correcterrorsinplayerparty.asm"
-INCLUDE "engine/routines/getsquareroot.asm"
+INCLUDE "engine/math/getsquareroot.asm"
 
 
 SECTION "bank5", ROMX
@@ -95,7 +95,7 @@ INCLUDE "engine/tilesets/mapgroup_roofs.asm"
 
 SECTION "Clock Reset", ROMX
 
-INCLUDE "engine/rtc/clock_reset.asm"
+INCLUDE "engine/rtc/restart_clock.asm"
 
 
 SECTION "bank9", ROMX
@@ -208,7 +208,7 @@ SECTION "bank13", ROMX
 INCLUDE "engine/tilesets/map_palettes.asm"
 INCLUDE "gfx/tileset_palette_maps.asm"
 INCLUDE "data/collision_permissions.asm"
-INCLUDE "engine/routines/emptyallsrambanks.asm"
+INCLUDE "engine/menus/emptyallsrambanks.asm"
 INCLUDE "engine/menus/savemenu_copytilemapatonce.asm"
 INCLUDE "engine/events/checksave.asm"
 INCLUDE "data/maps/scenes.asm"
@@ -222,9 +222,10 @@ Shrink2Pic: ; 4d2d9
 INCBIN "gfx/new_game/shrink2.2bpp.lz"
 
 INCLUDE "engine/link/link_2.asm"
-INCLUDE "engine/rtc/delete_save_change_clock.asm"
+INCLUDE "engine/rtc/reset_password.asm"
+INCLUDE "engine/menus/delete_save.asm"
 INCLUDE "data/tilesets.asm"
-INCLUDE "engine/routines/flagpredef.asm"
+INCLUDE "engine/flagpredef.asm"
 INCLUDE "engine/gfx/trademonfrontpic.asm"
 INCLUDE "engine/events/pokerus/check_pokerus.asm"
 INCLUDE "engine/events/lucky_number.asm"
@@ -253,9 +254,9 @@ INCLUDE "engine/events/basement_key.asm"
 INCLUDE "engine/events/sacred_ash.asm"
 INCLUDE "engine/pokemon/tempmon.asm"
 INCLUDE "engine/pokemon/types.asm"
-INCLUDE "engine/routines/unreferenced_getgen1trainerclassname.asm"
+INCLUDE "engine/battle/unreferenced_getgen1trainerclassname.asm"
 INCLUDE "engine/pokemon/mon_stats.asm"
-INCLUDE "engine/routines/initlist.asm"
+INCLUDE "engine/link/initlist.asm"
 INCLUDE "engine/pokemon/experience.asm"
 INCLUDE "engine/pokemon/switchpartymons.asm"
 INCLUDE "engine/gfx/load_pics.asm"