mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove pool pragmas

Browse Source
This commit is contained in:
Prakxo
2023-10-29 22:44:50 +01:00
parent 7d4cda852a
commit 7cc74b1212
19 changed files with 18 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rel/ac_douzou.c
+1 -1
View File
@@ -161,7 +161,7 @@ static void aDOU_set_bgOffset(ACTOR*, int);
static void aDOU_setup_action(ACTOR*, int);
static void aDOU_keep_item(ACTOR*);
#pragma pool_data on
static void aDOU_actor_ct(ACTOR* actor, GAME* game) {
static cKF_Skeleton_R_c* skl[2] = { &cKF_bs_r_obj_s_douzou, &cKF_bs_r_obj_w_douzou };
rel/ac_douzou_draw.c_inc
+2 -2
View File
@@ -4,7 +4,7 @@
#include "bg_item_h.h"
#include "m_house.h"
#pragma pool_data on
static int aDOU_actor_draw_before(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int joint_idx, Gfx** joint_shape, u8* joint_flags, void* arg, s_xyz* joint_rot, xyz_t* joint_pos) {
static rgba_t primcolor[mHS_HOUSE_NUM] = {
{ 255, 255, 0, 255 },
@@ -74,7 +74,7 @@ static int aDOU_actor_draw_before(GAME* game, cKF_SkeletonInfo_R_c* keyframe, in
}
#pragma pool_data reset
#pragma pool_data on
static void aDOU_actor_draw(ACTOR* actor, GAME* game) {
GAME_PLAY* play = (GAME_PLAY*)game;
GRAPH* graph = game->graph;
rel/ac_douzou_move.c_inc
+1 -1
View File
@@ -74,7 +74,7 @@ static void aDOU_keep_item(ACTOR* actor) {
}
}
#pragma pool_data on
static int aDOU_setEffect_sub(ACTOR* actor, GAME* game, int house_no, int color) {
static xyz_t offset_tbl[mHS_HOUSE_NUM] = {
{ 1.0f, 68.0f, 14.0f },
rel/ac_haniwa.c
+1 -1
View File
@@ -692,7 +692,7 @@ static void aHNW_save_end_wait(ACTOR* actor, GAME* game) {
}
}
#pragma pool_data on
static void aHNW_pl_approach_door(ACTOR* actor, GAME* game) {
static f32 chk_posX[mHS_HOUSE_NUM] = { 2095.0f, 2385.0f, 2095.0f, 2385.0f };
static f32 chk_val[mHS_HOUSE_NUM] = { 1.0f, -1.0f, 1.0f, -1.0f };
rel/ac_train1.c
+1 -1
View File
@@ -157,7 +157,7 @@ static void aTR1_passenger_ctrl(ACTOR* actor){
}
}
#pragma pool_data on
static void aTR1_setupAction(ACTOR* actor, int action){
TRAIN1_ACTOR* train1 = (TRAIN1_ACTOR*)actor;
rel/famicom_emu.c
-3
View File
@@ -76,7 +76,6 @@ void my_zelda_free(void* ptr){
zelda_free(ptr);
}
#pragma pool_data off
void famicom_emu_main(GAME* famicom){
static GXColor black_color = {0,0,0,0};
@@ -132,8 +131,6 @@ void famicom_emu_main(GAME* famicom){
JW_EndFrame();
}
#pragma pool_data on
void famicom_emu_init(GAME_FAMICOM_EMU* famicom){
rel/irqmgr.c
+3 -3
View File
@@ -77,7 +77,7 @@ static void irqmgr_JamMesgForClient(irqmgr_mesg_t* msg) {
}
}
#pragma pool_data on
/**
* @brief Handler function for pre-NMI message.
**/
@@ -113,7 +113,7 @@ static void irqmgr_HandlePreNMI480() {
**/
static void irqmgr_HandlePreNMI500() {}
#pragma pool_data on
/**
* @brief Handler for retrace message.
**/
@@ -210,7 +210,7 @@ void viMgrMain(void){
/* @unused ? osCreateViManager(?) */
#pragma pool_data on
/**
* @brief Sets the VI event info. Stubbed outside this functionality.
*
rel/m_all_grow.c
+3 -3
View File
@@ -30,7 +30,7 @@ static int l_haniwa_num_debug;
static mAGrw_block_c l_fossil_block[mAGrw_FOSSIL_NUM];
static mAGrw_block_c l_haniwa_block[mAGrw_HANIWA_NUM];
#pragma pool_data on
static void mAGrw_ClearDebugData() {
l_fossil_num_debug = 0;
l_haniwa_num_debug = 0;
@@ -95,7 +95,7 @@ static void mAGrw_SetDebugDataBlock(mActor_name_t* fg_items, u16* deposit, mAGrw
}
}
#pragma pool_data on
static void mAGrw_SetDebugData() {
mFM_fg_c* fg_items = Save_Get(fg[0]);
u16* deposit = Save_Get(deposit[0]);
@@ -114,7 +114,7 @@ static void mAGrw_SetDebugData() {
}
#pragma pool_data reset
#pragma pool_data on
extern void mAGrw_PrintFossilHaniwa_debug(gfxprint_t* gfxprint) {
gfxprint_color(gfxprint, 240, 50, 50, 255);
gfxprint_locate8x8(gfxprint, 3, 17);
rel/m_debug_display.c
+2 -2
View File
@@ -51,7 +51,7 @@ extern void* nt_txt;
extern Gfx darrow_model[];
extern Gfx camera_model[];
#pragma pool_data off
extern void Debug_Display_output(GAME_PLAY* play){
static DEBUG_DISP_PROC debug_display_output_proc[] = { debug_display_output_sprite_16x16_I8, debug_display_output_polygon};
static Debug_display_info debug_display_shape_data[] = {
@@ -69,7 +69,7 @@ extern void Debug_Display_output(GAME_PLAY* play){
}
extern Gfx RCP_debug_texture_16x16_8[];
#pragma pool_data on
static void debug_display_output_sprite_16x16_I8(Debug_display* display, void* txt, GAME_PLAY* play){
rel/m_handbill.c
+1 -1
View File
@@ -17,7 +17,7 @@ static u32 Handbillz_start;
static void mHandbillz_aram_init();
#pragma pool_data on
extern void mHandbill_aram_init() {
Ps_table_rom_start = JW_GetAramAddress(RESOURCE_PS_TABLE);
Ps_rom_start = JW_GetAramAddress(RESOURCE_PS);
rel/m_home.c
+1 -1
View File
@@ -136,7 +136,7 @@ static mActor_name_t l_proom_cottage_tmp[UT_X_NUM * UT_Z_NUM] = {
#define HANIWA_MSG_LINES 4
// TODO: fix me
#pragma pool_data on
/**
* @brief Clears the save data for a given home.
rel/m_item_name.c
-2
View File
@@ -294,7 +294,6 @@ extern void mIN_copy_name_str(u8* dst, mActor_name_t item) {
}
}
#pragma pool_data on
/**
* @brief Gets the artticle type for a given item.
*
@@ -353,4 +352,3 @@ extern int mIN_get_item_article(mActor_name_t item) {
return article;
}
#pragma pool_data reset
rel/m_mushroom.c
-2
View File
@@ -254,7 +254,6 @@ static void mMsr_ClearCandidateMushroom(mFM_fg_c* fg, u16* candidates, u8* candi
}
}
#pragma pool_data on
/**
* @brief Clears a set number of mushrooms around town while ignoring the acre the player is in.
*
@@ -321,7 +320,6 @@ static void mMsr_ClearMushrooms(int clear_num, int block_x, int block_z) {
}
}
}
#pragma pool_data reset
/**
* @brief Clears mushrooms upon first load.
rel/m_private.c
-2
View File
@@ -1003,7 +1003,6 @@ static void mPr_SetMotherMailMonthly(mPr_mother_mail_data_c* send_data, int mont
}
}
#pragma pool_data on
static void mPr_GetMotherMailMonthlyData(mPr_mother_mail_data_c* send_data, int* mail_no, mActor_name_t* present, int* event_no, int month, int not_send_num) {
static int mail_start_no_table[mTM_SEASON_NUM] = { 0x18C, 0x192, 0x186, 0x19E };
static mActor_name_t may_2_item_table[1] = { ITM_CLOTH105 }; // fortune shirt
@@ -1073,7 +1072,6 @@ static void mPr_GetMotherMailMonthlyData(mPr_mother_mail_data_c* send_data, int*
*present = ITM_FOOD_MUSHROOM;
}
}
#pragma pool_data reset
static int mPr_GetMotherMailNormalNotSendNum(mPr_mother_mail_data_c* send_data) {
int not_send_num = 0;
rel/m_select.c
-4
View File
@@ -903,7 +903,6 @@ static void select_print_wait(gfxprint_t* gfxprint) {
gfxprint_printf(gfxprint, "%s", msgs[msg_no]);
}
#pragma pool_data on
static void select_print_course_name(GAME_SELECT* select, gfxprint_t* gfxprint) {
const char* name;
int i;
@@ -940,14 +939,12 @@ static void select_print_course_name(GAME_SELECT* select, gfxprint_t* gfxprint)
gfxprint_printf(gfxprint, "%s", name);
}
}
#pragma pool_data reset
static void select_print_rtc(gfxprint_t* gfxprint, GAME_SELECT* select) {
gfxprint_locate8x8(gfxprint, 23, 6);
gfxprint_printf(gfxprint, "RTC Z:USE");
}
#pragma pool_data on
static void select_print_time_sub(gfxprint_t* gfxprint, GAME_SELECT* select, lbRTC_time_c* time) {
const char* weekday_name;
@@ -1035,7 +1032,6 @@ static void select_print_time_sub(gfxprint_t* gfxprint, GAME_SELECT* select, lbR
}
}
}
#pragma pool_data reset
static void select_print_time(gfxprint_t* gfxprint, GAME_SELECT* select) {
lbRTC_time_c time;
rel/m_time.c
-3
View File
@@ -289,8 +289,6 @@ extern void mTM_renewal_renew_time() {
}
}
// TODO: Hack. This fixes an issue where pooling data is necessary.
#pragma pool_data on
/**
* Display the current time in debug mode if certain conditions are met.
*
@@ -348,7 +346,6 @@ static void mTM_disp_time(int unused) {
CLOSE_DISP(g);
}
}
#pragma pool_data reset
#define mTM_TIMESTEP_NUM 4
rel/main.c
-2
View File
@@ -28,7 +28,6 @@ u8 SegmentBaseAddress[0x40];
int ScreenWidth = SCREEN_WIDTH;
int ScreenHeight = SCREEN_HEIGHT;
#pragma pool_data on
extern void mainproc (void* val){
irqmgr_client_t irqClient;
@@ -77,7 +76,6 @@ extern void mainproc (void* val){
osRecvMesg(&irqMgrMsgQueue, &msg, 1);
} while (msg != NULL);
}
#pragma pool_data reset
u32 entry(void) {
rel/player_select.c
+1 -3
View File
@@ -246,7 +246,6 @@ static void player_select_main(GAME* game) {
extern void player_select_cleanup(GAME* game) { }
#pragma pool_data on
extern void player_select_init(GAME* game) {
GAME_PLAYER_SELECT* player_select = (GAME_PLAYER_SELECT*)game;
GRAPH* g = game->graph;
@@ -332,5 +331,4 @@ extern void player_select_init(GAME* game) {
Common_Set(player_no, 0);
Common_Set(player_data_mode, 0);
Common_Set(scene_from_title_demo, -1);
}
#pragma pool_data reset
}
rel/second_game.c
+1 -3
View File
@@ -12,7 +12,6 @@
#include "sys_math.h"
#include "m_nmibuf.h"
#pragma pool_data on
static u8 sound_ok;
static u8 contpad_ok;
static u8 frame_count;
@@ -92,5 +91,4 @@ extern void second_game_init(GAME* game) {
game->cleanup = &second_game_cleanup;
init_rnd();
__osInitialize_common();
}
#pragma pool_data reset
}