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

2178 commits

Author SHA1 Message Date
fig02
33251ccb51
name action wrappers (#2261) 2024-10-09 21:37:33 -04:00
Dragorn421
ba9c60552b
Player doc: some rotation logic/data (#1443)
* Docs: some player rotation logic/data

* Improve misleading comment

* rename temps

* unk_6AE_rotFlags

* format

* disasm metadata
2024-10-09 20:22:52 -04:00
cadmic
621b8f38c5
[ntsc-1.0/1.1] Match audio library (#2243)
* [ntsc-1.0/1.1] Match audio library

* Don't include versions.h in audio table headers

* Include versions.h where audio tables are used
2024-10-09 10:53:16 -04:00
cadmic
60f9607569
[ntsc-1.0/1.1] Match "system" files (#2254) 2024-10-09 09:48:53 -04:00
cadmic
d3bf8ae78b
[ntsc-1.0/1.1] Extract assets (except audio) for ntsc-1.0 and ntsc-1.1 (#2253)
* [ntsc-1.0/1.1] Extract assets (except audio) for ntsc-1.0 and ntsc-1.1

* Fix merge with pal-1.0/1.1
2024-10-09 14:22:57 +02:00
cadmic
2048a65dd8
[ntsc-1.0/1.1] Match line numbers in debug strings (#2255) 2024-10-09 13:41:16 +02:00
fig02
7dd8f2b6ad
Document Player_ChooseNextIdleAnim (#2262)
* document most of Player_ChooseNextIdleAnim

* finish documenting Player_ChooseNextIdleAnim

* capital letter

* dummy block numbers for the script

* fix bss

* bug comment

* SpeicalIdle -> Fidget, clean up related things

* fix rng chance comment

* normal -> default

* rework Player_CheckForIdleAnim

* swap idle anim defines

* remove COMMON_FIDGET

* add ARRAY_COUNT_2D

* change macro def
2024-10-08 00:19:10 -04:00
Dragorn421
93f22fcc42
[includes] z_collision_check.c (#2252)
* [includes] z_collision_check.c

* bss
2024-10-07 11:16:04 +02:00
fig02
1d0e243806
Player: Special Idle Animations (#2259)
* document special idle anims

* review

* format

* remove SPECIAL_IDLE_ANIMSFX_MAX
2024-10-05 10:26:15 -04:00
fig02
6b31fdad53
Player: AnimMovement (#2245)
* name top level stuff

* newlines

* Document Player AnimMovement

* tweak comment

* spelling

* review

* rework comment
2024-10-04 13:52:03 -04:00
cadmic
e9cbcb7ad9
Document bug in Camera_BGCheckInfo (#2258) 2024-10-04 04:04:53 -04:00
cadmic
089a2c4c0b
Add missing HS_FISHING constant (#2256)
* Add missing HS_FISHING constant

* It's actually doubly-bugged lol

* Format
2024-10-03 22:50:06 -04:00
cadmic
801fe22153
Fix build on certain Linux distributions (#2257) 2024-10-02 13:40:38 -04:00
Dragorn421
8ced66d249
Pause doc: item page cursor movement (#2249)
* doc item page cursor movement

* review
2024-10-02 00:35:50 -04:00
fig02
49759e42d7
Actor flag: ACTOR_FLAG_CARRY_X_ROT_INFLUENCE (#2237)
* document x rot carry flag

* tweak comment

* typo

* review

* flag tweak
2024-10-01 18:27:29 -04:00
cadmic
37e72d7d95
[ntsc-1.0/1.1] Match actor changes introduced in NTSC 1.1 (#2251)
* [ntsc-1.0/1.1] Match actor changes introduced in NTSC 1.1

* SPHERE_DAMAGE -> FLARE_DANCER_BODY_DMG

* Fix Actor_SetPlayerKnockbackLargeNoDamage merge
2024-10-01 14:46:17 -04:00
Dragorn421
ed77e143b6
[headers] Create one_point_cutscene.h, z64olib.h and move stuff to z64{object,player,scene}.h (#2250)
* [headers] Create `one_point_cutscene.h`, `z64olib.h` and move stuff to `z64{object,player,scene}.h`

* bss

* sSceneCmdHandlers

* bss

* bss
2024-10-01 13:14:54 -04:00
Dragorn421
47c6c36dc3
[headers] Create zelda_arena.h, move protos to z64effect.h, and misc fixups (#2248)
* [headers] Create z64malloc.h, move protos to z64effect.h, and misc fixups

* zelda_arena.h

* bss

* bss2

* bss3

* bss
2024-10-01 08:46:56 +02:00
cadmic
bdc11c2894
[ntsc-1.0/1.1] Match "game engine" files (#2244)
* [ntsc-1.0/1.1] Match "game engine" files

* Use R_START_BTN_X/R_START_BTN_Y

* Comment obvious bugs

* Move Magic_Fill comments

* Move EVENTINF_HORSES_INDEX printf inside #if

* Replace "this function"
2024-09-30 15:52:38 -04:00
fig02
80ed596c56
Name Talking Related Actor Flags (#2230)
* document talking related actor flags

* tweak comment

* review

* tweak

* accept -> accepted

* add more clarification
2024-09-30 06:24:43 -04:00
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