mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-30 18:55:54 +00:00
Code Issues Projects Releases Wiki Activity
2187 commits 1 branch 0 tags 565 MiB
Commit graph

2187 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pepe20129
d0b4725869
 		Document Player_Action_8084F390 (#2264) 
* Document Player_Action_8084F390

* Rename linkYawToStepTowards into shapeYawTarget

* Fix BSS

* Address reviews

* Fix format

* Address Review
 2024-10-13 13:33:16 -04:00
mracsys
b275588728
 		Minor en_changer and en_bom_bowl_man documentation update (#2272) 
* minor en_changer documentation update

* rename EnChanger->chestOpened to selectedChest, formatting

* update asm comment on EnChanger_OpenChests

* use EnExItemType enum instead of EXITEM_COUNTER define
 2024-10-12 23:52:55 -04:00
mzxrules
eee7ba9bd5
 		Rename RoomBehaviorType2 (#2270) 
* Rename RoomBehavior2

* fig proposal

* fig comment
 2024-10-12 22:28:55 -04:00
Pepe20129
44460eeaec
 		Document Player_Action_SwingBottle (#2263) 
* Document Player_Action_8084ECA4

* Name func_8083721C

* Add note

* Move BottleCatchAnimationData declaration

* Apply format

* Revert "Name func_8083721C"

This reverts commit aeb7ea83ab.

* Revert "Merge branch 'main' of github.com:zeldaret/oot into bottle-info"

This reverts commit 10f1a4500368a66097c80cdb08f86ff2456ba9fb, reversing
changes made to 547280abf2a041a8f6884d43b2eada7802c7feec.

* Reapply "Merge branch 'main' of github.com:zeldaret/oot into bottle-info"

This reverts commit e9bf122be5.

* Some more bottle docs (#1)

* more docs

* struct comments

* format.py

* Revert "Merge branch 'main' of github.com:zeldaret/oot into bottle-info"

This reverts commit 10f1a4500368a66097c80cdb08f86ff2456ba9fb, reversing
changes made to 547280abf2a041a8f6884d43b2eada7802c7feec.

* add clarifying comment

* review, fix bss

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-10-11 16:31:06 -04:00
fig02
f79c9db649
 		Document Player_Action_TurnInPlace (#2268) 
* document turn in place

* format

* modify comments

* sWaterSpeedFactor
 2024-10-11 12:22:04 -04:00
cadmic
746adfc727
 		Use MASS_IMMOVABLE/MASS_HEAVY everywhere (#2269) 2024-10-10 23:48:26 -04:00
fig02
53c57599a4
 		Name talking action related things (#2260) 
* name talking related things

* Player_Action_TalkExchangeItem -> Player_Action_ExchangeItem

* splitting action stuff to new PR

* format
 2024-10-10 22:04:30 -04:00
fig02
fdf502dcdd
 		Document Player_Action_Idle (#2266) 
* document Player_Action_Idle

* Player_DecelerateToZero

* cleanup R_RUN_SPEED_LIMIT usages

* format

* typo

* reorder reg

* shake timer is used for fall damage

* comment on shake timer only being processed in one place

* format and edit comment

* shakeTimer -> fallDamageStunTimer
 2024-10-10 12:56:39 -04:00
Dragorn421
869bae3429
 		Pause doc: misc, fixups (#2265) 
* use missed reg macros

* do action indexing cleanup

* misc

* doc fixup ish in KaleidoScope_SetPageVertices

* newline_police

* `43` -> `(PAGE_BG_QUADS + WORLD_MAP_QUAD_28)`
 2024-10-09 22:09:58 -04:00
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