summaryrefslogtreecommitdiff
path: root/docs/tutorial
diff options
context:
space:
mode:
Diffstat (limited to 'docs/tutorial')
-rw-r--r--docs/tutorial/advanced_control_flow.md18
-rw-r--r--docs/tutorial/beginning_decomp.md36
-rw-r--r--docs/tutorial/data.md44
-rw-r--r--docs/tutorial/documenting.md26
4 files changed, 62 insertions, 62 deletions
diff --git a/docs/tutorial/advanced_control_flow.md b/docs/tutorial/advanced_control_flow.md
index 83d55f7ad..896edcb1d 100644
--- a/docs/tutorial/advanced_control_flow.md
+++ b/docs/tutorial/advanced_control_flow.md
@@ -27,15 +27,15 @@ void func_809529AC(EnMs* this, PlayState* play);
void func_80952A1C(EnMs* this, PlayState* play);
ActorInit En_Ms_InitVars = {
- ACTOR_EN_MS,
- ACTORCAT_NPC,
- FLAGS,
- OBJECT_MS,
- sizeof(EnMs),
- (ActorFunc)EnMs_Init,
- (ActorFunc)EnMs_Destroy,
- (ActorFunc)EnMs_Update,
- (ActorFunc)EnMs_Draw,
+ /**/ ACTOR_EN_MS,
+ /**/ ACTORCAT_NPC,
+ /**/ FLAGS,
+ /**/ OBJECT_MS,
+ /**/ sizeof(EnMs),
+ /**/ EnMs_Init,
+ /**/ EnMs_Destroy,
+ /**/ EnMs_Update,
+ /**/ EnMs_Draw,
};
static ColliderCylinderInitType1 D_80952BA0 = {
diff --git a/docs/tutorial/beginning_decomp.md b/docs/tutorial/beginning_decomp.md
index 2685f9276..8e67b91bf 100644
--- a/docs/tutorial/beginning_decomp.md
+++ b/docs/tutorial/beginning_decomp.md
@@ -28,15 +28,15 @@ void EnRecepgirl_Draw(Actor* thisx, PlayState* play);
// --------------- 4 ---------------
#if 0
ActorInit En_Recepgirl_InitVars = {
- ACTOR_EN_RECEPGIRL,
- ACTORCAT_NPC,
- FLAGS,
- OBJECT_BG,
- sizeof(EnRecepgirl),
- (ActorFunc)EnRecepgirl_Init,
- (ActorFunc)EnRecepgirl_Destroy,
- (ActorFunc)EnRecepgirl_Update,
- (ActorFunc)EnRecepgirl_Draw,
+ /**/ ACTOR_EN_RECEPGIRL,
+ /**/ ACTORCAT_NPC,
+ /**/ FLAGS,
+ /**/ OBJECT_BG,
+ /**/ sizeof(EnRecepgirl),
+ /**/ EnRecepgirl_Init,
+ /**/ EnRecepgirl_Destroy,
+ /**/ EnRecepgirl_Update,
+ /**/ EnRecepgirl_Draw,
};
// static InitChainEntry sInitChain[] = {
@@ -336,15 +336,15 @@ For now, we do not want to consider the data that mips2c has kindly imported for
```C
#if 0
ActorInit En_Recepgirl_InitVars = {
- ACTOR_EN_RECEPGIRL,
- ACTORCAT_NPC,
- FLAGS,
- OBJECT_BG,
- sizeof(EnRecepgirl),
- (ActorFunc)EnRecepgirl_Init,
- (ActorFunc)EnRecepgirl_Destroy,
- (ActorFunc)EnRecepgirl_Update,
- (ActorFunc)EnRecepgirl_Draw,
+ /**/ ACTOR_EN_RECEPGIRL,
+ /**/ ACTORCAT_NPC,
+ /**/ FLAGS,
+ /**/ OBJECT_BG,
+ /**/ sizeof(EnRecepgirl),
+ /**/ EnRecepgirl_Init,
+ /**/ EnRecepgirl_Destroy,
+ /**/ EnRecepgirl_Update,
+ /**/ EnRecepgirl_Draw,
};
static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 };
diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md
index 07ea8cfac..2c3f1d2e2 100644
--- a/docs/tutorial/data.md
+++ b/docs/tutorial/data.md
@@ -44,15 +44,15 @@ Once we have decompiled enough things to know what the data is, we can import it
```C
#if 0
ActorInit En_Recepgirl_InitVars = {
- ACTOR_EN_RECEPGIRL,
- ACTORCAT_NPC,
- FLAGS,
- OBJECT_BG,
- sizeof(EnRecepgirl),
- (ActorFunc)EnRecepgirl_Init,
- (ActorFunc)EnRecepgirl_Destroy,
- (ActorFunc)EnRecepgirl_Update,
- (ActorFunc)EnRecepgirl_Draw,
+ /**/ ACTOR_EN_RECEPGIRL,
+ /**/ ACTORCAT_NPC,
+ /**/ FLAGS,
+ /**/ OBJECT_BG,
+ /**/ sizeof(EnRecepgirl),
+ /**/ EnRecepgirl_Init,
+ /**/ EnRecepgirl_Destroy,
+ /**/ EnRecepgirl_Update,
+ /**/ EnRecepgirl_Draw,
};
static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 };
@@ -100,15 +100,15 @@ Next remove all the externs, and uncomment their corresponding commented data:
```C
ActorInit En_Recepgirl_InitVars = {
- ACTOR_EN_RECEPGIRL,
- ACTORCAT_NPC,
- FLAGS,
- OBJECT_BG,
- sizeof(EnRecepgirl),
- (ActorFunc)EnRecepgirl_Init,
- (ActorFunc)EnRecepgirl_Destroy,
- (ActorFunc)EnRecepgirl_Update,
- (ActorFunc)EnRecepgirl_Draw,
+ /**/ ACTOR_EN_RECEPGIRL,
+ /**/ ACTORCAT_NPC,
+ /**/ FLAGS,
+ /**/ OBJECT_BG,
+ /**/ sizeof(EnRecepgirl),
+ /**/ EnRecepgirl_Init,
+ /**/ EnRecepgirl_Destroy,
+ /**/ EnRecepgirl_Update,
+ /**/ EnRecepgirl_Draw,
};
static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 };
@@ -140,10 +140,10 @@ For actors which have yet to be decompiled, this is mitigated by use of the file
```c
ActorInit En_Recepgirl_InitVars = {
- ACTOR_EN_RECEPGIRL,
- ACTORCAT_NPC,
- FLAGS,
- OBJECT_BG,
+ /**/ ACTOR_EN_RECEPGIRL,
+ /**/ ACTORCAT_NPC,
+ /**/ FLAGS,
+ /**/ OBJECT_BG,
};
```
diff --git a/docs/tutorial/documenting.md b/docs/tutorial/documenting.md
index 9013ab010..619b30c06 100644
--- a/docs/tutorial/documenting.md
+++ b/docs/tutorial/documenting.md
@@ -49,15 +49,15 @@ void func_80C10290(EnRecepgirl* this);
void func_80C102D4(EnRecepgirl* this, PlayState* play);
ActorInit En_Recepgirl_InitVars = {
- ACTOR_EN_RECEPGIRL,
- ACTORCAT_NPC,
- FLAGS,
- OBJECT_BG,
- sizeof(EnRecepgirl),
- (ActorFunc)EnRecepgirl_Init,
- (ActorFunc)EnRecepgirl_Destroy,
- (ActorFunc)EnRecepgirl_Update,
- (ActorFunc)EnRecepgirl_Draw,
+ /**/ ACTOR_EN_RECEPGIRL,
+ /**/ ACTORCAT_NPC,
+ /**/ FLAGS,
+ /**/ OBJECT_BG,
+ /**/ sizeof(EnRecepgirl),
+ /**/ EnRecepgirl_Init,
+ /**/ EnRecepgirl_Destroy,
+ /**/ EnRecepgirl_Update,
+ /**/ EnRecepgirl_Draw,
};
static void* D_80C106B0[4] = { object_bg_Tex_00F8F0, object_bg_Tex_00FCF0, object_bg_Tex_0100F0, object_bg_Tex_00FCF0 };
@@ -317,10 +317,10 @@ As we discussed last time, `D_80C106B0` is an array of [segmented pointers](data
```C
ActorInit En_Recepgirl_InitVars = {
- ACTOR_EN_RECEPGIRL,
- ACTORCAT_NPC,
- FLAGS,
- OBJECT_BG,
+ /**/ ACTOR_EN_RECEPGIRL,
+ /**/ ACTORCAT_NPC,
+ /**/ FLAGS,
+ /**/ OBJECT_BG,
```
the fourth element is the object (it is actually an enum, but the file itself has the same name as the object enum). So, we need to look at the object file. We are very lucky that a custom tool has been written for such a thing: Z64Utils.
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 07:09:24 +0000