Commit Graph

559 Commits

Author SHA1 Message Date
engineer124 732455fdef Animation Cleanup: En_S* (#1517)
* cleanup

* more cleanup

* anim S cleanup

* fix another function

* missed one

* missed another small thing

* oops
2024-01-20 20:15:46 -03:00
Derek Hensley fe6494187e Text Extraction + some Message Docs (#1530)
* Some Decoder WIPs

* Improvements

* POC

* Fix bss

* another newline

* Staff OK

* Cleanup + fix progress script

* script cleanup

* Some docs

* makefile

* Extract text from extract_assets.py

* More docs

* Even more docs

* Other message assets

* Small cleanups

* Clean up decoders/encoders

* Message_SetupLoadItemIcon -> Message_DecodeHeader

* Some more docs

* Remove mkdmadata

* Fade Skippable

* More cmd docs

* 1 left

* Last notes

* HS_TIMER -> HS_TIME

* More general docs

* Format

* Note the charmap conversion for buttons in message_data_fmt_nes.h

* Remove trailing whitespace

* Small fixes

* PR
2024-01-19 21:16:57 -03:00
Derek Hensley 6412ddad50 General Cleanup (#1529)
* Cleanup

* vi define cleanup

* kdebugserver

* osmotor

* Remove sqrtf.c

* Move osFlash out of libultra

* PadUtils_Destroy

* BOOT_ADDRESS_ULTRA

* Fault

* Format

* viconfig.h

* More small cleanups

* gfx cleanup

* Format

* Forgot to save

* variables.h

* dListTable -> dListSides

* Fix header includes
2024-01-15 10:03:13 +11:00
Derek Hensley 663834cbc0 Skybox Docs (#1534)
* xml

* Docs

* 0s
2024-01-14 15:56:19 -03:00
Derek Hensley 1611c22212 Dmadata Migration (#1526)
* Matching dmatable

* Generate NON_MATCHING dmadata

* Clean up dmamgr

* Format

* Ignore tools/buildtools/mkdmadata

* Warnings

* Use SYMS flag instead of segment name

* PR + more notes

* PR cleanups
2024-01-14 13:04:53 -03:00
louist103 a5400fbde5 Update ZAPD (#1533)
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "2b6f459b9"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "2b6f459b9"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"

* Update ZAPD

Co-authored-by: Yanis42 <35189056+Yanis42@users.noreply.github.com>

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "572b13236"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "572b13236"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "9601f2699"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "9601f2699"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"

* fixes for new ZAPD

* readd typedefs

* remov enums

* Reading is hard

---------

Co-authored-by: Yanis42 <35189056+Yanis42@users.noreply.github.com>
2024-01-14 12:34:50 -03:00
engineer124 5607eec18b Use more TRUNCF_BINANG for f32 -> s16 casts (#1503)
* TRUNCF_BINANG

* brackets

* extra cast
2023-12-13 15:16:24 +11:00
engineer124 ed4da0ecef Cleanup External Audio Headers (#1520)
* high level audio headers

* move externs

* cleanup enums

* small thing

* rm sfxid

* small fix
2023-11-29 14:18:09 -03:00
engineer124 a44f19225b Animation Cleanup: En_R* (#1516)
* begin R

* finish anim R

* cleanup

* small adj

* cleanup

* CS_STATE_IDLE

* CS_ID_NONE

* more cleanup

* sBssPad

* angles

* sneak in small fix

* small fix
2023-11-28 08:43:36 -03:00
Anghelo Carvajal 7649cd309a Organize libc and libm files (#1499)
* memmove

* strcpy

* strcmp

* memset

* fmodf

* fix some missing includes

* Remove libc header dependencies on libultra

* fix

* review
2023-11-28 13:01:14 +11:00
Anghelo Carvajal 2fdcdd91b3 Split effect headers and a bit of cleanup (#1482)
* split

* bss

* z64eff_ss_dead.h

* clean eff_blure

* eff_shield_particle cleanup

* tire?mark

* and more cleanup

* format

* forgot to remove this

* review

* EffectBlureDrawMode enum

* review

* review

* bss
2023-11-27 12:24:46 -03:00
engineer124 55badb7162 Misc Cleanup (#1509)
* begin anim R

* sTexturesDesegmented

* more misc docs

* more misc cleanup

* small adjustments

* oh sneaky

* PR Review

* adj comment, reads better

* missed an enum

* this one actor reverses true/false

* bool

* CARNIVOROUS_LILY
2023-11-27 11:54:11 -03:00
engineer124 5284302c8f z_en_test7.c Documentation Pass (#1497)
* copy over docs

* more docs

* some docs

* more docs

* small cleanup

* more small cleanup

* more small cleanup

* lerp time

* small reordering

* feather type

* general owl warp docs

* more cleanup

* rm redundant info

* PR Review

* PR Review
2023-11-27 21:21:52 +11:00
engineer124 702f3cf44e Document Actor Category Change (#1518)
* Actor Category Change

* cleanup

* comments

* adj comment

* revert small cleanup for libc64 PR

* adjust comments
2023-11-27 21:02:28 +11:00
engineer124 c04aaab6a1 Use CURRENT_TIME Macro (#1514)
* use CURRENT_TIME macro

* add comment

* cleanup brackets
2023-11-27 20:04:54 +11:00
Anghelo Carvajal 6dd1600936 Organize libc64 files (#1492)
* Move qrand to libc64

* use an union to avoid type punning

* __osMalloc

* math64.c

* fixed_point.h

* sleep

* aprintf.h

* sprintf

* malloc

* use original names on aprintf.c and malloc.c

* qrand cleanup pass

* use original names of sleep.c

* og names for sprintf

* more cleanup

* format

* fixes

* whoops

* use ARRAY_COUNT again

* comment

* Use `fu`

* forgot this one

* review

* fix

* sneak a tiny cleanup
2023-11-27 12:01:42 +11:00
Anghelo Carvajal 34492a4386 Move the system heap and the framebuffers to their own segments (#1488)
* make segments for the systemheap and the framebuffers

* define in the makefile

* undefined syms

* Make segments for the pre boot buffers too

* Update spec

Co-authored-by: Parker <20159000+jpburnett@users.noreply.github.com>

* review

* Update spec

Co-authored-by: Parker <20159000+jpburnett@users.noreply.github.com>

* Update Makefile

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* comments

* comment

* move comment about the hardcoded address to buffers.h

* rewrite SYSTEM_HEAP_END_ADDR in terms of other symbols

* Use `ALIGNED` on all the buffers

* Rename SYSTEM_HEAP_END_ADDR to FRAMEBUFFERS_START_ADDR

* Put ALIGNED at the right like the rest of the codebase

* merge

* gLoBuffer

* gHiBuffer

* Add a static assert to ensure the address of gHiBuffer haven't shifted without the user noticing

* smol include cleanup

---------

Co-authored-by: Parker <20159000+jpburnett@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2023-11-26 09:47:21 -03:00
engineer124 b25e64d1bd z_en_test4.c Documented (#1498)
* begin docs

* more docs

* skybox

* more cleanup

* more cleanup

* more cleanup

* Improve comment

* in-function static
2023-11-25 17:34:33 +11:00
engineer124 c75d3b97d3 Animation Cleanup: En_O* (#1506)
* anim O cleanup

* fix bss

* PR Review
2023-11-23 15:41:25 +11:00
Anghelo Carvajal 506e215547 Yet another header cleanup (#1508)
* lights.c

* z64skin_matrix.h

* Move out some stuff from macros.h

* gamealloc.h

* move most transition functions to z64transition.h

* z64lib.h

* `include` cleanup on transition files

* z_overlay cleanup

* z64malloc.h

* format

* forgot to remove those

* forgot this

* fix borken includes
2023-11-23 13:55:05 +11:00
engineer124 5ef277df2d Animation Cleanup: En_P* (#1507)
* anim P cleanup

* PR Review

* PR Review

* Postbox Idle
2023-11-22 16:10:55 +11:00
Anghelo Carvajal 2b4610670f Move player-related function declarations to z64player.h (#1480)
* Move player function declarations to z64player.h

* rename Actor_MountHorse to Player_MountHorse and similar functions

* whoops

* add missing includes

* format

* whoops
2023-11-21 12:13:29 -03:00
engineer124 0e441520cc Document Actor_TalkOfferAccepted (#1502)
* rename

* PR Review
2023-11-21 12:36:02 +11:00
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