diff options
| author | Pheenoh <pheenoh@gmail.com> | 2023-03-07 18:03:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 18:03:46 -0700 |
| commit | f31ab5ae0be3de6e0910b2d5942e33458be043ac (patch) | |
| tree | 4fbfdeda4e8bfac575a81ab9d4eaa79530ea35c5 /src/d/com | |
| parent | 6c2e18af70dcc392b49cacf77fdb6ff8a164c0a5 (diff) | |
Misc Changes (#306)
Diffstat (limited to 'src/d/com')
| -rw-r--r-- | src/d/com/d_com_inf_actor.cpp | 37 | ||||
| -rw-r--r-- | src/d/com/d_com_inf_game.cpp | 6 |
2 files changed, 12 insertions, 31 deletions
diff --git a/src/d/com/d_com_inf_actor.cpp b/src/d/com/d_com_inf_actor.cpp index aa1add6d11..e279f363f4 100644 --- a/src/d/com/d_com_inf_actor.cpp +++ b/src/d/com/d_com_inf_actor.cpp @@ -1,37 +1,18 @@ -// -// Generated By: dol2asm -// Translation Unit: d/com/d_com_inf_actor -// +/** + * d_com_inf_actor.cpp + * dolzel2 - Common Information For Actor + */ #include "d/com/d_com_inf_actor.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */]; - -// -// Declarations: -// /* ############################################################################################## */ /* 80450610-80450618 000090 0008+00 0/0 1/1 0/0 .sdata g_dComIfAc_gameInfo */ -SECTION_SDATA extern dComIfAc_info_c g_dComIfAc_gameInfo = { - 0, 0, +dComIfAc_info_c g_dComIfAc_gameInfo = { + 0, // field_0x0 + false, // mPause }; /* 80450618-80450620 000098 0004+04 0/0 2/2 7/7 .sdata g_dComIfGoat_gameInfo */ -SECTION_SDATA extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, +dComIfGoat_info_c g_dComIfGoat_gameInfo = { + 0, // field_0x0 }; diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index 4fe93340e5..dfe644d481 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -1591,7 +1591,7 @@ asm void dComIfGs_offZoneSwitch(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGs_isZoneSwitch(int param_0, int param_1) { +asm BOOL dComIfGs_isZoneSwitch(int param_0, int param_1) { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGs_isZoneSwitch__Fii.s" } @@ -1631,7 +1631,7 @@ asm BOOL dComIfGs_isOneZoneSwitch(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGs_isZoneItem(int param_0, int param_1) { +asm BOOL dComIfGs_isZoneItem(int param_0, int param_1) { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGs_isZoneItem__Fii.s" } @@ -1641,7 +1641,7 @@ asm void dComIfGs_isZoneItem(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGs_isOneZoneItem(int param_0, int param_1) { +asm BOOL dComIfGs_isOneZoneItem(int param_0, int param_1) { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGs_isOneZoneItem__Fii.s" } |