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

Copy over previous WIP

Browse Source
This commit is contained in:
engineer124
2021-12-23 03:07:18 +11:00
parent 47a5b153a1
commit affc00ae74
6 changed files with 1044 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+6 -6
View File
@@ -2043,12 +2043,12 @@ Vec3f* OLib_Vec3fDiffDegF(Vec3f* dest, Vec3f* a, Vec3f* b);
Vec3s* OLib_Vec3fDiffBinAng(Vec3s* dest, Vec3f* a, Vec3f* b);
void OLib_DbCameraVec3fDiff(PosRot* a, Vec3f* b, Vec3f* dest, s16 mode);
void OLib_DbCameraVec3fSum(PosRot* a, Vec3f* b, Vec3f* dest, s16 mode);
// void func_8010CB80(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10);
// void func_8010CD98(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10);
// void Gfx_TextureRGBA16(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10);
// void Gfx_TextureIA8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10);
// void func_8010CFBC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10, UNK_TYPE2 param_11, UNK_TYPE2 param_12, UNK_TYPE2 param_13, UNK_TYPE2 param_14);
// void func_8010D2D4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10, UNK_TYPE2 param_11);
// void func_8010D480(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10, UNK_TYPE2 param_11, UNK_TYPE2 param_12, UNK_TYPE2 param_13, UNK_TYPE2 param_14, UNK_TYPE4 param_15, UNK_TYPE4 param_16);
// void func_8010D7D0(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10);
// void Gfx_TextureI8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10);
// void func_8010D9F4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE4 param_10, UNK_TYPE4 param_11, UNK_TYPE4 param_12, UNK_TYPE2 param_13, UNK_TYPE2 param_14);
// void func_8010DC58(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5);
// void func_8010DE38(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
@@ -2068,7 +2068,7 @@ void Interface_ChangeAlpha(u16 param_1);
// void func_80111CB4(void);
// void func_801129E4(void);
void func_80112AFC(GlobalContext* globalCtx);
void func_80112B40(GlobalContext* globalCtx, s32 arg1);
void Interface_LoadItemIcon(GlobalContext* globalCtx, u8 arg1);
// void func_80112BE4(void);
// void func_80112C0C(void);
u32 Item_Give(GlobalContext* globalCtx, u8 param_2);
@@ -2120,11 +2120,11 @@ void func_8011C808(GlobalContext* globalCtx);
// void func_8011CA64(void);
// void func_8011E3B4(void);
// void func_8011E730(void);
// void func_8011F0E0(UNK_TYPE4 ctxt);
// void Interface_Draw(UNK_TYPE4 ctxt);
// void func_80120F90(void);
// void func_80121000(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_TYPE1 param_8, UNK_TYPE1 param_9, UNK_TYPE1 param_10, UNK_TYPE4 param_11, UNK_TYPE4 param_12, UNK_TYPE4 param_13, UNK_TYPE4 param_14);
// void func_80121064(void);
// void func_801210E0(void);
// void Interface_Update(void);
// void func_80121F94(void);
void func_80121FC4(GlobalContext* globalCtx);
Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max);
include/z64.h
+1 -1
View File
@@ -679,7 +679,7 @@ typedef struct {
/* 0x30A */ s16 unk_30A;
/* 0x30C */ s16 unk_30C;
struct {
/* 0x30E */ u8 unk_30E; // "h_gauge"
/* 0x30E */ u8 hGauge;
/* 0x30F */ u8 bButton;
/* 0x310 */ u8 aButton;
/* 0x311 */ u8 tradeItems;
src/code/z_parameter.c
+1024 -33
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
+1 -1
View File
@@ -732,7 +732,7 @@ void func_80B41E18(EnKgy* this, GlobalContext* globalCtx) {
this->actor.textId = 0xC43;
CUR_FORM_EQUIP(EQUIP_SLOT_B) = ITEM_NONE;
TAKE_EQUIPPED_ITEM(EQUIP_SWORD);
func_80112B40(globalCtx, 0);
Interface_LoadItemIcon(globalCtx, 0);
func_80B40C74(globalCtx);
break;
tools/disasm/functions.txt
+6 -6
View File
@@ -2083,12 +2083,12 @@
0x8010C930:("OLib_Vec3fDiffBinAng",),
0x8010C9C8:("OLib_DbCameraVec3fDiff",),
0x8010CAA0:("OLib_DbCameraVec3fSum",),
0x8010CB80:("func_8010CB80",),
0x8010CD98:("func_8010CD98",),
0x8010CB80:("Gfx_TextureRGBA16",),
0x8010CD98:("Gfx_TextureIA8",),
0x8010CFBC:("func_8010CFBC",),
0x8010D2D4:("func_8010D2D4",),
0x8010D480:("func_8010D480",),
0x8010D7D0:("func_8010D7D0",),
0x8010D7D0:("Gfx_TextureI8",),
0x8010D9F4:("func_8010D9F4",),
0x8010DC58:("func_8010DC58",),
0x8010DE38:("func_8010DE38",),
@@ -2109,7 +2109,7 @@
0x801129E4:("func_801129E4",),
0x80112AF4:("func_80112AF4",),
0x80112AFC:("func_80112AFC",),
0x80112B40:("func_80112B40",),
0x80112B40:("Interface_LoadItemIcon",),
0x80112BE4:("func_80112BE4",),
0x80112C0C:("func_80112C0C",),
0x80112E80:("Item_Give",),
@@ -2161,10 +2161,10 @@
0x8011CA64:("func_8011CA64",),
0x8011E3B4:("func_8011E3B4",),
0x8011E730:("func_8011E730",),
0x8011F0E0:("func_8011F0E0",),
0x8011F0E0:("Interface_Draw",),
0x80120F90:("func_80120F90",),
0x80121064:("func_80121064",),
0x801210E0:("func_801210E0",),
0x801210E0:("Interface_Update",),
0x80121F94:("func_80121F94",),
0x80121FC4:("func_80121FC4",),
0x801224E0:("Path_GetByIndex",),
tools/sizes/code_functions.csv
+6 -6
View File
@@ -1597,12 +1597,12 @@ asm/non_matchings/code/z_olib/OLib_Vec3fDiffDegF.s,OLib_Vec3fDiffDegF,0x8010C8C8
asm/non_matchings/code/z_olib/OLib_Vec3fDiffBinAng.s,OLib_Vec3fDiffBinAng,0x8010C930,0x26
asm/non_matchings/code/z_olib/OLib_DbCameraVec3fDiff.s,OLib_DbCameraVec3fDiff,0x8010C9C8,0x36
asm/non_matchings/code/z_olib/OLib_DbCameraVec3fSum.s,OLib_DbCameraVec3fSum,0x8010CAA0,0x34
asm/non_matchings/code/z_parameter/func_8010CB80.s,func_8010CB80,0x8010CB80,0x86
asm/non_matchings/code/z_parameter/func_8010CD98.s,func_8010CD98,0x8010CD98,0x89
asm/non_matchings/code/z_parameter/Gfx_TextureRGBA16.s,Gfx_TextureRGBA16,0x8010CB80,0x86
asm/non_matchings/code/z_parameter/Gfx_TextureIA8.s,Gfx_TextureIA8,0x8010CD98,0x89
asm/non_matchings/code/z_parameter/func_8010CFBC.s,func_8010CFBC,0x8010CFBC,0xC6
asm/non_matchings/code/z_parameter/func_8010D2D4.s,func_8010D2D4,0x8010D2D4,0x6B
asm/non_matchings/code/z_parameter/func_8010D480.s,func_8010D480,0x8010D480,0xD4
asm/non_matchings/code/z_parameter/func_8010D7D0.s,func_8010D7D0,0x8010D7D0,0x89
asm/non_matchings/code/z_parameter/Gfx_TextureI8.s,Gfx_TextureI8,0x8010D7D0,0x89
asm/non_matchings/code/z_parameter/func_8010D9F4.s,func_8010D9F4,0x8010D9F4,0x99
asm/non_matchings/code/z_parameter/func_8010DC58.s,func_8010DC58,0x8010DC58,0x78
asm/non_matchings/code/z_parameter/func_8010DE38.s,func_8010DE38,0x8010DE38,0x7C
@@ -1623,7 +1623,7 @@ asm/non_matchings/code/z_parameter/func_80111CB4.s,func_80111CB4,0x80111CB4,0x34
asm/non_matchings/code/z_parameter/func_801129E4.s,func_801129E4,0x801129E4,0x44
asm/non_matchings/code/z_parameter/func_80112AF4.s,func_80112AF4,0x80112AF4,0x2
asm/non_matchings/code/z_parameter/func_80112AFC.s,func_80112AFC,0x80112AFC,0x11
asm/non_matchings/code/z_parameter/func_80112B40.s,func_80112B40,0x80112B40,0x29
asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s,Interface_LoadItemIcon,0x80112B40,0x29
asm/non_matchings/code/z_parameter/func_80112BE4.s,func_80112BE4,0x80112BE4,0xA
asm/non_matchings/code/z_parameter/func_80112C0C.s,func_80112C0C,0x80112C0C,0x9D
asm/non_matchings/code/z_parameter/Item_Give.s,Item_Give,0x80112E80,0x553
@@ -1675,10 +1675,10 @@ asm/non_matchings/code/z_parameter/func_8011C898.s,func_8011C898,0x8011C898,0x73
asm/non_matchings/code/z_parameter/func_8011CA64.s,func_8011CA64,0x8011CA64,0x654
asm/non_matchings/code/z_parameter/func_8011E3B4.s,func_8011E3B4,0x8011E3B4,0xDF
asm/non_matchings/code/z_parameter/func_8011E730.s,func_8011E730,0x8011E730,0x26C
asm/non_matchings/code/z_parameter/func_8011F0E0.s,func_8011F0E0,0x8011F0E0,0x7AC
asm/non_matchings/code/z_parameter/Interface_Draw.s,Interface_Draw,0x8011F0E0,0x7AC
asm/non_matchings/code/z_parameter/func_80120F90.s,func_80120F90,0x80120F90,0x35
asm/non_matchings/code/z_parameter/func_80121064.s,func_80121064,0x80121064,0x1F
asm/non_matchings/code/z_parameter/func_801210E0.s,func_801210E0,0x801210E0,0x3AD
asm/non_matchings/code/z_parameter/Interface_Update.s,Interface_Update,0x801210E0,0x3AD
asm/non_matchings/code/z_parameter/func_80121F94.s,func_80121F94,0x80121F94,0xC
asm/non_matchings/code/z_parameter/func_80121FC4.s,func_80121FC4,0x80121FC4,0x147
asm/non_matchings/code/z_path/func_801224E0.s,func_801224E0,0x801224E0,0x11
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
1597 asm/non_matchings/code/z_olib/OLib_Vec3fDiffBinAng.s OLib_Vec3fDiffBinAng 0x8010C930 0x26
1598 asm/non_matchings/code/z_olib/OLib_DbCameraVec3fDiff.s OLib_DbCameraVec3fDiff 0x8010C9C8 0x36
1599 asm/non_matchings/code/z_olib/OLib_DbCameraVec3fSum.s OLib_DbCameraVec3fSum 0x8010CAA0 0x34
1600 asm/non_matchings/code/z_parameter/func_8010CB80.s asm/non_matchings/code/z_parameter/Gfx_TextureRGBA16.s func_8010CB80 Gfx_TextureRGBA16 0x8010CB80 0x86
1601 asm/non_matchings/code/z_parameter/func_8010CD98.s asm/non_matchings/code/z_parameter/Gfx_TextureIA8.s func_8010CD98 Gfx_TextureIA8 0x8010CD98 0x89
1602 asm/non_matchings/code/z_parameter/func_8010CFBC.s func_8010CFBC 0x8010CFBC 0xC6
1603 asm/non_matchings/code/z_parameter/func_8010D2D4.s func_8010D2D4 0x8010D2D4 0x6B
1604 asm/non_matchings/code/z_parameter/func_8010D480.s func_8010D480 0x8010D480 0xD4
1605 asm/non_matchings/code/z_parameter/func_8010D7D0.s asm/non_matchings/code/z_parameter/Gfx_TextureI8.s func_8010D7D0 Gfx_TextureI8 0x8010D7D0 0x89
1606 asm/non_matchings/code/z_parameter/func_8010D9F4.s func_8010D9F4 0x8010D9F4 0x99
1607 asm/non_matchings/code/z_parameter/func_8010DC58.s func_8010DC58 0x8010DC58 0x78
1608 asm/non_matchings/code/z_parameter/func_8010DE38.s func_8010DE38 0x8010DE38 0x7C
1623 asm/non_matchings/code/z_parameter/func_801129E4.s func_801129E4 0x801129E4 0x44
1624 asm/non_matchings/code/z_parameter/func_80112AF4.s func_80112AF4 0x80112AF4 0x2
1625 asm/non_matchings/code/z_parameter/func_80112AFC.s func_80112AFC 0x80112AFC 0x11
1626 asm/non_matchings/code/z_parameter/func_80112B40.s asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s func_80112B40 Interface_LoadItemIcon 0x80112B40 0x29
1627 asm/non_matchings/code/z_parameter/func_80112BE4.s func_80112BE4 0x80112BE4 0xA
1628 asm/non_matchings/code/z_parameter/func_80112C0C.s func_80112C0C 0x80112C0C 0x9D
1629 asm/non_matchings/code/z_parameter/Item_Give.s Item_Give 0x80112E80 0x553
1675 asm/non_matchings/code/z_parameter/func_8011CA64.s func_8011CA64 0x8011CA64 0x654
1676 asm/non_matchings/code/z_parameter/func_8011E3B4.s func_8011E3B4 0x8011E3B4 0xDF
1677 asm/non_matchings/code/z_parameter/func_8011E730.s func_8011E730 0x8011E730 0x26C
1678 asm/non_matchings/code/z_parameter/func_8011F0E0.s asm/non_matchings/code/z_parameter/Interface_Draw.s func_8011F0E0 Interface_Draw 0x8011F0E0 0x7AC
1679 asm/non_matchings/code/z_parameter/func_80120F90.s func_80120F90 0x80120F90 0x35
1680 asm/non_matchings/code/z_parameter/func_80121064.s func_80121064 0x80121064 0x1F
1681 asm/non_matchings/code/z_parameter/func_801210E0.s asm/non_matchings/code/z_parameter/Interface_Update.s func_801210E0 Interface_Update 0x801210E0 0x3AD
1682 asm/non_matchings/code/z_parameter/func_80121F94.s func_80121F94 0x80121F94 0xC
1683 asm/non_matchings/code/z_parameter/func_80121FC4.s func_80121FC4 0x80121FC4 0x147
1684 asm/non_matchings/code/z_path/func_801224E0.s func_801224E0 0x801224E0 0x11