Commit Graph

9 Commits

Author SHA1 Message Date
Yanis
20a0613120 Merge zeldaret/main (#106)
* Match retail BSS ordering (#1927)

* Match retail BSS ordering

* Revert moving some global variables to headers

* Adjust block numbers after header changes

* Fix debug build

* Overlay bss ordering

* Fix BSS ordering after header changes

* gc-eu-mq OK

* Implement preprocessor for #pragma increment_block_number

* Transfer usage comment from reencode.sh

* Use temporary directory instead of temporary file

* Move ColChkMassType back

* Player: Document "WaitForPutAway"  (#1936)

* document put away delay

* functions.txt

* add a note on delaying indefinitely

* format

* typo

* delay -> wait for put away

* revert unintended formatting change

* add comment to struct member

* format

* fix functions.txt

* Set up gc-eu and match all code (#1938)

* Set up gc-eu and match all code

* Format

* Mark gc-eu-mq as WIP until it builds OK

* Move original/MQ map mark data to separate files

* Add #includes to .inc.c files to help out VS Code

* Use #if in spec instead of .inc.c files

* Delete disassembly data for gc-eu-mq (#1942)

* Player Docs: "sUpperBodyIsBusy" (#1944)

* document upperbodybusy

* change wording for comment and rename upperanimblendweight

* format

* review

* Fix miscategorized scenes (#1946)

* Fix miscategorized scenes

* Sort includes

* Player Docs: Action Interrupt (#1947)

* document action interrupt

* format

* new function comment

* format

* add a note about items

* format

* Add gc-eu-mq to CI (#1943)

* Add gc-eu-mq to CI

* Give up on scripting

* Revert quotes changes

* Player Docs: Name some high level update calls (#1593)

* name some low hanging fruit

* revert burn and shock, doing in seperate pr

* add some function comments

* yaw func

* adjust comment

* some review

* unname UpdateZTarget

* Player_DetectRumbleSecrets

* fix dive do action name

* Player Docs: Control stick buffers (#1945)

* name vars and add enum

* name some spin attack stuff

* fix right and left

* forward/backward

* format

* fix retail bss

* sControlStickWorldYaw

* Force string.o to be in boot for gcc builds (#1948)

In retail builds, memcpy is linked in code, not boot, but GCC likes to call memcpy when copying structs so currently GCC builds immediately crash in __osInitialize_common.

* Rename yDistToWater -> depthInWater (#1950)

* Rename yDistToWater -> yDistUnderWater

* yDistUnderWater -> depthInWater

* Check baserom hash before decompression (#1952)

* Remove Cygwin support (#1951)

* update installation docs

* setup fixes

* tabs

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-05-10 18:21:07 +02:00
cadmic
39de6ce293 Extract unused scene headers (#1930)
* Extract unused scene headers

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "1300a4f36"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "1300a4f36"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* Add more unused arguments to CS_LIGHT_SETTING
2024-03-23 12:38:05 -04:00
Dragorn421
e07d3a3819 Document more PathwayLists for scenes (#1181)
* Document more PathwayLists for scenes

* `Pathway` -> `PathList`

* Fix `NumPaths` in `ganon_final` scene (6 -> 4)

Co-authored-by: Hayden Kowalchuk <819028+mrneo240@users.noreply.github.com>
2022-03-19 20:56:05 -04:00
MegaMech
33c5b8eb67 Update market_alley_n.xml (#1173) 2022-03-19 20:30:09 -04:00
louist103
0b18419489 Scene cleanups (#1002)
* remove fake match

* u32 segment -> void* and add symbols to sEntranceCutsceneTable

* rename some symbols

* remove if1

* add the last missing symbol

* add symbols for almost all extrence textures

* finish adding the symbols

* Remove comment

* spelling fix

* Fig's and Dragorn's fixes

* add symbols to unkknown array

* format

* romans fixes
2021-11-08 21:15:37 -05:00
louist103
8e4d1ccd3f Fix all xmls to explicitly use offsets (#859)
* Forest and shadow temple

* fire temple

* Water temple

* Spirit temple

* Deku tree

* jabu jabu

* DC

* Inside Ganons castle

* GTG

* Castle courtyard

* great fairy's fountain

* chamber of sages

* shooting gallery

* Temple of time

* market

* back alley

* kokir shop

* goron shop

* zora shop

* House of skulltula

* bazarr

* potion shop

* gravekeepers hut

* lakeside lab

* hyrule field

* kak

* graveyard

* zoras river

* kokiri forest

* lake hylia

* zoras domain

* zoras fountain

* gerudo valley

* lost woods

* the rest of them

* cleanup

* final cleanup

* PR fixes (Zel)

* Fra -> FRA and cleanup map_name_static

* map_name_static

* DONE

* SHould be it

* Done done done done

* vector

* remove another pr

* ?
2021-07-06 19:18:13 +02:00
louist103
7446e5eb80 Decompile some more objects (#848)
* Object_FU limbs and skel OK

* limbs OK

* Object_FU textures OK

* Object_FU face textures OK

* Symbols in en_fu.c

* en_fu.c limb enum

* Remove Object_fu from undefined_syms, move textures to draw, and small cleanup

* Object_bird OK

* Object_Bird OK, added cutscene for shot sun, and song of storms

* Rainbow Bridge CS

* Great fairy CS

* Cutscene -> Cs

* remove '&' from Cutscenes

* Cleanup object_bird

* Update z_en_fu.c

* Update z_en_fu.h

* Update z_en_fu.c

* Update z_en_fu.h

* Update z_en_fu.h

* DC intro CS

* Zeldas lullaby CS

* Nabooru Knuckle CS

* Owl Lake Hylia CS

* Sun song CS

* Undefined sym in Boss Dodongo

* Missed a few more

* DC tex name

* Windmill man limbs
2021-06-29 19:22:36 +02:00
Anghelo Carvajal
9dbebfa38f Change Hints in scene's XMLs (#800)
* Remove blobhint

* Add segments and offsets, and remove most hints

* Change PathHint to Path

* Add missing final new lines in scenes xmls
2021-04-30 20:23:50 -04:00
Nicholas Estelami
b95643b397 Updated Texture Asset Handling (#478)
* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Fixed newline issue with ZAPD

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Fixed merge issues.

* Fixed makefile merge error

* Fixed additional merge error

* Fixed several more merge issues

* Commented out gameplay_keep and sk2 extraction, since currently unused.

* Reenabled gameplay_keep extraction since it's used in the spec

* Fixed build error

* Removed test struct

* Fixed makefile error that would happen on fresh builds

* Fixed merge issue

* Removed relative paths

* Multithreading on extraction, spec uses numbers, few changes to XMLs

* Removed redundant code from the extract_assets script

* object_sk2 and object_spot09_obj OK

* object_spot11_obj OK

* object_spot17_obj OK

* Test: One of the gameplay_keep dlists given a proper symbol

* Updated asset symbol names based on new naming scheme

* XMLs use "Offset" instead of "Address" now

* Fixed merge issues, updated ovl_Magic_Dark xml and gfx file

* Updated to use latest build of ZAPD

* Updated ZAPD again

* Updated ZAP to remove assimp dependency

* Jenkins Test: Added .gitkeep file

* Updated ZAP once more

* Updated png file name to comply with new naming scheme.

* Fixed bad include

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 06:39:52 -05:00