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

1354 Commits

Author SHA1 Message Date
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
Blake Warner
9ff2402db8 fixes triforce texture in temple of time #21 2022-02-09 18:21:42 -05:00
Blake Warner
a75f3f5eb2 more asset DLs 2022-02-09 18:20:16 -05:00
Blake Warner
92a90c3986 added some missing DL 2022-02-09 17:18:36 -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
Blake Warner
48d8b50ce4 bf 2022-02-09 12:30:30 -05:00
Blake Warner
3b122b510c fixes crash #94 #95 2022-02-09 09:51:35 -05:00
Blake Warner
306ce9158c bf 2022-02-09 08:05:15 -05:00
Blake Warner
5737d035a8 fix backwards compat with setup.py 2022-02-09 00:23:19 -05:00
DaMarkov
380f9aaf25
Fixed the grayed out (disabled) items in the pause menu. (#94)
KaleidoScope_GrayOutTextureRGBA32() expected an RGBA texture.
Rewrote the function for ABGR textures.

Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
2022-02-08 22:56:17 -05:00
Blake Warner
49984bf064 GLideN64 update 2022-02-08 22:54:51 -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
8185f70634 fix: link animation LUT added
Signed-off-by: Blake Warner <blake@null3d.com>
2022-02-08 20:20:10 -05:00
Hayden Kowalchuk
02a0769fc1 feat: small UB fixes
Signed-off-by: Blake Warner <blake@null3d.com>
2022-02-08 20:19:03 -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
6682f10003
GLideN64 was not shut down correctly. (#91)
Added gfx_shutdown() at the end of main_func()

Co-authored-by: DaMarkov <DaMarkovZED@gmail,com>
2022-02-08 14:37:49 -05:00
DaMarkov
c5a0dc295c
GLideN64 in OOT solution (#90)
* Added project files for GLideN64 to vs/.
Added these to OOT.sln so that all projects can be build with a single build command.
Also marked GLideN64 as a dependency for OOT so that a change in GLideN64 causes a compilation of OOT.

* Renamed x86 to Win32 so that the 32 bit configuration becomes the default when opening the solution the first time.

* Updated README.

Co-authored-by: DaMarkov <DaMarkovZED@gmail,com>
2022-02-08 14:18:41 -05:00
Blake Warner
84ee29eff7
Merge pull request #89 from DaMarkov/update-gitignore
Updated .gitignore
2022-02-08 13:01:42 -05:00
DaMarkov
2fca773372 Updated .gitignore.
This now ignores z_kankyo_assets.h, z_message_PAL_assets.h, z_scene_assets.h, z_scene_table_assets.h, z_vr_box_assets.h.
OOT.vcxproj.user (created by Visual Studio).
.log and .sav files generated by OOT.exe.
2022-02-08 18:17:37 +01:00
DaMarkov
3d3d736160
Added SDL2 static lib (32 and 64 bit). (#87)
Changed OOT project file to link against the static lib of SDL2.

Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
2022-02-08 11:16:25 -05:00
HungryBananaSalad
b39061af8d
Refactor setup_assets.bat into python; Add cleanup before build (#86)
Co-authored-by: HungryBananaSalad <>
2022-02-07 20:29:02 -05:00
wowjinxy
d65c595fec
Altered the boot info to represent modern builds (#85)
and a few translations
2022-02-07 19:29:29 -05:00
Blake Warner
eda4033bb6 moved debug menu controls to the c-pad 2022-02-07 17:54:15 -05:00
Bryan Kirk
cda941a994
Update ISSUE_TEMPLATE.md 2022-02-07 16:13:29 -05:00
Bryan Kirk
91cac03928
Update ISSUE_TEMPLATE.md 2022-02-07 16:08:37 -05:00
Bryan Kirk
603bc1d9d0
Create ISSUE_TEMPLATE.md 2022-02-07 16:02:55 -05:00
Blake Warner
47ceb4a3f1
Merge pull request #83 from GreenSwede/master
Add L_TRIG to keyboard + exit code 1 prompts to .bat
2022-02-07 08:02:19 -05:00
GreenSwede
433d37bb3a Pip dependency check + exit code 1 capture
Added tqdm and pathtools check. If they are not found when running fixbaserom.py, throw exit code 1.

Added button input prompt to give the user time to catch Python errors when ran through setup_assets.bat.
2022-02-07 13:32:47 +01:00
GreenSwede
ce27f3e221 Bind L_TRIG to X on keyboard
L-trigger toggles the minimap
2022-02-07 10:34:36 +01:00
HungryBananaSalad
5ba54aa5d1
Fix duplicate file extensions (#80)
Co-authored-by: HungryBananaSalad <>
2022-02-06 22:47:46 -05:00
HungryBananaSalad
3784f965e9
Multithreading for Asset Conversion (#79)
* Refactor asset conversion and add multithreading

* Improve Asset Conversion print message

Co-authored-by: HungryBananaSalad <>
2022-02-06 21:35:48 -05:00
Blake Warner
5f3fe3787d
Merge pull request #78 from wowjinxy/master
Level Select Translated
2022-02-06 19:43:48 -05:00
GreenSwede
c4ca168cc5
Fix some debug typos generated by translation (#77)
* remove incompatible multiprocessing pip package

* fix some debug typos generated by translation
2022-02-06 19:43:42 -05:00
wowjinxy
dc91a7f19f
Merge branch 'blawar:master' into master 2022-02-06 16:41:44 -08:00
wowjinxy
c77a5e3c08 Level Select Translated 2022-02-06 18:40:45 -06:00
wowjinxy
21baa02bf1
Debug strings translated (#76) 2022-02-06 19:04:50 -05:00
wowjinxy
56a30a64b2 Debug strings translated 2022-02-06 17:56:25 -06:00
Blake Warner
bee6ff7803
Merge pull request #75 from HungryBananaSalad/extract-assets-progress-bar
Added Progress Bar to Asset Extraction
2022-02-06 18:32:01 -05:00
HungryBananaSalad
1f78f749ee Added Progress Bar to Asset Extraction 2022-02-07 00:29:28 +01:00
GreenSwede
288e96c79a
remove incompatible multiprocessing pip package (#73) 2022-02-06 18:11:24 -05:00
Blake Warner
a2d4e2280f fixed python error with multithreaded extract_assets.py 2022-02-06 16:48:52 -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
HungryBananaSalad
5774aa9332
Asset Extraction switch to multithreading (#71)
Co-authored-by: HungryBananaSalad <>
2022-02-06 15:30:09 -05:00
Bryan Kirk
d6bdf10deb Removed message data assets 2022-02-06 13:50:24 -05:00
Hayden Kowalchuk
1fa2d716a2 feat: correct and document Path lists
Signed-off-by: Blake Warner <blake@null3d.com>
2022-02-06 11:05:11 -05:00
Blake Warner
f720ffef4e switched ZAPD to 32bit binary 2022-02-06 10:49:02 -05:00
Blake Warner
d63b27e8fe
Merge pull request #66 from DaMarkov/map-select-back-button
Back back on controller opens map select
2022-02-06 10:45:42 -05:00
Blake Warner
af6861343e updated readme build process 2022-02-06 10:34:55 -05:00
Blake Warner
ae29814efc fixed message lookup (again), added F9 language toggle hotkey 2022-02-06 10:34:55 -05:00