summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDragorn421 <Dragorn421@users.noreply.github.com>2023-10-30 15:19:16 +0100
committerGitHub <noreply@github.com>2023-10-30 10:19:16 -0400
commit8718a5c8c0c97cc93f4d11ee4a3a7cb4ddbdcacc (patch)
tree6fc11a45295bd5e8d60daa6fa56662422e11423a /docs
parent4908b8b37c2b9e84722fd3a57c3d1766adef33f8 (diff)
Remove `(ActorFunc)` casts in initvars (#1571)
* Remove `(ActorFunc)` casts in initvars, use `/**/` trick for format Achieved by using the following regex: (ActorInit.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*\n\};) replaced with $1$2/**/ $3$4/**/ $5$6/**/ $7$8/**/ $9$10/**/ $11$12/**/ $13$14/**/ $15$16/**/ $17$18/**/ $19 plus a change from /**/ to #if 0 #endif in docs/ * Manual fixes
Diffstat (limited to 'docs')
-rw-r--r--docs/tutorial/beginning_decomp.md22
-rw-r--r--docs/tutorial/data.md54
2 files changed, 38 insertions, 38 deletions
diff --git a/docs/tutorial/beginning_decomp.md b/docs/tutorial/beginning_decomp.md
index 9aaf9d440..b5c5e8506 100644
--- a/docs/tutorial/beginning_decomp.md
+++ b/docs/tutorial/beginning_decomp.md
@@ -638,19 +638,19 @@ void func_80A87F44(Actor* thisx, PlayState* play);
void func_80A87BEC(EnJj* this, PlayState* play);
void func_80A87C30(EnJj* this, PlayState* play);
-/*
+#if 0
ActorInit En_Jj_InitVars = {
- ACTOR_EN_JJ,
- ACTORTYPE_ITEMACTION,
- FLAGS,
- OBJECT_JJ,
- sizeof(EnJj),
- (ActorFunc)EnJj_Init,
- (ActorFunc)EnJj_Destroy,
- (ActorFunc)EnJj_Update,
- (ActorFunc)EnJj_Draw,
+ /**/ ACTOR_EN_JJ,
+ /**/ ACTORTYPE_ITEMACTION,
+ /**/ FLAGS,
+ /**/ OBJECT_JJ,
+ /**/ sizeof(EnJj),
+ /**/ EnJj_Init,
+ /**/ EnJj_Destroy,
+ /**/ EnJj_Update,
+ /**/ EnJj_Draw,
};
-*/
+#endif
extern ColliderCylinderInit D_80A88CB4;
// static ColliderCylinderInit sCylinderInit = {
diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md
index 9b6cfeb1b..69b04c782 100644
--- a/docs/tutorial/data.md
+++ b/docs/tutorial/data.md
@@ -94,15 +94,15 @@ s32 D_80B18910[] = { 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000,
s32 D_80B1893C[] = { 0x00000000, 0x00000000, 0xFF000000 };
ActorInit En_Tg_InitVars = {
- ACTOR_EN_TG,
- ACTORTYPE_NPC,
- FLAGS,
- OBJECT_MU,
- sizeof(EnTg),
- (ActorFunc)EnTg_Init,
- (ActorFunc)EnTg_Destroy,
- (ActorFunc)EnTg_Update,
- (ActorFunc)EnTg_Draw,
+ /**/ ACTOR_EN_TG,
+ /**/ ACTORTYPE_NPC,
+ /**/ FLAGS,
+ /**/ OBJECT_MU,
+ /**/ sizeof(EnTg),
+ /**/ EnTg_Init,
+ /**/ EnTg_Destroy,
+ /**/ EnTg_Update,
+ /**/ EnTg_Draw,
};
s32 D_80B18968[] = { 0x00000000, 0x44480000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 };
@@ -490,15 +490,15 @@ To replace the `extern`, because the data is in a separate file, we include the
Lastly, uncomment the InitVars block that's been sitting there the whole time. The data section of the file now looks like
```C
ActorInit En_Jj_InitVars = {
- ACTOR_EN_JJ,
- ACTORTYPE_ITEMACTION,
- FLAGS,
- OBJECT_JJ,
- sizeof(EnJj),
- (ActorFunc)EnJj_Init,
- (ActorFunc)EnJj_Destroy,
- (ActorFunc)EnJj_Update,
- (ActorFunc)EnJj_Draw,
+ /**/ ACTOR_EN_JJ,
+ /**/ ACTORTYPE_ITEMACTION,
+ /**/ FLAGS,
+ /**/ OBJECT_JJ,
+ /**/ sizeof(EnJj),
+ /**/ EnJj_Init,
+ /**/ EnJj_Destroy,
+ /**/ EnJj_Update,
+ /**/ EnJj_Draw,
};
#include "en_jj_cutscene_data.c" EARLY
@@ -567,15 +567,15 @@ Notice that the numbers in the bottom pane is all shifted one word to the left.
```C
ActorInit En_Jj_InitVars = {
- ACTOR_EN_JJ,
- ACTORTYPE_ITEMACTION,
- FLAGS,
- OBJECT_JJ,
- sizeof(EnJj),
- (ActorFunc)EnJj_Init,
- (ActorFunc)EnJj_Destroy,
- (ActorFunc)EnJj_Update,
- (ActorFunc)EnJj_Draw,
+ /**/ ACTOR_EN_JJ,
+ /**/ ACTORTYPE_ITEMACTION,
+ /**/ FLAGS,
+ /**/ OBJECT_JJ,
+ /**/ sizeof(EnJj),
+ /**/ EnJj_Init,
+ /**/ EnJj_Destroy,
+ /**/ EnJj_Update,
+ /**/ EnJj_Draw,
};
s32 usused = 0;