mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-22 22:24:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

link m_play

Browse Source
This commit is contained in:
Prakxo
2023-09-08 18:55:22 +02:00
parent 62311e1fba
commit 68db2189f0
45 changed files with 1254 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/rel_slices.yml
+7 -4
View File
@@ -340,6 +340,13 @@ first_game.c:
.text: [0x80629CA8, 0x80629D4C]
sys_romcheck.c:
.text: [0x80629D4C, 0x80629D8C]
sys_dynamic.c:
.bss: [0x813413F8, 0x81361820]
m_play.c:
.text: [0x80629D8C,0x8062B630]
.rodata: [0x8064D1B8, 0x8064D1C0]
.data: [0x806D46D0, 0x806D4958]
.bss: [0x81361820, 0x8148DA60]
second_game.c:
.text: [0x8062B630, 0x8062B848]
.bss: [0x8148DA60, 0x8148DA68]
@@ -363,10 +370,6 @@ audio.c:
.rodata: [0x8064D340, 0x8064D360]
.data: [0x806D4CB0,0x806D4D40]
.bss: [0x8148DA78,0x8148DA7C]
sys_dynamic.c:
.bss: [0x813413F8, 0x81361820]
# ac_aprilfool_control/aPC_actor_dt.c: common_data is pure bs,
# .text: [0x805153f0, 0x8051542C]
# dataobject.obj files
data/titledemo/pact0.c:
include/Famicom/famicom.h
+3
View File
@@ -68,6 +68,9 @@ typedef struct famicom_common_s {
/* 0xB4 */ int _b4;
} FamicomCommon;
extern void* my_malloc_current;
typedef u8 (*FAMICOM_GETSAVECHAN_PROC)(int* player_no, int* slot_card_result);
extern void famicom_setCallback_getSaveChan(FAMICOM_GETSAVECHAN_PROC getSaveChan_proc);
extern int famicom_mount_archive();
include/PreRender.h
+5
View File
@@ -27,6 +27,11 @@ typedef struct prerender_s {
u8 _24[0x24];
} PreRender;
extern void PreRender_setup_savebuf(PreRender* render, int arg1, int arg2, int arg3, int arg4, int arg5);
extern void PreRender_init(PreRender* render);
extern void PreRender_setup_renderbuf(PreRender* render, int arg1, int arg2, void* arg3, void* arg4);
extern void PreRender_cleanup(PreRender* render);
#ifdef __cplusplus
}
#endif
include/audio.h
+2 -2
View File
@@ -91,8 +91,8 @@ extern void sAdo_OngenTrgStartSpeed(f32 speed, u16 s1, xyz_t* pos);
extern void sAdo_TrgSeEcho(u8 b);
extern void sAdo_LevSeEcho(u8 b);
extern void sAdo_BgmFadeoutCheck();
extern void sAdo_SeFadeoutCheck();
extern u8 sAdo_BgmFadeoutCheck();
extern u8 sAdo_SeFadeoutCheck();
extern void sAdo_RoomType(u8 type);
extern void sAdo_Museum(u8 type);
include/famicom_emu.h
+2
View File
@@ -13,6 +13,8 @@ typedef struct game_famicom_emu_s {
/* 0x00 */ GAME game;
} GAME_FAMICOM_EMU;
extern void* my_malloc_func[];
extern void famicom_emu_init(GAME_FAMICOM_EMU* famicom_emu);
extern void famicom_emu_cleanup(GAME_FAMICOM_EMU* famicom_emu);
include/m_camera2.h
+4
View File
@@ -326,6 +326,10 @@ typedef struct camera_s {
xyz_t* Camera2_getMicPos_p(GAME_PLAY*);
void Camera2_ClearActorTalking_Cull(GAME_PLAY*);
void Camera2_process(GAME_PLAY*);
void Init_Camera2(GAME_PLAY*);
void Camera2_draw(GAME_PLAY*);
#ifdef __cplusplus
}
include/m_card.h
+1
View File
@@ -16,6 +16,7 @@ extern void mCD_init_card();
extern void mCD_PrintErrInfo(gfxprint_t* gfxprint);
extern void mCD_InitAll();
extern void mCD_LoadLand();
extern void mCD_toNextLand();
#ifdef __cplusplus
}
include/m_collision_bg.h
+6
View File
@@ -116,6 +116,12 @@ extern void mCoBG_SetPlussOffset(xyz_t wpos, s16 offset, s16 new_attrib);
extern int mCoBG_GetLayer(const xyz_t* wpos);
extern int mCoBG_BnumUnum2HoleNumber(int block_x, int block_z, int ut_x, int ut_z);
extern void mCoBG_InitMoveBgData();
extern void mCoBG_InitBlockBgCheckMode();
extern void mCoBG_InitDecalCircle();
extern void mCoBG_CalcTimerDecalCircle();
extern f32 mCoBG_GetWaterHeight_File(xyz_t wpos, char* file, int line);
#define mCoBG_GetWaterHeight(wpos) mCoBG_GetWaterHeight_File(wpos, __FILE__, __LINE__)
include/m_common_data.h
+3 -1
View File
@@ -200,7 +200,9 @@ typedef struct common_data_s {
/* 0x028592 */ s16 demo_profiles[mDemo_CLIP_TYPE_NUM - 1];
/* 0x028596 */ u8 _28596[0x285C0 - 0x28596];
/* 0x0285C0 */ s8 player_decoy_flag;
/* 0x0285C1 */ u8 _285C1[0x028838 - 0x0285C1];
/* 0x0285C1 */ u8 _285C1[0x0285C6 - 0x0285C1];
/* 0x0285C6 */ u8 event_id;
/* 0x0285C7 */ u8 _285C3[0x028838 - 0x0285C7];
/* 0x028838 */ s8 player_bee_swell_flag;
/* 0x028839 */ s8 player_bee_chase_flag;
/* 0x02883A */ u8 goki_shocked_flag;
include/m_debug_display.h
+11
View File
@@ -0,0 +1,11 @@
#ifndef M_DEBUG_DISPLAY_H
#define M_DEBUG_DISPLAY_H
#include "types.h"
#include "m_play.h"
extern void Debug_Display_output(GAME_PLAY*);
extern void Debug_Display_init();
#endif
include/m_demo.h
+3
View File
@@ -60,6 +60,8 @@ enum demo_clip_type {
mDemo_CLIP_TYPE_NUM
};
extern void mDemo_Init(GAME_PLAY*);
extern void mDemo_Main(GAME_PLAY*);
extern int mDemo_Request(int type, ACTOR* actor, mDemo_REQUEST_PROC request_proc);
extern void mDemo_Set_msg_num(int msg_num);
extern int mDemo_Check(int type, ACTOR* actor);
@@ -75,6 +77,7 @@ extern void mDemo_Set_talk_display_name(u8 value);
extern void mDemo_Set_camera(u8 value);
extern void mDemo_Set_talk_window_color(rgba_t* color);
extern int mDemo_CheckDemo();
extern void mDemo_stock_clear();
#ifdef __cplusplus
}
include/m_event.h
+5 -1
View File
@@ -240,7 +240,7 @@ extern int mEv_check_status(int event, s16 status);
extern s8* mEv_get_common_area(int type, s8 id);
extern int mEv_ArbeitPlayer(u32 player_no);
extern u16 mEv_get_special_event_type();
mEv_ClearEventSaveInfo(mEv_event_save_c* event_save_data);
extern int mEv_ClearEventSaveInfo(mEv_event_save_c* event_save_data);
extern int mEv_weekday2day(lbRTC_month_t month, int week_type, lbRTC_weekday_t weekday);
extern void mEv_ClearEventInfo();
@@ -248,12 +248,16 @@ extern void mEv_ClearEventInfo();
extern void mEv_init(Event_c* event);
extern void mEv_2nd_init(Event_c* event);
extern void mEv_run(Event_c* event);
extern void mEv_finish(Event_c* event);
extern int mEv_CheckTitleDemo();
extern void mEv_SetTitleDemo(int titledemo_no);
extern void mEv_debug_print4f(gfxprint_t* gfxprint);
extern void mEv_sp_debug_print4f(gfxprint_t* gfxprint);
#ifdef __cplusplus
}
#endif
include/m_fbdemo.h
+8 -8
View File
@@ -17,16 +17,16 @@ typedef struct {
/* 0x98 */ Mtx modelView2;
/* 0xD8 */ Gfx* gfx; // "gfxtbl"
/* 0xDC */ u16* zBuffer;
} fbdemo; // size = 0xE0
} fbdemo_c; // size = 0xE0
extern void fbdemo_init_gfx(fbdemo*);
extern void fbdemo_init_data(fbdemo*);
extern void fbdemo_cleanup(fbdemo*);
extern fbdemo* fbdemo_init(fbdemo*, int, int);
extern void fbdemo_update(fbdemo*);
extern void fbdemo_draw(fbdemo*, Gfx**);
extern void fbdemo_move(fbdemo*);
extern void fbdemo_init_gfx(fbdemo_c*);
extern void fbdemo_init_data(fbdemo_c*);
extern void fbdemo_cleanup(fbdemo_c*);
extern fbdemo_c* fbdemo_init(fbdemo_c*, int, int);
extern void fbdemo_update(fbdemo_c*);
extern void fbdemo_draw(fbdemo_c*, Gfx**);
extern void fbdemo_move(fbdemo_c*);
#endif
include/m_fbdemo_fade.h
+1
View File
@@ -18,6 +18,7 @@ typedef struct {
extern fbdemo_fade* fbdemo_fade_init(fbdemo_fade*);
extern void fbdemo_fade_move(fbdemo_fade*, int);
extern void fbdemo_fade_draw(fbdemo_fade* this, Gfx** gfxP);
extern void fbdemo_fade_startup(fbdemo_fade*);
extern void fbdemo_fade_settype(fbdemo_fade*, int);
extern void fbdemo_fade_setcolor_rgba8888(fbdemo_fade* this, u32 color);
include/m_fbdemo_triforce.h
-1
View File
@@ -26,5 +26,4 @@ extern s8 fbdemo_triforce_is_finish(fbdemo_triforce*);
extern void fbdemo_triforce_settype(fbdemo_triforce*, int);
extern void fbdemo_triforce_setcolor_rgba8888(void);
#endif
include/m_field_make.h
+3
View File
@@ -5,6 +5,7 @@
#include "m_actor_type.h"
#include "libforest/gbi_extensions.h"
#include "game_h.h"
#include "m_play.h"
#ifdef __cplusplus
extern "C" {
@@ -91,6 +92,8 @@ typedef struct field_info_s {
extern u8* g_block_type_p;
extern int* g_block_kind_p;
extern void mFM_FieldInit(GAME_PLAY*);
extern void mFM_Field_dt();
extern void mFM_DecideBgTexIdx(u8* bg_tex_idx);
extern void mFM_InitFgCombiSaveData(GAME* game);
extern mActor_name_t mFM_GetReserveName(int block_x, int block_z);
include/m_fuusen.h
+1 -1
View File
@@ -20,7 +20,7 @@ enum {
extern int fuusen_DEBUG_mode_flag;
extern void Balloon_init();
extern void Balloon_init(GAME_PLAY*);
extern void Balloon_make_fuusen(GAME_PLAY* play);
extern void Balloon_chk_make_fuusen(GAME_PLAY* play);
extern void Balloon_move(GAME_PLAY* play);
include/m_kankyo.h
+4
View File
@@ -42,7 +42,11 @@ typedef struct kankyo_s {
/* 0xC8 */ Nature nature;
} Kankyo;
extern void Global_kankyo_ct(GAME_PLAY*, Kankyo*);
extern int mEnv_NowWeather();
extern int mEnv_WindMove();
extern void mEnv_ManagePointLight(GAME_PLAY*, Kankyo*, Global_light*);
extern void Global_kankyo_set(GAME_PLAY*, Kankyo*, Global_light*);
#ifdef __cplusplus
}
include/m_msg.h
+4
View File
@@ -218,6 +218,10 @@ struct message_window_s {
extern int mMsg_Get_Length_String(u8* buf, size_t buf_size);
extern mMsg_Window_c* mMsg_Get_base_window_p();
extern void mMsg_Set_free_str(mMsg_Window_c* msg, int free_str_no, u8* str, int str_size);
extern void mMsg_ct(GAME_PLAY*);
extern void mMsg_dt(GAME_PLAY*);
extern void mMsg_Main(GAME_PLAY*);
extern void mMsg_Draw(GAME_PLAY*);
extern void mMsg_debug_draw(gfxprint_t* gfxprint);
extern void mMsg_aram_init();
extern void mMsg_aram_init2();
include/m_notice.h
+2
View File
@@ -17,6 +17,8 @@ typedef struct notice_board_post_s {
/* 0xC0 */ lbRTC_time_c post_time; /* date-time of post */
} mNtc_board_post_c;
extern void mNtc_set_auto_nwrite_data();
#ifdef __cplusplus
}
#endif
include/m_play.h
+48 -8
View File
@@ -16,12 +16,14 @@
#include "m_collision_obj.h"
#include "m_play_h.h"
#include "m_scene.h"
#include "PreRender.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef int (*DRAW_CHK_PROC)(ACTOR*, GAME_PLAY*);
typedef void (*PLAY_WIPE_PROC)(GAME_PLAY*);
/* sizeof(struct game_play_s) == 0x2600 */
struct game_play_s {
@@ -30,7 +32,8 @@ struct game_play_s {
/* 0x00E0 */ s16 scene_id;
/* 0x00E4 */ mFI_block_tbl_c block_table;
/* 0x00F4 */ mFI_block_tbl_c last_block_table;
/* 0x0104 */ u8 _0104[0x0110 - 0x0104];
/* 0x0104 */ u8 _0104[0x010C - 0x0104];
/* 0x010C */ Scene_status_c* current_scene_data;
/* 0x0110 */ Object_Exchange_c object_exchange;
/* 0x1A68 */ View view;
/* 0x1B88 */ Camera2 camera;
@@ -39,12 +42,16 @@ struct game_play_s {
/* 0x1DA0 */ pause_t pause;
/* 0x1DA8 */ Actor_info actor_info;
/* 0x1DEC */ Submenu submenu;
/* 0x1FA4 */ u8 _1FA4[0x2008 - 0x1FA4];
/* 0x1FA4 */ s8 unk1FA4;
/* 0x1FA8 */ u8 _1FA4[0x1FB8 - 0x1FA8];
/* 0x1FB8 */ PreRender prerender;
/* 0x2000 */ Door_data_c* door_data;
/* 0x2004 */ int _2004;
/* 0x2008 */ int next_scene_no;
/* 0x200C */ MtxF projection_matrix;
/* 0x204C */ MtxF mtx_204C;
/* 0x208C */ int _208C;
/* 0x2090 */ u32 game_frame;
/* 0x204C */ MtxF billboard_matrix;
/* 0x208C */ Mtx* _208C;
/* 0x2090 */ u32 game_frame;
/* 0x2094 */ u8 _2094;
/* 0x2095 */ u8 actor_data_num;
/* 0x2096 */ u8 ctrl_actor_data_num;
@@ -63,12 +70,45 @@ struct game_play_s {
/* 0x2318 */ fbdemo_fade color_fade;
/* 0x2328 */ CollisionCheck_c collision_check;
/* 0x23F8 */ DRAW_CHK_PROC draw_chk_proc; // only used by mikanbox actor
/* 0x23FC */ u8 _23FC[0x2600 - 0x23FC];
/* 0x23FC */ u32 fade_color_value;
/* 0x2400 */ Scene_status_c* scene_data_2400;
/* 0x2404 */ u8 _2400[0x2600 - 0x2404];
};
extern fbdemo_c fbdemo;
extern void play_init(GAME_PLAY* play);
extern void play_cleanup(GAME_PLAY* play);
extern void Game_play_Reset_destiny();
extern void event_title_flag_on();
extern void event_title_flag_off();
extern void Game_play_camera_proc(GAME_PLAY *);
extern void Game_play_fbdemo_wipe_destroy(GAME_PLAY *);
extern void Game_play_fbdemo_wipe_create_sub(GAME_PLAY *);
extern void Game_play_fbdemo_wipe_create(GAME_PLAY *);
extern void Game_play_fbdemo_wipe_init(GAME_PLAY *);
extern void Game_play_fbdemo_fade_in_move_end(GAME_PLAY *);
extern void Game_play_fbdemo_fade_out_start_emu_move_end(GAME_PLAY *);
extern void Game_play_fbdemo_fade_out_game_end_move_end(GAME_PLAY *);
extern void Game_play_change_scene_move_end(GAME_PLAY *);
extern void Game_play_fbdemo_wipe_move(GAME_PLAY *);
extern void Game_play_fbdemo_wipe_proc(GAME_PLAY *);
extern Gfx* game_play_set_fog(GAME_PLAY *, Gfx *);
extern void Game_play_fbdemo_proc(GAME_PLAY *);
extern void play_cleanup(GAME *);
extern void VR_Box_ct(GAME_PLAY *);
extern void play_init(GAME *);
extern void Game_play_move_fbdemo_not_move(GAME_PLAY *);
extern void Game_play_move(GAME_PLAY *);
extern void setupFog(GAME_PLAY *, GRAPH *);
extern void setupViewer(GAME_PLAY *);
extern void setupViewMatrix(GAME_PLAY *, GRAPH *, GRAPH *);
extern void copy_efb_to_texture(Gfx **, void *);
extern int makeBumpTexture(GAME_PLAY *, GRAPH *, GRAPH *);
extern void draw_version(GRAPH *);
extern void Game_play_draw(GAME *);
extern void play_main(GAME *);
extern void Gameplay_Scene_Init(GAME_PLAY *);
extern u8 mPl_SceneNo2SoundRoomType(int);
extern void Gameplay_Scene_Read(GAME_PLAY *, s16);
#ifdef __cplusplus
}
include/m_player_lib.h
+2
View File
@@ -9,9 +9,11 @@
extern "C" {
#endif
extern void mPlib_Object_Exchange_keep_Player_dt(GAME_PLAY*);
extern PLAYER_ACTOR* get_player_actor_withoutCheck(GAME_PLAY* play);
extern void mPlib_SetData1_controller_data_for_title_demo(f32 stick_x, f32 stick_y, int btn_a, int btn_b);
extern void mPlib_SetData2_controller_data_for_title_demo(mActor_name_t tool);
extern void mPlib_Clear_controller_data_for_title_demo();
extern void mPlib_request_main_invade_type1(GAME_PLAY* play);
extern mActor_name_t mPlib_Get_itemNo_forWindow();
extern int mPlib_check_able_change_camera_normal_index();
include/m_scene.h
+63 -1
View File
@@ -2,7 +2,6 @@
#define M_SCENE_H
#include "types.h"
#include "m_scene_table.h"
#include "m_lib.h"
#ifdef __cplusplus
@@ -39,8 +38,71 @@ typedef struct object_exchange_s {
u8 _1934[0x1958-0x1934];
} Object_Exchange_c;
typedef struct scene_status_s{
u8 unk0[0x13];
u8 unk13;
}Scene_status_c;
extern Scene_status_c test01_info;
extern Scene_status_c test02_info;
extern Scene_status_c test03_info;
extern Scene_status_c water_test_info;
extern Scene_status_c test_step01_info;
extern Scene_status_c test04_info;
extern Scene_status_c npc_room01_info;
extern Scene_status_c test_fd_npc_land_info;
extern Scene_status_c field_tool_field_info;
extern Scene_status_c shop01_info;
extern Scene_status_c BG_TEST01_info;
extern Scene_status_c BG_TEST01_XLU_info;
extern Scene_status_c broker_shop_info;
extern Scene_status_c fg_tool_in_info;
extern Scene_status_c post_office_info;
extern Scene_status_c start_demo1_info;
extern Scene_status_c start_demo2_info;
extern Scene_status_c police_box_info;
extern Scene_status_c buggy_info;
extern Scene_status_c player_select_info;
extern Scene_status_c player_room_s_info;
extern Scene_status_c player_room_m_info;
extern Scene_status_c player_room_l_info;
extern Scene_status_c shop02_info;
extern Scene_status_c shop03_info;
extern Scene_status_c shop04_1f_info;
extern Scene_status_c test05_info;
extern Scene_status_c PLAYER_SELECT2_info;
extern Scene_status_c PLAYER_SELECT3_info;
extern Scene_status_c shop04_2f_info;
extern Scene_status_c event_notification_info;
extern Scene_status_c kamakura_info;
extern Scene_status_c field_tool_field_info;
extern Scene_status_c title_demo_info;
extern Scene_status_c PLAYER_SELECT4_info;
extern Scene_status_c museum_entrance_info;
extern Scene_status_c museum_picture_info;
extern Scene_status_c museum_fossil_info;
extern Scene_status_c museum_insect_info;
extern Scene_status_c museum_fish_info;
extern Scene_status_c player_room_ll1_info;
extern Scene_status_c player_room_ll2_info;
extern Scene_status_c p_room_bm_s_info;
extern Scene_status_c p_room_bm_m_info;
extern Scene_status_c p_room_bm_l_info;
extern Scene_status_c p_room_bm_ll1_info;
extern Scene_status_c NEEDLEWORK_info;
extern Scene_status_c player_room_island_info;
extern Scene_status_c npc_room_island_info;
extern Scene_status_c start_demo3_info;
extern Scene_status_c lighthouse_info;
extern Scene_status_c tent_info;
extern int mSc_bank_regist_check(Object_Exchange_c* exchange, s16 bank_id);
extern void mSc_regist_initial_exchange_bank(GAME_PLAY* play);
extern void mSc_dmacopy_data_bank(Object_Exchange_c*);
extern void mSc_data_bank_ct(GAME_PLAY*, Object_Exchange_c*);
extern void Door_info_ct(Door_data_c**);
extern void Scene_ct(GAME_PLAY*, void*);
extern void mSc_decide_exchange_bank(Object_Exchange_c*);
#ifdef __cplusplus
}
include/m_scene_table.h
+4
View File
@@ -2,6 +2,7 @@
#define M_SCENE_TABLE_H
#include "types.h"
#include "m_scene.h"
#ifdef __cplusplus
extern "C" {
@@ -78,6 +79,9 @@ enum scene_table {
SCENE_NUM
};
extern Scene_status_c scene_data_status[SCENE_NUM];
#ifdef __cplusplus
}
#endif
include/m_submenu.h
+7
View File
@@ -104,6 +104,13 @@ struct submenu_s {
};
extern void mSM_open_submenu(Submenu* submenu, int menu_type, int arg0, int arg1);
extern void mSM_submenu_dt(Submenu*);
extern void mSM_submenu_ovlptr_cleanup(Submenu*);
extern void mSM_submenu_ovlptr_init(GAME_PLAY*);
extern void mSM_submenu_ct(Submenu*);
extern void mSM_submenu_ctrl(GAME_PLAY*);
extern void mSM_submenu_move(Submenu*);
extern void mSM_submenu_draw(Submenu*, GAME_PLAY*);
extern int mSM_CHECK_ALL_FISH_GET();
extern int mSM_CHECK_ALL_INSECT_GET();
include/m_titledemo.h
+1
View File
@@ -25,6 +25,7 @@ extern u16 pact4_head_table[];
extern int mTD_demono_get();
extern void title_demo_move(GAME_PLAY* play);
extern void mTD_player_keydata_init(GAME_PLAY* play);
extern void mTD_rtc_set();
extern void mTD_rtc_reserve();
extern int mTD_get_titledemo_no();
include/version.h
+9
View File
@@ -0,0 +1,9 @@
#ifndef VERSION_H
#define VERSION_H
#include "types.h"
extern char __Creator__[];
extern char __DateTime__[];
#endif
rel/ac_animal_logo_misc.c
+1
View File
@@ -9,6 +9,7 @@
#include "m_time.h"
#include "m_titledemo.h"
#include "m_event.h"
#include "m_scene_table.h"
extern void flash_rom_and_player_info_clear() {
Save* save = Common_GetPointer(save);
rel/audio.c
+2 -2
View File
@@ -341,12 +341,12 @@ extern void sAdo_LevSeEcho(u8 b){
Na_LevSeEcho(b);
}
extern void sAdo_BgmFadeoutCheck(){
extern u8 sAdo_BgmFadeoutCheck(){
Na_BgmFadeoutCheck();
}
extern void sAdo_SeFadeoutCheck(){
extern u8 sAdo_SeFadeoutCheck(){
Na_SeFadeoutCheck();
}
rel/m_actor.c
+1 -1
View File
@@ -323,7 +323,7 @@ extern void Actor_info_ct(GAME* game, Actor_info* actor_info, Actor_data* player
bzero(actor_info, sizeof(Actor_info));
actor_dlftbls_init();
Matrix_copy_MtxF(&play->mtx_204C, &MtxF_clear);
Matrix_copy_MtxF(&play->billboard_matrix, &MtxF_clear);
Matrix_copy_MtxF(&play->projection_matrix, &MtxF_clear);
/* Reset the actor dlf table info */
rel/m_all_grow.c
+1
View File
@@ -9,6 +9,7 @@
#include "m_collision_bg.h"
#include "zurumode.h"
#include "m_common_data.h"
#include "m_scene_table.h"
static mActor_name_t l_tree_max_table[mAGrw_FRUIT_NUM] = {
TREE_APPLE_FRUIT,
rel/m_all_grow_ovl.c
+1
View File
@@ -10,6 +10,7 @@
#include "m_house.h"
#include "m_snowman.h"
#include "m_shop.h"
#include "m_scene_table.h"
#ifdef MUST_MATCH
#include "ppcdis.h"
rel/m_eappli.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "m_common_data.h"
#include "m_private.h"
#include "lb_rtc.h"
#include "m_scene.h"
#include "m_scene_table.h"
#include "m_malloc.h"
#include "libjsys/jsyswrapper.h"
rel/m_fbdemo.c
+8 -7
View File
@@ -3,6 +3,7 @@
#include "libc64/malloc.h"
#include "libc64/sleep.h"
#include "libultra/gu.h"
#include "m_play.h"
Gfx fbdemo_gfx_init[] = {
gsDPPipeSync(),
@@ -19,7 +20,7 @@ Gfx fbdemo_gfx_init[] = {
gsSPEndDisplayList(),
};
extern void fbdemo_init_gfx(fbdemo* this) {
extern void fbdemo_init_gfx(fbdemo_c* this) {
int col;
int col2;
int colTex;
@@ -87,7 +88,7 @@ extern void fbdemo_init_gfx(fbdemo* this) {
gSPEndDisplayList(gfx++);
}
extern void fbdemo_init_data(fbdemo* this) {
extern void fbdemo_init_data(fbdemo_c* this) {
int col;
int row;
@@ -99,7 +100,7 @@ extern void fbdemo_init_data(fbdemo* this) {
}
}
extern void fbdemo_cleanup(fbdemo* this) {
extern void fbdemo_cleanup(fbdemo_c* this) {
msleep(100);
if (this->vtxData != NULL) {
@@ -120,7 +121,7 @@ extern void fbdemo_cleanup(fbdemo* this) {
}
}
extern fbdemo* fbdemo_init(fbdemo* this, int cols, int rows) {
extern fbdemo_c* fbdemo_init(fbdemo_c* this, int cols, int rows) {
s32 gridsize;
bzero(this, sizeof(fbdemo));
@@ -168,7 +169,7 @@ extern fbdemo* fbdemo_init(fbdemo* this, int cols, int rows) {
return this;
}
extern void fbdemo_update(fbdemo* this) {
extern void fbdemo_update(fbdemo_c* this) {
int col;
int row;
Vtx* vtx;
@@ -186,7 +187,7 @@ extern void fbdemo_update(fbdemo* this) {
}
}
void fbdemo_draw(fbdemo* this, Gfx** gfxP) {
void fbdemo_draw(fbdemo_c* this, Gfx** gfxP) {
Gfx* gfx = *gfxP;
gSPDisplayList(gfx++, fbdemo_gfx_init);
@@ -204,4 +205,4 @@ void fbdemo_draw(fbdemo* this, Gfx** gfxP) {
*gfxP = gfx;
}
extern void fbdemo_move(fbdemo* this) {}
extern void fbdemo_move(fbdemo_c* this) {}
rel/m_fuusen.c
+1 -1
View File
@@ -9,7 +9,7 @@
int fuusen_DEBUG_mode_flag;
extern void Balloon_init() {
extern void Balloon_init(GAME_PLAY*) {
Common_Set(balloon_state, Balloon_STATE_DEAD);
Common_Set(balloon_last_spawn_min, 0);
Common_Set(balloon_spawn_percent, 0.05f);
rel/m_museum_display.c
+1 -1
View File
@@ -2,7 +2,7 @@
#include "m_name_table.h"
#include "m_room_type.h"
#include "m_scene.h"
#include "m_scene_table.h"
#include "m_common_data.h"
extern int mMmd_FossilInfo(int fossil_no) {
rel/m_play.c
+1018
View File
File diff suppressed because it is too large Load Diff
rel/m_post_office.c
+1
View File
@@ -14,6 +14,7 @@
#include "m_play.h"
#include "libultra/libultra.h"
#include "m_common_data.h"
#include "m_scene_table.h"
static int mPO_keep_contents(Mail_c* mail) {
int res = FALSE;
rel/m_random_field.c
+1 -1
View File
@@ -4,7 +4,7 @@
#include "m_collision_bg.h"
#include "m_field_info.h"
#include "m_common_data.h"
#include "m_scene.h"
#include "m_scene_table.h"
extern void mRF_MakeRandomField(mFM_combination_c* combi_table, mFM_combo_info_c* combo_info, int combo_count, GAME* game) {
mRF_MakeRandomField_ovl(combi_table, combo_info, combo_count, game);
rel/m_select.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "m_kabu_manager.h"
#include "m_font.h"
#include "m_time.h"
#include "m_scene.h"
#include "m_scene_table.h"
#include "m_controller.h"
#include "m_kankyo.h"
#include "audio.h"
rel/m_start_data_init.c
+1 -1
View File
@@ -7,7 +7,7 @@
#include "m_font.h"
#include "m_field_info.h"
#include "m_field_make.h"
#include "m_scene.h"
#include "m_scene_table.h"
#include "libultra/libultra.h"
#include "m_cockroach.h"
#include "m_melody.h"
rel/m_titledemo.c
+1 -1
View File
@@ -40,7 +40,7 @@ extern int mTD_demono_get() {
return S_now_demono;
}
static void mTD_player_keydata_init(GAME_PLAY* play) {
extern void mTD_player_keydata_init(GAME_PLAY* play) {
PLAYER_ACTOR* player = get_player_actor_withoutCheck(play);
if (mEv_CheckTitleDemo() > 0) {
rel/m_trademark.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include "m_trademark.h"
#include "m_scene.h"
#include "m_scene_table.h"
#include "m_name_table.h"
#include "m_npc.h"
#include "m_kankyo.h"
rel/m_watch_my_step.c
+1 -1
View File
@@ -16,7 +16,7 @@
#include "m_room_type.h"
#include "m_msg.h"
#include "audio.h"
#include "m_scene.h"
#include "m_scene_table.h"
#include "m_private.h"
typedef struct watch_my_step_s {
src/version.c
+3 -3
View File
@@ -1,10 +1,10 @@
#include "types.h"
#include "version.h"
u8 __Creator__[] = {
char __Creator__[] = {
#include "assets/__Creator__.inc"
};
u8 __DateTime__[] = {
char __DateTime__[] = {
#include "assets/__DateTime__.inc"
};