From 9213dc7a5ef887866d19c369feba89bce35d4db0 Mon Sep 17 00:00:00 2001 From: Ozero4 <114027116+Ozero4@users.noreply.github.com> Date: Wed, 5 Mar 2025 04:06:23 +0100 Subject: [PATCH] func_80183070 to Sys_Freeze (#1686) --- include/functions.h | 2 -- spec/spec | 2 +- src/code/{code_80183070.c => sys_freeze.c} | 2 +- tools/disasm/files.txt | 2 +- tools/sizes/code_functions.csv | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) rename src/code/{code_80183070.c => sys_freeze.c} (72%) diff --git a/include/functions.h b/include/functions.h index 419c392134..573dfff44c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -25,8 +25,6 @@ void Room_Draw(PlayState* play, Room* room, u32 flags); void Room_FinishRoomChange(PlayState* play, RoomContext* roomCtx); -NORETURN void func_80183070(void); - AudioTask* AudioThread_Update(void); void AudioThread_QueueCmdF32(u32 opArgs, f32 data); void AudioThread_QueueCmdS32(u32 opArgs, s32 data); diff --git a/spec/spec b/spec/spec index 2aaf3b4383..245b29920a 100644 --- a/spec/spec +++ b/spec/spec @@ -740,7 +740,7 @@ beginseg include "$(BUILD_DIR)/src/code/sys_matrix.o" include "$(BUILD_DIR)/src/code/sys_ucode.o" include "$(BUILD_DIR)/src/code/sys_rumble.o" - include "$(BUILD_DIR)/src/code/code_80183070.o" + include "$(BUILD_DIR)/src/code/sys_freeze.o" include "$(BUILD_DIR)/src/code/c_keyframe.o" include "$(BUILD_DIR)/src/code/sys_slowly.o" include "$(BUILD_DIR)/src/code/sys_flashrom.o" diff --git a/src/code/code_80183070.c b/src/code/sys_freeze.c similarity index 72% rename from src/code/code_80183070.c rename to src/code/sys_freeze.c index bb3d2803ee..c5e427f02a 100644 --- a/src/code/code_80183070.c +++ b/src/code/sys_freeze.c @@ -1,7 +1,7 @@ #include "libc64/sleep.h" #include "attributes.h" -NORETURN void func_80183070(void) { +NORETURN void Sys_Freeze(void) { for (;;) { msleep(1000); } diff --git a/tools/disasm/files.txt b/tools/disasm/files.txt index c3a2403f53..7042d23334 100644 --- a/tools/disasm/files.txt +++ b/tools/disasm/files.txt @@ -477,7 +477,7 @@ 0x80180160 : "sys_matrix", 0x80182C90 : "sys_ucode", 0x80182CE0 : "sys_rumble", - 0x80183070 : "code_80183070", + 0x80183070 : "sys_freeze", 0x801830A0 : "c_keyframe", 0x80185660 : "sys_slowly", 0x801857C0 : "sys_flashrom", diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index a7ddef7340..a15d934b18 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -2914,7 +2914,7 @@ asm/non_matchings/code/sys_ucode/SysUcode_GetUCodeData.s,SysUcode_GetUCodeData,0 asm/non_matchings/code/sys_ucode/RumbleManager_Update.s,RumbleManager_Update,0x80182CE0,0xD0 asm/non_matchings/code/sys_ucode/RumbleManager_Init.s,RumbleManager_Init,0x80183020,0xE asm/non_matchings/code/sys_ucode/RumbleManager_Destroy.s,RumbleManager_Destroy,0x80183058,0x6 -asm/non_matchings/code/code_80183070/func_80183070.s,func_80183070,0x80183070,0xC +asm/non_matchings/code/sys_freeze/Sys_Freeze.s,Sys_Freeze,0x80183070,0xC asm/non_matchings/code/c_keyframe/FrameCtrl_Reset.s,FrameCtrl_Reset,0x801830A0,0xA asm/non_matchings/code/c_keyframe/FrameCtrl_Init.s,FrameCtrl_Init,0x801830C8,0x8 asm/non_matchings/code/c_keyframe/FrameCtrl_SetProperties.s,FrameCtrl_SetProperties,0x801830E8,0x18