8e6843f04e
DmChar08 OK ( #1085 )
...
* progress
* progress
* about to merge data. probably a bad idea
* matches with ZAPD
* docs
* done for now
* progress
* about to merge data. probably a bad idea
* matches with ZAPD
* docs
* done for now
* Fix makefile and add non matching to spec
* did some git stuff
* Git being a problem as usual
* format
* PR fixes
* PR fixes
* PR fixes
* Merge master and fixes
* going to merge play
* merged in the big one
* docs
* PR fixes
* format
* Clean up
* transition
* Better init
* Glitchy animations
* PR
* Format
* PR comments
* Missed one
* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* fix conflicts
* Fix conflicts
* format
* PR
Co-authored-by: louist103 <louist103@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-10-06 21:46:58 -03:00
4833c08364
ovl_Oceff_Storm OK ( #1010 )
...
* all functions matching
* all functions matching
* all functions matching (for real this time)
* data extracted and imported
* ovl_Oceff_Storm OK
* reloc
* pr review
* texture name
* renamings
* renamings
* Magic_Reset
* pr review
* gSPTextureRectangle
* pr review
2022-10-04 05:03:53 +01:00
1be5a7d2c7
ovl_Oceff_Wipe5 OK ( #1011 )
...
* progress
* progress
* ovl_Oceff_Wipe5 OK
* Co-authored-by: Derek-Hensley hensley.derek58@gmail.com
* Co-authored-by: Synray synray@users.noreply.github.com
* Co-authored-by: darkeye darkeye@users.noreply.github.com
* pr review
* pr review
* Magic_Reset
* fixes
2022-09-30 16:37:01 +01:00
6ff53e448b
ovl_Oceff_Wipe OK ( #1008 )
...
* ovl_Oceff_Wipe Decompiled
* format
* format
* pr review
* renaming
* renamings
* renamings
* magic
* pr review
2022-09-30 15:50:59 +01:00
363a7cda46
ovl_Oceff_Wipe4 OK ( #1007 )
...
* ovl_Oceff_Wipe4 decompiled
* pr review
* renamings
* renamings
* Material -> Model
* pr review
* Magic_Reset
2022-09-27 03:35:50 +01:00
62502ac22f
Document object_mtoride (Woodfall scene objects) ( #1062 )
...
* Name everything in object_mtoride
* Get ready for PR
* Update some of the names
2022-09-24 15:21:01 -03:00
aa6841a33b
ovl_Oceff_Wipe2 OK ( #1006 )
...
* ovl_Oceff_Wipe2 Decompiled
* pr review
* renamings
* renamings
2022-09-14 13:21:02 -03:00
33f7ede84f
ovl_Oceff_Spot OK ( #1004 )
...
* ovl_Oceff_Spot decompiled
* format
* renamings and pr review
* pr review
* pr review
2022-09-14 13:07:46 -03:00
e47dc7da25
ovl_Oceff_Wipe3 OK ( #1001 )
...
* all functions matching
* ovl_Oceff_Wipe3 decompiled
* bss
* pr review
* pr review
* renamings
* pr review
2022-09-14 12:57:47 -03:00
4b545bc259
ovl_Oceff_Wipe7 OK ( #1009 )
...
* progress
* ovl_Oceff_Wipe7 OK
* pr review
* format
* renamings
2022-08-15 14:27:30 -04:00
dbe98b9776
Document powder keg assets ( #967 )
...
* Document powder keg assets
* Add "barrel" to one of the asset names
* Update variables.txt
* ptr -> fuseSegmentPtr
2022-08-07 19:38:37 -04:00
bc3883d098
Effect Fhgflash OK ( #975 )
...
* OK
* format
* extract tex explicitly
* FHGFLASH_SHOCK_NO_ACTOR
* typo
* Hitmark
* sZeroVec
* eff
2022-08-07 19:24:05 -04:00
eff952b944
General Cleanup 8 ( #958 )
...
* EnBigokuta
* EnBji
* Soldiers
* Start harfgibud
* Finish harfgibud
* Pamela
* PametFrog
* format
* bigslime
* bji comment
* PR + small cleanup of Eye Tex anims
* Shikashi
2022-07-23 14:53:06 -04:00
f0e4581e22
ovl_En_Sth2 Decompiled and Documented ( #898 )
...
* ovl_En_Sth2 Decompiled and Documented
* &
* enum
* space
* pr review
* warnings
* pr review
* trailing coma + format
* pr review
* trailing coma
* review
* focusOffset
2022-07-22 04:57:49 +01:00
122e4f3982
Obj_Toudai ( #892 )
...
* Obj_Toudai
* PR
2022-07-11 22:21:04 -04:00
5ffdc0a387
ovl_Obj_Jgame_Light decompiled ( #867 )
...
* ovl_Obj_Jgame_Light decompiled
* xml
* doc
* pr review
* playstate
* playstate
* pr review
* pr review
* missing macro
* pr review
* pr review
* pr review
* pr review
* isOn
2022-07-11 21:30:18 -04:00
07ce7c8ab3
Document object_okuta and ovl_en_syateki_okuta assets ( #804 )
...
* Document object_okuta
* Document ovl_en_syateki_okuta assets
* Leg -> Arm
2022-04-24 17:51:41 +01:00
8a0b0b7ec8
En_Syateki_Okuta (Shooting Gallery Octorok) OK ( #772 )
...
* EnSyatekiOkuta_Init and EnSyatekiOkuta_Destroy OK
* func_80A36260, func_80A362A8, func_80A362F8, and func_80A36350 OK
* func_80A361F4 OK
* Decomp a bunch of functions
* Better match for func_80A368E0
* func_80A36CB0 OK
* Draw functions OK
* All functions OK
* Import data to C
* Use object symbols
* Final cleanup and generated spec
* Remove something I missed
* char -> UNK_TYPE1
* Respond to reviews
* Remove static from unnamed variables, whoops
2022-04-07 19:23:13 +01:00
cabb14e4b7
Obj_Smork ( #758 )
...
* Obj_Smork
* PR
* PR
2022-03-29 21:29:35 +01:00
72265fac92
Obj_Entotu ( #745 )
...
* Obj_Entotu
* Time macro
* PR
* Merge
2022-03-29 18:56:20 +01:00
02cb971616
En_Gakufu OK and Documented + Related Audio Functions ( #662 )
...
* Gakufu OK, copy progress from audio WIP
* Extraction
* import wip in prep for audio data import
* Add in `code_8019AF00.c` functions
* Finish docs
* Spacing
* Add enum
* Many PR suggestions
* Another enum
* PR Suggestions
* Fix bss
* Move comment higher
* Fix bss
Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 11:52:43 -03:00
7d4aaef0cd
Fire and Light arrows ( #710 )
...
* fire arrow OK
* Light arrows OK
* Format
* Assets
* Mtx Mode
* PR fixes
* pr fixes
* Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
* Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
2022-03-26 02:51:41 +00:00
36e48fcd91
En_Tanron1 ( #708 )
...
* En_Tanron1
* PR
* Fmt
* PR and match (thanks petrie)
2022-03-26 02:33:02 +00:00
7c624422de
En_Horse_Game_Check ( #706 )
...
* En_Horse_Game_Check
* PR
2022-03-26 02:16:28 +00:00
844b5efb6f
En_Sda ( #691 )
...
* En_Sda
* Format hello?
* PR
2022-03-26 01:33:42 +00:00
ce7aa87454
Oceff wipe6 ( #686 )
...
* Uncorrupted; Not OK
* Merged upstream -- actually OK
* Update assets/xml/overlays/ovl_Oceff_Wipe6.xml
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* - Removed Extra 0 characters; clang-format-11
* Removed new warnings.
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-03-24 23:45:37 -03:00
9a54ec9e0b
En_Bombers ( #684 )
...
* En_Bombers
* No need for this >:
* Override
* PR
2022-03-24 23:21:14 -03:00
49aeece9ee
Obj_Grass ( #617 )
...
* Obj_Grass
* PR
* PR
* PR
* Match (thanks Synray)
2022-03-24 21:20:21 -03:00
040db7ac40
En_Mm3 ( #671 )
...
* En_Mm3
* PR
* Merge
2022-03-05 12:57:38 -03:00
717adf8ed8
En_Sth ( #625 )
...
* En_Sth
* Skull tokens
* PR
2022-02-19 20:49:57 +00:00
e2d546c8f0
En_Bom_Bowl_Man ( #616 )
...
* En_Bom_Bowl_Man
* sAnimations
* Fixup data
* PR
2022-02-19 20:45:21 +00:00
2d6a74c0aa
Dm_Char01 ( #589 )
...
* Dm_Char01
* Merge
* Extract verts
* PR
2022-02-19 19:11:13 +00:00
009ad45f48
Add comment to Arrow_Ice xml and update DL names ( #605 )
...
* Add comment to Arrow_Ice xml and update DL names
* Update asset names
* Improve texture names
2022-02-14 00:14:58 +00:00
6d52cee5fe
En_Bom ( #537 )
...
* Broken
* En_Bom
* PR
* PR
* Merge
* PR
2022-01-18 22:19:15 -05:00
816971d98c
En_Kanban (1 non-matching) ( #419 )
...
* En_Kanban
* PR
* PR
* Object
* undef
* PR
* Merge
* Merge
* Merge
2022-01-12 15:37:26 +00:00
de61e04312
EnMm2 OK ( #492 )
...
* all matching except draw
* all matching
* done except importing data
* data extracted
* added xml for asset extraction
* clang format
* remove global_asm macros
* bit of documentation
* format
* use THIS macro
* remove unnecessary &
* space between vars and code
* feedback
* use OPEN_DISPS, CLOSE_DISPS, and POLY_OPA_DISP++ macros
* remove comment
* use matrix macros
* change comment format
* change comment format
* rename assets in xml
* fix indent
2022-01-04 04:56:35 +00:00
4ee7dc1da6
En_Bomjima (1 non-equiv) ( #433 )
...
* En_Bomjima
* Damn caps
* PR
* PR
* undef
* PR
2022-01-04 03:57:40 +00:00
f19571dfcd
Bigslime OK and Documented ( #361 )
...
* git subrepo pull tools/asm-differ --force
subrepo:
subdir: "tools/asm-differ"
merged: "d218cdf0"
upstream:
origin: "https://github.com/simonlindholm/asm-differ.git "
branch: "main"
commit: "d218cdf0"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/graphovl --force
subrepo:
subdir: "tools/graphovl"
merged: "f5fe93d7"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git "
branch: "master"
commit: "f5fe93d7"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "e7a8a48c"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "e7a8a48c"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Bring Bigslime over from old branch
* Format
* Improve docs
* format
* More cleanup
* Fix Zero Vectors Name
* Improve docs
* Spelling/Grammar
* Small typo
* Extra space
* Fix zapd merge conflict
* tab
* Fix remaining names
* format
* Better documentation
* format
* fix
* Add names to identity matrices
* Minor Cleanup
* easier to read comments
* Another touch-up
* Missed a spot
* one more...
* typo
* Another typo
* Fix merge master, fix EnBigslime_ApplyDamageEffectBigslime
* PR Feedback
* Fix variable
* Add in gZeroVec3f in new prs
* Fix gZeroVec3f
* gZeroVec3f
* PR Feedback, move lots of static data inside functions
* Use z_actor decomp of `func_800BE680` for better macro name
* Naming gone wrong, but fixed now
* Fix dList
* Add an extra line of docs about shadows for a function
* dList -> shadowDList
* Next round of PR feedback
* Document object file, still need to double check some
* Small cleanup
* Improve and fix many docs, unname unknown material texture
* format
* Oops
* Clean up blobs from object file
* Aha! I finally get what's going on
* Remove Bigslime undefined_syms
* Remove more undefined symbols
Co-authored-by: Angie <angheloalf95@gmail.com>
2021-12-27 04:24:45 +00:00
5b7fb5bfde
En_Bomjimb ( #461 )
...
* En_Bomjimb
* PR
* PR
2021-12-27 02:14:19 +00:00
a3478c4056
En_Tru (1 non-matching) ( #325 )
...
* En_Tru
* Fixups
* PR
* The meme
* I rebased by accident sorry
* Add object memes
* Type
2021-12-22 16:25:00 +00:00
b2747aa8b4
Subrepos updates ( #360 )
...
* git subrepo pull tools/asm-differ --force
subrepo:
subdir: "tools/asm-differ"
merged: "d218cdf0"
upstream:
origin: "https://github.com/simonlindholm/asm-differ.git "
branch: "main"
commit: "d218cdf0"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/graphovl --force
subrepo:
subdir: "tools/graphovl"
merged: "f5fe93d7"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git "
branch: "master"
commit: "f5fe93d7"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "e7a8a48c"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "e7a8a48c"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/graphovl --force
subrepo:
subdir: "tools/graphovl"
merged: "d14ea084"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git "
branch: "master"
commit: "d14ea084"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "e243634e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "e243634e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/decomp-permuter --force
subrepo:
subdir: "tools/decomp-permuter"
merged: "d1294dfa0"
upstream:
origin: "https://github.com/simonlindholm/decomp-permuter.git "
branch: "main"
commit: "d1294dfa0"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/graphovl --force
subrepo:
subdir: "tools/graphovl"
merged: "f5fe93d75"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git "
branch: "master"
commit: "f5fe93d75"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "d0cd6b397"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "d0cd6b397"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* add ExternalXMLFolder config
* git subrepo pull --force tools/decomp-permuter
subrepo:
subdir: "tools/decomp-permuter"
merged: "a20bac942"
upstream:
origin: "https://github.com/simonlindholm/decomp-permuter.git "
branch: "main"
commit: "a20bac942"
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: "4f7b8393e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "4f7b8393e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull --force tools/asm-differ
subrepo:
subdir: "tools/asm-differ"
merged: "f30d43ace"
upstream:
origin: "https://github.com/simonlindholm/asm-differ.git "
branch: "main"
commit: "f30d43ace"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Remove Segment="128"
2021-10-24 13:04:36 -03:00
fbd1a79942
Arrow_Ice OK ( #314 )
...
* Migrate data and ArrowIce_Init OK
* ArrowIce_Destroy OK (also define func_80115D5C in functions.h, maybe a bad thing???)
* ArrowIce_SetupAction OK
* func_809224DC OK
* ArrowIce_Update OK
* func_809227F4 OK (but with hacky float constant)
* func_809225D0 OK and use float constant in func_809227F4
* func_80922628 OK
* ArrowIce_Draw OK
* Migrate D_80924200.s to C
* Apply better names in ice_gfx, and document Draw slightly
* Name struct vars to match OoT
* Update function names to match OoT
* Explain that arrow's timer and hitFlags came from OoT
* Update spec + "migrate" bss to C
* Do a hex -> decimal conversion I missed
* Remove blank line in-between headers
* Remove extraneous forward declare
* Move initialization of arrow up one line
* Remove parentheses
* Use else if
* Use decrement operation
* Use decimal for an alpha calculation
* Switch func_80115D5C to take GameState*
* Put pad on the top of Draw
* Move initialization of arrow up (again)
* Early return from Update if we're killed
* Extract assets instead of putting them in the repo
* Add explanatory comment to top of file
* += 1 -> ++
* Use VEC3F_LERPIMPDST macro
* Force a jenkins rerun by adding a space
* Remove the space from the last commit
* Move literal to the back of the conditional
* Respond to review feedback
* Add ArrowIce_LerpFiredPosition to functions.txt
2021-09-30 10:34:45 -03:00
6fb180d0e1
En_Holl (Loading Halls/Holes) OK and mostly documented. ( #270 )
...
* EnHoll_Destroy() matching.
* EnHoll_Update() matching.
* EnHoll_Draw() matching and mostly documented.
* func_808999B0() matching and mostly documented.
* En_Holl OK (some asm remains)
* Renamed macros.
* func_80899B88 matching, but control flow could use some work.
* Got rid of GOTO in func_80899B88.
* Removed as many returns and magic numbers as currently possible.
* Renamed previous two functions to EnHoll_ChangeRooms and
EnHoll_VisibleIdle.
* EnHoll_SetAlwaysZero matching.
* EnHoll_TransparentIdle matching.
* func_8089A0C0 matching and mostly documented.
* func_8089A238 matching and mostly documented.
* Deleted last GLOBAL_ASM pragma.
* Final documentation for En_Holl PR.
* Switched spec to generated reloc.
* Clean up macros.
* Rename functions.
* Simplify name of ActionFunc array.
* Renamed globalCtx->unk_18878 to bgCoverAlpha.
* Ran format.sh.
* Added c file header.
* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c
add trailing comma to sActionFuncs[]
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c
replace UNK_TYPE with s32.
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Run format.sh.
* s32 pad and declaration formatting
* Remove comma in EnHoll_TransparentIdle.
* Renamed sThis to sInstancePlayingSound.
* renamed gfxP to dl
* Improved affine transformation documentation.
* ran format.sh
* Updated documentation to be doxygen compatible.
* Extracted assets.
* fix bss
* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c
replace bitmask == 0 with !
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Rename extracted asset variables.
* Renamed argument to macro functions to match .c
* renamed Vertices to Vtx.
* Renamed Vtx and DL.
* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c
Shorten documentation.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Apply suggestions from code review
Newline changes for readability.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c
* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c
Change oldCurrRoom to tempRoom.
* Apply suggestions from code review
engineer124's suggestions
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-09-01 19:39:01 -04:00
b292647ea2
ZAPD update: Gotta go fast! ( #226 )
...
* update extract_assets script
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "820678b4"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "820678b4"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* fixes and rgba16 format change
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6be9af65d"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "6be9af65d"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Update warning counts
2021-07-28 21:55:02 -04:00
9637e19303
EnClearTag OK and documented ( #214 )
...
* merge main
* Match Init
* Clear_Tag OK
* Full documentation
* More docs
* Fix function
* Fix MakeFile for assets and Fix texture swapped names
* Fix name
* Improve name and remove pad
* Can't stop the minor tweeks
* Adding potential Makefile fixes
* Minor name change
* Another name fix... and format
* PR Suggestion & Add Overlay File Description
* Re-documentation to match OoT WIP (more to come)
* Finish docs from OoT
* Fix merge and format
* Minor touch-ups
* Cleaner conditional
2021-07-20 11:07:05 -04:00
Derek Hensley