1
0
mirror of https://github.com/blawar/ooot.git synced 2024-07-04 18:13:37 +00:00
Commit Graph

495 Commits

Author SHA1 Message Date
Blake Warner
2e837de83e stack overflow fix 2022-02-19 08:53:36 -05:00
Blake Warner
525d226ca6 stack overflow fix 2022-02-19 08:37:22 -05:00
Blake Warner
41bd8fe0d1 added gfx_ar call 2022-02-18 20:34:20 -05:00
Blake Warner
5d48166b07 fps tweaks 2022-02-18 20:24:29 -05:00
DaMarkov
7c20a4bf14
Changed Color_RGBA8_u32 struct (#163)
* Changed `Color_RGBA8_u32` struct.

* Removed one color class and a replaced it with the correct one.

* Fixed the color issue in GfxPrint

Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
2022-02-18 11:02:08 -05:00
Zelllll
14d5c2c0fa zel's pal 1.0 retail support 2022-02-17 23:47:57 -05:00
Blake Warner
db1c218db6 refactored build system to support multiple roms 2022-02-17 22:03:25 -05:00
DaMarkov
25b04b02ca This commit contains all changes made in the rumble branch. 2022-02-17 14:40:45 +01:00
DaMarkov
36c6c419b2 Renamed a few variables. Got rid of one unused variable and an unused function. 2022-02-17 01:24:09 +01:00
Blake Warner
1ab390a646 slight refactor 2022-02-16 17:54:09 -05:00
Blake Warner
2215778c69 added actor reset callback #131 #122 #124 #134 #135 2022-02-16 00:59:13 -05:00
Blake Warner
6d4faff5a8 refactored z_player.h 2022-02-16 00:59:10 -05:00
Blake Warner
50e237f5be small tweak 2022-02-16 00:58:27 -05:00
Blake Warner
688e2fa2c2 changed global frame to counter 2022-02-14 10:56:17 -05:00
Blake Warner
b855643760 higher frame framework 2022-02-14 10:56:17 -05:00
Blake Warner
4ce1221e81 fixed audio crash 2022-02-14 10:56:17 -05:00
Blake Warner
ba10617dbe bf 2022-02-14 10:56:17 -05:00
Blake Warner
b9c0619828 cpp conversion 2022-02-14 10:56:16 -05:00
Blake Warner
aaeb80f0cb sound timings working #108 #103 #82 #74 #43 #19 2022-02-11 00:59:26 -05:00
Blake Warner
3ad159855d moved segment marking into ZAPD 2022-02-11 00:00:50 -05:00
DaMarkov
ef8e89ba9b Rewrote func_800D2CEC to little endian 2022-02-10 15:35:42 +01:00
DaMarkov
4b2ad84a88
Fixed the cursor in the pause menu. (#100)
And got rid of one THGA_Alloc

Co-authored-by: DaMarkov <DaMarkovZED@gmail,com>
2022-02-09 19:40:11 -05:00
DaMarkov
a4134c4412
Reduced the size of the arrays. (#99)
Thanks to mrneo240!
Also fixed another `gItemIcons` -> `gItemIconsCurrent` replacement.

Co-authored-by: DaMarkov <DaMarkovZED@gmail,com>
2022-02-09 15:44:55 -05:00
DaMarkov
bc9ef339a8
Rewrote the GrayOutTexture functions. (#98)
Added the array gItemIconsGray that holds all grayed out icons.
Added the array gItemIconsCurrent that points to either the original or grayed out icons.
Gray icons are generate at game start.

Co-authored-by: DaMarkov <DaMarkovZED@gmail,com>
2022-02-09 14:48:19 -05:00
DaMarkov
ac2b25f6a5
Framebuffer emulation (#92)
* Changed solution file so that GLidenN64 is also included as a project.
Set GLidenN64 as dependency of OOT.

* Added preliminary support for frame buffer emulation (FBE).
Added a text box and code the switch FBE on/off during gameplay.

* Added back a few vi* files from libultra.
Part of the implementation has already moved to ultra_reimplementation.cpp.

* Disabled the post-processing step in PreRender_Calc() to restore the pause menu.

* Moved the enable frame buffer emulation to pc_main, so that it can be deactivated without recompiling GLidenN64.
This will also make the updated GLidenN64 (with FBE) compatible with the old OOT (FBE disabled).

* Renamed func_80095248().

* Moved code from io/vi*.c into ultra_reimplementation.cpp.
And other code cleanup.

* Further cleanup. (idle.c, viconfig.c)

* Removed viconfig.c.
Changed the vi*.c files in libulta/io to the state they are in OOT master.

* Removed function from ultra_reimplementation.cpp that are not necessary.

* Reverted idle.c back to the state it's in master.
Further cleanup.

Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
Co-authored-by: DaMarkov <damarkov@gmail.com>
2022-02-08 21:09:53 -05:00
Hayden Kowalchuk
59c1b2e2c9 fix: use length for ucode related
Signed-off-by: Blake Warner <blake@null3d.com>
2022-02-08 20:18:36 -05:00
DaMarkov
32891b7424
Fixed all bank IDs (#69)
* Fixed cucco lady. `objectOsAnimeIndex` is at least 16 bits large.

* Changed `objectOsAnimeIndex` to `s32` since its a bank id.

* Went through all instances of `Object_GetIndex` to find other bank IDs that are only of size `s8`.
Changed them all to `s32`. This has changed the sizes of a few structs.
Thanks to vertigo!

Co-authored-by: DaMarkov <damarkov@gmail.com>
2022-02-06 16:01:27 -05:00
Blake Warner
ae29814efc fixed message lookup (again), added F9 language toggle hotkey 2022-02-06 10:34:55 -05:00
Blake Warner
0da1b3227e fixed black texture on movable block in deku tree #34 2022-02-04 17:39:50 -05:00
Blake Warner
5769930217 fixed early unloading of objects in widescreen #18 2022-02-04 15:28:32 -05:00
Blake Warner
fb33eacb27 added missing prototypes for previous PR 2022-02-03 21:26:36 -05:00
DaMarkov
b05ab528d4 Renamed two functions in z_actor which are responsible for culling.
Also renamed ACTOR_FLAG_5 to ACTOR_FLAG_UNCULLED.
Introduced the compiler flag NO_CULLING to disable culling.
This should ensure that all actors get rendered independent of the distance
to the camera.
2022-02-03 20:28:55 +01:00
john doe
1b4feced6a port merge 1 2022-01-31 19:05:17 -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
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
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
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
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
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
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
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