Commit Graph

103 Commits

Author SHA1 Message Date
TakaRikka cb85da153c Merge https://github.com/zeldaret/tp 2026-03-12 17:56:51 -07:00
Huitzi 0b0fdd1f60 Actor status consolidation & process profile definition editing (#3117)
* Consolidate fopAcM_STATUS into fopAc_Status_e

* Add _e suffix to fopAcStts enums

* Prepare for profile enumeration
* Correct typo in scene_process_profile_definition
* Manually handle g_profile_Obj_DamCps (inline preprocessing)
* Correct g_profile_TAG_LV5SOUP procname to enum
* Create d_priority.h

* Update process profile definitions
* Moved inline comments to the left
* Add missing fopAcStts enums
* Add d_priority.h include in f_pc_leaf.h
* Manually update d_a_obj_damCps profile

* Replace fopAcStts enums replacing and anticipatory profile size correction
* Changed profile size from literal to sizeof() in anticipation of PR #3116
* Provided putative names to staff-related status enums
* Replaced appropriate literals with fopAcStts enums

* Fix borked merge

* Rename item number enums and move to d_item_data.h

* Rename process profile name & draw priority enums

* Move process profile name & draw priority enums to appropriate files
* Moved fpcNm_ enums from d/d_procname.h to f_pc/f_pc_name.h
* Moved fpcDwPi_ enums from d/d_priority.h to f_pc/f_pc_draw_priority.h

* ACTUALLY (whoops) stage merge

* Correct item mistranslation

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2026-03-09 18:33:31 -07:00
PJB3005 ab389c5f49 Merge remote-tracking branch 'decomp/main' into 26-02-27-pjb-dev-2 2026-03-02 12:36:59 +01:00
TakaRikka 6e149819e1 d_s_logo / d_s_play debug work, d_a_kago cleanup, misc cleanup (#3116)
* d_a_kago cleanup

* d_s_logo wii/shield work

* d_s_logo / d_s_play debug work

* fix missing profile class sizeof's

* fix phase->id values

* build fixes

* fix dCamera_c and camera profile
2026-03-01 13:19:48 -08:00
PJB3005 798caf079a Merge remote-tracking branch 'origin/main' into 26-02-27-pjb-dev-2 2026-03-01 15:08:52 +01:00
PJB3005 eaff191b47 process class inheritance vtable fix 2026-03-01 14:34:07 +01:00
Luke Street 6a48380461 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 989c6ac3db Various minor warning fixes 2026-02-28 17:18:04 -07:00
Jasper St. Pierre 8023a38fea fopAc_ac_c inherit 2026-02-28 14:23:50 -08:00
TakaRikka b1f44ce532 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
Max Roncace 93dcac3343 Use attention enums everywhere instead of integer literals (#3044) 2026-01-14 16:55:59 +02:00
TakaRikka ce41820bf0 d_a_door_spiral mostly done (#3007) 2025-12-27 13:46:46 -07:00
Niklas Bauer 67b576ad9a f_op debug work (#2991)
* f_op debug 1

* f_op debug 2

* f_op debug 3

* f_op debug 4

* f_op debug 5

* f_op_debug fix build

* f_op linking

* remove goto in fopac_create

* fix regressions

* fix regressions

* pr comments
2025-12-26 13:17:51 -08:00
Max Roncace 8a478c5ebe d_a_mg_rod debug improvements (#2993) 2025-12-23 16:11:09 -08:00
Max Roncace a30e617e5a 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
LagoLunatic f97d334732 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
Carco_21 5716efc4c8 d_a_e_dn work (#2899)
* d_a_e_dn work

* PR cleanup and more documentation
2025-12-03 14:16:08 -08:00
Niklas Bauer c1861812ef 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 a6e76c0841 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
Howard Luck 20e9957356 d_a_alink_HIO work (#2852)
* daAlink_c::jointControll OK

* daalink debug work

* checkpoint

* fix casting

* checkpoint

* checkpoint

* checkpoint

* checkpoint

* checkpoint

* checkpoint

* checkpoint

* remaining functions + fixes round 1

* fixes round 2

* fixes round 3

* fixes round 4

* revert getNeckAimAngle for now
2025-11-30 22:26:50 +02:00
Carco_21 4d4444ca18 d_a_b_mgn debug almost equivalent (#2842)
* debug almost equivalent

* PR cleanup
2025-11-27 14:22:27 -08:00
Max Roncace 3080360a2a d_kankyo matching (#2872) 2025-11-26 13:52:12 -08:00
LagoLunatic 91011befd7 Remove fake matches, fix false equivalencies, and other small matches (#2837)
* Debug matches and remove fake matches

* Fix false equivalencies, regallocs, and vtable orders

* Fix PAL splits
2025-11-20 21:17:51 -08:00
hatal175 158899a16d debug work on d_a_e_fb (#2819) 2025-11-18 01:34:52 -08:00
LagoLunatic 23a1c94063 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
TakaRikka 850fae1aa3 m_Do_main / f_ap_game / f_op_actor debug work and misc (#2744)
* m_Do_main / f_ap_game debug stuff

* revolution sdk compatibility

* f_op_actor debug work

* rename fopAcM_SetupActor to fopAcM_ct

* fix build

* fix jp/pal splits
2025-10-19 20:30:49 +03:00
hatal175 8a99c051d1 d_a_e_yh OK (#2727) 2025-10-06 20:23:08 -07:00
LagoLunatic 6242aa6e84 Misc matches and fixes (#2703)
* Match mDoExt_morf_c::getPlayMode

* Misc cleanup

* Fix actor cull spheres

* Match daPy_py_c::getLastSceneSwordAtUpTime, JUTGamePad::testTrigger

* Fix improper demangling of dBgS_SphChk::SetCallback

* Fix d_camera rangef weak func order

* Match more alink_wolf funcs
2025-09-26 18:50:46 -07:00
LagoLunatic dbf6abeb90 Use composition instead of inheritance for most f_op classes (#2700) 2025-09-25 12:57:15 -07:00
Carco_21 bfeb1c048b d_a_e_zm matching (#2638)
* initial work

* a little more work

* matching

* pr cleanup

* changed 'subtype' to 'argument'

* fixed debug error
2025-09-10 01:53:13 +03:00
TakaRikka 52aa5f677f 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
Max Roncace 7d6c8ef3e5 d_a_e_kr equivalent (#2549) 2025-07-24 09:13:55 +03:00
Stbn-antier 522f06458d d_a_e_po 99% Matching (#2517)
* anm_init and nodeCallBack, need to review nodeCallBack as weird code

* First pass on class, 86% match

* Cleanup for PR, still work to do

* Solve error after pull

* Clangd format

* Adressing PR comments

* Update l_HIOInit

* Fix debug building, 60% match on debug :')
2025-07-15 23:35:50 +03:00
Carco_21 7025de1c9c d_a_e_mf equivalent and d_a_e_dn work (#2492)
* 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

* Worked on create function

* Worked up to search_bomb

* Work on various action functions

* Almost all functions worked on

* d_a_e_mf equivalent

* Started copying over to d_a_e_dn

* d_a_e_dn almost equivalent, e_mf cleanup

* somehow accidentally took out something from gra2 in a previous commit

* Fixed data layout issue in d_a_e_dn

* PR cleanup

* Took out fopen_enemy_c inheritance
2025-06-21 00:14:52 +03:00
hatal175 98f755e98a d_a_npc_worm matching (#2365)
* d_a_npc_worm matching

* Rename a_this
2025-03-31 18:30:42 -07:00
TakaRikka d7a8fb9d83 d_a_b_mgn equivalent (#2363) 2025-03-31 19:43:11 +03:00
Carco_21 fcf83b895b d_a_b_mgn (Dark Beast Ganon) (#2348)
* Started work on d_a_b_mgn

* Finished some of the smaller functions

* A lot of work on the set_Effect methods

* Work on CreateHeap

* Work on calcBloodMove

* Work on setHideSmokeEffect and _delete

* damage_check at 50%

* demo_skip 94% matching

* Work on some execute functions and a couple others

* Worked on last few functions and general cleanup

* Cleanup for pull request

* Last few pr review comments addressed
2025-03-27 15:45:21 -07:00
TakaRikka a4cdad86f4 b_gnd equivalent (#2340)
* b_gnd equivalent

* fix dEvt_info_c inlines

* fix some more inlines
2025-03-23 21:55:28 +02:00
LagoLunatic 4dc0cd9d09 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
Caroline Madsen 15a807bb7b e_rdy mostly done (#2324)
* e_rdy work

* e_rdy work

* e_rdy work

* e_rdy mostly done

* e_rdy fix hit direction
2025-03-12 16:02:03 -07:00
TakaRikka 9948a6371f wip debug / pal building, b_gm mostly done (#2285)
* b_gm mostly done

* wip debug / pal building

* fix configure.py

* fix some debug macros / flags
2025-01-16 19:37:39 +02:00
TakaRikka 24b72a5302 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
TakaRikka 8a0802554e d_a_alink work / lv4digsand done / e_s1 matched (#2224)
* d_a_alink work / d_a_obj_lv4digsand done

* d_a_e_s1 matched, not linked

* d_a_e_s1 documentation
2024-10-25 06:47:02 +03:00
TakaRikka 8514737d46 d_a_alink work / bump dtk version (#2205) 2024-10-12 15:11:17 -07:00
TakaRikka 12eb254d76 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 6eca7a83b9 obj_lv5YIblltray done (#2173)
* d_a_obj_lv5yiblltray done

* remove asm
2024-07-07 21:31:29 +03:00
TakaRikka d923917b39 work on d_camera / d_ev_camera (#2170) 2024-06-25 08:34:59 -06:00
TakaRikka 411a832fbb d_a_e_vt mostly done (#2158) 2024-05-24 20:47:15 -06:00
TakaRikka 6713925172 d_a_obj_item done (#2150)
* d_a_obj_item 99% done

* item cleanup

* remove asm

* add actor attention dist type enum

* change dist_entry names slightly
2024-05-08 07:21:07 +03:00
Caroline Madsen 3b4d74185d d_a_e_yc OK (#2143) 2024-05-01 09:16:22 +03:00