Clean up d_a_player_main function signatures

2026-07-07 21:30:47 -04:00 · 2023-10-17 13:55:02 -04:00
parent 22e83ee7f6
commit e73137de3e
20 changed files with 109 additions and 106 deletions
@@ -35,7 +35,7 @@ public:
    enum JPADrawVisitorDefFlags {};
    
    void initialize(JPABaseEmitter*, JPATextureResource*);
-    void draw(float(*)[4]);
+    void draw(MtxP);
    void calc();
    void calcParticle(JPABaseParticle*);
    void calcChild(JPABaseParticle*);
@@ -52,7 +52,7 @@ public:
    void zDraw();
    void zDrawParticle();
    void zDrawChild();
-    void loadYBBMtx(float(*)[4]);
+    void loadYBBMtx(MtxP);
    
    /* 0x00 */ JPADrawExecEmitterVisitor* mpExecEmtrVis[1];
    /* 0x04 */ JPADrawExecEmitterVisitor* mpExecEmtrPVis[5];
@@ -130,7 +130,7 @@ public:

 class daPy_mtxPosFollowEcallBack_c {
 public:
-    void makeEmitterColor(unsigned short, float(*)[4], const cXyz*, const csXyz*, const GXColor*, const GXColor*);
+    void makeEmitterColor(unsigned short, MtxP, const cXyz*, const csXyz*, const GXColor*, const GXColor*);
    void execute(JPABaseEmitter*);
    daPy_mtxPosFollowEcallBack_c();
    ~daPy_mtxPosFollowEcallBack_c();
@@ -140,8 +140,8 @@ public:

 class daPy_swBlur_c : public J3DPacket {
 public:
-    void initSwBlur(float(*)[4], int, float, int);
-    void copySwBlur(float(*)[4], int);
+    void initSwBlur(MtxP, int, float, int);
+    void copySwBlur(MtxP, int);
    void draw();
    ~daPy_swBlur_c();

@@ -1,5 +1,8 @@
 // Not sure what originally went in here but createHeap needs it for assert filenames

+#include "d/actor/d_a_bomb.h"
+#include "d/d_com_inf_game.h"
+
 bool daBomb_c::createHeap() {
    bool ret;
    if(mType == 1) {
@@ -71,7 +71,7 @@ void daPy_mtxFollowEcallBack_c::makeEmitter(u16 particleID, MtxP mtx, const cXyz
 }

 /* 80102C84-80102D14       .text makeEmitterColor__25daPy_mtxFollowEcallBack_cFUsPA4_fPC4cXyzPC8_GXColorPC8_GXColor */
-void daPy_mtxFollowEcallBack_c::makeEmitterColor(u16 particleID, MtxP mtx, const cXyz* pos, const _GXColor* prmColor, const _GXColor* envColor) {
+void daPy_mtxFollowEcallBack_c::makeEmitterColor(u16 particleID, MtxP mtx, const cXyz* pos, const GXColor* prmColor, const GXColor* envColor) {
    end();
    mpMtx = mtx;
    dComIfGp_particle_setP1(particleID, pos, NULL, NULL, 0xFF, this, -1, prmColor, envColor);
@@ -18,17 +18,17 @@ void daPy_lk_c::changeBottleDrinkFace(int) {
 }

 /* 80151E60-80152128       .text setBottleModel__9daPy_lk_cFUs */
-void daPy_lk_c::setBottleModel(unsigned short) {
+void daPy_lk_c::setBottleModel(u16) {
    /* Nonmatching */
 }

 /* 80152128-801521A0       .text makeFairy__9daPy_lk_cFP4cXyzUl */
-void daPy_lk_c::makeFairy(cXyz*, unsigned long) {
+void daPy_lk_c::makeFairy(cXyz*, u32) {
    /* Nonmatching */
 }

 /* 801521A0-80152300       .text procBottleDrink_init__9daPy_lk_cFUs */
-void daPy_lk_c::procBottleDrink_init(unsigned short) {
+void daPy_lk_c::procBottleDrink_init(u16) {
    /* Nonmatching */
 }

@@ -38,7 +38,7 @@ void daPy_lk_c::procBottleDrink() {
 }

 /* 80152624-801527CC       .text procBottleOpen_init__9daPy_lk_cFUs */
-void daPy_lk_c::procBottleOpen_init(unsigned short) {
+void daPy_lk_c::procBottleOpen_init(u16) {
    /* Nonmatching */
 }

@@ -63,7 +63,7 @@ void daPy_lk_c::procClimbUpStart() {
 }

 /* 8013680C-8013693C       .text procClimbDownStart_init__9daPy_lk_cFs */
-void daPy_lk_c::procClimbDownStart_init(short) {
+void daPy_lk_c::procClimbDownStart_init(s16) {
    /* Nonmatching */
 }

@@ -43,7 +43,7 @@ void daPy_lk_c::crawlBgCheck(cXyz*, cXyz*) {
 }

 /* 801390B8-801392BC       .text checkCrawlSideWall__9daPy_lk_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs */
-void daPy_lk_c::checkCrawlSideWall(cXyz*, cXyz*, cXyz*, cXyz*, short*, short*) {
+void daPy_lk_c::checkCrawlSideWall(cXyz*, cXyz*, cXyz*, cXyz*, s16*, s16*) {
    /* Nonmatching */
 }

@@ -73,7 +73,7 @@ void daPy_lk_c::checkNotCrawlStand(cXyz*, cXyz*) {
 }

 /* 80139760-80139878       .text procCrawlMove_init__9daPy_lk_cFss */
-void daPy_lk_c::procCrawlMove_init(short, short) {
+void daPy_lk_c::procCrawlMove_init(s16, s16) {
    /* Nonmatching */
 }

@@ -93,7 +93,7 @@ void daPy_lk_c::procCrawlAutoMove() {
 }

 /* 8013A630-8013A7C4       .text procCrawlEnd_init__9daPy_lk_cFiss */
-void daPy_lk_c::procCrawlEnd_init(int, short, short) {
+void daPy_lk_c::procCrawlEnd_init(int, s16, s16) {
    /* Nonmatching */
 }

@@ -43,7 +43,7 @@ void daPy_lk_c::setShapeAngleToTalkActor() {
 }

 /* 8012D08C-8012D134       .text checkEndMessage__9daPy_lk_cFUl */
-void daPy_lk_c::checkEndMessage(unsigned long) {
+void daPy_lk_c::checkEndMessage(u32) {
    /* Nonmatching */
 }

@@ -103,7 +103,7 @@ void daPy_lk_c::dProcOpenTreasure() {
 }

 /* 8012E28C-8012E418       .text setGetItemSound__9daPy_lk_cFUsi */
-void daPy_lk_c::setGetItemSound(unsigned short, int) {
+void daPy_lk_c::setGetItemSound(u16, int) {
    /* Nonmatching */
 }

@@ -63,7 +63,7 @@ void daPy_lk_c::setSmallFanModel() {
 }

 /* 8014C0C0-8014C254       .text setParachuteFanModel__9daPy_lk_cFf */
-void daPy_lk_c::setParachuteFanModel(float) {
+void daPy_lk_c::setParachuteFanModel(f32) {
    /* Nonmatching */
 }

@@ -18,7 +18,7 @@ void daPy_lk_c::checkGrabSpecialHeavyState() {
 }

 /* 8013A890-8013A8B4       .text getGrabMissActor__9daPy_lk_cFv */
-void daPy_lk_c::getGrabMissActor() {
+fopAc_ac_c* daPy_lk_c::getGrabMissActor() {
    /* Nonmatching */
 }

@@ -88,7 +88,7 @@ void daPy_lk_c::procHangMove() {
 }

 /* 801357C0-80135874       .text procHangClimb_init__9daPy_lk_cFf */
-void daPy_lk_c::procHangClimb_init(float) {
+void daPy_lk_c::procHangClimb_init(f32) {
    /* Nonmatching */
 }

@@ -18,7 +18,7 @@ void daPy_lk_c::checkHookshotReturn() {
 }

 /* 8014ABA0-8014ABF4       .text setHookshotCarryOffset__9daPy_lk_cFUiPC4cXyz */
-void daPy_lk_c::setHookshotCarryOffset(unsigned int, const cXyz*) {
+BOOL daPy_lk_c::setHookshotCarryOffset(unsigned int, const cXyz*) {
    /* Nonmatching */
 }

@@ -26,22 +26,22 @@ void daPy_matAnm_c::calc(J3DMaterial*) const {
 }

 /* 80103074-801030BC       .text seStartOnlyReverb__9daPy_lk_cFUl */
-void daPy_lk_c::seStartOnlyReverb(unsigned long) {
+void daPy_lk_c::seStartOnlyReverb(u32) {
    /* Nonmatching */
 }

 /* 801030BC-80103104       .text seStartMapInfo__9daPy_lk_cFUl */
-void daPy_lk_c::seStartMapInfo(unsigned long) {
+void daPy_lk_c::seStartMapInfo(u32) {
    /* Nonmatching */
 }

 /* 80103104-8010314C       .text seStartSwordCut__9daPy_lk_cFUl */
-void daPy_lk_c::seStartSwordCut(unsigned long) {
+void daPy_lk_c::seStartSwordCut(u32) {
    /* Nonmatching */
 }

 /* 8010314C-801031A4       .text voiceStart__9daPy_lk_cFUl */
-void daPy_lk_c::voiceStart(unsigned long) {
+void daPy_lk_c::voiceStart(u32) {
    /* Nonmatching */
 }

@@ -88,7 +88,7 @@ void daPy_lk_c::jointBeforeCB(int, J3DTransformInfo*, Quaternion*) {
 }

 /* 80103A88-80103AAC       .text daPy_jointBeforeCallback__FUlUsP16J3DTransformInfoP10Quaternion */
-void daPy_jointBeforeCallback(unsigned long, unsigned short, J3DTransformInfo*, Quaternion*) {
+void daPy_jointBeforeCallback(u32, u16, J3DTransformInfo*, Quaternion*) {
    /* Nonmatching */
 }

@@ -98,7 +98,7 @@ void daPy_lk_c::jointAfterCB(int, J3DTransformInfo*, Quaternion*) {
 }

 /* 80103C1C-80103C40       .text daPy_jointAfterCallback__FUlUsP16J3DTransformInfoP10Quaternion */
-void daPy_jointAfterCallback(unsigned long, unsigned short, J3DTransformInfo*, Quaternion*) {
+void daPy_jointAfterCallback(u32, u16, J3DTransformInfo*, Quaternion*) {
    /* Nonmatching */
 }

@@ -133,22 +133,22 @@ void daPy_lk_c::setItemHeap() {
 }

 /* 80104240-80104280       .text setBlurPosResource__9daPy_lk_cFUs */
-void daPy_lk_c::setBlurPosResource(unsigned short) {
+void daPy_lk_c::setBlurPosResource(u16) {
    /* Nonmatching */
 }

 /* 80104280-80104364       .text getItemAnimeResource__9daPy_lk_cFUs */
-void daPy_lk_c::getItemAnimeResource(unsigned short) {
+void daPy_lk_c::getItemAnimeResource(u16) {
    /* Nonmatching */
 }

 /* 80104364-801043F0       .text getAnimeResource__9daPy_lk_cFP14daPy_anmHeap_cUsUl */
-void daPy_lk_c::getAnimeResource(daPy_anmHeap_c*, unsigned short, unsigned long) {
+void daPy_lk_c::getAnimeResource(daPy_anmHeap_c*, u16, u32) {
    /* Nonmatching */
 }

 /* 801043F0-801044E8       .text getUnderUpperAnime__9daPy_lk_cFPC15daPy_anmIndex_cPP15J3DAnmTransformPP15J3DAnmTransformiUl */
-void daPy_lk_c::getUnderUpperAnime(const daPy_anmIndex_c*, J3DAnmTransform**, J3DAnmTransform**, int, unsigned long) {
+void daPy_lk_c::getUnderUpperAnime(const daPy_anmIndex_c*, J3DAnmTransform**, J3DAnmTransform**, int, u32) {
    /* Nonmatching */
 }

@@ -158,7 +158,7 @@ void daPy_lk_c::setTextureAnimeResource(J3DAnmTexPattern*, int) {
 }

 /* 80104564-80104600       .text loadTextureAnimeResource__9daPy_lk_cFUli */
-void daPy_lk_c::loadTextureAnimeResource(unsigned long, int) {
+void daPy_lk_c::loadTextureAnimeResource(u32, int) {
    /* Nonmatching */
 }

@@ -178,12 +178,12 @@ void daPy_lk_c::checkNormalFace() {
 }

 /* 80104A08-80104E08       .text setTextureAnime__9daPy_lk_cFUsi */
-void daPy_lk_c::setTextureAnime(unsigned short, int) {
+void daPy_lk_c::setTextureAnime(u16, int) {
    /* Nonmatching */
 }

 /* 80104E08-80104EC8       .text setPriTextureAnime__9daPy_lk_cFUsi */
-void daPy_lk_c::setPriTextureAnime(unsigned short, int) {
+void daPy_lk_c::setPriTextureAnime(u16, int) {
    /* Nonmatching */
 }

@@ -193,7 +193,7 @@ void daPy_lk_c::resetPriTextureAnime() {
 }

 /* 80104F74-80105040       .text setDemoTextureAnime__9daPy_lk_cFUsUsiUs */
-void daPy_lk_c::setDemoTextureAnime(unsigned short, unsigned short, int, unsigned short) {
+void daPy_lk_c::setDemoTextureAnime(u16, u16, int, u16) {
    /* Nonmatching */
 }

@@ -208,7 +208,7 @@ void daPy_lk_c::setTextureScrollResource(J3DAnmTextureSRTKey*, int) {
 }

 /* 80105220-801052BC       .text loadTextureScrollResource__9daPy_lk_cFUli */
-void daPy_lk_c::loadTextureScrollResource(unsigned long, int) {
+void daPy_lk_c::loadTextureScrollResource(u32, int) {
    /* Nonmatching */
 }

@@ -218,17 +218,17 @@ void daPy_lk_c::playTextureAnime() {
 }

 /* 8010552C-8010558C       .text checkPlayerGuard__9daPy_lk_cCFv */
-void daPy_lk_c::checkPlayerGuard() const {
+BOOL daPy_lk_c::checkPlayerGuard() const {
    /* Nonmatching */
 }

 /* 8010558C-801056E4       .text setOutPower__9daPy_lk_cFfsi */
-void daPy_lk_c::setOutPower(float, short, int) {
+void daPy_lk_c::setOutPower(f32, s16, int) {
    /* Nonmatching */
 }

 /* 801056E4-80105814       .text checkSightLine__9daPy_lk_cFfP4cXyz */
-void daPy_lk_c::checkSightLine(float, cXyz*) {
+void daPy_lk_c::checkSightLine(f32, cXyz*) {
    /* Nonmatching */
 }

@@ -263,12 +263,12 @@ void daPy_lk_c::setDrawHandModel() {
 }

 /* 80106BD0-80106C40       .text entryDLSetLight__9daPy_lk_cFP8J3DModelUl */
-void daPy_lk_c::entryDLSetLight(J3DModel*, unsigned long) {
+void daPy_lk_c::entryDLSetLight(J3DModel*, u32) {
    /* Nonmatching */
 }

 /* 80106C40-80106CB0       .text updateDLSetLight__9daPy_lk_cFP8J3DModelUl */
-void daPy_lk_c::updateDLSetLight(J3DModel*, unsigned long) {
+void daPy_lk_c::updateDLSetLight(J3DModel*, u32) {
    /* Nonmatching */
 }

@@ -353,7 +353,7 @@ void daPy_lk_c::setDoStatus() {
 }

 /* 80108A9C-80108B08       .text getDirectionFromAngle__9daPy_lk_cFs */
-void daPy_lk_c::getDirectionFromAngle(short) {
+void daPy_lk_c::getDirectionFromAngle(s16) {
    /* Nonmatching */
 }

@@ -368,7 +368,7 @@ void daPy_lk_c::getDirectionFromCurrentAngle() {
 }

 /* 80108B68-80108D80       .text setNormalSpeedF__9daPy_lk_cFffff */
-void daPy_lk_c::setNormalSpeedF(float, float, float, float) {
+void daPy_lk_c::setNormalSpeedF(f32, f32, f32, f32) {
    /* Nonmatching */
 }

@@ -393,7 +393,7 @@ void daPy_lk_c::cancelItemUpperReadyAnime() {
 }

 /* 80109F4C-8010A204       .text checkBodyAngleX__9daPy_lk_cFs */
-void daPy_lk_c::checkBodyAngleX(short) {
+void daPy_lk_c::checkBodyAngleX(s16) {
    /* Nonmatching */
 }

@@ -408,7 +408,7 @@ void daPy_lk_c::setBodyAngleXReadyAnime() {
 }

 /* 8010A4D4-8010A96C       .text setSpeedAndAngleNormal__9daPy_lk_cFs */
-void daPy_lk_c::setSpeedAndAngleNormal(short) {
+void daPy_lk_c::setSpeedAndAngleNormal(s16) {
    /* Nonmatching */
 }

@@ -428,7 +428,7 @@ void daPy_lk_c::setSpeedAndAngleAtnActor() {
 }

 /* 8010AC8C-8010ACEC       .text setFrameCtrl__9daPy_lk_cFP12J3DFrameCtrlUcssff */
-void daPy_lk_c::setFrameCtrl(J3DFrameCtrl*, unsigned char, short, short, float, float) {
+void daPy_lk_c::setFrameCtrl(J3DFrameCtrl*, u8, s16, s16, f32, f32) {
    /* Nonmatching */
 }

@@ -438,17 +438,17 @@ void daPy_lk_c::checkAtnWaitAnime() {
 }

 /* 8010AD2C-8010B798       .text setBlendMoveAnime__9daPy_lk_cFf */
-void daPy_lk_c::setBlendMoveAnime(float) {
+void daPy_lk_c::setBlendMoveAnime(f32) {
    /* Nonmatching */
 }

 /* 8010B798-8010BB08       .text setBlendAtnBackMoveAnime__9daPy_lk_cFf */
-void daPy_lk_c::setBlendAtnBackMoveAnime(float) {
+void daPy_lk_c::setBlendAtnBackMoveAnime(f32) {
    /* Nonmatching */
 }

 /* 8010BB08-8010C010       .text setBlendAtnMoveAnime__9daPy_lk_cFf */
-void daPy_lk_c::setBlendAtnMoveAnime(float) {
+void daPy_lk_c::setBlendAtnMoveAnime(f32) {
    /* Nonmatching */
 }

@@ -458,7 +458,7 @@ void daPy_lk_c::setAnimeEquipSword(int) {
 }

 /* 8010C100-8010C158       .text setAnimeEquipSingleItem__9daPy_lk_cFUs */
-void daPy_lk_c::setAnimeEquipSingleItem(unsigned short) {
+void daPy_lk_c::setAnimeEquipSingleItem(u16) {
    /* Nonmatching */
 }

@@ -473,7 +473,7 @@ void daPy_lk_c::setAnimeUnequipSword() {
 }

 /* 8010C284-8010C3C0       .text setAnimeUnequipItem__9daPy_lk_cFUs */
-void daPy_lk_c::setAnimeUnequipItem(unsigned short) {
+void daPy_lk_c::setAnimeUnequipItem(u16) {
    /* Nonmatching */
 }

@@ -543,7 +543,7 @@ void daPy_lk_c::changeDragonShield(int) {
 }

 /* 8010CD34-8010CFB4       .text checkNewItemChange__9daPy_lk_cFUc */
-void daPy_lk_c::checkNewItemChange(unsigned char) {
+void daPy_lk_c::checkNewItemChange(u8) {
    /* Nonmatching */
 }

@@ -623,12 +623,12 @@ void daPy_lk_c::changeWaitProc() {
 }

 /* 80110028-8011029C       .text changeLandProc__9daPy_lk_cFf */
-void daPy_lk_c::changeLandProc(float) {
+void daPy_lk_c::changeLandProc(f32) {
    /* Nonmatching */
 }

 /* 8011029C-80110338       .text setDamagePoint__9daPy_lk_cFf */
-void daPy_lk_c::setDamagePoint(float) {
+void daPy_lk_c::setDamagePoint(f32) {
    /* Nonmatching */
 }

@@ -683,7 +683,7 @@ void daPy_lk_c::getDamageVec(dCcD_GObjInf*) {
 }

 /* 80111D64-80111E54       .text setOldRootQuaternion__9daPy_lk_cFsss */
-void daPy_lk_c::setOldRootQuaternion(short, short, short) {
+void daPy_lk_c::setOldRootQuaternion(s16, s16, s16) {
    /* Nonmatching */
 }

@@ -938,7 +938,7 @@ void daPy_lk_c::procSlip() {
 }

 /* 80114D2C-80114DE4       .text procSlideFront_init__9daPy_lk_cFs */
-void daPy_lk_c::procSlideFront_init(short) {
+void daPy_lk_c::procSlideFront_init(s16) {
    /* Nonmatching */
 }

@@ -948,7 +948,7 @@ void daPy_lk_c::procSlideFront() {
 }

 /* 80114EE8-80114FA0       .text procSlideBack_init__9daPy_lk_cFs */
-void daPy_lk_c::procSlideBack_init(short) {
+void daPy_lk_c::procSlideBack_init(s16) {
    /* Nonmatching */
 }

@@ -978,7 +978,7 @@ void daPy_lk_c::procSlideBackLand() {
 }

 /* 801152D0-80115478       .text procFrontRoll_init__9daPy_lk_cFf */
-void daPy_lk_c::procFrontRoll_init(float) {
+void daPy_lk_c::procFrontRoll_init(f32) {
    /* Nonmatching */
 }

@@ -1053,7 +1053,7 @@ void daPy_lk_c::procAutoJump() {
 }

 /* 801163D4-8011651C       .text procLand_init__9daPy_lk_cFfi */
-void daPy_lk_c::procLand_init(float, int) {
+void daPy_lk_c::procLand_init(f32, int) {
    /* Nonmatching */
 }

@@ -1073,7 +1073,7 @@ void daPy_lk_c::procLandDamage() {
 }

 /* 80116864-80116A38       .text procFall_init__9daPy_lk_cFif */
-void daPy_lk_c::procFall_init(int, float) {
+void daPy_lk_c::procFall_init(int, f32) {
    /* Nonmatching */
 }

@@ -1138,7 +1138,7 @@ void daPy_lk_c::procPolyDamage() {
 }

 /* 801177CC-80117EAC       .text procLargeDamage_init__9daPy_lk_cFiiss */
-void daPy_lk_c::procLargeDamage_init(int, int, short, short) {
+void daPy_lk_c::procLargeDamage_init(int, int, s16, s16) {
    /* Nonmatching */
 }

@@ -1148,7 +1148,7 @@ void daPy_lk_c::procLargeDamage() {
 }

 /* 8011810C-80118504       .text procLargeDamageUp_init__9daPy_lk_cFiiss */
-void daPy_lk_c::procLargeDamageUp_init(int, int, short, short) {
+void daPy_lk_c::procLargeDamageUp_init(int, int, s16, s16) {
    /* Nonmatching */
 }

@@ -1158,7 +1158,7 @@ void daPy_lk_c::procLargeDamageUp() {
 }

 /* 80118640-801189AC       .text procLargeDamageWall_init__9daPy_lk_cFiiss */
-void daPy_lk_c::procLargeDamageWall_init(int, int, short, short) {
+void daPy_lk_c::procLargeDamageWall_init(int, int, s16, s16) {
    /* Nonmatching */
 }

@@ -1208,7 +1208,7 @@ void daPy_lk_c::procIceSlipFall() {
 }

 /* 80119500-80119688       .text procIceSlipFallUp_init__9daPy_lk_cFiss */
-void daPy_lk_c::procIceSlipFallUp_init(int, short, short) {
+void daPy_lk_c::procIceSlipFallUp_init(int, s16, s16) {
    /* Nonmatching */
 }

@@ -1228,7 +1228,7 @@ void daPy_lk_c::procIceSlipAlmostFall() {
 }

 /* 80119864-801198E0       .text procBootsEquip_init__9daPy_lk_cFUs */
-void daPy_lk_c::procBootsEquip_init(unsigned short) {
+void daPy_lk_c::procBootsEquip_init(u16) {
    /* Nonmatching */
 }

@@ -1248,12 +1248,12 @@ void daPy_lk_c::procNotUse() {
 }

 /* 80119DA0-80119EBC       .text getGroundAngle__9daPy_lk_cFP13cBgS_PolyInfos */
-void daPy_lk_c::getGroundAngle(cBgS_PolyInfo*, short) {
+void daPy_lk_c::getGroundAngle(cBgS_PolyInfo*, s16) {
    /* Nonmatching */
 }

 /* 80119EBC-8011A508       .text setLegAngle__9daPy_lk_cFfiPsPs */
-void daPy_lk_c::setLegAngle(float, int, short*, short*) {
+void daPy_lk_c::setLegAngle(f32, int, s16*, s16*) {
    /* Nonmatching */
 }

@@ -1308,7 +1308,7 @@ void daPy_lk_c::setWorldMatrix() {
 }

 /* 8011D070-8011D0E4       .text setAtParam__9daPy_lk_cFUli11dCcG_At_SplUcUcUcf */
-void daPy_lk_c::setAtParam(unsigned long, int, dCcG_At_Spl, unsigned char, unsigned char, unsigned char, float) {
+void daPy_lk_c::setAtParam(u32, int, dCcG_At_Spl, u8, u8, u8, f32) {
    /* Nonmatching */
 }

@@ -1378,7 +1378,7 @@ void daPy_lk_c::checkFallCode() {
 }

 /* 80120724-80120BBC       .text startRestartRoom__9daPy_lk_cFUlifi */
-void daPy_lk_c::startRestartRoom(unsigned long, int, float, int) {
+void daPy_lk_c::startRestartRoom(u32, int, f32, int) {
    /* Nonmatching */
 }

@@ -1458,7 +1458,7 @@ void daPy_lk_c::createAnimeHeap(JKRSolidHeap**, daPy_lk_c::daPy_HEAP_TYPE) {
 }

 /* 80124A40-80124B30       .text initModel__9daPy_lk_cFPP8J3DModeliUl */
-void daPy_lk_c::initModel(J3DModel**, int, unsigned long) {
+void daPy_lk_c::initModel(J3DModel**, int, u32) {
    /* Nonmatching */
 }

@@ -1558,22 +1558,22 @@ void daPy_lk_c::resetSeAnime() {
 }

 /* 80127E08-8012821C       .text setMoveAnime__9daPy_lk_cFfffQ29daPy_lk_c8daPy_ANMQ29daPy_lk_c8daPy_ANMif */
-void daPy_lk_c::setMoveAnime(float, float, float, daPy_lk_c::daPy_ANM, daPy_lk_c::daPy_ANM, int, float) {
+void daPy_lk_c::setMoveAnime(f32, f32, f32, daPy_lk_c::daPy_ANM, daPy_lk_c::daPy_ANM, int, f32) {
    /* Nonmatching */
 }

 /* 8012821C-80128494       .text setSingleMoveAnime__9daPy_lk_cFQ29daPy_lk_c8daPy_ANMffsf */
-void daPy_lk_c::setSingleMoveAnime(daPy_lk_c::daPy_ANM, float, float, short, float) {
+void daPy_lk_c::setSingleMoveAnime(daPy_lk_c::daPy_ANM, f32, f32, s16, f32) {
    /* Nonmatching */
 }

 /* 80128494-801285F8       .text setActAnimeUpper__9daPy_lk_cFUsQ29daPy_lk_c10daPy_UPPERffsf */
-void daPy_lk_c::setActAnimeUpper(unsigned short, daPy_lk_c::daPy_UPPER, float, float, short, float) {
+void daPy_lk_c::setActAnimeUpper(u16, daPy_lk_c::daPy_UPPER, f32, f32, s16, f32) {
    /* Nonmatching */
 }

 /* 801285F8-801286C0       .text resetActAnimeUpper__9daPy_lk_cFQ29daPy_lk_c10daPy_UPPERf */
-void daPy_lk_c::resetActAnimeUpper(daPy_lk_c::daPy_UPPER, float) {
+void daPy_lk_c::resetActAnimeUpper(daPy_lk_c::daPy_UPPER, f32) {
    /* Nonmatching */
 }

@@ -1603,22 +1603,22 @@ BOOL daPy_lk_c::checkGrabWeapon(int) {
 }

 /* 80128988-801289A8       .text onDekuSpReturnFlg__9daPy_lk_cFUc */
-void daPy_lk_c::onDekuSpReturnFlg(unsigned char) {
+void daPy_lk_c::onDekuSpReturnFlg(u8) {
    /* Nonmatching */
 }

 /* 801289A8-80128AA4       .text changeTextureAnime__9daPy_lk_cFUsUsi */
-void daPy_lk_c::changeTextureAnime(unsigned short, unsigned short, int) {
+void daPy_lk_c::changeTextureAnime(u16, u16, int) {
    /* Nonmatching */
 }

 /* 80128AA4-80128B50       .text setThrowDamage__9daPy_lk_cFP4cXyzsffi */
-void daPy_lk_c::setThrowDamage(cXyz*, short, float, float, int) {
+BOOL daPy_lk_c::setThrowDamage(cXyz*, s16, f32, f32, int) {
    /* Nonmatching */
 }

 /* 80128B50-80128C10       .text setPlayerPosAndAngle__9daPy_lk_cFP4cXyzs */
-void daPy_lk_c::setPlayerPosAndAngle(cXyz*, short) {
+void daPy_lk_c::setPlayerPosAndAngle(cXyz*, s16) {
    /* Nonmatching */
 }

@@ -1628,7 +1628,7 @@ void daPy_lk_c::setPlayerPosAndAngle(cXyz*, csXyz*) {
 }

 /* 80128CE4-80128DC0       .text setPlayerPosAndAngle__9daPy_lk_cFPA4_f */
-void daPy_lk_c::setPlayerPosAndAngle(float(*)[4]) {
+void daPy_lk_c::setPlayerPosAndAngle(MtxP) {
    /* Nonmatching */
 }

@@ -1638,7 +1638,7 @@ void daPy_lk_c::endDemoMode() {
 }

 /* 80128F8C-8012901C       .text getBokoFlamePos__9daPy_lk_cFP4cXyz */
-void daPy_lk_c::getBokoFlamePos(cXyz*) {
+BOOL daPy_lk_c::getBokoFlamePos(cXyz*) {
    /* Nonmatching */
 }

@@ -13,12 +13,12 @@
 #include "d/actor/d_a_player_link.h"

 /* 8012901C-80129034       .text setup__24daPy_swimTailEcallBack_cFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
-void daPy_swimTailEcallBack_c::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {
+void daPy_swimTailEcallBack_c::setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8) {
    /* Nonmatching */
 }

 /* 80129034-801290D8       .text getMaxWaterY__24daPy_swimTailEcallBack_cFPQ29JGeometry8TVec3<f> */
-void daPy_swimTailEcallBack_c::getMaxWaterY(JGeometry::TVec3<float>*) {
+void daPy_swimTailEcallBack_c::getMaxWaterY(JGeometry::TVec3<f32>*) {
    /* Nonmatching */
 }

@@ -48,12 +48,12 @@ void daPy_sightPacket_c::setSight() {
 }

 /* 801296FC-801297F4       .text initSwBlur__13daPy_swBlur_cFPA4_fifi */
-void daPy_swBlur_c::initSwBlur(float(*)[4], int, float, int) {
+void daPy_swBlur_c::initSwBlur(MtxP, int, f32, int) {
    /* Nonmatching */
 }

 /* 801297F4-80129A78       .text copySwBlur__13daPy_swBlur_cFPA4_fi */
-void daPy_swBlur_c::copySwBlur(float(*)[4], int) {
+void daPy_swBlur_c::copySwBlur(MtxP, int) {
    /* Nonmatching */
 }

@@ -78,7 +78,7 @@ void daPy_followEcallBack_c::execute(JPABaseEmitter*) {
 }

 /* 80129F98-80129FA0       .text setup__22daPy_followEcallBack_cFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
-void daPy_followEcallBack_c::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {
+void daPy_followEcallBack_c::setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8) {
    /* Nonmatching */
 }

@@ -93,7 +93,7 @@ void daPy_waterDropEcallBack_c::execute(JPABaseEmitter*) {
 }

 /* 8012A040-8012A058       .text setup__25daPy_waterDropEcallBack_cFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
-void daPy_waterDropEcallBack_c::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {
+void daPy_waterDropEcallBack_c::setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8) {
    /* Nonmatching */
 }

@@ -103,7 +103,7 @@ void daPy_waterDropEcallBack_c::end() {
 }

 /* 8012A0B4-8012A0E0       .text makeEmitterColor__28daPy_mtxPosFollowEcallBack_cFUsPA4_fPC4cXyzPC5csXyzPC8_GXColorPC8_GXColor */
-void daPy_mtxPosFollowEcallBack_c::makeEmitterColor(unsigned short, float(*)[4], const cXyz*, const csXyz*, const _GXColor*, const _GXColor*) {
+void daPy_mtxPosFollowEcallBack_c::makeEmitterColor(u16, MtxP, const cXyz*, const csXyz*, const GXColor*, const GXColor*) {
    /* Nonmatching */
 }

@@ -198,6 +198,6 @@ void daPy_lk_c::endDamageEmitter() {
 }

 /* 8012CA44-8012CD60       .text setItemWaterEffect__9daPy_lk_cFP10fopAc_ac_cii */
-void daPy_lk_c::setItemWaterEffect(fopAc_ac_c*, int, int) {
+u32 daPy_lk_c::setItemWaterEffect(fopAc_ac_c*, int, int) {
    /* Nonmatching */
 }
@@ -23,7 +23,7 @@ void daPy_lk_c::freeRopeItem() {
 }

 /* 80142E0C-80142E98       .text checkRopeRoofHit__9daPy_lk_cFs */
-void daPy_lk_c::checkRopeRoofHit(short) {
+void daPy_lk_c::checkRopeRoofHit(s16) {
    /* Nonmatching */
 }

@@ -48,7 +48,7 @@ void daPy_lk_c::changeRopeToHangProc() {
 }

 /* 8014327C-80143694       .text checkRopeSwingWall__9daPy_lk_cFP4cXyzP4cXyzPsPf */
-void daPy_lk_c::checkRopeSwingWall(cXyz*, cXyz*, short*, float*) {
+void daPy_lk_c::checkRopeSwingWall(cXyz*, cXyz*, s16*, f32*) {
    /* Nonmatching */
 }

@@ -98,7 +98,7 @@ void daPy_lk_c::procRopeReady() {
 }

 /* 80144620-80144C58       .text procRopeSwing_init__9daPy_lk_cFP10fopAc_ac_cs */
-void daPy_lk_c::procRopeSwing_init(fopAc_ac_c*, short) {
+void daPy_lk_c::procRopeSwing_init(fopAc_ac_c*, s16) {
    /* Nonmatching */
 }

@@ -53,7 +53,7 @@ void daPy_lk_c::setShipRidePos(int) {
 }

 /* 801403E0-80140480       .text setShipAttentionAnmSpeed__9daPy_lk_cFf */
-void daPy_lk_c::setShipAttentionAnmSpeed(float) {
+void daPy_lk_c::setShipAttentionAnmSpeed(f32) {
    /* Nonmatching */
 }

@@ -48,22 +48,22 @@ void daPy_lk_c::getSwordBlurColor() {
 }

 /* 801555FC-80155694       .text setNormalCutAtParam__9daPy_lk_cFUc */
-void daPy_lk_c::setNormalCutAtParam(unsigned char) {
+void daPy_lk_c::setNormalCutAtParam(u8) {
    /* Nonmatching */
 }

 /* 80155694-8015572C       .text setFinishCutAtParam__9daPy_lk_cFUc */
-void daPy_lk_c::setFinishCutAtParam(unsigned char) {
+void daPy_lk_c::setFinishCutAtParam(u8) {
    /* Nonmatching */
 }

 /* 8015572C-801557C4       .text setExtraCutAtParam__9daPy_lk_cFUc */
-void daPy_lk_c::setExtraCutAtParam(unsigned char) {
+void daPy_lk_c::setExtraCutAtParam(u8) {
    /* Nonmatching */
 }

 /* 801557C4-8015585C       .text setExtraFinishCutAtParam__9daPy_lk_cFUc */
-void daPy_lk_c::setExtraFinishCutAtParam(unsigned char) {
+void daPy_lk_c::setExtraFinishCutAtParam(u8) {
    /* Nonmatching */
 }

@@ -88,7 +88,7 @@ void daPy_lk_c::changeCutReverseProc(daPy_lk_c::daPy_ANM) {
 }

 /* 80156034-80156198       .text procCutA_init__9daPy_lk_cFs */
-void daPy_lk_c::procCutA_init(short) {
+void daPy_lk_c::procCutA_init(s16) {
    /* Nonmatching */
 }

@@ -98,7 +98,7 @@ void daPy_lk_c::procCutA() {
 }

 /* 80156424-80156584       .text procCutF_init__9daPy_lk_cFs */
-void daPy_lk_c::procCutF_init(short) {
+void daPy_lk_c::procCutF_init(s16) {
    /* Nonmatching */
 }

@@ -108,7 +108,7 @@ void daPy_lk_c::procCutF() {
 }

 /* 80156828-80156984       .text procCutR_init__9daPy_lk_cFs */
-void daPy_lk_c::procCutR_init(short) {
+void daPy_lk_c::procCutR_init(s16) {
    /* Nonmatching */
 }

@@ -118,7 +118,7 @@ void daPy_lk_c::procCutR() {
 }

 /* 80156C10-80156D6C       .text procCutL_init__9daPy_lk_cFs */
-void daPy_lk_c::procCutL_init(short) {
+void daPy_lk_c::procCutL_init(s16) {
    /* Nonmatching */
 }

@@ -28,12 +28,12 @@ void daPy_lk_c::checkNpcStatus() {
 }

 /* 8014D8F4-8014D938       .text getTactPlayRightArmAnm__9daPy_lk_cFl */
-void daPy_lk_c::getTactPlayRightArmAnm(long) {
+void daPy_lk_c::getTactPlayRightArmAnm(s32) {
    /* Nonmatching */
 }

 /* 8014D938-8014D97C       .text getTactPlayLeftArmAnm__9daPy_lk_cFl */
-void daPy_lk_c::getTactPlayLeftArmAnm(long) {
+void daPy_lk_c::getTactPlayLeftArmAnm(s32) {
    /* Nonmatching */
 }

@@ -68,12 +68,12 @@ void daPy_lk_c::getTactNormalWait() const {
 }

 /* 8014DB00-8014DB2C       .text getTactMusic__9daPy_lk_cCFv */
-void daPy_lk_c::getTactMusic() const {
+int daPy_lk_c::getTactMusic() const {
    /* Nonmatching */
 }

 /* 8014DB2C-8014DB74       .text getTactTimerCancel__9daPy_lk_cCFv */
-void daPy_lk_c::getTactTimerCancel() const {
+int daPy_lk_c::getTactTimerCancel() const {
    /* Nonmatching */
 }

@@ -98,7 +98,7 @@ void daPy_lk_c::procTactWait() {
 }

 /* 8014E9A4-8014EBA0       .text procTactPlay_init__9daPy_lk_cFlii */
-void daPy_lk_c::procTactPlay_init(long, int, int) {
+void daPy_lk_c::procTactPlay_init(s32, int, int) {
    /* Nonmatching */
 }

@@ -18,7 +18,7 @@ void daPy_lk_c::checkJumpFlower() {
 }

 /* 8014F994-8014FA88       .text procVomitReady_init__9daPy_lk_cFsf */
-void daPy_lk_c::procVomitReady_init(short, float) {
+void daPy_lk_c::procVomitReady_init(s16, f32) {
    /* Nonmatching */
 }

@@ -13,7 +13,7 @@
 #include "d/actor/d_a_player_link.h"

 /* 8013707C-801371E0       .text setBlendWHideMoveAnime__9daPy_lk_cFf */
-void daPy_lk_c::setBlendWHideMoveAnime(float) {
+void daPy_lk_c::setBlendWHideMoveAnime(f32) {
    /* Nonmatching */
 }