mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00
Code Issues Projects Releases Wiki Activity
1266 commits 1 branch 0 tags 486 MiB
Commit graph

1266 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dragorn421
c6b9a92139
Add Makefile dependencies to rebuild some files when editing actor, object and effect tables in include/tables/ 2021-12-23 23:43:12 +01:00
Dragorn421
dbfdf90257
Merge branch 'master' into fix_misc_4 2021-12-23 23:37:27 +01:00
Dragorn421
7689cade11
sDmaMgrDataExistError -> sDmaMgrIsRomCompressed bool 2021-12-23 23:37:22 +01: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
88474d7cb5
sgiDrawIds -> giDrawIds 2021-12-16 17:42:23 +01:00
Dragorn421
ec4d0fa5a3
Run formatter 2021-12-16 16:50:23 +01:00
Dragorn421
148694d60f
Minor cleanup 2021-12-16 16:47:25 +01:00
Dragorn421
d54fb8c125
Merge branch 'master' into fix_misc_4 2021-12-16 16:33:56 +01:00
Dragorn421
84f374a9a9
Merge branch 'fix_misc_4' of github.com:Dragorn421/oot into fix_misc_4 2021-12-16 16:30:53 +01:00
Dragorn421
419473b77e
Introduce ACTORCAT_MAX 2021-12-13 22:46:07 +01:00
Dragorn421
eaf3d76dd1
Missing empty line after declaration 2021-12-12 19:30:22 +01:00
Dragorn421
cb217fae66
10 -> ARROW_NUT for spawning EnArrow 2021-12-12 19:29:49 +01:00
Dragorn421
0706d2b3b0
Cleanup parameters passed to Actor_SpawnFloorDustRing 2021-12-12 15:17:47 +01: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
Roman971
54d77c71f1
Improve gfxprint documentation and strings (#1028) 
* Improve gfxprint documentation and strings

* Add GFXP_UNUSED_CHAR and rename bss variable
 2021-11-28 08:48:17 -05:00
Roman971
1fa6e3874b
Move kaleido scope and map mark data to a misc folder (#1033) 2021-11-28 08:25:30 -05:00
Tharo
982e7be1f7
Preliminary fixes for boot/libultra (#1032) 
* Preliminary fixes

* Missed a NULL
 2021-11-28 07:50:35 -05:00
Roman971
09f0dc84b8
Fix the format of some overlay textures (#1030) 2021-11-28 06:27:59 -05:00
Roman971
f68ac1d193
Fix the rupee count in progress.py (#1034) 
* Fix the rupee count in progress.py

* Use python integer division

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2021-11-28 06:06:27 -05:00
Roman971
d241bfb7ec
Cleanup unnecessary &'s on function/array pointers (#1031) 2021-11-28 05:47:55 -05:00
Roman971
6efb590699
Various minor cleanups (#1029) 
* Fix some disp usage in EffectSsGMagma2

* Fix some incorrect SAC flags

* Remove some instances where bool was used

* Fix a few line numbers to be decimal

* Remove MatrixInternal and use Mtx instead

* Fix gs flag names to be plural for consistency

* Fix some hex numbers to be uppercase

* Fix instances of 0X for hex numbers
 2021-11-26 17:37:33 -05:00
Anghelo Carvajal
c36decaf50
Texture alignment macro and a bit of cleaning (#927) 
* Add ALIGNED8

* Add designated initializers for cutscene macros

* Fix typo in ovl_Boss_Sst XML

* Fix extraction of ovlMagicDark

* names suggestions

* Remove braces

* fix
 2021-11-24 21:41:23 -05:00
louist103
665283432b
Even more objects (#913) 
* malon adult limbs and enum

* malon adult animations

* Malon Adult textures

* Object_ma2 OK

* Cleanup undefined syms file

* more cleanup

* object_in OK

* change

* Object_TA limbs and Limb DLs ok

* Textures in DLs OK

* Object TA animations OK

* Object TA OK

* clean up the xml

* almost done with impa textures

* name impa draw funcs

* fix globalCtx2 in talon_init

* more progress in impa

* eye texture stuff

* impa OK

* remove files

* fix messed up merge

* Switch MA2 blink timer from hex

* Name a function

* Fix skelanime fixer

* Missing malon adult TLUT

* add some missing symbols in DemoEc

* Fix conflicts, part2

* Clean up TLUT related stuff and some minor things

* Remove unused externs from z_demo_ec

* Remove unused symbols from undefined_syms.txt

* PR fixes (Dragorn)

* Dragorn fixes

* Fix various texture-related issues in object_link_child

* Update assets/xml/objects/object_in.xml

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

* Update assets/xml/objects/object_ta.xml

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

* Update assets/xml/objects/object_ta.xml

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

* Update assets/xml/objects/object_ta.xml

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

* Update assets/xml/objects/object_ta.xml

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

* Update assets/xml/objects/object_in.xml

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

* Update assets/xml/objects/object_in.xml

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

* Update assets/xml/objects/object_in.xml

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

* Update assets/xml/objects/object_in.xml

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

* Update assets/xml/objects/object_in.xml

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

* fix ingo and the rest of Dragorns fix

* impa fixes

* fix ingo again

* fix windmill man missing TLUT

* Fix impa in viewer

* Roman's fixes

* Add limb

* Missed an animation

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2021-11-24 19:37:36 +01:00
Roman971
0f58b15b27
Minor data/ cleanups (#1025) 
* Moved code_800D2E30's data to C
* Moved some audio data from asm to C
* Made separate data files for unknown pointer arrays
* Fixed a few missing balign directives
 2021-11-23 21:07:48 -05:00