1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Commit graph

958 commits

Author SHA1 Message Date
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
Roman971
97f80eeb3f
Update asm_processor and use static variables in En_Torch2 (#740)
* Update asm_processor to current master

* Update variables in En_Torch2 to actually be static

This is now possible because asm_processor was updated to handle static symbols in GLOBAL_ASM

* Update tutorial to reflect changes about static symbol limitations
2021-03-27 16:26:59 -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
d141e39e77
Finished decomp of code_800F7260 (1 non-matching) (#733)
* improved match

* decomped

* I dunno

* matched

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-27 21:01:50 +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
Roman971
8b57f36d32
Update Jenkins links in README (#738) 2021-03-26 02:57:07 +09: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
effd4256c9
Tutorial docs (#715)
* Move tutorial into docs folder

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

* Object decomp added

* contents and intro updates

* mention object decomp in beginning

* Addressed Fig's review

* Update EnSkb to jointTable and morphTable

* minor table tweak

* typo

* Alter to say ZAPD makes the object output folder

* Apply suggestions from code review

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* More review changes

* Apply suggestions from code review

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

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-24 01:15:35 +01:00
Anghelo Carvajal
5562b2ef6f
Fix some fixable warnings (#728)
* Fix setup warnings

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

* Casting the problems away

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

* I don't really like changing the type to void

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

* We're out of EARLY hell

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

* ./format.sh

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

* Change skel type to "Normal"

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

* Changes requested

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

* suggestion of roman

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

* early is back :c

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

* This will be a fix in ZAPD

Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-23 19:45:42 -04:00
Ethan Roseman
9b9a983860
Jenkins refactor (#732)
* Jenkins refactor

* reorder
2021-03-22 21:17:02 -04:00
petrie911
8f0549cd9a
PreRender decomped and equivalent (one small non-matching) (#723)
* now equivalent

* stuff

* remove struct

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-20 15:10:10 -04:00
fig02
493bdbc3c6
git subrepo pull --force tools/ZAPD (#727)
subrepo:
  subdir:   "tools/ZAPD"
  merged:   "4751db5c9"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "4751db5c9"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2021-03-20 12:02:12 -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
Anghelo Carvajal
867b5a87ba
Add distclean rule to makefile (#716)
* Add clean_everything rule to makefile

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

* change `clean_everything` to `distclean`

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

* Somehow forgot to commit the makefile

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

* Remove nuke

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

* Remove redundant variables

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

* Forgot to remove `TEXTURE_DIRS`

Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-14 12:07:46 -04:00
fig02
42af56b231
git subrepo pull --force tools/ZAPD (#718)
subrepo:
  subdir:   "tools/ZAPD"
  merged:   "4bf6600a3"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "4bf6600a3"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2021-03-14 11:40:25 -04: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
Zelllll
c47372d397
Update z64actor.h (#710) 2021-02-24 22:37:20 -05:00
Zelllll
e0bab1163e
lifemeter fixes (#709) 2021-02-24 15:42:25 -05:00
Roman971
d30ef91417
Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -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
Roman971
55ae8ad741
Minor gfx cleanups in some actors (#706)
* Minor gfx cleanups in some actors

* Fix frustum names
2021-02-17 19:06:07 -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
Synray
79c8accfab
z_play.c OK (#701)
* z_play.c OK

* Change ~0x13 -> -20

* Back to hex
2021-02-15 18:29:06 +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
Tharo
f9d96d9f73
Fix most compiler warnings in the boot and code segments (#674)
* Less warnings in boot & code segments

* few more warnings gone

* Ran formatter

* z_view warning gone

* -> 1

* f31 -> 31

* Remove function casts

* Few more small improvements

* Separate declaration and assignment in func_80091738 and Item_Give

Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-13 19:49:40 -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