github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-14 10:37:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Master Quest (#3) (#1632)

Browse source 
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
This commit is contained in:
briaguya 2022-09-29 19:07:48 -04:00 • committed by GitHub
commit 8888fb2ec1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
575 changed files with 22984 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

8
soh/include/functions.h
View file

@ -20,11 +20,11 @@ extern "C"
#endif
f32 fabsf(f32 f);
#pragma intrinsic(fabsf)
//#pragma intrinsic(fabsf)
f32 sqrtf(f32 f);
#pragma intrinsic(sqrtf)
//#pragma intrinsic(sqrtf)
f64 sqrt(f64 d);
#pragma intrinsic(sqrt)
//#pragma intrinsic(sqrt)
void gSPSegment(void* value, int segNum, uintptr_t target);
void gDPSetTextureImage(Gfx* pkt, u32 f, u32 s, u32 w, uintptr_t i);
@ -2419,8 +2419,6 @@ void Opening_Destroy(GameState* thisx);
void FileChoose_Init(GameState* thisx);
void FileChoose_Destroy(GameState* thisx);
char* SetQuote();
void Heaps_Alloc(void);
void Heaps_Free(void);

12
soh/include/libc/stddef.h
View file

@ -1,11 +1,13 @@
#ifndef STDDEF_H
#define STDDEF_H
#ifndef __cplusplus
#define NULL ((void*)0)
#else
#define NULL nullptr
#endif
#include <stddef.h>
//#ifndef __cplusplus
//#define NULL ((void*)0)
//#else
//#define NULL nullptr
//#endif
#if 0
#define size_t unsigned long

3
soh/include/z64map_mark.h
View file

@ -20,6 +20,7 @@ typedef struct {
typedef MapMarkIconData MapMarkData[3]; // size = 0x72
extern MapMarkData* gMapMarkDataTable[];
extern MapMarkData* gMapMarkDataTableVanilla[];
extern MapMarkData* gMapMarkDataTableMq[];
#endif

1
soh/include/z64save.h
View file

@ -175,6 +175,7 @@ typedef struct {
/* 0x1420 */ s16 worldMapArea;
/* 0x1422 */ s16 sunsSongState; // controls the effects of suns song
/* 0x1424 */ s16 healthAccumulator;
uint32_t isMasterQuest;
RandoSetting randoSettings[300];
ItemLocationRando itemLocations[RC_MAX];
HintLocationRando hintLocations[50];