Commit Graph

536 Commits

Author SHA1 Message Date
engineer124 28706d798d Animation Cleanup: En_N* (#1504) 2023-11-20 21:57:52 +11:00
engineer124 ebc36b2613 Misc Camera Cleanup (#1494)
* camera cleanup

* more cleanup

* two more improvements

* newLine

* another fake match fixed

* PR Review
2023-11-19 19:44:31 +11:00
engineer124 faba61d9b8 Player doc: anim wrappers (#1434)
* player cs docs setup

* more docs

* more docs

* missed enums

* more docs, but broken. Need to fix sPlayerCsModeAnimFuncs

* fix

* rm enum

* more minor docs

* PR suggestion

* typo

* csActionFunc

* PR Suggestion

* player animation

* cleanup

* cleanup

* comments

* macro

* fix bss

* another comment

* better macro

* move macro

* fix bss

* adjust names

* simplify enum

* missed flags

* PR Review

* adjust comment

* missed defines
2023-11-18 23:55:04 +11:00
engineer124 dbb6410ba3 Animation Cleanup: En_M* (#1496)
* brackets

* more M cleanup

* small cleanup

* PR Review
2023-11-17 10:49:23 -03:00
engineer124 8ab62788b2 Audio Voice Decompiled (#1490)
* Add Tharo's documentation comments

* Voice progress

* Match osVoiceControlGain

* Match osVoiceStartReadData

* Cleanup

* Add docs from n64devkit

* WIP on osVoiceGetReadData

* Add comment

* Match voiceinit.c

* Remove CONT_ERR, already present in controller.h

* Really close to matching osVoiceStopReadData

* Progress on voicecheckword

* Match osVoiceSetWord

* Add error codes

* Matched __osVoiceContRead2... Somehow...

* Add small amount of docs

* __osVoiceContRead36 was basically identical from __osVoiceContRead2

* docs, but maybe a little carried away

* Match __osVoiceContWrite4, Write is very similar to Read

* Match __osVoiceContWrite20 from __osVoiceContWrite4, ez

* Some docs

* Improve osVoiceGetReadData

* Match osVoiceCheckWord

* currentSyllable -> currSyllable

* Match osVoiceMaskDictionary

* Match __osVoiceSetADConverter

* Meme matched osVoiceStopReadData

* small cleanup

* Missed macros

* osVoiceGetReadData Meme Match

* Small clean-up

* format

* Properly split voice files from code

* Use proper flags for voice files

* Add basic docs for func_801A5AF0

* Import Voice Data

* Update matching functions in code_801A51F0 from audio WIP

* Update matching functions in code_801A4EB0 from audio WIP

* Match func_801A5A1C

* Match func_801A5228

* Match func_801A54D0

* Doc padmgr functions used

* Match func_801A5680, it's near identical to func_801A54D0

* code_801A51F0 OK

* Match func_801A4EB8

* Match func_801A4FD8 (mips2c got it matching directly)

* code_801A4EB0 & all of voice, OK

* Import bss

* Better match for func_801A5A1C

* format

* Cleanup

* Clean up dictionary

* Introduce OSVoiceDictionary

* More voice docs

* Fix bss

* Import code_801A4EB0 data

* Introduce Word Id enum

* Dictionary: u8 -> u16

* Introduce bgms

* Fill in bgm enums

* Rename bgm to clearer names

* Fix spacing

* Fix "No_Music" define

* remove comment

* import rodata

* Improve bgm names, found another seqId function

* Another seqId function

* Another name change

* Woods of Mystery -> Sarias Song

* Fix match in osVoiceControlGain

* Fix bss reordering

* Fix bss file split

* add saria's song bgm to pierre

* Another bgm function found!

* Add bgm's to `gSaveContext.seqIndex`

* Fix BSS

* fix bss

* Fix bss

* cleanup

* more cleanup

* cow voice weekeventflag

* small cleanup

* some docs

* cleanup var

* global

* more docs

* PR Review

---------

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-11-17 12:29:42 +11:00
engineer124 61e2f12cf5 Document Overriding Player Input (#1489)
* Override Input

* cleanup

* cleanup

* PR Review

* PR Review, fix merge
2023-11-16 16:28:19 +11:00
Derek Hensley 5acaec4486 Fix ultratypes types (#1454)
* Fix ultratypes types

* Add back size_t and NULL

* Callocs

* Callocs pt 2

* bool

* STDC version checks
2023-11-16 16:01:42 +11:00
engineer124 d9585d7444 Animation Cleanup: En_L* and some En_M* (#1493)
* cleanup L, some M

* small fix

* typo

* brackets

* more brackets
2023-11-15 11:46:54 +11:00
Anghelo Carvajal 3d150f3e1d Misc fixes 1 (#1491)
* Some low-hanging UB

* document bug on z_file_nameset_NES.c

* ALIGNED on audio data

* document bug on decode

* document bugs on Message_Decode

* Format

* More ALIGNED

* Put the ALIGNED macro at the right like the other uses in the repo

* review

* fix Message Decode

(cherry picked from commit abfbc7068816756f7ea3fa4a36ee0fe664c54c72)

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* remove comments

* Update src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.c

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

* format

---------

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-11-14 22:46:22 +11:00
engineer124 71d83a5e15 Match func_801457CC (z_sram_NES.c OK) (#1472)
* Match func_801457CC

* cleanup

* pads

* ITEM_NUM_SLOTS

* fix macro
2023-11-11 19:08:39 -03:00
engineer124 8d33d36a9b fix Misc Data (#1484) 2023-11-11 10:27:01 -03:00
Tharo b2535fc75a Fix aliasing in Cutscene_SetActorCue (#1483)
Co-authored-by: Revo <projectrevotpp@hotmail.com>
2023-11-11 09:34:27 -03:00
engineer124 2823a720bc Match Environment_DrawSkyboxStarsImpl (z_kankyo OK), introduce rand.h (#1476)
* match Environment_DrawSkyboxStarsImpl

* revert

* PR Review

* small fix

* group pads together

* Color_RGBA8_u32
2023-11-10 10:28:16 +11:00
engineer124 7681c97df0 Match Both Message Decodes (#1479)
* WIP

* match Message_DecodeNES

* cleanup

* another cleanup

* match Message_Decode

* more cleanup

* oops

* add back void
2023-11-09 12:57:56 -03:00
engineer124 5b17c3793e Match Environment_UpdateLights (z_kankyo OK) (#1478)
* Match Environment_UpdateLights

* cleanup
2023-11-09 08:56:33 -03:00
engineer124 dfb6c5b02c Struct Returns (#1466)
* change args

* more funcs

* cleanup

* play cleanup

* missed a file

* weird warnings

* missed some

* fix func from honotrap
2023-11-07 10:52:09 -03:00
engineer124 277c184cb4 Match Environment_Init (#1474)
* Match Environment_Init (fake)

* that's much better
2023-11-07 10:17:29 -03:00
engineer124 ffd9c84184 Match Message_DrawTextCredits (#1470) 2023-11-07 15:58:29 +11:00
engineer124 72bdfdee3f Match Message_Update (#1469) 2023-11-07 08:12:32 +11:00
engineer124 864748c6f9 match Sram_CopySave (#1467) 2023-11-07 07:58:28 +11:00
Alejandro Asenjo Nitti 5b4fddf16e Fix Camera_Update fake, match Play_UpdateMain & Play_DrawMain NON_MATCHINGs (#1463)
* Fix Camera_Update fake, match
Play_UpdateMain & Play_DrawMain
NON_MATCHINGS

* remove unnecessary parenthesis

* extra parenthesis

* review

* NUM_CAMS
2023-11-05 20:48:19 -03:00
engineer124 f8a5f11d6d Player Docs: public facing csAction things (#1459)
* public cs

* comments
2023-11-05 20:34:53 -03:00
Anghelo Carvajal f276d2b0e6 Enable -Wint-conversion warning (#1266)
* fixing some warnings

* more pointer fixing

* Use `-Wno-int-conversion` on audio files

* more progress

* fix

* more pointer fixes

* kinda progress

* Fix remaining casts

* Format

* fix merge

* fix warnings

* fix parameter

* use SEGMENT_ROM_START_OFFSET a bit more

* format

* fix audio warnings

* some more fixes

* fix en_go

* review

* review

* whoops, missing cast

* review

* review

* ->data

* format

* review

* fix

* asPtr

* fix

* Update src/code/sched.c

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

* review

* fix in EnDnh

* improve format

* engo

* format

* fix

* format

* Update include/z64.h

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

* TexturePtr

* fix warnings

* fix warnings

* format

* fix

* review

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-11-02 10:07:38 +11:00
engineer124 83ceaf3717 z_kankyo Decompiled (3 non-matching) (#1451)
* z_Kankyo progress

* build OK

* progress

* more progress

* Kankyo WIP

* Add docs

* func_800FEAF4

* more docs

* func_800FEAF4

* improve Init

* Small cleanup

* kankyo data

* data cleanup

* Environment_DrawLensFlare

* Match Environment_UpdateSkybox

* Match Environment_DrawRainImpl

* Start on Environment_UpdateLights

* Match Environment_DrawSandstorm

* gRainDropDL

* Some light renamings

* Fix merge

* cleanup

* improve non-equivalents

* cleanup

* PR Review

* match Environment_UpdatePostmanEvents

* PR Review

* small improvement to Environment_UpdatePostmanEvents from anon

* more cleanup

* void

* bits

* fix comment

* improve Environment_UpdateLights

* Skybox Stars Docs

* PR Review

* fix merge

* macros

* Add comments

* PR Review

* gRandFloat

* bug

---------

Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-10-31 14:50:11 +11:00
engineer124 4d74fed7f0 Cutscene Camera OK (Some Docs) (#1411)
* import WIP

* Match func_80161E4C

* Match func_801620CC

* Match func_80162FF8

* Match func_801631DC

* Match func_80162FF8

* Import bss

* fix bss

* type docs

* more docs?

* waypoint?

* names

* cleanup

* PR Review

* comments

* PR Review

* waypoints as 1 word

* adjust names

* Path order

* remove pathing

* fix bss

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-10-31 12:44:36 +11:00
Anghelo Carvajal e634be7cd4 Fix /* */ to /**/ (#1455) 2023-10-28 07:55:14 +11:00
engineer124 4422df3ef6 player unions (#1453) 2023-10-27 10:13:44 -03:00
Anghelo Carvajal cf41eeb3ac Remove (ActorFunc) cast on InitVars (#1148)
* Remove ActorFunc cast

* Format

* Revert "Format"

This reverts commit a6e89b3969.

* Messing with formatting

* format header a bit

* Revert "Messing with formatting"

This reverts commit c8db520278.

* comment

* format

* more comments

* format

* format

* format

* properly format
2023-10-27 10:03:02 -03:00
Anghelo Carvajal 6475196f0f Yet another libultra cleanup (#1384)
* os symbols

* various variables

* more variables

* more cleanup

* yeet HW_REG

* OS_PHYSICAL_TO_K0 and other cleanups

* Rename r4300.h

* migrate pimgr data and cleanup on initialize.c

* rename osFlash symbols

* cleanup gu

* vimodes

* yeet rmon, do libc files

* some os files

* hardwareinterrupt

* cleanup a lot of os files

* cleanup osVirtualToPhysical

* various io files

* another io chunk

* final io chunk

* yeet hardware.h

* yeet PHYSICAL_TO_VIRTUAL and VIRTUAL_TO_PHYSICAL

* fix typo

* fix merge

* remove global.h from libultra files

* fixes and format

* brief explanation

* review

* review

* review

* review

* SEGMENTED_TO_K0

* Revert "SEGMENTED_TO_K0"

This reverts commit f8d62d670f.

* take two

* bss

* bss
2023-10-26 10:44:27 -03:00
engineer124 6aaeb80f99 Decompile Remaining code_8019AF00.c Functions (1 non-matching) (#1442)
* remaining code_8019AF00 functions

* oops

* decimal duration

* PR Review
2023-10-26 10:09:08 -03:00
EllipticEllipsis 6bdb7c31ea code_80140E80 OK and preliminary documentation, Fbdemo_Wipe4 OK and documented (#1106)
* OK, start documentation

* More documentation

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

* Decompile func_80167F0C

* FbdemoWipe4 OK and documented

* Mark bug in Wipe4

* More docs

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

* Mark bug

* Few more notes

* Fix function in Play

* Format

* Review

* Name Play_PostWorldDraw

* functions.h...

* Revert func_80167F0C

* Review

* functions.h

* Review

* Update Wipe4

* Rename system

* Format

* Put skeleton back in the cupboard

* bss

* Fix build

* rename to z_visfbuf

* review

* format

* bss

* some bss cleanup

* review

* bss

* review

---------

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2023-10-26 17:42:24 +11:00
engineer124 7176ed4299 Player Docs: csMode -> csAction (#1433)
* csAction

* more cleanup

* namefixer

* simpleReplace

* fix brackets

* sneak in 2 player typos

* fix merge
2023-10-26 17:12:04 +11:00
Anghelo Carvajal 1e19cfe869 Anju objects (#1444)
* bring over the objects from the other branch

* kafeis mask

* use symbols

* dman naming after assets

* stateFlags

* remaining stuff

* anim array bug

* Name everything in DmGm after DmAn

* WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED

* undef

* format

* idk

* ing

* format

* name animations from an4, thanks emil!

* emptydl

* disbelief

* review

* format

* Update assets/xml/objects/object_mask_kerfay.xml

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

* review

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-10-23 16:03:16 +11:00
Anghelo Carvajal ec86f10b0f SCHEDULE_TIME (#1438)
* SCHEDULE_CALC_TIME_ALT

* add s32 cast to avoid f32 -> u16 direct cast

* SCHEDULE_TIME

* remove the alts

* Update explanation about the script
2023-10-22 16:52:40 +11:00
engineer124 425238fd5d Match Camera_Battle1 (#1445)
* match Camera_Battle1

* more cleanup

* more docs from OoT
2023-10-21 13:17:47 -03:00
engineer124 cbca59d49e Match Camera_KeepOn1 (#1447)
* Match Camera_KeepOn1

* small cleanup
2023-10-21 12:35:23 -03:00
engineer124 2dc405b6af Match Camera_Normal1 (#1446)
* improve Camera_Normal1

* decompme

* Match Camera_Normal1, thanks darkeye

* use the pad
2023-10-20 16:30:18 -03:00
engineer124 f545f164b4 Switch Flag "None" macro (#1412)
* switch flag none

* cleanup brackets

* individual actor switch flag none

* missed some, small cleanup

* <= 0x80
2023-10-15 19:59:25 +11:00
engineer124 93713a1da0 Audio Sequences Decompiled & Documented (z_obj_sound OK, more code_8019AF00.c) (#1407)
* import audio docs

* cleanup

* SEQ_SCREEN_WEIGHTED_DIST

* PR

* PR
2023-10-13 17:39:10 -03:00
engineer124 e810559391 Object Cleanup (#1410)
* object cleanup

* namefixer

* objectPtr

* PR Review

* PR Review

* more uses of macro

* missed another one
2023-10-05 17:37:52 -03:00
Derek Hensley 03d1a794e1 z_kankyo pt 1 (#1377)
* z64environment.h

* remove todo

* Cleanup

* data + bss + 2 functions

* Bring over simple functions

* Remove lerp comment

* code functions csv

* Remove docs changes

* ZBufValToFixedPoint

* Remove leading 0's

* SEGMENT macros

* eventDayCount

* format

* z64bombers_notebook.h

* fix merge

* Comments

---------

Co-authored-by: angie <angheloalf95@gmail.com>
2023-10-05 16:08:08 +11:00
fig02 f4a490bb6a Port Proposed OoT Object Docs (#1361)
* port docs in z_scene

* undo accidental ctrl-f

* another fix

* expose Object_SpawnPersistent

---------

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2023-10-04 14:01:04 +11:00
Derek Hensley 9e72c240d9 Z_message (2 NON_MATCHINGS) (#1398)
* matched func_8014D62C

* matched func_8014D304

* matched func_80149048

* matched func_80159438 & func_8014CDF0

* matched Message_GetState

* matched func_80152CAC

* matched func_80149454

* matched func_801491DC

* matched func_80150A84

* matched func_801496C8

* matched func_80149C18

* func_8014995C progress

* matched 8014995C

* matched func_80153EF0

* fix MessageContext lottery guess array size to match func_801496C8

* matched 80148D64

* matched func_8014AAD0

* progress func_8014CFDC

* matched func_8014CFDC

* progress func_801514B0

* progress#2 func_801514B0

* matched func_801514B0

* progress func_8014C70C

* Progress on few functions

* fix some variables & func name

* change unk11F00 type and usages

* func_8014C70C matched

* match func_8015268c

* fix building

* format

* engi message WIP

* enums, cleanup

* missed one

* oops

* even more enums

* another oops

* func_8015E7EC NON_MATCHING

* cleanup Message_DrawTextCredits

* MSGMODE cleanup

* import sFontWidths

* Import z_message_nes data

* Message_DrawTextNES draft

* fix types in message_nes

* Message_DrawTextNES NON_EQUIVALENT

* Message_DrawTextNES improvement

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

* Import bss

* fixes

* Data clean up

* Delete Message_Decode m2c output

* Readd Message_Update data

* import data

* func declaration

* cleanup

* Language enum

* fix naming, some flags

* Update functions and variables related to the bombers notebook event queue.

* Update renamed variables.txt

* format

* attempt Message_DecodeCredits

* begin Message_DecodeNES

* decode cleanup

* incremental improvements on Message_DecodeNES

* oops

* more progress

* first attempt at Message_Decode

* cleanup Message_Decode

* Message_Decode progress

* good progress on decode loops

* more progress

* good Message_Decode progress, thank anon

* decode creep

* big improvements, thanks anon/hatal

* small nes improvement

* cleanup

* match Message_DrawTextDefault, big progress on Message_DrawTextNES

* namefixer for save structs

* Some cleanup/fix non-equivalencies in decodes

* cleanup

* Small cleanup

* func_80150A84

* TextBoxType enum usage

* Format

* match Message_DecodeCredit by Maide, small improvement in Message_DrawTextNES

* comments

* some docs

* cleanup, improve matches

* Some improvement

Co-Authored-By: Santiago <github-santaclose-noreplay@NA.com>

* Fixes

* Missed

* Match Message_DrawTextNES

* Move functions to z64message.h

* string macros

* Small cleanups

* 1 more small thing

* decompme scratches

* Cleanup

* Item enum

* PR

* SEGMENT_ROM_START

* PR

* format

* ocarina cleanup

---------

Co-authored-by: andzura <andzura@andzura.fr>
Co-authored-by: Angie <angheloalf95@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Zoey Zolotova <zoey.zolotova@gmail.com>
Co-authored-by: Santiago <github-santaclose-noreplay@NA.com>
2023-10-04 08:51:45 +11:00
Anghelo Carvajal f08a69a2cb ovl_Bg_Dy_Yoseizo and related docs (#1390)
* Add ido setting to permuter

* OK

* Data imported & named, change spec

* Some easy naming

* Cleanup

* More object stuff and enums

* Document EnDyExtra

* Document DemoGetitem

* Document DemoEffect

* Some work on Elforg

* Elforg params macro, some more on Elfgrp

* Defines for number of fairies

* Tweak some flags wording

* Label beam

* Elfgrp: Name most of the stray fairy handling stuff

* cleanup

* fix typo

* GreatFairyAnimation

* name animations

* BgDyYoseizo_TrainPlayer

* Choose behaviour?

* fix merge

* format

* self review

* WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK

* jenkins

* review

* Update src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

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

* review

* Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c

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

* Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c

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

* Update src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

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

* Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c

* review

---------

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-04 08:13:22 +11:00
Derek Hensley 4ca54d704e Speedmeter OK (#1393)
* Match

* data + bss

* x

* Small cleanup

* maxVal

* gUnkTimeAcc

* SET_FULLSCREEN_VIEWPORT_HIRES

* Update permuter settings

* SET_FULLSCREEN_VIEWPORT_DYNAMIC
2023-10-03 15:52:41 +11:00
engineer124 1509349bd7 Animation Cleanup: En_K* (#1402)
* cleanup k

* one more name
2023-10-01 12:56:38 +11:00
engineer124 33aaaea2c4 Start Player Item Docs (#1396)
* Copy Fig Docs

* small cleanup

* ItemChangeType comment

* bool

* item change comments

* PR Review

* rm comments
2023-09-30 17:28:14 +10:00
Derek Hensley d4c41f0263 z_message_nes (1 NON_MATCHING) (#1394)
* Bring over progress

* Some docs

* scratch urls + format

* Fixes

* Match Message_DrawTextNES

* String macros

* color structs
2023-09-27 14:24:52 +10:00
engineer124 1d1e6ef03b Name player's generic actionVars (#1392)
* action-vars

* single bracket
2023-09-25 14:15:40 -03:00
Anghelo Carvajal a017b8f228 Cleanup pass for CIC6105.c (#1371)
* IO_READ

* CIC6105.h

* CIC defines

* sRomInfoFaultClient

* CIC6105_Init

* CIC6105_Destroy

* hopefully final cleanup

* review

* bss

* bss
2023-09-24 19:23:44 +10:00