louist103
f214743494
Fix func_800BC5E0 NON_EQUIVALENT (matched) ( #697 )
...
* mark func_800BC5E0 NON_EQUIVALENT
* fixed
2021-02-13 17:45:00 +01: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 12e0e5d2a6b251f1d234
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
mzxrules
d373661acd
Minor z_bgcheck documentation fixes ( #675 )
...
* Fix minor documentation issues
* Update include/z64bgcheck.h
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-02-12 17:30:21 -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
Chris Teague
bcf2694f93
Make func_800C213C match original ROM ( #678 )
...
* Make func_800C213C match original ROM
The C code for this function was very close to done, and was
functionally equivalent to the ROM. This commit uses a few tricks
to convince the compiler to allocate the same registers as the original
ROM. The two tricks used are:
1. Introduced a new temporary variable "yinc".
2. Added a "do while(0) {}" line in two places.
Both of these ideas came from the decomp-permuter tool. I took the
do/while idea and guess as to what it might have been in the original
code. I imagined that the "do while(0) {}" was probably left over from
a standard multi-line macro, which for some reason had an empty body.
I further suggest that maybe the empty body is because it was a feature
compiled out during RELEASE builds - perhaps a debug logging macro.
* Use simpler code for func_800C213C
Replaced dummy LOG macro with "do {} while(0);". This version makes
less assumptions about what the original code looked like.
2021-02-12 17:26:42 -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
petrie911
5f552a369c
z_skin OK and z_skin_awb decomped (one barely nonmatching) ( #632 )
...
* skin_awb some functions done
* more matches
* stuff
* matching skins
* closer?
* less skin
* skin
* format
* one thing
* merge actor
Co-authored-by: gns <adamkiddle23@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-02-12 20:41:34 +01:00
Parker Burnett
a30b5bbb26
m2ctx.py fixes ( #681 )
...
* adding a fix to m2ctx and adding argparse
* adding in some print statements
2021-02-11 14:08:24 -05:00
Roman971
f95a5aec68
Various README updates ( #671 )
...
* Update README
* Add shields.io badges in the README
* Add a mention about shiftability in README
* Fix shield json command in JenkinsFile
* Improve progress badge formatting
Now it should show the percentage as 51.2% instead of 51.17%, and 100% instead of 100.00%
2021-02-11 07:10:05 -05: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
Anghelo Carvajal
088e8c09bc
Update regconvert.py ( #666 )
...
* change raw offset to index
Signed-off-by: angie <angheloalf95@gmail.com>
* Rename offset to data index
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* clean up a bit the code
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* add --offset and --hex options
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* add --file flag to automatically convert every gGameInfo index to a macro
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* add --stdout flag
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* Check if index/offset is valid
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* Changes asked by @ethteck
Signed-off-by: Anghelo <angheloalf95@gmail.com>
2021-02-03 14:48:23 -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
02b3640bde
Fix most actor compiler warnings ( #656 )
...
* functions.h
* Bg_Hidan_Kowarerukabe
* Demo_Geff
* Arrow_Fire
* Demo_Sa
* Arms_Hook
* En_Okarina_Effect
* Demo_Im
* Bg_Menkuri_Kaiten
* Bg_Spot09_Obj (minus CollisionHeader)
* Obj_Hsblock
* Obj_Elevator
* En_Anubice_Tag
* Bg_Ydan_Hasi
(minus BgYdanHasi_MoveWater return shenanigans)
* En_Heishi4
* Demo_Go
* Bg_Spot00_Break
* Bg_Hidan_Kousi
* Bg_Spot17_Bakudankabe
* Bg_Spot18_Basket
* En_Dha
* Bg_Jya_Goroiwa
* En_Js
* Bg_Mori_Hineri
* Bg_Spot18_Shutter
* Bg_Jya_Bombchuiwa
* Bg_Bdan_Objects
* Bg_Jya_Amishutter
* Bg_Toki_Swd
* En_Heishi2
* En_Fu
* Bg_Jya_Kanaami
* Bg_Pushbox
* Bg_Spot12_Saku
* En_Ani
* En_Zl1
* En_Vase
* Bg_Spot05_Soko
* En_Crow (and a rename in En_Firefly)
* Bg_Hidan_Fslift
* En_Dog
* Bg_Heavy_Block
* En_Boom
* Bg_Ddan_Kd
* Bg_Spot16_Bombstone
* Demo_Effect
* Bg_Hidan_Syoku
* En_Firefly
* En_Fw
* Bg_Jya_Bombiwa
* En_Fd
* ovl_Bg_Spot15_Saku
* En_Mb
* Bg_Spot18_Obj
* Bg_Zg
* Bg_Bdan_Switch
* En_Md
* En_Box
* En_Bw
* En_Viewer
* En_Hs2
* Bg_Ydan_Maruta
* En_St
* En_Ru1
* Bg_Ddan_Jd
* En_Sb
* Bg_Jya_Cobra
* Bg_Spot12_Gate
* Bg_Haka_Trap
* En_Ms
* En_Kakasi2
* En_Horse_Link_Child
* Obj_Bombiwa
* En_Ds
* En_Kz
* Bg_Umajump
* Bg_Spot03_Taki
* Door_Toki
* Item_Etcetera
* En_Ru2
* En_Niw
* Bg_Spot15_Rrbox
* Demo_Tre_Lgt
* Obj_Oshihiki
* Bg_Mjin
* Bg_Spot18_Futa
* Bg_Spot01_Idosoko
* En_Arow_Trap
* Bg_Mizu_Uzu
* En_Horse_Zelda
* Player
* fix func_800358DC to work in functions.h
* fix fix to functions.h
* enum fixes
* Some review comments addressed
* DynaPoly_GetActor standardisation
* ovl_Daiku_Kakariko
* ovl_En_Vase
* ovl_En_Mk
* ovl_Bg_Spot00_Hanebasi
* ovl_Bg_Spot06_Objects
* ovl_En_Go
* ovl_En_Go2
* ovl_Bg_Jya_Bombiwa
* ovl_En_Cs
* ovl_En_Dodojr
* ovl_En_Ny
* ovl_En_Mm2
* Apply review suggestion
2021-02-02 18:44:24 -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
Anghelo Carvajal
d1a9775926
Improve the get_actor_sizes.py script ( #673 )
...
* the script now should be able to parse the files in the build folder
also added some flags to ignore an actor list and parse the non-matching like before
Signed-off-by: angie <angheloalf95@gmail.com>
* bit of cleanup
Signed-off-by: angie <angheloalf95@gmail.com>
* script to compare the results
Signed-off-by: angie <angheloalf95@gmail.com>
* dont assume every function is in just one file
Signed-off-by: angie <angheloalf95@gmail.com>
* fix qword allign
Signed-off-by: angie <angheloalf95@gmail.com>
* move the csv stuff to a function
Signed-off-by: angie <angheloalf95@gmail.com>
* add flag to export the amount of instructions per function
add examples for how to use the script
fix a bug
Signed-off-by: angie <angheloalf95@gmail.com>
* add include-only flag
Signed-off-by: angie <angheloalf95@gmail.com>
* delete extra file
Signed-off-by: angie <angheloalf95@gmail.com>
* keep functions order
Signed-off-by: angie <angheloalf95@gmail.com>
2021-02-02 13:30:34 -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
