Commit Graph

303 Commits

Author SHA1 Message Date
Maide
ba1595b5ad
En_Hanabi (#728)
* En_Hanabi

* PR
2022-03-27 11:17:15 -03:00
Maide
47cc65e134
Bg_Dblue_Balance (#724)
* Bg_Dblue_Balance

* PR
2022-03-27 11:12:00 -03:00
Maide
e6ca183a88
Bg_Dblue_Waterfall (#723)
* Bg_Dblue_Waterfall

* UNK
2022-03-27 11:07:03 -03:00
Maide
145b2f6a61
En_Jgame_Tsn (#722)
* En_Jgame_Tsn

* Merge
2022-03-27 11:01:23 -03:00
immibis
061ebc3b12
z_obj_chan OK (#591)
* z_obj_chan OK

* update Obj_Chan

* Obj_Chan updates

* Update for name changes. gameplay_keep object header is needed

* format

* more updates

* more changes

* Simplify floats

Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 10:56:20 -03:00
Maide
c0979dcb07
Obj_Vspinyroll (1 non-matching) (#712)
* Obj_Vspinyroll

* PR
2022-03-27 10:51:15 -03:00
Maide
36391bee46
En_Mk (#711)
* En_Mk

* PR
2022-03-27 10:44:55 -03:00
Maide
5649458e2f
Bg_Hakugin_Bombwall (#709) 2022-03-27 10:23:46 -03:00
Tom Overton
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 Overton
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
louist103
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
Maide
36e48fcd91
En_Tanron1 (#708)
* En_Tanron1

* PR

* Fmt

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

* PR

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

* PR
2022-03-26 02:16:28 +00:00
Parker Burnett
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
Maide
2746266881
En_Hidden_Nuts (#705)
* En_Hidden_Nuts

* PR
2022-03-26 02:04:42 +00:00
Derek Hensley
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
Maide
59ec3f721a
Obj_Driftice (2 non-matching) (#700)
* Obj_Driftice

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

* statics£

* PR

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

* Format hello?

* PR
2022-03-26 01:33:42 +00:00
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