1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-02 15:55:59 +00:00
Commit graph

371 commits

Author SHA1 Message Date
louist103
50baf812ac
Mark func_800DC910 as NON_EQUIVALENT (#882)
* fix

* add missing function
2021-08-04 17:39:28 +02:00
fig02
d816ac6122
Stalfos (en_test) OK and object_sk2 documented (#868)
* fix colliderinit typo

* migrate data

* init has 1 problem

* progress

* progress

* builds now

* progress

* progress

* lots of funcs matched

* many functions, fix warnings

* 1 left

* done

* docs progress

* remove graphovl

* missed some

* change some funcs

* some more

* another

* format

* more docs

* cleanups1

* limbs, DLs, textures

* limbs named (thanks elliptic)

* more docs

* Name animations, import symbols

* Named sections of xml

* more docs

* rename limbs and use flag macros

* name

* review1 and use limb enum

* review2

* agro -> aggro

* review3

* review4

* review5

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2021-08-01 15:44:16 -04:00
louist103
d2bad8fb6a
convert remaining RGB5a1 to RGBA16 (#879) 2021-08-01 19:15:21 +02:00
mzxrules
df5e1c63c0
z_en_ko OK (#869)
* .data OK

* Progress

* push some old stuff

* Finish a chain

* Progress

* Progress

* Run mathfixer.py

* Progress

* match one more

* Up to date

* Match func_80A97610

* func_80A96FD0

* most of the way through the mega switch

* small formatting thing. still stuck on the switch

* start a big switch function

* a little closer

* done with matching for now starting objects

* func_80A97738 OK!

* func_80A995CC OK!

* func_80A99864 OK!

* en_ko OK!

* Code clean-up pass

* more EnKo cleanups, object_fa and object_kw1 textures documented

* complete object_km1, more EnKo documentation

* More documentation

* delete asm

* Clean-up rebase issues

* bleh

* Implement Dragorn's suggestions

* fix spec, implement fig's suggestions

* whoops (ill leave it for the docs tho lol)

* whoops again

* i made an ouchie

* smile

* last one for real

Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-28 23:59:52 +02:00
krimtonz
d1a5ea5110
Audio WIP (#836)
* being code_800EC960

* wip

* wip

* more audio progress

* migrate data in code_800E11F0

* wip

* make ok

* remove asm

* wip

* move some variables outside of gAudioContext to the AudioContext structure due to the size used in func_800E3094

* more progress

* wip

* wip

* split code_800E11F0

* migrate rodata in code_800E11F0

* match functions that couldn't because of data issues

* move code_800E4FE0 asm files

* wip

* more wip

* fix global functions, and forward declarations

* wip

* wip

* wip

* ocarina wip

* match a couple functions

* some progress

* separate some bss

* match func_800EDA3C

* some matching

* more matches

* migrate audio rodata

* some matches

* more matchess

* start on synthesis

* work on synthesis

* fix function declaration

* Merge branch 'master' into audio

* match a few more functions

* wip

* wip

* more matching, rename Audio_SetBGM to Audio_QueueSeqCmd

* name several audio functions, and audiocontext members

* more naming, rename code_800E11F0 to audio_load, code_800DAAC0 to audio_synthesis

* audio wip

* match a few more functions.

* wip

* add missing NON_MATCHING directive

* wip

* some matching, data reogranization

* match cursed function

* wip

* wip

* formatting

* remove prefix from struct memebers

* missed function rename

* review

Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-27 19:44:58 -04:00
engineer124
cc9a04feb4
Match Interface_Draw (z_parameter OK) (#876)
* Interface_Draw down to permuter score = 175

* Fix typo

* Matched Interface_Draw!

* clean-up

* Another touch-up

* a little more cleanup

* No more direct gGameInfo->data access
2021-07-28 01:20:25 +02:00
Random
d223e246c7
db_camera (#842)
* Decompile shrink_window.c

* progress

* progress

* makefile

* progress

* match 8 functions

* 1 more match

* match 2 functions

* decompile func_800B9638

* fix flow

* migrate .bss

* doc

* name some stuff

* fixes

* comment fix

* remove scene .c files

* old z_camera .s files

* revert z_camera change

* revert unwanted z_camera change

* fixes

* remove unused files, run clang-format and fix non-matching

* fix clang-format causing non-matching

* remove newline + old comment in func_800B3BD4

* make db_camera global variables static

* add s prefix to startic variables

* change magic constants

* rename "unk_50"

* Match func_800B3BD4 and Match DbCamera_UpdateDemoControl (-bss)

* Lots of progress on update

* Mainly cleanup

* run format.sh + remove unused asm

* replace chevrons with add quotes

* remove useless cast + use correct empty argument function declaration

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2021-07-26 00:34:25 +02:00
Zelllll
89f684b026
Change PreRenderContext to just be PreRender (#862) 2021-07-04 11:58:19 -04:00
Tharo
cd9a2ed648
Some progress on z_vr_box.c (#838)
* z_vr_box.c progress

* Rename dpList to dlistBuf and SKYBOX_CLEAR_SKY to SKYBOX_NORMAL_SKY

* Fix

* renamed dlistBuf to dListBuf and split large string further
2021-07-04 11:43:04 -04:00
mzxrules
3fd05c9147
z_En_Ossan and dependencies (#824)
* fix colliderinit typo

* fix initchain

* reloc

* progress

* progress

* Pick off a few easy functions, reduce number of warnings

* more tough OKs

* Getting closer to all OK, fix en_girla header

* some hard OKs, 7 to go

* two funcs remaining

* func_80AC7094 OK!

* Fix warnings, begin documentation

* get most of object_ossan documented, document some of en_ossan

* improve en_girla function names

* more EnOssan documentation

* more documentation

* en_tana basically complete, en_girla vars all named, en_ossan documentation improvements

* delete TIME ITSELF

* object_oF1d_map OK

* more names, fixed a poition typo

* Nearly all en_ossan functions named, all variables named

* format.sh

* forgot to delete data

* implement pr changes

* EnOssan OK! implement most of Roman's suggestions

* ugh

* implement figs suggestions

* implement roman's suggestion

* Can't tell my left from my other left

Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-04 17:23:18 +02:00
fig02
0a35c752e7
Some actor.c docs (in preparation for en_test) (#820)
* renames

* format

* format functions.h

* clean

* arg name

* remove asm
2021-06-22 08:51:04 +09:00
Synray
7984c1c514
Match Math3D_LineSegMakePerpLineSeg (#854)
* Match Math3D_LineSegMakePerpLineSeg

Also renamed to Math3D_LineVsLineClosestTwoPoints

* Fix UB
2021-06-19 19:21:07 +02:00
engineer124
557c47113a
Match Camera_PrintSettings (z_camera OK) (#853)
* Match Camera_PrintSettings

* rm asm
2021-06-17 20:02:07 +02:00
louist103
23dc339882
Migrate .bss for fault drawer and .data for item00 (#823)
* Item00 and fault drawer

* Test

* Test2

* test3

* test4

* remove .data file for item00

* revert hex

* WHY

* PLEASE

* PR fixes (Roman) and run clang-format version 10

* Fault_drawer was swapped ...again)
2021-06-15 20:51:42 +02:00
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
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
zelda2774
4b97acff2c
Improve Audio_SequencePlayerProcessSequence (#844)
Co-authored-by: zelda2774 <zelda2774@invalid>
2021-06-03 18:36:21 -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
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
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
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
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
009b8ff672
Remove some unused duplicated C files (#818) 2021-05-20 13:49:34 -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
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
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
fig02
3fbdccbdba
Document BodyBreak (en_part, body part spawner) (#797)
* done

* status defines

* whoops

* comment wording

* size calc change

* elseif
2021-04-27 21:32:15 -04:00
zelda2774
4e81e4a388
Set __FILE__ in asm_processor (#793)
* Set __FILE__ in asm_processor

* bss fix

* Update to upstream version

Co-authored-by: zelda2774 <zelda2774@invalid>
2021-04-25 14:37:32 -04:00
petrie911
7b2b88d552
Volvagia (ovl_Boss_Fd) and related actors (#352)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* Lots of functions matched. Some big ones are close.

* Five left unmatched, one close.

* Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched.

* Three unmatched, one essentially matched, the rest matched.

* More fixes.

* Documented more of the structure and cleaned up a bit.

* BossFd2, BgVbSima, and EnVbBall matched and documented

* Also removed unneeded .s files

* And need to name EnVbBall's functions

* give this a shot

* fix conflict

* one more try

* removing darkmeiro changes

* and again

* now OK from make clean

* minor cleanup

* One more matching function for BossFd

* which means it doesn't need its .s

* splitting

* splitting

* splitting

* forgot some .s

* fancy new names

* fancy new names

* trying again

* sneaky .s files

* sound effects and some hex to decimal conversions

* Sound effects and static variable cleanup

* format.sh and clean up static variables

* sfx and formatting

* ZAP and cleanup

* small cleanup

* cleanup and ZAP

* ZAP

* looking at the giant function again

* looking at the giant function again

* Only the big function left.

* Those .s files aren't mine, officer

* float literals might be fixed. regalloc still a nightmare

* almost done with the big function

* should make now

* not much of a change

* all functions match. rodata somehow doesn't.

* forgot some things

* lots of cleanup

* and a little more

* small error

* large cleanup. Also BossFd has function names and inlined variable declarations

* still more cleanup

* the quest for 0.1f continues

* forgot to put NON_MATCHING back in

* Data structures fully documented. Still more cleanup.

* DECR now works with BossFd2

* should match now

* cleanup

* small cleanup

* cleanup and names

* tiny thing

* particles and headers and stuff

* now with more enums

* merge

* test

* end test

* update

* cleanup

* object 2

* object 1

* doc object_fd2

* git subrepo pull --force tools/ZAPD

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

* formatting

* .s

* merge actor

* vertex arrays

* a little more

* formatting

* merge opd

* fixed damage check

* cleanup

* fixes

* effect struct

* review

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig02 <fig02srl@gmail.com>
2021-04-17 19:12:46 +02:00
petrie911
3c18de2f83
Match func_800344BC and make func_8002FBAC equivalent (#778)
* format

* now equivalent

* another match

* cleanup

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-15 01:10:03 +02:00
Tharo
1f6a74e636
Use gDPSetScissor more and fix a few gbi macros (#776)
* Change gDPSetScissorFrac usages to gDPSetScissor

* Wrap some macros in do-while statements to remove some matching tricks
2021-04-14 21:14:07 +02:00
Synray
e3c1b52887
EnGoma OK (#770)
* En_Goma OK

* Label Goma

* Remove asm

* Labeling

* Review changes

* Forgot a comment

* sizeof

* Review comments and fix warnings

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-12 19:45:58 +02:00
MNGoldenEagle
c952fd4490
Add near-matching decomped functions for SeqPlayer (#729)
* Add nearmatching decomped functions

* improved match

* greatly improved match

* small thing

* almost matching

* small cleanup

* remove commented array

* pad -> unk

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-12 12:20:46 +02:00
Synray
7f94088a3b
En_Horse OK (#554)
* En_Horse OK

* Remove reloc

* WIP

* Use EnIn

* Documentation

* Documentation

* Remove debug prints

* Warnings

* Cleanup

* Unused asm

* Review comment

* Review comments and reformat

* More review comments

* Rename flags

* Review changes

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-11 21:23:40 -04:00
EllipticEllipsis
c04806fc66
Player animation offsets (#762)
* Changed PlayerAnimations to be named with offsets

* named hover boots timer

* update EnIshi sCylinderInits
2021-04-10 18:07:25 +02:00
petrie911
ab05eb9776
three more matches in BgJyaCobra (#758)
* two matches

* cleanup and formatting

* Update assets/xml/overlays/ovl_Bg_Jya_Cobra.xml

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* no more extract

* format

* owl exterminators

* new match

* new match

* small thing

* whoops

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2021-04-09 19:02:16 -04:00
petrie911
792056699d
Match two functions in z_eff_blure (#764)
* new matches

* format

* .s

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-07 20:13:32 -04:00
Roman971
03882c9214
Match the last function in PreRender.c (#763) 2021-04-06 14:56:30 -04:00
Roman971
2126685472
Match the last 4 functions in sys_matrix.c (#761) 2021-04-05 23:56:52 -04:00
Roman971
7e8d74d6ca
Match Sram_OpenSave from z_sram.c (#759) 2021-04-05 21:07:53 -04:00
Roman971
7d3692a266
Match the last function in z_skin_awb.c (#760) 2021-04-05 20:40:04 -04:00
gamestabled
03b81c71c2
named members of TitleCardContext (#749)
* named members of TitleCardContext

* changed screenX/Y to just x/y

* added clarifying comments and renamed timer -> duration because i think its better

* changed names to delayTimer and durationTimer

* made texture a void*

Co-authored-by: gamestabled <chandler2016@yahoo.com>
2021-04-05 13:37:46 -04:00
Tharo
208167361b
Poe Objects (#743)
* poe objects

* Last unaccounted resolved, name suffix fixes

* remove _tex

* missed 2

* format

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-04 23:48:12 +02:00
Dragorn421
288320317c
Gohma (ovl_Boss_Goma) (#397)
* ovl_Boss_Goma OK, except func_80917D98

* ovl_Boss_Goma OK and documented

* Minor cleanup: shorten enums, use named constants...

* Floats with .0f, less useless static usage, details on oversight about spawning child gohmas, cleanup...

* More documentation, hopefully less weird about documenting setups and actions

* fix fhg_fire

* remove warnings

* formatting things

* newlines

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-03 16:58:33 -04:00
Anghelo Carvajal
c94e595dc1
Misc objects problems (#748)
* fix hidan door

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

* doors and lens of truth in gameplaykeep

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

* other minor fixes

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

* Fix a typo

Signed-off-by: Angie <angheloalf95@gmail.com>
2021-04-02 19:30:26 -04:00