Commit Graph

1630 Commits

Author SHA1 Message Date
Tom Overton
3a952a655d
Boss05 (Bio Deku Baba) OK and documented (#1510)
* Init, Destroy, Update, easy actions

* Just the hard 3 + 1 left

* One left

* OK

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Data/bss in, extract colheader

* Clean up externs

* Better match for func_809EECBC

* Sfx

* Lot of naming

* fix build

* Name skel stuff

* name limbdraws

* name colliders

* Document `object_boss05`

* Port some names from Odolwa

* Name bio baba types (and relatedly clean up EnPp)

* Better names for the LimbDraw functions + some related vars

* Name all functions

* Name a lot of struct vars

* Colliders and body parts

* Name all struct vars (might come back for a few of these though)

* Name most stack vars

* Fragment states, ice data

* Limb rot index

* Damage effects

* Enum for hit reactions

* Enums for movement state/attack state

* Finish up

* Missed this in EnPp

* Respond to reviews

* Fix comment

* Reverse order for postlimbdraw, etc. functions

* Remove blank line at the top

* Respond to review

* Make a "getter" macro for the force detach timer

* Respond to review

---------

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2023-11-23 09:37:16 -03:00
engineer124
c75d3b97d3
Animation Cleanup: En_O* (#1506)
* anim O cleanup

* fix bss

* PR Review
2023-11-23 15:41:25 +11:00
Javarooster
282f84e3f3
Switched xml lines for gQuestIconSmallMagicJarTex and gQuestIconSmallKeyTex (#1513) 2023-11-23 14:54:01 +11:00
Javarooster
9eb3ee1306
Switch icon_item_static.xml offset addresses (#1512)
* Update icon_item_static.xml offsets

* Switched names for item_icon xml file

* Switched lines for icon_item_static.xml
2023-11-23 14:02:43 +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
76f81833b6
use og names (#1501) 2023-11-21 22:24:20 +11:00
Anghelo Carvajal
52c9137b48
Fix most hardcoded pointers in extracted assets (#1477) 2023-11-21 22:04:23 +11: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
Tom Overton
60ddc5891e
EnJso2 (Garo Master) OK and documented (#1485)
* EnJso2 (Garo Master) OK and documented

* Name all the override input things

* Respond to reviews
2023-11-13 09:41:51 -03: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
Tharo
a441a3cb2d
Decompile ovl_En_Po_Composer (#1391)
* Decompiled, mostly named

* Few more labels and document object

* Review changes

* Further review changes

* Improve EnPoComposer_UpdateEnvColor

* PO_COMPOSER -> POE_COMPOSER, tweak animation names

* More changes

* OCARINA_MODE_EVENT

* fix merge

---------

Co-authored-by: angie <angheloalf95@gmail.com>
2023-11-10 09:52:11 -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
Derek Hensley
e96f18d4e7
Small boot cleanup (#1475) 2023-11-10 10:08:21 +11:00
Anghelo Carvajal
70637abca9
ovl_En_An OK and somewhat documented (#1457)
* Init and Destroy

* EnAn_Update

* EnAn_Draw

* the overrides

* func_80B54124

* two more

* more funcs

* SCHEDULE_CALC_TIME_ALT

* moar

* mor

* mas

* scriiiipts

* mor funcs

* almost everythihng

* migrate data

* func_80B57B48 NON_EQUIVALENT

* object symbols

* face

* fix merge

* slots

* schedule result enum

* func_80B57B48

* format

* name some easy to name struct members

* stateFlags

* object stuff

* accessories

* text ids

* more function naming

* more naming

* name some anims

* trying to make sense out of the schedule

* convert schedule to ifs

* clean it up

* schedule algorithm

* many placeholder names

* name most of the important schedule values

* Add notes to every reamining schedule enum value

* dec

* HandleSchedule

* more naming

* name flags

* name some of the ProcessSchedule functions

* and more naming

* a bit of asset naming

* some typos

* asset naming

* more asset naming

* printing code

* WEEKEVENTREG_COUPLES_MASK_CUTSCENE_*

* name the mouths

* idk

* whoops

* format

* Name the remaining weekeventregs from anju

* name more flags

* whoops

* a

* Incorporate SCHEDULE_TIME

* format

* fix merge

* cleanup

* remove debug stuff

* clean

* WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL

* whoops

* remove some gotos

* whoops

* Update src/overlays/actors/ovl_En_An/z_en_an.c

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

* Update src/overlays/actors/ovl_En_An/z_en_an.c

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

* Update src/overlays/actors/ovl_En_An/z_en_an.c

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

* Update src/overlays/actors/ovl_En_An/z_en_an.c

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

* Update src/overlays/actors/ovl_En_An/z_en_an.c

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

* Update src/overlays/actors/ovl_En_An/z_en_an.c

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

* review

* whoops

* review

* ENAN_GET_8000

* Update src/overlays/actors/ovl_En_An/z_en_an.c

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

* Update src/overlays/actors/ovl_En_An/z_en_an.c

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

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* review

* Update src/overlays/actors/ovl_En_An/z_en_an.c

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

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* fix merge

* Update src/overlays/actors/ovl_En_An/z_en_an.c

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

* Update src/overlays/actors/ovl_En_An/z_en_an.c

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

* Update src/overlays/actors/ovl_En_An/z_en_an.c

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

* review

* review

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
2023-11-10 09:52:32 +11:00
Parker
f2347000b0
Update README with python venv instructions (#1372)
This change updates the README to include instructions for setting up
a python virtual environment.
2023-11-10 09:18:34 +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
Derek Hensley
54e2eff961
D_801AEFA0 (#1473) 2023-11-09 00:03:51 +11: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
Alejandro Asenjo Nitti
28e2da2a18
Match func_809F24C8 NON_MATCHING (#1465)
* fix func_809F24C8

* reloc
2023-11-07 10:32:25 -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
1d75f6aff5
Match FileSelect_SetWindowContentVtx (#1471) 2023-11-07 16:16:38 +11:00
engineer124
ffd9c84184
Match Message_DrawTextCredits (#1470) 2023-11-07 15:58:29 +11:00
engineer124
23fdf69734
Match AudioOcarina_CreateCustomSequence (code_8019AF00.c OK) (#1468)
* match AudioOcarina_CreateCustomSequence

* cleanup
2023-11-07 15:29:04 +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
mzxrules
ddb63dcec2
z_hono_trap OK (#1437)
* match first couple of funcs

* Attempt all functions

* add flags, func_80930190 OK

* z_en_honotrap OK

* clean things up

* implement most suggestions

* space out OPEN/CLOSE_DISP

* more improvements

* implement suggestions

* implement alf suggestions

* u substitution

* nitpicky

* format
2023-11-06 23:02:52 +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
Alejandro Asenjo Nitti
10a14feb2c
ovl_Dm_Tsg: OK (#1458)
* z_dm_tsg Matching

* play2 prototype

* * gSaveContext.save.entrance
* cueChannel constant
* THIS
* i++

* remove actionFunc

* bool

* PR review

* pr review

* DMTSG_UNK_SIZE

* i % 16U

* review
2023-11-03 08:45:35 -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
Tom Overton
42e1c438e1
Add original asset names to all object_n* and object_o* files (#1460) 2023-11-01 23:08:22 +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
Tom Overton
0492c8e89a
Document object_boss05 (Bio Deku Baba) (#1456) 2023-10-31 12:57:27 +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
Derek Hensley
23beee0717
ObjTakarayaWall OK (#1448)
* Takaraya Wall OK

* Docs

* Object docs

* Small cleanup

* undefined syms removal

* EnTakaraya_SpawnWalls docs

* PR

* Small cleanup

* Adjust comment

* PR

* More PR

* PR

* > 1

* ObjTakarayaWall_CanCarvePath
2023-10-29 09:33:07 -03:00
Tom Overton
2859cbbf5e
Boss01 (Odolwa) OK and documented (#1452)
* Boss01 (Odolwa) OK and documented

* Unify existing InitRand implementations

* Remove newlines after `// fallthrough`

* Respond to the rest of engineer's review

* Respond to most of anon's review

* Try to comment the shadow thing correctly

* Fix boss_01 after merge

* SEGMENTED_TO_VIRTUAL -> SEGMENTED_TO_K0

* Review

* Use DMG_SWORD_BEAM and update the comment in z64collision_check.h

* Respond to engineer's review
2023-10-29 08:29:43 +11:00