Skip to content

Commit 31cb0af

Browse files
stalechilibeansstalechilibeans
authored
Merge pull request #29 from somepersononthenet/main
very basic buggy ukiki
2 parents be1543d + 7adbb8c commit 31cb0af

16 files changed

Lines changed: 4314 additions & 5 deletions

File tree

‎Makefile.split‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ ACTOR_GROUPS := \
2020
group2 \
2121
group4 \
2222
group7 \
23+
group6 \
2324
group9 \
2425
group10 \
2526
group12 \
@@ -65,7 +66,7 @@ SKEETER_DIRS := skeeter seaweed water_mine cyan_fish bub water_ring treasure
6566
KLEPTO_DIRS := klepto eyerok pokey tornado
6667
SEA_DIRS := clam_shell manta sushi unagi whirlpool
6768
AMP_DIRS := blue_coin_switch amp cannon_lid cannon_base cannon_barrel chuckya purple_switch checkerboard_platform heart flyguy breakable_box exclamation_box goomba bobomb metal_box exclamation_box_outline test_platform koopa_shell
68-
MOLE_DIRS := monty_mole_hole monty_mole smoke ukiki fwoosh
69+
MOLE_DIRS := monty_mole_hole monty_mole smoke monkey fwoosh
6970
LAKITU_DIRS := lakitu_cameraman toad mips boo_castle
7071
PEACH_DIRS := bird peach yoshi
7172
BOWSER_DIRS := bowser_flame impact_ring yellow_sphere bowser bomb impact_smoke
@@ -97,6 +98,7 @@ $(BUILD_DIR)/actors/group0.o: $(MARIO_WATER_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c
9798
$(BUILD_DIR)/actors/group1.o: $(HOOT_THWOMP_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
9899
$(BUILD_DIR)/actors/group2.o: $(BULLY_BLARGG_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
99100
$(BUILD_DIR)/actors/group4.o: $(SEA_CREATURES_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
101+
$(BUILD_DIR)/actors/group6.o: $(MOLE_UKIKI_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
100102
$(BUILD_DIR)/actors/group7.o: $(SPINDRIFT_PENGUIN_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
101103
$(BUILD_DIR)/actors/group9.o: $(BOO_BOOKEND_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
102104
$(BUILD_DIR)/actors/group10.o: $(PEACH_TOADSTOOL_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
@@ -112,6 +114,7 @@ $(BUILD_DIR)/actors/group0.elf: SEGMENT_ADDRESS := 0x04000000
112114
$(BUILD_DIR)/actors/group1.elf: SEGMENT_ADDRESS := 0x05000000
113115
$(BUILD_DIR)/actors/group2.elf: SEGMENT_ADDRESS := 0x05000000
114116
$(BUILD_DIR)/actors/group4.elf: SEGMENT_ADDRESS := 0x05000000
117+
$(BUILD_DIR)/actors/group6.elf: SEGMENT_ADDRESS := 0x05000000
115118
$(BUILD_DIR)/actors/group7.elf: SEGMENT_ADDRESS := 0x05000000
116119
$(BUILD_DIR)/actors/group9.elf: SEGMENT_ADDRESS := 0x05000000
117120
$(BUILD_DIR)/actors/group10.elf: SEGMENT_ADDRESS := 0x05000000

‎actors/group6.c‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#include <PR/ultratypes.h>
2+
#include <PR/gbi.h>
3+
4+
#include "geo_commands.h"
5+
#include "macros.h"
6+
#include "surface_terrains.h"
7+
#include "types.h"
8+
#include "make_const_nonconst.h"
9+
#include "headers.h"
10+
11+
#include "monkey/monkey.sou"
12+
UNUSED static const u64 binid_3 = 3;

‎actors/group6.h‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#ifndef GROUP6_H
2+
#define GROUP6_H
3+
4+
#include "types.h"
5+
#include "headers.h"
6+
7+
// ukiki
8+
extern Hierarchy RCP_HmsEnemymonky_F_run[];
9+
extern Gfx RCP_monky_F_run0[];
10+
extern Gfx RCP_monky_F_run1[];
11+
extern Gfx RCP_monky_F_run2[];
12+
extern Gfx RCP_monky_F_run3[];
13+
extern Gfx RCP_monky_F_run4[];
14+
extern Gfx RCP_monky_F_run5[];
15+
extern Gfx RCP_monky_F_run6[];
16+
extern Gfx RCP_monky_F_run7[];
17+
extern Gfx RCP_monky_F_run8[];
18+
extern Gfx RCP_monky_F_run9[];
19+
extern Gfx RCP_monky_F_run10[];
20+
extern Gfx RCP_monky_F_run11[];
21+
extern Gfx RCP_monky_F_run12[];
22+
extern Gfx RCP_monky_F_run13[];
23+
extern Gfx RCP_monky_F_run14[];
24+
extern Gfx RCP_monky_F_run15[];
25+
extern Gfx RCP_monky_F_run16[];
26+
extern AnimePtr monky_anime[];
27+
28+
#endif

‎actors/group6_geo.c‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#include <ultra64.h>
2+
#include "sm64.h"
3+
#include "geo_commands.h"
4+
5+
#include "make_const_nonconst.h"
6+
#include "headers.h"
7+
8+
#include "common1.h"
9+
#include "group6.h"
10+
11+
12+
#include "monkey/monkey.hms"

‎actors/monkey/monkey.hms‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
/**************************************************************/
2+
/* shape data monky_F_run (skeleton & animation) */
3+
/**************************************************************/
4+
5+
extern Gfx RCP_monky_F_run0[];
6+
extern Gfx RCP_monky_F_run1[];
7+
extern Gfx RCP_monky_F_run2[];
8+
extern Gfx RCP_monky_F_run3[];
9+
extern Gfx RCP_monky_F_run4[];
10+
extern Gfx RCP_monky_F_run5[];
11+
extern Gfx RCP_monky_F_run6[];
12+
extern Gfx RCP_monky_F_run7[];
13+
extern Gfx RCP_monky_F_run8[];
14+
extern Gfx RCP_monky_F_run9[];
15+
extern Gfx RCP_monky_F_run10[];
16+
extern Gfx RCP_monky_F_run11[];
17+
extern Gfx RCP_monky_F_run12[];
18+
extern Gfx RCP_monky_F_run13[];
19+
extern Gfx RCP_monky_F_run14[];
20+
extern Gfx RCP_monky_F_run15[];
21+
extern Gfx RCP_monky_F_run16[];
22+
23+
24+
/*-------------------------------------------------------------*/
25+
/* Hms data */
26+
/*-------------------------------------------------------------*/
27+
Hierarchy RCP_HmsEnemymonky_F_run[] = {
28+
hmsShadow(100, 155, 1)
29+
hmsBegin()
30+
hmsScale(0.25f)
31+
hmsBegin()
32+
hmsJoint(RM_SURF,RCP_monky_F_run16,-12,-28,-25) /* monky_body1(22) */
33+
hmsBegin()
34+
hmsJoint(RM_SURF,NULL,0,99,-11) /* chn1(21) */
35+
hmsBegin()
36+
hmsJoint(RM_SURF,RCP_monky_F_run0,0,0,0) /* monky_head1(0) */
37+
hmsEnd()
38+
hmsJoint(RM_SURF,NULL,71,69,-9) /* chn2(20) */
39+
hmsBegin()
40+
hmsJoint(RM_SURF,RCP_monky_F_run3,0,0,0) /* monky_Larm11(3) */
41+
hmsBegin()
42+
hmsJoint(RM_SURF,RCP_monky_F_run2,86,0,0) /* monky_Larm21(2) */
43+
hmsBegin()
44+
hmsJoint(RM_SURF,RCP_monky_F_run1,64,0,0) /* monky_Lhand1(1) */
45+
hmsEnd()
46+
hmsEnd()
47+
hmsEnd()
48+
hmsJoint(RM_SURF,NULL,-71,68,-9) /* chn4(19) */
49+
hmsBegin()
50+
hmsJoint(RM_SURF,RCP_monky_F_run6,0,0,0) /* monky_Rarm11(6) */
51+
hmsBegin()
52+
hmsJoint(RM_SURF,RCP_monky_F_run5,86,0,0) /* monky_Rarm21(5) */
53+
hmsBegin()
54+
hmsJoint(RM_SURF,RCP_monky_F_run4,64,0,0) /* monky_Rhand1(4) */
55+
hmsEnd()
56+
hmsEnd()
57+
hmsEnd()
58+
hmsJoint(RM_SURF,NULL,43,-22,-1) /* chn6(18) */
59+
hmsBegin()
60+
hmsJoint(RM_SURF,RCP_monky_F_run9,0,0,0) /* monky_Lleg11(9) */
61+
hmsBegin()
62+
hmsJoint(RM_SURF,RCP_monky_F_run8,46,0,0) /* monky_Lleg21(8) */
63+
hmsBegin()
64+
hmsJoint(RM_SURF,RCP_monky_F_run7,36,0,0) /* monky_Lfoot1(7) */
65+
hmsEnd()
66+
hmsEnd()
67+
hmsEnd()
68+
hmsJoint(RM_SURF,NULL,-43,-22,-1) /* chn8(17) */
69+
hmsBegin()
70+
hmsJoint(RM_SURF,RCP_monky_F_run12,0,0,0) /* monky_Rleg11(12) */
71+
hmsBegin()
72+
hmsJoint(RM_SURF,RCP_monky_F_run11,46,0,0) /* monky_Rleg21(11) */
73+
hmsBegin()
74+
hmsJoint(RM_SURF,RCP_monky_F_run10,36,0,0) /* monky_Rfoot1(10) */
75+
hmsEnd()
76+
hmsEnd()
77+
hmsEnd()
78+
hmsJoint(RM_SURF,NULL,0,-15,-57) /* chn9(16) */
79+
hmsBegin()
80+
hmsJoint(RM_SURF,RCP_monky_F_run15,0,0,0) /* cube1(15) */
81+
hmsBegin()
82+
hmsJoint(RM_SURF,RCP_monky_F_run14,45,0,0) /* cube2(14) */
83+
hmsBegin()
84+
hmsJoint(RM_SURF,RCP_monky_F_run13,46,0,0) /* cube3(13) */
85+
hmsEnd()
86+
hmsEnd()
87+
hmsEnd()
88+
hmsEnd()
89+
hmsEnd()
90+
hmsEnd()
91+
hmsExit()
92+
};

0 commit comments

Comments
 (0)