mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-23 15:55:47 +00:00
Code Issues Projects Releases Wiki Activity
2029 commits 1 branch 0 tags 529 MiB
Commit graph

1657 commits

Author SHA1 Message Date
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
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
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
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
17a88746e7
Fix a couple of render modes (#1994) 2024-07-17 19:45:22 -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
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
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
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
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
fig02
06bbdf88f1
Revamp "AnimationContext" Docs, now called "AnimTaskQueue" (#1941) 
* start using task terminology

* more docs

* format

* cleanups

* MoveActor -> ActorMove

* missed a couple

* hopefully the last changes

* comment explaining the group change

* some review

* dragorn review

* remove accidental file

* fix matching issue, now use while loop
 2024-06-18 23:46:36 -04:00
cadmic
eb660765b1
Change linker script so gGameOverTimer can be in z_game_over.c (#1939) 
* Change linker script so gGameOverTimer can be in z_game_over.c

* gGameOverTimer -> sGameOverTimer

* include_data_only_with_rodata -> include_data_only_within_rodata
 2024-06-10 10:07:51 -04:00
inspectredc
e88084fe65
Fix LensMode Enum Names (#1954) 2024-06-09 14:43:15 -04:00
Dragorn421
05c87518e7
Document pause page switching (#1550) 
* Document pause page switching

* document initial scroll left setup, when opening the pause menu

* `PAUSE_MAIN_STATE_1` -> `PAUSE_MAIN_STATE_SWITCHING_PAGE`

* try a diagram of the pages layout in world space as a comment

* expand `nextPageMode` comment

* touch up pause camera header comments

* expand comment on irrelevant init `mainState = PAUSE_MAIN_STATE_SWITCHING_PAGE`

* expand doc on `sKaleidoSetup*` data

* expand docs on `gPageSwitchNextButtonStatus`

* add some doc on `sPageSwitch*` arrays

* SwitchPage -> PageSwitch

* add `PAGE_SWITCH_NSTEPS`

* `SWITCH_PAGE_*_PT` -> `PAGE_SWITCH_PT_*`

* peepoArtist

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-05-23 16:56:10 -04:00
cadmic
b86e1774cf
Rename yDistToWater -> depthInWater (#1950) 
* Rename yDistToWater -> yDistUnderWater

* yDistUnderWater -> depthInWater
 2024-04-28 17:29:06 -04:00
fig02
7e8b9144c2
Player Docs: Control stick buffers (#1945) 
* name vars and add enum

* name some spin attack stuff

* fix right and left

* forward/backward

* format

* fix retail bss

* sControlStickWorldYaw
 2024-04-22 17:35:22 -04:00
fig02
62b97badc9
Player Docs: Name some high level update calls (#1593) 
* name some low hanging fruit

* revert burn and shock, doing in seperate pr

* add some function comments

* yaw func

* adjust comment

* some review

* unname UpdateZTarget

* Player_DetectRumbleSecrets

* fix dive do action name
 2024-04-20 16:42:18 -04:00
fig02
7ea68e9506
Player Docs: Action Interrupt (#1947) 
* document action interrupt

* format

* new function comment

* format

* add a note about items

* format
 2024-04-19 11:01:04 -04:00
cadmic
9cbd57d329
Fix miscategorized scenes (#1946) 
* Fix miscategorized scenes

* Sort includes
 2024-04-18 22:21:34 -04:00