1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-26 14:46:16 +00:00
Commit graph

651 commits

Author SHA1 Message Date
EllipticEllipsis
e632b9a120
EnDekubaba OK and documented, object_dekubaba documented (#864)
* 13 functions left, data imported

* 2 left

* 1 left

* OK

* Begin naming

* sfx rename

* spec

* Begin naming, add LINK_IS_CHILD to EnDu

* Fix spelling of its/it's

* Document most of object_dekubaba, import symbols

* Document draw functions, begin on actionfuncs

* New actor function names, some float constants

* Name almost everything

* Delete asm

* Name size, format

* Review changes

* Review changes

* Brackets, format
2021-07-07 19:26:09 +02:00
louist103
0e7c023747
Extract all "place name" title cards (#858)
* Forest and shadow temple

* fire temple

* Water temple

* Spirit temple

* Deku tree

* jabu jabu

* DC

* Inside Ganons castle

* GTG

* Castle courtyard

* great fairy's fountain

* chamber of sages

* shooting gallery

* Temple of time

* market

* back alley

* kokir shop

* goron shop

* zora shop

* House of skulltula

* bazarr

* potion shop

* gravekeepers hut

* lakeside lab

* hyrule field

* kak

* graveyard

* zoras river

* kokiri forest

* lake hylia

* zoras domain

* zoras fountain

* gerudo valley

* lost woods

* the rest of them

* cleanup

* final cleanup

* PR fixes (Zel)

* (Re) fix case

* segment 0

* Fix map name static conflict

* Comment about ZAPD

* number 0

* Update place_title_cards.xml

* Update spec
2021-07-04 18:20:08 -04:00
Roman971
fa0a0fe81b
Decompile Fishing and document object_fish (#856)
* Start decompiling Fishing

* Decompile more functions in Fishing

* Decompile a few more functions in Fishing

* Decompile func_80B6E9E0 and func_80B7825C (non matching)

* Minor Fishing cleanups

* Migrate fishing bss to C and match 3 functions

* Decompile and match Fishing_Update

* Migrate fishing data to C and minor cleanups

* Fix the object_fish xml and use its symbols in Fishing

* Partially document Fishing and object_fish

* Add more documentation/cleanups to Fishing and object_fish

* Use object_fish symbols in Demo_Ec and fix naming

* Minor fixes to Fishing docs

* Apply review suggestions for Fishing

* Apply 2 more review suggestions for Fishing

* Apply some review suggestions for Fishing
2021-07-04 13:42:17 -04:00
mzxrules
3fd05c9147
z_En_Ossan and dependencies (#824)
* fix colliderinit typo

* fix initchain

* reloc

* progress

* progress

* Pick off a few easy functions, reduce number of warnings

* more tough OKs

* Getting closer to all OK, fix en_girla header

* some hard OKs, 7 to go

* two funcs remaining

* func_80AC7094 OK!

* Fix warnings, begin documentation

* get most of object_ossan documented, document some of en_ossan

* improve en_girla function names

* more EnOssan documentation

* more documentation

* en_tana basically complete, en_girla vars all named, en_ossan documentation improvements

* delete TIME ITSELF

* object_oF1d_map OK

* more names, fixed a poition typo

* Nearly all en_ossan functions named, all variables named

* format.sh

* forgot to delete data

* implement pr changes

* EnOssan OK! implement most of Roman's suggestions

* ugh

* implement figs suggestions

* implement roman's suggestion

* Can't tell my left from my other left

Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-04 17:23:18 +02:00
louist103
a6bd227137
Decompile obj_bean (magic bean and soft soil). 2 NON_MATCHINGs (#846)
* did a bunch

* Do a bunch more

* all functions in C

* Macros for draw and collision part of state flags

* Done for now

* remove ASM

* PR fixes (Elliptic)

* all angles are hex and take away bad names

* PR fixes (Roman)

* PR fixes

* PR fixes (Fig)

* restore map mark

* Fix the other messed with files
2021-06-23 19:28:57 +02:00
Synray
877544491b
Decompile and label EnEiyer (#852)
* En_Eiyer OK

* Label EnEiyer

* Style fixes

* Rename colCyl -> collider

* Use CLAMP_MIN

* Format

* Review changes
2021-06-17 19:51:49 +02:00
louist103
23dc339882
Migrate .bss for fault drawer and .data for item00 (#823)
* Item00 and fault drawer

* Test

* Test2

* test3

* test4

* remove .data file for item00

* revert hex

* WHY

* PLEASE

* PR fixes (Roman) and run clang-format version 10

* Fault_drawer was swapped ...again)
2021-06-15 20:51:42 +02:00
EllipticEllipsis
566d107e55
EnVali OK and documented, object_vali and object_bl completely analysed and documented (#845)
* OK

* Some naming

* Name more, correct typo in Biri, extract skel

* just Draws need names, fix typos in bili and warp1

* Decompile object_vali and add symbols

* Few more names

* Bari naming done

* object_bl completed, symbols added

* Label object_bl

* Formatter

* delete asm

* review changes

* review changes

* review
2021-06-14 18:11:14 -04:00
EllipticEllipsis
d399c3deb6
BgGndFiremeiro OK and documented (#850)
* OK, data imported

* Name everything

* Delete asm
2021-06-14 13:50:16 -04:00
Roman971
f44b24255c
Match EnDaiku_UpdateText (En_Daiku OK) (#841) 2021-06-02 17:59:01 -04:00
Zelllll
175aaf4f26
En_River_Sound OK (#833)
* match en_river_sound

* remove asm

* some docs

* more docs

* saria song

* review stuff
2021-06-01 13:17:45 -04:00
louist103
f6470eaa08
"Decompile" more objects. (#784)
* Object_hakach_objects OK and fix a warning in z_play.c

* Object Warp1 OK

* Object_spot16_obj OK

* object_cs Skeleton and limbs OK

* Limbs are broken

* Limbs OK

* Object_CS OK

* Object_jya_door OK

* fix errors and add new lines

* PR fixes (AngheloAlf)

* PR fixes (EllipticEllipsis)

* PR fixes (Fig)

* Rename Spot16 and Jya

* GraveYard -> Graveyard

* PR fixes

* -s

* PR fixes
2021-05-30 12:30:38 -04:00
louist103
201c9ec1cd
Decompile a bunch of objects (#603)
* Mostly done but shifted

* still messed up

* Almost OK

* OBJECT_JYA_OBJ OK, OBJECT_GR OK

* Done

* Merge master and format

* Cleanup

* Cleanup 2

* Start object MB dont merge yet

* Object_MB OK

* Object_ydan_objects OK

* General 'ydan' actor cleanup

* Forgot some small things

* Object_EC OK

* add .gitkeep and run format

* Object_sd OK but no textures cause of a zap issue

* PR fixes

* Fix object_sd

* fix ydan

* delete .gitkeep files

* OBJECT_BOX as far as it can go with current ZAP

* Fix undefined_syms

* Start child link object

* Push progress, dont merge yet

* Object_mori_objects OK

* Fixed?

* Fix conflicts again

* Seems like i missed some textures

* Extract data for BgBombwall

* More field

* ZAP YEP 2.0

* Object_Box OK

* Object_SD ok.  Ready to merge

* remove ASM and merge master

* remove ASM

* remove files wrongfully added to docs/

* Almost done

* Change comment in z_player_lib.c

* forgot some DLists in player_lib.c

* Fix conflict, run format

* Same as before but this time with Tex and TLUT

* Last few things

* fix object_GR and add limbs to object_sd

* Nane -> Name

* gChildDekuShieldMtx is now a matrix and not a blob

* PR fixes (Fig)

* add a space for comment in z_player_lib.c

* re push and new lines

* PR fixes (AngheloAlf)

* PR fixes (Roman)

* Fix Heishi2

* PR fixes (Fig)

* Replace spacing in a file

* PR fixes (Roman)
2021-05-26 18:59:21 -04:00
louist103
aebf11b8be
object_sa OK (#789)
* object_sa OK

* PR fixes (AngheloAlf)

* PR fixes (Roman)
2021-05-23 22:02:54 +02:00
Roman971
54f13007ca
Match EnSkb_PostLimbDraw (obl_en_skb OK) (#821) 2021-05-21 16:33:11 -04:00
EllipticEllipsis
d9a4a2079d
object_hata OK (#806)
* everything except limbs

* spec

* object_hata OK

* Replace symbols, unused data, enums, some cleanup

* Fix compiler warnings in EnRiverSound

* Address Roman's review

* Correct limbs name
2021-05-17 14:57:59 -04:00
Anghelo Carvajal
4d5d1fd079
Add every unreserved object in an automated way (#805)
* it's crashing

* fix stuff

* fix xmls

* problematic objects

* fix tabs

* Fix suffixes

* add missing new lines

* Add comments to the problematic objects

* Find and replace fixes

* Add Fig's objects

* I forgot to add a Name in a cutscene, so I'm adding it here

* Update object decomp tutorial a little bit

* Update problematic objects

* Update docs/tutorial/object_decomp.md

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Change comments

* comment out a few blobs

* dammit tluts

* Change a bunch of objects

* update the last bunch

* update comments on  oA11 and oB2

* Ninja-edit to fix compatibility with ZAPD's PR 142

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 12:36:40 -04:00
Roman971
ee539e90bd
Match BossFd_Fly (ovl_Boss_Fd OK) (#807) 2021-05-14 20:25:44 -04:00
Roman971
a53e084cd2
Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803)
* Decompile ovl_kaleido_scope + minor cleanups

* Add a common header for ovl_kaleido_scope

* Start cleaning up and documenting kaleido_scope (+ some interface docs)

* Improve and fix some kaleido_scope non matchings

* Match KaleidoSetup_Init

* Extract icon_item_fra/ger_static files

* Add more documentation and matches to kaleido_scope

* Improve the z_kaleido_collect.c non matching

* Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c

* Update most kaleido variables to be static

* Improve GS flag macros

* Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script

* Various minor fixes and improvements

* Minor fixes and review changes

* Review changes part 2

* Rename gSetTileCustom to gDPSetTileCustom

* Review changes part 3
2021-05-02 19:15:16 -04:00
EllipticEllipsis
ce44541d33
EnFish, OK and documented (#795)
* Matching

* Some naming

* spec

* Name another function

* Name animations, clarify use of GI_MAX and GI_NONE

* Documented bottle range functions

* Simplify squared distance function in EnIceHono, actor descriptions

* Functions for dropped fish

* More naming

* Change 65535.5f to (0xFFFF + 0.5f)

* Change 65535.5f to (0xFFFF + 0.5f)

* name phases

* Named other types, Docile functions

* Naming complete

* delete asm

* format, remove outdated comment

* Fix a few DrawFlexOpa arguments

* Review changes

* Change back to original playSound

* Function comments per review
2021-05-02 18:41:05 +02:00
Parker Burnett
2ee1fd4668
finished object_skb (#790)
* finished object_skb

* neglected the limbs and dlists, so I added them

* adding the textures

* fixing some names

* ....forgot to change the c file....

* hopefully fixed formatting issue
2021-04-30 20:31:49 -04:00
Anghelo Carvajal
722017814d
Decompile object_zo 🐬 (#794)
* Initial xml

* most of in-code references

* Add limbs and evrything else

* Functions used by EnRiverSound

* Fix forearm and use void* for textures

* Run formatter
2021-05-01 01:55:52 +02:00
mzxrules
1ac9479cae
z_bg_mizu_movebg and object_mizu_objects (#747)
* OK a few functions

* BgMizuMovebg_Draw OK, make tweaks to bg_mizu_bwall

* migrate data

* create mizu_objects, defines for water temple water level

* clean up some code

* implement most suggestions

* review

* review2

* formatting

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-25 19:36:43 -04:00
mzxrules
b7849976cf
ovl_Efc_Erupc OK (#773)
* a few good dead Gfx_TwoTexScrolls

* EfcErupc OK, mostly documented

* review

* remove fake match

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-25 19:12:42 -04:00
EllipticEllipsis
7cc67f70c1
EnTp, 1 nonmatching, and object_tp (#782)
* Data imported, 8 easy functions matched

* Init only remaining nonmatching, data in

* some renaming & fiddling with Init, still nonmatching

* fix colours

* Init still not matching

* Decompile object_tp

* renames

* Rename func_80B20DE0

* Horrible new idea

* Known equivalent, docs next

* Another attempt

* Finished naming in object_tp

* Named functions, more enums

* DrawBridge -> Drawbridge

* skulltulla -> Skulltula

* Name almost all struct variables

* Named most of the temps

* delete asm

* spec

* Missed data file, whoops

* Review

* More review changes
2021-04-21 14:26:24 -04:00
glankk
e73681ce74
ovl_En_River_Sound 1 non-matching (#786)
* ovl_En_River_Sound

* Implement review suggestions, run through clang-format

* Responding to PR comments

* Use CHECK_QUEST_ITEM, run through clang-tidy.
2021-04-21 19:51:44 +02:00
petrie911
7b2b88d552
Volvagia (ovl_Boss_Fd) and related actors (#352)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* Lots of functions matched. Some big ones are close.

* Five left unmatched, one close.

* Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched.

* Three unmatched, one essentially matched, the rest matched.

* More fixes.

* Documented more of the structure and cleaned up a bit.

* BossFd2, BgVbSima, and EnVbBall matched and documented

* Also removed unneeded .s files

* And need to name EnVbBall's functions

* give this a shot

* fix conflict

* one more try

* removing darkmeiro changes

* and again

* now OK from make clean

* minor cleanup

* One more matching function for BossFd

* which means it doesn't need its .s

* splitting

* splitting

* splitting

* forgot some .s

* fancy new names

* fancy new names

* trying again

* sneaky .s files

* sound effects and some hex to decimal conversions

* Sound effects and static variable cleanup

* format.sh and clean up static variables

* sfx and formatting

* ZAP and cleanup

* small cleanup

* cleanup and ZAP

* ZAP

* looking at the giant function again

* looking at the giant function again

* Only the big function left.

* Those .s files aren't mine, officer

* float literals might be fixed. regalloc still a nightmare

* almost done with the big function

* should make now

* not much of a change

* all functions match. rodata somehow doesn't.

* forgot some things

* lots of cleanup

* and a little more

* small error

* large cleanup. Also BossFd has function names and inlined variable declarations

* still more cleanup

* the quest for 0.1f continues

* forgot to put NON_MATCHING back in

* Data structures fully documented. Still more cleanup.

* DECR now works with BossFd2

* should match now

* cleanup

* small cleanup

* cleanup and names

* tiny thing

* particles and headers and stuff

* now with more enums

* merge

* test

* end test

* update

* cleanup

* object 2

* object 1

* doc object_fd2

* git subrepo pull --force tools/ZAPD

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

* formatting

* .s

* merge actor

* vertex arrays

* a little more

* formatting

* merge opd

* fixed damage check

* cleanup

* fixes

* effect struct

* review

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig02 <fig02srl@gmail.com>
2021-04-17 19:12:46 +02:00
Parker Burnett
7306d13897
Bg_toki_hikari all functions matching (#781)
* starting toki_hikari

* func_808BA018 matched and some work on other func

* init and draw matched, one to go

* matched final function, removed ASM, updated spec

* adding suggested changes
2021-04-17 18:21:43 +02:00
petrie911
07d54bd6d3
match (#780)
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-15 18:57:25 +02:00
petrie911
c8db3083f1
OK (#779)
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-15 18:29:58 +02:00
Lucas Shaw
70978762b8
ovl_En_Xc and object_xc OK (#746)
* Started

* did some more

* did a few more

* update

* Fixed corrupted git repo

* did some more

* Did a few more functions

* taking a break

* fix undefined

* matched the stupid hard function

* a few more

* did some more, done for tonight

* commit in case i mess up

* 3 non matching

* .

* remove tools/ZAP2 from origin master

* idk

* i cant figure this out

* object_xc OK

* compiles now

* the evil function is now ok

* z_en_xc OK

* some documentation

* more documentation i guess

* more documentation

* more z_en_xc docs

* z_en_xc updates

* Final pass, its been nearly a year

* Remove unnecessary comment

* forgot to remove unused asm

* Merge

* Made suggested changes and fixed warnings in z_en_xc

* Remove symbols from undefined_syms.txt

* Add some missing animmode to en_Xc

* review

* review

* fix tot cutscene

* comment

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-14 18:49:56 -04:00
Anghelo Carvajal
9e956cbe3f
object_horse and object_hni (#772)
* 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 the other horses from this branch

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

* Rename Epona animations

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

* rename animations of ingo's horse

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

* add textures in hni

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

* Give proper animation names

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

* Update symbols

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

* cutscenes

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

* ./format.sh

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

* Apply suggestions from code review

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Add most of epona's textures and some limbs

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

* add a bunch of textures and limbs of hni

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

* typo

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

* trailling comma memes

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

* all textures from hni

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

* The remaining epona's textures

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

* Use proper names for bridge cutscene

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-04-14 17:12:00 -04:00
Synray
c3880c5c99
Match en_elf func_80A0461C (#774) 2021-04-13 19:33:14 +02:00
Synray
e3c1b52887
EnGoma OK (#770)
* En_Goma OK

* Label Goma

* Remove asm

* Labeling

* Review changes

* Forgot a comment

* sizeof

* Review comments and fix warnings

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-12 19:45:58 +02:00
mzxrules
62df74991d
z_ovl_bg_spot07_taki OK (#766)
* z_bg_spot07_taki OK

* clean up code

* implement pr suggestions

* thisx fix
2021-04-11 21:33:29 -04:00
Synray
7f94088a3b
En_Horse OK (#554)
* En_Horse OK

* Remove reloc

* WIP

* Use EnIn

* Documentation

* Documentation

* Remove debug prints

* Warnings

* Cleanup

* Unused asm

* Review comment

* Review comments and reformat

* More review comments

* Rename flags

* Review changes

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-11 21:23:40 -04:00
louist103
d22b746128
Decompile King Dodongo and his fire effect (#744)
* Fixed upstream

* move .data

* match init

* mathc func_808C1D00

* match func_808C32F4, func_808C2B38, func_808C3224, func_808C2AB0

* match func_808C30F4, func_808C2A40, func_808C3704, func_808C3704

* func_808C18B0

* match another chain of functions

* Match func_808C29B0, Draw, and most of OverrideLimbDraw

* start update

* Really close

* Almost match update, match Override Limb Draw

* start the big switch

* Make a little progress on the big switch function

* Test

* chip away at the big one some more

* test

* progress

* More progress

* Add

* Finished another chain of functions

* Decomp effect functions

* Get the whole file in C

* Move data to its own C file

* Start the effect file en_bdfire.c

* Messed up expected

* Finish EnBdfire.c

* A little clean up

* done as far as I can get it

* Delete scenes directory

* Delete graphs directory

* Delete graphovl.py

* match and such

* Delete BossDodongo_Update.s

* PR fixes

* restore old IDO

* Color Filter

* PR fixes (Roman)

* Fixed added assets

* remove asm

* PR fixes (Roman)

* quick format change

* remove unwanted files

Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-11 18:38:22 +02:00
EllipticEllipsis
8d2a2a8e46
Gerudo objects (#757)
* object_ge1

* more stuff named

* object_gla OK, symbols added to C

* eff fire fix in gameplay_keep

* object_nb OK, fixed gameplay_keep

* replaced symbols in EnNb, limb enums

* Change EnGeldB limb enums to hex

* Use enum in header too

* Add descriptions to EnGe2 and EnNb, rearrange xml

* Reorder xml

* review changes
2021-04-10 18:25:03 +02:00
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
petrie911
ed78d18a25
Match Jsjutan and Tr and improve match of Yabusame_mark and holl (#769)
* some cleanup

* .s

* more matches

* .s and yabu

* holl try

* format

* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c

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

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
2021-04-09 19:19:30 -04:00
petrie911
d47528ee59
Bongo Bongo (ovl_Boss_Sst) (#458)
* First pass

* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* more matching fun

* fun with bongo

* clean this up later

* found the matching versions

* diff.py has escaped?

* now with more docs

* Now with floor and more docs

* one more thing

* incremental progress

* It's Bongo time

* one little thing

* merge ZAP

* update

* camera

* gfx now in their own file

* now with more object decomp

* name animations

* now shiftable

* missed some. also DECR

* opd merge

* start xml

* now with xml asset extraction

* format

* cleanup

* removed union

Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-06 01:08:45 +02:00
Roman971
b72ba754a2
Match demo_6k (#756) 2021-04-05 16:15:03 -04:00
petrie911
1398898b70
object_goma (#754)
* testing

* all named

* oh god spelling

* fixes

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-04 17:54:56 -04:00
Tharo
208167361b
Poe Objects (#743)
* poe objects

* Last unaccounted resolved, name suffix fixes

* remove _tex

* missed 2

* format

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-04 23:48:12 +02:00
engineer124
8b87e53b76
Graveyard objects: bg_spot02_objects (#751)
* BgSpot02Objects 4 non-matching

* Bg_Spot02 3 non-matching but all down to regalloc

* finish file

* spec

* asm

* rename var

* rename func

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-04 00:32:23 +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
9b4482314a
OnePointDemo OK (#719)
* matches

* more matches

* progress?

* it's time

* so close

* organize declarations

* docs

* more fixes

* more fixes

* fix stage 1

* more fixes

* first try

* demo ids in decimal

* final cleanup

* one more thing

* fixes

* more cleanup

* onepointcs

* OnePointCutscene

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-31 12:18:31 -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
mzxrules
86f16cf662
"decompile" ovl_map_mark_data, make minor tweaks to z_map_mark.c (#704)
* "decompile" ovl_map_mark_data, make minor tweaks to z_map_mark.c

* implement some suggestions

* eliminate wrapping braces
2021-03-29 19:24:08 +02:00
Kenix3
f4499a8de2
En_Clear_Tag OK and documented (#689)
* Decompile and document En_Clear_Tag

* Adds a define for setting the total count of ClearTag particles.

* Fixes swap in particle effect struct member names.

Additionally, implements the DECR macro where available.
Additionally, implements the CLAMP_MIN macro.
Additionally, adds more comments inside of functions explaining how the Arwing works.

* Reformats z_en_clear_tag.c after recent fixes.

* Removes not OK DECR and CLAMP_MIN macros.

I don't know why they built locally OK for me. May have had a stale build.

* Added static to data declarations.

Additionally added white spacing between data definitions.

* Various syling fixes in EnClearTag

Fixes inconsistent usage of particle/effect. They're Effect is the better name, so I went with that.

Fixed a naming issue in CalculateFloorTangent.

Adds s prefix to all the static variables.

Renames clearTagParticlesBuffer to sClearTagEffects

Consistent capitalization in comments.

Adds more descriptive comments to function level comments that didn't say a lot already.

Renamed gameplay.particleEffects to gameplay.specialEffects.

Renames cameraNumber to cameraId.

Fixed capitalization in display list variable names.

* Always capitalize the A in arwing.

* Fixes issue with overzealous replacement of arwing -> Arwing

* Renames arwing display lists to include the g prefix.

* Renames effect seed -> random

* Removes unnecessary decrement timer comments.

* Updates Arwing comments to detail why it's important that the roll is updated to zero.

* Updates stack variable names in EnClearTag_Update to be more consistent with each other.

* Updates Arwing crashing documentation.

* Further update documentation on arwing crashing.

* Even further updates to Arwing crashing docs.

* Fixes issue of missing newline in En_Clear_Tag.xml

* targetDirection reset now has a chained assignment

* Rotation angle to hex

* Fixes rotation hex and identifies float.

* Updates arwing fire check.

* Arwing cutscene timer is multiplied by 128 rather than shifting 7

* Updates scaledCrashingTimer assignment to be more consistent.

* Updates max scale to multiply by 2

* Gives name to the work buffer indices.

Additionally, makes enum names more consistent.

* Removes unnecessary globalCtx2 in EnClearTag_CreateFlashEffect

* Runs format.sh after recent changes.

* Updated path of ClearTag assets.

* Clear tag now uses Arwing in the display list name for all effects.

* Updates work buffer to expand and contract as new enums are added.

* Uses c99 defines in my c89

* Updates the unknown 8 bytes in en_clear_tag

* review

Co-authored-by: fig02 <fig02srl@gmail.com>
2021-03-29 19:14:08 +02: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
fig02
1639417327
code_80110450 (game over) OK* (#739)
* OK (sort of)

* remove hack

* clean up comments
2021-03-28 19:50:46 -04:00
fig02
187d2d1500
document code_8008E6A0 (frame advance) (#737)
* OK

* fixes

* format

* remove gotos, thanks petrie
2021-03-28 19:35:16 -04:00
fig02
7f3be6e37f
en_mm and object_mm OK (#735)
* almost done

* progress

* OK

* update mm2

* delete asm

* whitespace

* Update assets/xml/objects/object_mm.xml

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

* Update src/overlays/actors/ovl_En_Mm/z_en_mm.c

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

* name data

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 19:18:41 -04:00
fig02
11e5be77d5
bg_ice_shelter OK (#736)
* ok

* OK

* asm
2021-03-28 18:53:28 -04:00
maekclena
941f79215c
ovl_Demo_6K (#726)
* ovl_Demo_6K

* PR review

* Update src/overlays/actors/ovl_Demo_6K/z_demo_6k.c

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

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-29 00:40:38 +02: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
833dc2928d
ovl_En_Jsjutan with 1 non_matching (#713)
* Init

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

* destroy and non_matching update

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

* declare externs to data

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

* nonmatching draw

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

* everything is a disaster

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

* import bss

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

* first step to extract data

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

* import data

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

* func_80A89860

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

* draw

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

* func_80A89A6C is crap

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

* EnJsjutan_Update

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

* change some hexs into decs

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

* convert hexs of D_80A8AA98 into decimals and run format.sh

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

* move data to its own file

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

* this function is nightmare

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

* i'm really trying

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

* i think i am finally doing it

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

* move the temps to where they are used

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

* rename distance

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

* rename a few variables

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

* unclamp stuff :s

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

* i tried to see if i'm going better that older way

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

* moving stuff around

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

* this is the third try

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

* changing bit by bit

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

* step by step

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

* more stuff

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

* slow

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

* a few small changes

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

* go back to second try

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

* changing a s8 to u8 made a bigger difference than expected

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

* i am slowly doing it

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

* some problems are so dumb

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

* it is improving slowly again

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

* erase the old tries

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

* remove four variables

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

* fix the missing instructions at the end

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

* theres only regalloc problems left

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

* fix stack

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

* add ifdef non_matching

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

* i'm getting desesperate

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

* Remove unnecessary casts

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

* random stuff that improves codegen

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

* dumb is dumb

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

* erase stuff

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

* add some comments

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

* use bomb_explosion param and add some comments

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

* add a few comments in about stuff

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

* extract carpet's texture instead of hardcode it

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

* set segment 128 in the xml

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

* Add baseaddress, which fixes dlist in xml

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

* fix the second dlist

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

* compiler complain that the symbol doesn't exists

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

* last cleanup

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

* format and delete unused asm

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

* Cleanup and add a few comments

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

* add non matching to spec

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

* update xml and add a note to future people

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

* Finally remove z_en_jsjutan_data.c

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

* Rename extracted variables

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

* Update src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h

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

* Update src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-27 22:47:25 -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
Liam Nobel
b863784893
EnMu OK (#722)
* Commit Before Draw Decomp

* Closer EnMu_Draw

* Matched draw function

* EnMu Matching with OK

* Removed ASM

* EnMu OK

* Implemented pull request changes as of 2020/03/16

* Reverted header

* Split increment and switched 0s to NULLs
2021-03-27 21:14:38 +01:00
petrie911
cf78de2b11
Obj_Mure3 OK (#720)
* matched

* format

* review

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig02 <fig02srl@gmail.com>
2021-03-27 15:50:26 -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
zelda2774
7f55e088e5
Match ObjMure2_SetPosShrubCircle (#721)
* Match ObjMure2_SetPosShrubCircle

* reloc

Co-authored-by: zelda2774 <zelda2774@invalid>
2021-03-17 19:52:14 +01:00
AdamKiddle
8a730123b6
DoorKiller OK (#631)
* Init done

* slight tweak

* Destroy done

* func_80995020

* func_809951C4 done

* started func_80995A84

* func_80995A84, func_80995284, func_809952B8 done

* started the mess that is func_80995368

* most functions done except for 3 trouble cases

* func_80995368 done

* func_809958E4 done

* fully matching. Documentation and cleanup to come

* fixed fake matches

* documentation progress

* More documentation

* getting close on tidying up everything

* Finalised documentation and made some comments and name changes in player and other door files

* formatting and final touches to comments

* pr stuff

* merge master

* merge

* format

* remove unused asm after merge

* review

* \n

Co-authored-by: fig02 <fig02srl@gmail.com>
2021-03-14 11:21:15 -04:00
AdamKiddle
ca5a9aa7d1
EnEncount2 and EnFireRock OK (#659)
* first two funcs done

* fixing struct var name due to external use

* func_80A07CA4 done

* started EnEncount2_Update

* EnEncount2_Update done

* Encount2 done!

* EnFireRock_Init done (but will only match once initvars are uncommented

* progress

* 4 funcs left

* Fully matching

* minor formatting

* renames

* change structs back to normal

* formatting

* removing unused comments

* even more formatting stuff

* removed unused asm

* pr stuff

* pr stuff

* added newline at end of file

* some merge suggestions

* more pr stuff

* review

Co-authored-by: fig02 <fig02srl@gmail.com>
2021-03-14 10:39:41 -04:00
Emill
8e0fa07a7e
ovl_Item_Shield OK (#717)
* ovl_Item_Shield OK

* ovl_Item_Shield fix spec

* review changes

* review comments 2
2021-03-11 15:47:00 -05:00
emilybrooks
7c5ae8cc03
ovl_bg_haka_ship OK (#712)
* 2 non matchings left

* decompiled ovl_Bg_Haka_Ship

* review suggestions

* parent/child (Actor*)

* removed unneeded cast

* removed DECR

* review 2 suggestions, removed some redundant parentheses
2021-03-10 19:02:22 -05:00
Emill
80d0b2785d
ovl_En_Brob OK (#708)
* ovl_En_Brob OK

* Review changes
2021-02-28 10:43:25 -05:00
Anghelo Carvajal
2b70c84307
ovl_Demo_Du OK (#683)
* DemoDu_Init and externed data

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

* functions called by init

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

* DemoDu_Destroy

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

* DemoDu_Update

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

* DemoDu_Draw

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

* func_80969FD0

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

* func_8096B840

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

* two non matching functions

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

* import data

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

* func_8096BF60

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

* func_8096BF54

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

* about half of the updates functions

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

* almost the other half of update functions

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

* the rest of the updates functions

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

* DemoDu_UpdateEyes

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

* bunch of functions

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

* func_8096A970

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

* Another chunk of functions

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

* More functions and a bit of renaming

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

* More functions

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

* a bit of renaming and five more functions

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

* nonmatching function still not matching

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

* func_8096B57C and a bit of renaming

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

* func_8096A528

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

* move static variables around

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

* another bit of renaming

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

* REG

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

* Document the functions that give the medallion to player

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

* More function renaming

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

* more function renaming

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

* firemedallion and credits

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

* rename some variables in a nonmatching function

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

* i hate this function, and it is so dumb.

it took me days to figure it out, the error was so stupid

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

* rename mouthtextures and some variables

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

* Rename almost all the missing functions

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

* whoops, i forgot to run format.sh

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

* Renaming the references to the cutscene at the chamber of the sages after killing ganon

Thanks to @tharo

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

* Many of the changes requested by @petrie911

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

* Inline the assignments at DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink

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

* change wrong type

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

* changes requested by  @fig02

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

* run format

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

* remove s prefix in dustPosOffsets

Signed-off-by: angie <angheloalf95@gmail.com>
2021-02-28 10:19:54 -05: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
Lucas Shaw
3eec91504c
Some static texture files "decompiled" (#658)
* .

* remove tools/ZAP2 from origin master

* Some texture files

* fix tabs in new texture files

* map_i_static

* some updates

* update names

* update more names

* nintendo_rogo_static

* title_static ok

* Added segment= to the texture files

* do_action_static update

* Made suggested changes

* Made suggested changes

* Fixed spec
2021-02-24 13:41:43 -05:00
emilybrooks
579d7008fb
ovl_en_yabusame_mark, 1 nonmatching (#707)
* 1 nonmatching (func_80B42F74)

* #ifdef NON_MATCHING

* deleted unused asm

* review suggestions

* sCollisionVertices
2021-02-21 19:10:24 -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
Parker Burnett
8022585465
obj_tsubo OK (#702)
* Getting started

* matched tsubo_init

* matched func_80BA0DF4 and func_80BA100C

* matched func_80BA1294, with progress func_80BA15BC

* matched final func, deleted asm, some documenting

* Fixing some control flow, and names

* Fixing suggested changes (some still remain)

* adding the dangeon_keep gfx
2021-02-20 20:32:35 -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
Roman971
ad751f02d2
Match EnFr_Update (#705) 2021-02-17 14:14:36 -05:00
AdamKiddle
56e94e1e34
En_Ba OK (#700)
* init done

* Everything done except for draw

* matching

* Tidied for pr

* merge master into en_ba

* run format.sh

* fixing merge mistakes

* how many different ways can I screw up a merge challenge

* some pr comments
2021-02-15 17:59:59 -05:00
Parker Burnett
2c56a6e99a
z_en skb, 1 non-matching, with some documentation (#669)
* breathing new life into these skeletons

* StalZone Progress StalZone

* another match

* matched override

* some progress

* one down, one to go

* naming and prepping for pr

* removing asm and prepping for PR

* fixing damage table and asm issues

* hopefully this fixes it (thank you louis)

* fixing some suggested changes

* inlining data into EnSkb_SpawnDebris

* Fixing suggestions and adding a note

* fixing the asm and function name

* fix

* whoops

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-15 17:52:22 -05:00
nfaltermeier
88b05cd9a2
En_anubice OK (#688)
* init, func_809B1120, and func_809B11C0 OK
Also migrate data to c

* Match Destroy, func_809B142C, func_809B1524, func_809B15CC
Start on func_809B16AC, but float register diffs :(

* Everything OK but func_809B16AC
and what a devil it is...

* Work on func_809B16AC
What an ugly function

* Do some documentation

* More documentation

* Run formatter

* Rename a few things

* Address PR comments

* Missed a couple angle macro opportunities

* Update src/overlays/actors/ovl_En_Anubice/z_en_anubice.c

Co-authored-by: mzxrules <mzxrules@gmail.com>

* Anubice OK

* Deleted the wrong part of the spec

* A curtain was missed

* Forgot a comment
I changed the declaration but not the reference :I

* More PR comments

Co-authored-by: mzxrules <mzxrules@gmail.com>
2021-02-15 16:27:22 -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
fig02
982c645167
Armos and object_am OK (#652)
* started

* all but 2

* OK

* docs progress

* lots of docs

* add gitkeep back

* all funcs named

* small fix

* 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"

* object_am

* change

* ready i think

* last thing

* asm

* progress
2021-02-15 19:41:55 +01:00
Anghelo Carvajal
5bc23f58f8
ovl_En_Anubice_Fire OK (#687)
* init, destroy and other func

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

* func_809B2B48

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

* EnAnubiceFire_Update

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

* EnAnubiceFire_Draw NON_MATCHING

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

* import data

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

* inline some static variables

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

* EnAnubiceFire_Draw

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

* func_809B27D8

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

* final cleanup

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

* ups

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

* changes requested by @petrie911

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

* changes requested by @Roman971

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

* I somehow forgot to delete that file

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

* i don't know what to put in this message

Signed-off-by: angie <angheloalf95@gmail.com>
2021-02-14 15:37:22 -05:00
AdamKiddle
97cfe49797
Magic Fire OK (#662)
* all done, graphics commands written in draw however very messy and non matching

* figuring out data

* OK

* formatting before merge

* pr stuff

* more pr stuff

* pr changes
2021-02-14 12:55:11 -05:00
mzxrules
d615ec4f31
z_bg_jya_ironobj and object_jya_iron OK (#676)
* z_bg_jya_ironobj OK

* decompile object_jya_iron, clean up code

* implement requested changes
2021-02-13 19:10:40 -05:00
mzxrules
f9886c1097
z_bg_hidan_sima OK (#680)
* z_bg_hidan_sima OK

* cleanup code

* implement suggestions
2021-02-13 18:31:25 -05:00
DefinedBehavior
12348ca3df
ObjWarp2block OK (#685)
* ObjWarp2block OK

* Address petrie's comments

* Rename unused temp to reflect that it's padding

* Address fig comments

* Use a single byte in offset and size comments

* Address roman's comments
2021-02-13 17:51:08 -05:00
krimtonz
cf06b27b15
Decompile en_sw (#679)
* decompile ovl_en_sw

* remove unused asm

* some cleanup, run format

* review

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-12 20:52:39 -05:00
Zelllll
4d30626033
Bg_Breakwall OK and documented (#684)
* cleanup breakwall

* fix mistake in header

* make some data static

* reloc stuffs

* ready for pr

* Remove asm

* Update src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c

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

* fix petrie's stuff

* fixed all feedback

* Update src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h

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

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 20:51:59 -05:00
Anghelo Carvajal
6d01247f34
ovl_Eff_Dust OK (#655)
* void func_8099D8D0(void *arg0, s32 arg1)

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

* void func_8099D8D8(void *arg0, s32 arg1)

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

* void EffDust_Destroy(Actor *thisx, GlobalContext *globalCtx)

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

* Fix some pointers in the struct

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

* Fix functions declarations

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

* void EffDust_Init(Actor *thisx, GlobalContext *globalCtx)

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

* EffDust_Update, EffDust_Draw, renaming and cleanup

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

* void func_8099D8E0(EffDust *this)

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

* void func_8099DB28(EffDust *this, GlobalContext *globalCtx)

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

* void EffDust_UpdateFunc_8099DD74(EffDust *this, GlobalContext *globalCtx)

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

* Members renaming

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

* NON_MATCHING void func_8099E4F4(EffDust *this, GlobalContext *globalCtx)

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

* void func_8099DFC0(EffDust *this, GlobalContext *globalCtx)

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

* NON_MATCHING void func_8099E784(EffDust *this, GlobalContext *globalCtx)

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

* NON_MATCHING func_8099E784 - score 100

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

* func_8099E784 still not matching

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

* almost there (func_8099E784)

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

* func_8099E784 matching. needs cleanup

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

* void func_8099E784(EffDust *this, GlobalContext *globalCtx)

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

* Rename most members of the struct

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

* void func_8099E4F4(EffDust *this, GlobalContext *globalCtx) matching

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

* Rename a few variables and functions

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

* Add an enum for the possibles values for actor.param

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

* format files

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

* fix merge problems

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

* delete reloc

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

* remove defined symbols from undefined_syms

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

* 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>

* changes asked by @louist103

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

* Revert "Merge branch 'ovl_Demo_Gj' of github.com:AngheloAlf/oot into ovl_Eff_Dust"

This reverts commit 12e0e5d2a6, reversing
changes made to b251f1d234.

* fix merge problems

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

* Rename the param's enum and move it to header

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

* add file description

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

* Some changes requested by @Roman971

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

* more changes

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

* Change the particles amount from hex to decimal

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

* `format.sh` should also format headers :s

Signed-off-by: angie <angheloalf95@gmail.com>
2021-02-12 19:04:22 -05:00
gamestabled
fb1909bb92
En_Sth OK (#672)
* all functions matching

* en_sth OK

* text formatting and added a description at the top

* some suggested changes

* merge master and remove text comments

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-12 18:34:37 -05:00
fig02
0a1c16d440
gameplay_dangeon_keep (#665)
* xml done

* add references in

* missed a few

* newline

* review
2021-02-12 18:33:55 -05:00
Tharo
61dacd0882
Ovl_En_Gb OK (#691)
* Progress

* Matched

* Cleanup, some names

Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 17:37:13 -05:00
Anghelo Carvajal
0b2a4e9d7f
ovl_Bg_Hidan_Rock OK (#657)
* void BgHidanRock_Init(Actor *thisx, GlobalContext *globalCtx)

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

* small functions

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

* BgHidanRock_Destroy

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

* BgHidanRock_Update

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

* BgHidanRock_Draw

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

* func_8088B69C

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

* func_8088B79C

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

* func_8088B990

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

* func_8088B268 and move data

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

* func_8088BC40

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

* erase reloc

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

* a bit of cleanup

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

* ups

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

* another bit of cleanup

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

* Changes requested by @petrie911

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

* More changes requested by @petrie911

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

* fix some types

Signed-off-by: angie <angheloalf95@gmail.com>
2021-02-12 17:33:03 -05:00
Parker Burnett
43bba20796
Bg haka huta OK (#682)
* starting haka_huta with new changes

* matched last func, deleting asm

* added changes from review
2021-02-12 17:29:05 -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
petrie911
da55eaa2d8
En_Zl4 (#590)
* significant progress

* cutscene data

* match

* docs

* dist from link

* compiler warnings

* cutscene and such

* object decomp

* stuff

* cleanup

* name some things

* stuff

* cutscenes fixed

* 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"

* 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"

* reorder

* unused content

* documented cutscene dlists

* enviewer update

* Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c

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

* Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c

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

* formatter

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:16:40 -05:00
Tharo
7ee8c8011c
All* Get Item objects decompiled (#668)
* All get item objects OK

* Name z_draw functions

* fix skulltula tokens draw ids

* Review suggestions, merge extract_single_asset into extract_assets as an optional argument

Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-12 22:57:06 +01:00
EllipticEllipsis
ec31611c0e
EnBili OK and documented (#654)
* OK, data imported

* reloc

* some naming, some floats

* named almost everything

* description

* delete asm

* missing static

* Address review comments

* Apply suggestions from code review

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

* Update src/overlays/actors/ovl_En_Bili/z_en_bili.c

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-07 20:43:02 -05:00
maekclena
b029225000
ovl_En_Weiyer (#650)
* ovl_En_Weiyer

* PR review

* PR review
2021-02-07 18:31:24 -05:00
fig02
dff2dfef0f
En_Arrow OK (#648)
* fix colliderinit typo

* fix initchain

* start init

* match init

* progress

* progress

* more funcs

* match func_809B3DD8

* progress

* last func almost done

* enum

* name some more types

* progress

* all but one

* fix warning

* remove undefined syms

* match arrows

* review

* spec

* remove asm
2021-02-02 20:30:21 -05:00
fig02
6221723aad
Bombchu OK (#647)
* all but 1

* done

* asm

* rename collider data

* final changes and format

* matched, ty petrie

* asm

* review
2021-02-02 20:12:03 -05:00
EllipticEllipsis
33ce2c977b
BgDyYoseizo OK and documented (#634)
* OK, data imported

* naming

* spec, more naming

* more naming, in EnDyExtra too

* more naming

* deleat asm

* change one function name

* addressed review comments

* Actor changes

* Address review comments

* 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-02-02 19:29:40 -05:00
EllipticEllipsis
ced724fb9b
BgSpot08Iceblock OK, some documentation (#641)
* OK, spec

* all functions and variables named,
some docs on the complicated function

* delete asm

* updated to reflect Actor changes

* simplify one thing into a ternary

* Address review comments
2021-02-02 17:28:29 -05:00
emilybrooks
7eaf57be59
ovl_en_mm2 OK (#636)
* decompiled ovl_en_mm2

* resolved conflicts

* add back huta

* review suggestions

* review 2 suggestions

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-02 16:41:03 -05:00
engineer124
cce6880bc0
En_Fr Frogs 47 of 48 func decomped (#576)
* En_Fr 47 of 48 func decomped

* EnFr more cleanup

* uncommented out EnFr_Update

* more cleanup

* added format document

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Null Pointers

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

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

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

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

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

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

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

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

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

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

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

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

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

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

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

* feedback from pr

* more cleanup

* more pr feedback

* more cleaning and updates

* remove data.s

* review 2

* review

* missed one

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
2021-02-02 15:17:51 -05:00
EllipticEllipsis
ea60ad6017
Gerudo1 OK and mostly documented (#607)
* all functions matched, data imported

* some function names

* more naming

* corrections, naming

* some state flags named

* naming completed (some may be inaccurate)

* spec

* delete asm

* Review changes

* review

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-01 15:20:16 -05:00
EllipticEllipsis
45deae6357
Gerudo2 OK and mostly documented (#610)
* OK, inlined small data, began naming

* spec

* more naming

* finished naming

* remove ASM

* hex to dec

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-02-01 15:12:24 -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
EllipticEllipsis
1fbc0f1943
Gerudo3 OK and documented (#593)
* Ge3: OK and data migrated

* Functions and most variables named

* finished enums for limbs, inlined data

* spec updated, asm deleted

* fix dists

* changes

* changes

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 18:39:41 -05:00
Tharo
badb1d9d5e
ovl_Demo_Kankyo OK (#608)
* Decompiled, not yet matched

* Another match

* Fix merge

* OK

* Move cutscene data to separate source files, name some functions and variables

* Small cleanup

* Some docs

* Small improvements

* Struct_Unk_150 -> DemoKankyo_Unk_150

* Review Suggestions

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

* Further review changes

* rm reloc asm

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-31 18:38:23 -05:00
Zelllll
5da5263176
En_Cs OK and mostly documented (#639)
* all except one matching

* documented and ready for pr

* remove unused asm

* change mass thing
2021-01-31 18:32:19 -05:00
Zelllll
da993894d3
En_Daiku_Kakariko OK (Kakariko Village Carpenters) (#635)
* mostly done, one function left

* daiku_kakariko OK

* should be ready for pr

* removed unused asm

* should build OK now

* builds OK now

* all of fig's suggestions resolved
2021-01-31 18:14:47 -05:00
petrie911
8137c016a2
Demo_Ik (#620)
* match

* docs might be a while

* cues

* .s

* review

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 15:33:48 -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
Zelllll
a25ae3a584
En_Mk OK (lakeside lab dude) (#616)
* en_mk OK

* ready for pr

* ok now

* anim mode enums

* fixed dodojr

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2021-01-31 15:26:34 -05:00
Zelllll
9b91229422
Bg_Spot00_Hanebasi (Drawbridge) OK (#614)
* drawbridge progress

* matched cursed draw functions

* drawbridge OK

* fix error that made it not OK

* documentation improvements

* format fix

* update with new actor struct

* Update src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

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

* Update src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

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

* Update src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

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

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-31 15:09:04 -05:00
Zelllll
dde70e3c66
En_Dodojr (Baby Dodongo) OK (#609)
* some functions finished

* some more progress

* a bit more progress

* more functions done, one wip

* 2 functions remain

* one function remains

* actor mostly done, still one function left

* some progress, still not equivalent

* dodojr OK

* dodojr ready

* correct actor struct

* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c

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

* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c

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

* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c

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

* builds OK now

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-31 14:59:50 -05:00
Tharo
3e322f5d35
ovl_En_Sa (#625)
* Decompiled

* Add missing sfx id name

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

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 14:35:58 -05:00
Tharo
31b0ea2db8
ovl_En_Du (#630)
* Decompiled

* asm

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 14:01:16 -05:00
Lucas Shaw
6fd644dff5
libm.s -> ll.c (#661)
* .

* remove tools/ZAP2 from origin master

* libm.s -> ll.c

* fix progress.py (i think?)
2021-01-31 13:27:50 -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
engineer124
9f3e8cbf97
En_Fz Freezard (#519)
* En_Fr 47 of 48 func decomped

* En_Fz Frezzard 26/36 func decompiled

* En_Fz Freezard fully decomped

* revert EnFr to independently submit EnFz

* EnFz fully decompiled

* more cleanup

* pr feedback

* pr feedback

* petries review

* asm

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31 18:47:34 +01:00
EllipticEllipsis
c2b5ae3ed2
EnTr, 1 nonmatching, mostly documented (#621)
* 2 functions left, data imported

* one function left

* setup for NON_MATCHING

* struct variables named

* most of the functions named, type enums

* delete ASM

* Actor fixes
2021-01-31 00:07:58 -05:00
petrie911
9607ce34fd
object_torch2, object_blkobj, and object_geldb (#592)
* objects are fun

* more objects

* again

* fixes to geldb

* one more thing

* forgot s

* type fix

* some formatting

* change Gerudo 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"

* organize xmls

* outname

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-30 14:16:18 -05:00
AdamKiddle
3db87244b4
EnTrap OK (#615)
* Manual migration of work to new branch due to screwing up git

* removing unused asm

* formatting

* Fixing a comment

* Adding a missing sound define
2021-01-30 13:29:37 -05:00
petrie911
6f6270100b
En_Horse_Game_Check (#619)
* stuff

* name functions

* whoops

* horse head

* matched and documented

* merge actor

* relocs

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-30 13:17:43 -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
84195fcef6
Bg_Spot06_Objects OK and documented (#605)
* stuck on init

* init matches

* more functions matched

* just a few functions left

* three functions left

* all finished

* fix compiler error

* various improvements

* add actor description

* remove unused asm

* fix remaining dyna things

* Update src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

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

* Update src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

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

* fixed all of roman's comments

* format c files

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-22 19:55:38 -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
Roman971
70a3acf111
Match Player_Init (player_actor OK) (#651) 2021-01-21 08:48:21 -05:00
EllipticEllipsis
0e76c84c45
EnMThunder, 1 nonmatching (#604)
* Data migrated, all but Draw matched

* Draw likely equivalent
but serious regalloc issues,
and that last Gfx_TwoTexScroll is being very stubborn

* Merge remote-tracking branch 'upstream/master' into Thunder

* some improvements, set up to PR as nonmatching

* spec

* corrected header

* added function to functions.h

* delete asm

* Added new collider init

Co-authored-by: fig02 <fig02srl@gmail.com>
2021-01-21 00:47:38 -05:00
maekclena
d2563b3b91
ovl_En_Hy (#602)
* ovl_En_Hy

* Remove extra EOL

* Rebase + PR review
2021-01-20 13:28:04 -05:00
petrie911
cb9d85de34
relocs (#645)
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-18 19:15:04 -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
gamestabled
ed4d8af39e
Shopnuts (#577)
* matched functions, still need data

* shopnuts OK

* cleaned up some things in hintnuts by comparing to shopnuts

* merge with new animation stuff

* fixing merge 2

* suggested changes

* missed a DECR

* suggestions
2021-01-15 16:00:01 -05:00
petrie911
11a021a9a5
En_Honotrap (#580)
* a good start

* match

* docs

* slight error

* to Link

* fixes

* format

* come on formatter

* Update src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c

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

* Update src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c

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

* Update src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c

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

* Update src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h

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

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-14 15:19:28 -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
petrie911
fcc4a8190d
En_Sda (#581)
* match

* bug note

* textureblock

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-14 15:14:55 -05:00
EllipticEllipsis
65e956a272
DemoExt OK and documented (#586)
* OK

* all functions and variables named

* delete asm

* data inlined

* Merge remote-tracking branch 'upstream/master' into demo_ext

* addressed review comments

* formatter

* addressed review comments
2021-01-14 14:28:36 -05:00
Tom Overton
3b4a1c23d6
z_obj_kibako2 (large wooden crate) OK (#582)
* Migrate data to C

* Partially decompile Init

* func_80B959D0 OK

* ObjKibako2_Destroy OK

* ObjKibako2_Update OK

* ObjKibako2_Draw OK

* func_80B95CA4 OK

* ObjKibako2_Init OK

* func_80B95DFC

* func_80B95ED4 OK

* func_80B95A28 OK

* Name functions

* Delete unused asm and update spec

* Fixup math post rebase

* Name statics

* Clean up variable names

* Run formatter

* xzDistFromLink -> xzDistToLink

* Respond to feedback in ObjKibako2_Break

* Type sp2C as a CollisionHeader* and initalize it when declaring it

* Respond to remaining review feedback

* Respond to review feedback from Roman
2021-01-14 13:22:48 -05:00