Commit Graph

52 Commits

Author SHA1 Message Date
Max Roncace bb061a1225 Merge remote-tracking branch 'decomp/main' 2026-03-18 01:56:47 -04:00
Max Roncace 8578874254 Fix a bunch of compiler warnings and document several more bugs (#3130) 2026-03-17 22:38:05 -07:00
TakaRikka 820327989c fix event camera ptr param size 2026-03-12 21:15:50 -07:00
Luke Street 6e748ac283 More GCC compatibility/warning fixes (#3118)
* Wrap >4-char literals in a MULTI_CHAR macro

Modern compilers do not support CW's non-standard behavior with
>4 char literals. We can, however, use a constexpr function to
compute the u64 values directly. This leaves <=4 char literals
unchanged.

* Replace non-pointer usages of NULL with 0

* Define NULL to nullptr on C++11 and above

* Fix more -Wpointer-arith and -Woverflow warnings

* Replace u32/s32 with uintptr_t/intptr_t where appropriate

* JSUOutputStream: Overload all standard int types
2026-02-28 20:19:17 -08:00
Luke Street b807bedd35 More -Wpointer-arith fixes 2026-02-28 20:34:06 -07: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
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 91d97cf3f4 d_camera debug almost matching (#3032) 2026-01-11 19:20:17 -08:00
roeming 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
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
Jcw87 d9ca13c7b5 fix functions not returning values (#2942)
* fix functions not returning values

* implement functions that should return values
2025-12-11 15:31:44 -08:00
kipcode66 aeb51cade5 Improving compatibility with standard cpp compiler (#2920)
* Improving compatibility with standard cpp compiler

* Add __REGISTER macro for non mwcc compatibility

* Fix for PR comments

* fix missing define for revolution

* Simplifying cSAngle conversion
2025-12-06 21:08:05 -08:00
Max Roncace 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
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
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 b822d25e2d cleanup event stuff (#2688)
* cleanup event stuff

* fix debug
2025-09-23 14:20:38 +03:00
Max Roncace 42034fd364 More miscellaneous TU improvements (#2665) 2025-09-17 15:01:59 +03:00
Max Roncace 6b1f5b95de d_camera almost matching (equivalent) (#2633) 2025-09-08 14:41:07 +03:00
Max Roncace 30afae62d1 d_camera improvements (part 1) (#2623)
* Rename several dCamera_c fields

* Refactor mWork to generic buffer instead of union

* d_camera match improvements

* Implement several dCamera_c functions

* Remove d_camera.h from PCH

The symbol names in d_camera indicate that this header wasn't
included in the PCH (as they're compiled directly in d_camera.cpp).
2025-09-03 10:32:02 +03:00
Max Roncace c897597fc1 Add a precompiled header for RELs (#2597) 2025-08-24 09:52:08 +03:00
YunataSavior 7fdbc22fea d_a_npc_ks equivalent (#2481) 2025-06-10 19:19:55 +03:00
YunataSavior b26f9b8389 Continued cleanup of d_ev_camera functions (#2458) 2025-05-27 02:50:32 -07:00
YunataSavior 0178c4d576 Debug and various d_ev_camera fixes (#2448) 2025-05-19 18:40:57 +03:00
Carco_21 34f4bf0c0f More d_ev_camera work (#2422)
* Work on fixedFrameEvCamera

* Work on stokerEvCamera

* Small work

* Cleanup and started on transEvCamera

* Work on watchActorEvCamera

* Work on gameOverEvCamera and other cleanup

* Implemented mWork pointer logic where needed

* Small work on useItem0EvCamera

* Work on bSplineEvCamera

* work on twoActor0EvCamera function and cleanup

* Work on transEvCamera

* Cleanup

* Work on possessedEvCamera

* Work on fixedFramesEvCamera & started on digHoleEvCamera

* All functions have been at least somewhat worked on

* Further general work and cleanup
2025-05-06 17:30:19 -07:00
YunataSavior fb9fd4229a Fix debug build for fixedFrameEvCamera while also getting some overall matching (#2415) 2025-05-02 00:37:15 +03:00
Carco_21 1aba90e76c d_ev_camera work (#2412)
* Work on fixedFrameEvCamera

* Work on stokerEvCamera

* Small work

* Cleanup and started on transEvCamera

* Work on watchActorEvCamera

* Work on gameOverEvCamera and other cleanup

* Implemented mWork pointer logic where needed

* Small work on useItem0EvCamera

* Work on bSplineEvCamera

* work on twoActor0EvCamera function and cleanup

* Work on transEvCamera

* Cleanup
2025-04-30 15:46:15 -07:00
LagoLunatic cb8a9815b1 d_stage cleanup (#2392) 2025-04-13 20:54:57 -07:00
LagoLunatic 4e30ad564a Debug JStudio fix + match one retail func (#2378)
* Fix debug build

* Minor fixes

* Match daAlink_c::getDemoLookActor

* Fix JStudio paths in ShieldD splits

* Fix JStudio not compiling on debug

* Fix JStudio not compiling on retail, add fake header
2025-04-06 17:57:52 -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
LagoLunatic 0ff06d2974 Debug version now builds OK and all_source compiles (#2343)
* Fix missing arg to JUT_ASSERT

* Fix some MWCC version diff errors

* Compile m_Do_ext, d_demo, actor_mng

* Add VSCode task to quickly switch between versions

* Unlink magLift for debug

* Update the hash of the debug dol

The old cbea5fa... hash here was for the dol generated by the alf2dol.py script, which produces incorrect alignment.

The dol with the new hash can be obtained by using `dtk elf2dol` to convert the debug .alf file to a dol.

The DOL now builds OK.

* Fix all debug REL dtor splits

All RELs now also build OK, meaning `ninja build/ShieldD/ok` now succeeds.

* Add genMessage declarations to all HIO subclasses

* Fixing more compilation errors

* m_Do_mtx 100% on debug

Cannot be linked due to weak function name mangling?

* Improve various matches

* Fix all remaining compilation errors

* Fix new compilation errors from main

* Fix retail regression

* Link f_pc_profile_lst
2025-03-22 18:00:51 -07:00
LagoLunatic a60b7f3e99 Fix spurious differences when using ninja diff (#2294)
* Fix spurious differences when using ninja diff

* Fix some clangd errors/warnings
2025-01-26 22:01:05 -08:00
TakaRikka e7b0ad79e0 tbox/camera/d_bg_w_kcol work and cleanup (#2262)
* some camera/tbox cleanup

* d_bg_w_kcol work

* make item name enum better
2024-12-10 18:46:19 +02: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
TakaRikka 2f689ced90 work on d_camera / d_ev_camera (#2170) 2024-06-25 08:34:59 -06: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
TakaRikka 907774de02 remove "duplicated" inlines (#2099)
* fix f_op_actor_mng inlines

* fix f_pc inlines

* fix d_a_alink weak func signatures

* fix d_com_inf_game inlines

* fix some more inlines

* fix rest of player inlines

* m_Do / JSystem inlines fixed

* fix upstream changes
2024-03-19 13:31:53 +02:00
Trueffel 92a5ef653c d_a_obj_wind_stone OK (#2066)
* set up TU

* d_a_obj_wind_stone OK
2024-02-08 14:35:24 +02:00
TakaRikka bbacd1a0e8 most of d_a_alink_wolf done / some misc (#1993)
* wip on alink_wolf

* setup procvar unions

* most of d_a_alink_wolf done + some misc
2023-11-27 13:14:06 +02: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 513cf1a414 d_menu_save / pane_class / rename some data (#205)
* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress

* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data

* rename more data

* remove asm / progress

* match all of d_pane_class

* fixes / some dKankyo doc
2022-07-04 21:21:57 +02:00
Julgodis 5d12345a03 moved strings + decompile simple store functions 2021-04-10 07:02:38 +02:00
Julgodis cad608c551 demangle data-symbols 2021-04-08 01:47:05 +02:00
Julgodis 86cd345d20 detect more floats/doubles, including from relocations 2021-04-07 09:16:47 +02:00
Julgodis 85bd045193 building RELs 2021-04-06 18:00:35 +02:00
Julgodis 9325c67c63 __sinit and progress script update 2021-04-01 02:07:58 +02:00
Julgodis b6eed5208d .dead section fix 2021-03-31 23:22:38 +02:00
Julgodis 2404fb33c7 re-generate with bug fixes 2021-03-30 01:58:08 +02:00
Julgodis 9335ce5119 clang-format 2021-03-29 00:10:25 +02:00