1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 07:07:09 +00:00
Commit graph

1938 commits

Author SHA1 Message Date
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
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
7332e8ee76
Delete unused yaz0tool (#1959) 2024-06-18 20:53:19 -04:00
cadmic
44ca32168a
Check buffers segment in check_ordering.py (#1960) 2024-06-18 20:40:28 -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
87a6e75242
Remove Cygwin support (#1951) 2024-05-07 17:52:18 +02:00
cadmic
ff52c90928
Check baserom hash before decompression (#1952) 2024-05-05 18:45:45 -04:00
cadmic
b86e1774cf
Rename yDistToWater -> depthInWater (#1950)
* Rename yDistToWater -> yDistUnderWater

* yDistUnderWater -> depthInWater
2024-04-28 17:29:06 -04:00
cadmic
d4d7512cb6
Force string.o to be in boot for gcc builds (#1948)
In retail builds, memcpy is linked in code, not boot, but GCC likes to call memcpy when copying structs so currently GCC builds immediately crash in __osInitialize_common.
2024-04-25 13:10:31 +02: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
cadmic
4de56c44ac
Add gc-eu-mq to CI (#1943)
* Add gc-eu-mq to CI

* Give up on scripting

* Revert quotes changes
2024-04-20 00:12:26 -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
fig02
30eb05321d
Player Docs: "sUpperBodyIsBusy" (#1944)
* document upperbodybusy

* change wording for comment and rename upperanimblendweight

* format

* review
2024-04-17 16:24:52 -04:00
cadmic
681f276f8a
Delete disassembly data for gc-eu-mq (#1942) 2024-04-17 09:48:12 -04:00
cadmic
d59ca6cea2
Set up gc-eu and match all code (#1938)
* Set up gc-eu and match all code

* Format

* Mark gc-eu-mq as WIP until it builds OK

* Move original/MQ map mark data to separate files

* Add #includes to .inc.c files to help out VS Code

* Use #if in spec instead of .inc.c files
2024-04-15 13:36:29 -04:00
fig02
295a8669b8
Player: Document "WaitForPutAway" (#1936)
* document put away delay

* functions.txt

* add a note on delaying indefinitely

* format

* typo

* delay -> wait for put away

* revert unintended formatting change

* add comment to struct member

* format

* fix functions.txt
2024-04-15 13:02:43 -04:00
cadmic
f643499462
Match retail BSS ordering (#1927)
* Match retail BSS ordering

* Revert moving some global variables to headers

* Adjust block numbers after header changes

* Fix debug build

* Overlay bss ordering

* Fix BSS ordering after header changes

* gc-eu-mq OK

* Implement preprocessor for #pragma increment_block_number

* Transfer usage comment from reencode.sh

* Use temporary directory instead of temporary file

* Move ColChkMassType back
2024-04-14 23:51:32 +02:00
cadmic
a94661054e
Revert "Replace ‾ with - in z_bg_gnd_iceblock.c for encoding into EUC-JP (#1937)" (#1940)
This reverts commit a9ec5e1245.
2024-04-10 15:21:17 -04:00
cadmic
a9ec5e1245
Replace ‾ with - in z_bg_gnd_iceblock.c for encoding into EUC-JP (#1937) 2024-04-01 11:27:49 -04:00
cadmic
8bd599588c
Match retail camera (#1917)
* Create CAM_DEBUG_RELOAD_PARAMS and CAM_DEBUG_RELOAD_PREG macros

* Create debug macros for camera OREGs

* Move static data into Camera_Demo5

* Match retail camera functions, except Camera_Battle1

* Match camera data and bss sizes

* Restore R_CAM reg names, remove OREG_DEBUG[_SCALED]

* CAM_DATA_n -> CAM_GLOBAL_n

* Remove old debug macros

* Add braces to CAM_DEBUG_RELOAD_PREG macro

* Hackily match Camera_Battle1

* Format

* Better Camera_Battle1 match

* Format

* Revert R_CAM_N comments for sOREGInit
2024-03-30 23:48:06 -04:00
fig02
86bd6e9232
Document en_ba damage bug (#1934)
* comment on en_ba collision bug

* format
2024-03-29 11:27:34 -04:00
cadmic
4e1b0f6694
Fix various data issues in gc-eu-mq (#1921)
* Fix various data issues

* D_80153D78 -> sMessageDebuggerTextboxCount
2024-03-29 11:19:55 -04:00
cadmic
731fe6da82
Line up code segment for gc-eu-mq (#1918) 2024-03-29 11:11:45 -04:00
cadmic
93642f97bc
Use gcc -E instead of cpp to fix macOS build (#1935)
* Use `gcc -E` instead of `cpp` to fix macOS build

* -xc++ -> -xc
2024-03-29 11:03:28 -04:00
fig02
7445169e42
targetActor -> talkActor (#1933) 2024-03-24 12:27:45 -04:00
Tharo
ea72e87e92
Rework rom_header.s (#1932)
* Rework rom_header.s

* Offset comments, spaces in libultra version

* Adjust some comments, remove value arg from checksum macro
2024-03-23 13:06:00 -04:00
cadmic
8456e4be8a
Match retail ovl_kaleido_scope (#1931)
* WIP

* cleanup

* small progress

* small cleanup

* Finish retail ovl_kaleido_scope

* GREG + markPoint -> markPoint + GREG

---------

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2024-03-23 12:58:02 -04:00
cadmic
39de6ce293
Extract unused scene headers (#1930)
* Extract unused scene headers

* git subrepo pull --force tools/ZAPD

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

* Add more unused arguments to CS_LIGHT_SETTING
2024-03-23 12:38:05 -04:00
cadmic
872940d664
More data fixes (#1929) 2024-03-23 12:30:09 -04:00
fig02
bd0941405d
Document Player's Face and z_actor FaceChange functions (#1928)
* create some enums

* gonna try struct instead of array

* struct works. add docs too

* inline function comments

* fix function comment

* name faces, move enums

* rename textures

* outnames

* remove comments

* change comment slightly

* fixup face comments

* review

* offset comments

* add and use PLAYER_FACE_MAX

* typo

* more comment on blinkDuration

* another change to the comment
2024-03-23 12:21:45 -04:00
cadmic
07505dae37
Match retail build date (#1926) 2024-03-17 19:36:01 -04:00
Dragorn421
5834c335e6
git subrepo pull --force tools/fado (#1924)
subrepo:
  subdir:   "tools/fado"
  merged:   "7fad57f83"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "7fad57f83"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"
2024-03-13 12:33:58 -04:00
cadmic
17d683780d
Make BSS ordering script check ordering for all sections (#1920)
* Rename bss_reordering.py -> check_ordering.py

* Check all segments for ordering issues, not just bss

* Reword error message

* mapfile_segments -> source_code_segments

* Remove redundant vram check
2024-03-09 17:28:46 -05:00
Tharo
0159d43352
mkldscript: Capture more special rodata sections for GCC (#1919) 2024-03-09 16:54:42 +01:00
Dragorn421
68a86d2d00
Colliders: change "touch, bump" to AT and AC (elems) (#1637)
* toucherFlags, bumperFlags -> atElemFlags, acElemFlags

* TOUCH_ -> ATELEM_

* BUMP_ -> ACELEM_

* ColliderElementTouch,Bump -> ColliderElementDamageInfoAT,AC

* toucher,bumper -> atDmgInfo,acDmgInfo

* Update docs and zcolchk funcs names

* run formatter

* remove the last mentions of "bump" for colliders

* Update renamed functions in disasm
2024-03-04 19:33:08 -05:00
cadmic
bf37ad1368
Move baserom segments to extracted/ (#1916)
* Move baserom segments to extracted/

* Add old baserom segments dir back to .gitignore

* Rename segments/ -> baserom/
2024-03-04 19:06:26 -05:00
cadmic
9a5b4f3845
Add script to report BSS reordering (#1914)
* Write script to report BSS reordering

* Pin pyelftools version

* Fail on unknown relocation types

* Add sanity check for shifted ROM

* segment -> mapfile_segment

* Fix inconsistent offset/address naming

* Format negative addends

* Don't attempt to find relocs in .bss sections

* Compare build_value to mapfile VRAM
2024-03-04 18:58:36 +01:00
cadmic
39d4217ecf
Match retail BossFd2_UpdateMane (#1908) 2024-03-04 12:35:48 -05:00
cadmic
b9d1fe50cc
Make distclean delete build artifacts for all versions (#1909) 2024-03-04 18:26:04 +01:00
cadmic
63a95da5db
Match retail BossMo_DrawCore (#1907) 2024-03-04 18:22:23 +01:00
cadmic
9c09dcd4cd
Match retail z_fishing.c (#1905) 2024-03-04 17:57:16 +01:00
cadmic
01a5fa9a45
Remove 0xFF padding from uncompressed ROMs (#1910)
* Remove 0xFF padding from uncompressed ROMs

* Add comment about overdump contents

* Update checksum in README

* Reword comment
2024-03-04 11:39:16 -05:00
cadmic
e7b1868d84
Match retail BossFd_DrawBody (#1915) 2024-03-03 17:07:51 -05:00