mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 00:40:16 +00:00
Code Issues Projects Releases Wiki Activity
1202 commits 1 branch 0 tags 561 MiB
Commit graph

1202 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dragorn421
d80bdb32da
Use PLAYER_STR_* to compare to CUR_UPG_VALUE(UPG_STRENGTH) 2021-09-28 10:33:49 +02:00
Dragorn421
10b09e62c1
Revert "Remove ASCII_TO_U32, use 'IS64'" 
This reverts commit c801337dde.
 2021-09-28 10:10:57 +02:00
Dragorn421
3a4374f266
Remove U suffix from integer literals 2021-09-27 11:59:48 +02:00
Dragorn421
6c3ce96a71
Remove comments using in-game text 2021-09-25 10:54:13 +02:00
Dragorn421
d9c7eb3a2d
Fix unk_ offset of TransformUpdateIndex#unk_10 -> unk_0E 2021-09-23 18:14:12 +02:00
Dragorn421
4a172b7941
Run formatter 2021-09-21 11:18:44 +02:00
Dragorn421
843161b811
SKJ_ACTON_ -> SKJ_ACTION_ 2021-09-21 11:15:26 +02:00
Dragorn421
20755fef96
Fix some negative values written as u16 instead of s16 in ichains 2021-09-21 11:14:27 +02:00
Dragorn421
09529e36f8
Clean-up some objectively useless parens 2021-09-21 11:10:26 +02:00
Dragorn421
940942fad4
Rephrase comments mentioning "the devs" in a more neutral way 2021-09-21 11:01:48 +02:00
Dragorn421
ff60952ad3
Fix xz/xy mistake in comment in tektite 2021-09-21 10:54:54 +02:00
Dragorn421
f93eee8320
Use CHECK_BTN_ANY more 2021-09-21 10:53:45 +02:00
Dragorn421
fffd300be3
Format and small fix enums in z_boss_mo.h 2021-09-21 10:51:36 +02:00
Dragorn421
aec0103938
gWindMill* -> gWindmill* 2021-09-21 10:49:08 +02:00
Dragorn421
5fd93ae79b
Get rid of lowercase hex (outside libultra) 2021-09-21 10:49:08 +02:00
Dragorn421
52a91a3117
Use PLAYER_AP_ enum more to compare to Player#heldItemActionParam 2021-09-21 10:32:57 +02:00
Dragorn421
efe60cc88b
Use INV_CONTENT, AMMO macros more 2021-09-21 10:30:19 +02:00
Dragorn421
8bb2e22c00
Add explicit != NULL in some ternaries 2021-09-21 10:26:42 +02:00
Dragorn421
c801337dde
Remove ASCII_TO_U32, use 'IS64' 2021-09-21 10:22:39 +02:00
Dragorn421
92aef6b7f4
Use MTXMODE_ more 2021-09-21 10:20:53 +02:00
Dragorn421
b50e99525d
Matrix_MtxFToYXZRotS does not use MTXMODE_ 2021-09-21 10:12:16 +02:00
Dragorn421
802ebf6fb2
Remove unused extern CutsceneData in z_bg_dy_yoseizo.c 2021-09-21 10:09:37 +02:00
Dragorn421
889391f5ea
Add empty line after some variable declarations 2021-09-21 10:06:56 +02:00
Dragorn421
038968ea9a
Use OS_VI_ defines instead of hex 2021-09-21 10:00:55 +02:00
Dragorn421
d71cf60c14
0x803DA800 -> 0x80400000 - frame buffer size 2021-09-21 09:56:03 +02:00
Dragorn421
a9a36df816
0x25800 -> sizeof(u16[SCREEN_HEIGHT][SCREEN_WIDTH]) 2021-09-21 09:54:15 +02:00
Dragorn421
730687d5d3
Use OS_USEC_TO_CYCLES to make a time look better in Graph_TaskSet00 2021-09-21 09:52:16 +02:00
Dragorn421
9977da5bd2
Use defines instead of magic values in head/tail magic comments 2021-09-21 09:50:53 +02:00
Dragorn421
8115188107
Remove unnecessary space character in a xml 2021-09-21 09:50:05 +02:00
Dragorn421
0b804ac087
Add parens around params usage in VEC_SET macro 2021-09-21 09:49:19 +02:00
Roman971
a9604e267f
Match Skybox_Setup and 2 functions in z_kankyo.c (#980) 2021-09-20 19:33:44 -04:00
Synray
1fcb163451
Match remaining z_room functions (#978) 
* Match func_80095D04

* Match func_80096FE8

Most of the work was done by the co-authors, putting in this PR for convenience.

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Format

* Remove asm

* Caps

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2021-09-20 15:37:47 -04:00
engineer124
9318ba1804
Match func_800E5000 (#977) 2021-09-20 15:24:24 -04:00
Synray
1c0503cd3b
Match func_80B42F74 in Yabusame Mark (#976) 2021-09-20 14:38:25 -04:00
engineer124
bf53f2c95e
Match EnTorch2_Update (#975) 
* score = 965

* score = 305

* Clean-Up

* More clean-up

* Down to `sp30` <--> `sp34` swap, and extra `.data + 0x18` at the top?

* clean-up

* EnTorch2 OK, but does not reloc properly

* final cleanup

* Remove comments about non-matching

* Fix reloc non-matching

* Delete reloc

* Better solution

* PR Suggestions
 2021-09-20 14:15:21 -04:00
Synray
ac8dd91626
Match remaining function in Bg_Jya_Cobra (#969) 
* Match remaining function in Bg_Jya_Cobra

* Format
 2021-09-20 14:12:05 -04:00
Synray
4ecd175bd1
Match KaleidoScope_DrawQuestStatus (#974) 
* Match KaleidoScope_DrawQuestStatus

* Add back the parens
 2021-09-20 13:49:20 -04:00
petrie911
e51f50f0ff
Decompile z_kankyo (#956) 
* working

* start color switch

* progress

* progress

* progress on bgm func

* progress

* game over matched (except the rodata meme)

* start update

* progress

* lightning docs done

* progress

* progress

* progress

* progress

* progress

* can compile at least

* suns state, progress on kankyo_update

* some new names

* progress

* progress

* progress

* new functions

* cleanup

* more matches

* another match

* now functional

* format

* better match

* hugely improved update

* cleanup/review

* remove old changes

* review2

* review3

* missed one

* review4

* change asm filenames

* update doorwarp1

* review5

* Kankyo_ -> Environment_

* format

* merge master and format functions.h

Co-authored-by: Jacob Young <jacobly0@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
 2021-09-20 12:51:35 -04:00
Zelllll
50095d427c
Match z_actor (#973) 
* matched first function, currently unclear why the other match doesn't appear to work anymore

* matched other function, issue was bss

* remove asm
 2021-09-18 22:45:41 -04:00
louist103
8ac359fda5
Only use the ASM processor where it is needed (#919) 
* remove fake match

* Remove asm processor from files that don't need it

* Update Makefile
 2021-09-18 13:13:53 -04:00
Anghelo Carvajal
7f19430dc2
Make a XML for ganon_mant (#961) 
* Make a XML for ganon_mant

* cleanup

* Apply suggestions from code review

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* sForceAlignment

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
 2021-09-18 12:54:45 -04:00
louist103
b3814ddc1b
Fix ganon organ reloc data and extract its assets (#965) 
* fix ganon organ reloc data and extract its assets

* Named all textures

* RangeEnd

* static

* Remove D_ comments from XML

* Rename pad to sForceAlignment

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
 2021-09-18 11:40:40 -04:00
Anghelo Carvajal
672cc6e90d
Add -I. (#971) 
* Add `-I.`

* Remove unused rule
 2021-09-18 14:07:51 +02:00
louist103
e3f1ccd902
Fix all headers to comply with C standard (#957) 
* Fix all headers to comply with C standard

* fix a file in libultra

* Update include/stdbool.h

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update stdbool.h

* Update z64animation.h

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2021-09-15 19:24:19 -04:00
EllipticEllipsis
fbc4071cc8
Match last function in EnTp (#968) 
* Data imported, 8 easy functions matched

* Init only remaining nonmatching, data in

* some renaming & fiddling with Init, still nonmatching

* fix colours

* Init still not matching

* Decompile object_tp

* renames

* Rename func_80B20DE0

* Horrible new idea

* Known equivalent, docs next

* Another attempt

* Finished naming in object_tp

* Named functions, more enums

* DrawBridge -> Drawbridge

* skulltulla -> Skulltula

* Name almost all struct variables

* Named most of the temps

* delete asm

* spec

* Missed data file, whoops

* Review

* More review changes

* Match EnTp_Init

* spec

* Delete asm
 2021-09-15 19:03:47 -04:00
petrie911
b9ad6aac52
Make sSetupDLs a Gfx[][6] (#951) 
* setup[][6]

* formatting

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
 2021-09-14 09:43:16 -04:00
petrie911
30939ccd28
code_800BB040 matched (#959) 
* getting closer

* match!

* functions unnamed

* Update include/functions.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* small changes

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2021-09-13 15:29:11 -04:00
zelda2774
baceca73b8
Update diff.py (#964) 
Co-authored-by: zelda2774 <zelda2774@invalid>
 2021-09-13 13:20:07 -04:00
Tharo
eccfd2efbf
Decompile ovl_Door_Warp1 (#949) 
* Initial progress on Door_Warp1

* Fix merge

* More work on Door_Warp1

* Decompile most of Door_Warp1

* 2 more functions OK

* All decompiled, 3 nonmatching

* Tiny improvements, fix several warnings

* Remove commented GLOBAL_ASM lines

* Fix

* Fix merge

* Two more matches

* Some docs

* More docs

* Use generated reloc under NON_MATCHING

* Fix accesses in ru1

* Add break and add limbs and dlists for the skeleton to the object xml

* Comment values for enums

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* boolean returns for flag checking functions

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* Named more loop variables i and named DoorWarp1_FloatPlayer

* Last function matched thanks to Roman

* Some further suggestions

* Fix

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
 2021-09-12 11:10:10 -04:00
louist103
e31e35658d
Fix return UB (#958) 
* Ydan_SP

* func_8002D7EC

* Gameplay_ChangeCameraStatus

* Graph_InitTHGA

* CollisioCheck_LineOC

* Fix more in camera and jpeg

* revert comment in player
 2021-09-12 13:02:45 +02:00