diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/m_player_call.c | 1 | ||||
| -rw-r--r-- | src/code/m_submenu.c | 14 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/code/m_player_call.c b/src/code/m_player_call.c index 3f8a68c..308eade 100644 --- a/src/code/m_player_call.c +++ b/src/code/m_player_call.c @@ -1,3 +1,4 @@ +#include "prevent_bss_reordering.h" #include "ultra64.h" #include "m_actor.h" #include "m_actor_dlftbls.h" diff --git a/src/code/m_submenu.c b/src/code/m_submenu.c index 5352ebe..6ecff7a 100644 --- a/src/code/m_submenu.c +++ b/src/code/m_submenu.c @@ -174,22 +174,20 @@ void* mSM_ovlptr_dllcnv(void* vram, mSM* submenu) { return (void*)((uintptr_t)vram + area->relocationDiff); } -#ifdef NON_MATCHING -// regalloc void func_800C47B4_jp(UNUSED void* arg0, UNUSED void* arg1) { void* temp_s0; Player* temp_v0_3; UNUSED void* temp_v0_2; - struct_800418D8* temp_v0; + OSThread* temp_v0; u32 temp_a3; // sp34 u32 var_t1; // sp30 u32 var_t0; // sp2C size_t ovlSize; void* temp_a2; // sp20 - temp_v0 = B_800418D8_jp; - var_t0 = (temp_v0 != NULL) ? temp_v0->unk_11C : 0; - var_t1 = (temp_v0 != NULL) ? temp_v0->unk_104 : 0; + temp_v0 = gFaultMgr.faultedThread; + var_t0 = (temp_v0 != NULL) ? temp_v0->context.pc : 0; + var_t1 = (temp_v0 != NULL) ? temp_v0->context.ra : 0; FaultDrawer_Printf("SubmenuArea_visit\n"); FaultDrawer_Printf("RamStart-RamEnd Offset\n"); @@ -226,10 +224,6 @@ void func_800C47B4_jp(UNUSED void* arg0, UNUSED void* arg1) { } } } -#else -void func_800C47B4_jp(void*, void*); -#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_submenu/func_800C47B4_jp.s") -#endif uintptr_t func_800C497C_jp(uintptr_t address, UNUSED void* param) { uintptr_t addr = address; |