Skip to content

Commit 08a487f

Browse files
sonoftunksonoftunk
committed
Merges origin/develop into LocationTracker to resolve conflict with randomizer_check_objects.cpp
2 parents f936299 + 06df45e commit 08a487f

File tree

419 files changed

+3045
-2217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

419 files changed

+3045
-2217
lines changed

‎.github/workflows/pr-artifacts.yml‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,31 @@ jobs:
1111
runs-on: ubuntu-latest
1212
if: ${{ github.event.workflow_run.event == 'pull_request' }}
1313
steps:
14-
- id: 'get-info'
14+
- id: 'pr-number'
15+
uses: actions/github-script@v6
16+
with:
17+
result-encoding: string
18+
script: |
19+
const {owner, repo} = context.repo;
20+
const pullHeadSHA = '${{github.event.workflow_run.head_sha}}';
21+
const pullUserId = ${{github.event.sender.id}};
22+
const prNumber = await (async () => {
23+
const pulls = await github.rest.pulls.list({owner, repo});
24+
for await (const {data} of github.paginate.iterator(pulls)) {
25+
for (const pull of data) {
26+
if (pull.head.sha === pullHeadSHA && pull.user.id === pullUserId) {
27+
return pull.number;
28+
}
29+
}
30+
}
31+
})();
32+
33+
if (!prNumber) {
34+
return core.error(`No matching pull request found`);
35+
}
36+
37+
return prNumber;
38+
- id: 'artifacts-text'
1539
uses: actions/github-script@v6
1640
with:
1741
result-encoding: string
@@ -25,13 +49,13 @@ jobs:
2549
return allArtifacts.data.artifacts.reduce((acc, item) => {
2650
if (item.name === "assets") return acc;
2751
acc += `
28-
- [${item.name}](${context.payload.repository.html_url}/suites/${context.payload.workflow_run.check_suite_id}/artifacts/${item.id})`;
52+
- [${item.name}.zip](https://nightly.link/${context.repo.owner}/${context.repo.repo}/actions/artifacts/${item.id}.zip)`;
2953
return acc;
3054
}, '### Build Artifacts');
3155
- id: 'add-to-pr'
3256
uses: garrettjoecox/[email protected]
3357
with:
3458
repo-token: '${{ secrets.GITHUB_TOKEN }}'
35-
pr-number: ${{ github.event.workflow_run.pull_requests[0].number }}
59+
pr-number: ${{ steps.pr-number.outputs.result }}
3660
section-name: 'artifacts'
37-
section-value: '${{ steps.get-info.outputs.result }}'
61+
section-value: '${{ steps.artifacts-text.outputs.result }}'

‎BUILDING.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ _Note: If you're using Visual Studio Code, the [cpack plugin](https://marketplac
8585
# Clone the repo
8686
git clone https://github.com/HarbourMasters/Shipwright.git
8787
cd Shipwright
88+
# Clone the submodule libultraship
89+
git submodule update --init
8890
# Copy the baserom to the OTRExporter folder
8991
cp <path to your ROM> OTRExporter
9092
# Generate Ninja project
@@ -123,6 +125,8 @@ _Note: If you're using Visual Studio Code, the [cpack plugin](https://marketplac
123125
# Clone the repo
124126
git clone https://github.com/HarbourMasters/Shipwright.git
125127
cd ShipWright
128+
# Clone the submodule libultraship
129+
git submodule update --init
126130
# Copy the baserom to the OTRExporter folder
127131
cp <path to your ROM> OTRExporter
128132
# Generate Ninja project

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
77
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
88

99
project(Ship LANGUAGES C CXX
10-
VERSION 5.0.0)
11-
set(PROJECT_BUILD_NAME "FLYNN ALFA" CACHE STRING "")
10+
VERSION 5.0.1)
11+
set(PROJECT_BUILD_NAME "FLYNN BRAVO" CACHE STRING "")
1212
set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
1313

1414
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)

‎soh/include/alignment.h‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#ifndef ALIGNMENT_H
2+
#define ALIGNMENT_H
3+
4+
#define ALIGN8(val) (((val) + 7) & ~7)
5+
#define ALIGN16(val) (((val) + 0xF) & ~0xF)
6+
#define ALIGN32(val) (((val) + 0x1F) & ~0x1F)
7+
#define ALIGN64(val) (((val) + 0x3F) & ~0x3F)
8+
#define ALIGN256(val) (((val) + 0xFF) & ~0xFF)
9+
10+
#ifdef __GNUC__
11+
#define ALIGNED8 __attribute__ ((aligned (8)))
12+
#else
13+
#define ALIGNED8
14+
#endif
15+
16+
#endif

‎soh/include/functions.h‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,42 +1173,42 @@ s16 Quake_Calc(Camera* camera, QuakeCamCalc* camData);
11731173
Gfx* Gfx_SetFog(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
11741174
Gfx* Gfx_SetFogWithSync(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
11751175
Gfx* Gfx_SetFog2(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
1176-
Gfx* Gfx_CallSetupDL(Gfx* gfx, u32 i);
1177-
Gfx* func_800937C0(Gfx* gfx);
1178-
Gfx* func_80093808(Gfx* gfx);
1179-
void func_800938B4(GraphicsContext* gfxCtx);
1180-
void func_8009398C(GraphicsContext* gfxCtx);
1181-
void func_80093AD0(GraphicsContext* gfxCtx);
1182-
void func_80093BA8(GraphicsContext* gfxCtx);
1183-
void func_80093C14(GraphicsContext* gfxCtx);
1176+
Gfx* Gfx_SetupDL(Gfx* gfx, u32 i);
1177+
Gfx* Gfx_SetupDL_57(Gfx* gfx);
1178+
Gfx* Gfx_SetupDL_52NoCD(Gfx* gfx);
1179+
void Gfx_SetupDL_57Opa(GraphicsContext* gfxCtx);
1180+
void Gfx_SetupDL_51Opa(GraphicsContext* gfxCtx);
1181+
void Gfx_SetupDL_54Opa(GraphicsContext* gfxCtx);
1182+
void Gfx_SetupDL_26Opa(GraphicsContext* gfxCtx);
1183+
void Gfx_SetupDL_25Xlu2(GraphicsContext* gfxCtx);
11841184
void func_80093C80(PlayState* play);
1185-
void func_80093D18(GraphicsContext* gfxCtx);
1186-
void func_80093D84(GraphicsContext* gfxCtx);
1187-
Gfx* func_80093F34(Gfx* gfx);
1188-
Gfx* func_80093F58(Gfx* gfx);
1189-
void func_80094044(GraphicsContext* gfxCtx);
1190-
void func_800940B0(GraphicsContext* gfxCtx);
1191-
void func_80094140(GraphicsContext* gfxCtx);
1192-
Gfx* func_8009411C(Gfx* gfx);
1193-
void func_800942F0(GraphicsContext* gfxCtx);
1194-
void func_8009435C(GraphicsContext* gfxCtx);
1195-
void func_800943C8(GraphicsContext* gfxCtx);
1196-
Gfx* func_800944A0(Gfx* gfx);
1197-
void func_800944C4(GraphicsContext* gfxCtx);
1198-
void func_80094520(GraphicsContext* gfxCtx);
1199-
void func_8009457C(Gfx** gfxp);
1200-
void func_800945A0(GraphicsContext* gfxCtx);
1201-
void func_8009460C(GraphicsContext* gfxCtx);
1202-
void func_80094678(GraphicsContext* gfxCtx);
1203-
Gfx* func_80094968(Gfx* gfx);
1204-
Gfx* func_800946E4(Gfx* gfx);
1185+
void Gfx_SetupDL_25Opa(GraphicsContext* gfxCtx);
1186+
void Gfx_SetupDL_25Xlu(GraphicsContext* gfxCtx);
1187+
Gfx* Gfx_SetupDL_64(Gfx* gfx);
1188+
Gfx* Gfx_SetupDL_34(Gfx* gfx);
1189+
void Gfx_SetupDL_44Xlu(GraphicsContext* gfxCtx);
1190+
void Gfx_SetupDL_36Opa(GraphicsContext* gfxCtx);
1191+
void Gfx_SetupDL_28Opa(GraphicsContext* gfxCtx);
1192+
Gfx* Gfx_SetupDL_28(Gfx* gfx);
1193+
void Gfx_SetupDL_38Xlu(GraphicsContext* gfxCtx);
1194+
void Gfx_SetupDL_4Xlu(GraphicsContext* gfxCtx);
1195+
void Gfx_SetupDL_37Opa(GraphicsContext* gfxCtx);
1196+
Gfx* Gfx_SetupDL_39(Gfx* gfx);
1197+
void Gfx_SetupDL_39Opa(GraphicsContext* gfxCtx);
1198+
void Gfx_SetupDL_39Overlay(GraphicsContext* gfxCtx);
1199+
void Gfx_SetupDL_39Ptr(Gfx** gfxp);
1200+
void Gfx_SetupDL_40Opa(GraphicsContext* gfxCtx);
1201+
void Gfx_SetupDL_41Opa(GraphicsContext* gfxCtx);
1202+
void Gfx_SetupDL_47Xlu(GraphicsContext* gfxCtx);
1203+
Gfx* Gfx_SetupDL_20NoCD(Gfx* gfx);
1204+
Gfx* Gfx_SetupDL_66(Gfx* gfx);
12051205
Gfx* func_800947AC(Gfx* gfx);
1206-
void func_800949A8(GraphicsContext* gfxCtx);
1207-
void func_80094A14(GraphicsContext* gfxCtx);
1208-
void func_80094B58(GraphicsContext* gfxCtx);
1209-
void func_80094BC4(GraphicsContext* gfxCtx);
1210-
void func_80094C50(GraphicsContext* gfxCtx);
1211-
void func_80094D28(Gfx** gfxp);
1206+
void Gfx_SetupDL_42Opa(GraphicsContext* gfxCtx);
1207+
void Gfx_SetupDL_42Overlay(GraphicsContext* gfxCtx);
1208+
void Gfx_SetupDL_27Xlu(GraphicsContext* gfxCtx);
1209+
void Gfx_SetupDL_60NoCDXlu(GraphicsContext* gfxCtx);
1210+
void Gfx_SetupDL_61Xlu(GraphicsContext* gfxCtx);
1211+
void Gfx_SetupDL_56Ptr(Gfx** gfxp);
12121212
Gfx* Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height);
12131213
Gfx* func_80094E78(GraphicsContext* gfxCtx, u32 x, u32 y);
12141214
Gfx* Gfx_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height);
@@ -1217,7 +1217,7 @@ Gfx* Gfx_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 wi
12171217
Gfx* Gfx_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2,
12181218
u32 x2, u32 y2, s32 width2, s32 height2, s32 r, s32 g, s32 b, s32 a);
12191219
Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a);
1220-
void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b);
1220+
void Gfx_SetupFrame(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b);
12211221
void func_80095974(GraphicsContext* gfxCtx);
12221222
void func_80095AA0(PlayState* play, Room* room, Input* arg2, UNK_TYPE arg3);
12231223
void func_8009638C(Gfx** displayList, void* source, void* tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 mode0,

0 commit comments

Comments
 (0)