mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-09 12:37:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix rodata

Browse Source
This commit is contained in:
roeming
2025-01-16 14:56:41 -05:00
parent 00e4806bc9
commit a59dd955b7
3 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actor/ac_museum_fish.c
+24 -50
View File
@@ -1,13 +1,9 @@
#include "ac_museum_fish.h"
#include "m_demo.h"
#include "m_name_table.h"
#include "m_item_name.h"
#include "m_msg.h"
#include "m_common_data.h"
#include "sys_matrix.h"
#include "m_player_lib.h"
#include "m_debug_mode.h"
#include "libforest/gbi_extensions.h"
#include "m_rcp.h"
#include "ac_gyoei.h"
@@ -24,10 +20,6 @@
#define RANDOM_RANGE(min, max) ((int)(min) + (int)RANDOM((int)(max) - (int)(min)))
#define RANDOM2_RANGE(min, max) ((int)(min) + (int)RANDOM2((int)(max) - (int)(min)))
// delete this stuff later
typedef Mtx;
typedef Gfx;
// extern data
// clang-format off
extern cKF_Skeleton_R_c
@@ -630,28 +622,31 @@ int unagi_rail_num_tbl[3] = {
ARRAY_LEN(unagi_rail_pos3),
};
#include "../src/actor/ac_museum_fish_base.c_inc"
#include "../src/actor/ac_museum_fish_afish.c_inc"
#include "../src/actor/ac_museum_fish_aroana.c_inc"
#include "../src/actor/ac_museum_fish_koi.c_inc"
#include "../src/actor/ac_museum_fish_kaseki.c_inc"
#include "../src/actor/ac_museum_fish_bass.c_inc"
#include "../src/actor/ac_museum_fish_seafish.c_inc"
#include "../src/actor/ac_museum_fish_tai.c_inc"
#include "../src/actor/ac_museum_fish_small_fish.c_inc"
#include "../src/actor/ac_museum_fish_gupi.c_inc"
#include "../src/actor/ac_museum_fish_medaka.c_inc"
#include "../src/actor/ac_museum_fish_kingyo.c_inc"
#include "../src/actor/ac_museum_fish_dojou.c_inc"
#include "../src/actor/ac_museum_fish_donko.c_inc"
#include "../src/actor/ac_museum_fish_big_fish.c_inc"
#include "../src/actor/ac_museum_fish_ito.c_inc"
#include "../src/actor/ac_museum_fish_unagi.c_inc"
#include "../src/actor/ac_museum_fish_namazu.c_inc"
#include "../src/actor/ac_museum_fish_zarigani.c_inc"
#include "../src/actor/ac_museum_fish_kurage.c_inc"
#include "../src/actor/ac_museum_fish_hasu.c_inc"
#include "../src/actor/ac_museum_fish_subfish.c_inc"
// clang-format on
void Museum_Fish_Prv_data_init(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game, int fishNum, int r6) {
actor->fishIDEnum = fishNum;
actor->init_data = mfish_init_data[fishNum];
actor->group = mfish_group_tbl[fishNum];
if (actor->group >= 0) {
actor->position = suisou_pos[actor->group];
} else {
actor->position = ZeroVec;
}
actor->position.y = mfish_init_data[fishNum]._0C + RANDOM2_F(10);
if (r6 == 1) {
actor->position.x += RANDOM2_F(90.f);
actor->position.z += RANDOM2_F(90.f);
}
actor->currentProcess = &mfish_normal_process;
mfish_ct[fishNum](actor, game);
}
// clang-format off
cKF_Skeleton_R_c* kusa_model[14] = {
&cKF_bs_r_obj_museum5_kusa1,
&cKF_bs_r_obj_museum5_kusa1,
@@ -688,29 +683,8 @@ cKF_Animation_R_c* kusa_anime[14]= {
float kusa_start_frame[14] = {
25.0f, 0.0f, 25.0f, 0.0f, 50.0f, 0.0f, 20.0f, 60.0f, 80.0f, 0.0f, 0.0f, 25.0f, 0.0f, 75.0f
};
// clang-format on
void Museum_Fish_Prv_data_init(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game, int fishNum, int r6) {
actor->fishIDEnum = fishNum;
actor->init_data = mfish_init_data[fishNum];
actor->group = mfish_group_tbl[fishNum];
if (actor->group >= 0) {
actor->position = suisou_pos[actor->group];
} else {
actor->position = ZeroVec;
}
actor->position.y = mfish_init_data[fishNum]._0C + RANDOM2_F(10);
if (r6 == 1) {
actor->position.x += RANDOM2_F(90);
actor->position.z += RANDOM2_F(90);
}
actor->currentProcess = &mfish_normal_process;
mfish_ct[fishNum](actor, game);
}
void Museum_Fish_Actor_ct(ACTOR* actorx, GAME* gamex) {
MUSEUM_FISH_ACTOR* actor = (MUSEUM_FISH_ACTOR*)actorx;
int i;
src/actor/ac_museum_fish_base.c_inc
+24 -1
View File
@@ -623,7 +623,26 @@ void mfish_ani_base_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
void mfish_ani_base_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
mfish_onefish_dw(actor, gamex);
}
#include "../src/actor/ac_museum_fish_afish.c_inc"
#include "../src/actor/ac_museum_fish_aroana.c_inc"
#include "../src/actor/ac_museum_fish_koi.c_inc"
#include "../src/actor/ac_museum_fish_kaseki.c_inc"
#include "../src/actor/ac_museum_fish_bass.c_inc"
#include "../src/actor/ac_museum_fish_seafish.c_inc"
#include "../src/actor/ac_museum_fish_tai.c_inc"
#include "../src/actor/ac_museum_fish_small_fish.c_inc"
#include "../src/actor/ac_museum_fish_gupi.c_inc"
#include "../src/actor/ac_museum_fish_medaka.c_inc"
#include "../src/actor/ac_museum_fish_kingyo.c_inc"
#include "../src/actor/ac_museum_fish_dojou.c_inc"
#include "../src/actor/ac_museum_fish_donko.c_inc"
#include "../src/actor/ac_museum_fish_big_fish.c_inc"
#include "../src/actor/ac_museum_fish_ito.c_inc"
#include "../src/actor/ac_museum_fish_unagi.c_inc"
#include "../src/actor/ac_museum_fish_namazu.c_inc"
#include "../src/actor/ac_museum_fish_zarigani.c_inc"
#include "../src/actor/ac_museum_fish_kurage.c_inc"
#include "../src/actor/ac_museum_fish_hasu.c_inc"
void Museum_Fish_BigFishObjCheck(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) {
int i;
MUSEUM_FISH_PRIVATE_DATA* fish[2];
@@ -877,6 +896,10 @@ void Museum_Fish_objchk_pos_set(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) {
actor->_5B8.z += (actor->init_data._24 * cos_s(actor->_60C.y));
}
void Museum_Fish_old_chk_pos_set() {
// UNUSED/STRIPPED
}
void Museum_Fish_BGCheck(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) {
xyz_t p = suisou_pos[actor->group];
f32 f29, f30, f28, f27, f31, f26, f25;
src/actor/ac_museum_fish_subfish.c_inc
+3
View File
@@ -0,0 +1,3 @@
#include "../src/actor/ac_museum_fish_base.c_inc"