summaryrefslogtreecommitdiff
path: root/docs/tutorial
diff options
context:
space:
mode:
Diffstat (limited to 'docs/tutorial')
-rw-r--r--docs/tutorial/advanced_control_flow.md42
-rw-r--r--docs/tutorial/documenting.md4
-rw-r--r--docs/tutorial/other_functions.md6
3 files changed, 26 insertions, 26 deletions
diff --git a/docs/tutorial/advanced_control_flow.md b/docs/tutorial/advanced_control_flow.md
index 3420fc597..8cd9660ba 100644
--- a/docs/tutorial/advanced_control_flow.md
+++ b/docs/tutorial/advanced_control_flow.md
@@ -159,14 +159,14 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
temp_v0 = Message_GetState(&globalCtx->msgCtx);
if (temp_v0 != 4) {
if (temp_v0 != 5) {
- if ((temp_v0 == 6) && (func_80147624(globalCtx) != 0)) {
+ if ((temp_v0 == 6) && (Message_ShouldAdvance(globalCtx) != 0)) {
this->actionFunc = func_80952734;
return;
}
// Duplicate return node #17. Try simplifying control flow for better match
return;
}
- if (func_80147624(globalCtx) != 0) {
+ if (Message_ShouldAdvance(globalCtx) != 0) {
func_801477B4(globalCtx);
Actor_PickUp((Actor *) this, globalCtx, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
@@ -175,7 +175,7 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
// Duplicate return node #17. Try simplifying control flow for better match
return;
}
- if (func_80147624(globalCtx) != 0) {
+ if (Message_ShouldAdvance(globalCtx) != 0) {
temp_v0_2 = globalCtx->msgCtx.choiceIndex;
if (temp_v0_2 != 0) {
if (temp_v0_2 != 1) {
@@ -211,7 +211,7 @@ which is long, messy, and contains some rather nasty-looking control flow, inclu
temp_v0 = Message_GetState(&globalCtx->msgCtx);
if (temp_v0 != 4) {
if (temp_v0 != 5) {
- if ((temp_v0 == 6) && (func_80147624(globalCtx) != 0)) {
+ if ((temp_v0 == 6) && (Message_ShouldAdvance(globalCtx) != 0)) {
this->actionFunc = func_80952734;
return;
}
@@ -248,13 +248,13 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
if (temp_v0 != 6) {
goto block_17;
}
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
goto block_17;
}
this->actionFunc = func_80952734;
return;
block_5:
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
goto block_17;
}
func_801477B4(globalCtx);
@@ -262,7 +262,7 @@ block_5:
this->actionFunc = func_809529AC;
return;
block_7:
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
goto block_17;
}
temp_v0_2 = globalCtx->msgCtx.choiceIndex;
@@ -350,13 +350,13 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
if (temp_v0 != 6) {
goto block_17;
}
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
goto block_17;
}
this->actionFunc = func_80952734;
return;
block_5:
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
goto block_17;
}
func_801477B4(globalCtx);
@@ -364,7 +364,7 @@ block_5:
this->actionFunc = func_809529AC;
return;
block_7:
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
goto block_17;
}
temp_v0_2 = globalCtx->msgCtx.choiceIndex;
@@ -420,13 +420,13 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
if (temp_v0 != 6) {
return;
}
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
return;
}
this->actionFunc = func_80952734;
return;
block_5:
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
return;
}
func_801477B4(globalCtx);
@@ -434,7 +434,7 @@ block_5:
this->actionFunc = func_809529AC;
return;
block_7:
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
return;
}
temp_v0_2 = globalCtx->msgCtx.choiceIndex;
@@ -557,7 +557,7 @@ There's a couple of other obvious things here:
Well, at least the bottom half looks respectable now. Again, there is no code after the switch, so the next thing up, namely
```C
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
return;
}
```
@@ -578,13 +578,13 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
if (temp_v0 != 6) {
return;
}
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
return;
}
this->actionFunc = func_80952734;
return;
block_5:
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
return;
}
func_801477B4(globalCtx);
@@ -592,7 +592,7 @@ block_5:
this->actionFunc = func_809529AC;
return;
block_7:
- if (func_80147624(globalCtx) != 0) {
+ if (Message_ShouldAdvance(globalCtx) != 0) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
func_801477B4(globalCtx);
@@ -647,7 +647,7 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
break;
case 5:
- if (func_80147624(globalCtx) == 0) {
+ if (Message_ShouldAdvance(globalCtx) == 0) {
return;
}
func_801477B4(globalCtx);
@@ -656,7 +656,7 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
break;
case 4:
- if (func_80147624(globalCtx) != 0) {
+ if (Message_ShouldAdvance(globalCtx) != 0) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
func_801477B4(globalCtx);
@@ -700,7 +700,7 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
break;
case 5:
- if (func_80147624(globalCtx) != 0) {
+ if (Message_ShouldAdvance(globalCtx) != 0) {
func_801477B4(globalCtx);
Actor_PickUp((Actor *) this, globalCtx, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
@@ -708,7 +708,7 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
break;
case 4:
- if (func_80147624(globalCtx) != 0) {
+ if (Message_ShouldAdvance(globalCtx) != 0) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
func_801477B4(globalCtx);
diff --git a/docs/tutorial/documenting.md b/docs/tutorial/documenting.md
index b064b3e3b..e50921bef 100644
--- a/docs/tutorial/documenting.md
+++ b/docs/tutorial/documenting.md
@@ -183,7 +183,7 @@ void func_80C102D4(EnRecepgirl *this, GlobalContext *globalCtx) {
return;
}
- if ((temp_v0_2 == 5) && (func_80147624(globalCtx) != 0)) {
+ if ((temp_v0_2 == 5) && (Message_ShouldAdvance(globalCtx) != 0)) {
if (this->actor.textId == 0x2AD9) {
Flags_SetSwitch(globalCtx, this->actor.params);
Animation_MorphToPlayOnce(&this->skelAnime, &object_bg_Anim_00AD98, 10.0f);
@@ -500,7 +500,7 @@ void func_80C102D4(EnRecepgirl* this, GlobalContext* globalCtx) {
if (temp_v0_2 == 2) {
this->actor.textId = 0x2ADC; // hear directions again?
func_80C10148(this);
- } else if ((temp_v0_2 == 5) && (func_80147624(globalCtx) != 0)) {
+ } else if ((temp_v0_2 == 5) && (Message_ShouldAdvance(globalCtx) != 0)) {
if (this->actor.textId == 0x2AD9) { // "Welcome..."
Flags_SetSwitch(globalCtx, this->actor.params);
Animation_MorphToPlayOnce(&this->skelAnime, &object_bg_Anim_00AD98, 10.0f);
diff --git a/docs/tutorial/other_functions.md b/docs/tutorial/other_functions.md
index b0350a838..0795fa76e 100644
--- a/docs/tutorial/other_functions.md
+++ b/docs/tutorial/other_functions.md
@@ -288,7 +288,7 @@ void func_80C102D4(EnRecepgirl *this, GlobalContext *globalCtx) {
func_80C10148(this);
return;
}
- if (((temp_v0_2 & 0xFF) == 5) && (func_80147624(globalCtx) != 0)) {
+ if (((temp_v0_2 & 0xFF) == 5) && (Message_ShouldAdvance(globalCtx) != 0)) {
temp_v0_3 = this->actor.textId;
if (temp_v0_3 == 0x2AD9) {
Flags_SetSwitch(globalCtx, (s32) this->actor.params);
@@ -347,7 +347,7 @@ void func_80C102D4(EnRecepgirl *this, GlobalContext *globalCtx) {
return;
}
- if (((temp_v0_2 & 0xFF) == 5) && (func_80147624(globalCtx) != 0)) {
+ if (((temp_v0_2 & 0xFF) == 5) && (Message_ShouldAdvance(globalCtx) != 0)) {
if (this->actor.textId == 0x2AD9) {
Flags_SetSwitch(globalCtx, this->actor.params);
Animation_MorphToPlayOnce(&this->skelAnime, &D_0600AD98, 10.0f);
@@ -397,7 +397,7 @@ somehow we skipped over `t0`. Where is this in the code? The `153` in the middle
return;
}
- if (((temp_v0_2 & 0xFF) == 5) && (func_80147624(globalCtx) != 0)) {
+ if (((temp_v0_2 & 0xFF) == 5) && (Message_ShouldAdvance(globalCtx) != 0)) {
```
If you look at the conditionals and the declaration of `temp_v0_2`, you may notice something odd: `temp_v0_2` is a `u8`. Therefore the `& 0xFF` does nothing! It's surprisingly common for this to happen, be it leaving out a `& 0xFF` or adding an extraneous one. If we remove it, we get a match:
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 21:29:56 +0000