1
0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 12:54:51 +00:00
Commit Graph

843 Commits

Author SHA1 Message Date
fig02
04ea6b1395
Quick type fix (#644)
* quick fix

* functions.h
2021-01-18 16:36:41 -05:00
fig02
00a5edea71
Actor Struct Changes (and a few related things) (#617)
* reformat header

* type -> category

* done for now i think

* some more stuff

* first -> head

* focus

* flag comment

* ground -> floor

* remove asm, name wrapper funcs

* name func, format

* review

* targetPriority, format

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

* comment

* review

* feet flags

* horse shadow
2021-01-18 16:04:04 -05:00
zelda2774
20206fba0d
Fix non-matching in audio_heap (#640)
Co-authored-by: zelda2774 <zelda2774@invalid>
2021-01-17 21:31:47 -05:00
petrie911
02994f5339
Document Collision_Check (#468)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* some decomp

* still playing around with this

* rename functions

* ZAP again

* ZAP again

* the renaming begins

* more renaming. hopefully didn't break anything

* change all the things

* this and then merge

* and done

* one little thing

* small docs, small rename

* changed mind on cylinder and quad elements

* something

* more stuff

* more docs

* more adjustments

* Fixed some types

* more fixes

* all sorts of cleanup

* now with flags

* match!

* names and such

* update tools

* damage tables

* ColChkInfo

* one more thing

* formatting

* more formatting

* anime merge

* some stuff

* damage table

* again

* changes

* .s

* changes

* oc2 type

* a couple things

* format

* un-name magic arrows, not enough proof yet

* fix damage table script and remove old one

* EnAObj

* changes

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-17 21:13:36 -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
AdamKiddle
9be264da9d
TwoHeadArena Cleanup (#633)
* TwoHeadArena cleanup

* remove params

* remove params

* prettying up the struct a little

* remove unecessary cast
2021-01-15 17:18:15 -05:00
silv3rwing07
447c6514b9
Fixed descriptions of Zelda's Lullaby, Song of Time, and Scarecrow's Song effect actors (#579)
* Fixed descriptions of Zelda's Lullaby, Song of Time, and Scarecrow's Song effect actors

* Added enums for song types

* fixes

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-15 16:50:44 -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
Anghelo Carvajal
9c2ad0c60b
fixbaserom.py: Add support to v64 format and improve performance (#629)
* Add byte swap for v64 files

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

* Reduce `len` function calls

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

* Optimze a bit the byte-swapped v64 format

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

* Strip the overdump before doing the byte-swap

The previous way wasted time by byte-swapping data that would be discarded anyway.

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

* Swap twice the bytes per cycle to improve performance

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

* Read and write 16 bytes at a time and specify explicit endianness

Reading more bytes per cycle allow to speed up the swapping proccess

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

* Add v64 compatibility in the Readme

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

* Read whole file as little endian and write it as big endian without the loop

Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-14 15:14:33 -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
EllipticEllipsis
3e5f6b3485
EnWood02 OK (#578)
* OK, some documentation

* delete asm

* dists updated

* addressed review comments

* one more comment

* remove one comment

* addressed review comments
2021-01-14 12:58:17 -05:00
petrie911
d8f146519c
Fix LoadTextureBlock/LoadTextureTile combined macros and z_fbdemo OK (#623)
* first pass

* match z_fbdemo

* .s

* Update src/code/gfxprint.c

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-12 23:59:23 -05:00
Roman971
a22b6a22e8
Remove unused _SHIFT define to avoid permuter issues (#626) 2021-01-12 22:59:57 -05:00
Synray
6e278847c9
z_lifemeter OK (#622)
* z_lifemeter OK

There were a few versions that matched, so the duplicate `ddfactor`
might be fake. The `if (interfaceCtx)` at the start seems to be required.

I think `sHeartsPrimFactors[0]` vs `sHeartsDDPrimFactors[ddtype]` is
real, because the asm loads `sHeartsDDPrimFactors` for each access,
while it only loads `sHeartsPrimFactors` once. It could have something
to do with `reduceixa` in uopt.

* Make vars function-static

* Fix names
2021-01-12 22:08:56 -05:00
Lucas Shaw
a169932c75
Gameplay_Init matched (#585)
* Gameplay_Init ok

* add (void)0 to prevent warnings in gameplay_init

* update nigthflag

* .

* remove tools/ZAP2 from origin master

* made suggested change

* made sgugested changes
2021-01-12 20:02:56 -05:00
Zelllll
a0e2ce7211
Cleanup z_lifemeter (#552)
* z_lifemeter cleanup finished, one non-matching

* made Health_UpdateData a bit better, nowhere near matching still

* lifemeter done for now

* fixed define issue

* improve z_lifemeter, still doesn't match

* z_lifemeter done

* Rename functions

* Add files via upload

* Update Health_Update.s

* fix missing symbols in asm file

* Update Health_Update.s

* Update Health_Update.s

* fixed stuff

* Add files via upload

* Delete Health_Update.s

* Rename things according to Roman's suggestions

* lifemeter done hopefully

* fix unused asm that for some reason didn't merge

* fix feedback

* compiles right now

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2021-01-10 16:33:58 -05:00
Ethan Roseman
bda5b83346
MacOS ZAPD fixes (#606)
* Adding -Wno-return-type to GCC check for MacOS

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0325ec161"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0325ec161"
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:   "605f6972e"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "605f6972e"
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:   "6e6ad445a"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "6e6ad445a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Rewrote func to avoid returns without values
2021-01-10 04:04:36 -05:00
petrie911
115c152b03
Some cleanup and docs for z_skelanime (#601)
* docs and enums

* bgcheck merge

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-09 17:07:17 -05:00
Synray
7a171488d2
bgcheck OK (#613)
* bgcheck OK

* Remove comments
2021-01-08 22:14:43 -05:00
fig02
1ff2f0f849
ZAPD update (#612)
* remove roompoly

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "fd4d53a26"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "fd4d53a26"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2021-01-08 19:38:28 -05:00
Roman971
5c6335f9fb
Remove touchasset.py to improve build performance (#611) 2021-01-08 17:42:05 -05:00
mzxrules
3cef03f5ff
z_bgcheck.c, 800430A0.c, 80043480.c (#256)
* beginning of migrating changes

* got matching

* changed order a bit

* clean up bgcheck

* fix conflict

* fix conflict again

* first stab at identifying types, some oks

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

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

* couple more OKs

* pushing some OKs

* fix compilation issues

* code_800430A0.c OK, more files decomp'd

* 8003A3E0 big OK :)

* Decomp most of func_8003C614, decomp helper funcs

* Decomp SurfaceType, CamData, and WaterBox property related functions

* more OKs, big OK in 8003C078

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

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

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

* data migrated, more OKs

* 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled

* func_80040284, 800409A8 non_matching, add IS_ZERO macro

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

* More OKs, non-matching code cleanup

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

* format z_bgcheck.c

* fix warnings, compile errors on NON_MATCHING

* func_8003EE80 is now NON_MATCHING

* begin documenting some functions

* formatting

* more documentation, func_8003A95C OK

* fix PHYSICAL_TO_VIRTUAL changes

* fix var rename

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

* func_8004239C ok, more NON_MATCHING improvements, more documentation

* Implement most suggested changes

* Convert comments to slower comments

* /**

* Implement ZAP2 changes

* my anti-virus ate my format.sh results

* Rename a couple hundred functions, fix minor stuff

* rename var so that clang formats correctly

* run format.sh

* implement Petrie's matches/suggestions

* format

* matches

* and the asm

* slight error

* Add SSList

* two more matches

* stuff

* implement code changes

* clean up Petrie's matchings

Co-authored-by: Arthur <arthurtilly413@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-08 06:12:58 -05:00
notyourav
209f0d21b8
En_Toryo OK (#569)
* En_Toryo OK

* en_Toryo fixes

Co-authored-by: fig <fig02srl@gmail.com>
2021-01-07 14:10:15 -05:00
Tharo
2a13d71848
Highscores array (#600)
* Highscores

* Review suggestions

Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-01-05 14:57:18 -05:00
Tharo
510b3c4bd5
ovl_En_In OK (#545)
* Initial progress

* Further progress

* One nonmatching left

* Fix merge

* OK

* Cleanup

* Remove unused asm

* Use generated reloc

* nightFlag changes and requiredObject -> objectIdx

* Some suggestions

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

* Revert nightflag changes, early return after Actor_Kill, objectIdx -> ingoObjBankIndex

* Fix accidental nightFlag change in z_sram

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-04 14:52:36 -05:00
petrie911
8cd367c43b
Automatic object xml creation (#596)
* new tool

* fixes

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-04 12:06:51 -05:00
fig02
794538f6f7
ZAPD hotfix (#599)
* change parent

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "440ed2684"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "440ed2684"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2021-01-03 17:29:44 -05:00
Blackop778
2b346a1f6a
Update diff script to 9ce8fae (#589) 2021-01-03 15:29:01 -05:00
fig02
ba0c6965ca
Remove submodule and use subrepo for ZAPD (#591)
* remove zap

* git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD

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

* remove thanks.md

* zap2 -> zapd and spec changes

* remove submodule init
2021-01-01 23:24:29 -05:00
gamestabled
ae5a8f2700
Shabom OK (#571)
* 2 nonmatchings left

* shabom OK

* suggested changes

* more suggested changes
2021-01-01 19:56:57 -05:00
petrie911
7daadc5ea1
En_Ex_Item (#567)
* first go

* match

* vt

* docs

* one last thing

* formatted

* bowling, why not

* header

* Update src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h

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

* Update src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c

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

* press FFFF

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-31 19:56:02 -05:00
AdamKiddle
600bad1f20
En_Tite OK (#555)
* EnTite_Update matching

* Fixes to update

* made good progress, func_80B1A2A0 is in a good place to be matching soon

* Merge stuff

* func_80B19E94 done, func_80B18CC4 done

* EnTite_Destroy and EnTite_Init done

* Commenting out sDamageTable and EnTite_Init until all the data matches

* Some more small functions done

* more progress

* func_80B19918 done

* func_80B18E7C done

* func_80B19524 done

* more progress

* EnTite_Draw equiv but nonmatching, file otherwise done

* Found some unstaged changed on old laptop

* Draw matching: File fully matching!

* Documentation

* finished documentation

* deleted data files

* update spec

* fixed waterY -> yDistToWater rename after merge

* ran format.sh

* fixing accidental renames in camera

* Fixed some obvious number/comment formatting issues

* Removed unecessary prototypes

* merge

* running format.sh

* suggestions

* more pr comment changes

* format to push

* one more change

* more renames (see pr comments)

* merge

* renames

* format.sh

* fix renames

* function comment formatting

* merge + format

* endless merge fixes

* merge fixes until  die

* yet again a merge fix

* pr suggestions
2020-12-31 15:00:30 -05:00
mnzlmstr
5a2bd7a035
z_bg_bombwall OK (#506)
* Update spec

remove z_bg_bombwall.o from spec

* Update z_bg_bombwall.h

updated actor struct

* Update z_bg_bombwall.c

* Delete BgBombwall_Destroy.s

no longer needed

* Delete BgBombwall_Draw.s

no longer needed

* Delete BgBombwall_Init.s

no longer needed

* Delete BgBombwall_Update.s

no longer needed

* Delete func_8086E7D0.s

no longer needed

* Delete func_8086E850.s

no longer needed

* Delete func_8086EAC0.s

no longer needed

* Delete func_8086EB5C.s

no longer needed

* Delete func_8086ED50.s

no longer needed

* Delete func_8086ED70.s

no longer needed

* Delete func_8086EDFC.s

no longer needed

* Delete func_8086EE40.s

no longer needed

* Delete func_8086EE94.s

no longer needed

* Update spec

update path to reloc

* Delete z_bg_bombwall.data.s

no longer needed

* Delete z_bg_bombwall.reloc.s

no longer needed

* Update spec

fix path to reloc of bombwall

* Update z_bg_bombwall.c

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-30 11:36:17 -05:00
Zelllll
257fc54195
Bg_Hidan_Hamstep OK (#544)
* BgHidanHamstep 7/15

* 9/15 matched

* hamstep 14/15

* cleanup

* fix not OK

* fix ctrl+f mistake

* All functions OK

* cleanup

* Update z_bg_hidan_hamstep.c

* Update z_bg_hidan_hamstep.h

* fix math

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-12-29 22:48:57 -05:00
petrie911
1facd83c38
jpegdecoder OK (#574)
* new match

* and the .s

* merge

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 22:45:01 -05:00
Zelllll
dd38520a9e
Obj_Mure2 (one non-matching) (#550)
* objmure2 about halfway

* all decompiled, one non-matching

* some documentation

* mure2 done, one nonmatching

* Update spec

* Update z_obj_mure2.c

* Update z_obj_mure2.c

* Add files via upload

* fix formatting

* Fix fake match

* Changed data formatting

* More formatting changes

* fixed name of var

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-12-29 20:14:04 -05:00
Zelllll
8f3dc3db94
Bg_Hidan_Kowarerukabe OK (#562)
* 10/12 functions decompiled and matched

* 12/12 matched

* file done

* kowarerukabe OK

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

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

* hopefully fixed build issue

* OK now

* Fix new math function names

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
2020-12-29 20:13:38 -05:00
petrie911
c71b8183ae
Bg_Haka_Gate (#557)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* match

* sfx fix

* should be good to go

* comments and such

* Matrix macros escape me

* format

* fix bubble

* remove comments

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

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* matching

* more stuff

* names

* names and formatting

* vt

* header

* adjusted gfx

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 18:28:50 -05:00
petrie911
2dfa188706
Docs for the Anime part of SkelAnime (#517)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* more names

* so many names

* we got subsystems now

* slight cleanup

* merge part 2

* new naming scheme

* slight adjustment

* no limit

* syms maybe

* step one

* OK, it's fixed

* table

* some names and such

* comments**

* update zap

* gitkeep to please jenkins

* ZAP

* fixer

* fixer2

* fixer3

* zap

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig <fig02srl@gmail.com>
2020-12-29 17:46:46 -05:00
petrie911
e4d88bf942
En_Bb (Bubble (flying skull)) (#551)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* bubbles!

* match

* stuff

* more names

* let's go

* SFX error

* fixes

* also formatting

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

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

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

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

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

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

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

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

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

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

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

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

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.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>
2020-12-29 16:06:20 -05:00
petrie911
94d51ce86f
Bg_Mizu_Bwall (#543)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* bwall

* cleanup

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 13:35:01 -05:00
petrie911
9fcf8a4430
En_Bw (Torch Slug) (#537)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* slug-o-cola

* sfx macros

* Matched

* this will have to do

* well maybe a little more

* good enough
2020-12-29 13:32:32 -05:00
petrie911
695bc37be4
Bg_Gnd_Iceblock and Bg_Ice_Objects (sliding ice blocks) (#534)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* a good start

* done

* Log

* formatting

* thisx

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 13:11:11 -05:00
EllipticEllipsis
21e367a7cb
Bigmirror OK and documented (#530)
* OK

* documented (with one odd float value)

* delete asm and alter spec

* uniformise spawn data to sIsSpawned,
fix compile warnings in Bg_Jya_Lift and Bg_Mori_Elevator

* translate last printf

* re-delete modified asm

* addressed review comments

* remove outdated comment

* addressed comments, made defines

* untrack scenes dir

* remove scenes dir
2020-12-29 03:50:56 -05:00
Tharo
b50e079e1b
Decompile z_skin.c (#548)
* z_skin progress

* Some more progress

* Some real progress

* Decompiled, 1 nonmatching

* Remove unused asm

* pad -> D_80160FC0

Co-authored-by: Thar0 <maximilianc64@gmail.com>
2020-12-29 00:30:23 -05:00