Commit Graph

66 Commits

Author SHA1 Message Date
Max Roncace bb061a1225 Merge remote-tracking branch 'decomp/main' 2026-03-18 01:56:47 -04:00
TakaRikka dee722dab5 cc debug work (#3133) 2026-03-17 22:48:37 -07:00
PJB3005 883ba38bb8 Switch to Aurora headers for GX/VI
Replace GXSetArray() with GXSETARRAY() taking in size everywhere

Fix a ton of structs/enums being referred to with underscore name.
2026-03-02 12:00:53 +01:00
Luke Street 38b7156a8e Another round of GCC fixes (#3115)
* Fix remaining <string> -> <cstring> for GCC compilation (#3114 follow-up)

MWerks' <string> header transitively includes C string functions
(memcpy, strlen, strcmp, etc.), but GCC/Clang's <string> is the C++
std::string header. These files all use C string functions and should
include <cstring> instead.

* Use std::isnan instead of isnan for GCC compilation

GCC's <cmath> places isnan in the std namespace. Using the unqualified
isnan fails to compile with GCC/Clang.

* Fix cCcD_Src types: s32 -> u32 for bitmask fields

cCcD_SrcObjCommonBase::mSPrm, cCcD_SrcObjTg::mType, and
cCcD_SrcObjAt::mType are used as bitmasks (SetType/SetSPrm take u32,
MskType/MskSPrm use u32, values like 0xFFFFFFFF are common in
aggregate inits). Change from s32 to u32 to match usage.

Also fix AT_TYPE_WOLF_ATTACK/AT_TYPE_UNK to use unsigned literals,
and remove now-unnecessary (s32) casts on hex literals in collision
source data.

* Mark dummy() functions as static to avoid multiple definition errors

These decomp artifact functions have the same name and signature across
TUs, causing linker errors when building as a single binary.
2026-02-28 13:35:07 -08:00
Luke Street b7961b7739 Fix compilation errors after decomp/main merge
- Fix <string> -> <cstring> across all source files (upstream fix)
- Add <cstring> to JASGadget.h, <cstdarg> to JUTDbPrint.cpp
- Fix <string> -> <cstring> in JUTFont.h, d_save.h, f_ap_game.h
- Fix std::isnan usage in c_cc_d.cpp
- Fix cCcD_Src types: s32 -> u32 for bitmask fields (upstream fix)
- Fix AT_TYPE_WOLF_ATTACK/AT_TYPE_UNK unsigned literals (upstream fix)
- Remove (s32) casts on hex literals in collision data (upstream fix)
- Fix 0xFFFFFFFF literal in d_a_obj_wood_statue.cpp (upstream fix)
- Add braces to case 0 in d_a_e_gb.cpp to fix jump-over-init
- Fix Z2AudioCS.h include path (Z2AudioLib -> Z2AudioCS)
- Forward-declare Z2AudioCS in stubs.cpp to avoid revolution conflicts
- Guard JASGlobalInstance specializations with __MWERKS__ in m_Do_main
- Remove duplicate inline functions from d_com_inf_game.h
- Mark dummy() functions as static (upstream fix)
- Add JAUSectionHeap.h include to m_Do_main.cpp
2026-02-28 14:29:46 -07:00
TakaRikka ccdb3fbd2a 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
2026-01-17 15:44:37 +02:00
hatal175 798ba743a0 Work on d_cc_d debug (#3002) 2025-12-29 04:12:01 -08:00
LagoLunatic e8c70fb18f Clean up code, remove fakematches, add UNUSED, enable warnings (#2992)
* Remove NDEBUG_DEFINED fakematch, clean up getName temps

* Fix ifdef

* Fix bad JSystem pch ifdef breaking decomp.me

* Remove Acch Chk fakematches

* Private Acch fields

* Fix some clangd errors in headers

* Add UNUSED macro for matching debug parameters

* Enable clangd unused-parameter warning

* Remove extern from initializers

Probably added by dol2asm?

* Fix process profile definitions

* Remove leftover dol2asm address comments

* Remove some unnecessary double casts

* Enable some more clangd warnings

* Fix missing usages of fopAcM_ct

* Fix wrong enum usage

* Fix more fakematches
2025-12-23 15:53:10 -08:00
Niklas Bauer 5321562dec d_a_npc_kn debug work (#2907)
* d_a_npc_kn debug work

* d_a_npc_kn pr comments
2025-12-03 20:30:59 +02:00
TakaRikka dfa8efa97b project cleanup (#2895)
* some wii OS fixes

* remove old dol2asm comments

* remove dol2asm.h

* remove function address comments

* normalize ATTRIBUTE_ALIGN usage

* DECL_WEAK macro

* fix gcc attribute weak macro

* wrap more mwcc specific things in ifdefs

* fixes

* fix revo sdk version flags

* fixes
2025-11-30 15:23:42 -07:00
Max Roncace a2da8d35d2 d_a_e_sh matching (#2772) 2025-11-05 19:16:06 -08:00
Carco_21 351b9a7c5e d_a_obj_hata & d_a_obj_hb matching (#2752)
* hata matching

* hb initial work

* obj_hb matching

* fixed error

* pr cleanup
2025-10-28 04:25:15 +02:00
TakaRikka b841290afa d_debug_camera mostly done (#2695)
* d_debug_camera mostly done

* update some alink demo stuff

* some misc debug stuff
2025-09-25 18:20:46 +03:00
TakaRikka b17c29f4f5 d_a_e_ai done (#2617)
* d_a_e_ai done

* pr
2025-08-30 10:31:22 +03:00
Max Roncace 13f063b383 Misc framework fixes (#2578) 2025-08-10 23:22:28 -07:00
Howard Luck 40298997cc d_a_npc_kn work (#2274)
* checkpoint

* checkpoint

* checkpoint

* checkpoint

* checkpoint

* fixups

* check

* fixes 2

* fixes 3

* fixes 4

* fixes 5

---------

Co-authored-by: pheenoh <pheenoh@macmini.local>
Co-authored-by: pheenoh <pheenoh@macmini.lan>
2025-06-08 21:01:18 +03:00
Niklas Bauer ff99f0dbc7 d_a_e_tk_ball Matching (#2402)
* d_a_e_tk_ball matching

* d_a_e_tk_ball cleanup

* d_a_e_tk_ball comments
2025-04-20 18:05:58 -07:00
Caroline Madsen 03fafe3e15 d_camera work (#2369)
* bumpCheck matching

* checkGroundInfo matching

* chaseCamera matching

* lockonCamera attempted

* talktoCamera matching

* subjectCamera, magneCamera matching

* colosseumCamera close, plus various fixes

* towerCamera attempted

* hookshotCamera matching
2025-04-01 19:05:30 -07:00
TakaRikka f06311cd09 tag_allmato almost, swhit0 treesh swball done, misc cleanup (#2312)
* d_a_tag_allmato almost done

* d_a_swhit0 done

* some SSystem cleanup

* treesh done

* swball done, some other rel cleanup
2025-03-01 14:48:49 +02:00
TakaRikka dc32cbd7e6 d_a_obj_carry mostly done (#2301)
* d_a_obj_carry mostly done

* cleanup some acch inlines
2025-02-13 10:37:46 -07:00
YunataSavior 4637dde522 d_a_obj_Turara equivalent (#2289)
* Initial d_a_obj_Turara work

* More d_a_obj_Turara work

* d_a_obj_Turara equivalent except for weak func order of dEvLib_callback_c dtor

* Updates to d_a_obj_Turara after feedback from Taka

* b_dre equivalent (#2290)

* Update d_a_obj_Turara to remove unnecessary comment based on hatal\'s request

---------

Co-authored-by: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
2025-01-23 12:42:27 -08:00
YunataSavior b6dbdd16e8 d_a_obj_octhashi equivalent except for weak func ordering of cCcD_GStts dtor (#2287)
* Initial d_a_obj_octhashi work

* More d_a_obj_octhashi work

* d_a_obj_octhashi has 100% completion, but rodata doesn't match

* d_a_obj_octhashi equivalent. Would fully match except for cCcD_GStts dtor

* d_a_obj_octhashi update after feedback from Taka and hatal
2025-01-19 13:45:55 +02:00
TakaRikka b5b157ab34 d_a_horse mostly done (#2284)
* checkpoint

* d_a_horse mostly done

* some horse doc
2025-01-09 15:45:46 +02:00
Huitzi 761e5b03aa d_a_obj_waterPillar + d_a_obj_syRock Equivalent (weak ordering) (#2281)
* d_a_obj_waterPillar + d_a_obj_syRock Equivalent (weak ordering)
* Added fake struct padding
* Added fake Chk inlines to dBgS_Acch
* Added AT_TYPE_100 to cCcD_ObjAtType

* Addressed fakematch
* Deleted fake Chk inlines from dBgS_Acch
* Removed duplicated, but commented, static check for struct size
* Renamed two d_a_obj_waterPillar fields according to comments

* Removed explicit inline keywords & swapped use of PSMTX for debug-friendly MTX
2025-01-03 14:50:14 -08:00
hatal175 87f3899f11 d_a_obj_wsStick, d_a_obj_onsenTaru OK (#2268)
* d_a_obj_wsStick, d_a_obj_onsenTaru OK

* d_a_obj_pdtile OK

* d_a_obj_stone equivalent

* d_a_npc_lf OK

* Z2SoundMgr OK

* Remove fixed nonmatching comment

* d_a_obj_kantera OK

* Remove unneeded header

* daMyna_c::deleteItem matching

* d_a_obj_crvsteel OK
2024-12-24 02:36:01 -08:00
hatal175 a677d4598f daObj_BouMato_c OK (#2264)
* daObj_BouMato_c OK

* daObjGraRock_c Matched except template function order

* daBkyRock_c OK
2024-12-12 12:58:40 -08:00
TakaRikka 6482fe7535 d_a_b_zant matched + linked (#2253)
* work on b_zant

* zant work

* more zant work

* all b_zant functions done

* some doc work

* some more doc work

* d_a_b_zant linked

* fix d_a_b_zant_magic issue
2024-11-22 14:32:01 -07:00
hatal175 731da09105 Work on daNpc_Hanjo_c (#2225) 2024-10-25 23:44:26 -07:00
Caroline Madsen 434f63ccb8 d_a_b_yo and d_a_b_yo_ice mostly OK (#2219) 2024-10-19 11:54:40 +03:00
TakaRikka 61cf874485 d_a_alink canoe almost done (#2210)
* d_a_alink canoe almost done

* ironball mostly done

* alink_iceleaf done
2024-10-16 00:03:04 +03:00
TakaRikka 5935a0f308 d_a_alink work / bump dtk version (#2205) 2024-10-12 15:11:17 -07:00
TakaRikka f90ee9ed68 zramark work, sWallShutter / firewood2 done (#2187)
* obj_zramark done except weaks

* setup fixes

* obj_sWallShutter done

* firewood2 done

* remove asm
2024-08-07 09:32:04 -06:00
TakaRikka b8fa8172b5 some cc doc and obj_brg work (#2184)
* some cc doc

* document dCcD material types

* work on d_a_obj_brg
2024-07-22 12:33:37 -06:00
TakaRikka 4a308d96c3 obj_lv5YIblltray done (#2173)
* d_a_obj_lv5yiblltray done

* remove asm
2024-07-07 21:31:29 +03:00
Pheenoh 7154ac08e1 d_a_e_fz work, doxygen revamp (#2127)
* initial freezard actor struct + setActionMode OK

* daE_FZ_Draw

* setReflectAngle

* mBoundSoundset

* daE_FZ_Execute & execute

* demoDelete

* daE_FZ_Delete & _delete

* CreateHeap

* useHeapInit

* cc_set

* mtx_set

* action WIP

* way_gake_check

* executeRollMove

* executeMove

* draw WIP

* executeDamage

* checkpoint

* create

* checkpoint

* daE_FZ_c::executeWait

* checkpoint

* daE_FZ_c::damage_check almost done

* rm asm

* rm headers

* setup_profile WIP + doxygen update

* fix merge issues

* docs fix?

* fix2

* doxygen updates

* setup g_profile_E_FZ, profile setup script WIP

* update github actions

* update progress.md
2024-04-12 00:10:30 -06:00
Caroline Madsen 6b92f9daae d_a_b_ds mostly done (#2098) 2024-03-17 15:53:08 -07:00
TakaRikka 9bc604134e Obj_Oiltubo done (#2071) 2024-02-15 00:11:05 +01:00
TakaRikka d14757be50 d_a_e_yd_leaf and d_a_e_ph done (#2070)
* d_a_e_yd_leaf done

* d_a_e_ph OK

* remove asm

* some e_ph doc

* match dBgS_Acch, fix f_op_actor_mng weak funcs

* dBgS_Acch done

* cleanup dBgS Chk TUs

* d_a_obj done
2024-02-13 11:21:57 -07:00
Caroline Madsen a1e784519a d_a_obj_lv1Candle01, d_a_obj_lv2Candle OK (#1978)
Co-authored-by: hatal175 <hatal175@users.noreply.github.com>
2023-11-12 07:12:21 +02:00
Jacob Patzer 53fb073a7a d_a_obj_ss_item OK (#1983) 2023-11-10 15:21:06 -08:00
Trueffel 63c3e51f31 decompile a few daItemKantera_c funcs (#1970)
* attempt on daItemKantera_c

* format cpp
2023-10-28 02:46:18 +03:00
Pheenoh f9380b3e05 d_a_obj_carry work, SETUP_ACTOR macro, header cleanup (#1885)
* d_a_obj_carry work, SETUP_ACTOR macro

* rm headers, add script

* progress

* macro rename, consistent spacing
2023-08-16 12:07:52 -07:00
TakaRikka 8d42ed4176 Kytag09 and Kytag11 OK, work on d_a_bg_obj and d_kankyo (#1877)
* work on kankyo / d_a_bg_obj

* d_a_bg_obj work / kytag09 and kytag11 OK

* remove asm
2023-08-12 18:09:47 -06:00
Trueffeloot 9a85375f52 work on d_a_spinner 2023-08-05 22:58:21 +02:00
TakaRikka 7543b7b870 d_a_obj_swpropeller OK, work on d_kankyo / misc 2023-08-02 01:31:23 -07:00
Jcw87 b320ea785a d_cc_d_nonmatching 2023-07-03 00:06:03 -07:00
hatal175 1cf9a3a1b6 work on d_a_npc, d_a_npc_ash, d_a_tag_evtarea (#345)
All credit goes to randomsalience
2023-06-06 11:32:17 -06:00
Jcw87 4346df764b Remove #includes from headers (#334)
* add "global.h" to files that use it

* add MSL_C includes to files that use them

* remove dolphin includes from headers that don't need them

* remove JSupport includes from headers that don't need them

* remove JKernel includes from headers that don't need them

* remove JUtility includes from headers that don't need them

* remove J3D includes from headers that don't need them

* remove J2D includes from headers that don't need them

* remove JAudio2 includes from headers that don't need them

* remove Z2AudioLib includes from headers that don't need them

* remove JMessage includes from headers that don't need them

* remove JParticle includes from headers that don't need them

* remove SComponent includes from headers that don't need them

* remove dol includes from headers that don't need them

* sort includes
2023-05-12 12:10:14 -07:00
TakaRikka ec263c3460 e_ym / obj_volcball wip. obj_mgate done (#318)
* e_ym / obj_volcball wip. obj_mgate done

* remove asm

---------

Co-authored-by: root <root@DESKTOP-BTVP2BC>
2023-04-21 08:18:49 -06:00
Pheenoh e52a5af069 d_file_select, JASResArcLoader, d_a_obj_stone, d_a_obj_stone_mark (#309)
* setup TU

* JASResArcLoader OK

* d_a_obj_stoneMark work

* some funcs in d_a_obj_stoneMark

* many changes

* quat, d_a_obj_stone, d_a_alink, fix python script, tidy makefile

* d_file_select functions + pr cleanup
2023-03-17 21:05:06 -06:00