1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00
Commit graph

1498 commits

Author SHA1 Message Date
Dragorn421
09af3006ab
Link young/old -> child/adult 2022-10-05 13:15:32 +02:00
Dragorn421
d21b4aafd5
static symbols: g -> s prefix 2022-10-05 13:13:46 +02:00
Dragorn421
dba2317566
Viewport z scale/translation: 0x1FF -> G_MAXZ/2 (see proman "9.7 Mixing CPU and SP Addresses", "12.7.6 Depth Source") 2022-10-05 13:08:21 +02:00
Dragorn421
085c81ad01
Format (clang-format does not like figs bug comment on bongo cutscene unskip sadge) 2022-10-05 13:02:43 +02:00
Dragorn421
2219f3398d
Hunt down whitespace at end of lines 2022-10-05 13:02:06 +02:00
Dragorn421
c09e1829ec
"doesnt, isnt" -> "doesn't, isn't" 2022-10-05 12:56:54 +02:00
Dragorn421
51258cf173
Fixup comment on restoring MS as adult 2022-10-05 12:55:24 +02:00
Dragorn421
a9b420b468
Turn another sus construction into a switch 2022-10-05 12:54:02 +02:00
Dragorn421
3c34acbbf4
EnFz_ApplyDamage match fixup 2022-10-05 12:47:55 +02:00
Dragorn421
1baa571f18
Fix some typo/spelling 2022-10-05 12:43:10 +02:00
Dragorn421
403221a02b
Some cleanup on bgcheck waterbox y funcs 2022-10-05 12:39:55 +02:00
Roman971
1cb00350d9
Skip compiling C-included files during the build (#1386)
* Update the makefile to skip .inc.c files when building

* Rename all C-included source files to .inc.c
2022-10-04 12:36:25 +02:00
Roman971
2f4c25da53
Fix many missing NULLs (#1389)
* Fix many missing NULLs

* Fix a raw actor id in en_horse
2022-10-04 01:18:50 -04:00
Roman971
78e528d6fb
Various minor fixes (#1383)
* Swap REGION_US and REGION_JP

* Fix a few missing EXCH_ITEM enum values

* Remove unnecessary casts on alloc functions

* Fix a double slash in the spec file

* Swap top and bottom args in StackCheck_Init

* Remove some unnecessary & in array references

* Run formatter

* Fix the comments for US and JP codes
2022-10-02 17:40:09 -04:00
Tom Overton
a2c8eabbc5
Document everything in ovl_Boss_Ganon2.xml (#1377)
* Document everything in ovl_Boss_Ganon2.xml

* Add translation I forgot to do

* Remove leading zeroes
2022-10-02 16:47:27 -04:00
Roman971
82bcf03ba5
Fix format.py segfaults and other issues when applying fixes (#1387)
Removed the --style-config option when running clang-apply-replacements because it can cause segfaults and it's not actually needed in our use case.
Also fixed clang-tidy options to not include --fix when running with multiprocessing.
2022-10-02 15:46:07 -04:00
Roman971
f5a7c5612b
Use intptr types in more code files (#1385)
* Use intptr types for segments and a few system files

* Use intptr types for more dma rom addresses

* Use intptr types in data referring to rom files

* Update and cleanup a few message casts

* Change sys_cfb functions and debugHeapStart to use pointers

* Update graph.c for the sys_cfb return type change
2022-10-02 11:38:09 -04:00
fig02
e257416c07
document bongo cutscene bug (#1384) 2022-09-30 16:41:16 -04:00
Tharo
4f65d08eb5
Rumble doc (#1375)
* Rumble doc

* Fixes, suggested changes

* Improve padmgr retrace callback related code

* Name some rumble-adjacent things, further suggested changes

* Further suggested changes

* Suggested changes
2022-09-27 12:40:26 -04:00
Tom Overton
82e04ede5f
Replace player animation names with original names derived from OoT3D (#1369)
* Name every player animation after the original name from OoT3D

* Also update link_animetion with original names
2022-09-12 20:43:06 +02:00
Tharo
6b77ddba5a
More documentation for padmgr.c (#1336)
* More documentation for padmgr.c

* Update comments

* Further suggested changes

* Suggested changes

* LOG_SEVERITY_INFO -> LOG_SEVERITY_CRITICAL

* Adjust PadMgr_RequestPadData comment

* Avoid array notation for args, adjust comment, rename the FaultMgr padInput field to inputs to better reflect it's an array
2022-09-03 02:52:13 +02:00
Dragorn421
c0cf83a814
Doc room drawing (#1283)
* (wip) some doc on room draw2

* doc room_draw2

* do what can be done for `func_80095AA0`

* wip

* more cleanup around Room_DrawBackground2D

* format"

* commit to naming things

* move forward declarations of draw handlers to draw handlers array

* two z_room regs

* `R_MESH2_` -> `R_ROOM_CULL_`

* offset -> quakeOffset

* kb -> kB

* Improve cull mesh type doc

* `Sphere16` MeshHeaderCullEntry.bounds

* Revert "`Sphere16` MeshHeaderCullEntry.bounds" (ZAPD...)

This reverts commit cbe55e8090.

* Mesh header type: "cull" -> "cullable"

* Reword some Cullable doc

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* `boundsSphere*` for now for the can't-be-`Sphere16 bounds`

* Improve the PrerenderMulti bgCamInfo usage situation

* Comment on `overrideBgCamIndex`

* "are left" -> "remain"

* enum and defines for room draw debug regs

* drawBg -> drawBackground

* "mesh header all" -> "mesh header normal" 🤷

* array_count back to define

* Name some temps a lot less specifically

* "mesh header" -> "room shape"

* "Room shape prerender" -> "Room shape image"

* `ROOM_SHAPE_IMAGE_FORMAT_` -> `ROOM_SHAPE_IMAGE_AMOUNT_`

* `RoomShapeImageMultiBackgroundEntry` -> `RoomShapeImageMultiBgEntry`

* Remove references to "header" (old "mesh header" name)

* Axe variable names

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-08-31 19:28:51 -04:00
Dragorn421
2e18eb334b
Fix misc 16 (#1371)
* Replace tabs in exceptasm.s source

* Replace tabs with \t in strings

* Fix grammar in various comments

* Fix "initalize" typos in code

* (fix typo) `__osMallocIsInitalized` -> `__osMallocIsInitialized`

* Some Link -> Player

* Use `EXCH_ITEM_` more

* "bgm music" -> "background music"

* Fix typos in `place_title_cards.xml`

* `SkelAnime_Update` returns a boolean

* Run formatter
2022-08-30 17:35:00 -04:00
Dragorn421
881fe0ad0a
OREG cleanup & Doc Camera_GetPitchAdjFromFloorHeightDiffs (#1355)
* Doc `func_80044ADC` (draft)

* Replace `OREG` accesses with existing macros

* Small `Camera_GetPitchAdjFromFloorHeightDiffs` cleanup

* Simplify names with near/far

* Name regs used in `Camera_GetPitchAdjFromFloorHeightDiffs`

* Parentheses/misc cleanup

* update OREG names, except `R_CAM_YOFFSET_NORM` which looks too sketchy for this PR's scope
2022-08-30 17:20:23 -04:00
Dragorn421
1ab4e6ee5f
stickRel -> stickAdj (#1367)
* kaleido and filselect

* ocarina and KaleidoScope_UpdatePrompt
2022-08-30 14:55:37 -04:00
mzxrules
327a813b37
Fix RaycastFloor flags (#1328)
* fix raycast floor flags

* format.sh

* Name flags

* Rename RaycastFloor functions, clean up caller code, document z_bg_spot15_rrbox

* change comment to prevent format wrap

* change to "if BGCHECK_GROUND_CHECK_ON is set"

* roman suggestions
2022-08-30 17:49:51 +02:00
Tom Overton
fe8d5988b9
Document object_gndd (Young Ganondorf) (#1353) 2022-08-29 20:03:29 -04:00
Tom Overton
f5f6f2ef6c
Document Ganon objects (#1345)
* Document Ganon objects

* Better name for one texture
2022-08-29 19:44:17 -04:00
engineer124
0b531fd1ee
Improve match for Camera_CalcUpFromPitchYawRoll, add docs (#1361)
* doc Camera_CalcUpFromPitchYawRoll

* reword comments
2022-08-29 14:26:10 -04:00
Dragorn421
7cfee3d8a9
Doc pass on bgcheck-waterbox properties (#1288)
* Doc pass on bgcheck-waterbox properties

* `WATERBOX_ROOM_INDEX...` -> `WATERBOX_ROOM...`

* Fix `WATERBOX_PROPERTIES` macro (was completely wrong)

* `((setFlag19) & 1) << WATERBOX_FLAG_19_SHIFT` instead of ternary

* Fix `WATERBOX_PROPERTIES` macro (hopefully for good)
2022-08-29 13:52:42 -04:00
Tharo
0d52a4aebd
More documentation for PreRender.c (#1340)
* More documentation for PreRender.c

* Comment fix

* Suggested changes

* More on coverage reading functions

* Further comment changes

* Further suggestions
2022-08-28 12:18:20 -04:00
engineer124
e25bb1485a
Document the Haas Effect (#1302)
* Document Haas Effect

* More docs

* cleanup

* add comments

* Adjust comment

* More cleanup

* Fix

* Add description of the Haas Effect

* roman suggestion
2022-08-28 17:33:38 +02:00
Lauri Koskela
b24b8ad096
Docker fixes (#1357)
* Update Dockerfile to Ubuntu 22.04

* Fix git directory ownership check with docker build

* Add .dockerignore that ignores everything

Building the Docker image requires no files from the
repo. To avoid slow Docker context copying when building
the image, ignore all files.
2022-08-28 17:21:22 +02:00
krm01
16e62d45be
[Doc] actor En_Dodojr (Baby Dodongo) (#1311)
* doc baby dodongo

* remove unnecessary prototypes

* run formatter

* comment for bug that dragorn noticed

* use boolean return values

* clearer conditional checks on boolean functions

* rename bounceCounter -> counter

* renaming suggestions from review

* rename to EnDodojr_UpdateBounces per review

* rename to SetupSwallowedBombEffects

* rename to TryEatBomb

* last rename hopefully
2022-08-28 17:13:07 +02:00
Dragorn421
0aaf858df5
Fixup asset XMLs (#1363)
* Some TlutOffset stuff

* make unknown-format texture I8

* Fix object_ani TLUT stuff

* Add some missing `TlutOffset`

* object_owl eyes TLUTs

* fix dims and TlutOffset on unused mido textures

* Add missing `TlutOffset`
2022-08-28 16:34:49 +02:00
mracsys
20b90a633b
use correct name for player trade item comparison in en_ko (#1365) 2022-08-26 08:50:44 +02:00
engineer124
9e2aee3fa3
Minor Misc Cleanup (#1360)
* misc cleanup

* missed one

* EffectSsDust_UpdateFire

* revert change, needs more testing
2022-08-23 21:13:03 -04:00
Dragorn421
c0f7f4ad26
Fix extract_assets.py --force for text extraction (#1350) 2022-08-23 20:30:21 -04:00
fig02
fec5cd84af
Doc shrink_window, rename system to Letterbox (#1341)
* docs

* missed some hex

* document Gfx_SetupFrame

* review
2022-08-15 09:39:06 -04:00
EllipticEllipsis
dda78f9e2c
Convert Blure to use array colours (#1347) 2022-08-13 09:57:58 -04:00
Dragorn421
5fc85d0eab
Some TlutOffset cleanup (#1342)
* Add some missing TlutOffsets ("obvious" ones)

* Uppercase hex
2022-08-02 19:00:17 +02:00
Derek Hensley
9c6461751d
sceneNum -> sceneId (#1338)
* sceneNum -> sceneId

* forgot to save play

* scene -> sceneId where appropriate

* Missed 1 + format

* Update src/code/z_sram.c

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

* Update src/code/z_sram.c

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

* PR

* Fix

Co-authored-by: mzxrules <mzxrules@gmail.com>
2022-07-31 19:44:47 -04:00
Dragorn421
706d5596bf
Doc, macros, enums for SurfaceType.data (#1293)
* `SURFACETYPE`0/1 getter macros

* Cleanup/assess/revert existing names

* `SURFACETYPE0_30` -> "soft"

* `SURFACETYPE0_`13/26 -> floortype/floorproperty

* Introduce `SURFACETYPE_FLOORTYPE_` enum

* Introduce `SURFACETYPE_FLOORPROPERTY_` enum

* `SURFACETYPE0_21` -> "wall type", and maps to "wall flags"

* Introduce `SURFACETYPE_WALLTYPE_` enum

* Introduce `SURFACETYPE_WALLFLAG_` defines

* `SURFACETYPE1_0` -> "sfx type"

* `SurfaceType_GetSfx` -> `GetSfxId` and cleanup

* Introduce `SURFACETYPE_SFXTYPE_` enum

* Note oddity on `Player.unk_89E` (more docs needed)

* `SURFACETYPE1_4` -> "floor effect" (not 100% set on the name, just something different from type and property)

* Introduce `SURFACETYPE_FLOOREFFECT_` enum

* Introduce `SURFACETYPE_CONVEYORSPEED_` enum

* Add `SURFACETYPE_CONVEYORDIRECTION_TO_BINANG` macro

* `wallDamage` -> `hasFlag27`

* Be more underscore-happy

* Revert "`SURFACETYPE`0/1 getter macros"

This reverts commit e61cccf2e6.

* remove mention to removed define

* Remove surfacetype_ prefix, `SFX_TYPE_` -> `SURFACE_SFX_TYPE_`, `FLOOREFFECT_` -> `FLOOR_EFFECT_`

* Formatting

* 0-pad litteral to 8 nibbles
2022-07-31 20:57:18 +02:00
Dragorn421
6889c275cb
Doc pass on EnDoor and transition actors (#1243)
* Doc pass on EnDoor and transition actors

* (re)Name things

* Forgot to change gameplay_keep.xml

* "actor transition index" -> "transition actor index"

* Run formatter

* Better names for `DOOR_DL_` enum

* `TRANSITION_ACTOR_INDEX` -> `GET_TRANSITION_ACTOR_INDEX`

* name endoor params macros with get/is, _mask to _flag for the doubledoor flag

* Move last ; from `DOOR_ACTOR_BASE` expansion to usage
2022-07-30 20:57:44 -04:00
Tharo
455321d2e8
Fix various small gfx issues (#1313)
* Fix various small gfx issues

* Use 0xFFFF instead of -1 for max prim depth

* More fixed point numbers

* scale -> texCoordScale, better cycle 2 render mode in z_title

* GFXP_CHAR_* defines renamed to SPACING

* Fix some gDPLoadMultiBlock uses
2022-07-30 17:49:10 -04:00
fig02
afbc312024
Rename "Scene Setup Index" to "Scene Layer" (#1300)
* setup -> layer

* IS_CUTSCENE_LAYER

* review

* backtick

* remove some more mentions of setup

* alt header block

* clarifying comment
2022-07-30 17:28:50 -04:00
Tharo
d7ea63c75d
Fix format.py for python 3.6 (#1337) 2022-07-30 22:53:31 +02:00
Tharo
97e795fc0e
Cleanup libultra controller routines (#1312)
* Cleanup libultra controller routines

* Correct structure name

* Fixes + Suggestions

* Move READFORMAT macro to controller.h
2022-07-30 15:41:32 -04:00
Dragorn421
2f5eac6b76
Move fault_drawer bss to data/ asm because -g3 bss is fun (#1335) 2022-07-30 10:09:42 -04:00
Roman971
0ce2e75560
Rewrite format script in python to improve speed with multiprocessing (#1331)
* Rewrite format script in python to improve speed with multiprocessing

* Make format.py executable
2022-07-30 09:24:52 -04:00