Commit Graph

2878 Commits

Author SHA1 Message Date
oga-sven 6b91a845e1 d_a_himo2 improvements 2026-09-26 13:17:42 +02:00
LagoLunatic 2fbb91bbe2 Merge pull request #1218 from SuperDude88/main
More Consistent Macro Usage
2026-09-25 19:15:55 -04:00
SuperDude88 94fb9e0e41 Change ALIGN_DECL
MWCC 1.3.2 requires the attribute in a different place than later versions/most modern compilers, so make the macro handle the ordering

C++ structs don't seem to have ordering issues so they use the attribute directly
2026-09-25 16:19:00 -04:00
SuperDude88 2588a1f52e __Register Macro
Use __Register more consistently when not inside __MWERKS__ guard
2026-09-25 15:47:01 -04:00
SuperDude88 e9c8cfca7b ASM Macro Use
- Use ASM macro more consistently when it's not inside a __MWERKS__ guard
2026-09-25 15:45:51 -04:00
LagoLunatic 96bbf3e97e Add some more inlines 2026-09-25 14:03:54 -04:00
LagoLunatic 624ab5f13c d_a_bomb2 OK for demo 2026-09-25 09:45:34 -04:00
LagoLunatic f32cc7002c Fix debug build 2026-09-25 08:57:19 -04:00
LagoLunatic 49757b75fd Fix clangd warning about pragma pack 2026-09-24 16:08:19 -04:00
LagoLunatic 39f3cfdf14 J3DSys enum usage 2026-09-24 15:58:39 -04:00
LagoLunatic bb9271a9b8 J3D_ASSERT cleanup 2026-09-24 15:57:35 -04:00
LagoLunatic a61e15e431 Use packed structs when accessing save data fields instead of pointer casts, also use sizeof 2026-09-24 15:38:51 -04:00
LagoLunatic a757be3c24 Improve some d_camera funcs, fix dCamSetup_c fields being mixed up 2026-09-24 14:24:56 -04:00
LagoLunatic a15aec383f Merge pull request #1216 from SuperDude88/main
More Random Cleanup
2026-09-24 14:16:21 -04:00
Jcw87 52c3c0dbfc d_camera (#1217) 2026-09-24 12:30:17 -04:00
SuperDude88 aa1377886c Random Bits
A couple other things I decided to throw in
2026-09-23 22:20:47 -04:00
SuperDude88 7953486589 Explicit Template Types
u32 and the literal suffixes don't necessarily refer to the same type depending on compiler
2026-09-23 22:17:12 -04:00
SuperDude88 b57c63423f Enum Usage 2026-09-23 22:17:12 -04:00
SuperDude88 db2cc9d295 A Bunch of uintptr_t
A couple of these are odd because nearby asserts have (u32) that might suggest they didn't use it originally (but for matching purposes uintptr_t is just a typedef for u32)

Most don't have that issue, though
2026-09-23 22:17:12 -04:00
SuperDude88 236bf47a63 Fixed-Width Type Consistency
Make sure some of the declarations + definitions are consistent, plus some other misc fixes
2026-09-23 22:17:11 -04:00
SuperDude88 6b16b4bf6c GX Inlines
Use more inlines instead of directly dealing with GX FIFO
2026-09-23 22:17:11 -04:00
SuperDude88 aebb9e582b Redundant Struct Declarations 2026-09-23 22:16:42 -04:00
SuperDude88 c0ee29942a Questionable const char*
Some more instances of const char* that either required new casts to compile or seem inconsistent/possibly not real (event-related stuff, etc)
2026-09-23 21:34:32 -04:00
SuperDude88 d1d7b5bdd3 More const char*
Change a bunch of char* -> const char* to be more standard-compliant. These ones didn't require extra casting/didn't seem particularly inconsistent with nearby uses.
2026-09-23 21:23:54 -04:00
LagoLunatic 6a3a6d67a5 Implement all dBgW inlines 2026-09-23 18:27:20 -04:00
SuperDude88 ba6cb244a9 Random Minor Cleanups (#1177)
* Flower/Grass Cleanup

* Use ARRAY_SSIZE More

Doesn't touch the ones with (s32) casts since some break with (int)

* Improve d_menu_window Strings
2026-09-23 17:56:30 -04:00
LagoLunatic e88c3ac388 d_cc_s OK for demo 2026-09-23 16:42:57 -04:00
LagoLunatic e652f902b7 d_a_player_main inlines and fix himo2/himo3 confusion 2026-09-23 16:19:00 -04:00
LagoLunatic 72d0923cfe Use SQUARE macro for more literals 2026-09-23 16:04:02 -04:00
LagoLunatic 4c0b75df41 d_a_andsw0 OK for demo 2026-09-23 15:58:46 -04:00
LagoLunatic 82f1e2c734 d_a_saku matching for all retail versions, add inlines, and almost matching for demo 2026-09-23 13:44:28 -04:00
Kenz Linden ae3b3b0deb d_a_saku GLZE01 (#1214)
* daSaku_c matching setMoveBGMtx func

* minor adjustment of daSaku_c setMoveBGMTx func

* remove unecessary class declaration in d_a_saku header

* daSaku_c setEffFire matching

* d_a_saku Draw func matching

* d_a_saku move mtx into array

* d_a_saku move mtxs out of array, setMtx func matching

* d_a_saku checkCol func matching

* d_a_saku checkCol func cleanup

* d_a_saku move related adjacent values into array as opposed to separate variables

* d_a_saku setup HIO class

* d_a_saku mode_break_throw_obj matching, adjust other funcs for data type change

* d_a_saku broken matching, update other funcs to reflect changed data types

* d_a_saku change collision func matching

* d_a_saku burn matching

* fix sakuHIO class data structure

* d_a_saku execute matching

* d_a_saku GetDzId func matching

* d_a_saku CreateHeap func matching

* d_a_saku daSaku_Delete func matching

* d_a_saku adjust data type, update matching funcs for updated data type

* d_a_saku mode_break_none func matching

* d_a_saku daSaku_create matching except stringbase, fix CreateHeap func type

* d_a_saku fix CreateHeap and loadModel func types

* d_a_saku RecreateHeap func matching except stringbase

* d_a_saku CreateInit matching

* d_a_saku CreateDummyHeap func matching

* d_a_saku matAlphaAnim, changeXluMaterialAlpha, l_blendInfo, l_zmodeInfo, l_zmodeInfo2 matching

* d_a_saku DrawSub matching, adjust matAlphaAnim output type

* d_a_saku MoveBGResist func matching

* d_a_saku fix matAlphaAnim to use u16 in for loop

* d_a_saku mode_break_fire func matching

* d_a_saku loadModel func matching except stringbase

* d_a_saku loadMoveBG func matching

* d_a_saku update mode_break_throw_obj heap name

* d_a_saku change my_cyl_src to not const to force into .data

* d_a_saku setCol matching

* d_a_saku adjust loadModel value to correct val

* d_a_saku setEffBreak func matching

* d_a_saku fix sakuHIO_c destructor not properly initialised

* d_a_saku instantiate static vars, re-shuffle to get correct ordering and data placement

* d_a_saku remove redundant "this" usage

* d_a_saku run format on doc

* d_a_saku remove redundant non-matching comments

* d_a_saku cleanup - var names, formatting, function cleanup

* d_a_saku marked as matching

* d_a_saku remove redundant class declaration

* d_a_saku implement code review feedback

* reverse formatter making changes to configure.py

* d_a_saku code review fixes
2026-09-22 21:46:01 -04:00
LagoLunatic 1b5b1ccf41 d_a_npc_cb1 OK for JPN, almost for demo 2026-09-22 15:59:54 -04:00
LagoLunatic 0655ef6014 d_a_agb near matching for demo, one regalloc left 2026-09-22 15:20:06 -04:00
LagoLunatic f6616c1064 d_a_obj_figure OK for demo, fix wrong enum usage for retail 2026-09-22 14:28:18 -04:00
LagoLunatic 7f8a57ed3d warpls inlines from debug map 2026-09-22 13:06:04 -04:00
Luke 03a2cd7ae1 d_a_warpls 100% matching (#1054)
* d_a_warpls 100% matching

* warpls updated

Changed some member types to better attribute to their usage. Added member and local names as close to what they do. Cleaned up functions and some missing inlines.

* tweak some floats to suffix "f"

* Names & Member Funcs

Feel pretty good about these changes. I also added enums for the type of warp, event type and event state for readability.

* implement review changes

* missing space
2026-09-22 12:57:30 -04:00
LagoLunatic 6530b9186d d_a_obj_mmrr OK for demo 2026-09-21 20:08:53 -04:00
LagoLunatic 0fa15419e3 d_menu_item some more matches 2026-09-21 13:40:42 -04:00
LagoLunatic 496a768976 d_a_obj_gryw00 OK for demo 2026-09-21 12:55:46 -04:00
Robert Kämpf d09d06562b d_a_obj_mmrr 100% matching (#1212)
* d_a_obj_mmrr 80% matching

* d_a_obj_mmrr 100% matching & linked

* Cleanup and renames

* Remove commented out code

* Exclude demo version from matches

* Use particle id enum
2026-09-21 12:22:18 -04:00
TakaRikka 856594c384 d_menu_item mostly done (#1213)
* d_menu_item mostly done

* a little documentation
2026-09-21 02:50:40 -04:00
LagoLunatic ae69d049e9 YLzou documentation 2026-09-21 02:02:54 -04:00
Lee, Derek 5725ecf675 d_a_obj_YLzou matching (#1118)
* Most simple functions match or almost matching

* Run format

* set_start_type except some regswap

* Fix set_start_type regswap

* create_heap match except instruction locations

* eff_set_slip_smoke_pos matching except for some offsets

* Remove unnecessary

* Capitalize some hex

* eff_smoke_slip_start matching except some offsets

* Remove debug map comment

* name emitter

* vib_proc matching except some offsets

* demo_regist_wait_act_proc match

* demo_vib_start_wait_act_proc 100%

* Remove useless return

* demo_vib_act_proc matching except instruction offsets

* format

* move_ylzou_demo_move_act_proc matching except for instruction locations

* Clean up unnecessary returns

* demo_end_wait_act_proc except instruction offset for instruction offsets

* format

* demo_regist_wait_act_init_proc matched

* demo_end_wait_act_init_proc matching except instruction offsets

* go_up_stairs_demo_move_start_wait_act_init_proc matching except instruction offsets

* go_up_stairs_demo_move_act_proc matching except instruction offsets

* formatting

* _execute matching

* _create matched

* _delete matching

* rename variable to match objdiff

* 100% match

* Cleanup

* Add matching for since it doesn't match for demo

* Match d_a_obj_YLzou

* Demo matching

* Demo matched

* Update d_a_obj_YLzou.cpp

* Format and type triforce_complete as BOOL

---------

Co-authored-by: WilliamArnett <arnettwilliam7@gmail.com>
2026-09-20 23:33:32 -04:00
LagoLunatic adfcecf5f9 tag_ba1 OK for demo, fix inline usage 2026-09-20 23:05:42 -04:00
Phillip Stephens cf50f63c42 Match d_a_tag_ba1 (#1211)
* Match d_a_tag_ba1

* Don't link against D44J01

* Format nits
2026-09-20 22:56:00 -04:00
Teddy Heidmann 6efcd81322 d_a_npc_mn (#1210)
* class structure

* .data

* .rodata

* small fns

* talk2()

* phase_1, phase_2

* createHeap(), _delete()

* createInit, eventMesSetInit

* _draw(), _execute()

* not inlines

* executeWait()

* weird bool vs BOOL return

* executes

* more events

* talk3()

* getMsg() and anm fns

* privateCut()

* chkAttention()

* lookBack()

* remaining fns

* fieldNames

* matching retail

* D44J01

* add state enums

* review comments
2026-09-20 17:15:46 -04:00
LagoLunatic 74bc569576 clean up z/y/x set expressions 2026-09-20 13:49:04 -04:00
LagoLunatic 3bf1629173 JASBasicWaveBank OK 2026-09-20 13:16:06 -04:00
Jcw87 9066be8e31 JAudio (#1209) 2026-09-19 22:17:23 -04:00