mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move files in with other rando files

This commit is contained in:
lilDavid 2022-08-09 19:57:40 -05:00
parent 08366c51b6
commit 12d45685b9
15 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/CMakeLists.txt
View File

@ -124,7 +124,6 @@ set(Header_Files__include
"include/vt.h"
"include/z64.h"
"include/z64actor.h"
"include/z64adult_trade_shuffle.h"
"include/z64animation.h"
"include/z64audio.h"
"include/z64bgcheck.h"
@ -175,6 +174,7 @@ source_group("Header Files\\soh\\Enhancements\\debugger" FILES ${Header_Files__s
set(Header_Files__soh__Enhancements__randomizer
"soh/Enhancements/randomizer/randomizer.h"
"soh/Enhancements/randomizer/randomizer_item_tracker.h"
"soh/Enhancements/randomizer/adult_trade_shuffle.h"
)
source_group("Header Files\\soh\\Enhancements\\randomizer" FILES ${Header_Files__soh__Enhancements__randomizer})
@ -260,6 +260,7 @@ source_group("Source Files\\soh\\Enhancements\\debugger" FILES ${Source_Files__s
set(Source_Files__soh__Enhancements__randomizer
"soh/Enhancements/randomizer/randomizer.cpp"
"soh/Enhancements/randomizer/randomizer_item_tracker.cpp"
"soh/Enhancements/randomizer/adult_trade_shuffle.c"
)
source_group("Source Files\\soh\\Enhancements\\randomizer" FILES ${Source_Files__soh__Enhancements__randomizer})
@ -425,7 +426,6 @@ set(Source_Files__src__code
"src/code/ucode_disas.c"
"src/code/z_actor.c"
"src/code/z_actor_dlftbls.c"
"src/code/z_adult_trade_shuffle.c"
"src/code/z_bgcheck.c"
"src/code/z_camera.c"
"src/code/z_cheap_proc.c"

2
soh/src/code/z_adult_trade_shuffle.c → soh/soh/Enhancements/randomizer/adult_trade_shuffle.c
View File

@ -1,4 +1,4 @@
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
#include "functions.h"
#include "variables.h"
#include "macros.h"

0
soh/include/z64adult_trade_shuffle.h → soh/soh/Enhancements/randomizer/adult_trade_shuffle.h
View File

2
soh/src/code/z_kankyo.c
View File

@ -4,7 +4,7 @@
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/gameplay_field_keep/gameplay_field_keep.h"
#include "soh/frame_interpolation.h"
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
typedef enum {
/* 0 */ LENS_FLARE_CIRCLE0,

2
soh/src/code/z_parameter.c
View File

@ -3,7 +3,7 @@
#include "textures/parameter_static/parameter_static.h"
#include "textures/do_action_static/do_action_static.h"
#include "textures/icon_item_static/icon_item_static.h"
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
#ifdef _MSC_VER
#include <stdlib.h>

2
soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
View File

@ -6,7 +6,7 @@
#include "z_en_ds.h"
#include "objects/object_ds/object_ds.h"
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3)

2
soh/src/overlays/actors/ovl_En_Go/z_en_go.c
View File

@ -3,7 +3,7 @@
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_oF1d_map/object_oF1d_map.h"
#include "soh/frame_interpolation.h"
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_5)

2
soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
View File

@ -3,7 +3,7 @@
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_oF1d_map/object_oF1d_map.h"
#include "soh/frame_interpolation.h"
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_5)

2
soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
View File

@ -7,7 +7,7 @@
#include "z_en_hs.h"
#include "vt.h"
#include "objects/object_hs/object_hs.h"
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3)

2
soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
View File

@ -10,7 +10,7 @@
#include "objects/object_km1/object_km1.h"
#include "objects/object_kw1/object_kw1.h"
#include "vt.h"
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4)

2
soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
View File

@ -6,7 +6,7 @@
#include "z_en_kz.h"
#include "objects/object_kz/object_kz.h"
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3)

2
soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
View File

@ -6,7 +6,7 @@
#include "z_en_mk.h"
#include "objects/object_mk/object_mk.h"
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4)

2
soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
View File

@ -3,7 +3,7 @@
#include "objects/object_os_anime/object_os_anime.h"
#include "overlays/actors/ovl_En_Niw/z_en_niw.h"
#include "vt.h"
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4)

2
soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
View File

@ -6,7 +6,7 @@
#include "z_en_toryo.h"
#include "objects/object_toryo/object_toryo.h"
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3)

2
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
View File

@ -1,6 +1,6 @@
#include "z_kaleido_scope.h"
#include "textures/parameter_static/parameter_static.h"
#include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/randomizerTypes.h"
u8 gAmmoItems[] = {