2ff7320409
`ovl_daytelop` OK ( #277 )
...
* eeeee
* nonequivalents
* draw
* Import data
* Match Daytelop_LoadGraphics
* draw kinda better
* extract daytelops and gameover
* SEGMENT_ROM macros
* Use extracted symbols for daytelop
* match Daytelop_Draw
* Fix bss
* draw cleanup
* Daytelop_Update from non equivalent to non matching
* Some renames and spec
* Run formatter
* enum
* sfx
* Use SEGMENT_ROM_START macros everywhere
* more macros
* run formatter
* Add description
* update variables.txt
* Remove extra stuff in gbi.h
* Would this fix it?
* and again
* whoops
* Apply suggestions from code review
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Tharo's suggestions
* match Daytelop_Update
* run formatter
* fix merge issues
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2021-09-22 21:50:35 -04:00
01a6dea813
Update subrepos ( #281 )
...
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "e02e151c"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "e02e151c"
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: "86b1975e"
upstream:
origin: "https://github.com/simonlindholm/decomp-permuter.git "
branch: "main"
commit: "86b1975e"
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: "eb25be94"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git "
branch: "master"
commit: "eb25be94"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull (merge) tools/z64compress --force
subrepo:
subdir: "tools/z64compress"
merged: "98ef0ac2"
upstream:
origin: "https://github.com/z64me/z64compress.git "
branch: "main"
commit: "98ef0ac2"
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: "45cb0d6b"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "45cb0d6b"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/asm-differ --force
subrepo:
subdir: "tools/asm-differ"
merged: "48e675ff"
upstream:
origin: "https://github.com/simonlindholm/asm-differ.git "
branch: "main"
commit: "48e675ff"
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: "3c00dcb3"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "3c00dcb3"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/asm-differ --force
subrepo:
subdir: "tools/asm-differ"
merged: "47c94c99"
upstream:
origin: "https://github.com/simonlindholm/asm-differ.git "
branch: "main"
commit: "47c94c99"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Declare required textures
* Name texture, add decomp.me permuter settings
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "913810fc"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "913810fc"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/asm-differ --force
subrepo:
subdir: "tools/asm-differ"
merged: "97197f2a"
upstream:
origin: "https://github.com/simonlindholm/asm-differ.git "
branch: "main"
commit: "97197f2a"
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: "623d779f"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "623d779f"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/asm-differ --force
subrepo:
subdir: "tools/asm-differ"
merged: "55bba23a"
upstream:
origin: "https://github.com/simonlindholm/asm-differ.git "
branch: "main"
commit: "55bba23a"
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: "a20bac94"
upstream:
origin: "https://github.com/simonlindholm/decomp-permuter.git "
branch: "main"
commit: "a20bac94"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2021-09-21 20:13:03 -04: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
f0bad10668
Update ZAPD to use scene macros, improve texture system and others ( #129 )
...
* Fix segments
* add CMD_PTR macro
* macro fixes
* add PolygonDlist2
* Fix XMLs
* I hope this updates ZAPD
* Add ZAPD config files
* remove old structs
* update macro
* Add newline
* update ZAPD?
* update warnings
* update ZAPD
2021-06-02 18:18:38 -04:00
86bdadf4da
Extract assets in `make setup`, don't extract them to `assets/src/` and build them in `make` ( #132 )
...
* extract assets in setup and build them in make
* Add assetclean
2021-05-13 21:00:38 -04:00
c40bb119e1
Adds in scene support ( #117 )
...
* 1 scene done, Z2_SOUGEN OK
* All scenes OK
* Makefile improvements
* Use WIP ZAPD branch as submodule
* Add spawn rotation flag macro
* Fix bad merge
* Move scenes to be in their own subfolders
* Rename and restructure extracted baserom files
* Progress tracking for assets
* Add asset progress to csv
* Use master ZAPD
* Use distclean like in OOT
* Fix up a few things with the makefile
* Fix scenes not being dumped from ELF
Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
2021-04-29 18:56:18 -04:00
Anghelo Carvajal