1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Commit graph

1264 commits

Author SHA1 Message Date
Zelllll
c644aaa2ee
Interface improvements (#822)
* Add symbols, does NOT build OK

* parameter OK with syms

* Use `static` more and inline arrays

* wip docs

* Start on Interface_Draw, NOT OK yet

* rename variables since interface dev is weird

* nonmatching for now

* kaleido

* Update src/code/z_parameter.c

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* Make most texture rectangles use shifts

* fix symbols for all interface things

* done with interface_draw for now

* Update z_parameter.c

* format files

* fix wrong function calls

* fix bss

* improvements in matching

* remove button enum for now

* (void)0 to fix warning

* make conditional look nicer

* fix

* fix wrong combiner

* Update src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c

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

* format

* remove "HUD" naming

* review suggestions

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-06-15 13:29:10 -04:00
EllipticEllipsis
566d107e55
EnVali OK and documented, object_vali and object_bl completely analysed and documented (#845)
* OK

* Some naming

* Name more, correct typo in Biri, extract skel

* just Draws need names, fix typos in bili and warp1

* Decompile object_vali and add symbols

* Few more names

* Bari naming done

* object_bl completed, symbols added

* Label object_bl

* Formatter

* delete asm

* review changes

* review changes

* review
2021-06-14 18:11:14 -04:00
Anghelo Carvajal
a4c606c522
Add struct LegacyLimb and rename AnimationHeader2 for object_human (#849)
* Add LegacyLimb and rename AnimationHeader2

* Simplify SkelAnime_GetFrameDataLegacy

* Minor fixes

* Move LegacyLimb with the rest of the limbs
2021-06-14 14:12:34 -04:00
EllipticEllipsis
d399c3deb6
BgGndFiremeiro OK and documented (#850)
* OK, data imported

* Name everything

* Delete asm
2021-06-14 13:50:16 -04:00
EllipticEllipsis
d3db43df00
Fix and rename nes_font_static (#753)
* renames

* change digits and control pad names

* Add codepoints, rename blank char 0x7F
2021-06-08 19:22:28 +02:00
zelda2774
4b97acff2c
Improve Audio_SequencePlayerProcessSequence (#844)
Co-authored-by: zelda2774 <zelda2774@invalid>
2021-06-03 18:36:21 -04:00
Roman971
aceefd7384
Match 1 of the 2 remaining functions in Bg_Mizu_Movebg (#840) 2021-06-02 19:25:27 -04:00
Roman971
f44b24255c
Match EnDaiku_UpdateText (En_Daiku OK) (#841) 2021-06-02 17:59:01 -04:00
Roman971
2efeeff7c7
Match Jpeg_Decode (z_jpeg.c OK) (#839) 2021-06-01 15:27:07 -04:00
Zelllll
451f2536ae
z_sram OK (#834)
* match z_sram

* format and remove unused asm, also make some data static

* review comments

* another change
2021-06-01 13:31:29 -04:00
Zelllll
175aaf4f26
En_River_Sound OK (#833)
* match en_river_sound

* remove asm

* some docs

* more docs

* saria song

* review stuff
2021-06-01 13:17:45 -04:00
louist103
9de0b13141
Object_RU1, Object_MA1, and warp pad objects Decompiled (#828)
* Ruto limbs

* RutoLimb enum

* the enum doesn't go in en_door

* Limb DLists

* Name almost all textures and clean up EnRu1.c

* remove padding

* Name all but 1 animation and remove undefined syms

* Object MA limbs OK

* (MA1)Most textures

* Small renames in EnMa1.c

* Object MA1 OK

* add base object for Mjin

* Mjin OK

* Update object_ma1.xml

* PR fixes (Fig)

* PR fixes

* Missed one

* Update assets/xml/objects/object_ru1.xml

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-05-30 19:10:17 +02:00
louist103
f6470eaa08
"Decompile" more objects. (#784)
* Object_hakach_objects OK and fix a warning in z_play.c

* Object Warp1 OK

* Object_spot16_obj OK

* object_cs Skeleton and limbs OK

* Limbs are broken

* Limbs OK

* Object_CS OK

* Object_jya_door OK

* fix errors and add new lines

* PR fixes (AngheloAlf)

* PR fixes (EllipticEllipsis)

* PR fixes (Fig)

* Rename Spot16 and Jya

* GraveYard -> Graveyard

* PR fixes

* -s

* PR fixes
2021-05-30 12:30:38 -04:00
Anghelo Carvajal
515ebdce9d
ZAPD update: libpng, zroom improvements and others (#811)
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "769f5702a"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "769f5702a"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Add `libpng` to readme

* Remove `-ifp` since it doesn't exists anymore in ZAPD

* Remove extra print I added

* Add UNK_09 macro and other minor fixes

* Simplify PNG rules

* simplify gitignore

* Update README.md

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

* Update dockerfile

* basic instructions for cygwin and mac

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "86160be69"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "86160be69"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Change nanoseconds to seconds in extract_assets.py

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-05-30 11:09:59 -04:00
louist103
676ecf06c5
warnings fixed (#835) 2021-05-30 10:21:21 -04:00
Roman971
2c4dac2884
Match ViMode_Configure (z_vimode.c OK) (#830) 2021-05-29 09:41:39 -04:00
Roman971
9098b0fe22
Match 2 more functions in z_eff_blure.c (#831) 2021-05-29 03:30:48 -04:00
Anghelo Carvajal
7822d130f9
Change nanoseconds to seconds in extract_assets.py (#829) 2021-05-28 00:03:47 -04:00
louist103
515163e6cd
Outname -> OutName for OBJECT_LINK_CHILD (#827)
* Outname -> OutName

* ANother child fix

* TLUT -> tlut
2021-05-26 22:16:01 -04:00
Anghelo Carvajal
45012658d3
Track XML extraction time (#826)
* extracted-assets.json

* delete `.extracted-assets.json` in distclean

* Move `rm .extracted-assets.json` to `assetclean`
2021-05-26 19:40:48 -04:00
louist103
201c9ec1cd
Decompile a bunch of objects (#603)
* Mostly done but shifted

* still messed up

* Almost OK

* OBJECT_JYA_OBJ OK, OBJECT_GR OK

* Done

* Merge master and format

* Cleanup

* Cleanup 2

* Start object MB dont merge yet

* Object_MB OK

* Object_ydan_objects OK

* General 'ydan' actor cleanup

* Forgot some small things

* Object_EC OK

* add .gitkeep and run format

* Object_sd OK but no textures cause of a zap issue

* PR fixes

* Fix object_sd

* fix ydan

* delete .gitkeep files

* OBJECT_BOX as far as it can go with current ZAP

* Fix undefined_syms

* Start child link object

* Push progress, dont merge yet

* Object_mori_objects OK

* Fixed?

* Fix conflicts again

* Seems like i missed some textures

* Extract data for BgBombwall

* More field

* ZAP YEP 2.0

* Object_Box OK

* Object_SD ok.  Ready to merge

* remove ASM and merge master

* remove ASM

* remove files wrongfully added to docs/

* Almost done

* Change comment in z_player_lib.c

* forgot some DLists in player_lib.c

* Fix conflict, run format

* Same as before but this time with Tex and TLUT

* Last few things

* fix object_GR and add limbs to object_sd

* Nane -> Name

* gChildDekuShieldMtx is now a matrix and not a blob

* PR fixes (Fig)

* add a space for comment in z_player_lib.c

* re push and new lines

* PR fixes (AngheloAlf)

* PR fixes (Roman)

* Fix Heishi2

* PR fixes (Fig)

* Replace spacing in a file

* PR fixes (Roman)
2021-05-26 18:59:21 -04:00
Vijfhoek
36fead60a0
Improve z_jpeg documentation (#825)
* Improve z_jpeg documentation

* JpegWork::data is probably better than address

* Rename Jpeg_SendTask to Jpeg_ScheduleDecoderTask

* Rename njpegUCode to gJpegUCode

* Rename GetU16 to GetUnalignedU16 and improve docs
2021-05-26 20:46:07 +02:00
louist103
aebf11b8be
object_sa OK (#789)
* object_sa OK

* PR fixes (AngheloAlf)

* PR fixes (Roman)
2021-05-23 22:02:54 +02:00
mzxrules
4f9c02aaec
en_weather_tag Quick documentation pass (#808)
* Quick documentation pass

* Fill out the En_Weather_Tag enum

* move the enum into the header

* implement roman's suggestion
2021-05-22 20:21:30 -04:00
fig02
a9df91be99
Label a bug in Door_Shutter (#810)
* comment

* Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>

* change message

* typo

* repeated myself

* extra space lmao

* change wording again

* Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c

* indent

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
2021-05-23 02:05:03 +02:00
Anghelo Carvajal
5062f785fc
Add actorfixer.py ~~and graphovl.py~~; and a few improvements to extract_assets.py (#783)
* Only process touched files and abort the extraction if one file wasn't extracted properly

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

* add actorfixer and graphovl

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

* Re set execution permisions to diff.py

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

* Add graphs/ to gitignore

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

* Add looners flag to graphovl

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

* Parse macros

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

* cleanup

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

* Add enum parser to graphovl

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

* Remove redundant code

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

* cleanup

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

* Custom colors to graphovl!

* Select multiples styles for graphovl

* Add solarized light style

* Add renames of #796

* Add unaccounted warning flag

* remove graphovl

* git subrepo clone https://github.com/AngheloAlf/graphovl.git tools/graphovl

subrepo:
  subdir:   "tools/graphovl"
  merged:   "577e71592"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "577e71592"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* remove graphovl

* Add `graphovl/` to gitignore
2021-05-22 20:00:10 -04:00
mzxrules
5c4fdb706b
Small bgcheck documentation pass (#816)
* implement some documentation

* remove unnecessary comments related to decomp

* eliminate comment function prototypes
2021-05-22 23:50:05 +02:00
Roman971
54f13007ca
Match EnSkb_PostLimbDraw (obl_en_skb OK) (#821) 2021-05-21 16:33:11 -04:00
Kenix3
6a1c1eac88
Removes qemu from the README.md (#819)
* Removes qemu from the README.md

* Increments the step references in other parts of the README.md

* Update README.md

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* Update README.md

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* Update README.md

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* Update README.md

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
2021-05-20 19:01:00 -04:00
Roman971
009b8ff672
Remove some unused duplicated C files (#818) 2021-05-20 13:49:34 -04:00
Derek Hensley
c9ee9e43bd
Changed unk_192 to timer, as well as add missing trailing comma for formating (#817) 2021-05-18 15:40:26 -04:00
EllipticEllipsis
d9a4a2079d
object_hata OK (#806)
* everything except limbs

* spec

* object_hata OK

* Replace symbols, unused data, enums, some cleanup

* Fix compiler warnings in EnRiverSound

* Address Roman's review

* Correct limbs name
2021-05-17 14:57:59 -04:00
louist103
a597d71e54
Add clean assets (#785)
* makefile change

* also delete

* Add cleantools

* rename cleanassets and assetclean

* add rules to PHONY in makefile

* Remove toolsclean
2021-05-17 19:50:19 +02:00
Anghelo Carvajal
4d5d1fd079
Add every unreserved object in an automated way (#805)
* it's crashing

* fix stuff

* fix xmls

* problematic objects

* fix tabs

* Fix suffixes

* add missing new lines

* Add comments to the problematic objects

* Find and replace fixes

* Add Fig's objects

* I forgot to add a Name in a cutscene, so I'm adding it here

* Update object decomp tutorial a little bit

* Update problematic objects

* Update docs/tutorial/object_decomp.md

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Change comments

* comment out a few blobs

* dammit tluts

* Change a bunch of objects

* update the last bunch

* update comments on  oA11 and oB2

* Ninja-edit to fix compatibility with ZAPD's PR 142

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 12:36:40 -04:00
Anghelo Carvajal
ea703138bb
Simplify PNGs rules in the makefile (#814)
* simplify rules

* update `-eh`
2021-05-15 14:14:51 -04:00
Roman971
ee539e90bd
Match BossFd_Fly (ovl_Boss_Fd OK) (#807) 2021-05-14 20:25:44 -04:00
Anghelo Carvajal
8f9881ece2
Add UNK_09 macro and other minor fixes (#813)
(cherry picked from commit d3a6d4d2e1)
2021-05-14 20:11:00 -04:00
Anghelo Carvajal
58813216fc
Add scene macros (#792)
* add scene macros

* SCENECMD -> SCENE_CMD

* light renaming

* SCENE_CMD_ROOM_BEHAVIOR

* update params names

* Remove extra spaces

* More review changes by fig

* remove MM cmd ids

* more review changes

* last minute edit

* I keep confusing both lights commands

* Review changes

* Yet another cutscene change

* Unused02 is unused
2021-05-08 17:16:21 -04:00
Zach Banks
7c77253eca
ViMode progress (#802)
* ViMode OK

* Fix variable name in regconvert tool

* ViMode: fix formatting

* Add nonmatching impl for ViMode_Configure, respond to PR

- Fixed struct field naming (unkXX -> unk_XX)
- ViMode_Configure args are not flags for top/left etc; seem to be for
    video mode
- Used @Random06457's implementation of `ViMode_LogPrint`

* Use plain LOG_ADDRESS in ViMode_LogPrint

* Incorporate PR feedback from Roman971
2021-05-03 21:49:09 -04:00
EllipticEllipsis
278e471074
Delete -j from make setup and document use of -jN and -j in readme (#804)
* Add nproc to make setup

* Add cross-platform nproc equivalents

* Scrap that, just ditch -j in makefile altogether

* Clarified thread advice
2021-05-03 13:37:54 -04:00
Roman971
a53e084cd2
Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803)
* Decompile ovl_kaleido_scope + minor cleanups

* Add a common header for ovl_kaleido_scope

* Start cleaning up and documenting kaleido_scope (+ some interface docs)

* Improve and fix some kaleido_scope non matchings

* Match KaleidoSetup_Init

* Extract icon_item_fra/ger_static files

* Add more documentation and matches to kaleido_scope

* Improve the z_kaleido_collect.c non matching

* Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c

* Update most kaleido variables to be static

* Improve GS flag macros

* Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script

* Various minor fixes and improvements

* Minor fixes and review changes

* Review changes part 2

* Rename gSetTileCustom to gDPSetTileCustom

* Review changes part 3
2021-05-02 19:15:16 -04:00
Roman971
4e9f40cb13
Update asm-processor and add make dependencies for global asm and early includes (#801)
* Update asm-processor to latest master

* Add make dependencies for global asm and early includes

* Update asm-processor to latest master
2021-05-02 16:21:27 -04:00
EllipticEllipsis
ce44541d33
EnFish, OK and documented (#795)
* Matching

* Some naming

* spec

* Name another function

* Name animations, clarify use of GI_MAX and GI_NONE

* Documented bottle range functions

* Simplify squared distance function in EnIceHono, actor descriptions

* Functions for dropped fish

* More naming

* Change 65535.5f to (0xFFFF + 0.5f)

* Change 65535.5f to (0xFFFF + 0.5f)

* name phases

* Named other types, Docile functions

* Naming complete

* delete asm

* format, remove outdated comment

* Fix a few DrawFlexOpa arguments

* Review changes

* Change back to original playSound

* Function comments per review
2021-05-02 18:41:05 +02:00
Parker Burnett
2ee1fd4668
finished object_skb (#790)
* finished object_skb

* neglected the limbs and dlists, so I added them

* adding the textures

* fixing some names

* ....forgot to change the c file....

* hopefully fixed formatting issue
2021-04-30 20:31:49 -04: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
Anghelo Carvajal
722017814d
Decompile object_zo 🐬 (#794)
* Initial xml

* most of in-code references

* Add limbs and evrything else

* Functions used by EnRiverSound

* Fix forearm and use void* for textures

* Run formatter
2021-05-01 01:55:52 +02:00
Nicholas Estelami
0432011bd9
Updated to use latest version of ZAPD (#777)
* Updated config file

* Added missing files

* Temporarily removed asm_processor changes.

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "96ffc1e62"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "96ffc1e62"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "179af7d11"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "179af7d11"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Cleanup and fixes.

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "50ad2fe78"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "50ad2fe78"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Makefile fix

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "b9120803e"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "b9120803e"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2021-04-30 23:23:22 +02:00
Anghelo Carvajal
6e58354c71
General object cleanup (#799)
* Object cleanup

* Fix running man

* fix mm symbols
2021-04-30 00:38:15 -04:00
Anghelo Carvajal
98aef8988a
assert macro OK (#755)
* create assert macro and replace a bunch of __assert

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

* Another bunch of assert

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

* more assert

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

* assert(false)

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

* last assert used in matching code

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

* the non-matchings

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

* typo

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

* format

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

* change macro to uppercase

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

* Apply suggestions from code review

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

* Change ASSERT(false) to ASSERT(0)

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-04-29 14:39:46 -04:00
Roman971
0b8252cfe9
Improve the format in z_map_mark_data.c and cleanup mapmark.py (#798)
* Cleanup mapmark.py script

* Rename map mark defines

* Remove unused entries from map_mark_data
2021-04-28 05:10:23 -04:00