From 21514f841e1d012967a8ef2784b688b06b55b95d Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Thu, 9 Jan 2025 02:36:14 -0500
Subject: [PATCH] Overworld cleanup

---
 Overworld/time_system.asm | 12 ++++++------
 Overworld/world_map.asm   | 21 ++++++---------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/Overworld/time_system.asm b/Overworld/time_system.asm
index 99739c2..18f38a1 100644
--- a/Overworld/time_system.asm
+++ b/Overworld/time_system.asm
@@ -98,12 +98,12 @@ Overworld_SetFixedColAndScroll_AltEntry = $0BFE72
 
 RunClock:
 {
-  LDA $10	; checks current event in game
-  CMP #$07 : BEQ .counter_increasing ; dungeon/building?
-    CMP #$09 : BEQ .overworld ; overworld?
-    CMP #$0B : BEQ .overworld ; special overworld?
-      CMP #$0E : BEQ .dialog  ; dialog box?
-        RTS
+  ; checks current event in game
+  LDA $10 : CMP #$07 : BEQ .counter_increasing ; dungeon/building?
+            CMP #$09 : BEQ .overworld ; overworld?
+            CMP #$0B : BEQ .overworld ; special overworld?
+            CMP #$0E : BEQ .dialog  ; dialog box?
+              RTS
     .overworld
     ; Reload Sprite Gfx Properties
     JSL $00FC62 ; Sprite_LoadGraphicsProperties
diff --git a/Overworld/world_map.asm b/Overworld/world_map.asm
index 68e74f9..dfe9c87 100644
--- a/Overworld/world_map.asm
+++ b/Overworld/world_map.asm
@@ -1,11 +1,9 @@
 ; =========================================================
 ; World Map Module
 
-org $0AC589
-    WorldMapIcon_AdjustCoordinate:
 
-org $0AC51C
-    WorldMap_HandleSpriteBlink:
+WorldMapIcon_AdjustCoordinate = $0AC589
+WorldMap_HandleSpriteBlink = $0AC51C
 
 pullpc
 
@@ -169,17 +167,10 @@ org $0ABF90
 MapIconDraw:
 {
   ; .dont_draw_link
-  LDA.l $7EC108
-  PHA
-
-  LDA.l $7EC109
-  PHA
-
-  LDA.l $7EC10A
-  PHA
-
-  LDA.l $7EC10B
-  PHA
+  LDA.l $7EC108 : PHA
+  LDA.l $7EC109 : PHA
+  LDA.l $7EC10A : PHA
+  LDA.l $7EC10B : PHA
 
   ;-----------------------------------