Skip to content

Commit d6076b5

Browse files
Labeling particle related code (#719)
* Labeling particle related code * More labeling. Naming pass on what was labeled last commit * Stick X clamped with deadzone * Renaming TyreParticle to Particle * Matching coco's names and renaming some already labeled to keep style consistent * Minor extra particle labeling * Small extra labeling. Restoring some removed newlines * One last newline adjustment --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
1 parent 184f593 commit d6076b5

File tree

9 files changed

+1451
-1449
lines changed

9 files changed

+1451
-1449
lines changed

data/other_textures.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,14 +355,14 @@ extern u8 gTextureKartShadow[];
355355
extern u8 gTexture69B03C[];
356356
extern u8 gTexture69B140[];
357357
extern u8 gTexture69B378[];
358-
extern u8 gTexture69B960[];
359-
extern u8 gTexture69BA28[];
358+
extern u8 gTextureMusicNote[];
359+
extern u8 gTextureSpeechBubble[];
360360
extern u8 gTextureBoingExclamation[];
361361
extern u8 gTexture69BE6C[];
362362
extern u8 gTexture69BF54[];
363363
extern u8 gTexture69C090[];
364364
extern u8 gTexture69C1E8[];
365-
extern u8 gTexture69C354[];
365+
extern u8 gTextureSmokePuff[];
366366
extern u8 gTexture69C4E4[];
367367
extern u8 gTexture69C80C[];
368368
extern u8 gTexture69C9C4[];

data/other_textures.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,11 +1424,11 @@ glabel gTexture69B378
14241424
.incbin "textures/standalone/texture_69B378.rgba16.mio0"
14251425

14261426
.balign 4, 0x00
1427-
glabel gTexture69B960
1427+
glabel gTextureMusicNote
14281428
.incbin "textures/standalone/texture_69B960.i8.mio0"
14291429

14301430
.balign 4, 0x00
1431-
glabel gTexture69BA28
1431+
glabel gTextureSpeechBubble
14321432
.incbin "textures/standalone/texture_69BA28.i8.mio0"
14331433

14341434
.balign 4, 0x00
@@ -1452,7 +1452,7 @@ glabel gTexture69C1E8
14521452
.incbin "textures/standalone/texture_69C1E8.ia16.mio0"
14531453

14541454
.balign 4, 0x00
1455-
glabel gTexture69C354
1455+
glabel gTextureSmokePuff
14561456
.incbin "textures/standalone/texture_69C354.ia8.mio0"
14571457

14581458
.balign 4, 0x00

include/common_structs.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ typedef struct {
145145
} Collision;
146146

147147
typedef struct {
148-
/* 0x00 */ Vec3f unk_000;
149-
/* 0x0C */ f32 unk_00C;
148+
/* 0x00 */ Vec3f pos;
149+
/* 0x0C */ f32 scale;
150150
/* 0x10 */ u16 unk_010;
151-
/* 0x12 */ u16 unk_012;
151+
/* 0x12 */ u16 type;
152152
/* 0x14 */ f32 unk_014;
153153
/* 0x18 */ f32 unk_018;
154-
/* 0x1C */ s16 unk_01C;
155-
/* 0x1E */ s16 unk_01E;
156-
/* 0x20 */ s16 unk_020;
154+
/* 0x1C */ s16 IsAlive;
155+
/* 0x1E */ s16 timer;
156+
/* 0x20 */ s16 rotation;
157157
/* 0x22 */ s16 unk_022;
158158
/* 0x24 */ f32 unk_024;
159159
/* 0x28 */ f32 unk_028;
@@ -163,15 +163,15 @@ typedef struct {
163163
/* 0x32 */ s16 unk_032;
164164
/* 0x34 */ s16 unk_034;
165165
/* 0x36 */ s16 unk_036;
166-
/* 0x38 */ s16 unk_038;
167-
/* 0x3A */ s16 unk_03A;
168-
/* 0x3C */ s16 unk_03C;
169-
/* 0x3E */ s16 unk_03E;
166+
/* 0x38 */ s16 red;
167+
/* 0x3A */ s16 green;
168+
/* 0x3C */ s16 blue;
169+
/* 0x3E */ s16 alpha;
170170
/* 0x40 */ s16 unk_040;
171171
/* 0x42 */ s16 unk_042;
172172
/* 0x44 */ s16 unk_044;
173173
/* 0x46 */ s16 unk_046;
174-
} UnkPlayerStruct258; // size = 0x48
174+
} Particle; // size = 0x48
175175

176176
// This struct is almost identical to the GBI Vtx_t type,
177177
// except that its missing the "flag" member.
@@ -340,7 +340,7 @@ typedef struct {
340340
/* 0x0222 */ s16 unk_222;
341341
/* 0x0224 */ f32 size;
342342
/* 0x0228 */ s16 unk_228;
343-
/* 0x022A */ s16 unk_22A;
343+
/* 0x022A */ s16 driftState;
344344
/* 0x022C */ f32 previousSpeed;
345345
/* 0x0230 */ f32 unk_230;
346346
/* 0x0234 */ s16 unk_234;
@@ -353,7 +353,7 @@ typedef struct {
353353
/* 0x024C */ u16 animGroupSelector[4];
354354
/* 0x0254 */ u16 characterId;
355355
/* 0x0256 */ u16 unk_256;
356-
/* 0x0258 */ UnkPlayerStruct258 unk_258[40];
356+
/* 0x0258 */ Particle particles[40];
357357
/* 0x0D98 */ s16 unk_D98;
358358
/* 0x0D9A */ s16 unk_D9A;
359359
/* 0x0D9C */ f32 unk_D9C;

0 commit comments

Comments
 (0)