1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 21:40:03 +00:00
Commit graph

2158 commits

Author SHA1 Message Date
cadmic
f7f38ff874
[PAL N64] Completely match pal-1.0 and pal-1.1 and add to CI (#2246)
* [PAL N64] Match pal-1.0 and pal-1.1 and add to CI

* bss fixes from Jenkins
2024-09-28 20:52:45 -04:00
cadmic
04498f808f
[PAL N64] Match file select language selection (#2240)
* [PAL N64] Match file select language selection

* sInitialLanguageInputTimerY -> sInitialLanguageInputTimerX
2024-09-28 13:12:57 -04:00
Dragorn421
89df3ed9ff
Pause doc: Item page quads (#2238)
* Pause doc: Item page quads

* format

* rm AMMO_{FIRST,MAX,LAST}, _UNITS -> _ONES

* add back ITEM_QUAD_AMMO_FIRST (oops)

* units -> ones (continued)
2024-09-27 18:36:10 -04:00
cadmic
c6160e1980
[ntsc-1.0/1.1] Match PAL 1.0 viconfig changes (#2231)
* [ntsc-1.0/1.1] Match viconfig changes

* SREG(48) -> R_VI_MODE_EDIT_STATE
2024-09-27 16:44:35 -04:00
Dragorn421
86a146db24
[includes] z_fishing (#2242) 2024-09-27 15:32:44 -04:00
Dragorn421
fbf797f1e2
[headers] Create gfxalloc.h, map.h, move protos to gfx.h, z64{player,view}.h (#2233)
* [headers] Create gfxalloc.h, map.h, move protos to z64{actor,player,view}.h

* oops

* bss

* comment on player_lib protos & format

* format map.h

* Move SCREEN_{WIDTH,HEIGHT} and SET_FULLSCREEN_VIEWPORT to z64view.h

* bss

* revert move screen_width/height

* bss
2024-09-27 14:51:00 -04:00
Dragorn421
d80e538370
Pause doc: Quest page cursor movement (#2236) 2024-09-27 19:21:46 +09:00
Dragorn421
f70e363392
[headers] z64bgcheck.h functions (#2239)
* [headers] z64bgcheck.h functions

* format

* bss
2024-09-27 11:29:19 +02:00
cadmic
2e6637ae43
[ntsc-1.0/1.1] Match z_player.c (#2232)
* [ntsc-1.0/1.1] Match z_player.c

* Move braces around

* Use #if around only part of complicated conditions
2024-09-27 10:56:58 +02:00
Dragorn421
ca70ba14a2
[includes] Explicit global.h includes for z_player (#2235) 2024-09-27 00:35:40 -04:00
Dragorn421
bc8945eb3a
[headers] Move libultra protos to ultra64.h (as a temporary measure) (#2234)
* [headers] Move libultra protos to ultra64.h (as a temporary measure)

* format ultra64.h

* bss

* bss

* bss
2024-09-26 23:58:43 -04:00
cadmic
2f3c8084c9
[PAL N64] Set up build system and extract assets for pal-1.0 and pal-1.1 (#2205)
* [PAL N64] Set up build system and extract assets

* TOOD -> TODO

* Apparently this is what the formatter wants
2024-09-26 15:19:23 -04:00
cadmic
bccb219ea3
Fix typos found by codespell (#2229) 2024-09-26 00:21:00 -04:00
cadmic
f7a0117e7d
[ntsc-1.0/1.1] Match z_boss_ganon.c and z_boss_ganon2.c changes from PAL 1.0 (#2228) 2024-09-25 23:36:58 -04:00
cadmic
19621c6a3f
[ntsc-1.0/1.1] Match actor changes introduced in PAL 1.0 (#2227) 2024-09-25 23:11:38 -04:00
Dragorn421
43c3971aaf
Pause docs: Quest quads (#2224)
* Pause docs: Quest quads

* `QUAD_QUEST_` -> `QUEST_QUAD_`
2024-09-25 22:45:19 -04:00
fig02
9da16a8fd8
Player: Player_ActionHandler_Talk (#2226)
* document Player_ActionHandler_Talk

* format

* comment tweak

* review

* capitalization
2024-09-25 22:11:11 -04:00
cadmic
0acaed6d17
[PAL N64] Match z_message.c (#2202) 2024-09-25 17:41:08 -04:00
fig02
8ff4faa084
Player Docs: Player_ActionChange_6, Rolling and Put Away (#1949)
* progress

* changing branches

* start comments

* last few changes

* name the handler after rolling only

* comment tweak

* format
2024-09-25 15:46:15 -04:00
Dragorn421
7ccb0a641e
[headers] Create letterbox.h, move more protos from functions.h (#2225)
* [headers] Create z64shrink_window.h, move more protos from functions.h

* format

* include

* bss

* letterbox.h
2024-09-25 13:45:06 -04:00
fig02
50985375b9
ActionChange -> ActionHandler (#2219) 2024-09-25 10:58:27 -04:00
Dragorn421
5ed5f196d9
[headers] audio functions to z64audio.h and z64ocarina.h (#2223)
* [headers] audio functions to z64audio.h and z64ocarina.h

* bss
2024-09-25 10:25:49 +02:00
Dragorn421
e331805c0a
Pause docs: Songs playback (#2220)
* Pause docs: Songs playback

* `VREG(21-25)` -> `VREG(21) to VREG(25)`

* comments on quest-song related main states

* make `sPlayedSongBtns` `+1`-sized to account for trailing INVALID button note in a 8-btn-notes song
2024-09-25 00:27:31 -04:00
Dragorn421
a09ea76025
[headers] gfx_setupdl.h and z64skin_matrix.h (#2221)
* [headers] gfx_setupdl.h and z64skin_matrix.h

* include z64skin_matrix.h

* bss

* bss
2024-09-24 18:18:01 -04:00
mzxrules
dc1501e7a0
create ucode_disas.h (#2222)
* ucode_disas.h

* create UcodeType

* bss
2024-09-24 13:45:53 -04:00
Dragorn421
f9d892a2ae
Pause doc: KaleidoScope_DrawQuestStatus (partial) (#2215)
* Pause doc: `KaleidoScope_DrawQuestStatus` (partial)

* review

* format
2024-09-24 05:39:34 -04:00
fig02
3cea46a6c1
Z-Targeting Loose Ends (#2217)
* Z-Targeting loose ends

* format

* add stateflag comment

* typo

* unname PLAYER_STATE1_19 for now

* tweak parallel comment

* one more tweak
2024-09-24 05:00:38 -04:00
cadmic
52a1c2f969
[PAL N64] Miscellaneous changes (#2211)
* [PAL N64] Miscellaneous changes

* Reword comment

Co-authored-by: fig02 <fig02srl@gmail.com>

* glitch -> Glitch

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
2024-09-23 20:13:09 -04:00
mzxrules
56981d5297
Document Player Knockback related functions (#1601)
* document knockback related functions

* rotation -> yRot

* implement some changes

* Renames and comments

* mq bss

* format

* Intangibility and Invulnerability

* bss

* .bss

* add #pragma increment_block_number to z_en_item00.c

* .bss
2024-09-23 18:31:00 -04:00
Dragorn421
0f725405d1
[headers] Move z_actor functions to z64actor.h (#2216)
* move

* format

* bss
2024-09-23 11:06:43 -04:00
fig02
bb3848262d
Standardize "ActorMovement" over "ActorMove" (#2214)
* ActorMove -> ActorMovement

* more move -> movement

* ANIM_FLAG_ENABLE_MOVEMENT

* format
2024-09-23 10:07:11 -04:00
Pepe20129
ebd2b8dd50
Partially document idle animations (#2092)
* Idle animation sfx entries

* Function & array

* Cleanup

* I always forget format

* Remove entry from names

* Move comment

* Replace animation "indices" with comment

* Apply suggestion
2024-09-22 15:08:38 -04:00
fig02
fcd5745d40
PLAYER_STATE1_ACTOR_CARRY -> PLAYER_STATE1_CARRYING_ACTOR (#2213) 2024-09-21 18:25:19 -04:00
fig02
05b908d0eb
Document autoLockOnActor (#2212)
* document autoLockOnActor

* format.py

* backtick

* grammar

* comment adjustments

* word

* letter
2024-09-21 14:49:45 -04:00
cadmic
5178011b64
[PAL N64] Match handwritten audio sequences (#2210)
* [PAL N64] Match handwritten audio sequences

* Remove offset comments from PAL-only audio code

* Reorder includes
2024-09-21 07:30:52 -04:00
Dragorn421
a1a192b1a2
[headers] z64inventory.h, move savectx/inventory macros to z64save.h (#2209)
* [headers] z64inventory.h

* move savectx/inventory macros to z64save.h

* commit the file

* bss
2024-09-18 15:40:59 -04:00
cadmic
8348132511
[PAL N64] Create macros for 50-Hz-related values (#2206)
* [PAL N64] Create macros for 50-Hz-related values

* Use FRAME_RATE_DEPENDENT for player speeds and boot data too

* FRAME_RATE_DEPENDENT -> FRAMERATE_CONST
2024-09-18 15:14:47 -04:00
cadmic
2122a4345b
[PAL N64] Match actor changes that aren't in NTSC 1.2 or GC releases (#2208)
* [PAL N64] Match actor changes that aren't in NTSC 1.2

* Add bug comment about Zora's Domain waterfall
2024-09-18 10:49:01 -04:00
Dragorn421
dc2ceb33f3
Pause doc: Pages drawing (#2190)
* name main fields and regs for pages drawing

* comments

* format

* more comments

* roll -> pitch (oops)

* Document `PauseContext.offsetY`, `R_PAUSE_OFFSET_VERTICAL` as "y origin 1/2"

* copypaste comment on page pitches fields

* "offset depth" -> "depth offset"

* review
2024-09-18 08:11:21 -04:00
cadmic
306abef46b
Consistently use "OOT_VERSION <" and "OOT_VERSION >=" (#2199) 2024-09-17 15:40:50 -04:00
fig02
cc0b1bb127
PLAYER_STATE1_DEAD (#2204)
* PLAYER_STATE1_DEAD

* change comment

* format
2024-09-17 08:21:47 -04:00
cadmic
3287437069
[PAL N64] Match VI mode setup (#2198) 2024-09-16 21:51:53 -04:00
Dragorn421
48780cd2b1
Colliders: elemType -> elemMaterial (#2189)
* elemType -> elemMaterial

* format
2024-09-16 18:11:01 -04:00
fig02
8f0e2fc29c
Name PLAYER_STATE1_CHARGING_SPIN_ATTACK (#2203)
* name charge state flag

* format
2024-09-16 17:14:29 -04:00
cadmic
dc9782b5b3
[PAL N64] Rename file select assets (#2197) 2024-09-16 16:40:20 -04:00
fig02
c91e62f000
Document zTargetActiveTimer (#2200)
* document zTargetActiveTimer

* edit comments

* Update src/overlays/actors/ovl_player_actor/z_player.c

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

* capitalization

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
2024-09-16 12:34:23 -04:00
cadmic
2740bb020e
[PAL N64] Match changes that first appear in NTSC 1.2 (#2201) 2024-09-16 10:51:02 -04:00
Tharo
dbbeb656f8
[Audio 8/?] Check-in handwritten sequences, build sequences, automate various sfx arrays (#2137)
* [Audio 8/?] Check-in handwritten sequences, build sequences, automate various sfx arrays

* Fix whitespace in aseq.h

* Fix sequence 0 sfx id generator

* Suggested changes, adjust some MML syntax and add more instruction descriptions

* Correct some formatting in aseq.h

* Add the dir of the input .seq file to the list of includes to sequence assembling so that assembler-level includes like .include or .incbin work intuitively

* aseq.h tweaks

* MM review suggestions, aseq.h adjustments
2024-09-15 18:26:27 -04:00
fig02
03a1502706
More Player Z Target documentation (#2196)
* document flag

* Player_FriendlyLockOnOrParallel

* quirk

* z target functions

* more comments

* more comment changes

* format

* comment change
2024-09-14 16:42:28 -04:00
cadmic
65cc42a717
Use gSpiritBossNabooruKnuckleDefeatCs instead of gMinuetCs in sCutscenesUnknownList (#2195) 2024-09-13 16:38:16 -04:00