Skip to content

Commit eb2da30

Browse files
stalechilibeansstalechilibeans
authored
Merge pull request #28 from Roccoelsemen/main
Yoking in the 90's
2 parents b003036 + b59893c commit eb2da30

77 files changed

Lines changed: 7419 additions & 6756 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎actors/chain_ball/chain_ball.rgba16.png‎

1.73 KB
Loading

‎actors/chain_ball/geo.inc.c‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// 0x0D0005D0
2+
const GeoLayout metallic_ball_geo[] = {
3+
GEO_SHADOW(SHADOW_CIRCLE_4_VERTS, 0x96, 60),
4+
GEO_OPEN_NODE(),
5+
GEO_DISPLAY_LIST(LAYER_ALPHA, chain_ball_seg6_dl_060212E8),
6+
GEO_CLOSE_NODE(),
7+
GEO_END(),
8+
};

‎actors/chain_ball/model.inc.c‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Chain Ball
2+
3+
4+
// 0x06020AA0
5+
static const Vtx chain_ball_seg6_vertex_06020AA0[] = {
6+
{{{ -26, -26, 0}, 0, { 0, 992}, {0xff, 0xff, 0xff, 0xff}}},
7+
{{{ 26, -26, 0}, 0, { 992, 992}, {0xff, 0xff, 0xff, 0xff}}},
8+
{{{ 26, 26, 0}, 0, { 992, 0}, {0xff, 0xff, 0xff, 0xff}}},
9+
{{{ -26, 26, 0}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}},
10+
};
11+
12+
// align? binid?
13+
UNUSED static const u64 chain_ball_unused_1 = 0;
14+
15+
// 0x06020AE8
16+
ALIGNED8 static const Texture chain_ball_seg6_texture_06020AE8[] = {
17+
#include "actors/chain_ball/chain_ball.rgba16.inc.c"
18+
};
19+
20+
// 0x060212E8 - 0x06021380
21+
const Gfx chain_ball_seg6_dl_060212E8[] = {
22+
gsDPPipeSync(),
23+
gsSPClearGeometryMode(G_LIGHTING),
24+
gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
25+
gsDPLoadTextureBlock(chain_ball_seg6_texture_06020AE8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
26+
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
27+
gsSPVertex(chain_ball_seg6_vertex_06020AA0, 4, 0),
28+
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
29+
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
30+
gsDPPipeSync(),
31+
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
32+
gsSPSetGeometryMode(G_LIGHTING),
33+
gsSPEndDisplayList(),
34+
};

‎actors/common1.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ UNUSED static const u64 binid_1 = 1;
1616
#include "coin/coin.sou"
1717
UNUSED static const u64 binid_3 = 3;
1818

19+
#include "warp_pipe/model.inc.c"
20+
#include "warp_pipe/collision.inc.c"
21+
UNUSED static const u64 binid_4 = 4;
22+
1923
#include "door/door.sou"
2024
UNUSED static const u64 binid_5 = 5;
2125

‎actors/common1.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,15 @@ extern Hierarchy RCP_HmsDotstar[];
105105
// tree
106106
extern Hierarchy RCP_HmsMainTree[];
107107

108+
// warp_pipe
109+
extern const GeoLayout warp_pipe_geo[];
110+
extern const Gfx warp_pipe_seg3_dl_03008E40[];
111+
extern const Gfx warp_pipe_seg3_dl_03008F98[];
112+
extern const Gfx warp_pipe_seg3_dl_03009968[];
113+
extern const Gfx warp_pipe_seg3_dl_03009A20[];
114+
extern const Gfx warp_pipe_seg3_dl_03009A50[];
115+
extern const Collision warp_pipe_seg3_collision_03009AC8[];
116+
108117
// warp_collision
109118
extern const Collision door_seg3_collision_0301CE78[];
110119
extern const Collision lll_hexagonal_mesh_seg3_collision_0301CECC[];

‎actors/common1_geo.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "mist/geo.inc.c"
1111
#include "explosion/bombfire.hms"
1212
#include "coin/coin.hms"
13+
#include "warp_pipe/geo.inc.c"
1314
#include "door/door.hms"
1415
#include "flame/geo.inc.c"
1516
#include "blue_fish/geo.inc.c"

‎actors/group14.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ UNUSED static const u64 binid_4 = 4;
2323

2424
#include "wanwano/wanwan.sou"
2525
UNUSED static const u64 binid_5 = 5;
26+
27+
#include "chain_ball/model.inc.c"
28+
UNUSED static const u64 binid_6 = 6;

‎actors/group14.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
#include "types.h"
55
#include "headers.h"
66

7+
// chain_ball
8+
extern const GeoLayout metallic_ball_geo[];
9+
extern const Gfx chain_ball_seg6_dl_060212E8[];
10+
711
// koopa
812
extern Hierarchy RCP_HmsEnemynokonoko[];
913
extern Gfx RCP_nokonoko_down0[];

‎actors/group14_geo.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
#include "koopa/nokonoko.hms"
1212
#include "wanwano/wanwan.hms"
1313
#include "koopa_goal_flag/animed.hms"
14+
#include "chain_ball/geo.inc.c"

‎actors/wanwano/wanwan.hms‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*==================================================================================================
32
wanwan Shape Hms Data
43
====================================================================================================*/
@@ -26,7 +25,7 @@ Hierarchy RCP_HmsEnemywanwan[] = {
2625
hmsBegin()
2726
hmsJoint(RM_SURF,RCP_wanwan_anim4,0,0,0) /* ,wan_bodyA,(4) */
2827
hmsJoint(RM_SURF,RCP_wanwan_anim3,0,0,0) /* ,wan_toothA,(3) */
29-
hmsJoint(RM_SPRITE,RCP_wanwan_anim1,0,0,0) /* ,wan_eye,(1) */
28+
hmsJoint(RM_SURF,RCP_wanwan_anim1,0,0,0) /* ,wan_eye,(1) */
3029
hmsEnd()
3130
hmsEnd()
3231
hmsEnd()

0 commit comments

Comments
 (0)