diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-10-19 01:54:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-19 11:54:22 +0300 |
| commit | 0652b2c7b3722e40ded1a34f8846b8ae9d8fa4eb (patch) | |
| tree | 39764176734667add46d3a1f73ac76eb2650792a /src/d/d_demo.cpp | |
| parent | abc4c6659ae6e9cab854ff05651c1ff119659bf6 (diff) | |
obj_Iceleaf almost done / d_a_alink work (#2217)
* obj_iceleaf almost done
* fix up d_a_alink procvars
* more d_a_alink work
* some d_a_alink error cleanup
* some more cleanup
Diffstat (limited to 'src/d/d_demo.cpp')
| -rw-r--r-- | src/d/d_demo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 5a5072bce2..d8dea7bc2b 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -1282,7 +1282,7 @@ extern "C" void __dt__15dDemo_ambient_cFv() { /* 80039528-80039678 033E68 0150+00 1/0 0/0 0/0 .text * JSGFindObject__14dDemo_system_cCFPPQ26JStage7TObjectPCcQ26JStage8TEObject */ -bool dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorName, +int dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorName, JStage::TEObject objType) const { if (mpObject == NULL) { return true; @@ -1491,10 +1491,10 @@ void dDemo_c::reset() { } /* 80039F1C-80039F9C 03485C 0080+00 1/0 0/0 0/0 .text emitter_create__16dDemo_particle_cFUl */ -void dDemo_particle_c::emitter_create(u32 param_0) { +JPABaseEmitter* dDemo_particle_c::emitter_create(u32 param_0) { cXyz tmp(0.0f, 0.0f, 0.0f); int stayNo = dComIfGp_roomControl_getStayNo(); - dComIfGp_particle_set(param_0, &tmp, NULL, NULL, 0xFF, NULL, stayNo, NULL, NULL, NULL); + return dComIfGp_particle_set(param_0, &tmp, NULL, NULL, 0xFF, NULL, stayNo, NULL, NULL, NULL); } @@ -1559,4 +1559,4 @@ SECTION_DEAD static char const* const stringBase_8037981E = "デモデータ再 SECTION_DEAD static char const* const pad_8037983E = "\0"; #pragma pop -/* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
\ No newline at end of file +/* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ |