3145 Commits
Author SHA1 Message Date
Ethan RosemanandGitHub 91b983776e Set up AnsiColor Jenkins plugin (#682)
* Set up AnsiColor Jenkins plugin

* deliberate error

* Update z_en_firefly.c
2022-02-20 12:53:05 -05:00
engineer124andGitHub fa069535d0 Camera Preparation (#644)
* Copy progress from z_camera

* cleanup functions.h

* Oops

* Revert `SUB16` and `ADD16` back to original names

* PR Suggestions

* PR Suggestions

* Fix merge with master
2022-02-20 00:33:47 +00:00
71c0120fbd SubS Cutscenes, Flags, Objects, and Angles (#665)
* Bring cutscene code over

* Document cutscene functions

* Bring over flags code

* Document flags

* Bring Object code over

* Document object functions

* Better infinite loop comment

* Remove Effect_add correction

* Bring func_8013D5E8 code over

* Document angle helper

* ActorFixer

* Rename angle helper

* Missed gs

* Should probably test before commiting

* Better angle helper name as well as typo fix

* English is hard

* Len to num

* Fix merge

* Fix merge

* Format

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-02-19 23:49:36 +00:00
Derek HensleyandGitHub 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
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
Tom OvertonandGitHub fc270e338e Change all hex weekEventReg accesses into decimal (#660)
* Change all hex weekEventReg accesses into decimal

* Remove hex from Osn
2022-02-19 22:39:55 +00:00
c98184f8e3 Cleanup various enums (#612)
* PR

* Add SQ and GI enums

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-02-19 21:42:05 +00:00
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 OvertonandGitHub fed9dc991d Tutorial on decompiling objects (and also object_dns documented) (#647)
* Fix existing documentation

* Fill out object_decomp.md

* First part of object decomp example

* Document animations

* Tutorial for identifying blob

* Naming everything else referenced in the actor

* Name all limb display lists

* Finish example

* Some tips and tricks

* Remove TODO

* Make merging.md consistent with everything else

* Name limbs properly

* Rename "bouncing idle" to "walk", since they use that animation to walk towards you if they catch you

* Run formatter again

* Purge hylian toolbox

* Be a bit more precise about vertex naming

* Also -> Further

* Correct description of how extract_assets works

* Format types of data

* Add note about palette

* Update text about object's C file

* Fix typo

* one more time -> in more detail

* Format render error as code

* explain what texture animations are

* Standardize on bullet points

* Use anon's sugestion for the "How we work with objects" section

* Trailing commas for better formatting

* Delete undefined_syms reference in object decomp

* Add note about root limbs

* Remove undefined_syms reference in object_decomp_example

* Remove "since"

* Explain *how* I changed the texture

* Explain what to do if the limb doesn't render anything

* Fix some extremely tiny incorrect enum name thing

* Explain the object symbol stuff bettter

* Add link to ZAPD documentation

* Also update documentation

* Update actor flags for Dns
2022-02-19 21:30:31 +00:00
Tom OvertonandGitHub 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 OvertonandGitHub 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 BurnettandGitHub 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
MaideandGitHub 0e6cf608d2 En_Pr (#631) 2022-02-19 20:59:15 +00:00
MaideandGitHub 717adf8ed8 En_Sth (#625)
* En_Sth

* Skull tokens

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

* sAnimations

* Fixup data

* PR
2022-02-19 20:45:21 +00:00
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