From 60bcb90636cea7dadf6b42835d11279b1f1e4f71 Mon Sep 17 00:00:00 2001 From: scawful Date: Mon, 2 Dec 2024 05:21:24 -0500 Subject: [PATCH] Cleanup Oracle_main --- Oracle_main.asm | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/Oracle_main.asm b/Oracle_main.asm index ad1edf0..5934bb4 100644 --- a/Oracle_main.asm +++ b/Oracle_main.asm @@ -30,13 +30,8 @@ ; ZSCustomOverworld version ; Kept in case of serious issues which impedes progress ZS_CUSTOM_OW_V2 = 1 -if ZS_CUSTOM_OW_V2 == 1 - incsrc "Overworld/ZSCustomOverworld_Latest.asm" - print "End of ZCustomOverworld2.asm ", pc -else - incsrc "Overworld/ZCustomOverworld.asm" - print "End of ZCustomOverworld.asm ", pc -endif +incsrc "Overworld/ZSCustomOverworld_Latest.asm" +print "End of ZSCustomOverworld.asm ", pc ; Vanilla WRAM and SRAM incsrc "Core/ram.asm" @@ -52,9 +47,6 @@ namespace Oracle incsrc "Core/message.asm" - ; ------------------------------------------------------- - ; Music - print " -- Music -- " print "" @@ -72,9 +64,6 @@ namespace Oracle print "" - ; ------------------------------------------------------- - ; Overworld - print " -- Overworld -- " print "" @@ -82,9 +71,6 @@ namespace Oracle print "" - ; ------------------------------------------------------- - ; Dungeon - print " -- Dungeon -- " print "" @@ -92,9 +78,6 @@ namespace Oracle print "" - ; ------------------------------------------------------- - ; Sprites - print " -- Sprites -- " print "" @@ -102,9 +85,6 @@ namespace Oracle print "" - ; ------------------------------------------------------- - ; Transformation Masks - print " -- Masks -- " print "" @@ -112,9 +92,6 @@ namespace Oracle print "" - ; ------------------------------------------------------- - ; Items - print " -- Items -- " print "" @@ -122,8 +99,6 @@ namespace Oracle print "" - ; ------------------------------------------------------- - print " -- Events -- " print "" @@ -131,23 +106,14 @@ namespace Oracle print "" - ; ------------------------------------------------------- - ; Custom Menu and HUD - print " -- Menu -- " print "" incsrc "Menu/menu.asm" - ; ------------------------------------------------------- - ; Misc - incsrc "Util/item_cheat.asm" - ; ------------------------------------------------------- - ; incsrc "Music/ww_ganondorf.asm" - ; incsrc "Music/great_sea.asm" print ""