166 Commits

Author SHA1 Message Date
Derek Hensley 61a38830b9 Spimdisasm update (#243)
* git subrepo pull tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "5c3984fc"
upstream:
  origin:   "git@github.com:simonlindholm/asm-processor.git"
  branch:   "main"
  commit:   "5c3984fc"
git-subrepo:
  version:  "0.4.9"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "ea10886"

* Fix things needed for new spimdisasm release
2025-09-04 17:56:01 -07:00
kuchenmitsahne a4d5910cdb m_random_field OK (#241)
* 25 functions OK

* 10 functions OK

* Add block type and block kind enums/defines

* Formatting/style pass

* Move `FieldMakeBlockType` to `m_field_make`

* Remove unused/duplicate defines

* Split data out for `m_quest` and `m_random_field`; rename data symbols

* Generate `m_random_field.c` and rename function symbols.

* mRF_BlockTypeDirect2GateType, mRF_BlockTypeDirect2GateData OK

* mRF_Type2BlockInfo, mRF_Info2BlockType, mRF_GateType2GateCount, mRF_SearchPond, mRF_Attr2BeastRoadAttr, mRF_CheckBeastRoad OK

* mFI_GetUnitCol OK; mRF_PrintDebug and mRF_BlockInf2CheckBeastRoad OK (pending data import).

* Fix `m_random_field` code split; all newly included functions OK

* Fix mRF_Malloc return type; formatting pass

* Name m_random_field_ovl

* Rename data symbols (m_random_field_ovl).

* Rename symbols (all functions named)

* Import data

* Declare overlay segment; rename symbols

* mRF_MakeRandomField OK (all functions matching).

* Extract asset `data_combi_table`

* Clean up mRF_MakeRandomField; document m_field_make.h

* Rename mCoBG_unkStruct->unk6 as unitAttribute

* Misc cleanup and formatting.

* Rename additional data symbols (m_random_field_ovl).

* Formatting pass

* Improve documentation of BackgroundAttribute enum.

* Formatting pass; add omitted attribute.
2025-06-04 16:38:23 -07:00
Derek Hensley 8c6ae625ae Ultralib Update (#233)
* git subrepo pull (merge) lib/ultralib

subrepo:
  subdir:   "lib/ultralib"
  merged:   "74f0eee"
upstream:
  origin:   "git@github.com:decompals/ultralib.git"
  branch:   "main"
  commit:   "2717d45"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "cce3d93"

* New ultralib fixes

* Update some includes in tools

* git subrepo commit (merge) lib/ultralib

subrepo:
  subdir:   "lib/ultralib"
  merged:   "3a702eaf"
upstream:
  origin:   "git@github.com:decompals/ultralib.git"
  branch:   "main"
  commit:   "48f9f908"
git-subrepo:
  version:  "0.4.9"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "ea10886"

* Update warnings file
2025-02-21 17:03:51 -07:00
Derek Hensley f013a028f4 sFRm_flashrom OK (#240)
* YAML setup

* func_800CDF78_jp

* func_800CDEDC_jp

* func_800CDCC0_jp

* func_800CDE54_jp

* func_800CDB10_jp

* func_800CDECC_jp

* func_800CE04C_jp

* func_800CDBE0_jp

* func_800CDBF0_jp

* func_800CDC10_jp

* func_800CDC30_jp

* func_800CDDE0_jp

* func_800CE090_jp

* func_800CE0E8_jp

* func_800CE110_jp

* Cleanup
2025-01-21 09:34:12 -07:00
Derek Hensley 7c3634c2fb s_cpak OK (#239)
* YAML setup

* func_800CD640_jp

* func_800CD68C_jp

* func_800CD730_jp

* func_800CD8F8_jp

* func_800CD990_jp

* func_800CD9F0_jp

* func_800CDA4C_jp

* func_800CDA90_jp

* func_800CDAD0_jp

* func_800CD760_jp

* func_800CD82C_jp

* Cleanup
2025-01-20 11:52:28 -07:00
Derek Hensley 6baf5141be m_cpak OK (#238)
* Yaml setup

* mCPk_InitPak

* mCPk_get_pkinfo

* mCPk_PakOpen

* func_80079080_jp

* mCPk_SavePak

* func_8007919C_jp

* func_80079378_jp

* func_8007920C_jp

* func_80078EE0_jp

* func_80078EB4_jp

* func_8007942C_jp

* func_800792FC_jp

* func_800793A8_jp

* func_80079D00_jp

* func_80079BF8_jp

* func_80079B28_jp

* func_80079EA4_jp

* func_800794E4_jp

* func_80078F08_jp

* func_80079030_jp

* func_80078FE8_jp

* func_8007967C_jp

* func_80079708_jp

* func_80079760_jp

* func_80079838_jp

* func_800798DC_jp

* func_80079A24_jp

* func_80079AAC_jp

* func_80079E54_jp

* func_80079D50_jp

* func_80079E14_jp

* func_80079EDC_jp

* func_8007A008_jp

* func_80079F44_jp

* func_8007A080_jp

* func_80078F34_jp

* Some cleanup

* m_cpak
2025-01-19 09:05:03 -07:00
Derek Hensley a9e52e5a55 Cfbinfo (#237)
* func_800D2CDC_jp

* func_800D2CB4_jp

* func_800D2C10_jp

* cleanup

* Small docs of CfbInfo struct
2025-01-03 17:51:33 -07:00
Derek Hensley f319c81250 Graph OK (#236)
* graph_proc

* game_get_next_game_dlftbl

* graph_ct

* func_800D38E0_jp

* func_800D3C94_jp

* graph_dt

* graph_main

* graph_setup_double_buffer

* graph_task_set00 WIP

* graph_draw_finish

* func_800D3E40_jp

* func_800D3E14_jp

* Some cleanup

* Fix m2ctx.py

* graph_task_set00
2025-01-03 13:05:50 -07:00
Derek Hensley cb54eb49e4 6FD190 + 6FD410 OK (#235)
* func_800D94F0_jp

* func_800D9514_jp

* func_800D9524_jp

* func_800D955C_jp

* func_800D9618_jp

* func_800D96A8_jp

* func_800D96E8_jp

* func_800D9700_jp

* func_800D9750_jp

* func_800D9760_jp

* func_800D9770_jp

* func_800D9788_jp

* func_800D97A0_jp

* func_800D97F8_jp

* func_800D986C_jp

* Split off 6FD410 based on bss

* Migrate bss

* add todo

* headers

* Better types for 6FD410 bss based on graph

* Cleanup
2024-12-28 08:59:22 -07:00
Derek Hensley 7ba4585497 Move D_8003C568_jp from system_heap (#231) 2024-12-26 08:33:00 -07:00
Derek Hensley b73a19dd98 Identify audio_data data (#232) 2024-12-26 08:19:10 -07:00
Derek Hensley bececbff99 main OK (#234)
* main OK

* gSegments -> SegmentBaseAddress

* newline

* format
2024-12-26 08:14:55 -07:00
kuchenmitsahne 60579a4260 m_field_info 37 additional functions OK (40/188 total) (#230)
* 25 functions OK

* 10 functions OK

* Add block type and block kind enums/defines

* Formatting/style pass

* Move `FieldMakeBlockType` to `m_field_make`

* Remove unused/duplicate defines
2024-12-13 09:54:39 -07:00
Leonid Kapitonov 8e54519977 ac_house_goki OK (#229)
* prepare unknown size

* move `.data` to the C side

* remove redundant headers

* aHG_actor_ct OK

* func_80A83770_jp OK (rename to `aHG_actor_dt`)

* aHG_actor_move OK

- fix `mCoBG_CheckResult` description and comments
- extend `MyRoomClip` and fix offsets in comments

* func_80A83780_jp OK

* func_80A83930_jp OK

* func_80A83994_jp OK

* func_80A83A00_jp OK

* func_80A8401C_jp OK

* func_80A8409C_jp OK (rename to `aHG_setup_action`)

* aHG_actor_draw OK

* func_80A83D4C_jp OK

* func_80A83A24_jp OK

* name HG models

* put static HG data into the functions

* func_80A837C4_jp OK

* add notes and clean up a bit

* apply a suggestion by @hensldm

* remove ASM pragmas

* extract assets
2024-12-07 12:27:42 -07:00
kuchenmitsahne 7c055329a7 ac_hanami_npc1 OK (#228)
* Rename symbols

* First pass on struct Hanami_Npc1

* Actor funcs (ct, save, dt, init, draw) OK

* Add trailing member to struct_809AEFA4

* Update Clip_unk_040_unk_E4 typedef to ActorFunc signature in order to unify *_actor_draw signatures

* All talk functions and proc functions (minus aHM1_think_main_proc.s) OK

* mFI_GetPuleIdx (func_8008930C_jp) OK; rename symbols (m_field_info)

* aHM1_set_animation OK

* aHM1_actor_move OK; update *_actor_move function signature to ActorFunc across project

* aHM1_set_request_act, aHM1_check_moveRange OK

* aHM1_check_inBlock OK; fix style in aHM1_check_moveRange

* aHM1_turn, aHM1_walk, aHM1_set_spd_info OK

* aHM1_think_init_proc OK

* aHM1_revise_moveRange OK with fake (all functions matching)

* Remove extraneous prototypes

* Fix aHM1_think_main_proc signature

* Import data

* Fix aHM1_revise_moveRange signature

* Standardize actor accesses

* Improve define usage

* Name blockX and blockZ members in Actor struct

* Remove extraneous comments

* mFI_BkNum2WposXZ OK (m_field_info)

* Add defines to m_field_info

* Formatting pass

* Remove extraneous comments

* Fix unk_18 type in struct_809AEFA4

---------

Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
2024-11-27 11:46:58 -07:00
kuchenmitsahne d38ac6a9d3 ac_hanami_npc0 OK (#227)
* Standard actor functions and aHM0_ct_data functions OK

* Add scaffolding to Hanami_Npc0 struct

* func_809DE830_jp OK

* func_809DE434, func_809DE4A0_jp, func_809DE5BC_jp, func_809DE6B4_jp, func_809DE6C8_jp, func_809DE6EC_jp OK

* func_809DE538_jp OK with warnings

* func_809DE538_jp OK

* func_809DE714_jp OK with warnings

* func_809DE7D0_jp OK

* func_809DE8D0 OK

* func_809DE56C_jp OK with warnings

* func_809DE800_jp OK

* func_809DE978_jp OK

* func_809DE948_jp OK

* func_809DE744_jp OK

* func_809DE5DC_jp progress (nonmatching)

* Remove fake symbol D_809DEB1C_jp.

* Prepare for data import

* func_809DE5DC_jp OK, update func_809DE6EC_jp (all functions matching)

* Import data (44 differing words)

* Fix struct_809AEFA4, ac_hanami_npc0 OK

* Rename symbols + initial style pass

* Unify aHM0_*_proc function signatures

* Resolve warnings in aHM0_merry

* Update NPC actor functions + corresponding clip functions to use ActorFunc signature

* Fix aHM0_make_tumbler warning (none remain); minor cleanup

* Avoid format.py strangeness

* Fix typedef order
2024-11-26 08:37:21 -07:00
Prakxo 943287ddfa m_fbdemo* OK (#223)
* m_fbdemo OK

* m_fbdemo_wipe1 OK

* fix play

* m_fbdemo_triforce OK

* link triforce

* m_fbdemo_fade OK

* typo

* newline

* format
2024-10-21 07:57:26 -07:00
Prakxo 78d0c294c5 m_bgm OK (#222)
* m_demo OK

* camera fix

* m_bgm OK
2024-10-13 08:36:51 -07:00
Prakxo 60cc4c9e23 m_demo OK (#221)
* m_demo OK

* camera fix
2024-10-10 08:18:22 -07:00
Prakxo c7a6aa2b88 ac_arrange_room OK (#220)
* ac_arrange_room OK

* fix?
2024-10-09 08:46:35 -07:00
Prakxo 8639fa43c7 ac_boxTrick01 OK (#219) 2024-10-01 08:09:20 -07:00
Prakxo 8f359e10f0 m_player audio and other_func functions (#218)
* m_player_sound

* m_player_other_func

* format
2024-09-27 10:26:30 -07:00
emilybrooks 5db5ae7201 sum_blue_bureau01 OK (#216)
* initial commit

* imported data

* matching

* renamed functions

* extracted assets

* review
2024-09-26 07:45:16 -07:00
Prakxo bd553a1ca8 m_player controller functions (#217)
* player work1

* m_player_controller

* format
2024-09-26 07:39:38 -07:00
Prakxo 35eba20abd ef_room_sunshine OK (#214)
* ef_room_sunshine OK

* format

* jenkins

* fourth time's the charm
2024-09-24 12:05:32 -07:00
emilybrooks 946ee8e9c2 clchest03 matched and hal_chest02 cleanup (#213)
* initial commit

* func_80A70C60_jp

* func_80A70CF4_jp

* fully matching

* inported data

* improved furniture actor profile struct

* extracted spooky wardrobe object

* extracted clchest03 object

* forgot
2024-09-21 13:03:08 -07:00
Prakxo 2c7d61be83 m_land OK (#212) 2024-09-21 09:17:13 -07:00
Prakxo eb99af89c8 m_kankyo OK (#207)
* implement kankyo

* m_kankyo OK
2024-08-12 10:36:07 -07:00
Prakxo c3164cd99c ac_mikuji OK (#206)
* ac_mikuji OK

* jenkins
2024-07-29 09:30:20 -07:00
Prakxo c7d98021c3 m_prenmi OK (#205) 2024-07-28 07:28:07 -07:00
Prakxo ed51325ede player_select OK (#204) 2024-07-27 07:58:33 -07:00
Prakxo 85a19d3fb6 m_mail_check OK (#203)
* m_mail_check OK

* comments
2024-07-22 08:22:21 -07:00
Prakxo aeb01dcb95 m_roll_lib OK (#198) 2024-07-13 06:50:22 -07:00
Prakxo 0e66d077f8 lbrtc OK (#196)
* lbrtc OK

* format

* names

* format 2

* review + docs

* format
2024-07-01 08:02:29 -07:00
Prakxo 69201d6d72 m_room_type OK (#193)
* m_room_type OK

* offsets

* jenkins
2024-06-02 07:41:49 -07:00
Anghelo Carvajal fd05811213 m_trademark OK (#192)
* C file

* trademark_init

* trademark_cancel, trademark_move, trademark_main

* trademark_draw

* trademark_goto_demo_scene and func_80805360_jp

* set_npc_4_title_demo

* func_80804C40_jp

* trademark_cleanup

* func_808052B8_jp

* func_80805104_jp

* func_80804F78_jp

* func_80804EE0_jp

* fix warnings

* small cleanup

* fix build

* some fixes

* stuff

* some cleanups

* Fix rebase

* Import data

* Migrate bss

* cleanup

* Save substruct

* format

* TrademarkState and some other stuff

* remove fake match

* stuff I missed

* whoops

* Stupid `-Wtype-limits`

* Update src/overlays/gamestates/ovl_trademark/m_trademark.c

Co-authored-by: Prakxo <87568477+Prakxo@users.noreply.github.com>

* Review

* Update src/overlays/gamestates/ovl_trademark/m_trademark.c

Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>

* Update src/overlays/gamestates/ovl_trademark/m_trademark.c

Co-authored-by: Prakxo <87568477+Prakxo@users.noreply.github.com>

* clang-tidy changes???

* review

---------

Co-authored-by: Prakxo <87568477+Prakxo@users.noreply.github.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
2024-05-30 14:00:57 -07:00
Prakxo 1f7fbf9b29 m_choice_main OK (#191)
* work

* m_choice_main OK
2024-05-27 19:19:42 -07:00
Prakxo 8f73c61ec5 second_game OK (#190) 2024-05-21 09:21:23 -07:00
Prakxo 448405671d m_time OK (#189) 2024-05-19 09:40:39 -07:00
Prakxo 92911830dc m_cpedit OK (#188)
* save_menu OK

* work

* m_cpedit OK

* fix
2024-05-18 14:45:24 -07:00
Derek Hensley d743f70585 Prerender (1 NON_MATCHING) (#185)
* Start prerender

* wallpaper_draw1

* wallpaper_draw

* gfx_SetUpCFB

* PreRender_setup_savebuf

* PreRender_init

* PreRender_setup_renderbuf

* PreRender_cleanup

* PreRender_TransBufferCopy

* PreRender_TransBuffer

* PreRender_TransBuffer1

* PreRender_TransBuffer2

* PreRender_ShowCoveredge

* PreRender_saveZBuffer

* PreRender_saveFrameBuffer

* PreRender_saveCVG

* PreRender_loadZBuffer

* PreRender_loadFrameBufferAlpha

* PreRender_loadFrameBufferCopy

* PreRender_ConvertFrameBuffer_fg

* PreRender_ConvertFrameBuffer

* AntiAliasFilter

* ASAlgorithm

* PreRender_loadFrameBuffer

* names

* Remove fake in PreRender_TransBuffer1_env

* PreRender_CopyRGBC NON_MATCHING
2024-05-14 07:46:27 -07:00
Prakxo 707577c16e save_menu OK (#184) 2024-05-14 07:43:37 -07:00
Tom Overton 8b5260063f ac_structure OK with some minor documentation (#183)
* Partial progress

* `func_809E7F94_jp` OK

* Do some more DMA functions

* Fix build

* Finally make `func_809E823C_jp` work properly

* Finish DMA functions

* Use ALIGN16

* Make the size for `mSc_secure_exchange_keep_bank` more obviously related to what follows

* Fix build after merge

* aSTR_setupActor_proc OK

* aSTR_init_clip_area OK

* Import data to C

* Lots of cleanup

* Use enum values in actors

* StructureActor-ify the structures

* Move `setupInfo_table` inside the function and name it

* Name `aSTR_get_pal_segment` from context clues

* Use all the names I can from DnM+

* Try (and fail) to import BSS into C

* Match bss

* Make bss sizes more "correct"

* Use ARRAY_COUNT to define DMA length

* A lot fewer hardcoded numbers

* Lots of misc cleanup

* A huge amount of names and cleanup

* Get this PR-ready

* Forgot some booleans

* Name a lot of stuff after digging into the object files

* Remove magic numbers for bss array size

* Respond to review
2024-05-06 15:26:01 -07:00
Cuyler36 749152a745 Update GraphicsContext macros (#182)
* Update GraphicsContext macros

* Fix formatting
2024-04-29 15:58:41 -07:00
inspectredc 8caa1e847b ac_dump OK (#180)
* ac_dump OK

* warnings
2024-04-24 08:43:28 -07:00
inspectredc 7ae1401111 ac_airplane OK and documented (#178)
* ac_airplane OK and documented

* player lib funcs

* include object

* remove statics
2024-04-23 17:37:47 -07:00
inspectredc 99081d5a7e ac_kago OK and documented (#177)
* ac_kago OK and documented

* palette types

* suggestions + object stuff
2024-04-22 13:21:18 -07:00
Prakxo 202737c1f0 m_scene_ftr OK (#176)
* 1 byte off..

* m_scene_ftr OK

* newline

* warnings
2024-04-21 08:08:00 -07:00
inspectredc 30aaa1356f ac_bee OK (#175)
* ac_bee OK

* fix warning

* change sAdo_OngenPos back

* and in code..

* fix linker script stuff
2024-04-17 16:13:31 -07:00
inspectredc e6ea51bc3d ac_Fuusen OK and documented (#174)
* ac_Fuusen OK and documented

* add struct offsets

* use null post merge

* fix sym stuff

* suggestions

* act_balloon extracted

* remove fake symbol

* name object enum

* include assets

* fgname enum/macro
2024-04-16 12:31:29 -07:00