mirror of
https://github.com/zeldaret/mm.git
synced 2026-09-09 11:44:10 -04:00
Decompile and partially document some functions in z_play (#582)
* Decomp 10 functions in z_play, start documentation * Add numbers to enums in z_en_torch2.h * Decompile a 5 more functions (56 unattempted) * Add more details, name some more variables * Bit more Doxygen * Format * Fix arguments * Add symbols to actorfixer.py * Merge branch 'master' into play * Fix z_actor * Review * Deduplicate CycleSceneFlags * Fix warning * Fix unk4 * Review
This commit is contained in:
+3
-3
@@ -2016,7 +2016,7 @@ s32 Actor_PickUp(Actor* actor, GlobalContext* globalCtx, s32 getItemId, f32 xzRa
|
||||
player->getItemDirection = absYawDiff;
|
||||
|
||||
if ((getItemId > GI_NONE) && (getItemId < GI_MAX)) {
|
||||
ActorCutscene_SetIntentToPlay(globalCtx->unk_1879C[1]);
|
||||
ActorCutscene_SetIntentToPlay(globalCtx->playerActorCsIds[1]);
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -2237,7 +2237,7 @@ void Actor_InitContext(GlobalContext* globalCtx, ActorContext* actorCtx, ActorEn
|
||||
s32 i;
|
||||
|
||||
gSaveContext.weekEventReg[92] |= 0x80;
|
||||
cycleFlags = &gSaveContext.cycleSceneFlags[convert_scene_number_among_shared_scenes(globalCtx->sceneNum)];
|
||||
cycleFlags = &gSaveContext.cycleSceneFlags[Play_GetOriginalSceneNumber(globalCtx->sceneNum)];
|
||||
|
||||
bzero(actorCtx, sizeof(ActorContext));
|
||||
ActorOverlayTable_Init();
|
||||
@@ -3037,7 +3037,7 @@ void Actor_CleanupContext(ActorContext* actorCtx, GlobalContext* globalCtx) {
|
||||
actorCtx->absoluteSpace = NULL;
|
||||
}
|
||||
|
||||
func_80169D40(globalCtx);
|
||||
Play_SaveCycleSceneFlags(&globalCtx->state);
|
||||
ActorOverlayTable_Cleanup();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user