1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00
oot/include
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
..
ultra64 libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
alloca.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
bgm.h First proper commit. 2020-03-17 00:31:30 -04:00
color.h All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
command_macros_base.h Create Macros for Cutscene Data (#63) 2020-05-20 07:37:28 -04:00
fp.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
functions.h ovl_En_Ik (#461) 2020-11-23 08:53:21 -05:00
global.h First proper commit. 2020-03-17 00:31:30 -04:00
ichain.h Partially format header files 2020-03-22 22:50:15 +01:00
initvars.h Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
macro.inc First proper commit. 2020-03-17 00:31:30 -04:00
macros.h Use macros for oGfxCtx accesses (#465) 2020-10-29 17:31:09 -04:00
math.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
regs.h Elf_Msg, Elf_Msg2 OK (#317) 2020-08-18 14:31:34 -04:00
segment_symbols.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
sfx.h Various SFX fixes (#237) 2020-07-04 23:30:21 -04:00
stdarg.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
stdbool.h Partially format header files 2020-03-22 22:50:15 +01:00
stddef.h Partially format header files 2020-03-22 22:50:15 +01:00
stdlib.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
ultra64.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
unk.h Decompile z_play.c and Match/Document some of z_view.c (#74) 2020-04-16 17:36:12 -04:00
variables.h code_800F7260 (#433) 2020-10-26 07:58:56 -04:00
vt.h Partially format header files 2020-03-22 22:50:15 +01:00
z64.h Decompile z_kanfont (#443) 2020-10-12 17:42:17 -04:00
z64actor.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
z64animation.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
z64audio.h Fix prototype for Audio_PlaySoundGeneral and fix related types in structs (#481) 2020-11-16 03:31:08 -05:00
z64collision_check.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
z64cutscene.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
z64cutscene_commands.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
z64dma.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
z64effect.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
z64item.h Decompile Player (#387) 2020-09-18 21:45:39 -04:00
z64light.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
z64math.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00
z64object.h Partially format header files 2020-03-22 22:50:15 +01:00
z64player.h En_Elf Decompiled (#432) 2020-10-28 13:02:35 -04:00
z64save.h Decompile z_sram.c (#431) 2020-10-11 13:45:08 -04:00
z64scene.h Various SFX fixes (#237) 2020-07-04 23:30:21 -04:00
z64transition.h libultra cleanup (#215) 2020-10-03 11:22:44 -04:00