1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 17:54:15 +00:00
Commit graph

381 commits

Author SHA1 Message Date
Dragorn421
b8ecf7cae4
ovl_En_Daiku OK and documented (#422)
* ovl_En_Daiku OK, except func_809E3068

* ovl_En_Daiku documented

* `ACTORTYPE_ENEMY`

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Nonmatching reloc, better #include path, defines for state flags, enum values, `hair` -> `hairDLists`

* asm and format

* review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 16:58:05 -05:00
Tharo
26c38834ec
ovl_Door_Shutter OK (#413)
* Initial progress

* Some more progress

* Fix merge

* OK

* Small improvements

* Further improvements

* Some documentation, ran formatter

* Small fix

* Several review suggestions

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Further review changes

* Space out declarations, better boolean comparisons

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Some ands to modulos

* Swap condition

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Fix merge, PR suggestions

* review

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 16:55:01 -05:00
Peppers1612
80c803b9ec
ObjTimeblock OK (#421)
* ObjTimeblock: move data in source file

* ObjTimeblock: decomp Init()

* ObjTimeblock: decomp Destroy()

* ObjTimeblock: decomp func_80BA0058()/spawnDemoEffect()

* ObjTimeblock: decomp func_80B9FFA0()

* ObjTimeblock: decomp func_80BA040C()/mainActionFunc()

* ObjTimeblock: decomp func_80BA032C()

* ObjTimeblock: decomp func_80BA0480()

* ObjTimeblock: decomp func_80BA0514()

* ObjTimeblock: decomp func_80BA0524()

* ObjTimeblock: decomp func_80BA00CC()/toggleSceneSwitch()

* ObjTimeblock: decomp func_80BA04F8()

* ObjTimeblock: decomp func_80BA0508()/doNothing()

* ObjTimeblock: decomp func_80BA0758()

* ObjTimeblock: decomp func_80BA0768()

* ObjTimeblock: decomp func_80BA06AC()

* ObjTimeblock: decomp func_80BA083C()

* ObjTimeblock: decomp func_80BA084C()

* ObjTimeblock: decomp ObjTimeblock_Update()

* ObjTimeblock: decomp ObjTimeblock_Draw()

* ObjTimeblock: document the most obvious

* ObjTimeblock: use compiled reloc data

* ObjTimeblock: apply suggestions from mzxrules

* review

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 16:52:26 -05:00
Tharo
579b87dceb
ovl_En_Door (#402)
* Decompiled, two non-matchings remaining

* Fix merge

* Cleanups

* Some documentation, remove unused asm

* Remove unused data.s, review suggestions

* Ran formatter, further review suggestions

* Make some data static

* Match EnDoor_Init

* Remove asm for EnDoor_Init

* Changes from review

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* More variables static, remove unnecessary s8 cast

* PR Suggestions

* review

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 16:51:22 -05:00
MNGoldenEagle
cbb0c6da06
Decompiled and documentedKarebaba (withered Deku Baba enemy), all functions OK (#391)
* Renamed functions based on decomp

* Update function name changes

* Karebaba decomp and documentation with one non-matching function

* Cleaned up some messiness

* Forgot a file

* Addressing code review

* Updated based on code review

* Unnecessary define

* This function is going down

* Removed remaining asm, renamed symbols as recommended, and added comments to give context around the display lists

* Forgot a file

* Fix renamed function

* Addressed issues raised in code review

* Minor cleanup

* Addressed issues identified in code review

* Addressed the issues betterer

* Updated to use poly disp macros

* review 2

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 16:05:32 -05:00
Dragorn421
3cfafb2574
ovl_Obj_Switch OK and documented (#372)
* ovl_Obj_Switch OK

* Documentation & Cleanup

* Remove unneeded prototypes, use documentation comments format, add struct offsets

* Got rid of symbols not referenced by code, at the costly price of warnings

* review 2

* remove asm

* review 2

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 14:59:28 -05:00
maekclena
7b10ecad4c
ovl_En_Hs (#508)
* ovl_En_Hs

* PR review
2020-12-03 13:57:25 -05:00
Lucas Shaw
a9dc747709
ovl_En_Gm OK (#407)
* im tired so done for tonight

* decompiled

* z_en_gm remove reloc

* added description

* weird formatting fixed

* MTXMODE_APPLY

* Made suggested changes

* update

* review 2

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-02 15:00:24 -05:00
petrie911
a7b6323228
En_Rr (#472)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* Many likes alike

* matched

* merge ZAP

* now with names

* merge and small cleanup

* removed commends

* got formatter to behave

* move static array

* fixed variable names

* fixes

* pedantic comments
2020-12-02 14:59:45 -05:00
petrie911
bf9a1aadd9
En_Dh (#474)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* Is this where I make a Mr Hands joke?

* Manos: the Hands of Fate

* cleanup

* and format
2020-12-02 14:58:57 -05:00
petrie911
fd97e8433e
En_Ssh (House of Skulltula spiders) (#485)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* eek spiders

* now with names

* fixes and formatting

* expanded enum

* void* limb draw
2020-12-02 14:58:21 -05:00
Lucas Shaw
620e3418c7
ovl_En_Nb Decompiled (#298)
* started nabooru

* more work on nabooru

* did more

* file name

* almost done with z_en_nb

* did some more

* most of en_nb decomp

* data migrated en_nb

* did more

* almost finished

* started some documentation on ovl_en_nb

* did more documentation on en_nb

* did some more

* one non matching in en_nb

* ran format.sh

* update

* updated undefined_syms

* updated descriptions

* use DISP macros, delete japanese files. NABOORU IS 100% MATCHING POGGERS

* made suggested changes and removed reloc file

* Made some suggetsed changes

* Made some updates

* review 3

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-02 14:57:54 -05:00
Sirius902
09fe32e198
ovl_Magic_Dark (#495)
* merge upstream

* Merge upstream

* Small formatting

* Data section

* MagicDark_Draw

* Gross match of func_80B874E4

* Add func_8005A9CC to functions.h

* Work on func_80B87A18

* func_80B8772C

* Remove comment

* Work on func_80B87A18

* Correct fp constant

* Add regalloc comment ;(

* Move negatives to numbers

* Stupid casts >:(

* Use this->actor when possible

* It's so close

* Use cast + 0xFF

* func_80B87A18

* Delete asm and replace globalCtx2

* Update spec

* static everything

* Name scale

* Use decimal for alpha

* Name some stuff

* Delete reloc

* Name orbOffset

* Name some functions

* Make unused data colors (because it probably is)

* Change >= to >

* Use clamps

* Name MagicDark_DimLighting

* Name gfx

* Rename prototype params

* Cleanup

* Funny cast

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2020-12-01 21:36:39 -05:00
petrie911
1bb13b8c70
En_Nwc (#475)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* chicks, man

* slight change

* formatted everything

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-01 21:29:51 -05:00
Ethan Roseman
932174b6ee
Decompiled ovl_En_Zl3 (2 non-matchings) (#491)
* Progress

* deleting more function files

* more

* more

* More

* more

* more

* more

* more

* 2 more

* more

* more

* more

* more

* more

* more

* more

* more

* more

* master update

* 4 more

* Merged

* 3 more

* One more done!

* ug

* Ido Recomp test

* try 2

* Recomp by default

* Fix Jenkinsfile

* Fix 2

* Fixing struct

* CFE errors

* CFE fix -O2

* Cleanup

* More progress, almost done...

* Almost..

* Update and some progress

* formatting

* Cleanup

* Major cleanup

* done for now

* PR comments

* PR comments

* merge master and format

* a few things

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-01 20:48:54 -05:00
EllipticEllipsis
330bd35d23
En_Dns OK (#477)
* En_Dns OK

All functions matching, several named. I left unnamed the really short ones that just do purchase checks, and the string of action functions near the end where the purposes are somewhat opaque.

* Addressed all comments
(with the exception of one that didn't match)

* missed the header

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* else if review comment addressed

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-01 19:07:38 -05:00
louist103
4b04e6cb66
Decomp En_Niw_Lady, All OK (#462)
* Fixed upstream

* Migrate .data

* Start functions

* Decomp func_80AB9F24

* Add files via upload

Decomp: func_80ABB228(Draw),EnNiwLady_OverrideLimbDraw,func_80ABB0A0

* Matched a few more

* matched more

* progress

* All matched up.  Whole file OK

* Format, use reloc, deletet ASM

* Fixed a fake match and removed padding from struct

* Small cleanup

* Small cleanup

* Cleanup and some name changes

* Small cleanup

* Add POLY_OPA_DISP macro

* Fix issue in Draw

* Fix ZAP.  hopefully

* PR fixes

* PR fixes

* PR fixes

Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
2020-12-01 13:59:02 -05:00
Sirius902
5d03824f93
ovl_Bg_Ganon_Otyuka (#488)
* merge upstream

* Merge upstream

* BgGanonOtyuka_Init

* Migrate data

* Use texture symbol in dlist

* Split gfx into another file

* Cool data stuff

* Cleanup more data

* Name some more stuff

* Add newline

* BgGanonOtyuka_Destroy

* Rename shockwave to flash

* Work on BgGanonOtyuka_Draw

* Work more on draw

* More progress

* More BgGanonOtyuka_Draw

* Stuff

* Terrible match BgGanonOtyuka_Draw

* BgGanonOtyuka_Update

* func_808760DC

* Cleanup BgGanonOtyuka_Draw

* Cleanup

* More cleanup

* Work on func_80875A0C

* Rename to color

* func_80875C88

* func_80875A0C

* Stuff

* Stuff

* Name top and bottom dlists

* Name some verts

* Add back in accidentally removed D_808772E0

* Name side dlist

* Name dlists

* Name flash verts

* Only add unk_198 to BossGanon

* Name drop timer

* Name isFalling

* Name stuff

* Name stuff relating to sides

* Use Side enum

* Use cardinal directions for sides

* More naming / cleanup

* Rename to SIDE_ALL

* Replace enum with defines

* Flash state

* Reorder add

* Rename to flashHeight

* Revert "Rename to flashHeight"

This reverts commit fa1ca87630.

* Correct sides

* Rename to unwalledSides

* Put f32 on 0x8000

* Cleanup

* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Cleanup

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-29 05:05:30 -05:00
Zelllll
eba7b2c4d6
Decompile En_Vm (Beamos) (#416)
* Decompile En_Vm

* various Beamos fixes

* Beamos fixes

* Cleanup Beamos

* Update src/overlays/actors/ovl_En_Vm/z_en_vm.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Vm/z_en_vm.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Vm/z_en_vm.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Vm/z_en_vm.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Updated En_Vm

* Update Beamos

* Update src/overlays/actors/ovl_En_Vm/z_en_vm.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update En_Vm

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-25 14:20:02 -05:00
emilybrooks
831804ad64
ovl_en_horse_zelda OK (#471)
* Decompiled en_horse_zelda

* Deleted some asm files I missed

* Replaced approximation with a fraction

* Turns out the f32 cast is unnecessary

* Converted coordinates to decimal, replaced actor struct padding with char arrays

* Properly converted to decimal

* Renamed actionIndex to action, replaced += 1 with ++
2020-11-24 03:38:08 -05:00
petrie911
013e2d90d3
Obj_Ice_Poly (#473)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* Ice ice baby

* slight cleanup

* format

* Update src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-23 22:23:53 -05:00
petrie911
3aa76152c5
En_Attack_Niw, En_Insect, z_skin_matrix, and z_skelanime matched (#493)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* marginal improvement

* matched functions. Also fixed a serious lack of static

* format

* more static

* fixing a function prototype

* skelanime OK

* forgot .s

* skin matrix matched

* format
2020-11-23 21:34:32 -05:00
Sirius902
89f89ac5ea
ovl_En_Okuta (#470)
* merge upstream

* Merge upstream

* Migrate data

* Progress

* Progress

* Progress

* Cleanup data

* Match EnOkuta_Update

* EnOkuta_Draw

* func_80AC25D8

* Work on func_80AC2350

* Name EnOkuta_OverrideLimbDraw

* More progress

* More progress

* Progress

* Progress

* func_80AC2350

* func_80AC1938

* Use LINK_IS_ADULT

* func_80AC1B80

* Name some stuff

* Update spec and remove asm

* Name EnOkuta_SpawnSplash

* Name more stuff

* Name EnOkuta_Appear

* Name ColliderInits

* Reorder comparison to make more sense

* Name some Octorock related functions

* Name some projectile stuff

* Reorder comparison

* Convert remaining uses of unk_194 to decimal

* Name some more stuff

* Rename some wait functions to have 'to'

* Consolidate timers

* Name some more stuff

* Change EnOkuta_SetupWaitToAppear to take this

* Name jumpHeight

* Name this->scale

* Name shots

* Name _SetupWaitToShoot and _SetupShoot

* Name more stuff (might change)

* Name EnOkuta_ColliderCheck for now

* Replace some floating point constants

* Change name to make a bit more sense

* Rename mouth to snout

* Just rename parameter to scale

* Fun magic number I guess

* Remove several returns

* Cleanup

* Update src/overlays/actors/ovl_En_Okuta/z_en_okuta.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Okuta/z_en_okuta.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Clang format

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-23 19:50:13 -05:00
EllipticEllipsis
9a9025f01c
ovl_bg_ice_turara OK (#467)
* ovl_Bg_Ice_Turara.c OK

* =Updated z_bg_ice_turara.c to address comments

* Params and all functions named

* remove unnecessary linebreak

* Update src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Changed enum names

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-23 18:32:57 -05:00
Sirius902
385c419aa2
ovl_En_Ik (#461)
* merge upstream

* Merge upstream

* Progress

* Progress

* Fixes

* Migrate bss for now ig

* func_80A772EC

* Use rom reloc

* Cleanup

* Correct prototype

* Rename to _PlayBGM

* Eh revert to _StartMusic

* Match func_80A74398 more

* Fixes

* Work on func_80A74398

* Work on func_80A74398

* Match func_80A74398

* Use thisx

* Name, static, and move some stuff

* Match some graphics functions

* Rename asm for named functions

* Forgot one

* More graphics stuff

* Progress

* More progress

* Fix jump table

* Figure out types for a lot of data

* Fix data

* Type remaining data

* Work on func_80A7492C

* Ugly match for func_80A7492C

* Fix func_80A7492C

* Match some interesting stuff

* Move and remove forward declarations

* Sort declarations

* Progress

* Use quotes for vt import

* Slightly better diff

* Better diff again

* Fix stack on func_80A74BA4

* match func_80A74BA4

* func_80A74674

* Progress

* Progress

* Progress

* Progress

* Eh early return probably makes more sense here

* Progress

* Progress

* Progress

* Autocomplete sucks

* Name stuff in func_80A76E2C

* Work a bit on func_80A75C38

* Ugly match func_80A75FA0

* Name it prevInvincibilityTimer

* EnIk_PostLimbDraw3

* Use hex for line numbers in EnIk_PostLimbDraw3

* EnIk_PostLimbDraw2

* EnIk_PostLimbDraw1

* Use hex for line numbers in EnIk_PostLimbDraw1

* Use ACTORTYPE_ENEMY

* Progress

* Possible fake match of func_80A75C38

* Update spec and remove asm

* Cleanup forward declarations

* Move data to fun places

* Move data into func_80A76E2C

* Move data into func_80A75A38

* Make D_80A7847C an array

* Remove struct padding

* Revert "Remove struct padding"

This reverts commit 87b0bd73da.

* Name colliders

* Use else

* Name shieldColliderItems

* Use new graphics macros

* Cleanup
2020-11-23 08:53:21 -05:00
petrie911
9312c21c2f
Bg_Mizu_Shutter (#487)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* gate

* done

* done

* now with names
2020-11-23 07:53:17 -05:00
Darin
aac882a307
z_bg_spot18_basket (#417)
* OK - data transferred and two functions done

* Not OK

* Not OK

* OK - several more functions

* OK - another function

* OK - 2 more functions

* OK - another function

* OK - one function lefet

* Cleaned up file and removed ASM files

* Removed unneeded forward declaration

* Some cleanup

* More cleanup

* Minor cleanup

* Minor cleanup

* Minor cleanup

* Addressed a few issues

* Changed include statement format

* Changed numbers to hex

* Changed another number to hex
2020-11-22 06:05:35 -05:00
maekclena
0453c7d3cf
ovl_En_Siofuki (#456)
* ovl_En_Siofuki

* PR review

* Rebase

* PR review
2020-11-21 16:03:20 -05:00
petrie911
84a0acc9cf
En_Wonder_Item (#451)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* wonder item and incidental cleanup on wondertalk2

* merge update

* now with function names

* static variables

* the macros will rise again

* better (?) translation

* fix names
2020-11-21 14:18:14 -05:00
petrie911
930cee3061
EnEncount1 (#457)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* Leevers and Tektites and Wolfos, ohmy!

* changes and cleanup

* the need for speed
2020-11-19 14:27:32 -05:00
maekclena
0b9b2edf1b
ovl_En_Horse_Link_Child (#469)
* ovl_En_Horse_Link_Child

* PR review
2020-11-19 08:12:15 -05:00
Zelllll
c902175d5a
Decompile En_Crow (Guay Enemy) (#444)
* Decompile En_Crow (Guay Enemy)

* Remove thisx

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Made suggested changes

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Updated En_Crow

* Fixed chained assignment

* Updated En_Crow

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Crow/z_en_crow.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Added parens

* fix formatting

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-15 20:09:59 -05:00
Zelllll
af326f5b78
En_Niw (Cucco) OK (#429)
* Cucco progress

* Cucco decompiled, one non-matching

* Update z_en_niw.c

* Update z_en_niw.h

* Update z_en_niw.c

* Delete EnNiw_Destroy.s

* Delete EnNiw_Draw.s

* Delete EnNiw_Init.s

* Delete EnNiw_Update.s

* Delete func_80AB5BF8.s

* Delete func_80AB5FA0.s

* Delete func_80AB6100.s

* Delete func_80AB627C.s

* Delete func_80AB6324.s

* Delete func_80AB63A8.s

* Delete func_80AB840C.s

* Delete func_80AB70F8.s

* Delete func_80AB6D08.s

* Delete func_80AB6BF8.s

* Delete func_80AB6A38.s

* Delete func_80AB7F60.s

* Delete func_80AB6F04.s

* Delete func_80AB6570.s

* Delete func_80AB7204.s

* Delete func_80AB714C.s

* Delete func_80AB7328.s

* Delete func_80AB7290.s

* Delete func_80AB7420.s

* Delete func_80AB747C.s

* Delete func_80AB8168.s

* Delete func_80AB8258.s

* Delete func_80AB6EB4.s

* Delete func_80AB70A0.s

* Delete func_80AB6450.s

* Delete z_en_niw.data.s

* Delete z_en_niw.reloc.s

* Update undefined_syms.txt

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Add boolean suggestion

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Made suggested changes

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Most suggested changes made

* More changes made, fixed compiler error

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Cleaned up En_Niw

* Cleaned up En_Niw

* Cleaned up En_Niw

* Merged Cucco conflicts

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Made requested changes (Cucco)

* Added actor description

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Made requested En_Niw changes

* Removed DECR from En_Niw

* Reduced number of if (1)'s

* Update EnNiw

* Some Cucco documentation

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-10-28 13:20:10 -04:00
fig02
6e000fcc54
En_Elf Decompiled (#432)
* init matched

* everything but navi OK

* progress

* 4 left

* remove asm

* progress

* progress

* asm and spec

* remove comment

* suggestion

* review1

* use type enum

* name func

* overridelimbdraw

* review 2

* forgot one

* merge master

* format
2020-10-28 13:02:35 -04:00
petrie911
3ba022128c
Bg_Hidan_Fwbig (#450)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* long firewall is long

* Fwbig documented, some cleanup on Zl1

* format

* merge and cleanup

* last things
2020-10-27 01:29:01 -04:00
emilybrooks
ce3542f60c
ovl_bg_spot11_oasis OK (#454)
* Decompiled ovl_bg_spot11_oasis

* Forgot to rename the init chain

* Renamed draw function, corrected include statments, corrected the waterbox pointer assignment, removed early return, removed unnecessary cast

* Forgot to add a newline
2020-10-26 20:23:34 -04:00
louist103
eea81d97d8
BgJyaBombchuiwa OK (#452)
* Fixed upstream

* Almost done

* Done

* PR fixes

* PR fix

Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
2020-10-26 12:55:37 -04:00
petrie911
93fc51e9b6
Oshihiki (#441)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* matching

* format

* document and format

* .s files

* cleanup and macros in block-related actors

* fixed a few more things, also an error I cso an error I caught in another file.
2020-10-26 09:33:58 -04:00
Tharo
695552f0b8
code_800F7260 (#433)
* Split code_800F7260

* More function splits, migrate rodata

* Initial progress

* Small progress

* More substantial progress, finally figured out structs

* 2 functions left

* Move prototypes to functions.h

* Remove unused asm, move most externs to variables.h

* Fix merge

* Ran formatter

* Brackets to avoid && &

Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>

* More variables to variables.h

* Braces around early return

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* ARRAY_COUNT in sBankSizes and remove unnecessary temp vars

Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-26 07:58:56 -04:00
Roman971
57db7ba526
Match a few more functions (#446) 2020-10-12 23:15:42 -04:00
Ethan Roseman
08c4065a5e
Decompiled ovl_Bg_Haka_MeganeBG (#448) 2020-10-12 20:44:22 -04:00
Sirius902
5c631e3170
ovl_En_Horse_Normal (#403)
* merge upstream

* Merge upstream

* Match EnHorseNormal_Init

* Work on EnHorseNormal_Draw (probably finish depending functions first)

* func_80A6CC88

* Work on EnHorseNormal_Draw

* Clang format

* Properly use OPEN_DISPS

* Stop using thisx lol

* Use the funny angle number

* Use &D_04049AD0 because it's not a display list?

* Stop using fun macros to fix stack

* EnHorseNormal_Draw

* EnHorseNormal_Destroy

* EnHorseNormal_Update

* Use disp macros EnHorseNormal_Draw

* Correctly type D_04049AD0

* func_80A6C570

* Name some draw stuff

* Fix names

* Make if condition more readable

* func_80A6B30C and fix incorrect  pointer types

* Function prototypes

* func_80A6B250

* Add header comment

* Move skin function to functions.h

* Change to stable

* Cleanup a little

* Match some more

* Work on func_80A6BE6C (won't compile yet)

* Work on func_80A6BE6C again

* Progress

* func_80A6CAFC

* Match all but one :)

* Work on func_80A6BE6C

* Work more on func_80A6BE6C

* Multiply floating point by integer lol

* Reorder assignment to almost match

* func_80A6BE6C

* Fix warning and remove unnecessary forward declarations

* Data section

* Cleanup data a bit

* More cleanup and clang format

* Clang format is a little confused

* More cleanup

* Formatting

* Revert formatting on z_bg_spot01_objects2.c

* Name unk_14C

* Add clone comment

* Name clonePos

* Name and cleanup

* Name some animation related stuff

* Remove unnecessary assignment

* Name cloneRotY

* Use ARRAY_COUNT for sAnimations

* Add more to unknown struct layout

* Use u8 for last struct member

* Use s32 for length

* Add padding disclaimer

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Various suggestions

* Replace 10430.378f

* Remove padding because alignment

* Move function array out of function

* Remove struct name being present twice unecessarily

* Oops forgot the s

* Don't separate static vars from others

* Some cleanup

* Use ARRAY_COUNT(sJntSphItemsInit)

* Minor cleanup

* Rename enum members

* Oops forgot to rename enum

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-12 18:45:16 -04:00
Random
b010db7c19
Decompile z_sram.c (#431)
* Decompile z_sram.c

* rename Sram_CalcChecksum to Sram_WriteSaveSlot

* progress

* done i think

* add original name comments

* temp substructs

* minor fixes

* review

* review 2

* fix

Co-authored-by: fig <fig02srl@gmail.com>
2020-10-11 13:45:08 -04:00
maekclena
9d35542207
ovl_En_Butte (#440)
* ovl_En_Butte

* Delete asm and inline static data

* Style

* PR review
2020-10-11 09:21:12 -04:00
i82orbom
6b3b4aa883
z_bg_gnd_soulmeiro.c OK (#439)
* Starts z_bg_gnd_soulmeiro.c

* Init

* Some more progress

* BgGndSoulmeiro_Draw

* Some more progress

* Matched

* Removes unused asm

* PR suggestions

* Update comment

Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-10 20:05:59 -04:00
i82orbom
9bfad1ebd6
z_en_kakasi.c OK (#428)
* Starts decompiling z_en_kakasi

* Destroy

* EnKakasi_Init

* func_80A8F660

* func_80A8F75C

* func_80A8F28C

* func_80A8F320 equivalent, non matching due to regalloc

* EnKakasi_Draw

* func_80A8FBB8

* func_80A8FAA4

* func_80A8F9C8

* z_en_kakasi.c OK (1 equivalent, 1 non-matching)

* Fixed one non matching

* z_en_kakasi.c OK

* Removes unused asm

* Some fixes

* Additional fixes

* PR fixes

* Rename angle reference to yaw

* Change low rotation values to decimal

Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-04 12:17:54 -04:00
i82orbom
353d4d134f
z_en_kakasi2.c (#427)
* Decompiles z_en_kakasi2

- EnKakasi2_Init

* Destroy

* func_80A90264

* Finishes z_en_kakasi2

* Remove unused data/reloc

* Some hex fixes

* Some fixes

* Addresses PR comments

* Rename temp to be more generic

* More var renaming, timer modulo

* Change low rotation values to decimal

Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-04 12:15:01 -04:00
kroemker
ca2c493374
Match EnIceHono (#335)
* Match EnIceHono

* Cleanup for PR

* Delete unused asm

* Fix formatting

* Requested style changes

* PR fixes

* More PR fixes

* PR fixes
2020-10-04 12:13:37 -04:00
Sirius902
213bac4657
ovl_En_Ishi (#425)
* merge upstream

* Merge upstream

* Use Petrie's data section

* Move assignment to declaration

* EnIshi_Init without messing with formatting

* EnIshi_Draw

* Update asm

* Remove war of the zeros

* Type function pointers

* Match a few

* Remove extra * in comment

* Progress

* func_80A7E5A8 and add translation

* Cleanup func_80A7E5A8 and work on func_80A7E824

* Work on func_80A7E824

* Cursed asf match for func_80A7E824

* Re-use variable in cursed function to avoid warning

* func_80A7F0A8

* func_80A7F514

* Use C data

* Various fixes

* Move data around

* Clang format and stuff

* Stuff

* Pretty suspicious just saying

* Add janky hack warnings

* Use enum for type

* Cleanup enum a bit

* Use small and large instead of rock and boulder

* Name EnIshi_SetupCollider

* Remove static var space

* Update translation

* Name some stuff

* Name sRockScales

* Use object id defines for func_80029E8C

* Properly type var to s16

* Make match slightly less fake

* Yay no more fake match for func_80A7E824!

* Use thisx all throughout func_80A7E824 for consistency

* Rename to EnIshi_InitCollider

* Remove asm

* Only use thisx where required in func_80A7E824

* Cleanup and naming

* More naming

* Naming

* Finish naming

* Rename sCylinderInit to sCylinderInits

* Actually finish naming

* Minor cleanup

* Header comment

* Format effect function usage properly

* More formatting

* Various changes

* Minor cleanup

* review

Co-authored-by: fig02 <fig02srl@gmail.com>
2020-10-04 12:00:15 -04:00
fig02
728a789a2f
Kibako Reloc (#436)
* fix colliderinit typo

* fix initchain

* reloc
2020-10-04 11:20:00 -04:00
petrie911
704598652a
Kibako (#420)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* box

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* kakera macros

* kakera macros

* names

* one more rename

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-10-04 11:16:21 -04:00
i82orbom
fcea7c23a4
z_en_kakasi3.c OK (#430)
* Decompiles z_en_kakasi3.c

* EnKakasi3_Init

* Some more progress

* 2 remaining

* func_80A918E4

* z_en_kakasi3.c OK

* PR suggestions

* Additional PR fixes

* Removes not needed var in z_en_kakasi3.h struct

* Another PR rev round

Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-04 10:39:21 -04:00
Electrk
4dfc9d3c3c
BgSpot03Taki (#414)
* Migrate data, fix header, add undefined symbol, decompile Init function

* Decompiled Destroy function

* Decompiled func_808ADEF0 and adjusted struct some

* Decompiled Update function

* Fixed sInitChain stuff

* Preliminary Draw function decompilation

* Replaced code with OPEN_DISPS and CLOSE_DISPS and some hex with decimal

* Working on Draw function still

* More permuter test stuff

* Got Draw matching except for one little TwoTex issue

* Added NON_MATCHING

* Removed false alarm

* Got most of the functions decompiled; 1 non-matching, 1 not started

* Ran format.sh on file

* These two symbols should be arrays

* Got func_808ADAE0 mostly decompiled

* Got func_808ADAE0 fully decompiled!

* Removed necessary files (except _Draw)

* Successfully decompiled Draw function

* Decompiled Draw function
+ Added proper includes to spec

* Removed Draw function assembly

* Moved func_800F46E0 prototype to functions.h

* Renamed unk_174 to bufferIndex

* Replaced state constants with enum

* Renamed func_808ADAE0 to BgSpot03Taki_ApplyOpeningAlpha

* Renamed func_808ADAE0 to BgSpot03Taki_ApplyOpeningAlpha

* Made changes as per pull request comments

Co-authored-by: fig02 <fig02srl@gmail.com>
2020-10-04 10:14:28 -04:00
fullgrowngaming
85cf70bcd3
En_Rl OK (#378)
* Approx. half of en_rl matched

* More En_Rl work

* 5 functions left

* One function left

* En_Rl OK and all matching

* Formatted and cleaned up style things.

* Deleted asm and fixed spec

* Forgot to delete the stuff in the data folder again

* Made all requested changes.

* Forgot one requested change

* Implemented dragorn's documentation suggestions

* Implemented dragorn's documentation suggestions

* Made further requested changes

Co-authored-by: fig02 <fig02srl@gmail.com>
2020-10-04 10:09:20 -04:00
fig02
269aa0f36f
en_reeba OK (#434)
* leever progress

* leever progress

* leever progress

* 2 non matchings

* test

* merge master, match two functions

* progress

* OK

* revert permissions change

* remove unwanted file

* review

* use decr

* merge

* merge and review

* early return

* vt
2020-10-04 09:17:44 -04:00
petrie911
5d39ae1cc7
Rakkatenjo (#419)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* bonk

* static var cleanup

* one more rename
2020-10-04 08:58:33 -04:00
petrie911
4ac8e70f5a
Obj_Syokudai (#412)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* torches

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* cleanup

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* small cleanup

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-04 08:54:09 -04:00
petrie911
a52743e8cd
Bg_Hidan_Curtain (#411)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* flame circles

* merge and description

* Update src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* formatting and other cleanup

* names

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-04 08:48:48 -04:00
petrie911
3576f4c169
Po event (#368)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* and now for poe sister stuff

* more matches

* awful control flow still needed

* complex control is comples

* matched and documented

* also remove .s

* ZAP

* .s files never die

* more cleaning

* a little more cleanup

* data cleanup

* merge and fix

* removing globalCtx2

* dlists

* forgot this

* now with ColHeader

* a little more

* one last name change
2020-10-04 08:45:23 -04:00
petrie911
686b44d8f8
Bg_Mori_Kaitenkabe (#410)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* spinny wall

* cleanup

* wait for mori tex

* merge and better (?) names
2020-10-03 22:18:41 -04:00
Dragorn421
e270cd96bf
ovl_En_Box OK, documented (#356)
* ovl_En_Box OK, documented

* Update spec

* Removed useless union

* renames, remove comments, move internal enums from header

* stylistic changes

* Remove unneeded prototypes and use documentation format for doc comments

* Misread git's merge solution

* EnBox_SetupAction and Actor_SpawnAsChild

* Cleanup

* Merge effects, defines for movement flags, swap dList and dListHead, cleanup...
2020-10-03 18:42:10 -04:00
maekclena
6136ee6deb
ovl_En_Part (#383)
* ovl_En_Part

* PR review

* PR review

* Rebase

* PR review

* Oversight

* Rebase

* PR review
2020-10-01 18:51:05 -04:00
emilybrooks
7a8e00e49d
ovl_en_hs2 OK (#423)
* Decompiled ovl_en_hs2

* Replaced skelAnime pointer with pad, changed some values to hex, replaced early return with else statment, removed unnecessary padding in the header, removed unneeded & on a function pointer

* Replaced a tab with whitespace, removed address operator in front of ActorShadow_DrawFunc_Circle, moved vec3f inside the PostLimbDraw function

* Changed 0xFFFE to ~1
2020-10-01 07:49:47 -04:00
Ethan Roseman
024d5d69bf
Decompiled ovl_Bg_Jya_Zurerukabe (#424)
* Decompiled ovl_Bg_Jya_Zurerukabe

* PR suggestions, cleanup

* PR suggestion
2020-09-30 16:09:52 -04:00
Tharo
d292d81958
Decompiled En_Holl (#253)
* Decompile most of En_Holl

* Two nonmatchings left

* Rename some variables, use EnHollActionFunc

* Minor cleanups

* Only regalloc issues left

* General cleanups

* 1 nonmatching left

* Delete data.s file

* Added some more documentation

* Improved nonmatching but OK still elusive, some cleanups

* Review changes

* Ran formatter

* More review changes

* Flip conditions that were previously missed

* DISP macros
2020-09-30 15:11:04 -04:00
fig02
82968a7381
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396)
* fix colliderinit typo

* dead sound done

* deadsound documentation

* blast done

* progress

* spk init

* progress

* spark done

* ss bomb ok

* bomb done

* cleanup

* progress

* progress

* almost done with bomb2

* clean up gossip stone

* more

* cleanup and format

* remove unused asm file

* nonmatching reloc

* done i think

* mistakes

* fix headers

* idk how that got in here

* EffectSsStick OK

* progress

* fix conflicting name

* progress

* splash OK

* uname fields

* progress

* lightning OK

* remove unwanted files

* kirakira ok

* kirakira done

* magma OK

* remove files

* ss_g_fire OK

* name funcs

* progress

* progress

* magma2 and kakera OK

* eff_ss_dead_dd OK

* fcircle OK

* stone1 OK

* sibuki2 OK

* dt_bubble OK

* deaddb OK

* sibuki OK

* dead_ds OK

* ice_smoke OK

* hitmark OK

* hahen OK

* k_fire OK

* en_fire OK

* starting colors

* color changes 1

* color switch done

* init file data migrated

* data cleanup

* ice_piece OK

* en_ice OK

* progress

* progress

* docs progress

* fix blast color names

* documentation pass 1

* progress

* cleanup pass 2

* touchups

* added to functions.h

* small changes

* fix functions.h

* renaming progress

* name progress

* color enum

* more cleanups

* enice changes

* final cleanups

* remove unwanted file

* lightning -> shock

* pr suggestions

* fix comment

* remove unwanted comments
2020-09-29 20:18:46 -04:00
petrie911
a506801cd7
Bg_Mori_Idomizu (#401)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* matching

* merge and cleanup

* wait for mori tex

* name
2020-09-28 07:11:58 -04:00
Sirius902
00fb26a441
ovl_En_Goroiwa OK (#376)
* merge upstream

* Merge upstream

* Add block comment to c

* EnGoroiwa_Init

* Remove casts in EnGoroiwa_Init

* Matched named functions

* Add one prototype

* func_80A4BD04

* func_80A4BCA0

* func_80A4BD70 and fix incompatible pointer

* func_80A4BD8C and func_80A4BE54

* Remove forward declaration

* Order variable by address

* Cleanup warnings

* func_80A4C188

* Remove func_80A4C188 forward declaration

* Progress

* Rename unk_1CE to waypoint

* func_80A4C264

* func_80A4D5E0

* func_80A4C27C

* Separate necessary forward declarations from temporary

* func_80A4BE10

* func_80A4C080

* func_80A4C134 and func_80A4C164

* func_80A4D074

* Work on some (nonmatching)

* func_80A4D944

* func_80A4D9DC

* Progress

* func_80A4DB90 and func_80A4DC00

* func_80A4D8CC

* func_80A4CA50

* func_80A4C6C8

* work on func_80A4CED8

* Work on func_80A4CED8

* func_80A4CED8

* Use temp to avoid unused error

* Clarify comment

* Work on func_80A4C3A4

* func_80A4C3A4

* Clarify comment better

* func_80A4C594

* Angles

* Improve regalloc

* func_80A4BF28

* Cleanup point access

* Work on func_80A4C814

* func_80A4C814

* Use *=

* Work on func_80A4CB78

* Work on func_80A4D0FC

* Work on func_80A4CB78

* More on func_80A4CB78

* Implement dubious permuter suggestion

* Make janky hack less janky

* Update issue comment

* Move ptr func_80A4CB78

* func_80A4CB78

* Cleanup func_80A4CB78

* Various cleanup

* Add undefined sym

* Work on func_80A4D0FC

* Work more on func_80A4D0FC

* Work on func_80A4D624

* func_80A4D0FC

* Work on func_80A4D624

* Fix stack

* Wrap in NON_MATCHING ifdef to remember which function is not done

* Collapse goto

* Use -- for unk_1C4

* Collapse else if

* Add translation for 'Player ぶっ飛ばし'

* func_80A4D624

* Migrate data section

* Clang format

* Actually add unused note

* Name timers accordingly

* Remove & from sInitChain

* Give timer descriptive names

* Rename idleTimer to waitTimer

* Rename to sWaitDurations

* Name effect data

* Add s prefix (oops)

* Move some data into functions

* Rename params for func_80029E8C

* Unify whitespace for bool returns

* Name colliderHeightOffset

* Name duplicate of colliderHeightOffset and clang format everything

* Reorder vector assignments

* Rename params to pathIdx

* Rename temp to yawDiff

* Add 'f's because floating point

* Name a lot of stuff

* Name posDiff

* Nuke the bool

* Remove unnecessary return

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Remove useless forward declarations and use list[0]

* Clang format again

* Use switch statement

* Use hex for normalizing angle

* Use hex because angle

* Small fixes

* Small fixes

* Move function arrays out of function

* Correct colliderItems

* Don't separate static vars from others

* Clang format

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-09-28 06:03:39 -04:00
mzxrules
83fc21fea6
Match and fully document bg_ddan_jd (#386)
* match and fully document bg_ddan_jd

* fix comment

* implemented suggested changes, minor fixes

* more changes

* implement requested changes, tweak wording on ySpeed comments

* more minor tweaks
2020-09-28 01:18:47 -04:00
petrie911
e93d604ff7
Bg_Mori_Hashigo (#400)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* All but one

* OK

* merge and cleanup

* wait for mori tex
2020-09-28 01:03:26 -04:00
Dragorn421
a7beb8814b
ovl_Obj_Lightswitch OK and documented (#373)
* ovl_Obj_Lightswitch OK

* ovl_Obj_Lightswitch documented

* Removed unneeded prototypes

* Minor cleanup

* Cleanup, names

* Use color array for more sane SetEnvColor

* enum styling

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* more enum styling

* globalCtx2 meme

* XxxInit -> SetupXxx

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-27 10:35:52 -04:00
Roman971
2a9225763b
Decompile En_Mag (#406)
* Decompile En_Mag

* Document En_Mag

* Address some review comments
2020-09-27 10:14:25 -04:00
petrie911
201584a707
mori_bigst (#392)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* mori_bigst matched and documented

* forgot the .s files again

* Update src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* one .s got away

* more cleanup

* one more thing

* wait for mori tex

* cleanup

* Update z_bg_mori_bigst.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-09-26 21:28:27 -04:00
Darin
b48fa7ff4a
Bg_Spot16_Bombstone (#405)
* First working function

* Syncing up

* Not OK - something wrong with data elements

* Not OK - syncing files

* OK now.  Fixed data issue

* Not OK - data issue

* Not OK - syncing files

* OK - added another function and commented out init for now

* OK - another function

* Not OK - working on function

* OK - Added working functions back

* OK - another function

* Not OK - syncing files

* Not OK - updating undefined syms

* OK - Draw function

* Not OK - slightly closer on 5950

* OK - another function

* OK - another function

* OK - another function

* OK - another function

* OK - finally fixed init

* Lots of cleanup and renaming

* Removed data files

* Minor cleanup

* Removed commented out line

* Minor cleanup

* More minor cleanup

* More minor cleanup

* More cleanup

* Removed unneeded dereferences

* Minor cleanup

* Minor cleanup

* More cleanup

* Update src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* More cleanup

* More cleanup

* Removed structs

* Minor cleanup

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Changed EnBombf to Actor

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-26 21:26:21 -04:00
Ethan Roseman
08bf25fca7
Decompiled ovl_En_Rd (1 nonmatching) (#390)
* Initial progress

* Broken but almost

* Final attempt at the last function

* Fixing struct def

* PR updates

* PR stuff

* baby commit

* PR comments

* Error handling
2020-09-26 21:16:28 -04:00
Ethan Roseman
bdbd79296e
Decompiled ovl_Demo_Shd (#388)
* Decompiled ovl_Demo_Shd

* Revert var change

* gfxdata

* vars in block

* if (1)

* PR comments
2020-09-26 21:12:19 -04:00
petrie911
bc898fcbfc
Hashira (#384)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* Hashira4 done

* forgot some names

* minor cleanup

* .gitignore reverted

* merge and rename

* merge and cleanup

* needs a description

* dlists

* wait for mori tex
2020-09-26 21:10:20 -04:00
Lucas Shaw
7c7d292730
z_en_takara_man OK (#380)
* started

* Decompiled z_en_takara_man, added CHOICE_NO and CHOICE_YES defines

* use generated reloc

* Removed choice index define due to inconsistencies

* Made suggested changes
2020-09-26 21:09:17 -04:00
kroemker
0dca636f4a
BgMizuWater OK (#359)
* BgMizuWater OK

* Renaming

* Fix formatting

* Cleanup, use new gfx functions

* Fix stack issue

* PR fixes

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* PR fixes

* More PR fixes

* Fix formatting

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-26 21:06:30 -04:00
Darin
c864ce0de2
z_bg_spot15_rrbox OK (#375)
* Initial work on spot15_rrbox

* Few functions done with OK

* Added destroy function

* Fixed up struct, made actionFunc and completed more functions

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* File entirely working

* Replaced padding with better variables

* Replaced more padding

* Ran format script and some other minor layout changes

* Removed assembly files

* Made update function consistent with other base functions

* Renamed variable

* Removed data file

* Updated reloc location in spec

* Removed old reloc file

* Made init chain static

* Minor fixes

* Fixed various minor issues

* More minor cleanup

* Even more minor cleanup

* Minor cleanup

* More minor cleanup

* Minor fix

* Fixed up more variable names

* Apply suggestions from code review

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* More cleanup

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-09-26 20:06:26 -04:00
Peppers1612
b9b5724dec
BgPoSyokudai (#382)
* BgPoSyokudai: decomp Init()

* BgPoSyokudai: decomp Destroy()

* BgPoSyokudai: decomp Update()

* BgPoSyokudai: decomp Draw()

* BgPoSyokudai: remove data.s and reloc.s

* BgPoSyokudai: clarify switch flags 1D to 1F

* BgPoSyokudai: format following codestyle and remove macros
2020-09-21 03:30:58 -04:00
zelda2774
055d1d2bae
audio_heap: 1 non-matching (#381)
* Audio_AllocDmaMemory

* Audio_AllocDmaMemoryZeroed

* func_800DE238

* Audio_SessionPoolsInit

* func_800DE2B0

* func_800DE258

* Audio_DiscardSequence

* Audio_DiscardBank

* func_800DE12C

* Audio_ResetLoadStatus

* func_800DDE3C

* func_800DDE20

* Audio_InitMainPools

* Audio_SoundAllocPoolInit

* Audio_PersistentPoolClear

* Audio_TemporaryPoolClear

* func_800DE4A0

* Audio_PersistentPoolsInit

* Audio_TemporaryPoolsInit

* Formatting

* Audio_SeqAndBankPoolInit

* Audio_Alloc

* Audio_AllocZeroed

* func_800DE4B0

* func_800DF0CC

* func_800DF074

* func_800DF1D8

* func_800DF688

* func_800DF5DC, func_800DF630

* func_800DF7BC

* func_800DF7C4

* func_800DF888

* Fix AudioBufferParameters

* Audio_ResetStep

* Struct work

* oops

* structsss

* wip on func_800DFBF8

* func_800E04E8

* func_800E0540

* func_800E0964

* func_800E1148

* func_800DF5AC

* func_800E0E6C

* func_800E0E90

* func_800E0BF8

* func_800E0634

* func_800E05C4

* func_800E0CBC

* func_800E0C80

* naming

* func_800E0BB4

* func_800E0AD8

* func_800E0E0C

* func_800E0EB4

* func_800E06CC

* Audio_AllocBankOrSeq

* Use true/false macros

* fixup

* Format

* comments

* review

* unk instrument -> sfx

* Reword comment

* Change AVOID_UB to a comment

Co-authored-by: zelda2774 <zelda2774@invalid>
2020-09-20 13:22:09 -04:00
Ethan Roseman
9018841660
Decompiled ovl_Bg_Spot18_Shutter (#395)
* Decompiled ovl_Bg_Spot18_Shutter

* formatting

* PR fix
2020-09-20 12:14:32 -04:00
emilybrooks
7bd4686f1a
Ovl_Obj_Hana OK (#394)
* initial commit

* Deleted unused asm files.

* Formatting, simplified scale floats in HanaParams structs

* Removed a comment, replaced thisx with this->actor

* Renamed hanaParams data symbol, added missing static keywords, formatting

* Formatting suggestions
2020-09-20 09:37:54 -04:00
Andrew Zwicky
44dac7af67
ovl_Bg_Ice_Shutter (#377)
* Starting work on Bg_Ice_Shutter, want to commit
before attempting to use the permuter.

* Forgot to use the new UNK_TPYE in DynaPolyInfo_Alloc

* Resolving last asm issues by re-ordering and
updating .c file.

* Attempting to match by reordering things, removing no
longer used .s files from spec file.

* Adding in proper include path for _reloc file

* Removing unneeded parens and casts

* Removing extra space.

* Updated with review fixes

* Another round of review comments.

* Adding description to comment to clarify what these are.

* Adding in newline before draw function
2020-09-19 15:12:42 -04:00
Roman971
14191307e9
Decompile Player (#387)
* Setup player decomp

* Decompile z_player.c and z_player_lib.c

* Decompile remaining z_player.c functions

* Various player improvements

* Player progress (some non matchings and .data migrated)

* Player progress (reposition data and fix some non matchings)

* Cleanup, improve and document parts of z_player_lib.c/z_player.c

* Fix player renames in z_en_st.c

* Fix missing open/close disps in z_player.c

* Minor player fixes

* Address player comments
2020-09-18 21:45:39 -04:00
Roman971
b29c268f37
Use dummies to match bss ordering and some functions in z_collision_check.c (#393) 2020-09-15 18:41:38 -04:00
petrie911
203cd19f8a
Darkmeiro decompilation (#320)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* forgot to remove ASM

* Now with better formatting

* removed some stray thisx

* Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>

* one more cleanup

* cleanup as per discussion

* fancy new names

* sfx

* ZAP

* more cleanup

* more cleanup

* and a little more

* renaming some stuff

* a little more tidying up

* bug comment

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
2020-09-14 16:53:57 -04:00
fullgrowngaming
9891ac04c3
z_bg_menkuri_eye OK (#374)
* z_bg_menkuri_eye OK

* Fixed up a few things in Update

* Made all requested fixes.
2020-09-14 16:27:23 -04:00
krimtonz
4d9f83da1b
Decompiles ovl_En_St (#349)
* decompile and match En_St

* document ovl_En_St

* Implement OPEN_DISPS, and remove useless comments

* styling updates, inline some declarations

* PR suggestions as well as changing the BlureInit colors to u8 arrays over RGBA types

* remove pointer from EnSt_SetupAction
2020-09-14 12:17:34 -04:00
gamestabled
43a3ee9a93
BgHakaWater OK (#302)
* BgHakaWater OK

* minor style fixups

* made requested changes

* use true/false for isLowered
2020-09-08 22:48:35 -04:00
Dragorn421
507edd134e
ovl_Bg_Hidan_Dalm OK (#367)
* ovl_Bg_Hidan_Dalm OK, except _Init

* names and style changes

* OK, names, style
2020-09-07 08:29:58 -04:00
louist103
eef2a005b5
Decomp Heishi4 All OK (#364)
* Fixed upstream

* Migrate data, fix header, and begin Init function

* Lots of progress

* Almost done

* One non matching left

* Decomp EnHeishi4 All OK

* PR fixes

* PR fixes
2020-09-05 10:18:02 -04:00
fig02
bb1aacbd0b
z_lights.c OK (#343)
* rename some structs

* changes

* rename stuff and start a func

* progress

* progress

* progress

* remove unwanted file

* progress

* match last few funcs

* done, i think

* small changes

* match Lights_Draw (thanks krim)

* comments

* cleanup

* most pr suggestions

* name changes

* rename
2020-09-05 09:45:10 -04:00
i82orbom
612980f90c
Decompiles z_bg_spot01_objects2.c (#357)
* Starts z_bg_spot01_objects2

* z_bg_spot01_objects2.c almost finished

* Finishes z_bg_spot01_objects2.c

* Removes unused asm

* PR comments and rebased to master

* Addresses PR comments #2

Co-authored-by: i82orbom <i82orbom i82orbom@github>
Co-authored-by: i82orbom <i82orbom@github.com>
2020-09-04 18:28:45 -04:00
maekclena
d44dd61cd6
ovl_Effect_Ss_Extra (#339)
* ovl_Effect_Ss_Extra

* EffectSsExtra_Spawn

* Typo

* PR review

* PR review
2020-09-04 17:22:12 -04:00
zelda2774
c033b4b28e
audio_seqplayer, the easy half (#369)
* func_800E9340

* Audio_SequenceChannelDisable

* Audio_SeqChannelLayerFree

* Audio_SeqChannelLayerDisable

* Rename functions

* Audio_SeqChannelSetLayer

* Move gSequenceChannelNone into gAudioContext

* Audio_SequenceChannelInit

* Name functions

* Audio_M64ReadU8

* Audio_M64ReadS16

* Audio_M64ReadCompressedU16

* Audio_AudioListPopBack

* Audio_AudioListPushBack

* Audio_InitLayerFreelist

* Audio_SequencePlayerDisableAsFinished

* incomplete Audio_SequencePlayerDisable

* Audio_SequenceChannelEnable

* Audio_SequencePlayerDisableChannels

* Audio_SequencePlayerInitChannels

* struct fixes

* func_800E9ED8

* Name more functions

* Audio_SequenceChannelSetVolume

* Audio_SetInstrument

* Audio_GetInstrument

* confirm structs

* Audio_ResetSequencePlayer

* Audio_InitSequencePlayer

* Audio_InitSequencePlayers

* func_800EC734

* Find the right Audio_SoundAlloc

* Prune functions.h

* Move global vars into gAudioContext

* func_800EAEF4

* Audio_SeqChannelLayerProcessScript

* Audio_HandleScriptFlowControl

* func_800E9F64

* func_800EA0C0

* func_800EA440

* func_800EAAE0

* unbreak audio_effects

* Audio_ProcessSequence

* Audio_ProcessSequences

* Some audio_heap struct work and function naming

* Audio_SequencePlayerDisable

* ? instead of ! in z64audio.h

* Revert makefile change

* Formatting, player -> seqPlayerIndex

* Index -> Idx

Co-authored-by: zelda2774 <zelda2774@invalid>
2020-09-01 17:23:30 -04:00
Roman971
b4ac94a8fd
Match/Improve more non matching functions (#366)
* Match/Improve more non matchings

* Remove SET_NEXT_GAMESTATE from preserved macros
2020-08-30 12:51:46 -04:00
i82orbom
468c592792
Decompiles z_bg_spot11_bakudankabe.c (#355)
* Starts z_bg_spot11_bakudankabe

* BgSpot11Bakudankabe_Init

* BgSpot11Bakudankabe_Destroy

* BgSpot11Bakudankabe_Update

* BgSpot11Bakudankabe_Draw

* func_808B2180

* func_808B2218 WIP

* Finishes z_bg_spot11_bakudankabe.c

* Removes forward declared function

* Addresses PR comments

Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-28 21:14:20 -04:00
louist103
98ca965541
Decomp EnExRuppy (#331)
* PR fixes NOT MATCHING

* PR fixes

* Fix EnNiwGirl.h

* Update z_en_niw_girl.h

* Update z_en_niw_girl.c

* Delete ASM

* Ran format.sh and did some manual cleanup

* Update z_en_ex_ruppy.c

* Update z_en_ex_ruppy.c

* PR fixes

* Accidently left a git string in the file

* PR fixes

* PR fixes
2020-08-28 19:45:47 -04:00