mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-28 07:06:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Cuyler36
2024-10-29 08:34:55 -04:00
parent 192a8a6ca3
commit 2fbe1622ab
22 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actor/npc/ac_npc_curator.c
+1 -1
View File
@@ -123,4 +123,4 @@ static void aCR_actor_draw(ACTOR* actorx, GAME* game) {
(*Common_Get(clip).npc_clip->draw_proc)(actorx, game);
}
#include "../src/actor/ac_npc_curator_move.c_inc"
#include "../src/actor/npc/ac_npc_curator_move.c_inc"
src/actor/npc/ac_npc_guide.c
+2 -2
View File
@@ -148,5 +148,5 @@ static void aNGD_actor_draw(ACTOR* actorx, GAME* game) {
Common_Get(clip).npc_clip->draw_proc(actorx, game);
}
#include "../src/actor/ac_npc_guide_animation.c_inc"
#include "../src/actor/ac_npc_guide_move.c_inc"
#include "../src/actor/npc/ac_npc_guide_animation.c_inc"
#include "../src/actor/npc/ac_npc_guide_move.c_inc"
src/actor/npc/ac_npc_guide2.c
+2 -2
View File
@@ -134,5 +134,5 @@ static void aNG2_actor_draw(ACTOR* actorx, GAME* game) {
Common_Get(clip).npc_clip->draw_proc(actorx, game);
}
#include "../src/actor/ac_npc_guide2_animation.c_inc"
#include "../src/actor/ac_npc_guide2_move.c_inc"
#include "../src/actor/npc/ac_npc_guide2_animation.c_inc"
#include "../src/actor/npc/ac_npc_guide2_move.c_inc"
src/actor/npc/ac_npc_p_sel.c
+2 -2
View File
@@ -158,5 +158,5 @@ static void aNPS_actor_draw(ACTOR* actorx, GAME* game) {
CLIP(npc_clip)->draw_proc(actorx, game);
}
#include "../src/actor/ac_npc_p_sel_schedule.c_inc"
#include "../src/actor/ac_npc_p_sel_talk.c_inc"
#include "../src/actor/npc/ac_npc_p_sel_schedule.c_inc"
#include "../src/actor/npc/ac_npc_p_sel_talk.c_inc"
src/actor/npc/ac_npc_rcn_guide.c
+3 -3
View File
@@ -157,6 +157,6 @@ static void aNRG_actor_draw(ACTOR* actorx, GAME* game) {
Common_Get(clip).npc_clip->draw_proc(actorx, game);
}
#include "../src/actor/ac_npc_rcn_guide_move.c_inc"
#include "../src/actor/ac_npc_rcn_guide_talk.c_inc"
#include "../src/actor/ac_npc_rcn_guide_schedule.c_inc"
#include "../src/actor/npc/ac_npc_rcn_guide_move.c_inc"
#include "../src/actor/npc/ac_npc_rcn_guide_talk.c_inc"
#include "../src/actor/npc/ac_npc_rcn_guide_schedule.c_inc"
src/actor/npc/ac_npc_rcn_guide2.c
+3 -3
View File
@@ -224,6 +224,6 @@ static void aNRG2_actor_draw(ACTOR* actorx, GAME* game) {
Common_Get(clip).npc_clip->draw_proc(actorx, game);
}
#include "../src/actor/ac_npc_rcn_guide2_move.c_inc"
#include "../src/actor/ac_npc_rcn_guide2_talk.c_inc"
#include "../src/actor/ac_npc_rcn_guide2_schedule.c_inc"
#include "../src/actor/npc/ac_npc_rcn_guide2_move.c_inc"
#include "../src/actor/npc/ac_npc_rcn_guide2_talk.c_inc"
#include "../src/actor/npc/ac_npc_rcn_guide2_schedule.c_inc"
src/actor/npc/ac_npc_rtc.c
+2 -2
View File
@@ -161,5 +161,5 @@ static void aNRTC_actor_draw(ACTOR* actor, GAME* game) {
Common_Get(clip.npc_clip)->draw_proc(actor, game);
}
#include "../src/actor/ac_npc_rtc_think.c.inc"
#include "../src/actor/ac_npc_rtc_talk.c.inc"
#include "../src/actor/npc/ac_npc_rtc_think.c.inc"
#include "../src/actor/npc/ac_npc_rtc_talk.c.inc"
src/actor/npc/ac_npc_sendo.c
+1 -1
View File
@@ -82,4 +82,4 @@ static void aSEN_actor_draw(ACTOR* actorx, GAME* game) {
(*Common_Get(clip).npc_clip->draw_proc)(actorx, game);
}
#include "../src/actor/ac_npc_sendo_move.c_inc"
#include "../src/actor/npc/ac_npc_sendo_move.c_inc"
src/actor/npc/event/ac_ev_broker.c
+1 -1
View File
@@ -103,4 +103,4 @@ static void aEBRK_actor_draw(ACTOR* actorx, GAME* game) {
Common_Get(clip).npc_clip->draw_proc(actorx, game);
}
#include "../src/actor/ac_ev_broker_move.c_inc"
#include "../src/actor/npc/event/ac_ev_broker_move.c_inc"
src/actor/npc/event/ac_ev_dokutu.c
+1 -1
View File
@@ -2,7 +2,7 @@
#include "m_common_data.h"
#include "../src/actor/ac_ev_dokutu_talk.c_inc"
#include "../src/actor/npc/event/ac_ev_dokutu_talk.c_inc"
static void aEVD_actor_ct(ACTOR* actorx, GAME* game);
static void aEVD_actor_dt(ACTOR* actorx, GAME* game);
src/actor/npc/event/ac_ev_ghost.c
+2 -2
View File
@@ -302,5 +302,5 @@ static void aEGH_actor_draw(ACTOR* actorx, GAME* game) {
(*Common_Get(clip).npc_clip->draw_proc)(actorx, game);
}
#include "../src/actor/ac_ev_ghost_talk.c_inc"
#include "../src/actor/ac_ev_ghost_schedule.c_inc"
#include "../src/actor/npc/event/ac_ev_ghost_talk.c_inc"
#include "../src/actor/npc/event/ac_ev_ghost_schedule.c_inc"
src/actor/npc/event/ac_ev_gypsy.c
+1 -1
View File
@@ -90,4 +90,4 @@ static void aEGPS_actor_draw(ACTOR* actorx, GAME* game) {
(*Common_Get(clip).npc_clip->draw_proc)(actorx, game);
}
#include "../src/actor/ac_ev_gypsy_move.c_inc"
#include "../src/actor/npc/event/ac_ev_gypsy_move.c_inc"
src/actor/npc/event/ac_ev_kabuPeddler.c
+1 -1
View File
@@ -81,4 +81,4 @@ static void aEKPD_actor_draw(ACTOR* actorx, GAME* game) {
(*Common_Get(clip).npc_clip->draw_proc)(actorx, game);
}
#include "../src/actor/ac_ev_kabuPeddler_move.c_inc"
#include "../src/actor/npc/event/ac_ev_kabuPeddler_move.c_inc"
src/actor/npc/event/ac_ev_majin.c
+1 -1
View File
@@ -70,4 +70,4 @@ void aEMJ_actor_draw(ACTOR* actor, GAME* game) {
Common_Get(clip.npc_clip)->draw_proc(actor, game);
}
#include "../src/actor/ac_ev_majin_move.c_inc"
#include "../src/actor/npc/event/ac_ev_majin_move.c_inc"
src/actor/npc/event/ac_ev_santa.c
+1 -1
View File
@@ -137,4 +137,4 @@ static void aESNT_actor_draw(ACTOR* actorx, GAME* game) {
(*Common_Get(clip).npc_clip->draw_proc)(actorx, game);
}
#include "../src/actor/ac_ev_santa_move.c_inc"
#include "../src/actor/npc/event/ac_ev_santa_move.c_inc"
src/actor/npc/event/ac_ev_soncho.c
+1 -1
View File
@@ -80,4 +80,4 @@ static void aESC_actor_draw(ACTOR* actorx, GAME* game) {
(*Common_Get(clip).npc_clip->draw_proc)(actorx, game);
}
#include "../src/actor/ac_ev_soncho_talk.c_inc"
#include "../src/actor/npc/event/ac_ev_soncho_talk.c_inc"
src/bg_item/bg_cherry_item.c
+5 -5
View File
@@ -204,9 +204,9 @@ static void bit_cmn_single_drawS_shadow(GAME* game, bg_item_common_info_c* commo
static int bIT_actor_hole_effect_entry(bg_item_hole_c* hole, mActor_name_t fg_item, xyz_t* pos, u16 frames,
u16 wait_frames, s16 mode, s16 wait_type);
#include "../src/bg_cherry_item_data.c_inc"
#include "../src/bg_item_clip.c_inc"
#include "../src/bg_item_common.c_inc"
#include "../src/bg_item/bg_cherry_item_data.c_inc"
#include "../src/bg_item/bg_item_clip.c_inc"
#include "../src/bg_item/bg_item_common.c_inc"
extern u16 obj_g_hole_pal[];
extern u16 obj_b_hole_pal[];
@@ -281,5 +281,5 @@ static void bCI_actor_dt(ACTOR* actorx, GAME* game) {
bIT_clip_dt();
}
#include "../src/bg_cherry_item_move.c_inc"
#include "../src/bg_cherry_item_draw.c_inc"
#include "../src/bg_item/bg_cherry_item_move.c_inc"
#include "../src/bg_item/bg_cherry_item_draw.c_inc"
src/bg_item/bg_item.c
+5 -5
View File
@@ -203,9 +203,9 @@ static void bit_cmn_single_drawS_shadow(GAME* game, bg_item_common_info_c* commo
static int bIT_actor_hole_effect_entry(bg_item_hole_c* hole, mActor_name_t fg_item, xyz_t* pos, u16 frames,
u16 wait_frames, s16 mode, s16 wait_type);
#include "../src/bg_item_data.c_inc"
#include "../src/bg_item_clip.c_inc"
#include "../src/bg_item_common.c_inc"
#include "../src/bg_item/bg_item_data.c_inc"
#include "../src/bg_item/bg_item_clip.c_inc"
#include "../src/bg_item/bg_item_common.c_inc"
extern u16 obj_g_hole_pal[];
extern u16 obj_b_hole_pal[];
@@ -285,5 +285,5 @@ static void bIT_actor_dt(ACTOR* actorx, GAME* game) {
bIT_clip_dt();
}
#include "../src/bg_item_move.c_inc"
#include "../src/bg_item_draw.c_inc"
#include "../src/bg_item/bg_item_move.c_inc"
#include "../src/bg_item/bg_item_draw.c_inc"
src/bg_item/bg_police_item.c
+3 -3
View File
@@ -44,7 +44,7 @@ ACTOR_PROFILE BgPoliceItem_Profile = {
NULL,
};
#include "../src/bg_police_item_data.c_inc"
#include "../src/bg_item/bg_police_item_data.c_inc"
#include "../src/bg_police_item_move.c_inc"
#include "../src/bg_police_item_draw.c_inc"
#include "../src/bg_item/bg_police_item_move.c_inc"
#include "../src/bg_item/bg_police_item_draw.c_inc"
src/bg_item/bg_winter_item.c
+5 -5
View File
@@ -204,9 +204,9 @@ static void bit_cmn_single_drawS_shadow(GAME* game, bg_item_common_info_c* commo
static int bIT_actor_hole_effect_entry(bg_item_hole_c* hole, mActor_name_t fg_item, xyz_t* pos, u16 frames,
u16 wait_frames, s16 mode, s16 wait_type);
#include "../src/bg_winter_item_data.c_inc"
#include "../src/bg_item_clip.c_inc"
#include "../src/bg_item_common.c_inc"
#include "../src/bg_item/bg_winter_item_data.c_inc"
#include "../src/bg_item/bg_item_clip.c_inc"
#include "../src/bg_item/bg_item_common.c_inc"
extern u16 obj_g_hole_pal[];
extern u16 obj_b_hole_pal[];
@@ -288,5 +288,5 @@ static void bWI_actor_dt(ACTOR* actorx, GAME* game) {
bIT_clip_dt();
}
#include "../src/bg_winter_item_move.c_inc"
#include "../src/bg_winter_item_draw.c_inc"
#include "../src/bg_item/bg_winter_item_move.c_inc"
#include "../src/bg_item/bg_winter_item_draw.c_inc"
src/bg_item/bg_xmas_item.c
+5 -5
View File
@@ -214,9 +214,9 @@ static int bIT_actor_hole_effect_entry(bg_item_hole_c* hole, mActor_name_t fg_it
static void bXI_draw_loop_type1_xtree(GRAPH* graph, Gfx** gfx_pp, bg_item_draw_list_c* draw_list,
bg_item_draw_pos_c* draw_pos, Gfx** display_list_table);
#include "../src/bg_xmas_item_data.c_inc"
#include "../src/bg_item_clip.c_inc"
#include "../src/bg_item_common.c_inc"
#include "../src/bg_item/bg_xmas_item_data.c_inc"
#include "../src/bg_item/bg_item_clip.c_inc"
#include "../src/bg_item/bg_item_common.c_inc"
extern u16 obj_g_hole_pal[];
extern u16 obj_b_hole_pal[];
@@ -301,5 +301,5 @@ static void bXI_actor_dt(ACTOR* actorx, GAME* game) {
bIT_clip_dt();
}
#include "../src/bg_xmas_item_move.c_inc"
#include "../src/bg_xmas_item_draw.c_inc"
#include "../src/bg_item/bg_xmas_item_move.c_inc"
#include "../src/bg_item/bg_xmas_item_draw.c_inc"