1
0
mirror of https://github.com/blawar/ooot.git synced 2024-07-02 09:03:36 +00:00
Commit Graph

186 Commits

Author SHA1 Message Date
Blake Warner
48a5ad5bfa started to refactor setup rom hashing 2022-04-13 17:00:41 -04:00
Blake Warner
f14c743b52 fixed zapd 64bit release project 2022-04-03 21:21:51 -04:00
Blake Warner
cc3f0550b5 fix zapd 2022-04-03 20:38:31 -04:00
Blake Warner
139c8950e9 bf 2022-04-03 18:25:32 -04:00
Blake Warner
6aebafb63f fixed trailing comma in zapd mtx 2022-04-03 18:25:32 -04:00
Blake Warner
ed431ca968 more linux fixes 2022-04-03 18:25:32 -04:00
Franklyn Tackitt
f7bba0253c Fix tools on linux, hopefully portably 2022-04-03 18:25:32 -04:00
Blake Warner
5aa53bcd64 fix os path sep 2022-04-03 18:25:32 -04:00
Blake Warner
b333a47586 initial linux commit (does not compile) 2022-04-03 18:25:31 -04:00
Blake Warner
e41314624f save 2022-03-22 22:06:40 -04:00
Blake Warner
938e41871d added debug path output for fixbaserom failure 2022-03-05 00:13:07 -05:00
Blake Warner
beb9f01f27 allow big endian audio extraction 2022-03-02 19:49:37 -05:00
Blake Warner
a45b80bdf6 fixed off by 1 error in sameple bit fields 2022-03-01 23:18:17 -05:00
Blake Warner
461206d6ea added support for multiple rom hashes 2022-03-01 17:10:23 -05:00
Blake Warner
b4f0eba3d9 audio partially working 2022-03-01 14:19:45 -05:00
Blake Warner
21fa4bacc6 bf 2022-02-18 00:09:37 -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
Blake Warner
33bc628d9a fixed assets extraction scripts for cpp 2022-02-14 10:56:17 -05:00
Blake Warner
818c92ce7f update zapd binary 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
Blake Warner
6dc4511c68 fixed collisions / hookshot #101 reverted ZAPD back to 64-bit 2022-02-10 20:46:50 -05: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
f720ffef4e switched ZAPD to 32bit binary 2022-02-06 10:49:02 -05:00
Blake Warner
ae29814efc fixed message lookup (again), added F9 language toggle hotkey 2022-02-06 10:34:55 -05:00
Blake Warner
52fe9651fb fixed 32bit MSVC compile for ZAPD 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
2218b39c04 fixed jpeg decoding #31 #10 2022-02-04 08:22:24 -05:00
Torphedo
39a03a96c9 Fix Windows build/extraction 2022-02-03 20:17:41 -05:00
Blake Warner
ad66dfff1f fixed fs path ZAPD bug and improved setup_assets.bat 2022-02-03 17:39:16 -05:00
Blake Warner
3fb1030588 update build process 2022-02-02 14:34:16 -05:00
Blake Warner
c6c4bf42df added setup_assets.bat for easier asset extraction 2022-02-02 09:36:04 -05:00
Blake Warner
95e7905eef fixed regex in mark_segments.py 2022-02-01 08:05:41 -05:00
Blake Warner
6fb5bfe200 bf in mark_segments.py 2022-01-31 22:57:15 -05:00
Blake Warner
5af7972ddc more build refinements 2022-01-31 22:43:13 -05:00
Blake Warner
850968e32f bf 2022-01-31 21:17:08 -05:00
Blake Warner
27a823e980 bf 2022-01-31 21:15:30 -05:00
Blake Warner
6a781d9bb2 bf and removed unneeded scripts 2022-01-31 20:38:41 -05:00
Blake Warner
5c5604e0fa explicitly set abs paths for bad python installs 2022-01-31 20:08:09 -05:00
Blake Warner
75a4c38eb2 bf 2022-01-31 19:54:22 -05:00
Blake Warner
03c03eb673 fixed error in create_luts.py 2022-01-31 19:28:45 -05:00
john doe
1b4feced6a port merge 1 2022-01-31 19:05:17 -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
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
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
Roman971
8d4828a3be
Add pad_text to mkldscript and update progress.py (#1024)
* Add pad_text to mkldscript and update progress.py

Implements `pad_text` from MM and uses it instead of asm nops for the padding in ucode_disas.
Also updates `progress.py` to account for the change (RIP 1000000 code size), and to have a green badge for 100%.

* Remove 1.00mb comment in progress.py

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

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-11-24 03:31:44 +09:00
Tharo
a497f33bda
z_message_PAL, message_data_static and surrounding doc (#996)
* Initial progress on z_message_PAL, very messy

* Fix merge

* Some more progress

* Fix merge

* More z_message_PAL

* Small progress

* More small progress

* message_data_static files OK

* Prepare z_message_tables

* Matched another function, small updates

* Attempt to use asm-processor static-symbols branch

* Refactor text id declarations

* Begin large text codes parser function

* Fix merge

* Refactor done

* Build OK, add color and highscore names

* Remove encoded text headers and automatically encode during build

* Fix kanfont

* Various cleanups

* DISP macros

* Another match aside data

* Further progress

* Small improvements

* Deduplicate magic values for text control codes, small improvements

* Tiny progress

* Minor cleanups

* Clean up z_message_PAL comment

* Progress on large functions

* Further progress on large functions

* Changes to mkldscript to link .data in the .rodata section

* data OK

* Few improvements

* Use gDPLoadTextureBlock macros where appropriate

* rm z_message_tables, progress on large functions

* 2 more matches

* Improvements

* Small progress

* More progress on big function

* progress

* match func_80107980

* match Message_Update

* match func_8010BED8

* done

* Progress on remaining large functions

* Small progress on largest function

* Another match, extract text and move to assets, improve text build system

* Small nonmatchings improvements

* docs wip

* Largest function maybe equivalent

* Fix merge

* Document do_action values, largest function is almost instruction-matching

* Rename NAVI do_action to NONE, as that appears to be how that value is used in practice

* Fix merge

* one match

* Last function is instruction-matching

* Fix

* Improvements thanks to engineer124

* Stack matched thanks to petrie911, now just a/v/low t regalloc issues, some cleanup

* More variables labeled, use text state enum everywhere

* More labels and names

* Fix

* Actor_IsTalking -> Actor_TalkRequested

* Match func_8010C39C and remove unused asm

* More docs

* Mostly ocarina related docs

* All msgModes named

* Fix assetclean

* Cleanup

* Extraction fixes and headers

* Suggestions

* Review suggestions

* Change text extraction again, only extract if the headers do not already exist

* Fix

* Use ast for charmap, fix assetclean for real this time

* Review suggestions

* BGM ids and ran formatter

* Review comments

* rename include_readonly to include_data_with_rodata

* Remove leading 0s in number directives

* Review suggestions for message_data_static

* textbox pos enum comments, rename several enum names from Message to TextBox

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <romanlasnier@hotmail.com>
2021-11-22 20:20:30 -05:00