summaryrefslogtreecommitdiff
path: root/courses
diff options
context:
space:
mode:
authorcoco875 <59367621+coco875@users.noreply.github.com>2024-08-23 02:20:13 +0200
committerGitHub <noreply@github.com>2024-08-22 18:20:13 -0600
commite135178097f416bc54e36058e10d9b1c013929fd (patch)
tree0903c79b59ed716497e55618631d5e76611fe032 /courses
parent3781ce2830a143df855003b65fe069d2e26215d9 (diff)
Update from decomp (#34)
* Update menus.c (#634) * Update common_data.yml (#635) * Renames for screenId and other changes (#636) * screenId renames * Rename surface map to collision mesh (#637) * Rename some stack vars (#638) * Fix syntax error (#639) * Rename some stack vars * Update collision.c * Collision Documentation (#640) * Collision related renames * update doxygen (#649) * change bool (#644) * Update (#642) * Delete trig_tables_bss.c (#650) * fix typo audio (#656) * fix typo src actor (#657) * fix typo include (#658) * fix course (#659) * fix typo debug (#660) * fix typo data (#661) * Update common_structs.h * replace number with const (#665) * fix typo buffers (#655) * fix typo buffers * tweak ld file * rename to sMemoryPool * add a warning --------- * fix typo src (#654) * fix typo src * fix non matcing * Update code_80091750.c --------- * fix typo racing (#653) * fix typo racing * get it match * replace G_LINE3D to G_QUAD --------- * fix typo src (#652) * fix ending typo (#651) * Action more info when it doesn't match and fix first diff (#662) * Update linux-compile.yml * fix first-diff * Update first-diff.py --------- * document texture of kart (#663) * document texture of kart * change screenPlayerId to screenId * some documentation around object * Revert "some documentation around object" This reverts commit cbb39078e036bf2a417bed67359e910213acab28. * more rename --------- * Make evaluate_collision_players_palm_tree better (#667) This matches just the same as before, but using those two casts instead of shifts seems more likely to be accurate to the original source code Signed-off-by: Gabriel Ravier <gabravier@gmail.com> * add fedora instruciton (#666) * start documenting animation (#668) * start documenting animation * Update course_data.c * change comment * fix error of compilation * fix error of compilation * Update animation.c
Diffstat (limited to 'courses')
-rw-r--r--courses/all_course_model.h2
-rw-r--r--courses/koopa_troopa_beach/course_offsets.c6
-rw-r--r--courses/rainbow_road/course_offsets.c6
-rw-r--r--courses/sherbet_land/course_offsets.c14
-rw-r--r--courses/staff_ghost_data.c2
-rw-r--r--courses/yoshi_valley/course_offsets.c6
6 files changed, 18 insertions, 18 deletions
diff --git a/courses/all_course_model.h b/courses/all_course_model.h
index 4ef3709d6..95759cb10 100644
--- a/courses/all_course_model.h
+++ b/courses/all_course_model.h
@@ -2,7 +2,7 @@
#define ALL_COURSE_MODEL_H
#include "macros.h"
-#include "common_structs.h"
+#include <common_structs.h>
/** WARNING!!!
* This header file has the sizes of the vertex array's hard coded.
diff --git a/courses/koopa_troopa_beach/course_offsets.c b/courses/koopa_troopa_beach/course_offsets.c
index 18ffb89c7..ef784168f 100644
--- a/courses/koopa_troopa_beach/course_offsets.c
+++ b/courses/koopa_troopa_beach/course_offsets.c
@@ -388,7 +388,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 },
@@ -447,7 +447,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,
@@ -599,7 +599,7 @@ uintptr_t d_course_koopa_troopa_beach_unk4[] = {
};
// 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,
};
diff --git a/courses/rainbow_road/course_offsets.c b/courses/rainbow_road/course_offsets.c
index 5359dab9b..a555a72e7 100644
--- a/courses/rainbow_road/course_offsets.c
+++ b/courses/rainbow_road/course_offsets.c
@@ -97,7 +97,7 @@ s16 d_rainbow_road_chomp_jaw_animation[] = {
};
// 0x06016098
-animation_type_3_triplet d_rainbow_road_unk1[] = {
+AnimationLimbVector d_rainbow_road_unk1[] = {
{
{ 0x0001, 0x0000 },
{ 0x0001, 0x0000 },
@@ -141,7 +141,7 @@ animation_type_3_triplet d_rainbow_road_unk1[] = {
};
// 0x060160F8
-animation_type_2 d_rainbow_road_unk2 = {
+Animation d_rainbow_road_unk2 = {
0x00010000,
0x00000000,
0x0014,
@@ -151,7 +151,7 @@ animation_type_2 d_rainbow_road_unk2 = {
};
// 0x0601610C
-animation_type_2 *d_rainbow_road_unk3[] = {
+Animation *d_rainbow_road_unk3[] = {
&d_rainbow_road_unk2,
};
diff --git a/courses/sherbet_land/course_offsets.c b/courses/sherbet_land/course_offsets.c
index c942bf9a0..5cb3387c0 100644
--- a/courses/sherbet_land/course_offsets.c
+++ b/courses/sherbet_land/course_offsets.c
@@ -495,7 +495,7 @@ s16 d_course_sherbet_land_unk_data2[] = {
};
// 0x06009350
-animation_type_3_triplet d_course_sherbet_land_unk_data3[] = {
+AnimationLimbVector d_course_sherbet_land_unk_data3[] = {
{
{ 0x0001, 0x0000 },
{ 0x0001, 0x0001 },
@@ -559,7 +559,7 @@ animation_type_3_triplet d_course_sherbet_land_unk_data3[] = {
};
// 0x060093E0
-animation_type_2 d_course_sherbet_land_unk_data4 = {
+Animation d_course_sherbet_land_unk_data4 = {
0x00010000,
0x00050000,
0x0013,
@@ -720,7 +720,7 @@ s16 d_course_sherbet_land_unk_data5[] = {
};
// 0x06009640
-animation_type_3_triplet d_course_sherbet_land_unk_data6[] = {
+AnimationLimbVector d_course_sherbet_land_unk_data6[] = {
{
{ 0x0001, 0x0000 },
{ 0x0019, 0x0001 },
@@ -784,7 +784,7 @@ animation_type_3_triplet d_course_sherbet_land_unk_data6[] = {
};
// 0x060096D0
-animation_type_2 d_course_sherbet_land_unk_data7 = {
+Animation d_course_sherbet_land_unk_data7 = {
0x00000000,
0x00000000,
0x0019,
@@ -1006,7 +1006,7 @@ s16 d_course_sherbet_land_unk_data8[] = {
};
// 0x06009A24
-animation_type_3_triplet d_course_sherbet_land_unk_data9[] = {
+AnimationLimbVector d_course_sherbet_land_unk_data9[] = {
{
{ 0x0001, 0x0000 },
{ 0x0019, 0x0001 },
@@ -1070,7 +1070,7 @@ animation_type_3_triplet d_course_sherbet_land_unk_data9[] = {
};
// 0x06009AB4
-animation_type_2 d_course_sherbet_land_unk_data10 = {
+Animation d_course_sherbet_land_unk_data10 = {
0x00000000,
0x00000000,
0x0019,
@@ -1080,7 +1080,7 @@ animation_type_2 d_course_sherbet_land_unk_data10 = {
};
// 0x06009AC8
-animation_type_2 *d_course_sherbet_land_unk_data11[] = {
+Animation *d_course_sherbet_land_unk_data11[] = {
&d_course_sherbet_land_unk_data4,
&d_course_sherbet_land_unk_data7,
&d_course_sherbet_land_unk_data10,
diff --git a/courses/staff_ghost_data.c b/courses/staff_ghost_data.c
index 9483089ba..7ac7d2d2c 100644
--- a/courses/staff_ghost_data.c
+++ b/courses/staff_ghost_data.c
@@ -1,6 +1,6 @@
#include <libultraship.h>
#include <macros.h>
-#include "common_structs.h"
+#include <common_structs.h>
/*
* This file is required for data alignment
diff --git a/courses/yoshi_valley/course_offsets.c b/courses/yoshi_valley/course_offsets.c
index f5f5cfaf5..306cf6ccb 100644
--- a/courses/yoshi_valley/course_offsets.c
+++ b/courses/yoshi_valley/course_offsets.c
@@ -166,7 +166,7 @@ s16 d_course_yoshi_valley_unk1[] = {
};
// 0x06014714
-animation_type_3_triplet d_course_yoshi_valley_unk2[] = {
+AnimationLimbVector d_course_yoshi_valley_unk2[] = {
{
{ 0x0001, 0x0000 },
{ 0x0001, 0x0000 },
@@ -215,7 +215,7 @@ animation_type_3_triplet d_course_yoshi_valley_unk2[] = {
};
// 0x06014780
-animation_type_2 d_course_yoshi_valley_unk3 = {
+Animation d_course_yoshi_valley_unk3 = {
0x00010000,
0x00000000,
0x001d,
@@ -225,7 +225,7 @@ animation_type_2 d_course_yoshi_valley_unk3 = {
};
// 0x06014794
-animation_type_2 *d_course_yoshi_valley_unk4[] = {
+Animation *d_course_yoshi_valley_unk4[] = {
&d_course_yoshi_valley_unk3,
};