Commit Graph

32 Commits

Author SHA1 Message Date
PJB3005 3ffc3266d7 Merge branch 'main' into 26-02-27-allocator-isolation 2026-03-05 00:15:09 +01:00
Luke Street 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
Luke Street 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
PJB3005 038ef4216f Isolate JKRHeap operator overloads
Fixes #25

This isolates the JKRHeap operator new/delete overloads. Every single new/delete site in the code has been replaced with a macro.

Sadly for new[] and delete[] we have to keep global operators. The global new[] just allocates into malloc() however, and delete[] goes into free() if it's not in a JKRHeap. So that's fine.
2026-02-27 23:11:59 +01:00
Lurs 292724920c Merge branch 'wip/linkfix2' into wip/linkfix 2026-02-11 07:20:44 +01:00
roeming 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
Max Roncace 2ac52379df Use default parameter values in JORMContext calls where appropriate (#3057) 2026-01-19 18:18:30 -08:00
Max Roncace 43eac24e2e Use attention enums everywhere instead of integer literals (#3044) 2026-01-14 16:55:59 +02:00
LagoLunatic 11b713902f Resolve all gameInfo fakematches (#2995)
* Clean up various inlines/fakematches/comments

* Copy OptRuby inline name from TWW debug

* Resolve all dEvt_control_c related fakematches, return pointer instead of reference

* Fix some more missing inline usages
2025-12-24 16:57:36 -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
kipcode66 bda8dc6af8 4th round of standard compiler fixes (#2984)
* 4th round of standard compiler fixes

* use of fpcM_ERROR_PROCESS_ID_e in gWolfBustersID
2025-12-22 02:20:08 -08: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
TakaRikka a7b3a24ea4 npc_hoz done (#2775)
* npc_hoz done

* pr

* remove include
2025-11-07 15:26:52 +02:00
YunataSavior 4439e8559f npc_yamiD HIO and dbg cleanup (#2718) 2025-10-01 15:33:31 -07:00
YunataSavior 4b06e9392c d_a_obj_pumpkin OK (#2715)
* Initial obj_pumpkin work

* pumpkin execute done

* d_a_obj_pumpkin OK

* Remove NONMATCHING in obj_pumpkin

* obj_pumpkin PR comments
2025-09-30 10:49:33 -06:00
LagoLunatic 6ec6fce8cb Fix JUT_ASSERT and several other macros (#2711)
* Fix JUT_ASSERT to be a nested define

* Switch names that appear in asserts to be constants instead of defines

* Replace `0` in asserts with `NULL` or `FALSE`

* Fix fpclassify

* Fix ARRAY_SIZE

* Use G_CM3D_F_INF

* More fixes for fpclassify

* Remove FLOAT_LABEL

* Remove incorrect FLAG_ON macro

* Remove UNK_BSS macro

* Silence clangd unused header warning for PCH
2025-09-28 13:11:07 -07:00
TakaRikka 5fce8ea1e1 scannon / scannon_crs / scannon_ten done (#2632)
* scannon done

* scannon_crs done

* scannon_ten done

* pr

* attention debug stuff

* attn flags

* fix build
2025-09-08 12:01:20 +03:00
TakaRikka 87069235c0 some J3D/misc cleanup (#2628)
* some j3d cleanup

* begin using uintptr_t

* j3dgraphbase cleanup

* j3dgraphanimator cleanup
2025-09-04 17:56:59 +03:00
Max Roncace c897597fc1 Add a precompiled header for RELs (#2597) 2025-08-24 09:52:08 +03:00
Carco_21 427643edd2 ChkBit comments and enum work (#2571)
* Jagar cleanup

* saru work

* e_fm work

* gob enum added

* gob cleanup

* gob anm enums

* dComIfGs_isEventBit comments added

* More bit work and besu enum work

* Maybe fixed the issue?
2025-08-08 21:39:26 +03:00
hatal175 34c8e0fcf6 d_a_obj_twGate Matching (#2555)
* d_a_obj_twGate Matching

* d_a_obj_volcbom OK
2025-07-25 17:44:23 -07:00
Max Roncace 18000c624f d_a_npc_zelda equivalent (#2528) 2025-07-11 22:00:18 +03:00
Carco_21 0144dddcf4 Anm enum work (#2511)
* Added enums for b_gg, b_gos, and b_mgn

* Added enum for d_a_b_tn (might have more work for it)

* b_yo and b_zant enum work

* more enum work

* fixed mgn match break
2025-06-30 01:50:11 +03:00
YunataSavior 4f9a2ce023 d_a_npc_bou Equivalent (#2411)
* Initial d_a_npc_bou work

* d_a_npc_bou 34% done

* d_a_npc_bou 56% matching

* DONE d_a_npc_bou cutWildGoat

* d_a_npc_bou 76% matching

* d_a_npc_bou equivalent

* Mark d_a_npc_bou as Equivalent in configure(dot)py
2025-04-27 22:46:32 +03:00
Carco_21 cb73e7a1da Work on create functions of d_a_npc_midp and changed mpMatAnm to array (#2366)
* Work on create functions of d_a_npc_midp and changed mpMatAnm to array

* Pull request cleanup
2025-04-01 13:31:12 -07:00
hatal175 2a5b7d0d1f Match daNpc_Jagar_c::chkToMotion (#2319) 2025-03-08 15:25:30 -08:00
YunataSavior 133aaa7e02 Fixes and cleanup for d_a_npc_jagar to hit 99% matching (#2318) 2025-03-08 01:05:46 -08:00
Carco_21 657831d783 d_a_npc_jagar - ~94% (#2309)
* Began work on d_a_npc_jagar

* Major work on daNpc_Jagar_c::create()

* Jagar create() - 11%

* Continued work on daNpc_Jagar_c

* Jagar create() - 87%

* Continues work on Jagar

* Work on Jagar.checkChangeEvt()

* Working on Jagar.talk()

* Work on Jagar.changeBtp()

* Jagar.checkChangeJoint() & checkRemoveJoint()

* Jagar.chkAction() & setAction()

* Jagar.chkChuMotion()

* Jagar.chkSitMotion() & chkSitMotion2()

* Jagar.chkToMotion()

* Jagar.CreateHeap()

* Jagar.createHeapCallBack() & ctrlJointCallBack()

* Jagar.cuAnger()

* Jagar.cutClimbUp() - 92%

* Jagar.setAttnPos() - 85%

* Jagar.cutConversationWithBou() - 48%

* Jagar work and daNpcT_c::getActorDistance - 83%

* Jagar setParam work and daNpcT_c::getActorDistance - 85%

* Prep Jagar push to main

* little cleanup

* Fixed return type discrepancy

* Fixed *other* return type issues & variable names for Jagar

* Jagar talkWithBou work

* Work on Jagar talk

* Data & function cleanup

* I dont remember what i added this time lol

* Finished some functions

* Reworking Jagar talk()

* Finished some functions

* Attempting to rework cutNeedYourHelp

* Almost(ish) done with Jaggle

* Almost done with Jaggle

* Took out inline assembly in Jagar.chkToMotion()

* Cleanup

* Minor variable initialization change

* Small cleanup

* Hopefully fixed d_a_npc_bou compilation error
2025-03-07 19:41:36 +02:00
Caroline Madsen c1d444de70 d_a_npc work (#2306) 2025-02-23 14:43:25 -08:00
TakaRikka 073992df8d some cleanup of f_pc/f_op files (#2254)
* cleanup f_pc files

* cleanup f_op files

* fix a couple f_op_actor_mng functions

* minor JSystem work
2024-11-29 18:24:26 +02:00
hatal175 731da09105 Work on daNpc_Hanjo_c (#2225) 2024-10-25 23:44:26 -07:00
TakaRikka 178194ccb2 switch to dtk setup (#2203)
* switch to dtk setup

* some cleanup / fixes

* cleanup d_a_alink literals

* Restore doxygen, update CI & README.md (#1)

* Fix build image ref (#2)

---------

Co-authored-by: Luke Street <luke@street.dev>
2024-10-10 08:29:58 -06:00