diff --git a/include/functions.h b/include/functions.h index 184bf7daf1..f27a14aa2b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -4078,6 +4078,6 @@ s32 func_801A8A50(s32 param1); void func_801AA610(GlobalContext* globalCtx); void func_801AA624(GlobalContext* globalCtx); // void func_801AA68C(UNK_TYPE4 ctxt); -void nop_801AAAA0(GlobalContext* globalCtx); +void func_801AAAA0(GlobalContext* globalCtx); #endif diff --git a/src/code/z_construct.c b/src/code/z_construct.c index c88f60c099..a2e295da26 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -1,3 +1,4 @@ #include "global.h" -#pragma GLOBAL_ASM("asm/non_matchings/code/z_construct/nop_801AAAA0.s") +void func_801AAAA0(GlobalContext* globalCtx) { +} diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index 561daeaa87..cd4a6451f1 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -4086,7 +4086,7 @@ 0x801AA610:("func_801AA610",), 0x801AA624:("func_801AA624",), 0x801AA68C:("func_801AA68C",), - 0x801AAAA0:("nop_801AAAA0",), + 0x801AAAA0:("func_801AAAA0",), 0x80800000:("Title_UpdateCounters",), 0x8080009C:("Title_RenderView",), 0x80800134:("Title_Draw",), diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index e09804c9da..4b031b6a46 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -3600,4 +3600,4 @@ asm/non_matchings/code/code_801AA020/func_801AA520.s,func_801AA520,0x801AA520,0x asm/non_matchings/code/z_game_over/func_801AA610.s,func_801AA610,0x801AA610,0x5 asm/non_matchings/code/z_game_over/func_801AA624.s,func_801AA624,0x801AA624,0x1A asm/non_matchings/code/z_game_over/func_801AA68C.s,func_801AA68C,0x801AA68C,0x105 -asm/non_matchings/code/z_construct/nop_801AAAA0.s,nop_801AAAA0,0x801AAAA0,0x4 +asm/non_matchings/code/z_construct/func_801AAAA0.s,func_801AAAA0,0x801AAAA0,0x4