mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Match EnDaiku_UpdateText (En_Daiku OK) (#841)

Browse source
This commit is contained in:
Roman971 2021-06-02 23:59:01 +02:00 • committed by GitHub
parent 2efeeff7c7
commit f44b24255c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
View file

@ -260,11 +260,9 @@ s32 EnDaiku_UpdateTalking(EnDaiku* this, GlobalContext* globalCtx) {
return newTalkState;
}
#ifdef NON_MATCHING
// regalloc
void EnDaiku_UpdateText(EnDaiku* this, GlobalContext* globalCtx) {
s32 wannabeV0;
s32 wannabeV1;
s32 carpenterType;
s32 freedCount;
s16 sp2E;
s16 sp2C;
@ -278,25 +276,14 @@ void EnDaiku_UpdateText(EnDaiku* this, GlobalContext* globalCtx) {
func_8002F2CC(&this->actor, globalCtx, 100.0f) == 1) {
if (globalCtx->sceneNum == SCENE_GERUDOWAY) {
if (this->stateFlags & ENDAIKU_STATEFLAG_GERUDODEFEATED) {
// wannabeV0 uses v1 and wannabeV1 uses v0, the opposite is wanted
wannabeV0 = gSaveContext.eventChkInf[9];
// moving the wannabeV1 initialization to its declaration fixes regalloc but breaks earlier codegen
wannabeV1 = 0;
if (wannabeV0 & 1) {
wannabeV1++;
}
if (wannabeV0 & 2) {
wannabeV1++;
}
if (wannabeV0 & 4) {
wannabeV1++;
}
if (wannabeV0 & 8) {
wannabeV1++;
freedCount = 0;
for (carpenterType = 0; carpenterType < 4; carpenterType++) {
if (gSaveContext.eventChkInf[9] & (1 << carpenterType)) {
freedCount++;
}
}
switch (wannabeV1) {
switch (freedCount) {
case 0:
this->actor.textId = 0x605B;
break;
@ -357,10 +344,6 @@ void EnDaiku_UpdateText(EnDaiku* this, GlobalContext* globalCtx) {
}
}
}
#else
void EnDaiku_UpdateText(EnDaiku* this, GlobalContext* globalCtx);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_UpdateText.s")
#endif
/**
* The carpenter is idling in the tent.