Commit Graph

433 Commits

Author SHA1 Message Date
Maide ad6d314422
Obj_Kendo_Kanban (1 non-matching) (#687)
* Obj_Kendo_Kanban

* PR
2022-03-26 01:25:35 +00:00
Maide 10995051e0
En_Tanron5 (#653)
* En_Tanron5

* Stuff

* PR

* Fix

* Use x/z instead of x/y

* BSS

* Merge

* bss
2022-03-26 01:19:14 +00:00
Kristopher Early ad9e6e2ae5
ovl_Obj_Yasi (#719)
* parking

* z_obj_yasi successfully decompiled and matched

* removed commented code.

* more cleanup..

* Code Styling changes.

* Swapped to use BINANG_SUB macro.

* Formatting.

* addressing PR comments

* formatting
2022-03-26 01:00:21 +00:00
Nick ce7aa87454
Oceff wipe6 (#686)
* Uncorrupted; Not OK

* Merged upstream -- actually OK

* Update assets/xml/overlays/ovl_Oceff_Wipe6.xml

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

* - Removed Extra 0 characters; clang-format-11

* Removed new warnings.

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-03-24 23:45:37 -03:00
fig02 80cbdb956d
En_Tanron4 OK (seagulls) (#714)
* Seagull OK

* small fixes

* review 1

* review 2
2022-03-24 23:39:34 -03:00
Maide ecb4afd822
Bg_Spdweb (1 non-matching) (#685)
* Bg_Spdweb

* PR
2022-03-24 23:30:02 -03:00
Maide 9a54ec9e0b
En_Bombers (#684)
* En_Bombers

* No need for this >:

* Override

* PR
2022-03-24 23:21:14 -03:00
Tom Overton d5e692d0e1
En_Bom_Chu (Bombchu) OK and documented (#679)
* EnBomChu_Init OK

* EnBomChu_Destroy OK

* func_808F7868 OK

* func_808F79D4 OK

* func_808F7E74 OK

* func_808F7FA0 OK

* func_808F77E4 OK

* func_808F75D0 OK

* func_808F7944 OK

* func_808F7A84 OK

* func_808F818C OK

* func_808F8080 OK

* func_808F7FD0 OK

* EnBomChu_Update OK

* EnBomChu_Draw OK

* Drop unnecessary cast in Update

* Import data into C

* Object symbol

* Use generated reloc

* Port over OoT struct var names

* Name all statics

* Misc cleanup

* Name some of the new struct vars introduced in MM

* Port over most OoT function names

* Name movingSpeed based on in-game observation

* Name final param in EnBomChu_SpawnRipplesAndSplashes

* More cleanup and OOT port

* Some more names

* More docs

* Name last function

* Final little cleanup

* First round of review fixes

* Change the name of that one function

* More precise comment
2022-03-24 23:07:59 -03:00
Maide 5684b342b6
En_Vm (#678)
* En_Vm

* Hidden funcs >:

* PR

* PR
2022-03-24 22:55:58 -03:00
Maide 44db1ac61a
En_Bombf (#677)
* En_Bombf

* PR

* PR
2022-03-24 22:48:19 -03:00
Maide 0fbbde8d7d
Demo_Syoten (#672)
* Demo_Syoten

* Fix build, use UNK_PTR

* Use Vtx

* Keyframe stuff

* PR

* BSS

* PR

* Fix fix
2022-03-24 22:41:04 -03:00
Parker Burnett 950f3a247e
En_guard_nuts OK and Partially documented (#668)
* guard_nuts OK

* doing some documenting

* more docs

* more docs

* minor changes

* touch ups

* format

* pr feedback

* fixing a name

* ran actor_fixer
2022-03-24 22:34:50 -03:00
Tom Overton cbfa42c070
En_Mt_tag OK and documented (Goron Race Manager) (#659)
* EnMttag_Init OK

* EnMttag_Destroy OK

* EnMttag_Update OK

* func_809CF9A0 OK

* Update struct

* func_809CF444 OK

* func_809CFA00 OK

* func_809CF394 OK

* func_809CF8EC OK

* func_809CFA54 OK

* func_809CF350 OK

* func_809CF848 OK

* func_809CF950 OK

* func_809CFBC4 OK

* func_809CFD98 OK

* func_809CFE28 OK

* func_809CFF94 OK

* func_809CFC38 OK

* Get super close on func_809CF4EC

* Import data

* Get a start on func_809CF67C

* func_809CF4EC OK, thanks engineer!

* func_809CF67C OK, thanks engineer!

* Use the generated reloc

* Name message functions and raceGorons array

* Name some more stuff

* Name more functions

* Name most functions

* Take a stab at trying to figure out what the data represents

* Much better naming and understanding

* Name more

* Strip out debugging junk

* Better name

* Name the rest of the variables

* Describe bug

* Document the h*ck out of things

* Simplify PlayerCheatStatus a bit

* Use sCheckpointPositions as per engineer's advice

* Do some really stupid naming nonsense to explain the side effect of a function

* Fix Racing/RaceGoron inconsistency

* Decimal weekEventReg accesses

* Rename to EnMttag_UpdateCheckPoints

* Capitalization consistency + update functions.txt

* Respond to review

* Respond to review

* Respond to Elliptic's review

* idk if Elliptic meant the function name or the variable so let's just do both lol

* Fix function name changed by z_demo merge
2022-03-24 22:28:03 -03:00
Parker Burnett 3431b542ff
En_look_nuts OK with docs (#674)
* OK

* some documenting

* lgtm

* format

* spacing things out

* one other name

* PR feedback

* fix enum

* addressing PR

* actor fixer

* fixing PR
2022-03-24 22:22:46 -03:00
Maide 20fed85f67
En_Ah (#658)
* En_Ah

* PR
2022-03-24 22:17:07 -03:00
Maide 0a8fd53273
En_Elfgrp (#654)
* En_Elforg

* PR

* PR

* PR
2022-03-24 22:11:43 -03:00
Maide f87c8290c8
En_Tsn (#651)
* En_Tsn

* PR

* PR

* Merge
2022-03-24 22:05:40 -03:00
Maide 7ee4615cd0
Obj_Spidertent (1 non-matching) (#639)
* Obj_Spidertent

* Match func_80B2FC98 (thanks Anon58)

* PR

* Fix

* PR

* PR
2022-03-24 21:56:51 -03:00
Maide 47ef03494b
Obj_Spinyroll (2 non-matching) (#635)
* Obj_Spinyroll

* syms

* PR

* PR

* PR
2022-03-24 21:49:47 -03:00
Maide ad25a1dc47
Obj_Skateblock (#622)
* Obj_Skateblock

* PR

* PR

* PR

* PR

* Something weird happened
2022-03-24 21:44:00 -03:00
Tom Overton 17489d9a1d
En_Fishing OK (three functions matched) (#742)
* EnFishing_UpdateOwner OK

* EnFishing_UpdateFish OK

* Respond to engineer's review

* EnFishing_UpdateLure OK, thanks Synray!

* Remove NON_MATCHING from spec
2022-03-24 21:32:24 -03:00
Anghelo Carvajal 1599192b85
Script for checking relocs correctly updated on spec (#718)
* Script to check for relocs on spec

* add reloc_spec_check to jenkinsfile

* add colors

* Use light red instead of red

* Go back to red

* fix EnDoor reloc
2022-03-24 21:25:41 -03:00
Maide 49aeece9ee
Obj_Grass (#617)
* Obj_Grass

* PR

* PR

* PR

* Match (thanks Synray)
2022-03-24 21:20:21 -03:00
engineer124 b852a9a930
Audio_Load OK and Documented (#620)
* Copy audio_load progress from main branch

* Fix warning

* fix UB

* cleanup WIP

* Add docs, bss still broken

* bss fix

* bytesRemaining with size_t

* PR Suggestions

* PR Suggestions

* Fix bss

* Fix bss

* PR Suggestions
2022-03-23 21:22:13 -04:00
Anghelo Carvajal 92c4d42f44
`z_skin` and `z_skin_awb` OK and documented a bit (#415)
* oot copypaste

* func_8013859C non matching and func_80138700

* protos

* the other functions

* func_80138300

* progress

* func_80137F58

* func_80137EBC

* func_80137B34 NON_MATCHING

* func_80137970

* func_8013835C

* z64skin

* some docs

* some bits

* Match func_80137B34

* Match Skin_DrawImpl

* Match Skin_Init tahnks to Anon

* Some docs?

* AnimatedLimb

* SkinVtx

* more names

* fix merge issue

* format

* another clean

* trailing comma

* cleanup

* format

* add some descriptions

* Import bss

* last cleanup

* Update ZAPD symbol map

* Reanme gIdentityMtx and gIdentityMtxF

* fix merge issues

* bss

* review

* Update include/z64skin.h

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

* bss

* Port @fig02 skin docs

* format and a few changes

* format

* Port over OoT review

* fixes

* Engineer's review

* format

* address pr

* Fix bss

* fix bss

* Update src/code/z_skin_awb.c

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

* bss

* bss

* undo

* pr

* Skin_Setup

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-03-23 17:30:34 -04:00
mzxrules f1560614d6
z_object_switch OK (#527)
* z_obj_switch all functions attempted

* z_obj_switch OK

* Document z_obj_switch

* update gameplay_dangeon_keep references

* pr changes implemented

* fix warnings

* pr suggestions, name all functions
2022-03-10 05:49:11 -05:00
Maide 6ed7b0849c
En_Osk (#670)
* En_Osk

* PR

* run actorfixer

Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-09 23:19:00 -03:00
immibis fa321be0f3
Bg_F40_Switch OK and documented (#526)
* Bg_F40_Switch OK and documented

* updates for Bg_F40_Switch PR

* update names

* formatting

* func_80BC46B0 → BgF40Switch_CheckAll
2022-03-09 22:08:36 -03:00
Derek Hensley d36b0d506d
Misc NON_MATCHINGS/NON_EQUIVALENTS (#696)
* Match the rest in fireObj

* Fix FireObjLightParams struct

* Fix up bomjima

* Match ObjSnowball

* 2 functions in EnGoroiwa

* Rename randMultiplier

* Minor cleanup

* More cleanup

* Boss02 Ok

* Match Boss06_Draw

* format

* bss

* Remove static from osFlash bss

* PR suggestions

* Remove LightInfoPositional

* 0x4000

* Format

* Cleanup

* Fix bombjima data

* Boss02 newline

* PR stuff

* Change func_8012CF0C to NON_EQUIVALENT

* Matched func_8012CF0C by AngheloAlf

* RSPMatrix -> Mtx

* Bubbles fix
2022-03-09 22:02:27 -03:00
Maide 040db7ac40
En_Mm3 (#671)
* En_Mm3

* PR

* Merge
2022-03-05 12:57:38 -03:00
Parker Burnett 4a18f3ca4d
En_shn OK (#638)
* Building on Macs

* Add Mac building documentation

* Review

* Update for new z64compress

* Review

* getting some matching done

* gettting some more matches

* actor fixer

* almost OK

* Shn OK

* fixing data and warnings

* finishing touches

* forgot to update spec

* dang comments not being formatted

* this should fix things

* fixing feedback and other fixes

* fixing things

* fixing things

* addressing PR

* format and minor fix

* actorfixer

* fixing actor

* fixing enum

* yay format

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-05 12:45:49 -03:00
Parker Burnett 10a1ef8f1d
Bg_ingate OK (#643)
* close, 2 functions left, both close

* documenting what I can

* fixing things

* fixing

* changing weekEventReg

* master fix

* ran actorfixer
2022-03-05 12:22:43 -03:00
Maide 26d71ffbf6
En_Prz (#656)
* En_Prz

* PR

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-05 12:09:23 -03:00
Anghelo Carvajal 6017869b1e
`z_player_call` OK (#693)
* Match functions

* Rename functions

* Import data and bss, and minor fixes

* Format

* Whoops

* Add some protos to z_player
2022-03-05 11:51:51 -03:00
Maide d9155eb498
Bg_Hakugin_Switch (#699) 2022-03-05 11:42:55 -03:00
Tom Overton f9dac7d483
En_Racedog OK (#690)
* func_80B24630 OK

* func_80B248B8 OK

* func_80B246F4 OK

* func_80B25448 OK

* func_80B256BC OK

* EnRacedog_Draw OK

* LimbDraw functions OK

* func_80B2583C OK

* func_80B258D8 OK

* EnRacedog_Update OK

* func_80B255AC OK

* func_80B2538C OK

* func_80B252F8 OK

* Data imported to C

* Update struct to have everything Init needs

* func_80B24E14 OK

* EnRacedog_Destroy OK

* func_80B24C14 OK

* EnRacedog_Init OK

* func_80B2478C OK

* func_80B24CB4 OK

* func_80B251EC OK

* func_80B24F08 OK

* func_80B25490 OK

* Use generated reloc

* Object symbols and other misc cleanup

* More cleanup

* Move data to be in-function like how Dg does it

* Rename to ENRACEDOG_GET_3E0 until this actor is actually documented

* Last itty bitty cleanup

* Better header

* Forgot to name the LimbDraw functions, whoops

* Respond to reviews

* Match how Dg does weekEventReg stuff

* Respond to review
2022-03-05 11:34:26 -03:00
Maide f87cabbc55
En_Butte (#683) 2022-03-05 11:27:33 -03:00
Maide 640f039cce
En_Gg2 (#676)
Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-05 11:22:16 -03:00
Maide 1c955e56b0
En_Tab (#657)
* En_Tab

* PR
2022-03-05 11:16:36 -03:00
Maide 888448decf
Obj_Hakaisi (#655)
* Obj_Hakaisi

* Fix

* PR
2022-03-05 11:10:55 -03:00
Tom Overton f4a9d117b1
En_Syateki_Crow (Shooting Gallery Guay) OK (#694)
* EnSyatekiCrow_Init OK

* EnSyatekiCrow_Destroy OK

* func_809CA5D4

* func_809CA67C OK

* func_809CA71C OK

* func_809CA840 OK

* func_809CA8E4 OK

* EnSyatekiCrow_Update OK

* func_809CAAF8 OK

* func_809CABC0 OK

* func_809CACD0 OK

* EnSyatekiCrow_Draw OK

* func_809CAE5C OK

* func_809CAF2C OK

* Migrate data to C

* Object symbols

* Use generated reloc

* Name static variables

* Name LimbDraw functions

* Remove struct padding

* Respond to review

* Respond to Elliptic's review
2022-03-05 11:03:59 -03:00
Averane 5f9e906727
EnHeishi OK and documented (#597)
* EnHeishi first pass

* fixed references to updated function names

* fixed references to updated function names part 2

* removed unnecessary externs

* pr fixes

* fix header

* fix object files to match demoheishi changes

* cleanup

* PR comments addressed

* merge master

* use actors flags with change for demoheishi too
2022-03-05 10:58:54 -03:00
emilybrooks aa6c316102
Ovl_En_Drs OK and Documented (#669)
* done

* merged master, some cleanup

* more cleanup

* review 1

* removed the skelAnime temp

* format

* prototype newline

* globalctx2
2022-03-05 10:54:09 -03:00
Anghelo Carvajal 77cfd399d0
`z_demo` with 4 NON_MATCHINGs (#514)
* starting

* a bunch

* and another bunch

* a bunch

* Match func_800EB1DC

* func_800EB4B4

* func_800EB6F8

* 2 more

* fix prototype of a random kankyo function

* func_800EBD60 non matching

* func_800EC678 matched?

* func_800EC6D4

* break

* func_800ECD7C

* A bunch of functions

* func_800EE200

* func_800EDF78 and func_800EE0CC

* func_800EDBE0 NON_MATCHING

* Cutscene_Init NON_MATCHING

* func_800EA324 NON_EQUIVALENT

* Fix warnings

* func_800EC924 NON_EQUIVALENT

* Cutscene_ProcessCommands NON_EQUIVALENT

* Format

* Split z_demo data and import it

* Import bss

* Match func_800EB364

* Rename Cutscene_Command_SetTime

* Improve Cutscene_ProcessCommands a bit (still not equivalent, probably)

* Improve Cutscene_ProcessCommands thanks to engineer and anon

* Cutscene_ProcessCommands NON_MATCHING

* Name some commands

* Fix

* Renames based on Engineer knowledge of Audio stuff

* More command names

* Cutscene_Command_GiveTatlToPlayer

* Some cutscene commands macros

* more command macros

* Macros for unknown commands

* Improve Cutscene_Command_Textbox a bit

* Rename stuff

* Name Terminator and Camera

* MOTIONBLUR

* Macros for textbox commands

* CS_PLAYER_ACTION_LIST

* A few macro renames

* Small cleaning

* A bit more of cleanup

* Rumble

* Entrance comments in func_800EB6F8

* Some var renames

* CS_CMD_FADESCREEN

* More clean up

* Clean functions protos

* Move CutsceneStateHandler out of z64.h

* Cutscene_DoNothing

* Cutscene_IsPlayingCs & Cutscene_GetSceneSetupIndex

* And more renames

* name some stuff in the cutscenecontext struct

* npcActionIndex->actorActionIndex

* Undo names of CS_STATE_ enum

* Name Cutscene_ActorTranslate family of functions

* small docs pass

* sfxconvert and format

* Hopefully last cleanup

* Add some missing functions to actorfixer

* Fix merge issues and remove trailing commas

* Cutscene commands fix

* Cutscene_Command_Misc improved by engineer

* Update src/code/z_demo.c

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>

* Address review

* bss

* Match Cutscene_Command_Textbox by anon58

* Fix merge issues

* Match Cutscene_Command_Misc by @hensldm

* review

* float time macros

* fix merge issues

* format

* Fix building assets

* fix merge issues

* format

* Fix

* format

* fix merge issues

* fix

* fix

* format

* fix issues and run format

* bss

* Fix conflicts, bss and formatter

* Update include/functions.h

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

* Update include/functions.h

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

* Update include/z64.h

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

* Update include/z64cutscene.h

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

* Update include/z64cutscene.h

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

* Update include/z64cutscene.h

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* address review and fix some stuff

* fix merge problems

* more fixes and format

* Fixes

* Update include/functions.h

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

* Update include/functions.h

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Engineer suggestions

* format

* Elliptic review

* Use dec for ShrinkWindow_SetLetterboxTarget

* add a few comments

* Cutscene_Command_ChooseCreditsScenes

* Update src/code/z_demo.c

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

* format

* some cleanups and some comments

* change actorActionCmd from hex to dec in the codebase

* minor comment on textboxcmd

* ahhhh

* Update src/code/z_demo.c

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

* brackets

* minor comments

* rewording

* im dumb

* brackets

* another bracket

* Dawn of the New Day

* Update src/code/z_demo.c

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

* fixes

* Cutscene_Command_TransitionFX by Anon

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-03-04 19:14:52 -05:00
Maide 8b7cbb1273
En_Gk (#580)
* En_Gk

* Merge

* Merge

* TrasnformDraw

* PR

* a

* Ok

* PR
2022-02-28 03:03:03 +00:00
Maide d60f3fcf2c
En_Gg (#585)
* En_Gg

* remove syms

* merge

* Merge

* PR

* PR
2022-02-28 02:59:07 +00:00
Maide e127ee650a
En_Pr2 (#587)
* En_Pr2

* Cringe

* Merge

* PR

* Revert EnEncount1

* PR
2022-02-28 02:52:39 +00:00
Maide 6f4b349020
En_Zob (#593)
* En_Zob

* Merge

* Merge

* Merge

* PR

* fixer
2022-02-28 02:44:29 +00:00
Maide c9f64d3344
Obj_Hunsui (#626)
* Obj_Hunsui

* PR

* Merge

* Merge
2022-02-28 02:38:36 +00:00
Maide 84e13ff2a0
Obj_Comb (#632)
* Obj_Comb

* PR
2022-02-28 02:29:56 +00:00
Maide bb6b580a6b
Mir_Ray (1 non-matching) (#634)
* Mir_Ray

* PR

* fmt
2022-02-28 02:18:40 +00:00
Maide 484263dedc
Obj_Bombiwa (#637)
* Obj_Bombiwa

* PR
2022-02-28 02:11:06 +00:00
louist103 684df37ebc
En_Door (#571)
* progress

* it matches mostly

* symbols

* done for now

* fix warnings and stuff

* formatter

* NON_EQUIVALENT

* pr fixes

* formatter and actorfixer

* fix pm

* more fixes

* PR fixes

* it actually builds again

* matching function

Co-authored-by: Louis <louist103@pop-os.localdomain>
2022-02-27 17:37:24 -05:00
Derek Hensley f67ecbc3c2
EnBba01 Ok and Documented (#667)
* Decomp Bba_01

* Doc bba01

* Document object_bba

* Remove new line

* Cleanup/rename EnHy to help differentiate it from overlays

* Adjust xml comment

* PR suggestions

* English is hard

* English is hard 2

* Add note about invalid textIds

* typo

* Fix merge

* Remove 0 defines
2022-02-19 23:27:15 +00:00
Maide b949669131
Door_Shutter (#623)
* Door_Shutter

* PR

* Fix macro

* PR

Co-authored-by: angie <angheloalf95@gmail.com>
2022-02-19 23:05:22 +00:00
Maide 3f15c0017a
En_Zoraegg (#630)
* En_Zoraegg

* Revert bgCheckFlags

* roomInf

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-02-19 21:36:16 +00:00
Tom Overton 8e3d28b536
En_Syateki_Wf (Shooting Gallery Wolfos) OK (#673)
* EnSyatekiWf_Init and EnSyatekiWf_Destroy OK

* func_80A201CC OK

* func_80A20284 OK

* func_80A2030C and func_80A20320 OK

* func_80A20378 OK

* func_80A200E0 OK

* func_80A203DC OK

* func_80A20670 OK

* func_80A206DC and func_80A20710 OK

* func_80A2075C OK

* func_80A2079C and func_80A20800 OK

* func_80A208F8 OK

* Import data to C

* func_80A20858 OK

* EnSyatekiWf_Update OK

* Draw functions OK

* Use generated reloc

* Delete struct padding

* Use object symbols

* Name the statics

* ANIMMODE enum

* Misc cleanup

* Format

* Respond to review

* Change do-while loops to just be while loops

* Decimal counter
2022-02-19 21:26:04 +00:00
Tom Overton debcfa3d72
Bg_Numa_Hana (Wooden Flower in Woodfall Temple) OK and documented, partial documentation of object_numa_obj (#666)
* Import data to C

* BgNumaHana_Init OK

* BgNumaHana_Destroy OK

* BgNumaHana_Update OK

* func_80A1A500 OK

* func_80A1AE08 and func_80A1AE1C OK

* func_80A1AA14 and func_80A1AA28 OK

* func_80A1AA38 and func_80A1AA4C OK

* A few more functions

* Finish most functions

* func_80A1A56C OK

* BgNumaHana_Draw OK

* Use generated reloc

* Use object symbols

* Actor flags

* Minor cleanup

* Some initial documentation

* More documentation

* Document flower petal struct

* Some more struct vars

* Name everything else

* Finish documenting the object for the flower

* Final doc pass

* UNK_TYPE

* Respond to review and fix build
2022-02-19 21:18:15 +00:00
Parker Burnett 249871642f
Obj_kinoko OK (#646)
* z_obj_kinoko OK

* fixing DL and changing to thisx

* naming display list

* minor fix

* fixing PR suggestions

* addressing PR

* reverting name and leaving a comment
2022-02-19 21:12:22 +00:00
Maide 0e6cf608d2
En_Pr (#631) 2022-02-19 20:59:15 +00:00
Maide 717adf8ed8
En_Sth (#625)
* En_Sth

* Skull tokens

* PR
2022-02-19 20:49:57 +00:00
Maide e2d546c8f0
En_Bom_Bowl_Man (#616)
* En_Bom_Bowl_Man

* sAnimations

* Fixup data

* PR
2022-02-19 20:45:21 +00:00
Maide c91423abae
En_Baba (#592)
* En_Baba

* Merge

* Merge

* PR

* PR

* Apply suggestions from code review

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

* Update src/overlays/actors/ovl_En_Baba/z_en_baba.c

* format

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2022-02-19 20:38:52 +00:00
Maide 2b5fe949fe
En_Tanron2 (#615)
* En_Tanron2

* Format

* PR
2022-02-19 20:27:21 +00:00
Maide 320a1a3030
Dm_Char00 (#611)
* Dm_Char00

* Replace other macros

* PR
2022-02-19 20:22:45 +00:00
Maide 9f5217c81f
En_Zow (#607)
* En_Zow

* Matching

* PR
2022-02-19 20:16:21 +00:00
Maide 08acf42204
En_Kendo_Js (#606)
* En_Kendo_Js

* PR

* PR

* PR
2022-02-19 20:09:27 +00:00
retro 557825636f
EnOsn OK (#603)
* start working on struct

* init matching

* destroy matched

* func_80AD0830 and update matching

* func_80AD1634 matching

* idle matching

* func_80AD16A8 matching

* cleanup

* func_80AD0A24 matching

* cleanup

* func_80AD144C matching

* func_80AD14C8 almost matchign

* func_80AD14C8 matching

* func_80AD19A0 matching

* func_80AD0AB0 matching

* func_80AD0998 matching

* func_80AD1398 matchign

* cleanup

* func_80AD0B38 matching

* func_80AD0E10 matching

* func_80AD08B0 matching

* func_80AD10FC matching

* EnOsn_Draw matching

* func_80AD1DA8 matching

* func_80AD1E28 matching

* document

* update kafei mask

* import data

* actorfixer

* fix warnings

* cleanup

* format and cleanup

* use unk_type

* most feedback done

* format

* change unks to vec3s

* treat as bool

* use CHECK_QUEST_ITEM macro

* use CHECK_QUEST_ITEM macro

* some documentation

* format

* some feedback done

* fix fallthrough spacing in switch

* split up func_80AD1398

* format

* more feedback

* param macro

* use param macro

* replace returns with break

* remove padding

* fix for upstream merge

* feedback

* move some data inline

* feedback

* fetch upstream

Co-authored-by: retro <retro@retros-air.home>
Co-authored-by: retro <retro@retros-mbp.home>
Co-authored-by: retro <retro@retros-MacBook-Pro.local>
2022-02-19 19:48:05 +00:00
Maide 271cf4de70
Obj_Snowball2 (#596)
* Obj_Snowball2

* Merge

* merge

* PR
2022-02-19 19:41:46 +00:00
Maide 5d3ddfac00
En_Al (#595)
* En_Al

* Merge

* Merge

* PR

* Names

* PR
2022-02-19 19:34:09 +00:00
Maide 9ddf530f9b
En_Karebaba (#590)
* En_Karebaba

* merge

* Merge

* PR
2022-02-19 19:17:20 +00:00
Maide 2d6a74c0aa
Dm_Char01 (#589)
* Dm_Char01

* Merge

* Extract verts

* PR
2022-02-19 19:11:13 +00:00
Maide 3086543498
En_Ja (#581)
* En_Ja

* Fix a problem

* Merge

* Merge

* TrasnformDraw

* Need static data

* PR
2022-02-19 19:04:34 +00:00
Isghj 926b575d13
EnAni OK (Man in Tree in South Termina Field) (#566)
* EnAni:Start

* EnAni: done with matching

* EnAni: docs

* EnAni: forgot the display lists, they wouldnt load in z64utils, had to use limb->DL to name them

* EnAni: forgot the spec, so rusty

* Apply suggestions from code review

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

* EnAni: more requested changes

* EnAni: format pass

* EnAni: remove typedef warning

* EnAni: typdef attempt

* Apply suggestions from code review

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

* EnAni: changed ani state flags from enum to defines

* EnAni: formatter no

* EnAni: undefined behavior

* EnAni: chest rot discovered

* EnAni: fixes after merging

* EnAni: flags docs

* EnAni: flags at top using enum

* EnAni: jenkins bait

* EnAni: revert bgcheck flag

* EnAni: single doc

* EnOssan: format after fix to EnAni

* EnAni: requested changes, some documentation changes

* EnAni: forgot to re-extract

* EnAni: better object naming

* EnAni: changed STATE_SUFFERING to STATE_WRITHING to match object docs, removed extra whitespace from defines

* EnAni: removed object comment about z64util not rendering them

* EnAni: flipped actor flag to match OOT

* EnAni: formater pls

* EnAni: Animatation Enum values in Animation_change calls

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-02-19 18:59:43 +00:00
Isghj 26d1982f19
EnYb OK (Kamaro, the dancing ghost) (#562)
* EnYb: start

* EnYb: ah I broke it

* EnYb: well at least the draw function matched...

* EnYb: back to semi-matching

* EnYb: Back to OK, workable again

* EnYb: init matches now, ugly as it is for dma padding

* EnYb: probably not progress

* EnYb: fixes to master merge, back to OK

* EnYb: custom shadow function matches

* EnYb: more docs, this last function sucks

* EnYb: OK thanks to Anon and myxrules

* EnYb: docs

* EnYb: more docs

* EnYb: formatter pass

* EnYb: removed unused symbols

* Requested changes part 1

* EnYb: Minor changes

* EnYb: forgot the spec

* EnYb: some display lists documented based on limbs, but two remain because their limbs dont highlight in z64Utils

* EnYb:one wrong entry

* EnYb: maybe better object documentation

* EnYb: fix warnings

* EnYb: flag docs

* EnYb: changed function

* EnYb: more documentation

* EnYb: flags enum at top

* Update src/overlays/actors/ovl_En_Yb/z_en_yb.c

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

* Update src/overlays/actors/ovl_En_Yb/z_en_yb.c

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

* EnYb: PR fixes

* EnYb: formater is picky

* EnYb: jenkins bait

* EnYb: correct array access

* EnYb: formater pass

* Apply suggestions from code review

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

* EnYb: fixes

* EnYb: more requested changes, formater pass

* EnYb: renamed padding

* EnYb: object xml name updates

* EnYb: merge fix

* EnYb: limb enum and small changes

* EnYb: scale float fraction found

* EnYb: better object limb naming

* EnYb: formater pls

* EnYb: flipped actor flags to match OOT

* Apply suggestions from code review

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

* EnYb: more requested changes

* EnYb: more animMode enum found

* EnYb: doc player playing ocarina

Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-02-19 09:57:09 -05:00
engineer124 01ca078226
Import code_8019AF00.c (Audio) data & bss, introduce z64ocarina.h (#575)
* Import code_8018AF00 Data

* code_8019AF00.c BSS Imported

* format

* Small touch-up

* rename `bgm.h` to `sequence.h`

* Missed a variable

* PR Feedback 1
2022-02-14 01:38:46 +00:00
Maide 7565f9f052
En_Insect (#652)
* En_Insect

* WHO DIDN'T FORMAT?!

* PR
2022-02-14 01:32:56 +00:00
Maide a5e631d03f
En_Zov (#649)
* En_Zov

* PR

* PR
2022-02-14 01:18:42 +00:00
Tom Overton 3597e4809f
En_Jg (Goron Elder) OK and documented. Also document object_jg (#594)
* Migrate data to C

* Init / Destroy / Update / Draw

* Functions called from Update

* Better Init match

* A few more functions

* A few more functions

* Drum-spawning function OK

* EnJg OK

* Name a few struct vars

* Name some static vars

* Name limbs

* Name limb DLs

* Name some textures

* Name all remaining textures

* First pass animation names + use object in actor file

* Add drum to XML + clean it up

* Better translations, thanks Emily!

* Some more documentation

* Improvements

* Params accessor for s_goro

* Proper object symbols for Jg_Gakki

* Delete unnecessary undefined_syms

* Text defines for my own sanity

* Some more names

* Document point/path stuff

* Name every function, even if the names are bad

* Params macro for if he's in goron shrine

* Some misc improvements

* Document EnJg_GetShrineGoronToFocusOn better

* Final cleanup before PR

* Change action name because this actor is dumb!

* Run actorfixer

* Rename some variables now that a function is named

* ProcessTalkRequest takes GameState

* Run actorfixer

* Use new actor flags

* Update text ID names to match my text ID PR

* Define the limb enum in the object

* Be consistent about where the EnumName is

* Don't name limbs after the actor

* Basic enum for drum limb

* Fix stuff after merge

* Do if/else if/else

* Remove textId defines

* Decimal weekEventReg accesses
2022-02-13 20:07:26 -05:00
Maide 45cee7d8af
Obj_Dhouse (#648)
* Obj_Dhouse

* PR

* PR
2022-02-14 00:58:19 +00:00
Derek Hensley 0625803c17
Ovl_En_Cne_01 Ok and Documented (#641)
* Decomp and document Cne01

* Document object_cne

* split enhy header from z64

* Cleanup

* Actually include new z_en_hy header

* Actor flags

* Add header to object_cne

* screen defines

* Useage of ENHY_LIMB_MAX
2022-02-14 00:30:30 +00:00
Maide 9e9b84cb2c
Dm_Char05 (#583)
* Dm_Char05

* Params

* Syms

* Earpstone

* Merge
2022-02-13 23:58:41 +00:00
Maide 5fe04d87e0
Bg_Ikana_Rotaryroom (#573)
* Bg_Ikana_Rotaryroom

* Merge

* Merge

* PR

* PR
2022-02-13 23:39:10 +00:00
Maide 66b309218c
Bg_Dblue_Movebg (#568)
* Bg_Dblue_Movebg

* UNK_TYPE1

* PR

* Match Draw (thanks Anon58)

* Match

* data

* PR
2022-02-13 23:24:26 +00:00
Maide 5fa02d9725
En_Arrow (1 non-matching) (#551)
* En_Arrow

* Remove comment

* UNK_TYPE1

* Add thing

* Merge

* Merge

* PR

* PR

* PR
2022-02-13 23:14:13 +00:00
Parker Burnett 0f7f5de084
En_am OK (#501)
* en_am ok

* clean up

* applying feedback and some docs, need finish still

* this should fix things

* fixing things

* fixing things and running format

* post actor_fixer

* adding object header and fixing comments

* formatting and adding enum for limbs

* addressing pr, naming things, cleanup

* fixing enum in header

* doing some docs and fixing format
2022-02-13 12:02:31 -05:00
Averane 40d1bc00fe
EnDemoheishi OK and documented (#584)
* EnDemoheishi decomp first pass

* object decomp

* whitespace between declarations and statements added

* various PR fixes

* format for CI

* various PR fixes 2 + format

* missed one texture output name

* fix texture docs in unrelated files

* fix demoheishi shared texture naming

* made object sdn properties generic for soldiers

* missed outName modifications

* fixed references to updated function names

* reverting some texture changes to unrelated objects & use object specific names for lips and fingers textures

* added textId comment

* various PR comments addressed

* added enum for animations

* reverting halt animation naming

* moved animation enum to actor class

* fixed enum names

* fix typo

* more PR fixes

* format

* fix for broken build after other PR merge

* format

* merge fixes

* isTalking

* Enum - Calf to shin

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

* Object - Calf to shin

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

* DList - Calf to Shin

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

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-02-05 19:52:39 -05:00
engineer124 2104c16362
code_8012EC80.c OK and Documented + parameter_static extraction (#534)
* Match remaining functions of code_8012EC80.c

* parameter_static extracted and OK

* Small Progress

* Documentation all over the place

* Finish Documenting

* Cleanup

* Name more textures

* Update knowledge on deku playground player name

* All textures from parameter_static known now

* Finish documenting and validating parameter_static

* More up-to-date SaveContext docs

* More docs

* More cleanup

* Sun -> Star

* Minor touchup

* More cleanup

* pictograph -> pictoBox

* Remove the "unused" part

* More accurate name: hour lines

* It's gsDPLoadTextureBlock, not gsDPSetTextureImage

* Fix parameter_static and merge issues

* More docs from new PRs and Parameter WIP

* Missed a name

* Move parameter_static to interface assets

* Clean up code_8012EC80.c data

* Fix comment

* Add comments to parameter_static

* Oops

* fix merge

* Missed a PR review suggestion

* Fix merge
2022-02-05 01:49:21 +00:00
engineer124 bcdd99df08
Importing audio_data.c (#473)
* import audio_data.c

* frequency of -> harmonic

* Name remaining filter data

* Note to Pitch
2022-02-05 00:39:21 +00:00
Maide 69d7a2e585
Obj_Bean (#467)
* Obj_Bean

* Fix non-matching (thanks engineer)

* PR

* undef

* fmt

* PR

* PR

* Merge

* Merge

* PR
2022-02-05 00:27:29 +00:00
Maide e257491e19
Obj_Ice_Poly (#610)
* Obj_Ice_Poly

* PR
2022-02-04 23:58:18 +00:00
LtPeriwinkle 4460d086d4
EnZo OK and documented (#503)
* EnZo OK, sort of documented

* fix variable naming

* fix suspicious match, add -ing to `PlayWalkSound`

* name `FollowPath`, waypoint struct member

* update description to say unused

* name `TreadWater`, fix a snake case i missed

* name `Walk`

* cleanup a bit

* address comments

pointers -> symbols, remove static and array length, inline data,
define var on same line, update file description, use ARRAY_COUNT

* space things out, move data, add ENZO_NO_PATH

* fix ENZO_NO_PATH define

* remove array pad, dec for size, thisx in limbdraw, renames in draw

* name some object_zo stuff, use symbols

* funny single member damage enum

* name textures

* name the rest of the used items in object_zo

* name the dlist

* suggestions

* actually fix the return false

* formatting
2022-01-30 18:09:17 -03:00
Maide ade2f678b8
Boss_06 (2 non-matching) (#557)
* Boss_06

* Format

* BSS

* Merge

* PR
2022-01-30 17:25:38 -03:00
Maide 5eb1b417de
En_Hint_Skb (#554)
* En_Hint_Skb

* Merge

* Actorfixer fail

* Merge

* PR
2022-01-30 17:13:46 -03:00
Maide 06a14e73ea
En_Scopenuts (#560)
* En_Scopenuts

* Merge

* PR

* Fix

* PR
2022-01-30 17:00:19 -03:00
Maide b8c33ffa54
En_Rg (1 non-matching) (#565)
* En_Rg

* UNK

* PR

* PR

* Merge

* Merge

* PR

* textures
2022-01-30 16:53:54 -03:00
Maide a00601671d
En_Zos (#609)
* En_Zos

* Merge
2022-01-30 16:48:40 -03:00
LtPeriwinkle af26d4edac
EnBigokuta OK and documented + object_bigokuta documented (#563)
* EnBigokuta like half matched

* match all but 2 functions

* match all the functions

* import data

* name object stuff

* use new object symbols, do some documenting

* fix name of headUndersideTex

* name some struct members

* finish documenting

* Address comments

spacing, unkFunc comments, temp names, remove parens, reorder pads,
data formatting, limb enum

* address comments

* move empty line

* change the ARRAY_COUNT
2022-01-30 16:37:39 -03:00
EllipticEllipsis 7879b49785
contramread OK (#577)
* contramread OK

* Review
2022-01-30 15:52:19 -03:00
Maide e4010be70c
Obj_Oshihiki (#636) 2022-01-29 20:00:43 -05:00
Maide c840e04c27
En_Trt2 (#448)
* Trt2

* Whoops

* PR

* PR

* PR

* Merge

* Merge

* Merge

* bgcheck

* I got trolled >:
2022-01-29 18:45:32 -05:00
Lucas Shaw 850823c2ee
ovl_Obj_Kzsaku OK (#506)
* ovl_Obj_Kzsaku OK

* add packing macro

* made suggested changes

* switch pad order

* made some suggested changes. still don't know completely about naming

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-01-23 09:40:47 -03:00
Anghelo Carvajal 5e4c8e0506
`scene_texture`s (#550)
* scene texture xml generator

* Create XMLs for every scene_texture except 3 and 7

* Manually add blobs

* add XMLs for not used ones

* update spec

* Add scene_texture as external files to every scene that uses them

* add gsDPLoadTextureBlock_4b

* gsDPLoadMultiBlock

* gsDPLoadTLUT_pal16

* gsDPLoadMultiBlock_4b

* Add back the blob I removed...

* address review

* Fix tluts

* delete script
2022-01-22 17:49:35 -03:00
Derek Hensley 1531f5b56f
General Cleanup (#600)
* Remove excess prevent_bss_reordering.h

* Cleanup THIS and globalCtx2

* Iceblock relocs

* Format

* PR plus more this

* door spiral

* THIS and globalCtx2 swap, along with sSetupDL in firefly

* Revert ObjMure change

* door_spiral and unused in en_test5

* PR comments
2022-01-19 12:03:05 -03:00
Maide 6d52cee5fe
En_Bom (#537)
* Broken

* En_Bom

* PR

* PR

* Merge

* PR
2022-01-18 22:19:15 -05:00
Anghelo Carvajal 399f5a1b33
Split rsp files (#602) 2022-01-17 15:45:20 -05:00
engineer124 9e6a6eee4c
Audio_Effects OK and Documented (#549)
* Audio_Effects OK

* Remove duplicate

* PR Suggestion

* Small cleanup

* Small Touchup
2022-01-16 18:24:58 +00:00
EllipticEllipsis 924fa9aadf
EnMag OK and documented (#547)
* Name textures in object_mag

* Corrections

* tabs -> spaces

* OK, data imported

* Remove obsolete comment

* Start documentation

* Defines for most texture sizes

* Name most static variables, add state enum

* Macros, name all the statics

* Couple of minor tweaks to other files

* Name some more effect stuff

* Fix kanfont data

* Name everything else, move macros

* Format

* Review
2022-01-16 17:55:03 +00:00
Maide b47941968d
En_Ig (#533)
* En_Ig

* UNK_TYPE1

* Remove syms

* PR

* PR

* Merge

* Merge
2022-01-16 17:46:08 +00:00
Parker Burnett 7aa3766d67
En_hgOK (#394)
* en_hgo OK

* Formatting changed somehow?...hopefully this fixes

* who would win, Cammoguy or one letter?

* format

* addressing review comments

* fixing PR comments

* fixing and merging master

* forgot to format

* fixes warnings?

* minor documentation...don't have tools to do more

* Fixing things, hopefully OK

* formatting...

* clean-up undefined syms
2022-01-16 09:37:21 -05:00
Maide 816971d98c
En_Kanban (1 non-matching) (#419)
* En_Kanban

* PR

* PR

* Object

* undef

* PR

* Merge

* Merge

* Merge
2022-01-12 15:37:26 +00:00
Anghelo Carvajal c44e26a143
`__osMalloc.c` OK (#395)
* __osRealloc

* match __osCheckArena

* cleanup

* Import bss, unreferenced strings and cleanup

* format

* Reviews

* Move convert.h to ultra64/

* Make the os_malloc.h header

* potato

* renames and fixes

* format

* small doc pass
}

* format

* minor changes

* Introduce system_malloc.h

* Docs pass

* fix

* format

* stuff

* Apply suggestions from code review

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

* review

* format

* remove repeated sentence

* Apply suggestions from code review

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

* include headers

* review

* Rename __osMallocAddHeap

* remove @brief

* Update src/boot_O2/__osMalloc.c

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

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-11 23:25:14 +00:00
engineer124 133e02a8a7
z_sound_source OK (#353)
* z_sound_source OK

* Fix Pos

* Lib_PlaySfxByPos

* Change function names

* format

* Update names to match OoT

* cleanup from the merge

* Fix name
2022-01-11 00:27:36 +00:00
Anghelo Carvajal 6069a1585f
`z_actor` with some documentation, with 1 NON_EQUIVALENTs (#401)
* Match Player_GetHeight

* Another bunch

* Fix merge conflict

* rename Gfx_DrawDListXlu

* add WEEROR

* Actor_Spawn

* almost Actor_SpawnTransitionActors  and Actor_Delete

* A bunch of small actors

* More renames

* format

* Some Player renames

* a few more

* import data

* run formatter

* func_800B7170

* whoops

* Fix merge issues

* Whoops 2

* func_800B83BC and func_800B83F8

* Actor_IsActorFacingPlayerAndWithinRange

* add some prototypes

* match Actor_UpdateBgCheckInfo

* func_800B7678

* mark Actor_SpawnAsChildAndCutscene as non_matching

* Actor_Draw

* Update is chaotic

* 2 new matches

* func_800BC8B8

* Another bunch

* function renames

* run formatter

* cleanup

* remove unnecesary casts

* add missing sfx

* Fix renames

* fix merge

* func_800BF7CC

* small bunch

* another bunch

* func_800BE184 non_matching

* two more

* split z_cheap_proc

* Another bunch

* another bunch

* a few and a non matching

* yeee

* a

* Actor_DrawAll non_equivalent

* Actor_RecordUndrawnActor

* i don't know what to put in this commit message

* func_800B4B50 non matching

* func_800B42F8 non matching

* func_800B5040

* func_800B5814 non_equiv

* func_800B6584

* func_800B6608

* func_800B6680

* func_800B7E04

* func_800B8118

* func_800b9170

* ,

* func_800BC4EC

* func_800BA6FC

* func_800BA798

* func_800BA8B8

* Actor_LoadOverlay

* small cleanup

* func_800BB2D0

* meh

* func_800BBAC0

* func_800BC270

* func_800B5208 non matching

* Fix warnings

* meh

* rename some ActorShadow_ functions

* fairy

* Flags_

* fix warnings

* format

* Actor_PickUp and family

* func_800B8E58

* match Actor_RemoveFromCategory

* another bit of docs

* Match func_800B86C8

* And another bit

* rename Player_GetRunSpeedLimit

* func_800B9E84

* func_800BE63C

* func_800BB8EC

* match func_800B5814

* match func_800B9334

* cleanup

* fix conflicts: first pass

* another fix

* actorfixer fix

* fix conflicts

* func_800BE680 non_equivalent

* Improve func_800BE680 a bit

* func_800BE680 equivalent (?)

* func_800BE680 equivalent

* Actor_UpdateActor equivalent

* format

* use some  ExchangeItemID enum values

* Some more cleaning

* more cleanup

* More name stealing from OoT

* match func_800B82EC

* match func_800B9D1C and a bit of cleanup

* Add ACTOR_FLAGS placeholders

* Renames and match func_800BE184

* last pass of name stealing

* format

* fix conflicts

* more cleanup

* more cleanup

* cleanup and OVERLAY_RELOCATION_OFFSET macro

* Remove prototypes of obviously internal-only functions,
update variable names,
forward declare where necessary,
remove all `param_\d`s

* remove newlines

* minor rename

* Use ACTOR_FLAGS in z_actor

* Match func_800BE3D0

* Rename movement functions

* Document Actor_CalcOffsetOrientedToDrawRotation

* velX -> horizontalSpeed

* A bit of documentation for actor movement functions

* format

* Fix merge issues

* format

* Format

* Fix renames

* fix warnings

* fix conflicts

* review :D

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

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

* Fix

* format

* Actor_SpawnSetupActors

* engineer review

* Update src/code/z_actor.c

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

* A bunch of Engineer's reviews

* more Engineer's review

* a

* whoops

* run actorfixer

* c'mon

* 😮‍💨

* whoops

* warning

* More engineer's review

* run format

* I'm dumb

* a

* match func_800BE680

* Match Actor_DrawZTarget

* Match Actor_SpawnAsChildAndCutscene, fix non-equivalent in Actor_UpdateActor

* Fix merge issue

* format

* update actor

* Steal a bit of @Thar0 documentation from OoT's z_message

* Run actorfixer

* Fix renames

* Match func_800B4B50 thanks to @hensldm

* Improve ActorShadow_DrawFeet thanks to @hensldm

* whoops

* Actor_PlaySfxAtProjectedPos

* Actor_UpdateActor matched by @hensldm

* Match func_800BA2FC by @hensldm

* Match Actor_SpawnTransitionActors by @hensldm

* Match func_800BB604 by @hensldm

* Match Actor_DrawAll by @hensldm

* ActorShadow_DrawFeet by @hensldm

* Actor_UpdateAll by @hensldm

* Match func_800BCCDC by @engineer124

* Small Actor_PlaySfxAtPos by @engineer124

* ACTOR_FLAGS_ALL and a bit of cleanup

* Add invisible comment

* Small docs pass

* Fix merge

* Engineer's review

* format lol

* Actor_DrawDoorLock docs

* Actor_SpawnShieldParticlesMetal

* fix merge issues

* sActorFaultClient

* fix

* commit message

* Run actorfixer.py && format.sh

* Fix warnings

* fixes

* format

* bss

* Update include/functions.h

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

* Address review

* Fix merge issues, format and such

* fix merge issues

* Add ACTORCAT_MAX

* actorList -> actorLists

* Fix merge issues

* format

* Enable WERROR on jenkinsfile

* Fix merge

* Use object symbols

* address review

* format

* review

* fix merge issues

* fix

* VRAM_PTR_SIZE, small cleanup and format

* 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>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2022-01-10 12:04:28 -05:00
Maide 92302fa6d6
En_Ishi (#538)
* En_Ishi

* PR

* PR

* Merge
2022-01-04 06:51:21 +00:00
Maide af52799bc7
Obj_Flowerpot (#539)
* Obj_Flowerpot

* PR
2022-01-04 06:37:52 +00:00
Maide d90a15ba6e
En_Kame (#536)
* En_Kame

* PR
2022-01-04 06:25:29 +00:00
Maide 0a5bc25e8d
Obj_Hugebombiwa (#535)
* Obj_Hugebombiwa

* PR

* PR
2022-01-04 06:17:52 +00:00
Maide bf6a4c04be
En_Ssh (#532)
* En_Ssh

* ptrs

* PR
2022-01-04 06:11:59 +00:00
Maide 897e68fbae
Boss_04 (#529)
* Boss_04

* What even is spelling anyway

* PR

* PR
2022-01-04 06:02:29 +00:00
Derek Hensley d3e4a3368f
Effect_soft_sprite_old_init and particleOverlayTable OK (#520)
* Migrated data

* Migrate particleOverlayTable

* Import data for effect_soft_sprite, add g to effect table, minor cleanup of z64effect.h

* Name data

* Comment out static variable in variables.h

* Use better macros

* PR review and other cleanup

* Update bug comment
2022-01-04 05:50:12 +00:00
Savino Jossi 06a08a3322
Ovl obj jg gakki (#512)
* add gakki decompilation

* add gakki header file

* modify spec to remove data

* Use THIS macro for this = thisx

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

* Change reloc include to the generated one

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

* spacing variables and functions

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

* spacing variables and functions

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

* spacing variables and functions

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

* clean up unnecessary mips_to_c hints

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

* clean up old mips_to_c hints

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

* variable cleanup and lookup

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

* remove unnecessary cast

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

* rerun format after code review

* fix naming convention

* add variable name hints for data

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

* reformatted file

* Fix collider naming

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

* fix more renaming

Co-authored-by: Savino Jossi <sj@redballoonsecurity.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-04 05:38:41 +00:00
Lucas Shaw 9e5382076a
ovl_Obj_Roomtimer OK (#505)
* ovl_Obj_Roomtimer OK

* add packed params

* made suggested changes

* fixed
2022-01-04 05:25:41 +00:00
Lucas Shaw 005fd64e41
ovl_Obj_Dowsing ok (#504)
* ovl_Obj_Dowsing OK

* update spec

* params pack

* made suggested changes
2022-01-04 05:10:13 +00:00
Nick Sturgeon 78cb55ce97
ovl_En_Ruppecrow OK with documentation (#502)
* Implement EnRuppecrow_Init

* Implement EnRuppecrow_Destroy

* Implement EnRuppecrow_Update

* Implement EnRuppecrow_Draw

* Implement func_80BE2260, func_80BE2808

* Implement func_80BE30F4

* Implement func_80BE2F6C

* Implement func_80BE35A4

* Implement func_80BE2728

* Initial work on func_80BE2B80

* Implement func_80BE2B80

* Implement func_80BE2794

* Implement func_80BE3354

* Implement func_80BE348C

* Implement func_80BE2E18

* Implement func_80BE2D4C

* Run format script for cleanup

* Implement func_80BE2668

* Implement func_80BE3178

* Implement func_80BE32DC

* Initial work on func_80BE2874

* Implement func_80BE2874

* Implement func_80BE2330

* Implement func_80BE24CC

* Move static data into C file

* Rename D_WORDs to static names

* Format and document EnRuppecrow

* Update documentation

* Apply feedback

* Remove unecessary struct padding

* Implement review suggestions

* Run actorfixer

* Use object header
2022-01-04 05:02:53 +00:00
retro de61e04312
EnMm2 OK (#492)
* all matching except draw

* all matching

* done except importing data

* data extracted

* added xml for asset extraction

* clang format

* remove global_asm macros

* bit of documentation

* format

* use THIS macro

* remove unnecessary &

* space between vars and code

* feedback

* use OPEN_DISPS, CLOSE_DISPS, and POLY_OPA_DISP++ macros

* remove comment

* use matrix macros

* change comment format

* change comment format

* rename assets in xml

* fix indent
2022-01-04 04:56:35 +00:00
kyleburnette 99761a9c0d
EnColMan OK (#479)
* EnColMan OK

* Fix description at top of file

* Made suggested changes

* Make suggested changes

* Format

* Include gameplay_keep and use symbols
2022-01-04 04:51:03 +00:00
Maide 520a2ecc68
Obj_Snowball (1 non-matching) (#468)
* Obj_Snowball

* PR

* PR & Object

* PR
2022-01-04 04:45:14 +00:00
Maide 9a0079de8a
En_Gb2 (#453)
* En_Gb2

* Negs

* PR

* Update src/overlays/actors/ovl_En_Gb2/z_en_gb2.c

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

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-04 04:35:21 +00:00
Maide fc37051216
En_Fish (#450)
* En_Fish

* R

* PR

* PR

* Update src/overlays/actors/ovl_En_Fish/z_en_fish.c

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

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-04 04:29:49 +00:00
Maide f66a9f8d0e
Object_Kankyo (1 non-matching) (#445)
* Object_Kankyo

* Removing permuter

* PR

* Re-add description

* PR
2022-01-04 04:24:35 +00:00
Maide 22a759a923
En_Peehat (#444)
* En_Peehat

* Fix

* Revert m2ctx

* PR

* Warning

* PR
2022-01-04 04:17:40 +00:00
Maide 429a5ee9ff
En_St (#443)
* En_St

* Warning

* PR

* undef

* PR
2022-01-04 04:09:32 +00:00
Maide 6b50345831
En_Water_Effect (#435)
* En_Water_Effect

* PR

* PR

* undef

* PR
2022-01-04 04:03:47 +00:00
Maide 4ee7dc1da6
En_Bomjima (1 non-equiv) (#433)
* En_Bomjima

* Damn caps

* PR

* PR

* undef

* PR
2022-01-04 03:57:40 +00:00
Maide 934c562471
En_Wiz_Fire (#406)
* En_Wiz_Fire

* Remove padding

* PR

* PR

* Object

* Undef

* PR
2022-01-04 03:51:11 +00:00
Maide 0b45e0f87a
En_Go (3 non-matching) (#405)
* En_Go

* PR

* PR

* Object

* Undef

* PR
2022-01-04 03:45:36 +00:00
kyleburnette 3af87ca611
pfsreadwrite file OK, contpfs OK and data/bss migrated, pfsgetstatus OK (#385)
* pfsreadwrite file OK, contpfs OK and data/bss migrated, pfsgetstatus OK

* Made tharo's suggestions

* Update pfsgetstatus.c

* Made suggested changes (other than uintptr_t)
2022-01-04 03:29:11 +00:00
Maide 618b25f41d
En_Fishing (3 non-matching) (#378)
* En_Fishing

* PR

* PR

* Object

* Undef

* PR

* format
2022-01-03 18:48:37 -05:00
Maide 3d883491e1
En_Kusa2 (#363)
* En_Kusa2

* PR

* Warnings

* PR

* Match

* pepega
2022-01-01 13:09:44 -05:00
Tom Overton 44ccdbe0d5
En_Talk_Gibud (Gibdos in the well) OK and somewhat documented (#486)
* Good start

* More progress

* More progress, need to try importing data now

* Import data to C

* Match a tricky item function

* Matched another item function

* Improve definition of EnTalkGibudUnkStruct

* func_80AFFD3C OK

* Draw functions done

* EnTalkGibud_Init OK

* EnTalkGibud OK

* Document item and switch flag stuff

* Name all static variables

* Enum for animations

* Document type

* Document limb stuff

* Tons of documentation

* Document effect stuff

* Document most unknown struct vars

* Name most functions

* Name final function + document text IDs

* Organize forward declarations

* Name stack variables

* Document damage effects

* Document limbs

* One final pass

* Respond to Anghelo's review

* Respond to Anghelo's second review

* Add space to force Jenkins to rerun (testing PR dashboard, please ignore)

* Removing previously added space

* Fix limb enum to add LIMB_NONE

* Run ./format.sh, whoops

* Respond to hensldm review + small cleanup

* Respond to engineer's review

* Fix item enum

* This is a legacy PR, so using autogenned object symbols

* Fix merge conflict

* Move Talk_Gibud specific enums to .c
2021-12-28 02:15:32 +00:00
Tom Overton 527c54b66e
Obj_Tokeidai (Clock Tower) OK and mostly documented (#442)
* Migrate data to C

* ObjTokeidai_Init OK

* ObjTokeidai_Destroy OK

* func_80AB2BBC OK

* func_80AB3BB0 OK

* func_80AB29F8 OK

* func_80AB27B4 OK

* func_80AB2834 OK

* func_80AB2790 OK

* func_80AB28C8 OK

* ObjTokeidai_Update OK

* func_80AB4040 OK

* func_80AB3010 OK

* func_80AB3CCC OK

* func_80AB3240 OK

* func_80AB3C50 OK

* func_80AB4080 OK

* func_80AB4160 OK

* func_80AB319C OK

* func_80AB3BE8 OK

* func_80AB3BD8 OK

* func_80AB3B34 OK

* func_80AB3A7C OK

* func_80AB3ED0 OK

* func_80AB39BC OK

* func_80AB38B0 OK

* func_80AB3880 OK

* func_80AB363C OK

* func_80AB36C4 OK

* func_80AB3808 OK

* func_80AB365C OK

* func_80AB3598 OK

* func_80AB3544 OK

* func_80AB34CC OK

* func_80AB3370 OK

* func_80AB32F0 OK

* ObjTokeidai_Draw OK

* func_80AB4894 OK

* func_80AB4664 OK

* func_80AB4394 OK

* Use compiled reloc

* Initial documentation pass

* Little more documentation

* Last bit of first pass documentation

* Finish documentation

* Respond to review feedback

* Respond to Anghelo's feedback

* Incorporate new enum

* Respond to engineer's feedback

* Respond to engineer's feedback

* Update comments because the things I thought were unused ARE actually used

* Switch to using "Open" instead of "Transform"

* Run ./format.sh

* Respond to engineer + hensldm by removing some macros

* Fix func_801A3F54 argument

* Fix func_801A3F54 argument

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

* This is a legacy PR, so using autogenned object symbols

* Move enum to .c

* Revert "Move enum to .c"

This reverts commit de13c50f0a.

* Move tokeidai-specific defines to .c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-12-28 02:10:15 +00:00
Maide 7cb71922e3
En_Geg (#436)
* En_Geg

* Format comments

* PR

* Object

* undef

* PR
2021-12-28 01:44:27 +00:00
LtPeriwinkle 1a08089da0
Effect_Ss_Stick (#464)
* Effect_Ss_Stick OK

* fix spec

* space between declarations and code

* Gfx -> Gfx[], fix spacing

* add deku stick to description

* add fragment to file description

* use autogenned gameplay_keep symbol
2021-12-28 01:36:04 +00:00
Tom Overton 70419d6044
En_Fall (the moon, Moon's Tear, and effects) OK and mostly documented (#476)
* EnFall_Init OK

* EnFall_Destroy OK

* EnFall_Update OK

* func_80A6C3AC and func_80A6C3FC OK

* func_80A6BF90 OK

* func_80A6CA9C OK

* func_80A6CD38 OK

* func_80A6CF60 OK

* func_80A6C9A8 OK

* Import data into C

* func_80A6CB74 OK

* func_80A6CD74 OK

* func_80A6CF70 OK

* func_80A6CECC OK

* func_80A6D698 OK

* func_80A6D220 OK

* func_80A6D100 OK

* func_80A6D75C OK

* func_80A6D88C OK

* func_80A6D98C OK

* func_80A6DC20 OK

* func_80A6DA7C OK

* func_80A6DC40 OK

* func_80A6DD3C OK

* func_80A6E214 OK

* func_80A6E37C OK

* func_80A6C7C0 OK

* func_80A6D444 OK

* func_80A6C1DC OK

* func_80A6D504 OK

* func_80A6E07C OK

* Move all statics to in-function

* Migrate bss to C and use compiled reloc

* Clean up UnkFallStruct

* Initial documentation pass

* Some more function names

* Name some more unknowns

* Name yet more unknowns

* Name all struct variables and static data

* Do one last documentation pass

* Respond to engineer's style review

* Respond to hensldm's review

* This is a legacy PR, so using autogenned object symbols
2021-12-28 01:26:06 +00:00
engineer124 f19571dfcd
Bigslime OK and Documented (#361)
* git subrepo pull tools/asm-differ --force

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "d218cdf0"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "d218cdf0"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/graphovl --force

subrepo:
  subdir:   "tools/graphovl"
  merged:   "f5fe93d7"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "f5fe93d7"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/ZAPD --force

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "e7a8a48c"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "e7a8a48c"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Bring Bigslime over from old branch

* Format

* Improve docs

* format

* More cleanup

* Fix Zero Vectors Name

* Improve docs

* Spelling/Grammar

* Small typo

* Extra space

* Fix zapd merge conflict

* tab

* Fix remaining names

* format

* Better documentation

* format

* fix

* Add names to identity matrices

* Minor Cleanup

* easier to read comments

* Another touch-up

* Missed a spot

* one more...

* typo

* Another typo

* Fix merge master, fix EnBigslime_ApplyDamageEffectBigslime

* PR Feedback

* Fix variable

* Add in gZeroVec3f in new prs

* Fix gZeroVec3f

* gZeroVec3f

* PR Feedback, move lots of static data inside functions

* Use z_actor decomp of `func_800BE680` for better macro name

* Naming gone wrong, but fixed now

* Fix dList

* Add an extra line of docs about shadows for a function

* dList -> shadowDList

* Next round of PR feedback

* Document object file, still need to double check some

* Small cleanup

* Improve and fix many docs, unname unknown material texture

* format

* Oops

* Clean up blobs from object file

* Aha! I finally get what's going on

* Remove Bigslime undefined_syms

* Remove more undefined symbols

Co-authored-by: Angie <angheloalf95@gmail.com>
2021-12-27 04:24:45 +00:00
Lucas Shaw 5455cbc0c8
z_kaleido_manager and z_kaleido_scope_call OK (#489)
* migrated data and bss for z_kaleido_manager, renamed ovl_Player_Actor to ovl_player_actor to make it work with the data

* z_kaleido_manager OK

* add to functions.h variables.h and variables.txt

* init

* rename parameters in func_80163700

* rename func_80163700 to KaleidoManager_FaultAddrConvFunc

* change u32 casts to uintptr_t casts in z_kaleido_manager. (u8 *) casts must stay, they are the only casts that match

* ran format, uintptr_t

* made suggested changes
2021-12-27 03:59:50 +00:00
engineer124 27903c6286
code_80194710 OK (Audio libultra_code_O2) (#474)
* code_80194710.c OK

* Add new line after variable declaration

* format

* Function declarations

* Name changes to match OoT

* Rename file

* s32 -> size_t
2021-12-27 03:51:37 +00:00
Roman971 6c2f521373
Decompile and clean up some effect files (#342)
* Decompile various effect files and cleanup z_effect.c

* Decompile z_eff_tire_mark.c and cleanup structs

* Small cleanups

* Apply most review suggestions

* Apply more review suggestions

* Change eff_shield_particle vertices to be extracted as an asset

* Add relevant effect functions to actorfixer.py
2021-12-27 02:51:16 +00:00
Maide 6fba9aa388
En_Fz (#528)
* En_Fz

* UNK_TYPE1

* AC WHY

* gameplay_keep

* a
2021-12-27 02:42:56 +00:00
retro 5e72c01ff4
BgInibsMovebg OK (#485)
* init messy but matching and data imported

* destroy matched

* all matching

* add param macro

* use generated reloc

* remove unneccessary comment

* add comment

* cleanup

* feedback

* use NULL

* sort variables by address
2021-12-27 02:29:48 +00:00
Nick Sturgeon 2d15fd4a41
ovl_En_Talk OK (#484)
* Implement EnTalk_Init

* Implement EnTalk_Destroy

* Implement func_80BDE058

* Implement func_80BDE090

* Clean up code

* Apply suggestions from code review

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* Remove whitespace

* Update src/overlays/actors/ovl_En_Talk/z_en_talk.h

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

* Use renamed macro

* Apply feedback

Co-authored-by: Parker Burnett <burnettparker@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-12-27 02:21:01 +00:00
Maide 5b7fb5bfde
En_Bomjimb (#461)
* En_Bomjimb

* PR

* PR
2021-12-27 02:14:19 +00:00
Maide e7b326f5e4
En_Zog (#441)
* En_Zog

* Removing padding

* PR

* PR

* undef

* fmt
2021-12-27 02:08:35 +00:00
Maide ae2ba19d7b
En_Aob_01 (#440)
* En_Aob_01

* PR

* Object

* Fix weird capitalisation

* undef
2021-12-27 02:01:37 +00:00
Maide ddb3405219
En_Rail_Skb (#418)
* En_Rail_Skb

* PR

* PR

* Object

* undef
2021-12-27 01:55:16 +00:00
Maide 2df8e5d433
En_Elf (#371)
* En_Elf

* En_Elf

* PR

* PR

* Format
2021-12-27 01:47:56 +00:00
Maide ba4f676f4e
Obj_Iceblock (#367)
* Obj_Iceblock

* PR

* PR

* Object

* Undef
2021-12-27 01:40:25 +00:00
Maide d3e8ea9e5a
En_Akindonuts (#349)
* En_Akindonuts

* Enums

* Rebase

* PR

* PR

* Object

* Uncomment blob

* Undef
2021-12-27 01:32:45 +00:00
Maide cee404f6b2
Door_Warp1 (2 non-matching) (#347)
* Door_Warp1

* Rebase

* Rebase

* PR

* Object

* Format

* Undef

* def more

* Whoops
2021-12-27 01:25:39 +00:00
Maide a3478c4056
En_Tru (1 non-matching) (#325)
* En_Tru

* Fixups

* PR

* The meme

* I rebased by accident sorry

* Add object memes

* Type
2021-12-22 16:25:00 +00:00
Maide aad8f64c65
En_Gs (#431)
* En_Gs

* PR

* PR

* PR

* Update src/overlays/actors/ovl_En_Gs/z_en_gs.h

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

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-12-21 12:57:41 -03:00
Derek Hensley a7cece0fca
Code_800f07c0 OK with some documentation (#373)
* Matched func_800F07C0

* Matched func_800F0888

* Matched func_800F0944

* Matched func_800F09B4

* Matched func_800F0A94

* Matched func_800F0E94

* Matched func_800F0EEC

* Matched func_800F0F28

* Matched func_800F0FF0

* Matched func_800F10AC

* Matched func_800F112C

* Matched func_800F0DD4

* Matched func_800F0CE4

* Matched func_800F0A20

* Matched func_800F0BB4

* Fix functions.h

* Migrated data and add some doc comments, having BSS issues

* BSS fix

* Fix merge conflict

* Document

* Run Formatter

* Actually save functions.h

* Rename UnusedNPC to EnHy

* Change some rets and run format

* PR review

* Fix merge conflict

* Minor touchups

* Fix renamed func

* Change char to UNK_TYPE1

* Add header

* Rename two functions

* Fix capital X's in undefined_syms

* Convert char to UNK_TYPE1 in EnDoor

* Change huge ternary into if else for readability

* Fix up EnIn

* Better whitespace

* Format

* Revert UNK_TYPE1s in EnDoor

* Rename file

* Missed rename in undefined_syms
2021-12-19 20:14:36 +00:00
engineer124 9b1fe6e91b
Importing Audio Init Params (#471)
* Import audio init params

* Add comments describing what these sizes represents

* Fix variables.txt

* Remove leading zero's from gTatumsPerBeat

* Name variables
2021-12-19 20:01:47 +00:00
LtPeriwinkle e579bf5587
Effect_Ss_Kakera (#469)
* Effect_Ss_Kakera OK

* fix variable naming and formatting

* GAMEPLAY_KEEP, assign Vec together, angles in hex

* rename bgcheck functions

* address style changes

* move/format data; use shift instead of multiply
2021-12-19 19:47:47 +00:00
Tom Overton 038eb997d0
En_Tanron3 (Gyorg's fishes) OK and somewhat documented (#376)
* Import data to C

* EnTanron3_Init OK

* EnTanron3_Destroy OK

* func_80BB897C OK

* func_80BB91D4 OK

* func_80BB9288 OK

* EnTanron3_Draw OK

* func_80BB95FC OK

* EnTanron3_Update OK

* func_80BB9308 OK

* func_80BB87D4 OK

* func_80BB85A0 OK

* func_80BB8A48 OK

* Update spec with compiled reloc

* Name most of the functions

* Name a few more things

* Merge animation system changes

* Name remaining unnamed variables

* Finish documentation

* Use modulo for fogTimer

* Move enum/structs to .h

* boss03Parent -> sGyorg

* D_80BB9720 -> sZeroVec

* Move initialization of effectPtr up

* Use 2 * M_PI

* Use MTXMODE_NEW

* 65536.0f -> 0x10000

* timer += 1 -> timer++

* Timer cleanup

* Remove unneccesary parentheses

* When performing bitwise operations on timer, use hex

* Lowercase "fish" in the comment at the top

* Respond to jpburnett's feedback

* Respond to Elliptic and Kenix's reviews

* Undo renaming the Gyorg var, but keep the comment

* Add a little bit more documentation

* Variable renames

* Remove a comment that no longer applies

* Document some swimming behavior

* PICK_DIRECTION -> PICK_NEW_DEVIATION

* Minor comment tweak

* Respond to Elliptic's review

* Remove timer inconsistency
2021-12-19 19:40:39 +00:00
Nick Sturgeon 70990bf43f
ovl_En_Test5 (Spring Water Modifier) OK with attempted documentation (#483)
* Implement asm functions in C

* Clean up code with documentation

* Apply styling suggestions

* Apply feedback
2021-12-19 19:34:28 +00:00
mzxrules 9bf0a59044
z_bg_goron_oyu OK (#487)
* Initial Decomp of `z_bg_goron_oyu`
Note: Waterbox instead of ColHeader would make sense here, confirm and change accordingly.
Just to not break the match until its settled for func_800CA1AC...

* implement suggested changes, fix other style issues

* z_bg_goron_oyu OK

* minor improvements

* fix clear_tag issue, restore THIS

* missed this

* format.sh

* implement final changes

Co-authored-by: MMDecomp <mmdecomp@gmail.com>
2021-12-19 19:20:45 +00:00
Lucas Shaw c6c3768022
ovl_Obj_Yado ok (#500)
* ovl_Obj_Yado OK

* rename struct member

* rename colorFlag to isNight
2021-12-19 19:14:18 +00:00
Electrk 89829b9905
EnInvisibleRuppe OK (#508)
* EnInvisibleRuppe OK

* Style changes as per review

* Update reloc

* Apply feedback
2021-12-19 18:47:08 +00:00
Tharo d62fb2b689
Initial object file xmls (#312)
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "3c00dcb3"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "3c00dcb3"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Object xmls

* Fix bss reordering

* Setup has warnings now

* Fix object_gi_reserve01 dlist names

* rm xml -> c make rule

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "ba947126"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "ba947126"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* SPBranchList related warnings gone

* Remove some mis-detected animations

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "405fc13e"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "405fc13e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* scene related setup warning gone

* Fix

* Newlines
2021-12-18 14:37:05 -05:00
Anghelo Carvajal d4dc34ee71
Update progress script with new assets categories and update csv output format (#510)
* Reorganize csvs and progress.py

* Put stuff in the correct folders

* Reduce lots of repeated code

* Change csv output format

* Filter out automaticaly named variables in "Matching" progress calculation for assets

* Address Elliptic's review

* Don't count handwritten files in progress and add a way to fix files detected in the wrong section

* Add missing "total"

* More fixing

* Add two missing columns

* Update paths in Jenkinsfile

* Update progress shield in readme

* Update progress link
2021-12-18 16:37:37 +00:00
EllipticEllipsis d5b71bd0f5
Tutorial (#362)
* ObjTree OK, data imported

* EnMs OK, data imported

* And the spec

* OK

* Some minor edits

* A lot of preliminary stuff

* Mostly complete beginning

* First draft of other functions doc

* Whoops, forgot the GlobalContext pad

* Draw functions (minus colour), create Data

* Data

* gitignore, some progress on documenting

* Review comments, continue documenting

* spec

* Finish off documentation

* undefined_syms

* Add a couple of todos

* One more

* At least add tools for object decomp

* Start conversion table stuff

* Document ObjTree

* Document EnMs

* Add more tables to conversions

* Maide's review

* Review

* Review

* Typos and incomplete thoughts

* Update vscode.md

* Correct function/variable names

* Review suggestions

* Format

* Missed one

* Rename functions and format

* Fix ObjTree

* Update actorfixer.py, fix some variable names

* Some review

* Review suggestions

* More review

* Hopefully fix all the thisx references

* Missed one
2021-12-16 18:47:18 -05:00
Lucas Shaw ff231e093a
z_vr_box_draw OK (#481)
* z_vr_box_draw OK

* ok

* Removed z_vr_box_draw.data.s, its actually z_sram_NES.data.s

* Added enum SkyboxId
2021-12-07 04:36:02 +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
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
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
Maide 837eb1c806
En_Tk (#338)
* En_Tk

* PR

* Warnings

Co-authored-by: root <root@Careface.localdomain>
2021-11-20 12:10:37 -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 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
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
Maide 602f348928
En_Pm (#309)
* En_Pm

* Format

* PR

* a

* a

* Finally fixed?

* PR

* Fix enum
2021-11-11 22:41:59 -03:00
EllipticEllipsis 285381e662
vimgr OK (#421)
* vimgr OK

* spec

* OSIoMesg, add OS_MESG defines, other review

* Review
2021-11-11 15:30:31 -03:00
EllipticEllipsis 304bfa443e
Transfer osViModes to C files (#438)
* Transfer osViModes to C files

* Finish spec

* Import data to and Improve vi.c

* spec, again

* Format

* Use defines for the types
2021-11-10 23:04:57 -05:00
Parker Burnett 77b9431f11
En_hakurock rOcK (#355)
* inital commit with a good chunk done

* adsjfkalsdfh

* can't figure this out for the life of me...

* I'll come back to this later

* not finished, but at least OKs

* blah, still stuck

* en_hakurock OK

* minor clean up

* formatting and pushing up changes

* fixing spec

* fixing warnings and addressing feedback

* addressing PR comments from engineer

* fixing enum

* format
2021-11-06 00:59:45 -03:00
Anghelo Carvajal 278ff4a4b3
`motor.c` OK (#397)
* use motor in the spec

* import bss

* Delete viextendvstart.c

* rename functions

* move stuff and format

* remove globals.h and ultra64.h

* Update src/libultra/io/motor.c

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

* add motor.h to padmgr

* fix

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-11-06 00:29:56 -03:00
Derek Hensley 49f55ff005
EnvFlags OK (#404)
* Matched

* Remove magic number

* Rename system to EnvFlags
2021-11-05 23:15:47 -03:00