Commit Graph

844 Commits

Author SHA1 Message Date
LagoLunatic 93a2a6522a d_a_movie_player fixes 2026-08-12 12:56:27 -04:00
LagoLunatic 5f056105b3 d_a_magma OK for demo 2026-08-12 12:18:36 -04:00
LagoLunatic 2289b54d5f ba1 cleanup 2026-08-08 15:34:12 -04:00
Anthony Rossi 7bf6761243 D_a_npc_ba1 100% matching (#1144)
* Ba1 matched 100%

* last fixes

* Proper interaction with actor_fa

* Not matching 100% on JP

* Matching on JPN

* Forgot to update the configure file ...

* 100% matching

* Applied review suggestions

---------

Co-authored-by: Anthony Rossi <anthony.rossi@pm.me>
2026-08-08 15:01:29 -04:00
LagoLunatic 1d57f04689 salvage_tbox demo match and fix inlines 2026-08-03 17:54:03 -04:00
Anders Gjerde cb6a9205db d_a_salvage_tbox - 100% (GZLJ01, GZLE01, GZLP01) (#1113)
* First attempts at d_a_salvage_tbox

* CreateHeap match

* set_mtx 87%

* set_mtx 100%

* initWaitGetItem 93%

* initWaitGetItem 98.24%

* initWaitGetItem 98.24% - removed comments

* Removed unecessary fields

* actWait02 78.04%

* daSTBox_Draw 100%

* _create 39.71%

* _create 80.10%

* _create 98.50%

* Some changes in class members to be done, _create 99.99%, started on shadowEcallBack.

* _create 100%, shadowEcallBack.getMaxWaterY 84.93%, shadowEcallBack.setup 100%

* shadowEcallBack.getMaxWaterY 93.68%

* shadowEcallBack.getMaxWaterY 94.64%

* shadowEcallBack.getMaxWaterY 99.32%

* getWaterY 99.62%

* Swap position of mpAngle to get setup back to 100%

* actWait02 81.50%

* actDrop 74.60%

* actDrop 98.80%

* actWait 32.54%

* actWait 84.60%

* actWait 88.69%

* actWait 99.35%

* actWait02 100%

* _delete 55.71%

* _delete 97.57%

* _delete 99.12%

* shadowEcallBack_c::execute 79.13%

* shadowEcallBack_c::execute 99.70%

* CreateInit 94.92%

* CreateInit 98.64%

* shadowEcallBack_c::draw 21.24%

* shadowEcallBack_c::draw 34.81%

* shadowEcallBack_c::draw 54.72%

* shadowEcallBack_c::draw 69.86%

* shadowEcallBack_c::draw 97.99%

* shadowEcallBack_c::draw 99.10%

* actWait 99.43%

* _execute 40.58%

* _execute 73.14%

* _execute 98.29%

* initWaitGetItem improvements 98.24%

* initWaitGetItem 100%

* Removed unnecessary this->

* _delete 100%

* actWait 99.82%

* CreateInit 99.52%

* shadowEcallBack_c::getMaxWaterY 99.32%

* CreateInit 99.52%

* Simplified getStaffId in _execute

* shadowEcallBack_c::draw 99.11%

* shadowEcallBack_c::draw 99.23%

* shadowEcallBack_c::draw 99.48%

* actWait 99.85%

* Named shadowCallback

* actDrop 99.60%

* Renamed m_arc_name to m_arcname

* actWait 99.97% - using dComIfGp_particle_setShipTail

* _execute 99.58% - changed actIdx type to s16

* _execute 98.43% - reverting actIdx type back to int.

* CreateInit 99.92% - created cXyz position in shadowEcallBack.

* _execute 100% - cast on ship.

* .rodata 100% - Moved crane_offset above actWait where it first is used.

* Hoisted alpha_arr in shadowEcallBack_c::execute but to no avail.

* shadowEcallBack_c::execute 100% - emitter->setGlobalTranslation for regswap and used inline emitter->setGlobalRotation

* shadowEcallBack_c::draw 100% - moved fVar3 down a few lines to fix regswap

* shadowEcallBack_c::execute 100% - getting global translation object, only modifying its y property, and setting it again.

* Removed Nonmatching from matching functions and fixed memory offsets in shadowEcallBack_c.

* Linked - Added destructor for shadowEcallBack and added Matching in configure.py

* Set MatchingFor Japanese, United Statian and European versions - demo differs quite a bit.

* Removed incorrectly added include d_a_ship.h from d_com_inf_game.h

---------

Co-authored-by: Anders Gjerde <mail@mail.com>
2026-08-03 16:36:40 -04:00
LagoLunatic 537b6cfc3b use 4 spaces for indentation instead of 2/8/etc 2026-08-03 01:53:25 -04:00
WilliamArnett 11f4940d74 d_a_npc_p1 100% Matching (#1098)
* 99% match

* Rewrote _execute to increase accuracy. Only issue in .text is a label not loading correctly. I have no idea how to fix this.

* Equivalent. Weak func ordering.

* 7% text

* 28% text

* 41% text

* 65% text

* Rewrote _execute to increase accuracy. Only issue in .text is a label not loading correctly. I have no idea how to fix this.

* Equivalent. Weak func ordering.

* 82% text

* Equivalent. A lot of work is needed to name variables and clean up functions. Weak function ordering is wrong.

* Cleaned some functions, named several variables, and began documenting dialog tree.

* Naming a couple more variables

* 21% text

* change out getMySubstanceP for getMyIntegerP inline

* 100% text

* Refactor to use JUT_ASSERT macro

* #181: d_a_tag_attention matching; TODO: implement chk_inside and dComIfGp_att_Look2RequestF

* #181: continue working on d_a_tag_attention, matching almost complete

* #181: revert naming class member (not certain enough)

* #181: preliminary changes to resolve #784 comments regarding usage of debug maps

* #181: commit suggestion by @WilliamArnett, fixing regalloc error

Co-authored-by: WilliamArnett <149556961+WilliamArnett@users.noreply.github.com>

* #181: fix missing curly bracket

* #181: resolve #784 comments with the kind help of @WilliamArnett;
 move `daTagAttention::Act_c::chk_inside` to header file; split `plyrToObjVec` definition to match assembly;
 remove temp variable, use values directly and swap operands;
 implement `Look2RequestF` in `include/d/d_attention.h`;
 remove non-matching use of temp variable `iVar1` and replace `current.pos` with uninitialized variable in `daTagAttention::Act_c::_execute`

* Update fork to match upstream

* some changes

* 73% text

* 100% Matching minus kaji_anm

* Delete debug/m2cdecomp

* revert unnecessary file changes

* remove d_a_npc_p2_cut.inc

* Match kaji_anm

* swap declaration order of l_msg and l_msgId

* Naming many fields

* Implement GetKajiID inline

* Enum and variable names

* Remove virtual genMessage function

* Implement @LagoLunatic 's suggested changes

* Revert array changes in d_camera.h (@LagoLunatic suggested change)

* Whitespace

* Rename dSnap enum

---------

Co-authored-by: Skelp <skelp@pm.me>
Co-authored-by: Skelp <59535863+Skelp@users.noreply.github.com>
2026-08-03 01:40:12 -04:00
Teddy Heidmann 5063d3433c zeldaret/tww#385 d_a_obj_drift (#1100)
* zeldaret/tww#385 d_a_obj_drift

* configure changes

* GZLJ01

* D44J01

* Not matching D44J01

* demo support

* variable cleanup

* revert new helper

* revert again

* Attempt 2

* Try to fix non-deterministic issue

* Revert tide fix

* debug mapping

* more map fixes

* Update src/d/actor/d_a_obj_drift.cpp

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

* review comments

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2026-07-30 22:46:56 -04:00
LagoLunatic 2bebe68302 majyuu door inlines 2026-07-30 17:17:14 -04:00
Teddy Heidmann 32cd6f7080 d_a_obj_majyuu_door 100% Matching (#1138)
* Initial structure

* More progress

* fix index

* _create()

* more progress

* modeProcCall

* fix smoke_set

* Matching

* add demo support, remove current.roomNo

* cleanup
2026-07-30 17:11:54 -04:00
LagoLunatic be8da688fc zl1 cleanup, inline cleanup 2026-07-27 12:14:38 -04:00
LagoLunatic 2091385155 Demo matches 2026-07-24 14:25:28 -04:00
LagoLunatic 7efaae45c7 A couple demo matches 2026-07-24 11:25:35 -04:00
LagoLunatic 4efda6f355 Minor cleanup
Inlines, wrong indentation, enums, private fields, etc
2026-07-23 17:48:51 -04:00
LagoLunatic 2115d05965 d_a_npc_ls1 anim field naming pass, add enums 2026-07-22 21:28:12 -04:00
WilliamArnett bf372802ca d_a_npc_bm1 100% Matching Retail (#1107)
* 99% match

* Rewrote _execute to increase accuracy. Only issue in .text is a label not loading correctly. I have no idea how to fix this.

* Equivalent. Weak func ordering.

* 7% text

* 28% text

* 41% text

* 65% text

* Rewrote _execute to increase accuracy. Only issue in .text is a label not loading correctly. I have no idea how to fix this.

* Equivalent. Weak func ordering.

* 82% text

* Equivalent. A lot of work is needed to name variables and clean up functions. Weak function ordering is wrong.

* Cleaned some functions, named several variables, and began documenting dialog tree.

* Naming a couple more variables

* 21% text

* change out getMySubstanceP for getMyIntegerP inline

* 100% text

* Refactor to use JUT_ASSERT macro

* #181: d_a_tag_attention matching; TODO: implement chk_inside and dComIfGp_att_Look2RequestF

* #181: continue working on d_a_tag_attention, matching almost complete

* #181: revert naming class member (not certain enough)

* #181: preliminary changes to resolve #784 comments regarding usage of debug maps

* #181: commit suggestion by @WilliamArnett, fixing regalloc error

Co-authored-by: WilliamArnett <149556961+WilliamArnett@users.noreply.github.com>

* #181: fix missing curly bracket

* #181: resolve #784 comments with the kind help of @WilliamArnett;
 move `daTagAttention::Act_c::chk_inside` to header file; split `plyrToObjVec` definition to match assembly;
 remove temp variable, use values directly and swap operands;
 implement `Look2RequestF` in `include/d/d_attention.h`;
 remove non-matching use of temp variable `iVar1` and replace `current.pos` with uninitialized variable in `daTagAttention::Act_c::_execute`

* Update fork to match upstream

* some changes

* 12% text

* 21% text

* 26% text

* 43% text

* 51% text

* Revert unnecessary file changes

* Update d_a_tag_attention.cpp

* 55% text

* 52% text

* 52% text

* 56% text

* 68%

* 77% text

* 100% matching minus regswap

* 100% matching for retail

* Many more demo matches

* Fix broken match in _create()

* Demo Match

* Add some missing inlines

* Fix dComIfGp_setMesgCameraInfoActor

* More inline matching

* fix broken demo match

* Name some fields

* Utilize EventBit enum

* Name more fields, and add inline calls to d_a_npc_ls1

* Remove comments

* Implement @LagoLunatic suggested changes

* remove actor cast from dSnap_RegistFig calls

* Fix broken match in eInit_ATTENTION_

* Second round of @LagoLunatic 's suggested changes

---------

Co-authored-by: Skelp <skelp@pm.me>
Co-authored-by: Skelp <59535863+Skelp@users.noreply.github.com>
2026-07-22 20:10:59 -04:00
LagoLunatic 5c556d3c53 Enum usage 2026-07-22 12:36:48 -04:00
LagoLunatic 0fdc3a3f3b Cleanup/documentation for various photo-related code 2026-07-19 15:54:06 -04:00
LagoLunatic c1513e97e5 Some npc/ship inline fixes from debug map 2026-07-17 16:08:55 -04:00
Zeclos d3d65a4d8c d_a_npc_mk matching (#1115)
* matching

* cleanup

* d_a_npc_tt matching outside of _create and rodata

* matching

* all symbols matching order wrong fake inline usage

* matching

* cleanup, naming of some fields and enums

* undo changes
2026-07-16 17:23:52 -04:00
LagoLunatic 98721a6b80 d_a_npc_tt inlines fix 2026-07-13 13:37:02 -04:00
LagoLunatic aefdf7499b d_a_obj_tide use res enums 2026-07-08 11:59:39 -04:00
LagoLunatic 68ea9331aa d_a_npc_mt OK for all versions
closes #348
2026-07-05 14:07:43 -04:00
Mattias Blum 6812d925ff d_a_npc_mt 100% for GZLE01 (#1102)
* d_a_npc_mt 100% for GZLE01

* implemented dPb_erasePicture and added some relevant inlines

* fixed existing references to mSelectPicture

* PR changes made
2026-07-05 13:49:57 -04:00
Zeclos a7a5b5d636 D_a_npc_tt (#1099)
* matching

* cleanup

* d_a_npc_tt matching outside of _create and rodata

* matching

* cleanup
2026-07-05 13:11:40 -04:00
TakaRikka 88a753265e water_mark / wpillar done, minigame_starter wip (#1069)
* d_minigame_starter attempt

* water_mark / wpillar done

* review changes
2026-06-28 18:40:28 -04:00
SuperDude88 4b401652d9 d_a_kb Almost Matching (#1040)
* d_a_kb Almost Matching

- Get most of the logic in

Still need to switch over from inheritance to composition, will fix at least 2/3 of the functions

* Switch Inheritance -> Composition

Causes regressions in way_check and target_set

* Use More Enums

Now uses res/loop mode/item number/sound/particle/collision attribute/event flag enums properly

* Fix d_a_npc_people

Used kb_class in a couple spots

* Another Inline

Found it in the debug map

* Joint Enums

- Add joint enums with note about normal/big pigs needing to have (at least partially) identical joint setups

* Assert for Joint Numbers

- Make sure the joint numbers match for the normal pig + big pig models
- Update/extend note accordingly
2026-06-26 17:45:09 -04:00
LagoLunatic ed343703e6 Fix include capitalization 2026-06-16 14:59:27 -04:00
123456789758 d61a31e7ab Use joint enums in several different places (#981)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2026-06-16 14:55:36 -04:00
N1ghtD3c0d3r f2d931cd81 d_a_lstair - 100% matching for GZLJ01, GZLE01 and GZLP01 (#1039)
* d_a_lstair - 100% matching for GZLE01

* d_a_lstair - 100% matching for GZLE01 - restore comment deleted by mistake

* d_a_lstair - 100% matching for GZLE01 - fix return values of functions in the MethodTable; replace code with some inlines and macros; improve some casting locations; replace some magic numbers with enum usage; adjust res enum file according general update in the codebase

* d_a_lstair - 100% matching for GZLE01 - remove useless parameter

* d_a_lstair - 100% matching for GZLJ01, GZLE01 and GZLP01
2026-05-31 18:00:48 -04:00
LagoLunatic bae595b973 Update all code to use the new enum formats 2026-05-29 16:34:55 -04:00
LagoLunatic b597e195b4 Match 3 more d_a_tn funcs, clean up some inlines 2026-05-28 18:36:35 -04:00
123456789758 ce8aa593df d_a_tn - 99% matching (#994)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2026-05-28 13:59:57 -04:00
123456789758 a70388d63f d_a_mo2 - 100% matching (#939)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2026-05-28 13:46:38 -04:00
LagoLunatic 102042628f Process profiles and enums cleanup (#1031)
* Fix some profile comments

* Add missing static for local visibility data

* Move proc name and draw priority enums to f_pc

* Add _e suffix to daObjBarrier_c proc enum

* Change proc name enum format to match TP

* Change draw prio enum format to match TP

* Change ItemNo enum format, finish fixing item names

* Revert static for cb1 hio

* Clean up formatting of profile comments

* Fix comment alignment
2026-05-26 00:11:58 -04:00
LagoLunatic 9ec2756f98 d_a_obj_hlift OK
closes #410
2026-05-25 18:15:55 -04:00
marian-m12l 7a2286565a d_a_obj_hlift (#1015)
* first pass on d_a_obj_hlift

* shuffle data + more matching functions

* fix unnamed namespace + use resource enum

* fix set_mtx demo

* fix modes u_l_ and l_u

* fix demo assert

* vib_proc 98% demo

* enum names

* fixes after review

---------

Co-authored-by: marian <marian.muller@serli.com>
2026-05-25 17:54:31 -04:00
LagoLunatic 4550a9aae6 d_a_bst OK for USA
closes #277
2026-05-23 17:28:49 -04:00
LagoLunatic a3e422e481 d_a_npc_md 99% for demo 2026-05-22 20:08:54 -04:00
LagoLunatic 47e01ede22 Fix d_a_npc_md inline usage 2026-05-22 18:43:02 -04:00
LagoLunatic 6a1073e705 Fix d_a_npc_md weak func order, clean up order fakematches from d_a_player main
closes #226
2026-05-22 15:50:17 -04:00
123456789758 02b81a670b d_a_npc_md - 99% matching (#896)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2026-05-22 00:21:27 -04:00
LagoLunatic ab5659b201 d_a_player_main cleanup and some demo matches (#1016)
* d_a_player_main cleanup and some demo matches

* Add unions for player_main procvars

* Make d_a_player_main fields private
2026-05-21 19:18:46 -04:00
LagoLunatic d10eaa3ef8 d_a_obj_jump initial documentation pass 2026-05-21 14:41:15 -04:00
Teotia444 fcf5898096 d_a_npc_ah OK (#1014)
* d_a_npc_ah ok

* remove fake struct

* d_a_npc_ah OK for D44J01

* d_a_npc_ah OK

* Demo/enum fixes for d_a_npc_ah
2026-05-21 14:04:40 -04:00
marian-m12l 0568d6fe35 d_a_obj_jump (#997)
* start work on d_a_obj_jump

* rough pass over all functions

* fix CreateHeap

* mode_wait 99%

* mode_lower 99%

* draw 99%

* attr accessor

* fixes for Create

* match rideCB with weirg pointer arithmetic

* Execute 99%

* jnodeCB_lower 96%

* set_mtx 99%

* fix set_push_flag

* Create 96%

* retype field

* cleanup

* tiny fix

* split class fields + call inline functions

* Attr_c struct fields + prm_get_type

* fix class fields + match Mthd_Create + 90+% Create and jnodeCB_lower

* improve redability for rideCB

* Create 100%

* add Prm_e enum

* clean unnecessary return and this->

---------

Co-authored-by: marian <marian.muller@serli.com>
2026-05-19 17:13:38 -04:00
LagoLunatic d5d5a23a0c d_a_player_main OK (#1010) 2026-05-18 20:30:12 -04:00
LagoLunatic bc09a831c5 Fix compile and link errors when building in debug mode 2026-05-18 00:54:24 -04:00
LagoLunatic 6002c9bda4 d_a_himo2 99% (#1009) 2026-05-18 00:10:32 -04:00