mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-29 00:06:33 +00:00
Code Issues Projects Releases Wiki Activity
2134 commits 1 branch 0 tags 486 MiB
Commit graph

2134 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tharo
29acf96db2
[Audio 1/?] Extract Samplebanks and Soundfonts to XML (#2008) 
* [Audio 1/?] Extract Samplebanks and Soundfonts to XML

* Remove config.py and use the version yamls for addresses, other suggested changes

* Adjust setup-audio

* Remove some commented out dead code (MM review)
 2024-08-08 00:11:39 -04:00
cadmic
0186524300
Match NTSC z_kaleido_scope.c (#1988) 
* Match NTSC z_kaleido_scope.c

* Use new REGs everywhere

* Add comments for YREG initialization

* Use new REGs everywhere for real

* Fix merge
 2024-08-08 02:03:22 +02:00
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
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
cadmic
1b0e35c89a
Extract NTSC assets for gc-us (#1973) 
* Extract NTSC assets for gc-us

* Extract kanji

https://github.com/zeldaret/mm/pull/1536

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
 2024-06-26 06:22:26 -04:00
cadmic
24571203df
Remove global.h from z_fishing (#1977) 2024-06-25 18:48:24 -04:00
fig02
a599d7d548
Rename ANIM_FLAG_PLAYER_7 to ANIM_FLAG_OVERRIDE_MOVEMENT (#1969) 
* rename and add comments

* format

* override movement

* format

* rework comments

* Remove whitespace at end of lines

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2024-06-25 15:50:01 -04:00
Anghelo Carvajal
d8f2e9abc6
Move PlayState to a new z64play.h (#1966) 
* ActorContext

* frameadvance

* SfxSource

* GameOverContext

* RoomContext

* TransitionActorContext

* fix bss

* Move PlayState

* Move play functions to new header

* SAC_ENABLE

* no longer needed

* SAC_ENABLE again

* z_demo being silly

* comment

* format headers

* fix retail bss

* actually fix bss

* Cutscene_ProcessScript comment

* bss again

* Update src/code/z_demo.c

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

* rename to frame_advance and remove it from z64.h

* move macros too

* review

* Rename SequenceContext to SceneSequences

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
 2024-06-25 15:13:31 -04:00
Dragorn421
2ce4742bf6
Fix misc 22 (#1971) 
* remove trailing whitespace

* fix/docbug about dright for next page of fault menu

* // size = ...; -> // size = ...

* access `ColliderJntSph.elements` as an array

* fixup doc in PreRender.c

* empty line after decl

* gdSPDefLights1 xyz arguments for direction are signed 8bit values

* doc bug of bad use of free in EffDust actor

* decimal for Actor.colorFilterTimer

* shopItemEntries -> sShopItemEntries

* HEISHI4_AT_KAKRIKO_ENTRANCE -> HEISHI4_AT_KAKARIKO_ENTRANCE

* format
 2024-06-24 18:39:08 -04:00
cadmic
4dc70fefee
Rename gTitleZeldaShieldLogoMQTex -> gTitleZeldaShieldLogoTex (#1974) 2024-06-24 17:50:45 -04:00
cadmic
9def6f4d0d
Set up multiversion assets with ZAPD and match gc-eu (#1967) 
* Add ZAPD hack to deal with extracted/VERSION/ in include paths

* Extract assets to extracted/VERSION

* Add ZAPD flags to override virtual address / start offset / end offset

* Configure offsets for code and overlay assets

* Reorganize ZAPD configs

* Match gc-eu-mq

* Match gc-eu

* Remove old asset dirs during distclean

* Revert "Remove old asset dirs during distclean"

This reverts commit fc8027a75f.

* make zapd addresses globals int64_t so they can store uint32_t addresses and -1

* slight cleanup extract_assets.py

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0285e11f0"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0285e11f0"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2024-06-24 15:22:39 +02:00
cadmic
b2d80568b9
Automatically find end of staff message table (#1970) 2024-06-22 09:20:49 -04:00
Tharo
52e7483392
Sync gbi.h with MM, move ucode defines to makefile (#1968) 
* Sync gbi.h with MM, move ucode defines to makefile, use GBI_DEBUG instead of OOT_DEBUG

* UCODE_DEFS -> GBI_DEFINES, add GBI_DOWHILE toggle
 2024-06-22 08:49:07 -04:00
fig02
e4eb5e27b3
Rename ANIM_FLAG_0 to ANIM_FLAG_UPDATE_XZ (#1964) 
* rename anim flag 0

* review

* missed a word
 2024-06-21 19:04:06 -04:00
Tharo
38921684a5
Add point lighting gbi features (#1962) 
* Add point lighting gbi features

* Maybe fix bss ordering
 2024-06-20 22:39:43 -04:00
cadmic
0ddd64fd6c
Introduce version-specific YAML config (#1957) 2024-06-20 22:26:32 -04:00
cadmic
8b6a6e6778
Run CC_CHECK with the correct CPP defines (#1963) 
* Run CC_CHECK with the correct CPP defines

* Add "CPP_DEFINES ?="
 2024-06-20 18:26:01 -04:00
Dragorn421
adcc1cecb1
Fix check_ordering.py checking for shifted/nonmatching-besides-relocs (#1961) 2024-06-19 00:16:02 -04:00
mzxrules
8d83727429
Experiment: remove global.h dependency from sys_math, sys_math3d, z_lib (#1956) 
* split sys_math, sys_math3d, z_lib from global.h

* suggestions

* forgot this

* more math stuff

* nit fix

* re-add ichain.h

* resolve tharo's comments
 2024-06-19 00:00:23 -04:00