3750e7cfee
Merge remote-tracking branch 'origin/main' into 26-02-27-pjb-dev-2
2026-03-01 15:08:52 +01:00
1b69152d5a
Fix collision data loading (64-bit & BE)
2026-02-28 22:52:18 +01:00
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
3b8300d0d2
Merge decomp/main into dusk
...
Merges 44 upstream commits from zeldaret/tp decomp/main.
Conflict resolutions:
- .github/workflows/build.yml: keep deleted (not needed for PC port)
- README.md: keep PC port README
- J3DAnimation.h: keep OFFSET_PTR macro + add upstream forward decl
- J3DModelLoader.h: keep BE(u32) mBlockNum + add field_0x1c
- d_com_inf_game.h: keep PC port inlines + add upstream declarations
- global.h: keep MULTI_CHAR macro + add FABSF macro
- JUTConsole.cpp: keep uintptr_t cast for 64-bit
- JUTDbPrint.cpp: keep PC enter_() helper + add cstring include
- JUTResFont.cpp: take upstream loop/struct improvements with BE types
- JUTCacheFont.cpp: take upstream decomp fix
- float.h: use upstream !PLATFORM_GCN guard
- d_a_npc_bouS/theB.cpp: keep MULTI_CHAR() for PC portability
- d_a_npc_henna.cpp: keep uintptr_t + use upstream var name
- d_demo.cpp: keep near_/far_ field renames for PC
- d_resorce.cpp: keep uintptr_t + fix var name to res
- d_s_room.cpp, m_Do_graphic.cpp: keep dusk includes + add cstring
- m_Do_main.cpp: keep JHIComPortManager + use JAS_GLOBAL_INSTANCE_INIT
- angle_utils.h: remove redundant types.h include
2026-02-28 13:33:16 -07:00
29c96f5c65
Some GCC compilation fixes ( #3114 )
...
* Fix 6-byte multichar literals
* Add `struct` to `e_ga_class::ga_s`
* Fix remaining wrong forward declares (struct/class)
* Replace `#include <string>` with `#include <cstring>`
* Guard FLT_EPSILON define to prevent redefinition
* Add missing `#include <cstring>` for direct cstring function usage
2026-02-28 12:11:00 -08:00
af7ab981e6
Fix MORE wrong forward declares (struct/class) ( #3110 )
2026-02-24 14:20:45 -08:00
fcf1f4bed1
Fix wrong forward declares (struct/class)
...
Requires removing the now-matching symbols from jsystem_stubs.cpp
2026-02-24 16:58:12 +01:00
07ef4b6d26
Big cast cleanup ( #3076 )
...
* Big cast cleanup
* fix for name conflict
* rename header
* rename cast macros
* fix rename mistake
---------
Co-authored-by: roeming <roeming@users.noreply.github.com >
2026-02-20 02:48:29 -08:00
292724920c
Merge branch 'wip/linkfix2' into wip/linkfix
2026-02-11 07:20:44 +01:00
81d679d207
Fix errors for msvc
...
Use less strict compiler flags instead of modifying source code
Add ugly defines so MSVC stops complaining about zero length arrays
2026-02-01 15:37:26 -08:00
dbee7c8f1f
d_com_inf_game debug ( #3075 )
...
* d_com_inf_game debug
* inline sorting
2026-01-29 18:58:59 -08:00
c9e2a73dda
general cleanup, d_menu_quit / d_a_obj_testcube mostly done, d_msg_scrn_explain debug ( #3065 )
...
* typedef for cPhs_Step
* make sdk includes consistent
* d_menu_quit / d_msg_scrn_explain debug
* d_a_obj_testcube mostly done
* d_debug_pad mostly done
* jstudio tool library headers
* some JStudioCameraEditor headers
* d_jcam_editor mostly done
* try fixing some shield regressions
* d_bg_parts mostly done
* fix merge errors
* debug fix
2026-01-24 23:36:23 -08:00
7c71acb6b6
match d_a_npc_tk for debug ( #3046 )
...
* match d_a_npc_tk for debug
* fix macro usage
* fix whitespace
2026-01-17 15:45:52 +02:00
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
9b7e55965f
standard compiler compatibility changes ( #3040 )
...
* move math to cmath
* replace stdarg to cstdarg
* change stdint to stdint.h
* minor fixes
* change stdio to cstdio
* change stdlib to stdlib
* renamed ctype to cctype
* fix missing argument for UNSET_FLAG
2026-01-13 00:48:25 +02:00
e3b78563d1
obj_pumpkin dbg equiv ( #3036 )
2026-01-12 22:18:58 +02:00
91d97cf3f4
d_camera debug almost matching ( #3032 )
2026-01-11 19:20:17 -08:00
37ec227b3f
first round of constants cleanup ( #3021 )
...
* first round of constants cleanup
* move m_PI_D definition
* remove compatibility comment
* add future version of angle subtracting with/without cast
* whitespace change to run builds again
2026-01-10 23:38:04 +02:00
ea53712c30
Add guards around std library headers ( #3013 )
...
* Last fix for standard compiler error
* adding define guards around headers
* rename cmath.h and climits.h to cmath and climits respectively
* renaming cstdarg.h to cstdarg
* renaming cstdlib.h to cstdlib
* renaming cstring.h to cstring
* renaming cstdio.h to cstdio
* renaming cmath locale ctype
* renaming stdarg string and va_list
* renaming cstddef
* renaming stdio stddef stdlib
* renaming algorithm, functional, iterator, memory, and utility
* renaming bitset, cstdint, limits, and stdint
* renaming new and type_traits
* update quote includes for standard library headers to angle bracket includes
2026-01-05 03:50:45 -08:00
350d24b4b4
d_a_e_rdy debug work ( #3011 )
...
* debug work for d_a_e_rdy
* remove unused fake function
* fix regressions
* rename variable
* Fix version diffs of angle adding
2026-01-04 17:22:04 -08:00
798ba743a0
Work on d_cc_d debug ( #3002 )
2025-12-29 04:12:01 -08:00
fc3692e4ac
Debug d_a_e_ym ( #3003 )
2025-12-26 16:23:14 -08:00
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
46d53ab65f
MSL_C header cleanup ( #2988 )
...
* msl_c header cleanup
* math header cleanup
* fix rest of shieldD configs
* cleanup cflag configs a bit
* fix shield build
2025-12-23 10:20:32 -08:00
811d9c0a8d
match last function in d_camera.cpp ( #2971 )
...
Co-authored-by: Cuyler36 <Cuyler36@users.noreply.github.com >
2025-12-19 17:24:18 -08:00
3fd414beab
Use consistent s32/u32 ( #2964 )
...
* cleanup long usage
* fix regression
2025-12-18 13:31:44 -08:00
cf492884ea
Various debug conditional compilation cleanup ( #2915 )
...
* Global: Define DEBUG as 0 if not already defined
* Clean up DEBUG-guarded code
2025-12-06 13:34:47 -08:00
b51274a3dd
Debug+retail matches and clean up some fakematches ( #2910 )
...
* Debug matches
* Match daAlink_c::procGrassWhistleWait
* Match JASAramStream::channelProc
* More debug matches
* Match JAUStreamStaticAramMgr_::deleteStreamAram and bitset inlines
* Fix some fakematches
* Fix gameinfo player info not being a struct
* Update bug comments
* Fix procids in alink
* d_a_scene_exit OK
2025-12-03 15:09:56 -08:00
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
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
47a379e016
d_a_npc debug work ( #2863 )
...
* Remove d_a_npc3.cpp
This file appears to not actually be real and the asserts in its
functions all reference d_a_npc2.cpp instead.
* d_a_npc debug almost matching
2025-11-25 22:32:01 +02:00
4067730deb
Clean up some fakematches, mostly around gameInfo loads ( #2862 )
2025-11-25 22:30:14 +02:00
da16badc8a
Move cBgS_GrpPassChk and cBgS_PolyPassChk to separate headers ( #2861 )
...
This is supported by RTTI ordering which only makes sense if these
classes are in separate headers from the dBgS_* classes.
2025-11-25 18:39:11 +02:00
4bc21e9bea
Fix more nonmatchings ( #2850 )
...
* Fix GetPolyIndex and GetBgIndex, fixing a couple regallocs
* Match daNpcCd2_c::checkFearSituation and daNpcCd2_c::getAnmP
* Match daAlink_c::jointControll
* Clean up float class checks
* Move float constants to global.h
2025-11-23 15:23:44 -08:00
691aac252b
wii building OK / m_Do_graphic debug work ( #2815 )
...
* wii building OK + m_Do_graphic debug work
* d_meter_HIO debug cleanup
* wii m_Do_graphic stuff
* tag_attack_item OK, mirror_chain almost
* fix build
* mg_fshop matching
2025-11-17 20:01:03 +02:00
a2da8d35d2
d_a_e_sh matching ( #2772 )
2025-11-05 19:16:06 -08:00
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
561a9cca39
d_a_obj_ss_drink equivalent ( #2708 )
...
* d_a_obj_ss_drink equivalent
* SomeFunc -> ProcessFunc
* fixes for taka
* rm FLT_MIN
* G_CM3D_F_INF
2025-09-27 22:03:27 -07:00
4a029d7c16
Remove unnecessary externs ( #2705 )
2025-09-27 15:30:54 -07:00
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
42034fd364
More miscellaneous TU improvements ( #2665 )
2025-09-17 15:01:59 +03:00
b17c29f4f5
d_a_e_ai done ( #2617 )
...
* d_a_e_ai done
* pr
2025-08-30 10:31:22 +03:00
aed8fe8cd3
Start linking some TUs on debug and PAL ( #2612 )
...
* Fix clang union handling (affects all TUs including d_camera.h)
Union members with non-trivial ctors/dtors is undefined behavior and clangd normally throws a fit and refuses to parse the whole union, but it seems to be possible to ifdef the problematic ctors out for non-mwerks compilers and explicitly tell modern compilers to use the defaults instead. Thanks to encounter for this fix.
* Link all TUs that already match on debug
In order to link TUs for debug, most functions seem to need to have their alignment set to 16 in symbols.txt. There are a few hundred functions that seem to be the exception and break when their alignment is set to 16, but I don't know the reason for this.
* Remove some fakematches (nosyminline/sym off) for weak func order in retail
* Fix clang not knowing that MSL_C++ is C++
* Link more debug TUs
* Fix missing PAL split
* Fix wrong slashes being used in includes
* RZDE01_00: Fix incorrect capitalization in config.yml
* Add RZDE01_00 to configure task
* Revert configure.py to use MatchingFor
* Fix PAL splits and symbols, link matching PAL TUs
2025-08-27 17:37:31 -07:00
c897597fc1
Add a precompiled header for RELs ( #2597 )
2025-08-24 09:52:08 +03:00
1be4c97a3b
d_a_e_hp almost matching ( #2585 )
2025-08-15 12:50:49 +03:00
13f063b383
Misc framework fixes ( #2578 )
2025-08-10 23:22:28 -07:00
868faf897e
Improve various partially matched TUs ( #2526 )
2025-07-11 01:11:21 -07:00
1fdfc4c69f
d_bg_w_kcol work ( #2490 )
2025-06-19 23:40:53 -07:00
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
0178c4d576
Debug and various d_ev_camera fixes ( #2448 )
2025-05-19 18:40:57 +03:00
PJB3005