1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-27 19:44:40 +00:00
Commit graph

757 commits

Author SHA1 Message Date
Sirius902
8384e646a5 Merge branch 'master' into ovl_En_Ik 2020-10-03 16:37:06 -07:00
Sirius902
5a68ed0c5a Merge remote-tracking branch 'upstream/master' 2020-10-03 16:36:47 -07:00
Dragorn421
e270cd96bf
ovl_En_Box OK, documented (#356)
* ovl_En_Box OK, documented

* Update spec

* Removed useless union

* renames, remove comments, move internal enums from header

* stylistic changes

* Remove unneeded prototypes and use documentation format for doc comments

* Misread git's merge solution

* EnBox_SetupAction and Actor_SpawnAsChild

* Cleanup

* Merge effects, defines for movement flags, swap dList and dListHead, cleanup...
2020-10-03 18:42:10 -04:00
Random
174af7384d
libultra cleanup (#215)
* cleanup libultra

* fixes

- use quotes instead of <> for includes
- add macros for zelda specific thread priorities
- fix Makefile
- properly format the remaining pfs structs

* fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL

* remove ULTRA_ABS

* fix includes

* update z_player.c/z_lib.c + run format.sh

* merge upstream/master

* fix include in En_Goroiwa

* fix includes
2020-10-03 11:22:44 -04:00
Sirius902
b24b5d2dbe Progress 2020-10-03 02:08:48 -07:00
Sirius902
0afce8bd32 Sort declarations 2020-10-03 01:11:04 -07:00
Sirius902
706c9de919 Move and remove forward declarations 2020-10-03 01:01:48 -07:00
Sirius902
698e6969e3 Match some interesting stuff 2020-10-03 00:22:41 -07:00
Sirius902
307d70867b Fix func_80A7492C 2020-10-02 22:54:42 -07:00
Sirius902
9f8b35bd0c Ugly match for func_80A7492C 2020-10-02 22:34:54 -07:00
Sirius902
321b44a10d Work on func_80A7492C 2020-10-02 01:05:44 -07:00
Sirius902
ae3278de6c Type remaining data 2020-10-02 00:40:57 -07:00
Sirius902
8591572385 Fix data 2020-10-02 00:35:30 -07:00
Sirius902
7b04a7cfeb Figure out types for a lot of data 2020-10-02 00:27:21 -07:00
maekclena
6136ee6deb
ovl_En_Part (#383)
* ovl_En_Part

* PR review

* PR review

* Rebase

* PR review

* Oversight

* Rebase

* PR review
2020-10-01 18:51:05 -04:00
emilybrooks
7a8e00e49d
ovl_en_hs2 OK (#423)
* Decompiled ovl_en_hs2

* Replaced skelAnime pointer with pad, changed some values to hex, replaced early return with else statment, removed unnecessary padding in the header, removed unneeded & on a function pointer

* Replaced a tab with whitespace, removed address operator in front of ActorShadow_DrawFunc_Circle, moved vec3f inside the PostLimbDraw function

* Changed 0xFFFE to ~1
2020-10-01 07:49:47 -04:00
Sirius902
0faddf5321 Fix jump table 2020-10-01 00:31:10 -07:00
Sirius902
eb74a1854e More progress 2020-10-01 00:12:16 -07:00
Sirius902
6802960a77 Progress 2020-09-30 23:39:36 -07:00
Sirius902
78ca34d897 More graphics stuff 2020-09-30 23:06:01 -07:00
Sirius902
8c99be7682 Forgot one 2020-09-30 22:33:03 -07:00
Sirius902
a79f0bca8f Rename asm for named functions 2020-09-30 22:30:49 -07:00
Sirius902
2453af9697 Match some graphics functions 2020-09-30 22:27:47 -07:00
Sirius902
6dd443c0e3 Name, static, and move some stuff 2020-09-30 20:37:08 -07:00
Sirius902
2b51005739 Use thisx 2020-09-30 20:27:52 -07:00
Sirius902
0c92f891ba Match func_80A74398 2020-09-30 20:24:29 -07:00
Sirius902
bcacb5b148 Work on func_80A74398 2020-09-30 19:57:47 -07:00
Sirius902
8e5db49a8d Work on func_80A74398 2020-09-30 19:16:04 -07:00
Sirius902
7ebec4cae0 Fixes 2020-09-30 18:21:58 -07:00
Sirius902
0bcc99778c Match func_80A74398 more 2020-09-30 18:12:23 -07:00
Sirius902
6e200aa0ca Eh revert to _StartMusic 2020-09-30 17:48:55 -07:00
Sirius902
07a1e5da15 Rename to _PlayBGM 2020-09-30 17:32:26 -07:00
Sirius902
cf49171580 Correct prototype 2020-09-30 17:30:05 -07:00
Sirius902
33a067a021 Cleanup 2020-09-30 17:22:50 -07:00
Sirius902
9fe3cb43ef Use rom reloc 2020-09-30 17:06:28 -07:00
Sirius902
4f1ba11baa func_80A772EC 2020-09-30 16:00:33 -07:00
Sirius902
ab7d7135a1 Migrate bss for now ig 2020-09-30 15:31:57 -07:00
Sirius902
c0bdcfbe45 Fixes 2020-09-30 14:08:15 -07:00
Ethan Roseman
024d5d69bf
Decompiled ovl_Bg_Jya_Zurerukabe (#424)
* Decompiled ovl_Bg_Jya_Zurerukabe

* PR suggestions, cleanup

* PR suggestion
2020-09-30 16:09:52 -04:00
Tharo
d292d81958
Decompiled En_Holl (#253)
* Decompile most of En_Holl

* Two nonmatchings left

* Rename some variables, use EnHollActionFunc

* Minor cleanups

* Only regalloc issues left

* General cleanups

* 1 nonmatching left

* Delete data.s file

* Added some more documentation

* Improved nonmatching but OK still elusive, some cleanups

* Review changes

* Ran formatter

* More review changes

* Flip conditions that were previously missed

* DISP macros
2020-09-30 15:11:04 -04:00
Sirius902
e645bc6f70 Progress 2020-09-30 01:20:43 -07:00
Sirius902
266f7a6f19 Progress 2020-09-30 00:43:42 -07:00
Sirius902
3a02d7f3b7 Merge remote-tracking branch 'upstream/master' 2020-09-29 18:19:29 -07:00
fig02
82968a7381
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396)
* fix colliderinit typo

* dead sound done

* deadsound documentation

* blast done

* progress

* spk init

* progress

* spark done

* ss bomb ok

* bomb done

* cleanup

* progress

* progress

* almost done with bomb2

* clean up gossip stone

* more

* cleanup and format

* remove unused asm file

* nonmatching reloc

* done i think

* mistakes

* fix headers

* idk how that got in here

* EffectSsStick OK

* progress

* fix conflicting name

* progress

* splash OK

* uname fields

* progress

* lightning OK

* remove unwanted files

* kirakira ok

* kirakira done

* magma OK

* remove files

* ss_g_fire OK

* name funcs

* progress

* progress

* magma2 and kakera OK

* eff_ss_dead_dd OK

* fcircle OK

* stone1 OK

* sibuki2 OK

* dt_bubble OK

* deaddb OK

* sibuki OK

* dead_ds OK

* ice_smoke OK

* hitmark OK

* hahen OK

* k_fire OK

* en_fire OK

* starting colors

* color changes 1

* color switch done

* init file data migrated

* data cleanup

* ice_piece OK

* en_ice OK

* progress

* progress

* docs progress

* fix blast color names

* documentation pass 1

* progress

* cleanup pass 2

* touchups

* added to functions.h

* small changes

* fix functions.h

* renaming progress

* name progress

* color enum

* more cleanups

* enice changes

* final cleanups

* remove unwanted file

* lightning -> shock

* pr suggestions

* fix comment

* remove unwanted comments
2020-09-29 20:18:46 -04:00
petrie911
a506801cd7
Bg_Mori_Idomizu (#401)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* matching

* merge and cleanup

* wait for mori tex

* name
2020-09-28 07:11:58 -04:00
Sirius902
00fb26a441
ovl_En_Goroiwa OK (#376)
* merge upstream

* Merge upstream

* Add block comment to c

* EnGoroiwa_Init

* Remove casts in EnGoroiwa_Init

* Matched named functions

* Add one prototype

* func_80A4BD04

* func_80A4BCA0

* func_80A4BD70 and fix incompatible pointer

* func_80A4BD8C and func_80A4BE54

* Remove forward declaration

* Order variable by address

* Cleanup warnings

* func_80A4C188

* Remove func_80A4C188 forward declaration

* Progress

* Rename unk_1CE to waypoint

* func_80A4C264

* func_80A4D5E0

* func_80A4C27C

* Separate necessary forward declarations from temporary

* func_80A4BE10

* func_80A4C080

* func_80A4C134 and func_80A4C164

* func_80A4D074

* Work on some (nonmatching)

* func_80A4D944

* func_80A4D9DC

* Progress

* func_80A4DB90 and func_80A4DC00

* func_80A4D8CC

* func_80A4CA50

* func_80A4C6C8

* work on func_80A4CED8

* Work on func_80A4CED8

* func_80A4CED8

* Use temp to avoid unused error

* Clarify comment

* Work on func_80A4C3A4

* func_80A4C3A4

* Clarify comment better

* func_80A4C594

* Angles

* Improve regalloc

* func_80A4BF28

* Cleanup point access

* Work on func_80A4C814

* func_80A4C814

* Use *=

* Work on func_80A4CB78

* Work on func_80A4D0FC

* Work on func_80A4CB78

* More on func_80A4CB78

* Implement dubious permuter suggestion

* Make janky hack less janky

* Update issue comment

* Move ptr func_80A4CB78

* func_80A4CB78

* Cleanup func_80A4CB78

* Various cleanup

* Add undefined sym

* Work on func_80A4D0FC

* Work more on func_80A4D0FC

* Work on func_80A4D624

* func_80A4D0FC

* Work on func_80A4D624

* Fix stack

* Wrap in NON_MATCHING ifdef to remember which function is not done

* Collapse goto

* Use -- for unk_1C4

* Collapse else if

* Add translation for 'Player ぶっ飛ばし'

* func_80A4D624

* Migrate data section

* Clang format

* Actually add unused note

* Name timers accordingly

* Remove & from sInitChain

* Give timer descriptive names

* Rename idleTimer to waitTimer

* Rename to sWaitDurations

* Name effect data

* Add s prefix (oops)

* Move some data into functions

* Rename params for func_80029E8C

* Unify whitespace for bool returns

* Name colliderHeightOffset

* Name duplicate of colliderHeightOffset and clang format everything

* Reorder vector assignments

* Rename params to pathIdx

* Rename temp to yawDiff

* Add 'f's because floating point

* Name a lot of stuff

* Name posDiff

* Nuke the bool

* Remove unnecessary return

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

* Remove useless forward declarations and use list[0]

* Clang format again

* Use switch statement

* Use hex for normalizing angle

* Use hex because angle

* Small fixes

* Small fixes

* Move function arrays out of function

* Correct colliderItems

* Don't separate static vars from others

* Clang format

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-09-28 06:03:39 -04:00
mzxrules
83fc21fea6
Match and fully document bg_ddan_jd (#386)
* match and fully document bg_ddan_jd

* fix comment

* implemented suggested changes, minor fixes

* more changes

* implement requested changes, tweak wording on ySpeed comments

* more minor tweaks
2020-09-28 01:18:47 -04:00
petrie911
e93d604ff7
Bg_Mori_Hashigo (#400)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* All but one

* OK

* merge and cleanup

* wait for mori tex
2020-09-28 01:03:26 -04:00
Sirius902
918e591e08 Merge remote-tracking branch 'upstream/master' 2020-09-27 10:10:30 -07:00
Dragorn421
a7beb8814b
ovl_Obj_Lightswitch OK and documented (#373)
* ovl_Obj_Lightswitch OK

* ovl_Obj_Lightswitch documented

* Removed unneeded prototypes

* Minor cleanup

* Cleanup, names

* Use color array for more sane SetEnvColor

* enum styling

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

* more enum styling

* globalCtx2 meme

* XxxInit -> SetupXxx

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-27 10:35:52 -04:00