mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-03 00:16:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

move / fix bunch of stuff (#133)

Browse Source 
* fix some class structures / d_event wip

* d_event wip

* move gamepad stuff

* move m_Do_main

* move d_bomb / partial m_Do_reset

* format

* remove asm

* add Z2SoundID enum

* move some Z2 classes

* fix

* move more Z2 stuff

* fix fopAc_ac_c more
This commit is contained in:
TakaRikka
2021-06-12 15:22:36 -07:00
committed by GitHub
parent c3a4305108
commit f5a4c44812
132 changed files with 6755 additions and 3217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_bomb.cpp
+11 -65
View File
@@ -6,75 +6,21 @@
#include "d/d_bomb.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
//
// Types:
//
struct fopAc_ac_c {};
struct dBomb_c {
/* 80031F94 */ void checkStateCarry();
/* 80031FCC */ void checkFlowerBombWait(fopAc_ac_c*);
/* 80031FF4 */ void checkWaterBomb(fopAc_ac_c*);
/* 8003201C */ void checkInsectBombMove(fopAc_ac_c*);
};
//
// Forward References:
//
extern "C" void checkStateCarry__7dBomb_cFv();
extern "C" void checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c();
extern "C" void checkWaterBomb__7dBomb_cFP10fopAc_ac_c();
extern "C" void checkInsectBombMove__7dBomb_cFP10fopAc_ac_c();
//
// External References:
//
//
// Declarations:
//
/* 80031F94-80031FCC 02C8D4 0038+00 0/0 0/0 5/5 .text checkStateCarry__7dBomb_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dBomb_c::checkStateCarry() {
nofralloc
#include "asm/d/d_bomb/checkStateCarry__7dBomb_cFv.s"
bool dBomb_c::checkStateCarry() {
return (fopAcM_checkCarryNow(&mActor) || fopAcM_checkHookCarryNow(&mActor) ||
fopAcM_GetParam(&mActor) == 2 || fopAcM_GetParam(&mActor) == 1);
}
#pragma pop
/* 80031FCC-80031FF4 02C90C 0028+00 0/0 0/0 1/1 .text checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dBomb_c::checkFlowerBombWait(fopAc_ac_c* param_0) {
nofralloc
#include "asm/d/d_bomb/checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c.s"
bool dBomb_c::checkFlowerBombWait(fopAc_ac_c* param_1) {
return (fopAcM_GetName(&mActor) == 0x221 && fopAcM_GetParam(&mActor) == 4);
}
#pragma pop
/* 80031FF4-8003201C 02C934 0028+00 0/0 0/0 1/1 .text checkWaterBomb__7dBomb_cFP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dBomb_c::checkWaterBomb(fopAc_ac_c* param_0) {
nofralloc
#include "asm/d/d_bomb/checkWaterBomb__7dBomb_cFP10fopAc_ac_c.s"
bool dBomb_c::checkWaterBomb(fopAc_ac_c* param_1) {
return (fopAcM_GetName(&mActor) == 0x221 && daNbomb_c::checkWaterBomb());
}
#pragma pop
/* 8003201C-80032044 02C95C 0028+00 0/0 0/0 1/1 .text checkInsectBombMove__7dBomb_cFP10fopAc_ac_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dBomb_c::checkInsectBombMove(fopAc_ac_c* param_0) {
nofralloc
#include "asm/d/d_bomb/checkInsectBombMove__7dBomb_cFP10fopAc_ac_c.s"
}
#pragma pop
bool dBomb_c::checkInsectBombMove(fopAc_ac_c* param_1) {
return (fopAcM_GetName(&mActor) == 0x221 && fopAcM_GetParam(&mActor) == 7);
}