1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Commit graph

305 commits

Author SHA1 Message Date
louist103
25dd8e54dc
Decompile and mostly document EnSkj, EnSkjNeedle, and OBJECT_SKJ. One NON_MATCHING (#750)
* match a few

* delete ASM

* Almost done

* One reg swap left

* GlobalCtx2 YEP

* Start object SKJ

* Start some documentation

* Big doc pass

* Name the first batch of functions

* Done

* fix some issues real quick

* lets try this again

* remove left over doc tools and add 3 textures

* Finish object_skj docs

* PR fixes

* PR fixes

* Delete BuildInfo.ha

* PR fixes (Roman)

* PR fixes (Roman)
2021-04-10 17:39:25 +02:00
Dragorn421
288320317c
Gohma (ovl_Boss_Goma) (#397)
* ovl_Boss_Goma OK, except func_80917D98

* ovl_Boss_Goma OK and documented

* Minor cleanup: shorten enums, use named constants...

* Floats with .0f, less useless static usage, details on oversight about spawning child gohmas, cleanup...

* More documentation, hopefully less weird about documenting setups and actions

* fix fhg_fire

* remove warnings

* formatting things

* newlines

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-03 16:58:33 -04:00
Anghelo Carvajal
9834f5517e
EnDivingGame OK (#745)
* update

* EnDivingGame_Draw OK

* dont feel like working on this function today

* fixed build errors

* fixing some merge conflicts

Signed-off-by: Angie <angheloalf95@gmail.com>

* more conflict fixing

Signed-off-by: Angie <angheloalf95@gmail.com>

* all merge conflicts fixed

Signed-off-by: Angie <angheloalf95@gmail.com>

* EnDivingGame_Update OK

Signed-off-by: Angie <angheloalf95@gmail.com>

* remove DECR

Signed-off-by: Angie <angheloalf95@gmail.com>

* format and unused_asm

Signed-off-by: Angie <angheloalf95@gmail.com>

* change reloc in spec

Signed-off-by: Angie <angheloalf95@gmail.com>

* damn reloc

Signed-off-by: Angie <angheloalf95@gmail.com>

* Apply suggestions from code review

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* use OPEN_DISPS macro

Signed-off-by: Angie <angheloalf95@gmail.com>

* batch of suggestions

Signed-off-by: Angie <angheloalf95@gmail.com>

* more suggestions

Signed-off-by: Angie <angheloalf95@gmail.com>

* more changes, but this isn't ready yet

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename two timers

Signed-off-by: angie <angheloalf95@gmail.com>

* Update src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* grabbedRuppiesCounter

Signed-off-by: angie <angheloalf95@gmail.com>

* a lot of vec

Signed-off-by: angie <angheloalf95@gmail.com>

* Apply suggestions from code review

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

* fix some typos

Signed-off-by: angie <angheloalf95@gmail.com>

* allRupeesThrowed

Signed-off-by: angie <angheloalf95@gmail.com>

* rupeesLeftToThrow

Signed-off-by: Angie <angheloalf95@gmail.com>

* boolean changes and minor comments

Signed-off-by: Angie <angheloalf95@gmail.com>

* and more renaming

Signed-off-by: Angie <angheloalf95@gmail.com>

* renaiming and chained assign

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename 3 functions

Signed-off-by: Angie <angheloalf95@gmail.com>

* final rename and add two enums

Signed-off-by: angie <angheloalf95@gmail.com>

* format

Signed-off-by: angie <angheloalf95@gmail.com>

* enum naming

Signed-off-by: angie <angheloalf95@gmail.com>

Co-authored-by: Lucas Shaw <lgs84@cornell.edu>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
2021-04-03 12:15:16 -04:00
petrie911
28cfd82a4f
Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* It's Phantom Ganon time

* Fhg_Fire matched

* small touch up

* more documentation

* starting naming fire

* renaming

* cleanup

* hooray for new names

* merge

* first pass

* camera status

* bgcheck

* object 1

* object 2

* .s

* .s

* fig's comments

* implementing zel's suggestions and a few other things

* the work begins

* work continues

* docs, shifts, cleanup

* cleanup

* texture names

* addressing the rest of the notes

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-29 15:35:46 -04:00
EllipticEllipsis
ed4021a6fe
EnJj and object_jj OK (#741)
* Shift to new branch

* object_jj decomped

* docs

* Documented blinking, various other things

* more naming

* Most stuff in the object named

* implement eye enums

* delete asm

* Changes from Fig's review

* Apply suggestions from code review

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 20:02:09 -04:00
Anghelo Carvajal
b338f12498
object_horse_ganon, object_horse_link_child, object_horse_normal and object_horse_zelda OK (#724)
* object_horse_zelda

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse_normal

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse_link_child

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse_ganon

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse

Signed-off-by: angie <angheloalf95@gmail.com>

* object_hni

Signed-off-by: Angie <angheloalf95@gmail.com>

* ZAPD is falling to do vtx

Signed-off-by: Angie <angheloalf95@gmail.com>

* Testing

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename horse_link_child variables

Signed-off-by: angie <angheloalf95@gmail.com>

* horse_zelda with names

Signed-off-by: angie <angheloalf95@gmail.com>

* I'm suspecting that this game doesn't use z_en_horse_ganon

Signed-off-by: angie <angheloalf95@gmail.com>

* Child epona eye textures

Signed-off-by: Angie <angheloalf95@gmail.com>

* Extract eyes textures from Epona

Signed-off-by: Angie <angheloalf95@gmail.com>

* Small rename

Signed-off-by: Angie <angheloalf95@gmail.com>

* change references in EnHorseNormal

Signed-off-by: angie <angheloalf95@gmail.com>

* Rename a few HorseNormal animations

Signed-off-by: angie <angheloalf95@gmail.com>

* Add normal horse eye texture

Signed-off-by: angie <angheloalf95@gmail.com>

* Add some textures

Signed-off-by: angie <angheloalf95@gmail.com>

* change pointers in EnViewer

Signed-off-by: angie <angheloalf95@gmail.com>

* Rename some animations of HorseGanon

Signed-off-by: angie <angheloalf95@gmail.com>

* Add a few dlists in object_horse

Signed-off-by: Angie <angheloalf95@gmail.com>

* Add whinnies

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename last animations remaining in horse_normal and horse_ganon

Signed-off-by: angie <angheloalf95@gmail.com>

* Remove epona and ingo's horse

Signed-off-by: angie <angheloalf95@gmail.com>

* ./format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* Give a proper name to horses animations

Signed-off-by: angie <angheloalf95@gmail.com>

* add trailling comma

Signed-off-by: Angie <angheloalf95@gmail.com>

* remove union of skeletons

Signed-off-by: angie <angheloalf95@gmail.com>

* change skeletonheader* to void*

Signed-off-by: angie <angheloalf95@gmail.com>

* remove cast

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

* remove cast 2

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

* format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-27 23:44:11 -04:00
Anghelo Carvajal
3aad8f7244
object_du OK (#693)
* .gitkeep and xml

Signed-off-by: angie <angheloalf95@gmail.com>

* comment out most of the xml

Signed-off-by: angie <angheloalf95@gmail.com>

* add all animations

Signed-off-by: angie <angheloalf95@gmail.com>

* textures

Signed-off-by: angie <angheloalf95@gmail.com>

* more textures

Signed-off-by: angie <angheloalf95@gmail.com>

* another texture

Signed-off-by: angie <angheloalf95@gmail.com>

* eye and mouth textures

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* add to spec and comment out a problematic skeleton

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* replace almost all d_ references

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* add missing include

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* fix problems with overlapping data

Signed-off-by: angie <angheloalf95@gmail.com>

* replace references to Darunia's skeleton

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename cutscenes in en_du

Signed-off-by: Angie <angheloalf95@gmail.com>

* last renaming

Signed-off-by: Angie <angheloalf95@gmail.com>

* ups, forgot to delete some pointers from undefined_syms.txt

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename the animations

Signed-off-by: angie <angheloalf95@gmail.com>

* run format

Signed-off-by: angie <angheloalf95@gmail.com>

* gDaruniaSageFormationAnim

Signed-off-by: angie <angheloalf95@gmail.com>

* update actor symbols from object

Signed-off-by: angie <angheloalf95@gmail.com>

* rename eyes

Signed-off-by: angie <angheloalf95@gmail.com>

* rename a mouth texture

Signed-off-by: angie <angheloalf95@gmail.com>

* run format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* typo

Signed-off-by: angie <angheloalf95@gmail.com>

* delete gitkeep

Signed-off-by: angie <angheloalf95@gmail.com>

* link of the pr

Signed-off-by: Angie <angheloalf95@gmail.com>

* update the cs name to the correct one

Signed-off-by: angie <angheloalf95@gmail.com>

* tlut

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

* add object name to outname in palettes

Signed-off-by: angie <angheloalf95@gmail.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-27 23:02:45 -04:00
Anghelo Carvajal
43b45b91c9
object_zl2, object_zl2_anime1 & object_zl2_anime2 OK (#694)
* xml

Signed-off-by: Angie <angheloalf95@gmail.com>

* add xmls of anime1 and anime2

Signed-off-by: Angie <angheloalf95@gmail.com>

* add unaccounted data from animes

Signed-off-by: Angie <angheloalf95@gmail.com>

* add all unaccounted data and a bit of renaming

Signed-off-by: Angie <angheloalf95@gmail.com>

* add to spec and change the pointer to the decompiled names

Signed-off-by: Angie <angheloalf95@gmail.com>

* add palettes

Signed-off-by: angie <angheloalf95@gmail.com>

* delete gitkeep

Signed-off-by: angie <angheloalf95@gmail.com>

* run format

Signed-off-by: angie <angheloalf95@gmail.com>

* change palette to Tlut

Signed-off-by: angie <angheloalf95@gmail.com>

* change `Tlut` to `TLUT`

Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-27 22:24:28 -04:00
EllipticEllipsis
dab0d957fe
Objects used in DemoEffect OK (#731)
* object_triforce_spot

* object_gi_jewel

* object_efc_crystal_light

* object_efc_fire_ball

* object_efc_lgt_shower

* object_god_lgt

* object_light_ring

* object_efc_tw

* undefined_syms

* fix gameplay_keep
2021-03-23 20:40:36 -04:00
EllipticEllipsis
77ec4d4916
object_bg and object_mir_ray OK (#714)
* object_bg and object_mir_ray

* remove externs in mir_ray

* newline at end of xml

* fix a couple of warnings in Obj_Tsubo
2021-03-18 03:46:42 -04:00
Anghelo Carvajal
e48e565ffe
object_hidan_objects OK (#695)
* xml

Signed-off-by: angie <angheloalf95@gmail.com>

* add to spec and remove repetaed entries

Signed-off-by: Angie <angheloalf95@gmail.com>

* add some dlists

Signed-off-by: Angie <angheloalf95@gmail.com>

* add a few offsets

Signed-off-by: Angie <angheloalf95@gmail.com>

* fireballs textures

Signed-off-by: Angie <angheloalf95@gmail.com>

* add some unused dlists

Signed-off-by: Angie <angheloalf95@gmail.com>

* change the references in decompiled objects

Signed-off-by: angie <angheloalf95@gmail.com>

* change the references from non matching actors

Signed-off-by: angie <angheloalf95@gmail.com>

* add blob

Signed-off-by: angie <angheloalf95@gmail.com>

* changes requested by @Zelllll

Signed-off-by: angie <angheloalf95@gmail.com>

* why is this object so big?

Signed-off-by: angie <angheloalf95@gmail.com>

* rename a lot of stuff

Signed-off-by: Angie <angheloalf95@gmail.com>

* this object never ends

Signed-off-by: angie <angheloalf95@gmail.com>

* Some floats

Signed-off-by: angie <angheloalf95@gmail.com>

* stones blocks

Signed-off-by: angie <angheloalf95@gmail.com>

* rename fireball and stuff

Signed-off-by: Angie <angheloalf95@gmail.com>

* Stationary flame thrower

Signed-off-by: Angie <angheloalf95@gmail.com>

* SpinningFlamethrower

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename the lasts textures

Signed-off-by: Angie <angheloalf95@gmail.com>

* some random renamings

Signed-off-by: Angie <angheloalf95@gmail.com>

* run format

Signed-off-by: Angie <angheloalf95@gmail.com>

* Remove .gitkeep

Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-18 03:23:59 -04:00
Anghelo Carvajal
6b9a44e5a0
object_gj OK (#698)
* xml

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* add spec

Signed-off-by: angie <angheloalf95@gmail.com>

* replace all hardcoded pointers in demo_gj

Signed-off-by: angie <angheloalf95@gmail.com>

* add the rest of the unaccounted data as a blob

Signed-off-by: angie <angheloalf95@gmail.com>

* i forgot to erase a undefined_sym

Signed-off-by: angie <angheloalf95@gmail.com>

* name everything in object_gj

Signed-off-by: angie <angheloalf95@gmail.com>

* Categorize by how are ussed each rubble

Signed-off-by: Angie <angheloalf95@gmail.com>

* forgot to erase the externs

Signed-off-by: angie <angheloalf95@gmail.com>

* the cool laser meme is ded

Signed-off-by: angie <angheloalf95@gmail.com>

* delete gitkeep

Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-17 17:53:05 -04:00
gamestabled
d3311f9a29
Various objects (#677)
* object_okuta

* object_crow

* object_wallmaster

* named wallmaster textures

* object_dodongo

* object_firefly

* object_fire
2021-03-17 17:06:56 -04:00
Anghelo Carvajal
7b68e8b771
object_anubice OK (#696)
* xml

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* add all the object to xml

Signed-off-by: Angie <angheloalf95@gmail.com>

* add object to srccode

Signed-off-by: Angie <angheloalf95@gmail.com>

* A bit of naming

Signed-off-by: angie <angheloalf95@gmail.com>

* final rename

Signed-off-by: angie <angheloalf95@gmail.com>

* add unused particle

Signed-off-by: angie <angheloalf95@gmail.com>

* rename unused particle dls

Signed-off-by: angie <angheloalf95@gmail.com>

* delete gitkeep

Signed-off-by: angie <angheloalf95@gmail.com>

* run format.sh

Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-17 21:22:06 +01:00
Anghelo Carvajal
62606737f1
ovl_Demo_Gj Ok (#670)
* a bunch of functions

Signed-off-by: angie <angheloalf95@gmail.com>

* another bunch of functions

Signed-off-by: angie <angheloalf95@gmail.com>

* add dummies to func_8097911C to match it

Signed-off-by: angie <angheloalf95@gmail.com>

* fix some functions declarations

Signed-off-by: angie <angheloalf95@gmail.com>

* Add functions of the array used by the update function

Signed-off-by: angie <angheloalf95@gmail.com>

* add functions used by draw

Signed-off-by: angie <angheloalf95@gmail.com>

* draw and update functions

Signed-off-by: angie <angheloalf95@gmail.com>

* DemoGj_Init

Signed-off-by: angie <angheloalf95@gmail.com>

* fix some functions declarations

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* 9 small functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* Some unmatched functions and 12 small matched functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* another 7 small functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* add data

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* small types fixes

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* six more functions

Signed-off-by: angie <angheloalf95@gmail.com>

* func_80978C20

Signed-off-by: angie <angheloalf95@gmail.com>

* func_8097BA48

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* five repeated functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* Array of cylinders and two other functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* seven equals and problematic functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* func_80978F60 and func_80979860

Signed-off-by: angie <angheloalf95@gmail.com>

* func_8097923C doesn't want to match :c

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* three not matching functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* func_80978AFC

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* three more

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* DemoGj_FindGanon

Signed-off-by: angie <angheloalf95@gmail.com>

* func_809797E4

Signed-off-by: angie <angheloalf95@gmail.com>

* func_80978B90

Signed-off-by: angie <angheloalf95@gmail.com>

* last non matching function

Signed-off-by: angie <angheloalf95@gmail.com>

* erase reloc

Signed-off-by: angie <angheloalf95@gmail.com>

* a bit of renaming

Signed-off-by: angie <angheloalf95@gmail.com>

* another chunk of renaming

Signed-off-by: angie <angheloalf95@gmail.com>

* fix reg macros and a few comments

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* vt, arrayfuncs renaming and another bit of renaming

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* More renaming

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* i'm hating this actor

Signed-off-by: angie <angheloalf95@gmail.com>

* format

Signed-off-by: angie <angheloalf95@gmail.com>

* Changes asked by @shawlucas

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* swap globalCtx and globalCtx2

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* Move static variables nearer to where they are used and general cleanup

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* A bunch of changes

Signed-off-by: angie <angheloalf95@gmail.com>

* run format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* Forgot to change updateMode

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename the references to object_gj

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename some functions

Signed-off-by: Angie <angheloalf95@gmail.com>

* document the actor params, a few members and rename some draw functions

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename DemoGj_DrawRubbleDisplayList into DemoGj_DrawRotated

Signed-off-by: angie <angheloalf95@gmail.com>

* The first type is the the rubble that is around the fight's arena

Signed-off-by: angie <angheloalf95@gmail.com>

* rename the enums

Signed-off-by: angie <angheloalf95@gmail.com>

* Document the value read from the Ganon instance and rename a few functions from that

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename init and draw functions

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename smoke spawner functions

Signed-off-by: angie <angheloalf95@gmail.com>

* run format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* fix merge issues

Signed-off-by: Angie <angheloalf95@gmail.com>
2021-02-28 09:53:46 -05:00
mzxrules
bbbf657b4b
z_en_peehat (#660)
* decomp most of En_Peehat

* z_en_peehat code decomp'd and OK

* complete data migration

* first pass at documentation

* minor code clean-up

* documentation pass

* fix spec (hopefully), implement some of petrie's suggestions

* implement requested changes

* fix compiler warnings

* implement fig's changes

* implement roman's changes
2021-02-21 09:25:53 -05:00
Zelllll
f57e0467d2
Decompile object_syokudai and object_ydan_objects (#699)
* add deku and torch objects

* why git?
2021-02-17 14:42:59 -05:00
Ethan Roseman
ecedc4f059
Decompiled ovl_Bg_Hidan_Hrock (#690)
* Fixing mkldscript.c for mac

* 1 to go

* merge update

* almost

* small update

* updating API with master

* NON_MATCHING

* names of vars

* almost matching

Signed-off-by: angie <angheloalf95@gmail.com>

* BgHidanHrock_Init matching

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* renames

* format

* PR suggestions

Co-authored-by: angie <angheloalf95@gmail.com>
2021-02-15 14:33:41 -05:00
petrie911
b8c2ec1f60
Forest Stage and related actors and objects (#618)
* starting out

* match demo

* full match

* cleanup

* more names

* more names

* headers

* dist from link

* docs

* objects

* format

* organization of xmls

* merge actor

* Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c

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

* Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c

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

* format

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 17:25:02 -05:00
gamestabled
ef272322eb
dekunuts OK (#664)
* dekunuts OK

* named unk_19A

* improved the match, got rid of volatile

* one unaccounted blob

* finished object_dekunuts

* capitalization consistency

* suggested changes

* suggested changes again
2021-02-12 17:22:48 -05:00
mzxrules
43f47f9561
bg_ydan_sp OK (#628)
* BgYdanSp OK

* clean up for PR

* fix thisx, run format.sh

* delete unused asm

* implement roman's changes

* unnecessary comments
2021-02-01 14:56:33 -05:00
petrie911
6615d212eb
Demo_Kekkai, its object, and its cutscenes (#627)
* first pass

* scene

* object

* name

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "44f5d7cb9"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "44f5d7cb9"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* now with cutscenes

* one last name

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0305ec2c2"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0305ec2c2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* ZAPD works

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "2e1174063"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "2e1174063"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* now with vtx arrays

* revert zap changes

* review

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-01 14:52:23 -05:00
louist103
45a21b0ac7
EnNy OK (#624)
* get data in

* Match Init and one other

* match some more

* match a bunch more

* merge master

* OK

* Some naming done

* OBJECT_NY almost done. waiting on ZAP changes

* Remove ASM

* Cleanup

* Commit before merge

* fix damage table

* Change comment
2021-01-31 15:32:55 -05:00
engineer124
8e8421fdec
Gorons: En_Go & En_Go2 OK (#556)
* moved en_go rodata

* EnGo 20/45 functions decompiled

* EnGo 25/45 functions decompiled

* EnGo 28/45 functions decompiled

* EnGo 32/45 functions decompiled

* minor attempts

* init Goron 2 6/98 decompiled (baby functions)

* Goron2 14/98 func decompiled

* Goron2 30/98 func decompiled

* EnGo 34/45 functions decompiled

* EnGo 38/45 functions decompiled

* Goron2 44/98 functions decompiled

* Goron2 58/98 functions decompiled

* Merged EnGo and EnGo2: 38/45, 58/98 functions decompiled

* EnGo EnGo2: 38/45, 65/98 functions decompiled

* EnGo EnGo2: 38/45, 70/98 functions decompiled

* EnGo EnGo2: 39/45, 72/98 functions decompiled

* EnGo EnGo2: 39/45, 80/98 functions decompiled

* EnGo EnGo2: 39/45, 88/98 functions decompiled

* EnGo EnGo2: 39/45, 92/98 functions decompiled

* typo in GoronType

* EnGo EnGo2: 40/45, 93/98 functions decompiled

* EnGo EnGo2: 45/45, 93/98 functions decompiled

* EnGo EnGo2 fully decomped

* begin cleanup

* the cleanup continues

* continue cleaning

* Documentation and renaming attempt

* more cleanup

* more cleanup

* Apply suggestions from code review

Committing suggestions

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>

* more pr suggestions

* more pr and gns feedback

* fixed comment

* cleanup

* update math & skelAnime names

* goron1

* goron2

* relocs

* review

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: fig <fig02srl@gmail.com>
2021-01-31 13:02:28 -05:00
Zelllll
20c1f4e648
Decompile Gameplay_Keep and fix all existing decompiled objects (#595)
* First batch of files

* Add missing folders back

* Fix missing folders again

* Finish fixing existing texture files

* Gameplay_Keep XML finished

* Most actor gameplay_keep undefined syms removed

* Only ~200 gkeep symbols remain

* All gkeep symbols that ZAP supports are fixed

* Cleanup, and make gkeep names more accurate

* Starting to figure out what some unknown blobs are, merge zeldaret in

* fix a few more things

* refactor gkeep

* Change how gitkeep is handled

* gkeep xml cleanup

* Gkeep finished, now just waiting up ZAP updates

* 100 link animations finished

* 150 link animations finished

* 200 link animations finished

* 250 link animations finished

* 350 link animations finished

* 400 link animations finished

* 450 link animations finished

* 500 link animations finished

* 550 link animations finished

* All Link animations finished

cannot build yet because ZAP doesn't have LinkAnimationHeader yet

* xml changes for new zap stuff

* finish gameplay_keep

* fixing existing objects

* ready for pr besides zap padding issue

* mostly ready for pr

* format all c files

* all conflicts fixed

* make changes that roman requested

* fix thing i didn't mean to change

* some animation symbols renamed

* fixed roman's stuff

* lifemeter hardcoded pointers removed

* fix issue with incorrect data in gameplay_keep

* removed unused asm

* fixed most of fig's comments

* fix all of fig's comments

* reformat files

* Update assets/xml/textures/icon_item_static.xml

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

* Update assets/xml/textures/icon_item_static.xml

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

* fixed stuff

* fixed most of roman's comments

* remove leading zeroes

* should build now

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "f84d8337b"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "f84d8337b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* all of gkeep symbols fixed

* compiler error fixed

* format files

* final changes

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-24 19:36:40 -05:00
Zelllll
d739765031
Bg_Haka_Zou OK (#598)
* started init, not matched yet

* all except init matched

* haka_zou OK

* haka_zou done

* fix jenkins problem

* various improvements

* removed unused asm

* fixed things

* fixed new dyna names

* more dyna fixes

* ok now?????

* this better build OK

* applied roman's suggestions

* function renames

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-21 10:21:05 -05:00
Blackop778
3f669bea1e
Decompile Bg Jya Cobra (#588)
* Start work on Jya Cobra

* Match two functions

* Work on func_80896ABC

* func_80896CB4 and most of func_80896D78

* Fix func_80895BEC, clean up func_80896ABC

* Work on func_80896EE4

* Match func_80896EE4

* Nearly match func_80895A70, finish BgJyaCobra_Draw

* Match func_808969F8, start on func_80895C74

* Work on func_80895C74 and func_80895EF0, data move
Also ran permuter

* Some cleanup

* Almost match func_80895C74, tiny bit of work on func_80895EF0

* Remove variables in func_80895EF0

* Make init match nicer

* Work on func_80896518

* Progress in func_80896518

* Figured something out in func_80896518
Going to experiment with stack stuff

* func_80896518 has tiny stack and regalloc issues

* Work on func_80895EF0

* Some work on func_80895EF0

* Update diff script

* Work on func_90995EF0
Use 2d array indexing in func_80895EF0
Small regalloc improvement in func_80896518
Change not equal to to less than where possible

* match func_80896ABC and func_80896D78

* Improve func_80895EF0 a bit

* Do some cleanup

* Change commented out functions to ifdefs

* Another bit of cleanup

* Run formatter

* Remove now unused include

* Another another bit of cleanup

* Revert update to diff script

* PR suggestions

* PR comments

* PR comments, a bit of documentation

* Run formatter

* Apply suggestions from code review

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

* More PR comments

* actor fixes

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-21 09:55:11 -05:00
engineer124
f786f958bb
En_Viewer (one non-matching) (#570)
* init commit

* en_viewer 20/24 functions decompiled

* en_viewer 22/24 functions decompiled

* EnViewer 1 func non-matching, down to stack

* cleanup, 1 non-matching

* ran formatter

* remove extra space in undefined_syms.txt

* remove data.s

* update math & skelAnime names

* pr feedback

* review

* semicolon

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-16 12:33:37 -05:00
krimtonz
2810aa2b9c
ovl_En_Owl (#573)
* begin En_Owl

* EnOwl wip

* fix conflicts

* owl wip

* wip

* cleanup

* more cleanup

* remove unused asm

* run formatter

* match EnOwl_Init

* formatting

* pr updates

* forgot the enum values in WaitZoraRiver

* merge fixes

* Fix merge issues

* review changes + more

* name

Co-authored-by: fig <fig02srl@gmail.com>
2021-01-14 15:17:03 -05:00
mzxrules
3cef03f5ff
z_bgcheck.c, 800430A0.c, 80043480.c (#256)
* beginning of migrating changes

* got matching

* changed order a bit

* clean up bgcheck

* fix conflict

* fix conflict again

* first stab at identifying types, some oks

* Clean up most bad structs/pointer math, move relevant structs to z64bgcheck.h, get some OKs

* more OKs, z_bgcheck.bss migration, update some sys_math3d.c args

* couple more OKs

* pushing some OKs

* fix compilation issues

* code_800430A0.c OK, more files decomp'd

* 8003A3E0 big OK :)

* Decomp most of func_8003C614, decomp helper funcs

* Decomp SurfaceType, CamData, and WaterBox property related functions

* more OKs, big OK in 8003C078

* more OKs, more progress, move a function definition in z_collision_check to functions.h

* more clean-ups, more OKs, dyn_vtx is now defined as u8*

* 8003A5B8, 8003A7D8, 8003C614, 8003DD6C OK, document function args better

* data migrated, more OKs

* 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled

* func_80040284, 800409A8 non_matching, add IS_ZERO macro

* All asm files have C representations, some big OKs, lots of minor tweaks

* More OKs, non-matching code cleanup

* 8003FBF4 and 80040BE4 OK, improve codegen for most functions

* format z_bgcheck.c

* fix warnings, compile errors on NON_MATCHING

* func_8003EE80 is now NON_MATCHING

* begin documenting some functions

* formatting

* more documentation, func_8003A95C OK

* fix PHYSICAL_TO_VIRTUAL changes

* fix var rename

* More documentation, functions 80040E40, 80041648 OK, change types to not be compatible with ZAP

* func_8004239C ok, more NON_MATCHING improvements, more documentation

* Implement most suggested changes

* Convert comments to slower comments

* /**

* Implement ZAP2 changes

* my anti-virus ate my format.sh results

* Rename a couple hundred functions, fix minor stuff

* rename var so that clang formats correctly

* run format.sh

* implement Petrie's matches/suggestions

* format

* matches

* and the asm

* slight error

* Add SSList

* two more matches

* stuff

* implement code changes

* clean up Petrie's matchings

Co-authored-by: Arthur <arthurtilly413@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-08 06:12:58 -05:00
gamestabled
ae5a8f2700
Shabom OK (#571)
* 2 nonmatchings left

* shabom OK

* suggested changes

* more suggested changes
2021-01-01 19:56:57 -05:00
Zelllll
257fc54195
Bg_Hidan_Hamstep OK (#544)
* BgHidanHamstep 7/15

* 9/15 matched

* hamstep 14/15

* cleanup

* fix not OK

* fix ctrl+f mistake

* All functions OK

* cleanup

* Update z_bg_hidan_hamstep.c

* Update z_bg_hidan_hamstep.h

* fix math

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-12-29 22:48:57 -05:00
petrie911
c71b8183ae
Bg_Haka_Gate (#557)
* 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

* match

* sfx fix

* should be good to go

* comments and such

* Matrix macros escape me

* format

* fix bubble

* remove comments

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig <fig02srl@gmail.com>
2020-12-29 19:39:30 -05:00
petrie911
42f2d38b8f
En_Torch2 (#486)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* Oh boy more giant functions

* now functional, but not equivalent

* Now only non-matching

* cleaned up illusion room

* much closer. static variables still suck though

* much closer. static variables still suck though

* some docs and cleanup. matching is horrible.

* static varaibles are a troublesome  lot

* ifdef

* merge ZAP

* merge again

* small cleanup

* small fixes

* swordstate

* resolve conflict

* comments and such

Co-authored-by: fig <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-28 20:56:24 -05:00
Nicholas Estelami
b95643b397
Updated Texture Asset Handling (#478)
* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Fixed newline issue with ZAPD

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Fixed merge issues.

* Fixed makefile merge error

* Fixed additional merge error

* Fixed several more merge issues

* Commented out gameplay_keep and sk2 extraction, since currently unused.

* Reenabled gameplay_keep extraction since it's used in the spec

* Fixed build error

* Removed test struct

* Fixed makefile error that would happen on fresh builds

* Fixed merge issue

* Removed relative paths

* Multithreading on extraction, spec uses numbers, few changes to XMLs

* Removed redundant code from the extract_assets script

* object_sk2 and object_spot09_obj OK

* object_spot11_obj OK

* object_spot17_obj OK

* Test: One of the gameplay_keep dlists given a proper symbol

* Updated asset symbol names based on new naming scheme

* XMLs use "Offset" instead of "Address" now

* Fixed merge issues, updated ovl_Magic_Dark xml and gfx file

* Updated to use latest build of ZAPD

* Updated ZAPD again

* Updated ZAP to remove assimp dependency

* Jenkins Test: Added .gitkeep file

* Updated ZAP once more

* Updated png file name to comply with new naming scheme.

* Fixed bad include

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 06:39:52 -05:00
Zelllll
eadf85f17c
Bg_Haka_Sgami OK (#532)
* spinning scythe trap, 4/6 matching

* fixed typo

* Almost matched sgami init

* Matched sgami Init

* starting to clean up func_8087E858

* func_8087E858 half-way done

* Scythe matched

* update scythe

* Removed asm files

* Delete z_bg_haka_sgami.reloc.s

* Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

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

* Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

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

* Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

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

* Update z_bg_haka_sgami.c

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-19 04:59:35 -05:00
petrie911
92e9f2d370
Undefined Symbols in the ASM (#527)
* 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

* now with more symbols
2020-12-12 14:22:33 -05:00
petrie911
d4e16bbacf
En_GeldB (#516)
* 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

* woo watch out

* data and such

* stuff

* more decomp

* another match

* match and docs

* more docs

* little more cleanup

* SFX macros

* little more

* more attempts to match

* naming things

* I give up on the match

* also spec

* changes

* hex

* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c

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

* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.h

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

* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-10 15:00:17 -05:00
Kenix3
353684c638
ovl_demo_effect 100% OK (#466)
* Fully decompiles demo_effect actor.

* Formats z_demo_effect.c

* GET_ACTOR_TYPE is renamed to GET_EFFECT_TYPE

* Implements OPEN_DISPS macros for all draw functions.

* Fixes ugly float values

* Removes unnecessary union structs in the DemoEffect actor struct

* Renames DemoEffect SkelAnimeCurve member to skelCurve

* Names initObjectBankIndex DemoEffect struct member

* Renames jewel display list holders

* Renames initialization function pointers to initUpdateFunc and initDrawFunc

* Renames primitive and environment color DemoEffect struct members.

* Fixes a couple missed floats.

* Renames most draw and update functions.

* Finishes naming all update functions.

* Adds additional SFX defines.

* Renames the rest of the functions

* Renames all external object display lists and vertex references

* Renames DemoEffect global data variables

* Renames DemoEffect Medal function to GetItem because it's used by LightArrows too

* Fixes DemoEffect Timewarp_Timeblock documentation.

* DemoEffect_TimewarpTimeblock updates shrink functions to use decimal

* Converts DemoEffect hex to decimal where appopriate

* Names the rest of DemoEffect struct members.

* Names DemoEffect triforceSpot crystalLightOpacity

* Adds DemoEffect enums for light effect color and god lgt types.

* Renames DemoEffect_UpdateBlueOrb to DemoEffect_UpdateBlueOrbGrow

* Fixes compiler warning in DemoEffect_JewelSparkle

* Renames DemoEffect_MedalSparkle argument

* Reformatting DemoEffect struct offset comments.

* Formats z_demo_effect

* Updates DemoEffect oGfxCtx to use the new macros.

* Adds comments detailing what each function in the DemoEffect system does.

* Removes z_demo_effect.data.s

* Renames DemoEffect global variables and sets them to static

* Removes pointer from DemoEffect function references

* Removes unncecessary default: break; statements in DemoEffect

* Converts rotation values to hex in DemoEffect

* DemoEffect effectFlags now uses ~1 rather than 65534

* DemoEffect_DrawGodLgt now uses a cleaner conditional statement

* eventChkInf in DemoEffect now uses 1 << 9 and 1 << 11

* DemoEffect now uses VT macros.

* Converts DemoEffect colors to hex.

* Changes M_PI / 32768.0f to M_PI / 0x8000

* Updates demo_effect enums to be all caps

* ovl_demo_effect reloc info is now included via build process rather than included from original asm

* Adds param packing macro

* DemoEffect struct unions are now typedef'd outside of the main struct

* Reformats DemoEffect sJewelSparkleColors

* Removes an if(globalCtx){} in DemoEffect_Init

* Removes ActorFunc cast in DemoEffect_Wait

* Removes unncessary comment in DemoEffect_MedalSparkle

* Timer check in DemoEffect_UpdateLightRingShrinking now uses <= 255 rather than < 256

* Removes unnecessary comment in DemoEffect_SetJewelColor

* Removes unncessary comment in DemoEffect_MoveJewelActivateDoorOfTime

* Converts an angle to hex in DemoEffect_MoveJewelActivateDoorOfTime

* Converts a while to for loop in DemoEffect_JewelSparkle

* Moves stack variables in DemoEffect_UpdateDust to a new line for each one

* Removes globalCtx2 assignment to the beginning of the function in DemoEffect_DrawJewel

* Removes unnecessary comment in DemoEffect_DrawCrystalLight

* No longer wrapping rotation reset in if(1){} in DemoEffect_DrawGodLgt

* Converts DemoEffect if statements to use != 0 and == 0 when non-boolean ints are checked.

* DemoEffect initDrawFunc now uses type ActorFunc rather than DemoEffectFunc

* review 2

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-07 12:48:29 -05:00
EllipticEllipsis
dadee87f94
Bombchu bowling OK (#496)
* All functions decompiled, most named

* asm deleted, spec and undefined_syms included

* missed a static

* Some cleanup on comments and osSyncPrintfs

* asm

Co-authored-by: fig02 <fig02srl@gmail.com>
2020-12-06 13:48:51 -05:00
petrie911
b097c58caf
En_Dodongo (#498)
* 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

* I can't wait to bomb some do dodongos

* a whole heap of bombchus

* matched

* more names

* Dodongo dislikes smoke

* i am error

* merge

* fixes

* Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c

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

* Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c

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

* Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-06 13:06:17 -05:00
EllipticEllipsis
6b6c30cded
En Firefly OK (#503)
* Init, Destroy OK, data partially done

* All functions matched

* Data imported

* Finished naming functions and variables

* name change, inlined PostLimbDraw data

* Delete asm

* progress

* skelanime updated and review

* asm

* review 2

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-06 02:07:59 -05:00
louist103
736ebc7cca
Decompile DemoEc 1 non matching (#479)
* Fixed upstream

* Migrate data and Decomp Init

* Decomp a few more functions

* Small change before starting

* Back to this file

* Match action func chains, func_8096DE94, func_8096DF9C, func_8096E0A4

* Match all except 1 function in first back of actionFuncs

* matched a bunch in bank D_8097053C

* Match the first few draw functions

* match a few more draws and start one

* All matched but one.  All equivalent

* Name setup funcs

* finish naming functions

* Fix Gfx stuff

* Remove 'expectedc'

* General clean up

* fix

* progress

* cleanup

* remove reloc

* review 2

* fix awful function pointer thing

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-05 21:02:55 -05:00
i82orbom
2ca9c78838
z_demo_gt.c, 2/112 non matching (#480)
* Z_demo_gt.c

* More progress

* More progress

* Some more progress

* Mooore progress

* Removes unused asm

* Additional progress

* More progress

* 36 remaining

* More progress??

* 19 remaining

* some progress?

* First draw function decompiled

* func_80981694

* func_8097F508

* func_8097FF9C

* WIP

* func_80981E84

* func_80982244

* func_80981AA0 cannot believe it matched

* func_8097D7D8

* Rand functions matched

* Changes after rebase of GFX macros

* func_8097F280

* func_8097FDDC

* func_8097E824 some more progress, 2 left

* Removes unused ASM

* Cleanup / Function renaming

* More cleanup / Renaming

* review

* review

* format

Co-authored-by: i82orbom <i82orbom i82orbom@github>
Co-authored-by: fig <fig02srl@gmail.com>
2020-12-05 16:19:48 -05:00
Parker Burnett
994bf19a97
en_kusa (#494)
* starting the decomp for en_kusa -> the bushes

* in the bushes of love

* maybe the init_function is done?

* The functions that call functions never end

* more progress. almost matches init

* fig helped a bunch...ty fig

* moving things along

* yikes

* more things matching

* moar matches! fixed casting issues on some data

* progress

* progress

* One function left to go

* yeah, idk....its close though

* closer

* Ok

* En_Kusa: Ok

* removing the asm files

* fixed suggestions

* small fixes I forgot

* messed things up, had to go back, back to being OK

* named a couple more functions and fixed some logic

* fixing some names I guessed wrong on

* fixed suggested changes

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-05 15:28:39 -05:00
Tharo
f85a2d10ee
Poe Actor Decomps (#463)
* Poe actors progress

* Some more progress, En_Poh almost matching

* Further progress

* Fix merge

* Decompile data

* Actor struct cleanups

* More functions OK

* Progress

* Last function decompiled, some nonmatchings left

* Few more OK, skelanime_init definition changes

* Progress

* Style improvements, OPEN/CLOSE_DISPS, few more OK

* Few more style improvements, function prototype additions/changes, another function OK

* Remove unused asm, begin documentation

* Use generated reloc

* Cleanup, format

* Remove a few no longer needed comments

* PR suggestions

* DISP macros

* Missed some FrameUpdateMatrix != 0 replacements

* EnPoField_InteractWithSoul -> EnPoField_SoulInteract, eyeImageIdx -> eyeTextureIdx

* Fix merge, reformat

* Review Suggestions

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

* Further review suggestions

* Ran formatter

* Less DECR usage

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-04 19:34:27 -05:00
krimtonz
e983d2b72b
z_en_fd, z_en_fd_fire, and z_en_fw (#415)
* EnFd OK

* decompile En_Fd_Fire, document some of En_Fd

* fw wip

* match a few more of ovl_en_fw, properly organize data

* Ovl_En_Fw OK

* Documentation, formatting.

* change Color_RGBA8_n to Color_RGBA8

* PR updates

* fix errors with merge

* review

* dunno why jenkins failed

* review

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-04 14:35:28 -05:00
louist103
e455a24876
Decomp EnMb (#445)
* Fixed upstream

* Initial commit

* Matched init but broke something else

* All fixed.  Matched Init OK

* Progress

* Lots of progress

* Progress

* progress

* Progress

* progress

* fix struct size

* commit

* progress

* progress

* add comment

* merge master

* fix undefined syms

* progress

* progress

* progress

* Progress

* progress

* Finish

* Remove asm

* Clean up

* Delete some ASM

* Fix spec

* Update z_en_mb.h

* Match a few more and move func_80AA7938 to non equivilent

* asm

* no more non equiv

* matched

* asm

* review

Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 19:25:36 -05:00
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
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
petrie911
629d1c8968
Add remaining undefined syms (#500)
* 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

* syms

* Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-01 21:50:35 -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
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
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
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
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
Tharo
fff616d2be
Decompile z_kanfont (#443)
* Decompile z_kanfont.c

* Cleanups

* off -> offset

* Kanfont -> Font , Keep so-far unused Font fields as padding, Remove MessageData sub-struct
2020-10-12 17:42:17 -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
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
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
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
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