diff options
| author | Ryan Myers <ryan.p.myers@gmail.com> | 2023-12-21 10:52:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-21 12:52:51 -0300 |
| commit | 015ce283b47d5cd15b349bde600cb5b97e7247b7 (patch) | |
| tree | e0eb824c337a89dca4f82509c37078bacebda8b6 /include | |
| parent | 11197f6c28f3b96abd3be448811ab31474c646c3 (diff) | |
Match over 20 new funcs in sf 77e40 (#55)
* Match func_8007B9DC and func_8007BB14
* Remove macro and add debug notices
* Fix merge diff
* Match func_8007BC7C
* Match func_8007BCE8
* Match func_8007BDE0
* Match func_8007BE54 and an audio func func_8001A500
* Match func_8007BEE8
* Match func_8007BF64
* Match func_8007BFFC
* Match func_8007C088
* Match func_8007C120
* Match func_8007C1AC
* Match func_8007C250
* Fix merge from master
* Match func_8007C3B4
* Match func_8007C484 and func_8007C50C
* Match func_8007C608 and func_8007C688
* Match func_8007C6FC and func_8007C85C
* Match func_8007C8C4
* Add a progress script WIP
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 18 | ||||
| -rw-r--r-- | include/hud.h | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/include/functions.h b/include/functions.h index 6c2dec96..5924e14b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -23,7 +23,9 @@ u8* func_8001C3EC(void); void func_80016A50(void); void func_800182F4(s32); void func_80019218(u32, Vec3f*, u8, f32*, f32*, s8*); -void func_8001A500(Vec3f*); +void func_80019290(s32, Vec3f**); +void func_8001A38C(u8, Vec3f*); +void func_8001A500(Vec3f* sfxPos); void func_8001A55C(Vec3f*, u32); void func_8001A838(u32); void func_8001ACDC(s32); @@ -196,7 +198,7 @@ void func_80060968(void); void func_80060F30(Vec3f* , u32 , s32 ); void Object_Kill(Object*, Vec3f*); s32 func_80060FE4(Vec3f*, f32); -void Object_SetInfo(ObjectInfo*, u32); +void Object_SetInfo(ObjectInfo* info, u32 objId); void Object_80_Initialize(Object_80*); void Object_4C_Initialize(Object_4C*); void Object_2F4_Initialize(Object_2F4*); @@ -348,19 +350,20 @@ void func_8007B67C(Object_8C*); void func_8007B758(Object_8C*); void func_8007B8F8(f32 posX, f32 posY, f32 posZ, f32 ); void func_8007B960(Object_8C*); -void func_8007BC7C(f32, f32, f32, f32); +void func_8007BC7C(f32 posX, f32 posY, f32 posZ, f32); void func_8007BCE8(Object_8C*); void func_8007B9DC(Object_8C*); void func_8007BDE0(Object_8C*); void func_8007BE54(Object_8C*); void func_8007BEE8(Object_8C*); -void func_8007BFFC(f32, f32, f32, f32, f32, f32, f32, s32); -void func_8007C120(f32, f32, f32, f32, f32, f32, f32, s32); +void func_8007BFFC(f32 posX, f32 posY, f32 posZ, f32 x, f32 y, f32 z, f32 arg6, s32 arg7); +void func_8007C120(f32 posX, f32 posY, f32 posZ, f32 x, f32 y, f32 z, f32 arg6, s32 arg7); void func_8007C250(Object_8C*); -void func_8007C484(f32, f32, f32, f32, f32, f32, f32, s32); +void func_8007C484(f32 posX, f32 posY, f32 posZ, f32 x, f32 y, f32 z, f32 arg6, s32 arg7); void func_8007C50C(Object_8C*); -void func_8007C688(f32 , f32 , f32 , f32 , s32 ); +void func_8007C688(f32 posX, f32 posY, f32 posZ, f32 arg3, s32 arg4); void func_8007C8C4(Object_8C*); +void func_8007C85C(f32 posX, f32 posY, f32 posZ, f32 arg3); void func_8007C9E0(Object_8C*); void func_8007CAF0(Object_8C*); void func_8007D074(f32, f32, f32, f32); @@ -483,6 +486,7 @@ s32 Play_GetMaxShields(void); void func_800A5844(void); void func_800A5D6C(void); void func_800A5FA0(Vec3f* , u32 , s32 ); +void func_800A6070(Vec3f* arg0, u32 arg1); void func_800A6148(void); void func_800A69F8(s32 , f32 , f32 , f32 ); void func_800A6CD0(Player *, s32, s32); diff --git a/include/hud.h b/include/hud.h index 9960b993..77d658d5 100644 --- a/include/hud.h +++ b/include/hud.h @@ -55,7 +55,7 @@ extern s32 D_1011E60[]; extern s32 D_1013580[]; extern s32 D_1013700[]; extern s32 D_20031B0[]; -extern s32 D_2010A30[]; +extern Gfx D_2010A30[]; extern u16 D_3000B20[]; extern u16 D_30013E0[]; |