mirror of
https://github.com/zeldaret/af.git
synced 2026-09-30 15:27:04 -04:00
Fault + Fault_drawer (#77)
* Fault OK * fault_drawer OK * Cleanup * Cleanup pt 2 * Forgot to save * PR
This commit is contained in:
+2
-2
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
+2
-2
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user