Commit Graph
865 Commits
Author SHA1 Message Date
MaideandGitHub 5649458e2f Bg_Hakugin_Bombwall (#709) 2022-03-27 10:23:46 -03:00
Tom OvertonandGitHub 3986732c5d En_Syateki_Dekunuts (Shooting Gallery Deku Scrub) OK (#716)
* Import data to C

* EnSyatekiDekunuts_Init OK

* EnSyatekiDekunuts_Destroy OK

* func_80A2BE54 OK

* func_80A2BF18 OK

* func_80A2BFC4 OK

* func_80A2C0F8 OK

* func_80A2C150 and func_80A2C168 OK

* func_80A2C1AC OK and better match on func_80A2BFC4

* func_80A2C208 OK

* func_80A2C27C OK

* func_80A2C2E0 and func_80A2C33C OK

* func_80A2C3F0 OK

* func_80A2C478 and func_80A2C48C OK

* EnSyatekiDekunuts_Update OK

* func_80A2C4D0 OK

* func_80A2C5DC OK

* EnSyatekiDekunuts_Draw OK

* func_80A2C8A0 OK

* Use generated reloc and minor cleanup

* Use object symbols

* Last bit of cleanup

* Use limb enum values for all syateki actors I've worked on

* M_PI / 4
2022-03-26 03:07:25 +00:00
Tom OvertonandGitHub acd84bda77 En_Bb (Blue Bubble) OK and documented. object_bb documented (#713)
* EnBb_Init OK

* EnBb_Destroy OK

* func_808C20D4 OK

* func_808C2238 OK

* func_808C1FF4 OK

* func_808C1E94 OK

* func_808C2344 OK

* func_808C23EC OK

* EnBb_Update OK

* func_808C2E34 OK

* func_808C254C OK

* func_808C272C OK

* func_808C2B94 OK

* func_808C2A00 OK

* func_808C1F00 OK

* func_808C1F74 OK

* func_808C25E0 OK

* func_808C28CC OK

* func_808C2B1C OK

* func_808C2BD0 OK

* func_808C2C38 OK

* func_808C2CB4 OK

* func_808C2CF0 OK

* func_808C2D78 OK

* EnBb_Draw OK

* func_808C32EC OK

* func_808C3324 OK

* Migrate data to C

* Use generated reloc

* Object symbols and misc cleanup

* Name struct vars that are used with Actor_DrawDamageEffects

* Name most things in the object

* Name attackRange

* Good enough names for limbs for now

* Might as well name the limb draw stuff for now

* Name flame width/height

* Enum for damage effects

* Name some more stuff from OoT

* Name a lot more stuff

* First pass names on all functions

* Name jinxTimer on gSaveContext

* Name sLimbIndexToLimbPos

* First pass name to the rest of the limb draw system

* More cleanup

* Last cleanup before PR

* Incorporate Actor_DrawDamageEffect stuff

* Respond to hensldm's review
2022-03-26 02:57:18 +00:00
louist103andGitHub 7d4aaef0cd Fire and Light arrows (#710)
* fire arrow OK

* Light arrows OK

* Format

* Assets

* Mtx Mode

* PR fixes

* pr fixes

* Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c

* Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
2022-03-26 02:51:41 +00:00
Derek HensleyandGitHub 9a41b76f35 SubS ActorPathing (#689)
* Bring code over

* Clean up

* Renames

* Cleanup

* Split SubS stuff from z64 into z64subs

* newline

* Bss

* Name callbacks

* bss

* bss
2022-03-26 02:43:14 +00:00
MaideandGitHub 36e48fcd91 En_Tanron1 (#708)
* En_Tanron1

* PR

* Fmt

* PR and match (thanks petrie)
2022-03-26 02:33:02 +00:00
MaideandGitHub e43a92de18 En_Attack_Niw (#707)
* En_Attack_Niw

* PR

* newline
2022-03-26 02:23:06 +00:00
MaideandGitHub 7c624422de En_Horse_Game_Check (#706)
* En_Horse_Game_Check

* PR
2022-03-26 02:16:28 +00:00
Parker BurnettandGitHub 9362fee5e8 En_kusa OK and Documented (#640)
* matched one function

* More matches

* more matches

* cleaning up some stuff

* making some progress

* two new matches, and a partial match

* meh...i'll come back to this

* fixing ctx names

* more matches

* OK and documented

* fixing data stuff

* PR suggestions

* fixing name and DL issues

* fixing pr suggestions

* PR feedback

* ....format....

* PR fix

* fixes

* dang format

* fixing name

* I'm blind

* fixing obj_grass
2022-03-26 02:10:25 +00:00
MaideandGitHub 2746266881 En_Hidden_Nuts (#705)
* En_Hidden_Nuts

* PR
2022-03-26 02:04:42 +00:00
Derek HensleyandGitHub 69c0e15a45 EffectSsBubble OK (#702)
* Decompile eff_ss_bubble

* Document effBubble stuff in gameplay keep

* newline

* Formatting is hard

* PR suggestions

* Amplitude -> Max
2022-03-26 01:54:05 +00:00
MaideandGitHub 59ec3f721a Obj_Driftice (2 non-matching) (#700)
* Obj_Driftice

* PR
2022-03-26 01:46:13 +00:00
MaideandGitHub b7639a7c6f En_Wood02 (#697)
* En_Wood02

* statics£

* PR

* PR
2022-03-26 01:39:33 +00:00
MaideandGitHub 844b5efb6f En_Sda (#691)
* En_Sda

* Format hello?

* PR
2022-03-26 01:33:42 +00:00
MaideandGitHub ad6d314422 Obj_Kendo_Kanban (1 non-matching) (#687)
* Obj_Kendo_Kanban

* PR
2022-03-26 01:25:35 +00:00
MaideandGitHub 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
Tom OvertonandGitHub 863d6b9378 Document object_dog (#720) 2022-03-26 01:05:38 +00:00
Kristopher EarlyandGitHub 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
Tom OvertonandGitHub fa8c723da8 Fix two small things in Bg_F40_Switch (#717) 2022-03-26 00:53:19 +00:00
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
fig02andGitHub 80cbdb956d En_Tanron4 OK (seagulls) (#714)
* Seagull OK

* small fixes

* review 1

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

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

* No need for this >:

* Override

* PR
2022-03-24 23:21:14 -03:00
Derek HensleyandGitHub 984a5061c2 ObjectFsn documented (#680)
* Cleanup some shopkeepers

* More cleanup

* Document animations

* General cleanup

* Animation enums

* Limb maxes

* More Cleanup

* Some more minor stuff

* fsn cutscene state

* Parens and postlimbdraw

* Ossan Limbs

* Remove ENFSN_LIMB_MAX

* SI_MAX

* Compound macro

* Document gameplayKeep textures used by shopkeepers

* Ani Limbs in Ossan

* Format

* PR suggestion

* Remove trueTmp from EnFsn
2022-03-24 23:14:14 -03:00
Tom OvertonandGitHub 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