From 192a8a6ca376edcf2fa9f1f8e71f197e742ab05c Mon Sep 17 00:00:00 2001 From: Cuyler36 Date: Tue, 29 Oct 2024 05:54:49 -0400 Subject: [PATCH] Add a few more rel groups --- configure.py | 145 ++++++++++-------- src/actor/npc/.gitkeep | 0 src/actor/{ => npc}/ac_npc_curator.c | 0 src/actor/{ => npc}/ac_npc_curator_move.c_inc | 0 src/actor/{ => npc}/ac_npc_engineer.c | 0 src/actor/{ => npc}/ac_npc_guide.c | 0 src/actor/{ => npc}/ac_npc_guide2.c | 0 .../{ => npc}/ac_npc_guide2_animation.c_inc | 0 src/actor/{ => npc}/ac_npc_guide2_move.c_inc | 0 .../{ => npc}/ac_npc_guide_animation.c_inc | 0 src/actor/{ => npc}/ac_npc_guide_move.c_inc | 0 src/actor/{ => npc}/ac_npc_p_sel.c | 0 .../{ => npc}/ac_npc_p_sel_schedule.c_inc | 0 src/actor/{ => npc}/ac_npc_p_sel_talk.c_inc | 0 src/actor/{ => npc}/ac_npc_rcn_guide.c | 0 src/actor/{ => npc}/ac_npc_rcn_guide2.c | 0 .../{ => npc}/ac_npc_rcn_guide2_move.c_inc | 0 .../ac_npc_rcn_guide2_schedule.c_inc | 0 .../{ => npc}/ac_npc_rcn_guide2_talk.c_inc | 0 .../{ => npc}/ac_npc_rcn_guide_move.c_inc | 0 .../{ => npc}/ac_npc_rcn_guide_schedule.c_inc | 0 .../{ => npc}/ac_npc_rcn_guide_talk.c_inc | 0 src/actor/{ => npc}/ac_npc_rtc.c | 0 src/actor/{ => npc}/ac_npc_rtc_talk.c.inc | 0 src/actor/{ => npc}/ac_npc_rtc_think.c.inc | 0 src/actor/{ => npc}/ac_npc_sendo.c | 0 src/actor/{ => npc}/ac_npc_sendo_move.c_inc | 0 src/actor/{ => npc/event}/ac_ev_broker.c | 0 .../{ => npc/event}/ac_ev_broker_move.c_inc | 0 src/actor/{ => npc/event}/ac_ev_castaway.c | 0 src/actor/{ => npc/event}/ac_ev_dokutu.c | 0 .../{ => npc/event}/ac_ev_dokutu_talk.c_inc | 0 src/actor/{ => npc/event}/ac_ev_ghost.c | 0 .../event}/ac_ev_ghost_schedule.c_inc | 0 .../{ => npc/event}/ac_ev_ghost_talk.c_inc | 0 src/actor/{ => npc/event}/ac_ev_gypsy.c | 0 .../{ => npc/event}/ac_ev_gypsy_move.c_inc | 0 src/actor/{ => npc/event}/ac_ev_kabuPeddler.c | 0 .../event}/ac_ev_kabuPeddler_move.c_inc | 0 src/actor/{ => npc/event}/ac_ev_majin.c | 0 .../{ => npc/event}/ac_ev_majin_move.c_inc | 0 src/actor/{ => npc/event}/ac_ev_santa.c | 0 .../{ => npc/event}/ac_ev_santa_move.c_inc | 0 src/actor/{ => npc/event}/ac_ev_soncho.c | 0 .../{ => npc/event}/ac_ev_soncho_talk.c_inc | 0 src/{ => bg_item}/bg_cherry_item.c | 0 src/{ => bg_item}/bg_cherry_item_data.c_inc | 0 src/{ => bg_item}/bg_cherry_item_draw.c_inc | 0 src/{ => bg_item}/bg_cherry_item_move.c_inc | 0 src/{ => bg_item}/bg_item.c | 0 src/{ => bg_item}/bg_item_clip.c_inc | 0 src/{ => bg_item}/bg_item_common.c_inc | 0 src/{ => bg_item}/bg_item_data.c_inc | 0 src/{ => bg_item}/bg_item_draw.c_inc | 0 src/{ => bg_item}/bg_item_move.c_inc | 0 src/{ => bg_item}/bg_police_item.c | 0 src/{ => bg_item}/bg_police_item_data.c_inc | 0 src/{ => bg_item}/bg_police_item_draw.c_inc | 0 src/{ => bg_item}/bg_police_item_move.c_inc | 0 src/{ => bg_item}/bg_post_item.c | 0 src/{ => bg_item}/bg_winter_item.c | 0 src/{ => bg_item}/bg_winter_item_data.c_inc | 0 src/{ => bg_item}/bg_winter_item_draw.c_inc | 0 src/{ => bg_item}/bg_winter_item_move.c_inc | 0 src/{ => bg_item}/bg_xmas_item.c | 0 src/{ => bg_item}/bg_xmas_item_data.c_inc | 0 src/{ => bg_item}/bg_xmas_item_draw.c_inc | 0 src/{ => bg_item}/bg_xmas_item_move.c_inc | 0 68 files changed, 80 insertions(+), 65 deletions(-) delete mode 100644 src/actor/npc/.gitkeep rename src/actor/{ => npc}/ac_npc_curator.c (100%) rename src/actor/{ => npc}/ac_npc_curator_move.c_inc (100%) rename src/actor/{ => npc}/ac_npc_engineer.c (100%) rename src/actor/{ => npc}/ac_npc_guide.c (100%) rename src/actor/{ => npc}/ac_npc_guide2.c (100%) rename src/actor/{ => npc}/ac_npc_guide2_animation.c_inc (100%) rename src/actor/{ => npc}/ac_npc_guide2_move.c_inc (100%) rename src/actor/{ => npc}/ac_npc_guide_animation.c_inc (100%) rename src/actor/{ => npc}/ac_npc_guide_move.c_inc (100%) rename src/actor/{ => npc}/ac_npc_p_sel.c (100%) rename src/actor/{ => npc}/ac_npc_p_sel_schedule.c_inc (100%) rename src/actor/{ => npc}/ac_npc_p_sel_talk.c_inc (100%) rename src/actor/{ => npc}/ac_npc_rcn_guide.c (100%) rename src/actor/{ => npc}/ac_npc_rcn_guide2.c (100%) rename src/actor/{ => npc}/ac_npc_rcn_guide2_move.c_inc (100%) rename src/actor/{ => npc}/ac_npc_rcn_guide2_schedule.c_inc (100%) rename src/actor/{ => npc}/ac_npc_rcn_guide2_talk.c_inc (100%) rename src/actor/{ => npc}/ac_npc_rcn_guide_move.c_inc (100%) rename src/actor/{ => npc}/ac_npc_rcn_guide_schedule.c_inc (100%) rename src/actor/{ => npc}/ac_npc_rcn_guide_talk.c_inc (100%) rename src/actor/{ => npc}/ac_npc_rtc.c (100%) rename src/actor/{ => npc}/ac_npc_rtc_talk.c.inc (100%) rename src/actor/{ => npc}/ac_npc_rtc_think.c.inc (100%) rename src/actor/{ => npc}/ac_npc_sendo.c (100%) rename src/actor/{ => npc}/ac_npc_sendo_move.c_inc (100%) rename src/actor/{ => npc/event}/ac_ev_broker.c (100%) rename src/actor/{ => npc/event}/ac_ev_broker_move.c_inc (100%) rename src/actor/{ => npc/event}/ac_ev_castaway.c (100%) rename src/actor/{ => npc/event}/ac_ev_dokutu.c (100%) rename src/actor/{ => npc/event}/ac_ev_dokutu_talk.c_inc (100%) rename src/actor/{ => npc/event}/ac_ev_ghost.c (100%) rename src/actor/{ => npc/event}/ac_ev_ghost_schedule.c_inc (100%) rename src/actor/{ => npc/event}/ac_ev_ghost_talk.c_inc (100%) rename src/actor/{ => npc/event}/ac_ev_gypsy.c (100%) rename src/actor/{ => npc/event}/ac_ev_gypsy_move.c_inc (100%) rename src/actor/{ => npc/event}/ac_ev_kabuPeddler.c (100%) rename src/actor/{ => npc/event}/ac_ev_kabuPeddler_move.c_inc (100%) rename src/actor/{ => npc/event}/ac_ev_majin.c (100%) rename src/actor/{ => npc/event}/ac_ev_majin_move.c_inc (100%) rename src/actor/{ => npc/event}/ac_ev_santa.c (100%) rename src/actor/{ => npc/event}/ac_ev_santa_move.c_inc (100%) rename src/actor/{ => npc/event}/ac_ev_soncho.c (100%) rename src/actor/{ => npc/event}/ac_ev_soncho_talk.c_inc (100%) rename src/{ => bg_item}/bg_cherry_item.c (100%) rename src/{ => bg_item}/bg_cherry_item_data.c_inc (100%) rename src/{ => bg_item}/bg_cherry_item_draw.c_inc (100%) rename src/{ => bg_item}/bg_cherry_item_move.c_inc (100%) rename src/{ => bg_item}/bg_item.c (100%) rename src/{ => bg_item}/bg_item_clip.c_inc (100%) rename src/{ => bg_item}/bg_item_common.c_inc (100%) rename src/{ => bg_item}/bg_item_data.c_inc (100%) rename src/{ => bg_item}/bg_item_draw.c_inc (100%) rename src/{ => bg_item}/bg_item_move.c_inc (100%) rename src/{ => bg_item}/bg_police_item.c (100%) rename src/{ => bg_item}/bg_police_item_data.c_inc (100%) rename src/{ => bg_item}/bg_police_item_draw.c_inc (100%) rename src/{ => bg_item}/bg_police_item_move.c_inc (100%) rename src/{ => bg_item}/bg_post_item.c (100%) rename src/{ => bg_item}/bg_winter_item.c (100%) rename src/{ => bg_item}/bg_winter_item_data.c_inc (100%) rename src/{ => bg_item}/bg_winter_item_draw.c_inc (100%) rename src/{ => bg_item}/bg_winter_item_move.c_inc (100%) rename src/{ => bg_item}/bg_xmas_item.c (100%) rename src/{ => bg_item}/bg_xmas_item_data.c_inc (100%) rename src/{ => bg_item}/bg_xmas_item_draw.c_inc (100%) rename src/{ => bg_item}/bg_xmas_item_move.c_inc (100%) diff --git a/configure.py b/configure.py index 54d422f6..fab4db1b 100644 --- a/configure.py +++ b/configure.py @@ -893,12 +893,6 @@ config.libs = [ "foresta", [ Object(Matching, "audio.c"), - Object(Matching, "bg_cherry_item.c"), - Object(Matching, "bg_item.c"), - Object(Matching, "bg_police_item.c"), - Object(Matching, "bg_post_item.c"), - Object(Matching, "bg_winter_item.c"), - Object(Matching, "bg_xmas_item.c"), Object(Matching, "c_keyframe.c"), Object(Matching, "ev_cherry_manager.c"), Object(Matching, "evw_anime.c"), @@ -958,27 +952,6 @@ config.libs = [ Object(Matching, "actor/ac_dummy.c"), Object(Matching, "actor/ac_dump.c"), Object(NonMatching, "actor/ac_effectbg.c"), - Object(NonMatching, "actor/ac_ev_angler.c"), - Object(NonMatching, "actor/ac_ev_artist.c"), - Object(Matching, "actor/ac_ev_broker.c"), - Object(NonMatching, "actor/ac_ev_broker2.c"), - Object(NonMatching, "actor/ac_ev_carpetPeddler.c"), - Object(Matching, "actor/ac_ev_castaway.c"), - Object(NonMatching, "actor/ac_ev_designer.c"), - Object(Matching, "actor/ac_ev_dokutu.c"), - Object(NonMatching, "actor/ac_ev_dozaemon.c"), - Object(Matching, "actor/ac_ev_ghost.c"), - Object(Matching, "actor/ac_ev_gypsy.c"), - Object(Matching, "actor/ac_ev_kabuPeddler.c"), - Object(Matching, "actor/ac_ev_majin.c"), - Object(NonMatching, "actor/ac_ev_miko.c"), - Object(NonMatching, "actor/ac_ev_pumpkin.c"), - Object(Matching, "actor/ac_ev_santa.c"), - Object(Matching, "actor/ac_ev_soncho.c"), - Object(NonMatching, "actor/ac_ev_soncho2.c"), - Object(NonMatching, "actor/ac_ev_speech_soncho.c"), - Object(NonMatching, "actor/ac_ev_turkey.c"), - Object(NonMatching, "actor/ac_ev_yomise.c"), Object(NonMatching, "actor/ac_event_manager.c"), Object(Matching, "actor/ac_fallS.c"), Object(Matching, "actor/ac_fallSESW.c"), @@ -1054,44 +1027,6 @@ config.libs = [ Object(Matching, "actor/ac_nameplate.c"), Object(NonMatching, "actor/ac_needlework_indoor.c"), Object(Matching, "actor/ac_needlework_shop.c"), - Object(NonMatching, "actor/ac_normal_npc.c"), - Object(NonMatching, "actor/ac_npc.c"), - Object(NonMatching, "actor/ac_npc2.c"), - Object(NonMatching, "actor/ac_npc_conv_master.c"), - Object(Matching, "actor/ac_npc_curator.c"), - Object(NonMatching, "actor/ac_npc_depart_master.c"), - Object(Matching, "actor/ac_npc_engineer.c"), - Object(Matching, "actor/ac_npc_guide.c"), - Object(Matching, "actor/ac_npc_guide2.c"), - Object(NonMatching, "actor/ac_npc_hem.c"), - Object(NonMatching, "actor/ac_npc_majin.c"), - Object(NonMatching, "actor/ac_npc_majin2.c"), - Object(NonMatching, "actor/ac_npc_majin3.c"), - Object(NonMatching, "actor/ac_npc_majin4.c"), - Object(NonMatching, "actor/ac_npc_majin5.c"), - Object(NonMatching, "actor/ac_npc_mamedanuki.c"), - Object(NonMatching, "actor/ac_npc_mask_cat.c"), - Object(NonMatching, "actor/ac_npc_mask_cat2.c"), - Object(NonMatching, "actor/ac_npc_needlework.c"), - Object(Matching, "actor/ac_npc_p_sel.c"), - Object(NonMatching, "actor/ac_npc_p_sel2.c"), - Object(NonMatching, "actor/ac_npc_police.c"), - Object(NonMatching, "actor/ac_npc_police2.c"), - Object(NonMatching, "actor/ac_npc_post_girl.c"), - Object(NonMatching, "actor/ac_npc_post_man.c"), - Object(Matching, "actor/ac_npc_rcn_guide.c"), - Object(Matching, "actor/ac_npc_rcn_guide2.c"), - Object(NonMatching, "actor/ac_npc_restart.c"), - Object(Matching, "actor/ac_npc_rtc.c"), - Object(Matching, "actor/ac_npc_sendo.c"), - Object(NonMatching, "actor/ac_npc_shasho.c"), - Object(NonMatching, "actor/ac_npc_shop_master.c"), - Object(NonMatching, "actor/ac_npc_shop_mastersp.c"), - Object(NonMatching, "actor/ac_npc_sleep_obaba.c"), - Object(NonMatching, "actor/ac_npc_soncho.c"), - Object(NonMatching, "actor/ac_npc_station_master.c"), - Object(NonMatching, "actor/ac_npc_super_master.c"), - Object(NonMatching, "actor/ac_npc_totakeke.c"), Object(Matching, "actor/ac_police_box.c"), Object(Matching, "actor/ac_post_office.c"), Object(NonMatching, "actor/ac_present_demo.c"), @@ -1161,6 +1096,75 @@ config.libs = [ Object(Matching, "actor/ac_yatai.c"), ], ), + Rel( + "actor_npc", + [ + Object(NonMatching, "actor/npc/ac_normal_npc.c"), + Object(NonMatching, "actor/npc/ac_npc.c"), + Object(NonMatching, "actor/npc/ac_npc2.c"), + Object(NonMatching, "actor/npc/ac_npc_conv_master.c"), + Object(Matching, "actor/npc/ac_npc_curator.c"), + Object(NonMatching, "actor/npc/ac_npc_depart_master.c"), + Object(Matching, "actor/npc/ac_npc_engineer.c"), + Object(Matching, "actor/npc/ac_npc_guide.c"), + Object(Matching, "actor/npc/ac_npc_guide2.c"), + Object(NonMatching, "actor/npc/ac_npc_hem.c"), + Object(NonMatching, "actor/npc/ac_npc_majin.c"), + Object(NonMatching, "actor/npc/ac_npc_majin2.c"), + Object(NonMatching, "actor/npc/ac_npc_majin3.c"), + Object(NonMatching, "actor/npc/ac_npc_majin4.c"), + Object(NonMatching, "actor/npc/ac_npc_majin5.c"), + Object(NonMatching, "actor/npc/ac_npc_mamedanuki.c"), + Object(NonMatching, "actor/npc/ac_npc_mask_cat.c"), + Object(NonMatching, "actor/npc/ac_npc_mask_cat2.c"), + Object(NonMatching, "actor/npc/ac_npc_needlework.c"), + Object(Matching, "actor/npc/ac_npc_p_sel.c"), + Object(NonMatching, "actor/npc/ac_npc_p_sel2.c"), + Object(NonMatching, "actor/npc/ac_npc_police.c"), + Object(NonMatching, "actor/npc/ac_npc_police2.c"), + Object(NonMatching, "actor/npc/ac_npc_post_girl.c"), + Object(NonMatching, "actor/npc/ac_npc_post_man.c"), + Object(Matching, "actor/npc/ac_npc_rcn_guide.c"), + Object(Matching, "actor/npc/ac_npc_rcn_guide2.c"), + Object(NonMatching, "actor/npc/ac_npc_restart.c"), + Object(Matching, "actor/npc/ac_npc_rtc.c"), + Object(Matching, "actor/npc/ac_npc_sendo.c"), + Object(NonMatching, "actor/npc/ac_npc_shasho.c"), + Object(NonMatching, "actor/npc/ac_npc_shop_master.c"), + Object(NonMatching, "actor/npc/ac_npc_shop_mastersp.c"), + Object(NonMatching, "actor/npc/ac_npc_sleep_obaba.c"), + Object(NonMatching, "actor/npc/ac_npc_soncho.c"), + Object(NonMatching, "actor/npc/ac_npc_station_master.c"), + Object(NonMatching, "actor/npc/ac_npc_super_master.c"), + Object(NonMatching, "actor/npc/ac_npc_totakeke.c"), + ], + ), + Rel( + "actor_npc_event", + [ + Object(NonMatching, "actor/npc/event/ac_ev_angler.c"), + Object(NonMatching, "actor/npc/event/ac_ev_artist.c"), + Object(Matching, "actor/npc/event/ac_ev_broker.c"), + Object(NonMatching, "actor/npc/event/ac_ev_broker2.c"), + Object(NonMatching, "actor/npc/event/ac_ev_carpetPeddler.c"), + Object(Matching, "actor/npc/event/ac_ev_castaway.c"), + Object(NonMatching, "actor/npc/event/ac_ev_designer.c"), + Object(Matching, "actor/npc/event/ac_ev_dokutu.c"), + Object(NonMatching, "actor/npc/event/ac_ev_dozaemon.c"), + Object(Matching, "actor/npc/event/ac_ev_ghost.c"), + Object(Matching, "actor/npc/event/ac_ev_gypsy.c"), + Object(Matching, "actor/npc/event/ac_ev_kabuPeddler.c"), + Object(Matching, "actor/npc/event/ac_ev_majin.c"), + Object(NonMatching, "actor/npc/event/ac_ev_miko.c"), + Object(NonMatching, "actor/npc/event/ac_ev_pumpkin.c"), + Object(Matching, "actor/npc/event/ac_ev_santa.c"), + Object(Matching, "actor/npc/event/ac_ev_soncho.c"), + Object(NonMatching, "actor/npc/event/ac_ev_soncho2.c"), + Object(NonMatching, "actor/npc/event/ac_ev_speech_soncho.c"), + Object(NonMatching, "actor/npc/event/ac_ev_turkey.c"), + Object(NonMatching, "actor/npc/event/ac_ev_yomise.c"), + ], + ), Rel( "actor_tool", [ @@ -1192,6 +1196,17 @@ config.libs = [ Object(Matching, "actor/tool/ac_t_zinnia2.c"), ], ), + Rel( + "bg_item", + [ + Object(Matching, "bg_item/bg_cherry_item.c"), + Object(Matching, "bg_item/bg_item.c"), + Object(Matching, "bg_item/bg_police_item.c"), + Object(Matching, "bg_item/bg_post_item.c"), + Object(Matching, "bg_item/bg_winter_item.c"), + Object(Matching, "bg_item/bg_xmas_item.c"), + ], + ), Rel( "effect", [ diff --git a/src/actor/npc/.gitkeep b/src/actor/npc/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/actor/ac_npc_curator.c b/src/actor/npc/ac_npc_curator.c similarity index 100% rename from src/actor/ac_npc_curator.c rename to src/actor/npc/ac_npc_curator.c diff --git a/src/actor/ac_npc_curator_move.c_inc b/src/actor/npc/ac_npc_curator_move.c_inc similarity index 100% rename from src/actor/ac_npc_curator_move.c_inc rename to src/actor/npc/ac_npc_curator_move.c_inc diff --git a/src/actor/ac_npc_engineer.c b/src/actor/npc/ac_npc_engineer.c similarity index 100% rename from src/actor/ac_npc_engineer.c rename to src/actor/npc/ac_npc_engineer.c diff --git a/src/actor/ac_npc_guide.c b/src/actor/npc/ac_npc_guide.c similarity index 100% rename from src/actor/ac_npc_guide.c rename to src/actor/npc/ac_npc_guide.c diff --git a/src/actor/ac_npc_guide2.c b/src/actor/npc/ac_npc_guide2.c similarity index 100% rename from src/actor/ac_npc_guide2.c rename to src/actor/npc/ac_npc_guide2.c diff --git a/src/actor/ac_npc_guide2_animation.c_inc b/src/actor/npc/ac_npc_guide2_animation.c_inc similarity index 100% rename from src/actor/ac_npc_guide2_animation.c_inc rename to src/actor/npc/ac_npc_guide2_animation.c_inc diff --git a/src/actor/ac_npc_guide2_move.c_inc b/src/actor/npc/ac_npc_guide2_move.c_inc similarity index 100% rename from src/actor/ac_npc_guide2_move.c_inc rename to src/actor/npc/ac_npc_guide2_move.c_inc diff --git a/src/actor/ac_npc_guide_animation.c_inc b/src/actor/npc/ac_npc_guide_animation.c_inc similarity index 100% rename from src/actor/ac_npc_guide_animation.c_inc rename to src/actor/npc/ac_npc_guide_animation.c_inc diff --git a/src/actor/ac_npc_guide_move.c_inc b/src/actor/npc/ac_npc_guide_move.c_inc similarity index 100% rename from src/actor/ac_npc_guide_move.c_inc rename to src/actor/npc/ac_npc_guide_move.c_inc diff --git a/src/actor/ac_npc_p_sel.c b/src/actor/npc/ac_npc_p_sel.c similarity index 100% rename from src/actor/ac_npc_p_sel.c rename to src/actor/npc/ac_npc_p_sel.c diff --git a/src/actor/ac_npc_p_sel_schedule.c_inc b/src/actor/npc/ac_npc_p_sel_schedule.c_inc similarity index 100% rename from src/actor/ac_npc_p_sel_schedule.c_inc rename to src/actor/npc/ac_npc_p_sel_schedule.c_inc diff --git a/src/actor/ac_npc_p_sel_talk.c_inc b/src/actor/npc/ac_npc_p_sel_talk.c_inc similarity index 100% rename from src/actor/ac_npc_p_sel_talk.c_inc rename to src/actor/npc/ac_npc_p_sel_talk.c_inc diff --git a/src/actor/ac_npc_rcn_guide.c b/src/actor/npc/ac_npc_rcn_guide.c similarity index 100% rename from src/actor/ac_npc_rcn_guide.c rename to src/actor/npc/ac_npc_rcn_guide.c diff --git a/src/actor/ac_npc_rcn_guide2.c b/src/actor/npc/ac_npc_rcn_guide2.c similarity index 100% rename from src/actor/ac_npc_rcn_guide2.c rename to src/actor/npc/ac_npc_rcn_guide2.c diff --git a/src/actor/ac_npc_rcn_guide2_move.c_inc b/src/actor/npc/ac_npc_rcn_guide2_move.c_inc similarity index 100% rename from src/actor/ac_npc_rcn_guide2_move.c_inc rename to src/actor/npc/ac_npc_rcn_guide2_move.c_inc diff --git a/src/actor/ac_npc_rcn_guide2_schedule.c_inc b/src/actor/npc/ac_npc_rcn_guide2_schedule.c_inc similarity index 100% rename from src/actor/ac_npc_rcn_guide2_schedule.c_inc rename to src/actor/npc/ac_npc_rcn_guide2_schedule.c_inc diff --git a/src/actor/ac_npc_rcn_guide2_talk.c_inc b/src/actor/npc/ac_npc_rcn_guide2_talk.c_inc similarity index 100% rename from src/actor/ac_npc_rcn_guide2_talk.c_inc rename to src/actor/npc/ac_npc_rcn_guide2_talk.c_inc diff --git a/src/actor/ac_npc_rcn_guide_move.c_inc b/src/actor/npc/ac_npc_rcn_guide_move.c_inc similarity index 100% rename from src/actor/ac_npc_rcn_guide_move.c_inc rename to src/actor/npc/ac_npc_rcn_guide_move.c_inc diff --git a/src/actor/ac_npc_rcn_guide_schedule.c_inc b/src/actor/npc/ac_npc_rcn_guide_schedule.c_inc similarity index 100% rename from src/actor/ac_npc_rcn_guide_schedule.c_inc rename to src/actor/npc/ac_npc_rcn_guide_schedule.c_inc diff --git a/src/actor/ac_npc_rcn_guide_talk.c_inc b/src/actor/npc/ac_npc_rcn_guide_talk.c_inc similarity index 100% rename from src/actor/ac_npc_rcn_guide_talk.c_inc rename to src/actor/npc/ac_npc_rcn_guide_talk.c_inc diff --git a/src/actor/ac_npc_rtc.c b/src/actor/npc/ac_npc_rtc.c similarity index 100% rename from src/actor/ac_npc_rtc.c rename to src/actor/npc/ac_npc_rtc.c diff --git a/src/actor/ac_npc_rtc_talk.c.inc b/src/actor/npc/ac_npc_rtc_talk.c.inc similarity index 100% rename from src/actor/ac_npc_rtc_talk.c.inc rename to src/actor/npc/ac_npc_rtc_talk.c.inc diff --git a/src/actor/ac_npc_rtc_think.c.inc b/src/actor/npc/ac_npc_rtc_think.c.inc similarity index 100% rename from src/actor/ac_npc_rtc_think.c.inc rename to src/actor/npc/ac_npc_rtc_think.c.inc diff --git a/src/actor/ac_npc_sendo.c b/src/actor/npc/ac_npc_sendo.c similarity index 100% rename from src/actor/ac_npc_sendo.c rename to src/actor/npc/ac_npc_sendo.c diff --git a/src/actor/ac_npc_sendo_move.c_inc b/src/actor/npc/ac_npc_sendo_move.c_inc similarity index 100% rename from src/actor/ac_npc_sendo_move.c_inc rename to src/actor/npc/ac_npc_sendo_move.c_inc diff --git a/src/actor/ac_ev_broker.c b/src/actor/npc/event/ac_ev_broker.c similarity index 100% rename from src/actor/ac_ev_broker.c rename to src/actor/npc/event/ac_ev_broker.c diff --git a/src/actor/ac_ev_broker_move.c_inc b/src/actor/npc/event/ac_ev_broker_move.c_inc similarity index 100% rename from src/actor/ac_ev_broker_move.c_inc rename to src/actor/npc/event/ac_ev_broker_move.c_inc diff --git a/src/actor/ac_ev_castaway.c b/src/actor/npc/event/ac_ev_castaway.c similarity index 100% rename from src/actor/ac_ev_castaway.c rename to src/actor/npc/event/ac_ev_castaway.c diff --git a/src/actor/ac_ev_dokutu.c b/src/actor/npc/event/ac_ev_dokutu.c similarity index 100% rename from src/actor/ac_ev_dokutu.c rename to src/actor/npc/event/ac_ev_dokutu.c diff --git a/src/actor/ac_ev_dokutu_talk.c_inc b/src/actor/npc/event/ac_ev_dokutu_talk.c_inc similarity index 100% rename from src/actor/ac_ev_dokutu_talk.c_inc rename to src/actor/npc/event/ac_ev_dokutu_talk.c_inc diff --git a/src/actor/ac_ev_ghost.c b/src/actor/npc/event/ac_ev_ghost.c similarity index 100% rename from src/actor/ac_ev_ghost.c rename to src/actor/npc/event/ac_ev_ghost.c diff --git a/src/actor/ac_ev_ghost_schedule.c_inc b/src/actor/npc/event/ac_ev_ghost_schedule.c_inc similarity index 100% rename from src/actor/ac_ev_ghost_schedule.c_inc rename to src/actor/npc/event/ac_ev_ghost_schedule.c_inc diff --git a/src/actor/ac_ev_ghost_talk.c_inc b/src/actor/npc/event/ac_ev_ghost_talk.c_inc similarity index 100% rename from src/actor/ac_ev_ghost_talk.c_inc rename to src/actor/npc/event/ac_ev_ghost_talk.c_inc diff --git a/src/actor/ac_ev_gypsy.c b/src/actor/npc/event/ac_ev_gypsy.c similarity index 100% rename from src/actor/ac_ev_gypsy.c rename to src/actor/npc/event/ac_ev_gypsy.c diff --git a/src/actor/ac_ev_gypsy_move.c_inc b/src/actor/npc/event/ac_ev_gypsy_move.c_inc similarity index 100% rename from src/actor/ac_ev_gypsy_move.c_inc rename to src/actor/npc/event/ac_ev_gypsy_move.c_inc diff --git a/src/actor/ac_ev_kabuPeddler.c b/src/actor/npc/event/ac_ev_kabuPeddler.c similarity index 100% rename from src/actor/ac_ev_kabuPeddler.c rename to src/actor/npc/event/ac_ev_kabuPeddler.c diff --git a/src/actor/ac_ev_kabuPeddler_move.c_inc b/src/actor/npc/event/ac_ev_kabuPeddler_move.c_inc similarity index 100% rename from src/actor/ac_ev_kabuPeddler_move.c_inc rename to src/actor/npc/event/ac_ev_kabuPeddler_move.c_inc diff --git a/src/actor/ac_ev_majin.c b/src/actor/npc/event/ac_ev_majin.c similarity index 100% rename from src/actor/ac_ev_majin.c rename to src/actor/npc/event/ac_ev_majin.c diff --git a/src/actor/ac_ev_majin_move.c_inc b/src/actor/npc/event/ac_ev_majin_move.c_inc similarity index 100% rename from src/actor/ac_ev_majin_move.c_inc rename to src/actor/npc/event/ac_ev_majin_move.c_inc diff --git a/src/actor/ac_ev_santa.c b/src/actor/npc/event/ac_ev_santa.c similarity index 100% rename from src/actor/ac_ev_santa.c rename to src/actor/npc/event/ac_ev_santa.c diff --git a/src/actor/ac_ev_santa_move.c_inc b/src/actor/npc/event/ac_ev_santa_move.c_inc similarity index 100% rename from src/actor/ac_ev_santa_move.c_inc rename to src/actor/npc/event/ac_ev_santa_move.c_inc diff --git a/src/actor/ac_ev_soncho.c b/src/actor/npc/event/ac_ev_soncho.c similarity index 100% rename from src/actor/ac_ev_soncho.c rename to src/actor/npc/event/ac_ev_soncho.c diff --git a/src/actor/ac_ev_soncho_talk.c_inc b/src/actor/npc/event/ac_ev_soncho_talk.c_inc similarity index 100% rename from src/actor/ac_ev_soncho_talk.c_inc rename to src/actor/npc/event/ac_ev_soncho_talk.c_inc diff --git a/src/bg_cherry_item.c b/src/bg_item/bg_cherry_item.c similarity index 100% rename from src/bg_cherry_item.c rename to src/bg_item/bg_cherry_item.c diff --git a/src/bg_cherry_item_data.c_inc b/src/bg_item/bg_cherry_item_data.c_inc similarity index 100% rename from src/bg_cherry_item_data.c_inc rename to src/bg_item/bg_cherry_item_data.c_inc diff --git a/src/bg_cherry_item_draw.c_inc b/src/bg_item/bg_cherry_item_draw.c_inc similarity index 100% rename from src/bg_cherry_item_draw.c_inc rename to src/bg_item/bg_cherry_item_draw.c_inc diff --git a/src/bg_cherry_item_move.c_inc b/src/bg_item/bg_cherry_item_move.c_inc similarity index 100% rename from src/bg_cherry_item_move.c_inc rename to src/bg_item/bg_cherry_item_move.c_inc diff --git a/src/bg_item.c b/src/bg_item/bg_item.c similarity index 100% rename from src/bg_item.c rename to src/bg_item/bg_item.c diff --git a/src/bg_item_clip.c_inc b/src/bg_item/bg_item_clip.c_inc similarity index 100% rename from src/bg_item_clip.c_inc rename to src/bg_item/bg_item_clip.c_inc diff --git a/src/bg_item_common.c_inc b/src/bg_item/bg_item_common.c_inc similarity index 100% rename from src/bg_item_common.c_inc rename to src/bg_item/bg_item_common.c_inc diff --git a/src/bg_item_data.c_inc b/src/bg_item/bg_item_data.c_inc similarity index 100% rename from src/bg_item_data.c_inc rename to src/bg_item/bg_item_data.c_inc diff --git a/src/bg_item_draw.c_inc b/src/bg_item/bg_item_draw.c_inc similarity index 100% rename from src/bg_item_draw.c_inc rename to src/bg_item/bg_item_draw.c_inc diff --git a/src/bg_item_move.c_inc b/src/bg_item/bg_item_move.c_inc similarity index 100% rename from src/bg_item_move.c_inc rename to src/bg_item/bg_item_move.c_inc diff --git a/src/bg_police_item.c b/src/bg_item/bg_police_item.c similarity index 100% rename from src/bg_police_item.c rename to src/bg_item/bg_police_item.c diff --git a/src/bg_police_item_data.c_inc b/src/bg_item/bg_police_item_data.c_inc similarity index 100% rename from src/bg_police_item_data.c_inc rename to src/bg_item/bg_police_item_data.c_inc diff --git a/src/bg_police_item_draw.c_inc b/src/bg_item/bg_police_item_draw.c_inc similarity index 100% rename from src/bg_police_item_draw.c_inc rename to src/bg_item/bg_police_item_draw.c_inc diff --git a/src/bg_police_item_move.c_inc b/src/bg_item/bg_police_item_move.c_inc similarity index 100% rename from src/bg_police_item_move.c_inc rename to src/bg_item/bg_police_item_move.c_inc diff --git a/src/bg_post_item.c b/src/bg_item/bg_post_item.c similarity index 100% rename from src/bg_post_item.c rename to src/bg_item/bg_post_item.c diff --git a/src/bg_winter_item.c b/src/bg_item/bg_winter_item.c similarity index 100% rename from src/bg_winter_item.c rename to src/bg_item/bg_winter_item.c diff --git a/src/bg_winter_item_data.c_inc b/src/bg_item/bg_winter_item_data.c_inc similarity index 100% rename from src/bg_winter_item_data.c_inc rename to src/bg_item/bg_winter_item_data.c_inc diff --git a/src/bg_winter_item_draw.c_inc b/src/bg_item/bg_winter_item_draw.c_inc similarity index 100% rename from src/bg_winter_item_draw.c_inc rename to src/bg_item/bg_winter_item_draw.c_inc diff --git a/src/bg_winter_item_move.c_inc b/src/bg_item/bg_winter_item_move.c_inc similarity index 100% rename from src/bg_winter_item_move.c_inc rename to src/bg_item/bg_winter_item_move.c_inc diff --git a/src/bg_xmas_item.c b/src/bg_item/bg_xmas_item.c similarity index 100% rename from src/bg_xmas_item.c rename to src/bg_item/bg_xmas_item.c diff --git a/src/bg_xmas_item_data.c_inc b/src/bg_item/bg_xmas_item_data.c_inc similarity index 100% rename from src/bg_xmas_item_data.c_inc rename to src/bg_item/bg_xmas_item_data.c_inc diff --git a/src/bg_xmas_item_draw.c_inc b/src/bg_item/bg_xmas_item_draw.c_inc similarity index 100% rename from src/bg_xmas_item_draw.c_inc rename to src/bg_item/bg_xmas_item_draw.c_inc diff --git a/src/bg_xmas_item_move.c_inc b/src/bg_item/bg_xmas_item_move.c_inc similarity index 100% rename from src/bg_xmas_item_move.c_inc rename to src/bg_item/bg_xmas_item_move.c_inc