Skip to content

Commit

Permalink
start documenting animation (#668)
Browse files Browse the repository at this point in the history 
* start documenting animation

* Update course_data.c

* change comment
  • Loading branch information
@coco875
coco875 committed Aug 22, 2024
1 parent 1ae52f2 commit 8733751
Show file tree
Hide file tree
Showing 20 changed files with 394 additions and 651 deletions.
145 changes: 33 additions & 112 deletions courses/koopa_troopa_beach/course_data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <waypoints.h>
#include <course.h>
#include <mk64.h>
#include <code_80004740.h>
#include <animation.h>

#include "course_displaylists.inc.h"

Expand Down Expand Up @@ -8310,7 +8310,7 @@ s16 d_course_koopa_troopa_beach_unk_data2[] = {
};

// 0x06014B50
animation_type_3_triplet d_course_koopa_troopa_beach_unk_data3[] = {
AnimationLimbVector d_course_koopa_troopa_beach_unk_data3[] = {
{
{ 0x0001, 0x0000 },
{ 0x0037, 0x0001 },
Expand Down Expand Up @@ -8369,7 +8369,7 @@ animation_type_3_triplet d_course_koopa_troopa_beach_unk_data3[] = {
};

// 0x06014BD4
animation_type_2 d_course_koopa_troopa_beach_unk_data4 = {
Animation d_course_koopa_troopa_beach_unk_data4 = {
0x00010000,
0x00000000,
0x0037,
Expand Down Expand Up @@ -8541,146 +8541,67 @@ Gfx d_course_koopa_troopa_beach_dl_16990[] =

//! 0x60169b
u32 d_course_koopa_troopa_beach_unk4[] = {
0x00000001,
0x00000002,
ANIMATION_DISABLE_AUTOMATIC_POP,

0x00000000,
0x00000007,
0x00000000,
0x00000000,
0x00000000,
0x00000000,
0x00000000,
ANIMATION_ADD_POS(0x00000000, 0x00000000, 0x00000000),

0x00000001,
0x00000002,
ANIMATION_DISABLE_AUTOMATIC_POP,

0x00000000,
0x00000007,
0x00000000,
(u32) d_course_koopa_troopa_beach_dl_16630,
0x00000000,
0x00000000,
0x00000000,
ANIMATION_RENDER_MODEL(d_course_koopa_troopa_beach_dl_16630),

0x00000001,
0x00000002,
ANIMATION_DISABLE_AUTOMATIC_POP,

0x00000000,
0x00000007,
0x00000000,
0x00000000,
0x00000000,
0xfffffffb,
0x00000005,
ANIMATION_ADD_POS(0x00000000, -0x00000005, 0x00000005),

0x00000001,
0x00000002,
ANIMATION_DISABLE_AUTOMATIC_POP,

0x00000000,
0x00000007,
0x00000000,
(u32) d_course_koopa_troopa_beach_dl_16850,
0x00000000,
0x00000000,
0x00000000,
ANIMATION_RENDER_MODEL(d_course_koopa_troopa_beach_dl_16850),

0x00000001,
0x00000002,
ANIMATION_DISABLE_AUTOMATIC_POP,

0x00000000,
0x00000007,
0x00000000,
(u32) d_course_koopa_troopa_beach_dl_168F0,
0x00000024,
0x00000000,
0x00000000,
ANIMATION_RENDER_MODEL_AT(d_course_koopa_troopa_beach_dl_168F0, 0x00000024, 0x00000000, 0x00000000),

0x00000001,
0x00000002,
ANIMATION_DISABLE_AUTOMATIC_POP,

0x00000000,
0x00000007,
0x00000000,
(u32) d_course_koopa_troopa_beach_dl_16990,
0x00000019,
0x00000000,
0x00000000,
ANIMATION_RENDER_MODEL_AT(d_course_koopa_troopa_beach_dl_16990, 0x00000019, 0x00000000, 0x00000000),

0x00000002,
0x00000002,
ANIMATION_POP_MATRIX,

0x00000002,
0x00000002,
ANIMATION_POP_MATRIX,

0x00000002,
0x00000002,
ANIMATION_POP_MATRIX,

0x00000000,
0x00000007,
0x00000000,
0x00000000,
0x00000000,
0xfffffffb,
0xfffffffb,
ANIMATION_ADD_POS(0x00000000, -0x00000005, -0x00000005),

0x00000001,
0x00000002,
ANIMATION_DISABLE_AUTOMATIC_POP,

0x00000000,
0x00000007,
0x00000000,
(u32) d_course_koopa_troopa_beach_dl_16850,
0x00000000,
0x00000000,
0x00000000,
ANIMATION_RENDER_MODEL(d_course_koopa_troopa_beach_dl_16850),

0x00000001,
0x00000002,
ANIMATION_DISABLE_AUTOMATIC_POP,

0x00000000,
0x00000007,
0x00000000,
(u32) d_course_koopa_troopa_beach_dl_168F0,
0x00000024,
0x00000000,
0x00000000,
ANIMATION_RENDER_MODEL_AT(d_course_koopa_troopa_beach_dl_168F0, 0x00000024, 0x00000000, 0x00000000),

0x00000001,
0x00000002,
ANIMATION_DISABLE_AUTOMATIC_POP,

0x00000000,
0x00000007,
0x00000000,
(u32) d_course_koopa_troopa_beach_dl_16990,
0x00000019,
0x00000000,
0x00000000,
ANIMATION_RENDER_MODEL_AT(d_course_koopa_troopa_beach_dl_16990, 0x00000019, 0x00000000, 0x00000000),

0x00000002,
0x00000002,
ANIMATION_POP_MATRIX,

0x00000002,
0x00000002,
ANIMATION_POP_MATRIX,

0x00000002,
0x00000002,
ANIMATION_POP_MATRIX,

0x00000002,
0x00000002,
ANIMATION_POP_MATRIX,

0x00000002,
0x00000002,
ANIMATION_POP_MATRIX,

0x00000002,
0x00000002,
ANIMATION_POP_MATRIX,

0x00000003,
0x00000002,
ANIMATION_STOP,
};

// 0x06016B60
animation_type_2 *d_course_koopa_troopa_beach_unk_data5[] = {
Animation *d_course_koopa_troopa_beach_unk_data5[] = {
&d_course_koopa_troopa_beach_unk_data4,
};

Expand Down
8 changes: 4 additions & 4 deletions courses/koopa_troopa_beach/course_data.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <actor_types.h>
#include <waypoints.h>
#include <course.h>
#include "code_80004740.h"
#include "animation.h"

extern Gfx d_course_koopa_troopa_beach_dl_0[];
extern Gfx d_course_koopa_troopa_beach_dl_48[];
Expand Down Expand Up @@ -314,8 +314,8 @@ extern u8 d_course_koopa_troopa_beach_crab_tlut[];
extern u8 d_course_koopa_troopa_beach_crab_frames[][4096];
extern u32 d_course_koopa_troopa_beach_unk_data1[];
extern s16 d_course_koopa_troopa_beach_unk_data2[];
extern animation_type_3_triplet d_course_koopa_troopa_beach_unk_data3[];
extern animation_type_2 d_course_koopa_troopa_beach_unk_data4;
extern AnimationLimbVector d_course_koopa_troopa_beach_unk_data3[];
extern Animation d_course_koopa_troopa_beach_unk_data4;
extern Lights1 d_course_koopa_troopa_beach_light1;
extern u8 d_course_koopa_troopa_beach_bird_wing[];
extern u8 d_course_koopa_troopa_beach_bird_eye[];
Expand All @@ -332,7 +332,7 @@ extern Gfx d_course_koopa_troopa_beach_dl_168F0[];
extern Vtx d_course_koopa_troopa_beach_bird_wing_3_model[];
extern Gfx d_course_koopa_troopa_beach_dl_16990[];
extern u32 d_course_koopa_troopa_beach_unk4[];
extern animation_type_2 *d_course_koopa_troopa_beach_unk_data5[];
extern Animation *d_course_koopa_troopa_beach_unk_data5[];
extern u32 d_course_koopa_troopa_beach_unk_data6[];
extern Lights1 d_course_koopa_troopa_beach_light2;
extern Vtx d_course_koopa_troopa_beach_tree_model[];
Expand Down
91 changes: 21 additions & 70 deletions courses/rainbow_road/course_data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <actor_types.h>
#include <waypoints.h>
#include <course.h>
#include <code_80004740.h>
#include <animation.h>
#include <mk64.h>

#include "course_displaylists.inc.h"
Expand Down Expand Up @@ -3415,7 +3415,7 @@ Gfx d_course_rainbow_road_dl_15F18[] =
};

// 0x06015FC8
s16 d_rainbow_road_chomp_jaw_animation[] = {
s16 d_rainbow_road_chomp_angle[] = {
0x0000, 0x3fff,
0x9602, 0x9483,
0x90d2, 0x8c1b,
Expand Down Expand Up @@ -3471,7 +3471,7 @@ s16 d_rainbow_road_chomp_jaw_animation[] = {
};

// 0x06016098
animation_type_3_triplet d_rainbow_road_unk1[] = {
AnimationLimbVector d_rainbow_road_chomp_animation_matrix[] = {
{
{ 0x0001, 0x0000 },
{ 0x0001, 0x0000 },
Expand Down Expand Up @@ -3515,98 +3515,49 @@ animation_type_3_triplet d_rainbow_road_unk1[] = {
};

// 0x060160F8
animation_type_2 d_rainbow_road_unk2 = {
Animation d_rainbow_road_unk2 = {
0x00010000,
0x00000000,
0x0014,
0x0007,
d_rainbow_road_chomp_jaw_animation,
d_rainbow_road_unk1,
d_rainbow_road_chomp_angle,
d_rainbow_road_chomp_animation_matrix,
};

// 0x0601610C
animation_type_2 *d_rainbow_road_unk3[] = {
Animation *d_rainbow_road_unk3[] = {
&d_rainbow_road_unk2,
};

// 0x06016110
u32 d_rainbow_road_unk4[] = {
0x00000001,
0x00000002,
ANIMATION_DISABLE_AUTOMATIC_POP,

0x00000000,
0x00000007,
0x00000000,
0x00000000,
0x00000000,
0x0000023a,
0x00000000,
ANIMATION_ADD_POS(0x00000000, 0x0000023a, 0x00000000),

0x00000001,
0x00000002,
ANIMATION_DISABLE_AUTOMATIC_POP,

0x00000000,
0x00000007,
0x00000000,
(u32) d_course_rainbow_road_dl_15550,
0x00000000,
0x00000000,
0x00000000,
ANIMATION_RENDER_MODEL(d_course_rainbow_road_dl_15550),

0x00000000,
0x00000007,
0x00000000,
(u32) d_course_rainbow_road_dl_151A8,
0x00000000,
0x00000000,
0x00000000,
ANIMATION_RENDER_MODEL(d_course_rainbow_road_dl_151A8),

0x00000002,
0x00000002,
ANIMATION_POP_MATRIX,

0x00000000,
0x00000007,
0x00000000,
0x00000000,
0x00000000,
0x0000023a,
0x00000000,
ANIMATION_ADD_POS(0x00000000, 0x0000023a, 0x00000000),

0x00000001,
0x00000002,
ANIMATION_DISABLE_AUTOMATIC_POP,

0x00000000,
0x00000007,
0x00000000,
(u32) d_course_rainbow_road_dl_15C68,
0x00000000,
0x00000000,
0x00000000,
ANIMATION_RENDER_MODEL(d_course_rainbow_road_dl_15C68),

0x00000000,
0x00000007,
0x00000000,
(u32) d_course_rainbow_road_dl_158C0,
0x00000000,
0x00000000,
0x00000000,
ANIMATION_RENDER_MODEL(d_course_rainbow_road_dl_158C0),

0x00000000,
0x00000007,
0x00000000,
(u32) d_course_rainbow_road_dl_15F18,
0x00000000,
0x00000000,
0x00000000,
ANIMATION_RENDER_MODEL(d_course_rainbow_road_dl_15F18),

0x00000002,
0x00000002,
ANIMATION_POP_MATRIX,

0x00000002,
0x00000002,
ANIMATION_POP_MATRIX,

0x00000003,
0x00000002,
ANIMATION_STOP,
};

// No idea what this stuff is
Expand Down
Loading

0 comments on commit 8733751

Please sign in to comment.