1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 07:07:09 +00:00
oot/data
Sirius902 385c419aa2
ovl_En_Ik (#461)
* merge upstream

* Merge upstream

* Progress

* Progress

* Fixes

* Migrate bss for now ig

* func_80A772EC

* Use rom reloc

* Cleanup

* Correct prototype

* Rename to _PlayBGM

* Eh revert to _StartMusic

* Match func_80A74398 more

* Fixes

* Work on func_80A74398

* Work on func_80A74398

* Match func_80A74398

* Use thisx

* Name, static, and move some stuff

* Match some graphics functions

* Rename asm for named functions

* Forgot one

* More graphics stuff

* Progress

* More progress

* Fix jump table

* Figure out types for a lot of data

* Fix data

* Type remaining data

* Work on func_80A7492C

* Ugly match for func_80A7492C

* Fix func_80A7492C

* Match some interesting stuff

* Move and remove forward declarations

* Sort declarations

* Progress

* Use quotes for vt import

* Slightly better diff

* Better diff again

* Fix stack on func_80A74BA4

* match func_80A74BA4

* func_80A74674

* Progress

* Progress

* Progress

* Progress

* Eh early return probably makes more sense here

* Progress

* Progress

* Progress

* Autocomplete sucks

* Name stuff in func_80A76E2C

* Work a bit on func_80A75C38

* Ugly match func_80A75FA0

* Name it prevInvincibilityTimer

* EnIk_PostLimbDraw3

* Use hex for line numbers in EnIk_PostLimbDraw3

* EnIk_PostLimbDraw2

* EnIk_PostLimbDraw1

* Use hex for line numbers in EnIk_PostLimbDraw1

* Use ACTORTYPE_ENEMY

* Progress

* Possible fake match of func_80A75C38

* Update spec and remove asm

* Cleanup forward declarations

* Move data to fun places

* Move data into func_80A76E2C

* Move data into func_80A75A38

* Make D_80A7847C an array

* Remove struct padding

* Revert "Remove struct padding"

This reverts commit 87b0bd73da.

* Name colliders

* Use else

* Name shieldColliderItems

* Use new graphics macros

* Cleanup
2020-11-23 08:53:21 -05:00
..
overlays ovl_En_Ik (#461) 2020-11-23 08:53:21 -05:00
__libm_qnan_f.rodata.s Matched most remaining libultra files (#221) 2020-07-06 20:15:01 -04:00
audio_effects.data.s audio_playback, audio_effects OK (#313) 2020-08-15 14:06:26 -04:00
code_800D2E30.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
code_800DACC0.bss.s audio_seqplayer, the easy half (#369) 2020-09-01 17:23:30 -04:00
code_800DACC0.data.s audio_seqplayer, the easy half (#369) 2020-09-01 17:23:30 -04:00
code_800E11F0.data.s Remove hard-coded pointers in several files (#186) 2020-06-04 17:51:14 -04:00
code_800E11F0.rodata.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
code_800EC960.data.s Decompile z_sram.c (#431) 2020-10-11 13:45:08 -04:00
code_800F9280.data.s audio_heap: 1 non-matching (#381) 2020-09-20 13:22:09 -04:00
code_800F9280.rodata.s audio_heap: 1 non-matching (#381) 2020-09-20 13:22:09 -04:00
db_camera.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
db_camera.data.s Decompile shrink_window.c (#232) 2020-07-08 21:54:39 -04:00
db_camera.rodata.s Decompile shrink_window.c (#232) 2020-07-08 21:54:39 -04:00
fault.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
fault_drawer.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
rsp.rodata.s Fix more raw pointers (rsp and part of .data) (#170) 2020-05-27 09:06:37 -04:00
rsp.text.s Fix more raw pointers (rsp and part of .data) (#170) 2020-05-27 09:06:37 -04:00
rsp_boot.text.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bgcheck.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bgcheck.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_bgcheck.rodata.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_camera.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_item00.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_en_item00.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_kankyo.bss.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_kankyo.data.s Fix remaining rom/ram pointers (#190) 2020-06-05 17:09:43 -04:00
z_lifemeter.data.s Fix and improve some non matchings (#229) 2020-06-30 14:44:07 -04:00
z_message_PAL.bss.s Fix remaining rom/ram pointers (#190) 2020-06-05 17:09:43 -04:00
z_message_PAL.rodata.s Update asm processor and migrate/improve rodata for a few files (#209) 2020-06-14 19:24:09 -04:00
z_onepointdemo.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00
z_skin.bss.s Fix remaining rom/ram pointers (#190) 2020-06-05 17:09:43 -04:00
z_text.data.s z_select decompiled, 1 non matching left (#202) 2020-06-13 22:59:58 -04:00
z_vr_box.data.s Properly align asm & data (+ minor fixes) (#165) 2020-05-26 18:09:00 -04:00