1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-23 07:45:55 +00:00
Commit graph

2086 commits

Author SHA1 Message Date
fig02
6a8c556bdb
Add make_options.mk (#2016)
* make-options.mk

* fix file name

* Make more settings overwritable with .make_options.mk and group them together

* PAL -> EU

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-08-06 13:32:34 -04:00
cadmic
6c4935dc18
Use recomp instead of qemu-irix in Jenkins (#2014) 2024-08-03 21:43:26 -04:00
Dragorn421
ff2abf36a1
Remove tutorial, link to the latest zeldaret/oot:main revision with it (#2013)
* Remove tutorial, link to the latest zeldaret/oot:main revision with it

* proofreading here too

* rename to decompiling_tutorial

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
2024-08-02 21:20:54 -04:00
cadmic
0da402b9de
Automate fixing BSS ordering (#2009)
* Automate fixing BSS ordering

* Typo

* Some cleanups

* Move pragma check after printing BSS info

* Some proofreading

* multiprocessing, require version, some colors

* Tweak output

* Black + mypy

* Move logging and sys.exit out of helper functions

* Use stdout instead of stderr in fix_bss.py

* Add suggestion to conflicting offsets error

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

* Remove var = list[T]()

* Improve error handling

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

* Add error if no pointers to BSS

* Add comment about process_file_worker

* Only print updates if stdout is a tty

* Use new binary-search-esque candidate generation algorithm

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

* Add Wikipedia link

* More comment tweaks

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-02 20:31:15 -04:00
fig02
078e21f6c6
InitVars -> Profile (#2011)
* rename ActorInit

* rename actorInit

* rename initInfo

* EffectSs Profile

* _InitVars -> _Profile

* format, loose ends

* revert tutorial
2024-08-02 17:50:02 -04:00
Dragorn421
a083a15650
Clean up gitignore (#2012)
* Clean up gitignore

* review

* reivew
2024-08-02 01:49:53 -04:00
Dragorn421
cc7eef6f9c
fix zfishing bss 2024-08-01 22:23:25 +02:00
Dragorn421
c750eca0bd
merge fixup 2 2024-08-01 22:15:30 +02:00
Dragorn421
594e461cb9
merge fixup 2024-08-01 22:13:00 +02:00
Dragorn421
4dd0649478
Merge commit '8ee485d2e7b237a785ac0cf3870117944c923a07' into doc_pause_menu 2024-08-01 21:47:53 +02:00
Dragorn421
9169d886bc
Merge commit '7fcbf3f4b280e26284a8f62dbcb5b72d0e24dcc4' into doc_pause_menu 2024-08-01 21:47:44 +02:00
Dragorn421
74c4839f8a
Merge commit 'ab2ca85227bb4ed245d3a39faedc25f793a39a45' into doc_pause_menu 2024-08-01 21:47:27 +02:00
Dragorn421
b6581fd43e
Merge commit 'bf3339a16d6bf1d48165853540f20aebfdf5367a' into doc_pause_menu 2024-08-01 21:39:02 +02:00
Dragorn421
7e49dfcabd
Merge commit 'baf1e8c1748b6440e5d594a8d0079d4eb2e3acee' into doc_pause_menu 2024-08-01 21:33:10 +02:00
Dragorn421
2b425dfa62
Merge commit '1b0e35c89ad8875272a568ae4ab1e301e99e9316' into doc_pause_menu 2024-08-01 21:32:54 +02:00
Dragorn421
73ba1f864d
Merge commit '24571203df84c3294c8410260160cd5a3e9cfa68' into doc_pause_menu 2024-08-01 21:29:53 +02:00
Dragorn421
1a5eb5cd92
Merge commit 'd8f2e9abc67163a366fa2e62ac5d2d7467dfdb65' into doc_pause_menu 2024-08-01 21:29:41 +02:00
Dragorn421
dc599911db
Merge commit 'b2d80568b9f1a1e59e9e00f29d3936c7cd7e18c3' into doc_pause_menu 2024-08-01 21:29:29 +02:00
Dragorn421
43931defff
Merge commit '05c87518e7ef5b6f12792c38975aa6a06cbaaf60' into doc_pause_menu 2024-08-01 21:28:06 +02:00
Dragorn421
2b24b8a07a
Merge commit '87a6e752429a7821ae81dcf8bffc6cdf13803084' into doc_pause_menu 2024-08-01 21:23:12 +02:00
Dragorn421
3786fa4062
Merge commit 'f643499462f8cf908ddf1ee77b5625ebaff2cf25' into doc_pause_menu 2024-08-01 20:34:36 +02:00
Dragorn421
0561d05c44
Merge commit '8456e4be8a61c586b84476e7b17a32d971099593' into doc_pause_menu 2024-08-01 20:33:21 +02:00
Dragorn421
eca2c3e10d
Merge commit '39de6ce293d4f2ea31013a746404d730aca3f061' into doc_pause_menu 2024-08-01 20:18:13 +02:00
Dragorn421
9963e7f5d5
Update vs code config and provide c_cpp_properties.json with all supported versions (#2010)
* Update oot-gc-eu-mq-dbg example vscode config and provide c_cpp_properties.json with all supported versions

* remove N64 prefix from config names

* newline at end of file
2024-07-31 23:19:46 -04:00
Tharo
8ee485d2e7
Create build directories for committed assets (#2007) 2024-07-29 17:16:53 -04:00
cadmic
0db9e7275f
Fix Makefile performance regression with OOT_VERSION define (#2006) 2024-07-29 15:57:35 -04:00
cadmic
ec5068c58d
Introduce OOT_VERSION and OOT_REGION defines for build info and ROM header (#2003)
* Use version defines for build info and ROM header

* Use existing REGION_ defines for OOT_REGION instead
2024-07-28 00:46:55 -04:00
cadmic
5515aa1705
Configure incbins in version config instead of using the Debug ROM (#2005)
* Run CPP for data/*.s

* Configure incbins in version config instead of using the Debug ROM
2024-07-28 00:24:13 -04:00
cadmic
067d06bb56
Match NTSC loose ends (#2004)
* Match NTSC loose ends

* Add comment about giObjectSegment size
2024-07-28 00:09:05 -04:00
fig02
7fcbf3f4b2
Document ANIM_FLAG_PLAYER_2 as ANIM_FLAG_DISABLE_CHILD_ROOT_ADJUSTMENT (#2001)
* name ANIM_FLAG_DISABLE_CHILD_ROOT_ADJUSTMENT

* reword

* typo
2024-07-27 23:47:58 -04:00
fig02
d905e08daf
Document bottle color bug (#2000)
* bottle color bug

* adjust wording

* format

* small thing

* reword

* missed a letter
2024-07-27 23:16:00 -04:00
cadmic
294da9e355
Detect shifted .bss sections in check_ordering.py (#1992)
* Restrict check_ordering.py to .bss sections by default

* Detect shifted .bss sections in check_ordering.py
2024-07-27 22:29:15 -04:00
Tharo
7244cd62a5
Restore makefile rules for building asset files out of the assets directory (#2002)
* Re-add makefile rules for building asset files out of the assets directory

* Fix ASSET_FILES_OUT
2024-07-23 18:47:00 -04:00
cadmic
47fd023238
Match NTSC z_kanfont.c and z_message.c (#1997)
* Match NTSC z_kanfont.c and z_message.c

Co-authored-by: inspectredc <inspectredc@gmail.com>

* Apply suggestions from code review

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Remove now-unnecessary padding

* Remove msgBufDecoded comment

* Use == NULL for fake match

* Rename Message_DrawText{JPN,NES} -> Message_DrawText[Wide]

* Font_LoadKanji -> Font_LoadCharWide

* Restore FONT_MESSAGE_OFFSET/FONT_MESSAGE_LENGTH

---------

Co-authored-by: inspectredc <inspectredc@gmail.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2024-07-21 21:50:20 -04:00
fig02
ab2ca85227
Rename ANIM_FLAG_NO_MOVE to ANIM_FLAG_ADJUST_STARTING_POS (#1981)
* rename flag and draft 1 of comment

* draft 2

* tweak wording

* format

* format
2024-07-21 19:27:25 -04:00
Derek Hensley
2361a33307
Small cleanup of cleararena (bootclear) (#1999)
* cleararena use boot end

* cleararena -> bootclear
2024-07-21 15:22:54 -04:00
inspectredc
e1dc4cf448
Nicer AudioSeq_SequenceChannelProcessScript match (#1996)
* Nicer AudioSeq_SequenceChannelProcessScript match

* cadmic suggestion
2024-07-18 21:56:53 -04:00
Tharo
c1341224f9
Promote the warnings implicit-int, int-conversion, incompatible-pointer-types to errors (#1995) 2024-07-18 12:58:59 -04:00
Tharo
17a88746e7
Fix a couple of render modes (#1994) 2024-07-17 19:45:22 -04:00
Dragorn421
a1c7937dba
make format.py clean up extra whitespace, also in .h files (#1991)
* make format.py clean up extra whitespace, also in .h files

* fixup

* cleanup whitespace msg

* Update check_format.py to also check non-src files touched by format.py

* format
2024-07-17 19:32:55 -04:00
cadmic
aaad2e1caf
Match NTSC z_en_mag.c (#1989) 2024-07-17 19:11:24 -04:00
cadmic
c83b93aae4
Match NTSC z_parameter.c and z_construct.c (#1987)
* Match NTSC z_parameter.c and z_construct.c

* Comment which REG collide

* Use new REGs everywhere

* Use new REGs everywhere for real
2024-07-17 18:52:38 -04:00
cadmic
4fbb48177f
Create FILENAME_ macros for NTSC filename encoding (#1986)
* Create FILENAME_ macros for NTSC filename encoding

* Add defines/comments for all filename characters

* FILENAME_EXCLAMATION_POINT -> FILENAME_EXCLAMATION_MARK to match kanji file

* hirigana -> hiragana
2024-07-17 18:36:17 -04:00
cadmic
f0796afb86
Fix extract_assets.py error message (#1985) 2024-07-17 18:13:39 -04:00
cadmic
a6438f0533
Handle messages with different box types/positions between JPN/NES (#1984)
* Handle messages with different box types/positions between JPN/NES

* Remove redundant case

* More asserts

* Be a bit more Pythonic
2024-07-17 17:56:00 -04:00
mzxrules
7eee97429f
Clean up custom LoadTextureBlock in z_map_mark.c and z_lmap_mark.c (#1896)
* experimental inc.c

* make it look proper

* make table types u32

* ZCONST -> COND_CONST

* Tharo suggestion and comment

* implement MM Decomp suggestions

* fix minor nits

* Update header guard
2024-07-17 17:35:37 -04:00
cadmic
bf3339a16d
Set up build system and disassembly for gc-us (#1982)
* Build gc-us

* Set up gc-us disassembly

* Don't disasm unchanged overlays

* Fix gc-eu-mq BSS

* romalign link_animetion for NTSC

* Explicitly set CPP defines to 0/1

* Add #ifs to segment_symbols.h

* Add sButtonTextures now

* Fix message _SHIFTL usage

* Don't ifdef LANGUAGE_MAX
2024-07-06 21:38:31 +02:00
Tharo
baf1e8c174
Reworked text extraction + add JP text extraction (#1980)
* Reworked text extraction + add JP text extraction

* Format

* Suggested changes

* Correct address for gc-us sJpnMessageEntryTable

Co-authored-by: cadmic <cadmic24@gmail.com>

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
2024-07-02 22:42:52 -04:00
Dragorn421
264581ff3f
CCCHECK: Add -Werror=implicit-function-declaration (#1979) 2024-06-27 06:39:28 -04:00
cadmic
93b687e43f
Fix extract_assets.py -s modification check (#1978) 2024-06-26 10:30:55 -04:00