Commit Graph

64 Commits

Author SHA1 Message Date
Pieter-Jan Briers b289dece80 26 02 27 pjb dev 2 (#41)
* fix kankyo UB

* Fix TEV Stage DL writing

BE issue

* BE Fixes in materials/shapes

* Move to Aurora GD impl

* JUTDataFileHeader

* j3d: load vertex and texture not through GD

* Endian swap vertex data (mostly)

* Just exit(0) when closing the game

Fix crashes :godo:

* fix fopAcM_ct_placement and remove memcpy

* J3D: track vertex arrays correctly, swap work

* fix visibility, turn off overridden new/delete when we call into aurora

* event: cut name be

* Default window improvements

Double size, allow OS to decide position

* survive TParse::parseHeader_next

* color swap fix

* swap endian/fixes oob function pointer

* Remove GXGetViewportv stub

Aurora has it now

* Set array pointers via GD again

Relies on https://github.com/encounter/aurora/pull/35

* Let Aurora decide graphics backend

* disable procbar drawing

* Fix TColor endianness conversion issues

Fixes the wrong color for the flashing logo

* cam param swap

* simplify vtx loading, mat/amb color fix

* endian swap stb/fvb data

* aurora stat changes

* fix storage buffer crash

dont unnecessarily reassign vertex buffers in a way that forces aurora to recache things

* set bgobj spec fix

* add camera debug, endian swap more stb data, d_a_bg_obj::spec_data_c swapped

* JKRExpHeap: fix bad allocator slowdown

* solid tex

* texture caching

* log level

* fix window aspect ratio, disable bloom, endian swap camera type data

camera is now actually playing opening cutscene!!!!

* add GXDestroyTexObj to a couple stack init'd GXTexObjs, remove some diag printfs

* endian swap joint weight envelope data

* move to dusk config

* verbose arg errors

* better stub logging (for now)

* less logging, more BE

* more stubbing, move logging stuff around

* move all logging to aurora logging

* fix STUB_LOG, __FUNCTION__ isn't a string literal, wasn't building as it
was.

* update aurora

* fix heap alignment mismatch and always head align for now

* prevent them from fucking up my shit

* forward jut warning to DuskLog

* remove report logging

* maybe and i must emphasize maybe fix JMessage parsing

* this was a dumb idea

* preserve negative alignment for JKRHeap

* use normal free on macos and linux

* ^

* fix JMAHermiteInterpolation c impl

* endian swap J2DScreen mColor (oops)

* swap more J3D anim data, remove weird pointer addr check in J3DMaterial getMaterialAnm

* typo fix

* Fix aligned_alloc() size issues on POSIX

aligned_alloc() requires its input size to be a multiple of alignment. This wasn't being upheld so there were allocation failures in init code that made the game fail to start outside Windows.

Also just cleaned up some of this code a bit and removed fallback cases that *shouldn't* get hit.

* _Exit instead of exit()

Seriously I don't want destructors to run. Let the OS reclaim that shit.

* Reapply "Isolate JKRHeap operator overloads" (#39)

This reverts commit 3623b27f37.

* Fix some oopsies

* Fix hardcoded pointer size in JUTCacheFont::allocArray

* More operator overload fixes

Add void template specialization for jkrDelete

Add new[] placement overload. Apparently.

* Fix delete macros on nullptr

TIL C++ allows that.

* fix delete[]

* fix new(std::nothrow) overload

* fix avoid ub

* swap remaining anim data needed for title logo

* get rid of op 7

* move aurora_end_frame to correct spot

* juttexture destroy tex

* j2d animation be

* shutdown crash

* link warp material fix

* mDoExt_3DlineMat1_c fix

* hacky keyboard controls

* endian swap J2DResReference, add kb_pad to files.cmake

* fix some missing endian swaps in J2D, remove addr alignment check

* Remove heap unsetting in aurora calls

Never worked properly and not the right solution even if it did

* Don't print in DC stubs

They're fine to never implement

* Fix alignment stuff again

* Compile GF from dolphin lib

Doesn't seem to break anything and shuts up some stub warnings

* j3dtexture tlut obj fix

* addTexMtxIndexInDL fix

* don't recreate null tex data every frame

* the actual fix i wanted to push

* its kinda fakematch city over here

* insert hte efb copy

* limited window size / viewport support

* IsDelete FIX

---------

Co-authored-by: madeline <qwertytrogi@gmail.com>
Co-authored-by: Jasper St. Pierre <jstpierre@mecheye.net>
Co-authored-by: Jeffrey Crowell <jeff@crowell.biz>
Co-authored-by: TakaRikka <takarikka@outlook.com>
Co-authored-by: CraftyBoss <talibabdulmaalik@gmail.com>
Co-authored-by: Lurs <2795933+Lurs@users.noreply.github.com>
2026-03-08 15:27:15 -07:00
TakaRikka 3623b27f37 Revert "Isolate JKRHeap operator overloads" (#39) 2026-03-06 19:49:35 -08:00
PJB3005 3ffc3266d7 Merge branch 'main' into 26-02-27-allocator-isolation 2026-03-05 00:15:09 +01: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 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
roeming 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
Jcw87 7a22a1c320 fix compiler warnings (#3094) 2026-02-11 00:14:18 -08: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
YunataSavior 5536ed3f3d npc_besu, npc_toby DBG equiv (#3051) 2026-01-18 17:52:48 -08:00
LagoLunatic 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
LagoLunatic 6cdcda0f1d Match 4 more functions (#2909)
* Match daNpcF_Lookat_c::adjustMoveDisAngle

* Match daNpc_ykM_c::reset and daNpc_ykW_c::reset

* Fakematch daNpcThe_c::main gameInfo load

* Update configure.py
2025-12-02 18:18:28 -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
Max Roncace be5b449ae9 d_a_npc_ykm debug almost matching (#2877) 2025-11-27 14:28:39 -08:00
Max Roncace 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
LagoLunatic 7a6795c978 Misc fixes (#2830)
* Replace DANPCF_C_HACK with a better fakematch

* d_a_obj_item OK

* Fix ninja diff

* Misc debug/nonmatching fixes

* Fix ninja diff for PAL

* Fix bad PAL split
2025-11-19 14:10:03 -08:00
hev7 822fc18990 d_a_npc_pouya matching (#2806)
* d_a_npc_pouya matching

* mItemPartnerId fix
2025-11-15 04:02:24 -08:00
roeming 2069ffc698 rename variable in accordance with assert (#2797) 2025-11-12 16:45:53 -08:00
LagoLunatic b3849f228a Regalloc/debug/misc fixes (#2794)
* Fix "0" asserts

* More debug and regalloc fixes

* Fix PTMF syntax for compatibility with other compilers

* Fix some fakematches, link more TUs for J/P
2025-11-10 18:25:00 -08:00
roeming 87181ad1b8 D a npc gra matching debug (#2788)
* match all d_a_npc_gra functions in debug

* update all offsets to match release

* rename parameters

* add ct hack for d_a_npc_gra

* add suggestions

* fix type

* use sound enums

* fix sinit and one regswap

* fix wrong variable usage
2025-11-09 15:17:04 -08:00
YunataSavior b604f014e6 Link obj_gra2, obj_gm (#2781)
* obj_gra2 almost linkable

* Link obj_gra2

* Link obj_gm
2025-11-08 15:58:02 -08:00
TakaRikka a7b3a24ea4 npc_hoz done (#2775)
* npc_hoz done

* pr

* remove include
2025-11-07 15:26:52 +02:00
TakaRikka 4618e95975 kankyo / m_do_ext debug stuff (#2759)
* kankyo debug work

* finish draw packets
2025-10-28 05:55:46 +02:00
hev7 7b999a5420 d_a_npc_len matching (#2748)
* d_a_npc_len matching

* HIO

* more work on len

* d_a_midna work for PAL

* mg_rod PAL work
2025-10-21 21:37:13 +03:00
TakaRikka be85496e31 d_a_npc_blue_ns mostly done (#2747)
* d_a_npc_blue_ns mostly done

* d_a_obj_poCandle / d_a_obj_poTbox done
2025-10-21 21:33:59 +03:00
YunataSavior b621ac0d8d npc_toby OK (#2733)
* npc_toby 68% done

* address ykm ykw regressions

* All npc_toby cut done + chkPassed1 fakematch

* npc_toby OK

* npc_toby some hio var rename

* npc_gnd cleanup

* npc_gnd CreateHeap and reset

* Add fakematch comment fo get_u16_Idx
2025-10-16 20:21:57 -07:00
Carco_21 ffe71b446c d_a_npc_chat matching (#2725)
* initial work

* tiny change

* over half done

* got to playMotion

* got to wait function

* matching
2025-10-05 18:32:14 -07:00
YunataSavior 6c84ed53d7 npc_moir HIO and debug cleanup (#2719) 2025-10-01 15:35:44 -07:00
hev7 5b647b344d d_a_npc_lud matching (#2694)
* d_a_npc_lud matching

* Fixes
2025-09-25 18:20:14 +03:00
TakaRikka 39da9a3a77 npc_kkri done (#2655) 2025-09-14 10:55:16 +03:00
TakaRikka ab64210b40 npc_kakashi done (#2651) 2025-09-13 00:29:20 +03:00
TakaRikka 819ad98ac2 Lv4railwall / lv4sand / lv4slidewall done. fix wii build (#2637)
* lv4railwall / lv4sand / lv4slidewall done and wii build fix

* fix Mtx** parameters

* add some notes about wii compiler version

* Remove dol2asm include

---------

Co-authored-by: hatal175 <hatal175@users.noreply.github.com>
2025-09-09 17:30:32 +03:00
Carco_21 5380801ce9 d_a_npc_tks almost matching (#2616)
* initial work

* one more demo func left

* almost matching

* almost matching

* pr cleanup
2025-09-03 22:23:04 +03:00
Max Roncace 40eb5cb1ca d_a_npc_ykw almost matching (#2613) 2025-08-30 10:30:51 +03:00
Carco_21 589ad79dc4 d_a_npc_kasi_hana, mich, and kyu work (#2610)
* equivalent

* kasi_mng_c work

* class work and create function work

* kasi_mng_c is matching

* little more work

* almost matching

* enums defined

* kasi_hana almost matching

* more mich work

* mich almost matching

* kyu almost matching

* potentially fixed issue

* Now maybe good?

* Should be fixed now

* PR Cleanup
2025-08-29 22:40:14 +03:00
Carco_21 c3c313a9fb d_a_npc_ykm work (#2566)
* initial work

* got to cut functions

* Tiny work

* All functions worked on

* took out param dtor

* naming work

* cleanup

* pr cleanup
2025-08-04 22:25:39 +03:00
Max Roncace 18000c624f d_a_npc_zelda equivalent (#2528) 2025-07-11 22:00:18 +03:00
TakaRikka 1d67202ac0 fix GC JPN dol splits / d_a_npc_prayer mostly done (#2488)
* jmessage cleanup pass

* more JMessage cleanup

* d_msg_class cleanup

* fix a bunch of gc jpn dol splits

* d_a_npc_prayer pretty much equivalent
2025-06-18 11:05:44 +03:00
Carco_21 f770d6c230 d_a_obj_gra2 work (#2482)
* Tiny start on d_a_obj_gra2

* Initial work

* Solid work done

* More work

* work on some rolling functions and deme camera

* Almost all functions worked on

* All functions worked on

* Fixed some BaseNpc functions I broke

* PR Cleanup

* PR cleanup part 2
2025-06-16 16:40:16 +03: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
YunataSavior 1d52a3a209 d_a_npc_maro equivalent (#2439)
* Initial d_a_npc_maro work

* d_a_npc_maro 17% matching

* d_a_npc_maro 28% done

* d_a_npc_maro 38% done

* d_a_npc_maro 57% done

* daNpc_Maro_c::cutArrowTutorial done....

* d_a_npc_maro: dcomifgp_getattention returns ptr now....

* d_a_npc_maro 98% matching

* d_a_npc_maro equivalent

* address d_a_npc_maro PR comments
2025-06-07 01:20:54 -07:00
hev7 1be0127979 d_a_npc_moi work (#2471)
* d_a_npc_moi work

* Fix broken match
2025-06-05 12:16:20 +03:00
TakaRikka 49b1c20e24 d_a_npc cleanup (#2466)
* d_a_npc first cleanup pass

* more d_a_npc cleanup
2025-05-31 15:18:54 +03:00
LagoLunatic d3d79cb0a0 Update dtk-template (#2453)
* Update dtk-template

* Fix debug build

* Fix d_event_debug includes

* Progress reports: Enable function relocation diffing (data_value)

* Fix some diffs

* Fix a few more diffs

* More fixes
2025-05-22 22:25:06 -07:00
hev7 4324a7d53e d_a_npc_impal work (#2449)
* d_a_npc_impal work

* Address review comments
2025-05-19 23:56:11 +03:00
hev7 41454dec51 d_a_npc_uri almost matching (#2400)
* d_a_npc_uri almost matching

* Fix various issues

* Fix
2025-04-19 14:35:06 +03:00
hatal175 d2e615f431 Work on d_a_npc_taro (#2386) 2025-04-10 16:42:52 -07:00
YunataSavior 35bd1ba3a2 d_a_e_ym, d_a_e_oc, and d_a_npc_hanjo equivalent, d_a_npc_ashB work (#2368)
* d_a_e_ym, d_a_e_oc, and d_a_npc_hanjo equivalent, d_a_npc_ashB work

* Updates to PR based on feedback, plus fix debug build
2025-04-10 16:24:46 +03:00