diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2026-01-17 05:44:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-17 15:44:37 +0200 |
| commit | b1f44ce5322d0844758bebd487b3f3f5c0363823 (patch) | |
| tree | fb47f2c7f115b2cb51c06223d46784da43e9fe56 /src/d/d_demo.cpp | |
| parent | 93dcac33431a9f279623d25ff2065def5b2b5eec (diff) | |
d_a_alink cleanup / debug work (#3045)
* start d_a_alink debug cleanup
* d_a_alink_damage debug
* d_a_alink_guard debug
* d_a_alink_bow debug
* d_a_alink_boom debug
* d_a_alink_copyrod debug
* d_a_alink_hvyboots debug
* d_a_alink_grab debug
* d_a_alink_sumou debug
* d_a_alink_horse debug
* d_a_alink_canoe debug
* d_a_alink_crawl / d_a_alink_hang debug
* d_a_alink_swim debug
* d_a_alink_hook / d_a_alink_iceleaf debug
* d_a_alink_bottle debug
* d_a_alink_whistle / d_a_alink_kandelaar / d_a_alink_ironball debug
* d_a_alink_demo debug
* d_a_alink_effect debug
* d_a_alink_wolf debug
* d_a_alink debug / cleanup
* cleanup button status enums
Diffstat (limited to 'src/d/d_demo.cpp')
| -rw-r--r-- | src/d/d_demo.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index b4433c5e02..2a7c74f40b 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -193,8 +193,8 @@ u16 dDemo_c::m_branchType; const u8* dDemo_c::m_branchData; -int dDemo_actor_c::getDemoIDData(int* param_0, int* param_1, int* param_2, u16* param_3, - u8* param_4) { +int dDemo_actor_c::getDemoIDData(int* o_arg0, int* o_arg1, int* o_arg2, u16* o_resID, + u8* param_4) { JStudio::stb::TParseData_fixed<51, TValueIterator_misaligned<u32> > data(getPrm()->getData()); static JStudio::stb::TParseData_fixed<51, TValueIterator_misaligned<u32> > dummy; @@ -210,10 +210,10 @@ int dDemo_actor_c::getDemoIDData(int* param_0, int* param_1, int* param_2, u16* } u32 var_r31 = *it; - *param_0 = var_r31 >> 0x1E; - *param_1 = (var_r31 >> 0x18) & 0xF; - *param_2 = (var_r31 >> 0x10) & 0xF; - *param_3 = var_r31 & 0xFFFF; + *o_arg0 = var_r31 >> 0x1E; + *o_arg1 = (var_r31 >> 0x18) & 0xF; + *o_arg2 = (var_r31 >> 0x10) & 0xF; + *o_resID = var_r31 & 0xFFFF; if (param_4 != NULL) { *param_4 = (var_r31 >> 0x17) & 1; @@ -224,7 +224,7 @@ int dDemo_actor_c::getDemoIDData(int* param_0, int* param_1, int* param_2, u16* } #if DEBUG -s16 dDemo_c::m_branchNum = 0; +u16 dDemo_c::m_branchNum = 0; #endif static void* dDemo_getJaiPointer(char const* arcName, u32 anmID, int param_2, u16* param_3) { |