Commit Graph

659 Commits

Author SHA1 Message Date
tom-overton 75d157aaf9 Merge branch 'tokeidai' of github.com:tom-overton/mm into tokeidai 2021-12-26 17:15:23 -08:00
Tom Overton a7188971a8 Fix func_801A3F54 argument
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-12-20 02:54:06 -08:00
tom-overton 694b6467e0 Fix func_801A3F54 argument 2021-12-20 02:52:37 -08:00
Tom Overton 2f73fdf2f9 Merge branch 'master' into tokeidai 2021-12-06 18:10:54 -08:00
Tom Overton 93d7fe080b Do another round of improvement on actor comment headers (#462)
* Update actor descriptions as of 11/3/2021

* Fix headers for everything I messed up

* Update headers as of 11/8/2021

* Update descriptions

* Update business scrub descriptions

* Respond to engineer's feedback

* Clean up Ruto description

* Mark chikuwa as unused

* Update description of blockstop

* Responding to Elliptic's review

* bigpi -> bigpo

* Update Trt2 description to be a little more clear

* Impove mu_pict description

* Add description for horse_game_check
2021-12-07 02:01:51 +00:00
Maide 22c72301dc En_Rr (#458) 2021-12-07 01:45:23 +00:00
engineer124 1ab0fb5557 Importing Audio Sfx Params (#472)
* Import audio sfx params

* Add TODO: description for this file
2021-12-07 00:39:51 +00:00
Tom Overton d218c9be23 En_Stream (unused water vortex from OoT) OK (#480)
* En_Stream (unused water vortex from OoT) OK

* Better names in EnStream_PlayerIsInRange

* Enum for whether the player is in range
2021-12-06 23:52:18 +00:00
retro 64ecb146ae EnFr (#494)
* all matching

* implement feedback

* feedback

* feedback

* cleanup param macros
2021-12-06 22:28:48 +00:00
retro 5b7df3f1ca EnHitTag OK (#482)
* EnHitTag all matching, data still not imported

* rename loop counter variable to i

* imported data

* use generated reloc

* cleanup

* name func_80BE20E8, document with ITEM00_RUPEE_GREEN enum, use if-return-implication in WaitForHit

* add switchflag param macro

* use previously unused pCylinder as function arguments

* use THIS macro and change switchflag macro to take actor pointer

* space between var declaration and code

* format

* rename pCylinder to cylinder

* rename cylinder to collider

* change ColliderCylinder* to pad

Co-authored-by: retro <retro@DESKTOP-KGV19SQ.localdomain>
2021-12-06 21:50:59 +00:00
Maide 08cf506be7 Dm_Stk (#350)
* Dm_Stk

* PR
2021-12-06 21:45:28 +00:00
Maide f4dfeac4a9 En_Gm (#365)
* En_Gm

* Format

* PR

* Warnings

* Merge
2021-12-06 21:18:17 +00:00
Derek Hensley b5da6b9bf9 Fault and Fault_Drawer (3 MATCHING and 1 NON_MATCHING) (#434)
* Matched last functions except Fault_FindNextStackCall

* Bss in drawer and cleanup

* Update define and format

* PR comments

* Formating PR suggestions

* Small format

* Fault_FindNextStackCall

* Change grays to dark gray and light gray
2021-12-06 21:03:21 +00:00
Zach Banks b031598460 Disassembly performance improvements (speed, RAM) (#478)
* Improve disasm.py RAM usage using `bisect`

This is based on AngheloAlf's work in PR #477, but uses the built-in
library `bisect` instead of adding an external dependency.

* Caching vrom_variables for ~25% faster disasm.py
2021-12-06 20:21:01 +00:00
Derek Hensley e177e99933 Elf_Message OK (#457)
* Matched

* Rename function
2021-12-06 14:42:17 -05:00
tom-overton fc91013d34 Respond to engineer + hensldm by removing some macros 2021-12-06 00:55:35 -08:00
Rozelette 56d76d6458 En_Cow 🐮 (#493)
* OK

* Address feedback

* Adjust comparison
2021-12-01 12:32:15 -05:00
mzxrules ce1de034df z_obj_mure.c (#364)
* a bunch of OKs and close functions

* OK All but 1 function

* Clean up code

* Match

* implement suggestions

* OBJMURE_CHILD_STATE_DEAD

* Update src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* use enum for type tests

* add OBJMURE_TYPE_MAX

Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-11-30 22:18:58 -03:00
tom-overton eded457007 Run ./format.sh 2021-11-25 05:09:07 -08:00
tom-overton 94f85c5fdc Switch to using "Open" instead of "Transform" 2021-11-25 05:05:38 -08:00
mzxrules 6b493d3f9d z_bgcheck.c (#357)
* first few functions

* two more almost matching functions

* Rebase to NBS, get it to compile

* BgCheck_RaycastFloorStaticList OK, fix-up some functions

* BgCheck_SphVsStaticWall OK! and a few others

* more z_bgcheck NON_MATCHINGS

* OK more functions, reorganize external reference #defines

* More functions OK, more struct fixes

* More OKs

* Decomp all the way to the end of bgcheck

* All functions attempted

* Rename functions

* formatting, data migration

* Give names to unk structs, rename some structs, fix some non-equivalent functions

* WaterBox_GetSurfaceImpl OK

* BgCheck_ResetPolyCheckTbl OK, improve WaterBox_GetSurface2 codegen, eliminate warnings and clean up source.

* BcCheck3_BgActorInit ->BgCheck3_BgActorInit, fix warnings

* pr change requests

* fix crc maybe

* implement more changes

* implement alf's changes
2021-11-23 13:29:18 -03:00
tom-overton 9082da5c03 Update comments because the things I thought were unused ARE actually used 2021-11-20 09:19:39 -08:00
tom-overton ef0a8c2f6d Respond to engineer's feedback 2021-11-20 09:17:04 -08:00
Maide 837eb1c806 En_Tk (#338)
* En_Tk

* PR

* Warnings

Co-authored-by: root <root@Careface.localdomain>
2021-11-20 12:10:37 -03:00
engineer124 ea17d924e4 Audio BGM Macros (#460)
* Introduce bgms

* Fill in bgm enums

* Rename bgm to clearer names

* Fix spacing

* Fix "No_Music" define

* remove comment

* Improve bgm names, found another seqId function

* Another seqId function

* Another name change

* Woods of Mystery -> Sarias Song

* add saria's song bgm to pierre

* Another bgm function found!

* Add bgm's to `gSaveContext.seqIndex`
2021-11-20 11:01:37 -03:00
Maide 97425f68ae m2ctx: Optionally return Player* for Player accesses (#446)
* m2ctx

* Rename
2021-11-20 00:17:33 -03:00
EllipticEllipsis 48a5116389 cartrominit OK (#412)
* cartrominit OK

* spec

* Rename a couple of variables
2021-11-20 00:15:50 -03:00
Anghelo Carvajal 2854294009 z_jpeg, jpegutils and jpegdecoder OK (#322)
* this is a disaster

* two more

* func_800F470C

* split and rename jpegutils and jpegdecoder

* match jpegutils

* match jpegdecoder.c

* audio_rodata

* data split

* Split rsp

* Steal documentation from OoT

* cleanup

* Format

* remove removed members in JpegContext

* Update include/z64.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/jpegdecoder.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/jpegutils.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review renames

* true

* Some type fixes

* Update include/z64.h

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* add comment

* Update src/code/z_jpeg.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* format

* bss fix

* decr

* format

* z64jpeg.h

* Add stdbool

* Rename audio_init_params

* whoops

* whoops++

* whoops#

* remove extra dumb variables in variables.txt

* fix

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-11-19 17:34:45 -03:00
engineer124 c8b0ff3f74 Introducing z64audio.h (#459)
* Copy over z64audio.h from audio WIP

* Cleanup z64audio.h

* PR Suggestions

* Improvements from Audio doc WIP

* More cleanup

* Remove a few structs, Introduce OcarinaSongId

* More cleanup from audio docs WIP

* Fix
2021-11-19 15:26:20 -03:00
engineer124 2dd84d8a9f Import abi.h from OoT (#466) 2021-11-19 14:18:06 -03:00
Derek Hensley 9a424688b1 Add ability to warnings script to just check building (not setup or disasm) (#414)
* Add option to run warnings on just build

* Rename all to full

* Update tools/warnings_count/check_new_warnings.sh

Remove testing code.

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-11-19 12:52:32 -03:00
Derek Hensley 9b51336f09 Sub_S Prototypes and approriate header stuff (#408)
* Add sub_s prototypes

* Rename limbDrawTable to jointTable

* Rename UnkActorDraws

* Fix warnings

* Fix warnings
2021-11-19 12:45:26 -03:00
engineer124 d190b265f6 Audio Files & Data: Fix File/Data Splits and Compiler Flags (#456)
* Properly split audio voice

* Split off jpeg code from audio

* Fix compiler flags

* Properly split libultra audio file

* Split audio data for many files correctly

* Fix remaining data splits

* Fix up troublesome data

* Fix variables.txt

* Missed two files that need to go in audio/

* Add missing `/`

* `D_801E1100` -> audio_init_params

* Properly split code_801D9090.data.s

* Fix code_801A5BD0 bss

* Move audio_dramStack to a blob
2021-11-19 09:36:50 -05:00
EllipticEllipsis dfc146663f aisetfreq OK, some libultra improvements (#416)
* aisetfreq OK

* Add a lot of HW_REG and some other macros to libultra

* Format

* Remove extra volatile

* Review

* De-C guNormalize

* Correct typo in crc.c
2021-11-18 15:15:09 -03:00
Isghj 89b9d90826 En_Kakasi (Scarecrow) (#279)
* EnKakasi: rebase progress into one commit

* EnKakasi: fixes to get compiling on master, still doesn't match

* EnKakasi: is this even progress?

* EnKakasi: docs and cleaning

* EnKaksi: damn it, that master merge really messed up more than I thought, after clean build something really weird is going on and now I REALLY need firstdiff

* EnKakasi: Back to building, NOT OK

* fixed a code

* only rodata left to fix

* EnKakasi: functions got removed in included functions

* EnKakasi: thanks to fig mentioning there were missing cases, OK

* EnKakasi: (OK) docs and cleaning

* EnKakasi: Init now matches

* EnKakasi: cleaning and docs

* EnKakasi: more cleaning and docs

* EnKakasi: forgot function declarations

* EnKakasi: spec

* EnKakasi: animation array symbols added

* EnKakasi: formater pass

* EnKakasi: type warning fix

* EnKakasi: little descriptor

* EnKakasi: OK thanks to AngheloAlf

* Apply suggestions from code review

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Update src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Apply suggestions from code review

Splitting this into pieces to not have a huge pile of bugs

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* EnKakasi: wrong type of inverse flag

* Apply suggestions from code review

Batch 2

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* EnKakasi: RIP Anime

* Apply suggestions from code review

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* EnKakasi: Anim enum update

* EnKakasi: Removed text documentation

* EnKakas: return of THIS

* Update src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* EnKakasi: mystery solved but not understood

* Apply suggestions from code review

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* EnKakasi: rename EnKakasi_CheckAnimateSFX to EnKakasi_CheckAnimationSfx (no real reason to shorten Animation to Animate, and SFX is not initialism, its a shorten)

* EnKakasi: minor change to touch jenkins

* EnKakasi: is it loise-uni?

* EnKakasi: fixed skelanime changes

* EnKakasi: formater pass

* EnKakasi: requested changes

* Update src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* EnKakasi: removed un needed pad

* EnKakasi: removed redundant documentation comment

Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2021-11-18 14:33:23 -03:00
LtPeriwinkle 25682591df EnMm OK (#452)
* EnMm OK

* remove commented InitVars

* switch >= to >; 0x1F to 31

* style fixes

* use macros and enums

* fix formatting

* Fix function naming
2021-11-18 14:08:49 -03:00
EllipticEllipsis 7134e81898 sys_initial_check OK, documented, error message files debinarised (#437)
* OK

* Symbols and other documentation

* Remove externs

* spec

* More documentation, decompile the texture files,
some uintptr_t and size_t

* Top-of-file comment

* Move symbols back into right order

* Use some defines

* Missed an osTvType and a size_t

* Add missing header to os.h

* Use segment symbol macros

* Remove duplicate header

* Address review suggestions
2021-11-15 19:57:16 -03:00
kyleburnette 20f3a190f4 xldtob OK (#439)
* Initial work

* xldtob OK

* Update src/libultra/rmon/xldtob.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-11-14 20:01:22 -03:00
tom-overton 5c207bc603 Respond to engineer's feedback 2021-11-14 14:33:33 -08:00
Kenix3 0c3bba3ff6 Moves func_800CB000 to z_bg_item, decompiles func_800CB000, and documents z_bg_item and a few DynaPolyActor struct members. (#407)
* Moves func_800CB000 to z_bg_item, decompiles func_800CB000, and documents z_bg_item and a few DynaPolyActor struct members.

* Adding usage of dynapoly state flag defines.

* Formats z_bg_item

* Update z_bg_item.c

* Update z_bg_collect.c

* Update z_bg_item.c

* Update z_bg_item.c

* Renames z_bg_item system to DynaPolyActor

* Format
2021-11-14 19:06:34 -03:00
Anghelo Carvajal 0a953f7aea sched.h (#341)
* sched.h

* format

* screen.h

* sched.h and scheduler.h

* empty commit

* remove screen.h

* format

* Fix

* fix bss

* remove line

* Whoops

* remove dupllicated structs

* ...

* c'mon

* Add TASK_FRAMEBUFFER macro

* format
2021-11-14 18:38:27 -03:00
Maide 602f348928 En_Pm (#309)
* En_Pm

* Format

* PR

* a

* a

* Finally fixed?

* PR

* Fix enum
2021-11-11 22:41:59 -03:00
Tom Overton a5d8165cd1 Use ITEM_MASK_GIBDO enum in En_Hg (#451) 2021-11-11 19:46:11 -05:00
EllipticEllipsis 1dba23c323 pfsinitpak OK (#425)
* pfsinitpak OK

* Review

* Remove unnecessary if (1) {}
2021-11-11 20:24:30 -03:00
EllipticEllipsis 9aef02bc32 epiread.c OK (#410)
* epiread.c OK

* uintptr_t
2021-11-11 19:27:49 -03:00
EllipticEllipsis 40ec8a9fc0 epiwrite.c OK (#411)
* epiwrite.c OK

* uintptr_t

* Reintroduce bad code rather than start rearranging headers
2021-11-11 18:25:53 -03:00
EllipticEllipsis 987566eebe pfsselectbank OK (#420)
* pfsselectbank OK

* Update src/libultra/io/pfsselectbank.c

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2021-11-11 17:45:53 -03:00
tom-overton aa8b67caa0 Incorporate new enum 2021-11-11 11:05:12 -08:00
tom-overton 2412e2723e Respond to Anghelo's feedback 2021-11-11 10:57:09 -08:00
tom-overton b6b8b9f000 Respond to review feedback 2021-11-11 10:57:09 -08:00