3145 Commits
Author SHA1 Message Date
engineer124 7591174b36 Merge branch 'master' into voice 2021-11-25 17:49:01 +11:00
mzxrulesandGitHub 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
837eb1c806 En_Tk (#338)
* En_Tk

* PR

* Warnings

Co-authored-by: root <root@Careface.localdomain>
2021-11-20 12:10:37 -03:00
engineer124andGitHub 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
MaideandGitHub 97425f68ae m2ctx: Optionally return Player* for Player accesses (#446)
* m2ctx

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

* spec

* Rename a couple of variables
2021-11-20 00:15:50 -03:00
engineer124 f0c676d124 Merge branch 'audio_bgm' into voice 2021-11-20 09:35:46 +11:00
engineer124 dfdbd66106 Merge branch 'master' into audio_bgm 2021-11-20 09:35:29 +11:00
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
engineer124andGitHub 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
engineer124andGitHub 2dd84d8a9f Import abi.h from OoT (#466) 2021-11-19 14:18:06 -03:00
engineer124 793bc2f971 Merge branch 'master' into audio_bgm 2021-11-20 02:58:22 +11:00
engineer124 65cbbf40fd Merge branch 'master' into voice 2021-11-20 02:57:07 +11:00
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 HensleyandGitHub 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
engineer124andGitHub 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
engineer124 5cc0ff2d64 Add bgm's to gSaveContext.seqIndex 2021-11-19 22:45:36 +11:00
engineer124 a0882f3fd3 Another bgm function found! 2021-11-19 22:36:18 +11:00
engineer124 e84d8bc3f5 add saria's song bgm to pierre 2021-11-19 18:53:37 +11:00
engineer124 1071d4bd90 Merge branch 'master' into audio_bgm 2021-11-19 18:52:32 +11:00
EllipticEllipsisandGitHub 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
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
LtPeriwinkleandGitHub 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
engineer124 4e0ce6c70a Fix bss file split 2021-11-17 16:28:15 +11:00
engineer124 597907c50a Fix bss reordering 2021-11-17 16:25:34 +11:00