1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-30 06:46:01 +00:00
Commit graph

1676 commits

Author SHA1 Message Date
hatal175
f344fe648b
Document RCP functions (#1087)
* Document RCP functions

* Rename functions according to convention

* Rename file and functions to RcpUtils
2022-01-23 18:04:50 -05:00
Tyler Phillips
4b4099e84c
Expose MIPS_BINUTILS_PREFIX for building on alternative platforms (#1076)
* Define MIPS_BINUTILS_PREFIX for crossdev generated binaries (mips-gentoo-linux-gnu)

* Update error message to reflect binutils prefix

* Add documentation around MIPS_BINUTILS_PREFIX

* Clear up documentation

* Update Makefile

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update Makefile

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update Makefile

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update Makefile

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update Makefile

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2022-01-20 00:57:39 +01:00
Dragorn421
6479913daa
Defines for player state flags (#1081)
* script-assisted player state flags

* Run formatter

* manually convert state flags in `D_80116068`

* `PLAYER_STATE_FLAG_` -> `PLAYER_STATE`

* Run formatter
2022-01-17 19:04:07 -05:00
Dragorn421
2a4fb604fb
Cleanup symbols 7 (#1073)
* Cleanup symbols, mostly from non-matching objects

* ZAPD supports unaligned textures!

* Uncomment `object_oF1s`
2022-01-17 18:50:18 -05:00
louist103
0a48548da7
Extract z_select_static (#1074)
* merge master

* z_select_static OK

* remove jenkins file

* missed a DL

* Update z_select_static.xml

* new ZAPD
2022-01-17 18:42:33 -05:00
Stephen Meier
46b826fcd4
Updating vscode.md (#1095)
* Update vscode.md

Updating vscode makedown to match what is found in the mm repository

* Update docs/tutorial/vscode.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update docs/tutorial/vscode.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update docs/tutorial/vscode.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Moving vscode.md to the root of the docs folder

* Update docs/vscode.md

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

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Stephen Meier <stephen.meier@ibm.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-01-18 00:35:25 +01:00
louist103
71be03da7c
Asset header split (#1023)
* merge master

* gi objects

* Some more and fix dungeon keep and field keep

* the rest of them

* fix field keep

* Remove extra underscore
2022-01-17 17:38:32 -05:00
Dragorn421
98259a128d
Misc. doc/cleanup 4 (#1093)
* Cleanup parameters passed to `Actor_SpawnFloorDustRing`

* `10` -> `ARROW_NUT` for spawning EnArrow

* Missing empty line after declaration

* Introduce `ACTORCAT_MAX`

* Minor cleanup

* Run formatter

* `sgiDrawIds` -> `giDrawIds`

* `sDmaMgrDataExistError` -> `sDmaMgrIsRomCompressed` bool

* Add Makefile dependencies to rebuild some files when editing actor, object and effect tables in `include/tables/`

* Run formatter

* Revert "Add Makefile dependencies to rebuild some files when editing actor, object and effect tables in `include/tables/`"

This reverts commit c6b9a92139.
2022-01-17 21:30:30 +01:00
EllipticEllipsis
9b67778a00
Building on Macs (#1086)
* git subrepo pull (merge) tools/ZAPD

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

* Fix extract_assets.py multithreading

* Update binutils doc a bit

* Remove * import, add multiprocessing option
and way to pass arguments to ZAPD

* Update format.sh to be more platform-independent

* git subrepo pull --force tools/ZAPD

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

* Remove ;

* Update formatting script to not just use 11

* Add Python requirements,
move the Mac stuff in the README into its own doc

* Fix readme link

* Minor format thing

* .

* Move ZAPDArgs into its own function

* Update readme and remove requirements.txt

* Dragorn-inspired rewrite of processZAPDArgs

* git subrepo pull --force tools/ZAPD

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

* Fix function definition

* Building docs overhaul

* Add Python packages to Mac and Cygwin

* Heading number

* format format.sh (!)

* Replace "currently"

* Remove Debian

* git subrepo pull (merge) --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0ba781304"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0ba781304"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2022-01-16 19:43:07 -05:00
engineer124
9450272503
Improve River_Sound Docs (#1100)
* river_sound docs

* Small touch-up

* PR Suggestions

* Improve comments on river line calculations

* More PR Feedback

* after analyzing the filter data for MM, lowPassFilter is reverse to what I thought it was
2022-01-14 17:13:04 -05:00
Anghelo Carvajal
9fec455805
Small Skin system documentation pass (#1017)
* some docs

* rename a bunch of callbacks

* more cleanup

* format

* last cleanup

* some updates

* more docs

* done i think

* name flag and format

* name unused variable

* comments

* revert unwanted change

* z64skin.h

* format

* Address review

* Rename PostLimbDraw callbacks to PostDraw and some PR addressing

* add true/false for setTranslation

* ahhhh

* remove "you"

Co-authored-by: fig02 <fig02srl@gmail.com>
2022-01-12 18:00:28 -05:00
Dragorn421
e5ecdfd559
Misc. doc/cleanup 5 (#1096)
* `0` -> `CHEST_ANIM_SHORT` in `GET_ITEM` z_player macro

* fix typos in z_en_skj

Co-authored-by: Yanis42 <yalink88@gmail.com>

* `unkSkjStruct` -> `EnSkjUnkStruct`

* Use `EFFECT_SS_` enum in all `EffectSs_Spawn` calls

* Decimal for all `EffectSs_Spawn` priorities

* Use `OBJECT_INVALID` more

* `Object_IsLoaded` returns a boolean

* Add `@bug` in `DmaMgr_SendRequestImpl` about passing partially uninitialized struct

* Fix typo `forc_structure_alignment` -> "force"

* Move `CMD_F` to `z64cutscene_commands.h` since it is specifically for cutscene data

* Use `ALIGN16` macro more

* Use `ALIGN256` macro more

* Add `@bug` on two messed up 8-bytes-aligns

* Set `gSaveContext.nightFlag` to 0/1 instead of false/true

* Use `IS_DAY` macro more

* Run formatter

Co-authored-by: Yanis42 <yalink88@gmail.com>
2022-01-12 15:48:04 -05:00
Dragorn421
11917bf640
Cleanup around some generic animation info structs (#1059)
* Name generic anim info structs and cleanup usage

* Make `EnDaiku` use generic struct

* Add `/* decimalid */` comments to all added enums

* small fixes

* Two more generic animinfo structs

* Cleanup usage of newly generic structs

* Cleanup x2 usage of newly generic structs

* `transitionRate` -> `morphFrames`

* Properly name generic anim structs (attempt to at least)

* `anim` -> `animation`

* fixes

* run formatter

* Use consistent prototypes for each actor's ChangeAnim helper

* run formatter

* minor cleanup

* Run formatter

* `Animation_ChangeInfo` -> `Animation_ChangeByInfo`
2022-01-11 21:10:43 -05:00
engineer124
d3a8ade6ba
Migrate Remaining Audio Data & Cleanup some Audio Data externs (#1097)
* Import code_800F7260.bss.s

* Import code_800F9280.data.s

* format

* cleanup externs

* Move bss to next file

* Move struct_8016E320 (BgmRequests) back to file

* Move data to init_params, remove data pad (can't remove bss pad), ReverbSettings

* remove extra spacing

* Remove data/bss comments
2022-01-11 20:58:26 -05:00
engineer124
67f6b50de3
Document Parts of Camera Data (#1054)
* Add Data enum and fill ARRAY_COUNT

* Clean-Up

* Document camera settings

* Document scenes further

* Minor edit

* Cleanup

* More cleanup

* Oof, that was tedious

* Align function look-up tables

* Remove comments

* format

* Cleanup

* formatter gone wrong, hid comments from me

* format

* Dragorn PR Review 1

* Change approach to camera data using macros

* Clean up function and data map

* Cleanup Comments
2022-01-10 20:51:57 -05:00
Tom Overton
9e5a9d7dc9
Change all instances of "palette" in object symbols/OutNames to "tlut" (#1099) 2022-01-10 20:41:47 -05:00
engineer124
59e212c197
Document code_8006BA00 (Audio Sound Sources) (#997)
* Document SoundSources

* PR Suggestions

* Duration timers to dec

* `PlaySfxByPosAndId` -> `PlaySoundByPosition`

* Improve names

* `PlaySfxAtStationaryPosition` -> `PlaySfxAtFixedWorldPos` and `originWorldPos` -> `worldPos`

* format
2022-01-10 20:31:53 -05:00
Dragorn421
b1d3844325
Document undocumented matrix functions (#955)
* Document `func_800D1694` as `Matrix_TranslateRotateYXZ`

* Document `func_800D1FD4` as `Matrix_ReplaceRotation`

* Cleanup `Matrix_RotateAxis`

* Document `func_800A7EC0` as `SkinMatrix_SetRotateAxis`

* Document `func_800D2A34` and `func_800D2A98` as `Matrix_SetTranslateScaleMtx`(`F`)

* Document mostly unused functions at the end of `sys_matrix.c`

* Add in-use renamed functions to `namefixer.py`

* Add `Matrix_SetTranslateScaleMtx2` to `namefixer.py`

* Run formatter

* Fix namefixer.py mistake from #952

* Format clang-11.1

* Fix `Matrix_TranslateRotateYXZ` wrongly documented, it actually is `Matrix_SetTranslateRotateYXZ`

* VS Code is stellar at refactoring (no)

* Run formatter

* Come on VS Code

* Improve `Matrix_ReplaceRotation` docs

* Fix typo

* Fix namefixer.py
2022-01-11 00:28:01 +01:00
Dragorn421
0b8edc21c0
ACTOR_FLAG_11 -> ACTOR_FLAG_ENKUSA_CUT (#1065) 2021-12-27 13:24:41 -05:00
EllipticEllipsis
965677f014
Update recomp (#1085)
* Update linux

* Update macos
2021-12-27 13:09:43 -05:00
engineer124
b8b983dd7f
Nature Ambience Documentation (#1063)
* Document nature ambience io data

* Document nature ambience functions

* Function headers

* Doc storing main bgm for nature/miniboss bgm

* Give temporary names to functions

* small cleanup

* add docs to clarify

* Break up nature ambience channel io data for easier reading

* Add info to where each nature ambience Id is used

* Name environmental sequence functions

* Use channel macros globally

* Add nature enum, revert env name

* Revert tough-to-name functions, use nature channel enum instead

* Fill in remaining enums from sequence 1

* PR Suggestions

* Improve macros

* remove clang-format off

* MINI_GAME_2 -> TIMED_MINI_GAME

* Revert to generic name

* Fix Spacing
2021-12-27 12:35:05 -05:00
louist103
a862411f00
Objects4 (#1057)
* remove fake match

* merge master

* animations

* dog limbs

* textures

* KZ limbs and DL

* a few KZ textures and make a file for link_boy

* the rest of KZ

* Far Limb DLs

* near DLs and limbs

* small fix to child

* boots and some sword and more child clean ups

* a bunch of DLs

* fix boy

* fix link child for real this time

* adult should be good now

* progress

* all undefined symbols done

* progress

* done (for now)

* restore makefile

* child -> adult

* child -> adult

* dog fixes

* KZ fixes

* more player fixes

* remove unneeded enum in dog

* rename hookshot stuff

* Update z_player_lib.c

* revert model group stuff

* move comment

* fix mirror shield upper

* remove useless 2

* OOT -> Oot

* gauntlet plate 2 fix

* fix

Co-authored-by: Louis <louist103@pop-os.localdomain>
2021-12-27 08:08:26 -05:00
Ethan Roseman
6213fe3bbd
Fix Jenkinsfile 2021-12-19 00:31:22 +09:00
EllipticEllipsis
383a95d11e
Changed progress.py csv output to be compatible with new website (#1075)
* Changed progress.py csv output to be compatible with new website

* Increment and clarify csv version

* Update csv paths
2021-12-19 00:09:51 +09:00
Dragorn421
05b2cbfc60
Doc dodongo's cavern stuff (#1019)
* Document `func_80033480` more

* More doc in `BgDdanKd`

* WIP Document BgDodoago

The dodongo skull light-eyes-with-bomb puzzle
Some TODOs, jank/legacy code which I'm unsure if it achieves something significant

* Finish documenting BgDodoago

* `BgDodoago_WaitExplosives_` -> `BgDodoago_WaitExplosives`

* Run formatter

* `dlistBuffer` -> `displayListHead`
2021-12-10 20:21:19 -05:00
louist103
037c1dcad6
Cleanup more u32 being used as pointers. (#1052)
* merge master

* more u32 -> void*

* remove jenkins file

* format

* z64.h

* fix

* re cleanup z64scene.h
2021-12-07 14:19:13 -05:00
Dragorn421
15d3796574
Replace more constants with proper asset symbols (#1071) 2021-12-07 20:10:44 +01:00
Dragorn421
70b858b724
Name one is-controller-valid symbol (#1060)
* Document `D_8012DBC0` as `isCtrlr2Valid`

* `isCtrlr2Valid` missing `g` prefix

* Run formatter
2021-12-07 09:17:48 -05:00
Dragorn421
5f89b8543f
Cleanup variables.h (#1061)
* Cleanup `variables.h`

* `gSpeedMeterTimeEntryPtr` -> `sSpeedMeterTimeEntryPtr`
2021-12-06 14:03:42 -05:00
Chris
7fa513ec73
Update Dockerfile (#1062)
- Moved to ubuntu 21.10 as base image to be able to make use of GCC 11.2 and LLVM 13
- Cleaned up necessary packages a little
- Added simple instructions to the Dockerfile for easier usage
2021-12-06 13:28:36 -05:00
Roman971
a9b257c0a9
Minor README updates and cleanup (#1066)
* Update README for Windows 11 and distro version

* Improve naming consistency in the README
2021-12-06 12:53:32 -05:00
Dragorn421
a9284494f2
Use defines for actor flags (#873)
* Add ACTOR_FLAG_ defines

* Add ACTOR_FLAGS_ALL macro and use ACTOR_FLAG_* constants everywhere

* Remove unused ACTOR_FLAG_* constants

* actor flags in bigokuta & ko

* actor flags in obj_mure

* actor flags in stalfos, twinrova & ganon2

* actor flags in morpha & barinade

* name some previously missed actor flags

* found some comments using hex for actor flags

* Actor flags in ovl_En_Ganon_Mant

* Actor flags in EnWf

* Flags in en_zf

* Actor flags in BossGanon (FeelsOKMan)

* Remove `ACTOR_FLAG_NONE`

* Wrap expansion of `FLAGS` in parentheses

* `ACTOR_FLAGS_ALL` -> `CHECK_FLAG_ALL`

* Move `CHECK_FLAG_ALL` to `macros.h`

* Run formatter
2021-12-05 19:11:38 -05:00
engineer124
79220ba58a
Document Sequence Modes and Related Functions (#1046)
* Document Audio_SetSequenceMode

* Cleanup surrounding docs

* format

* Clean-up

* fix capital `I` in `playeridx`

* Dist -> DistSq

* `SetCamModeAndSeqMode` -> `UpdateCamAndSeqModes`

* Get rid of extra padding

* PR Feedback
2021-12-05 12:13:53 -05:00
fig02
e635e34265
Remove THIS macro (#1047)
* remove THIS

* fix

* forgot dorf
2021-12-04 11:33:00 -05:00
fig02
68899c2e33
git subrepo pull --force tools/ZAPD (#1049)
subrepo:
  subdir:   "tools/ZAPD"
  merged:   "a3363333d"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "a3363333d"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2021-12-03 21:57:05 +01:00
engineer124
5e9d24fca4
Clean Up Sequence Structs in Scene/Save/z64 (#1051)
* Clean up sound scene struct

* Follow-up cleaning

* cleanup

* Document forcedSeqId

* Update include/z64save.h

Co-authored-by: fig02 <fig02srl@gmail.com>

* Update include/z64.h

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

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-12-03 09:49:32 -05:00
Roman971
21a92ab95f
Fix sym_info.py and first_diff.py map lookup issues (#1055)
Symbol names like qNaN0x3FFFFF were detected as new sections in the map, which broke lookups for some sections of the ROM
2021-12-03 09:11:49 -05:00
fig02
4390dd74b6
boss_ganon (Ganondorf) OK (#1037)
* data migrated and OK

* some functions ported

* everything ported and updated

* merge message

* plenty of functions matched

* remove unwanted file

* 5 more, progress on update

* update matched

* fix proto

* fix

* func_808E06FC

* asm

* 2 left

* 1 more

* last function inital decomp

* Dbg MQ OK

* docs progress

* revert limb stuff

* some more docs

* docs progress

* more docs

* done with docs for now i think

* revert unwanted change

* some symbols

* anime2

* format

* small changes

* some more changes

* merge master and fix matrices

* reviews 1 and 2

* remove continue

* review 3 and 4

* un-name bodyPartsPos for now
2021-12-02 17:31:39 -05:00
Dragorn421
8ff1f242fa
Replace some more constants with proper asset symbols (#1053) 2021-12-02 16:19:19 -05:00
engineer124
1ac6e42b56
Cutscene Camera Commands: POS -> EYE, FOCUS -> LOOK_AT (#993)
* Cutscene Camera Commands: `POS` -> `EYE`, `FOCUS` -> `LOOK_AT`

* PR Suggestion: Update names with REL_TO

* Use newer name in macros, address PR comment
2021-12-02 22:04:55 +01:00
Dragorn421
b3d5f549e7
Document Actor_DrawDoorLock (#1045) 2021-12-01 19:32:23 -05:00
Dragorn421
ff49ace524
Symbol cleanup 4 (#1050)
* Replace some hardcoded constants with proper asset symbols

* Remove Blob which turned out to be a texture
2021-12-01 19:21:32 -05:00
Dragorn421
4a3809d4d2
Cleanup asset xmls (#1044)
* Consistent order for attributes of `Texture` nodes in asset xmls

* Consistent order for attributes of `Blob` nodes in asset xmls

* Use `LimbType` instead of `Type` in `Limb` nodes in asset xmls

* Remove space before closing `/>` in asset xmls tags
2021-12-01 15:28:23 -05:00
Dragorn421
1cf11907fa
Make progress.py count libultra files towards boot or code by using _*SegmentStart/End in the map (#1043) 2021-12-01 08:41:38 -05:00
Tharo
f1d183d6fe
libultra files and directories restructure (#1038)
* Restructure files, begin header restructure

* Format

* us2dex

* Fix parallel spelling

Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>

* Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer

* Uppercase hex, exception vector address defines

* Interrupt flags 1

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Interrupt flags 2

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-30 19:08:57 -05:00
engineer124
eabc918817
Name the coordinate transformation matrices (#1042) 2021-11-30 18:52:16 -05:00
Dragorn421
669732abbe
Misc Cleanup 2 (#1007)
* Cleanup `UNK_TYPE`, `UNK_PTR` usage

* Add some missing empty lines after declarations

* Remove some legacy comments from non-matching times

* Fix some grammar (mostly "it's"/"its")

* Use proper names for two symbols after ZAPD bugfix

* Cleanup `place_title_cards.xml`

* Use `NULL` to check against `D_8012D260` pointer

* Parentheses around some macro arguments

* wip proofread headers up to z64animation.h
2021-11-30 18:40:42 -05:00
Tharo
04a9d51e90
Rework handling of dmadata (#1036)
* Generate dmadata

* Remove tab indentations in mkdmadata.c and mkldscript.c

* Fix

* Review suggestions

* Hopefully fix

* Fix index

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-12-01 00:29:09 +01:00
engineer124
783ef3a117
Audio Sequence Player Ids Enum (#1040)
* bgm.h -> sequence.h

* First round of filling in enum

* More

* seqCmd

* format
2021-11-30 13:47:09 -05:00
Tharo
d9c1dffe09
Remove link_animetion related undefined sym (#1039) 2021-11-29 18:39:52 -05:00