From 75a6bb5df6ebd9f122b0ed6ee4ecc9e6c60baf0c Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 16 Feb 2020 12:20:20 +0100 Subject: [PATCH] PanicResetClock -> ClearClock Funky name that only exists based on what it's used for, not so much what it is. --- engine/menus/save.asm | 2 +- home/joypad.asm | 1 + home/time.asm | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 5d2138044..ef9926fe9 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -670,7 +670,7 @@ TryLoadSaveData: ld de, wOptions ld bc, wOptionsEnd - wOptions call CopyBytes - call PanicResetClock + call ClearClock ret INCLUDE "data/default_options.asm" diff --git a/home/joypad.asm b/home/joypad.asm index f562d0878..b39f8c0f4 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -14,6 +14,7 @@ ClearJoypad:: ret Joypad:: +; This is called automatically every frame in VBlank. ; Read the joypad register and translate it to something more ; workable for use in-game. There are 8 buttons, so we can use ; one byte to contain all player input. diff --git a/home/time.asm b/home/time.asm index e631fe060..b708329c5 100644 --- a/home/time.asm +++ b/home/time.asm @@ -1,6 +1,6 @@ ; Functions relating to the timer interrupt and the real-time-clock. -AskTimer:: +Unreferenced_Timer:: push af ldh a, [hMobile] and a @@ -195,7 +195,7 @@ InitTime:: farcall _InitTime ret -PanicResetClock:: +ClearClock:: call .ClearhRTC call SetClock ret