izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

en_invadepoh OK (#200)

Browse Source 
* Applied changes to master on new branch

* some docs

* minor change

* Slight improvement to last draw func

* Got rid of all warnings

* Removed extra text file

* Readded warnings text file

* Fixed warnings text file

* Some cleanup, added engineer's new matched functions!

* Marked non-equivalent functions as such

* Improved last draw func (still non-equivalent)

* Made most of anghelo's suggested changes

* Slightly better code for func_80B4A350, though it's not matching still

* Engineer matched 2 funcs so I'm pushing those

* Added a function from engineer and one of my own

* Fixed warning

* Slightly better code for func_80B44C80

* Slightly better code for func_80B44C80

* Matched func_80B44C80

* Pushing engineer's matched draw func. All rodata funcs matched!

* Build NOT OK - rodata. Pushing anyway because I did a lot of work and it's close

* Build NOT OK (see previous commit) - func_80B440B8 matched

* Build NOT OK (see previous commit) - func_80B43BC8 matched

* All funcs matched! Build not OK still though

* almost ok

* OK now

* Fixed some warnings

* Fixed more warnings

* More warnings work

* Fixed all warnings (I think)

* Fixed all warnings (I think)

* Moderate amount of cleanup

* More cleanup

* More cleanup and some slight documentation

* Decent amount of documentation

* More documentation

* Fixed build (forgot to replace one struct member)

* More documentation and cleanup

* Fixed merge conflict, added binang_sub macro usages, and otherwise added most of the suggested changes f

git commit

* Organized things a bit, added a few more CLOCKTIME macros

* Added extra output to timeconvert.py

* Formatting

* Made all suggested changes

* 'Downgraded' timeconv script to version without seconds

* Added a macro for part of the params usages plus an enum

* Actually fixed header file (didn't save before)

* Renamed milk get item in enum

* Fixed GI enum update

Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
Co-authored-by: Zelllll <elilee968@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
This commit is contained in:
kyleburnette
2021-07-17 00:04:37 -04:00
committed by GitHub
co-authored by Zelllll Zelllll angie
parent 66d0656128
commit e1219e7351
15 changed files with 4828 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+3 -3
View File
@@ -1769,7 +1769,7 @@ void func_800F6FF8(GlobalContext* globalCtx, EnvironmentContext* envCtx, LightCo
// void func_800F8CD4(GlobalContext* globalCtx, EnvironmentContext* envCtx, LightContext* lightCtx, s32 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
// void func_800F8D84(void);
// void func_800F9728(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
// void func_800F9824(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9, UNK_TYPE2 param_10, UNK_TYPE1 param_11);
void func_800F9824(GlobalContext* globalCtx, EnvironmentContext* envCtx, View* view, GraphicsContext* gfxCtx, Vec3f vec, f32 arg5, f32 arg6, s8 arg7, s8 arg8);
// void func_800FA39C(void);
// void func_800FA3C4(void);
// void func_800FA9FC(void);
@@ -1814,7 +1814,7 @@ u32 func_800FE4B8(GlobalContext* globalCtx);
// void func_800FE590(void);
// void func_800FE5D0(void);
// UNK_TYPE4 func_800FE610(void);
// void func_800FE620(void);
s32 func_800FE620(GlobalContext* globalCtx);
// void func_800FE658(void);
// UNK_TYPE4 func_800FE6F8(UNK_TYPE4 param_1, s16 param_2, s16 param_3);
// void func_800FE778(void);
@@ -3935,7 +3935,7 @@ void func_801A2ED8(void);
// void func_801A2F88(void);
// void func_801A3000(void);
// void func_801A3038(void);
// void func_801A3098(void);
void func_801A3098(u16 arg0);
// void func_801A312C(void);
void func_801A31EC(UNK_TYPE1 arg1, UNK_TYPE4 arg2, u8 arg3);
// void func_801A3238(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5);
include/macros.h
+2
View File
@@ -32,6 +32,8 @@
#define CURRENT_DAY (gSaveContext.day % 5)
#define CLOCK_TIME(hr, min) ((s32)(((hr) * 60 + (min)) * 0x10000 / (24 * 60)))
#define SLOT(item) gItemSlots[item]
#define AMMO(item) gSaveContext.inventory.ammo[SLOT(item)]
#define INV_CONTENT(item) gSaveContext.inventory.items[SLOT(item)]
include/z64.h
+3 -5
View File
@@ -986,11 +986,9 @@ typedef struct {
/* 0x12070 */ UNK_TYPE1 pad12070[0x8];
/* 0x12078 */ s32 bankRupeesSelected;
/* 0x1207C */ s32 bankRupees;
/* 0x12080 */ UNK_TYPE1 pad12080[0x30];
/* 0x120B0 */ UNK_TYPE1 pad120B0[0x1];
/* 0x120B1 */ u8 unk_120B1;
/* 0x120B2 */ UNK_TYPE1 pad120B2[0x2];
/* 0x120B4 */ UNK_TYPE1 pad120B4[0x2C];
/* 0x12080 */ UNK_TYPE1 pad12080[0x31];
/* 0x120B1 */ u8 unk120B1;
/* 0x120B2 */ UNK_TYPE1 pad120B2[0x2E];
} MessageContext; // size = 0x120E0
typedef struct ActorBgMbarChair ActorBgMbarChair;
include/z64item.h
+1
View File
@@ -90,6 +90,7 @@ typedef enum {
/* 0x5C */ GI_POTION_GREEN,
/* 0x5D */ GI_POTION_BLUE,
/* 0x5E */ GI_FAIRY,
/* 0x60 */ GI_MILK_BOTTLE = 0x60,
/* 0x7E */ GI_MASK_ALL_NIGHT = 0x7E,
/* 0x8C */ GI_MASK_BREMEN = 0x8C,
/* 0x9B */ GI_SWORD_GREAT_FAIRY = 0x9B,
include/z64scene.h
+1 -1
View File
@@ -470,7 +470,7 @@ typedef struct {
typedef struct {
/* 0x00 */ u8 count; // number of points in the path
/* 0x01 */ s8 unk1;
/* 0x01 */ u8 unk1;
/* 0x02 */ s16 unk2;
/* 0x04 */ Vec3s* points; // Segment Address to the array of points
} Path; // size = 0x8