summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2023-08-28 09:59:31 -0700
committerGitHub <noreply@github.com>2023-08-28 09:59:31 -0700
commit1e3511efea9cf4379a04fca77f6a00cb170da28c (patch)
tree7650c04105d35d867939d19e3421102ae511102f /src/code
parentfcfbb6c52feec4a01b46f0c2bcc037af373d4fe9 (diff)
Fault + Fault_drawer (#77)
* Fault OK * fault_drawer OK * Cleanup * Cleanup pt 2 * Forgot to save * PR
Diffstat (limited to 'src/code')
-rw-r--r--src/code/m_actor.c4
-rw-r--r--src/code/m_actor_dlftbls.c8
-rw-r--r--src/code/m_malloc.c4
-rw-r--r--src/code/m_submenu.c8
4 files changed, 12 insertions, 12 deletions
diff --git a/src/code/m_actor.c b/src/code/m_actor.c
index 1762c01..7398d4b 100644
--- a/src/code/m_actor.c
+++ b/src/code/m_actor.c
@@ -253,7 +253,7 @@ void Actor_draw(Game_Play* game_play, Actor* actor) {
FaultClient faultClient;
LightsN* light;
- Fault_AddClient(&faultClient, func_80056380_jp, actor, "Actor_draw");
+ fault_AddClient(&faultClient, func_80056380_jp, actor, "Actor_draw");
//! FAKE
if (1) {}
@@ -289,7 +289,7 @@ void Actor_draw(Game_Play* game_play, Actor* actor) {
CLOSE_DISPS(game_play->state.gfxCtx);
- Fault_RemoveClient(&faultClient);
+ fault_RemoveClient(&faultClient);
}
s32 Actor_draw_actor_no_culling_check(Actor* actor) {
diff --git a/src/code/m_actor_dlftbls.c b/src/code/m_actor_dlftbls.c
index c502323..affc057 100644
--- a/src/code/m_actor_dlftbls.c
+++ b/src/code/m_actor_dlftbls.c
@@ -96,12 +96,12 @@ FaultAddrConvClient sActorOverlayTableFaultAddrConvClient;
void actor_dlftbls_init(void) {
actor_dlftbls_num = ACTOR_ID_MAX;
- Fault_AddClient(&sActorOverlayTableFaultClient, ActorOverlayTable_FaultClient, NULL, NULL);
- Fault_AddAddrConvClient(&sActorOverlayTableFaultAddrConvClient, ActorOverlayTable_FaultAddrConv, NULL);
+ fault_AddClient(&sActorOverlayTableFaultClient, ActorOverlayTable_FaultClient, NULL, NULL);
+ fault_AddressConverterAddClient(&sActorOverlayTableFaultAddrConvClient, ActorOverlayTable_FaultAddrConv, NULL);
}
void actor_dlftbls_cleanup(void) {
- Fault_RemoveClient(&sActorOverlayTableFaultClient);
- Fault_RemoveAddrConvClient(&sActorOverlayTableFaultAddrConvClient);
+ fault_RemoveClient(&sActorOverlayTableFaultClient);
+ fault_AddressConverterRemoveClient(&sActorOverlayTableFaultAddrConvClient);
actor_dlftbls_num = 0;
}
diff --git a/src/code/m_malloc.c b/src/code/m_malloc.c
index a63ac74..69a20b1 100644
--- a/src/code/m_malloc.c
+++ b/src/code/m_malloc.c
@@ -42,11 +42,11 @@ s32 zelda_CheckArena(void) {
void zelda_InitArena(void* heap, size_t size) {
__osMallocInit(&zelda_arena, heap, size);
- Fault_AddClient(&B_80141FC8_jp, (void*)ArenaImpl_FaultClient, &zelda_arena, NULL);
+ fault_AddClient(&B_80141FC8_jp, (void*)ArenaImpl_FaultClient, &zelda_arena, NULL);
}
void zelda_CleanupArena(void) {
- Fault_RemoveClient(&B_80141FC8_jp);
+ fault_RemoveClient(&B_80141FC8_jp);
__osMallocCleanup(&zelda_arena);
}
diff --git a/src/code/m_submenu.c b/src/code/m_submenu.c
index 7419545..5352ebe 100644
--- a/src/code/m_submenu.c
+++ b/src/code/m_submenu.c
@@ -297,13 +297,13 @@ dummy_label_255895:
D_8010DCE4_jp = var_s0;
SubmenuArea_visit = NULL;
- Fault_AddClient(&B_80144670_jp, func_800C47B4_jp, NULL, NULL);
- Fault_AddAddrConvClient(&B_80144680_jp, func_800C497C_jp, NULL);
+ fault_AddClient(&B_80144670_jp, func_800C47B4_jp, NULL, NULL);
+ fault_AddressConverterAddClient(&B_80144680_jp, func_800C497C_jp, NULL);
}
void mSM_submenu_ovlptr_cleanup(mSM* submenu) {
- Fault_RemoveClient(&B_80144670_jp);
- Fault_RemoveAddrConvClient(&B_80144680_jp);
+ fault_RemoveClient(&B_80144670_jp);
+ fault_AddressConverterRemoveClient(&B_80144680_jp);
if (SubmenuArea_visit != NULL) {
SubmenuArea_DoUnlink(SubmenuArea_visit, submenu);
SubmenuArea_visit = NULL;