summaryrefslogtreecommitdiff
path: root/docs/tutorial
diff options
context:
space:
mode:
Diffstat (limited to 'docs/tutorial')
-rw-r--r--docs/tutorial/advanced_control_flow.md34
-rw-r--r--docs/tutorial/introduction.md4
2 files changed, 19 insertions, 19 deletions
diff --git a/docs/tutorial/advanced_control_flow.md b/docs/tutorial/advanced_control_flow.md
index 48ef9661b..95b0d6b86 100644
--- a/docs/tutorial/advanced_control_flow.md
+++ b/docs/tutorial/advanced_control_flow.md
@@ -107,7 +107,7 @@ void func_809529AC(EnMs* this, PlayState* play) {
func_800B8500(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, 0);
this->actionFunc = func_80952A1C;
} else {
- Actor_PickUp(&this->actor, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
+ Actor_OfferGetItem(&this->actor, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
}
}
@@ -168,7 +168,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
}
if (Message_ShouldAdvance(play) != 0) {
func_801477B4(play);
- Actor_PickUp((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
return;
}
@@ -198,7 +198,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
return;
}
func_8019F208();
- Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
@@ -257,7 +257,7 @@ block_5:
goto block_17;
}
func_801477B4(play);
- Actor_PickUp((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
return;
block_7:
@@ -289,7 +289,7 @@ block_13:
return;
block_15:
func_8019F208();
- Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
return;
@@ -360,7 +360,7 @@ block_5:
goto block_17;
}
func_801477B4(play);
- Actor_PickUp((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
return;
block_7:
@@ -390,7 +390,7 @@ block_11:
}
func_8019F208();
- Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
return;
@@ -429,7 +429,7 @@ block_5:
return;
}
func_801477B4(play);
- Actor_PickUp((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
return;
block_7:
@@ -459,7 +459,7 @@ block_11:
}
func_8019F208();
- Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
return;
@@ -509,7 +509,7 @@ So let us rewrite the entire second half as a switch:
}
func_8019F208();
- Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
return;
@@ -541,7 +541,7 @@ There's a couple of other obvious things here:
func_80151938(play, 0x937U);
} else {
func_8019F208();
- Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
@@ -589,7 +589,7 @@ block_5:
return;
}
func_801477B4(play);
- Actor_PickUp((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
return;
block_7:
@@ -606,7 +606,7 @@ block_7:
func_80151938(play, 0x937U);
} else {
func_8019F208();
- Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
@@ -653,7 +653,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
return;
}
func_801477B4(play);
- Actor_PickUp((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
break;
@@ -671,7 +671,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
func_80151938(play, 0x937U);
} else {
func_8019F208();
- Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
@@ -704,7 +704,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
case 5:
if (Message_ShouldAdvance(play) != 0) {
func_801477B4(play);
- Actor_PickUp((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
}
break;
@@ -723,7 +723,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
func_80151938(play, 0x937U);
} else {
func_8019F208();
- Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
+ Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md
index 2115faace..aba8beede 100644
--- a/docs/tutorial/introduction.md
+++ b/docs/tutorial/introduction.md
@@ -27,7 +27,7 @@ glabel func_809529AC
/* 0003D8 809529F8 C484009C */ lwc1 $f4, 0x9c($a0)
/* 0003DC 809529FC 8C870098 */ lw $a3, 0x98($a0)
/* 0003E0 80952A00 24060035 */ addiu $a2, $zero, 0x35
-/* 0003E4 80952A04 0C02E287 */ jal Actor_PickUp
+/* 0003E4 80952A04 0C02E287 */ jal Actor_OfferGetItem
/* 0003E8 80952A08 E7A40010 */ swc1 $f4, 0x10($sp)
.L80952A0C:
/* 0003EC 80952A0C 8FBF001C */ lw $ra, 0x1c($sp)
@@ -46,7 +46,7 @@ void func_809529AC(EnMs* this, PlayState* play) {
func_800B8500(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, 0);
this->actionFunc = func_80952A1C;
} else {
- Actor_PickUp(&this->actor, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
+ Actor_OfferGetItem(&this->actor, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
}
}
```
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 11:24:05 +0000