2954 Commits
Author SHA1 Message Date
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
MaideandGitHub 2b5fe949fe En_Tanron2 (#615)
* En_Tanron2

* Format

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

* Replace other macros

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

* Matching

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

* PR

* PR

* PR
2022-02-19 20:09:27 +00:00
Tom OvertonandGitHub e353f3bb96 Document object_rd, document En_Rd and En_Railgibud, and clean up En_Talk_Gibud (#604)
* Document object_rd + use it in rd and railgibud

* Move limb enum to rd.h, share it across all redead actors

* Copy over head/body rotation and effect documentation from Talk_Gibud to the other two

* Minor spacing things in Talk_Gibud

* Import tons of symbols from Talk_Gibud into Railgibud

* Always set actionFunc last in Setup functions

* Document the isInvincible struct var (thanks kz)

* More railgibud struct documentation

* Cutscene-related struct names

* Damage effect enum for Railgibud

* Damage effect enum for Rd

* Use the UpdateDamage name that everyone else uses

* Grab/Type enums in Railgibud

* Document EnRailgibud_MoveGrabbedPlayerAwayFromWall

* Document EnRailgibud_PlayerInRangeWithCorrectState

* Document EnRailgibud_PlayerOutOfRange

* Document path stuff in Railgibud

* More Railgibud junk

* Enum for animations

* Minor documentation on effect stuff

* Document Railgibud sink into ground

* Document most of Railgibud that was left

* Clarify one function name

* Use player2, since I guess func_800B8E58 takes Player* now

* Make Talk_Gibud/Railgibud consistent with each other in style

* Name a few Rd functions

* Name some dancing functions

* Make define for is Redead

* Define for if the Redead is frozen

* Make most params access use TYPE

* Document some Rd types

* Document grab fail functions

* Port a few more names from other Gibdo actors

* More Rd documentation

* Document alpha

* Document walk to home functions

* Document deathTimer in Rd

* Some more timers documented

* Document damageEffect struct var

* Name all functions in Rd

* Document unk_3E4

* Document grab stuff

* Document mourning state

* Document action states

* Name all remaining variables

* Document remaining EnRdType

* Document all types of Redead

* Use ACTOR_FLAGs

* Verbose player stateflags

* CheckCollision -> UpdateCollision

* Try to explain what makes Rd different from the others better

* Last changes before PR

* Move the limb enum to the object

* Remove unnecessary includes from the .c files

* Format after sync
2022-02-19 19:58:31 +00:00
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
MaideandGitHub 271cf4de70 Obj_Snowball2 (#596)
* Obj_Snowball2

* Merge

* merge

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

* Merge

* Merge

* PR

* Names

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

* merge

* Merge

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

* Merge

* Extract verts

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

* Fix a problem

* Merge

* Merge

* TrasnformDraw

* Need static data

* PR
2022-02-19 19:04:34 +00:00
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
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
MaideandGitHub a9a97e217c Fix fix (#663) 2022-02-14 10:25:22 -06:00
Derek HensleyandGitHub 6e62ae4075 SubS Animations and LimbRotTables (#624)
* Bring over the matching code, rename struct vars to be consistent, and move animation structs to z64animation.h

* Clean up function prototypes

* Format and some stack var renames

* Update tutorial

* Rename animation structs

* Rename SubS functions

* Rename Actor function

* Rename arg names

* Bring over code for func_8013D9C8

* Rename and cleanup

* Some more cleanup

* Small cleanup

* Animmode enum

* Adjust actorfixer

* More uses of animmode enum, as well as fixing typo

* Change hex 0xD to 13

* typo

* Fix merge

* Format

* Fix merge

* Actorfixer

* Format
2022-02-14 02:10:56 +00:00
engineer124andGitHub 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
MaideandGitHub 7565f9f052 En_Insect (#652)
* En_Insect

* WHO DIDN'T FORMAT?!

* PR
2022-02-14 01:32:56 +00:00
Tom OvertonandGitHub 18e714e098 Document object_cow (#650)
* Document object_cow

* Respond to reviews

* Reorder flags
2022-02-14 01:28:19 +00:00
MaideandGitHub a5e631d03f En_Zov (#649)
* En_Zov

* PR

* PR
2022-02-14 01:18:42 +00:00
Tom OvertonandGitHub 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
MaideandGitHub 45cee7d8af Obj_Dhouse (#648)
* Obj_Dhouse

* PR

* PR
2022-02-14 00:58:19 +00:00
Tom OvertonandGitHub d588870b7a Document sun textures/displaylist (#642)
* Document sun textures/displaylist

* Fix gSunEvening1Tex's outname

* Add comment explaining the textures should be 64x64
2022-02-14 00:40:19 +00:00
Derek HensleyandGitHub 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
Tom OvertonandGitHub 7ba82882b2 Clean up En_Giant header (#614)
* Clean up En_Giant header

* Run ./format.sh

* Move defines to be near the enums

* Move the limb enum to the object
2022-02-14 00:21:28 +00:00