diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-01-25 12:24:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 21:24:14 +0100 |
| commit | 612f26c132280da43ecfa5fa8c8cc32966f06eb6 (patch) | |
| tree | ac20d071712cf830ec526222c98d340d90721f77 /src/d/d_bomb.cpp | |
| parent | 6f4d068f1d7c5a9f25f1920e64e5b10dc29aea07 (diff) | |
d_kankyo_wether / d_eye_hl (#178)
* d_eye_hl / d_kankyo_wether wip
* more d_kankyo_wether + format
* remove asm
* some d_kankyo wip
* fix dccs vtable
* some m_Do_graphic / d_meter2_draw work
Diffstat (limited to 'src/d/d_bomb.cpp')
| -rw-r--r-- | src/d/d_bomb.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/d/d_bomb.cpp b/src/d/d_bomb.cpp index f025c00205..adf55dc467 100644 --- a/src/d/d_bomb.cpp +++ b/src/d/d_bomb.cpp @@ -4,6 +4,7 @@ // #include "d/d_bomb.h" +#include "d/d_procname.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" @@ -14,13 +15,13 @@ bool dBomb_c::checkStateCarry() { } bool dBomb_c::checkFlowerBombWait(fopAc_ac_c* param_1) { - return (fopAcM_GetName(&mActor) == 0x221 && fopAcM_GetParam(&mActor) == 4); + return (fopAcM_GetName(&mActor) == PROC_NBOMB && fopAcM_GetParam(&mActor) == 4); } bool dBomb_c::checkWaterBomb(fopAc_ac_c* param_1) { - return (fopAcM_GetName(&mActor) == 0x221 && daNbomb_c::checkWaterBomb()); + return (fopAcM_GetName(&mActor) == PROC_NBOMB && daNbomb_c::checkWaterBomb()); } bool dBomb_c::checkInsectBombMove(fopAc_ac_c* param_1) { - return (fopAcM_GetName(&mActor) == 0x221 && fopAcM_GetParam(&mActor) == 7); + return (fopAcM_GetName(&mActor) == PROC_NBOMB && fopAcM_GetParam(&mActor) == 7); }
\ No newline at end of file |