summaryrefslogtreecommitdiff
path: root/docs/tutorial
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2023-09-14 19:24:39 -0700
committerGitHub <noreply@github.com>2023-09-14 23:24:39 -0300
commit99dd8a41f969ace0b9defc1c9cdf0f44f67d53be (patch)
tree78fa13c1433514602fc8f3240a900cc4a797db79 /docs/tutorial
parent548ea08838f11a0f3c7f29e014eede6ef784ab7a (diff)
Docs namefixer (#1378)
Diffstat (limited to 'docs/tutorial')
-rw-r--r--docs/tutorial/advanced_control_flow.md6
-rw-r--r--docs/tutorial/documenting.md4
-rw-r--r--docs/tutorial/introduction.md4
-rw-r--r--docs/tutorial/other_functions.md6
4 files changed, 10 insertions, 10 deletions
diff --git a/docs/tutorial/advanced_control_flow.md b/docs/tutorial/advanced_control_flow.md
index 0217cdde2..83d55f7ad 100644
--- a/docs/tutorial/advanced_control_flow.md
+++ b/docs/tutorial/advanced_control_flow.md
@@ -94,7 +94,7 @@ void func_80952734(EnMs* this, PlayState* play) {
if (this->actor.xzDistToPlayer < 90.0f) {
if (ABS_ALT(temp_v1) < 0x2000) {
- func_800B8614(&this->actor, play, 90.0f);
+ Actor_OfferTalk(&this->actor, play, 90.0f);
}
}
}
@@ -104,7 +104,7 @@ void func_80952734(EnMs* this, PlayState* play) {
void func_809529AC(EnMs* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.textId = 0;
- func_800B8500(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, 0);
+ Actor_OfferTalkExchange(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, 0);
this->actionFunc = func_80952A1C;
} else {
Actor_OfferGetItem(&this->actor, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
@@ -116,7 +116,7 @@ void func_80952A1C(EnMs* this, PlayState* play) {
Message_ContinueTextbox(play, 0x936U);
this->actionFunc = func_809527F8;
} else {
- func_800B8500(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, -1);
+ Actor_OfferTalkExchange(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, -1);
}
}
diff --git a/docs/tutorial/documenting.md b/docs/tutorial/documenting.md
index 11d8b3546..9013ab010 100644
--- a/docs/tutorial/documenting.md
+++ b/docs/tutorial/documenting.md
@@ -137,7 +137,7 @@ void func_80C1019C(EnRecepgirl* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state) != 0) {
func_80C10290(this);
} else if (Actor_IsFacingPlayer(&this->actor, 0x2000)) {
- func_800B8614(&this->actor, play, 60.0f);
+ Actor_OfferTalk(&this->actor, play, 60.0f);
if (Player_GetMask(play) == 2) {
this->actor.textId = 0x2367;
} else if (Flags_GetSwitch(play, this->actor.params)) {
@@ -473,7 +473,7 @@ void func_80C1019C(EnRecepgirl* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state) != 0) {
func_80C10290(this);
} else if (Actor_IsFacingPlayer(&this->actor, 0x2000)) {
- func_800B8614(&this->actor, play, 60.0f);
+ Actor_OfferTalk(&this->actor, play, 60.0f);
if (Player_GetMask(play) == PLAYER_MASK_KAFEIS_MASK) {
this->actor.textId = 0x2367; // "... doesn't Kafei want to break off his engagement ... ?"
} else if (Flags_GetSwitch(play, this->actor.params)) {
diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md
index aba8beede..58a74fbb4 100644
--- a/docs/tutorial/introduction.md
+++ b/docs/tutorial/introduction.md
@@ -16,7 +16,7 @@ glabel func_809529AC
/* 0003B0 809529D0 8C860098 */ lw $a2, 0x98($a0)
/* 0003B4 809529D4 8C87009C */ lw $a3, 0x9c($a0)
/* 0003B8 809529D8 AFA40020 */ sw $a0, 0x20($sp)
-/* 0003BC 809529DC 0C02E140 */ jal func_800B8500
+/* 0003BC 809529DC 0C02E140 */ jal Actor_OfferTalkExchange
/* 0003C0 809529E0 AFA00010 */ sw $zero, 0x10($sp)
/* 0003C4 809529E4 8FA40020 */ lw $a0, 0x20($sp)
/* 0003C8 809529E8 3C0E8095 */ lui $t6, %hi(func_80952A1C)
@@ -43,7 +43,7 @@ and turn it into compilable C code:
void func_809529AC(EnMs* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.textId = 0;
- func_800B8500(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, 0);
+ Actor_OfferTalkExchange(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, 0);
this->actionFunc = func_80952A1C;
} else {
Actor_OfferGetItem(&this->actor, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
diff --git a/docs/tutorial/other_functions.md b/docs/tutorial/other_functions.md
index f73902ca5..dd2de5538 100644
--- a/docs/tutorial/other_functions.md
+++ b/docs/tutorial/other_functions.md
@@ -135,7 +135,7 @@ void func_80C1019C(EnRecepgirl* this, PlayState* play) {
return;
}
if (Actor_IsFacingPlayer((Actor *) this, 0x2000) != 0) {
- func_800B8614((Actor *) this, play, 60.0f);
+ Actor_OfferTalk((Actor *) this, play, 60.0f);
if (Player_GetMask(play) == 2) {
this->actor.textId = 0x2367;
return;
@@ -190,7 +190,7 @@ void func_80C1019C(EnRecepgirl* this, PlayState* play) {
return;
}
if (Actor_IsFacingPlayer(&this->actor, 0x2000) != 0) {
- func_800B8614(&this->actor, play, 60.0f);
+ Actor_OfferTalk(&this->actor, play, 60.0f);
if (Player_GetMask(play) == 2) {
this->actor.textId = 0x2367;
return;
@@ -226,7 +226,7 @@ void func_80C1019C(EnRecepgirl* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state) != 0) {
func_80C10290(this);
} else if (Actor_IsFacingPlayer(&this->actor, 0x2000)) {
- func_800B8614(&this->actor, play, 60.0f);
+ Actor_OfferTalk(&this->actor, play, 60.0f);
if (Player_GetMask(play) == 2) {
this->actor.textId = 0x2367;
} else if (Flags_GetSwitch(play, this->actor.params)) {