diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2023-01-15 11:10:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-15 12:10:23 -0700 |
| commit | 5e05ae38f8541fddd79341bdcf75488b07ca9122 (patch) | |
| tree | 57e2806b6e48586e0d9bbde6d221236888137d04 /src/c | |
| parent | c90f9dfde9a3ee5dfa13475e2199ee491671507b (diff) | |
d_a_b_oh2 / d_a_obj_web0 / d_a_obj_web1 (#243)
* d_a_obj_web0 / d_a_obj_web1
* remove asm
* d_a_set_bgobj
* d_cc_s work
* remove asm
* build fix
* fix tp.py progress check and rel sha1 check
* clean up some bg files
Diffstat (limited to 'src/c')
| -rw-r--r-- | src/c/c_damagereaction.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 2b04c61fcb..5a87192790 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -56,6 +56,17 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; // /* ############################################################################################## */ +/* 80450C98-80450C9C -00001 0004+00 0/0 0/0 50/50 .sbss None */ +extern u8 struct_80450C98[4]; +u8 struct_80450C98[4]; + +/* 80450C9C-80450CA0 -00001 0004+00 0/0 0/0 6/6 .sbss None */ +#pragma push +#pragma force_active on +u8 cDmr_SkipInfo; +#pragma pop + +/* ############################################################################################## */ /* 80451BA8-80451BAC 0001A8 0004+00 1/1 0/0 0/0 .sdata2 @3731 */ SECTION_SDATA2 static f32 lit_3731 = 25.0f; @@ -97,7 +108,7 @@ void JPTraceParticleCallBack4::draw(JPABaseEmitter* param_0, JPABaseParticle* pa #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cDmrNowMidnaTalk() { +asm BOOL cDmrNowMidnaTalk() { nofralloc #include "asm/c/c_damagereaction/cDmrNowMidnaTalk__Fv.s" } |