1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-17 12:33:38 +00:00
oot/asm/non_matchings/overlays/actors
Sirius902 8c72e1dea6
Decompiled ovl_Shot_Sun (#236)
* match ShotSun_Init

* match ShotSun_Destroy

* match func_80BADDCC

* break up unk_19C to add spawnTimer

* ShotSun_Update

* func_80BADE74

* work on func_80BAE05C

* make func_80BAE05C closer

* use proper macros for osSyncPrintf

* format if statement better and add temp player pointer func_80BAE05C

* Reorder spawnPos to match stack args later

* match func_80BAE05C

* almost match func_80BADF0C

* Remove temporary and add parenthesis

* change part of comment and move last unk_1A4 assignment to be similar to decompiler

* Change do while(false) to if (1)

* func_80BADF0C

* change comment

* update spec

* fix vt macro

* cleanup and name

* remove asm

* remove data

* remove extern

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>

* remove & for function pointers

* rename and retype D_02007020

* format

* remove tiny whitespace

* reorder if statement

* finish renaming

* replace cast with bitwise operation

* move globally used functions to functions.h

* reorder description

* move headers for EnItem00 and EnAObj to z64actor.h

* retype Item_DropCollectible and Item_DropCollectible2 to return EnItem00*

* rename ShotSun_StartFairyCountdown to ShotSun_TriggerFairy

* rename ShotSun_FairyCountdown to ShotSun_SpawnFairy

* add unk_E3EC field to MessageContext

* rename to ShotSun_UpdateHyliaSun for now

* remove != 0 on flag check

* remove unsigned suffix and use enum constant for Item_DropCollectible call

* add unk_95C field to Player

* add ub comment

* retype unk_1A4 and remove explicit struct padding

* Update src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c

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

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-12 19:03:38 -04:00
..
ovl_Bg_Bombwall
ovl_Bg_Bowl_Wall
ovl_Bg_Breakwall rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_Bg_Ddan_Jd
ovl_Bg_Dodoago
ovl_Bg_Dy_Yoseizo
ovl_Bg_Ganon_Otyuka
ovl_Bg_Gnd_Darkmeiro
ovl_Bg_Gnd_Firemeiro
ovl_Bg_Gnd_Iceblock
ovl_Bg_Gnd_Soulmeiro
ovl_Bg_Haka
ovl_Bg_Haka_Gate
ovl_Bg_Haka_Huta
ovl_Bg_Haka_MeganeBG
ovl_Bg_Haka_Sgami Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Bg_Haka_Ship
ovl_Bg_Haka_Tubo
ovl_Bg_Haka_Water
ovl_Bg_Haka_Zou
ovl_Bg_Heavy_Block
ovl_Bg_Hidan_Curtain
ovl_Bg_Hidan_Dalm
ovl_Bg_Hidan_Fwbig
ovl_Bg_Hidan_Hamstep
ovl_Bg_Hidan_Hrock
ovl_Bg_Hidan_Kowarerukabe Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Bg_Hidan_Rock rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_Bg_Hidan_Rsekizou
ovl_Bg_Hidan_Sekizou
ovl_Bg_Hidan_Sima
ovl_Bg_Ice_Objects
ovl_Bg_Ice_Shelter
ovl_Bg_Ice_Shutter
ovl_Bg_Ice_Turara
ovl_Bg_Ingate
ovl_Bg_Jya_1flift
ovl_Bg_Jya_Bigmirror
ovl_Bg_Jya_Block
ovl_Bg_Jya_Bombchuiwa Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Bg_Jya_Bombiwa Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Bg_Jya_Cobra
ovl_Bg_Jya_Goroiwa
ovl_Bg_Jya_Haheniron Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Bg_Jya_Ironobj Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Bg_Jya_Megami Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Bg_Jya_Zurerukabe
ovl_Bg_Menkuri_Eye rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_Bg_Mizu_Bwall
ovl_Bg_Mizu_Movebg
ovl_Bg_Mizu_Shutter
ovl_Bg_Mizu_Water
ovl_Bg_Mori_Bigst
ovl_Bg_Mori_Elevator
ovl_Bg_Mori_Hashigo
ovl_Bg_Mori_Hashira4
ovl_Bg_Mori_Hineri rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_Bg_Mori_Idomizu
ovl_Bg_Mori_Kaitenkabe
ovl_Bg_Mori_Rakkatenjo
ovl_Bg_Po_Event
ovl_Bg_Po_Syokudai
ovl_Bg_Relay_Objects Decompile 2 small files (code_8006BA00.c and code_8006C3A0.c) (#101) 2020-04-30 22:00:39 -04:00
ovl_Bg_Spot00_Hanebasi Decompile 2 small files (code_8006BA00.c and code_8006C3A0.c) (#101) 2020-04-30 22:00:39 -04:00
ovl_Bg_Spot01_Idohashira Decompiled ovl_Bg_Spot01_Idohashira (1 non-matching) (#213) 2020-06-21 17:50:01 -04:00
ovl_Bg_Spot01_Idomizu
ovl_Bg_Spot01_Objects2
ovl_Bg_Spot02_Objects
ovl_Bg_Spot03_Taki
ovl_Bg_Spot06_Objects
ovl_Bg_Spot07_Taki
ovl_Bg_Spot08_Bakudankabe Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Bg_Spot08_Iceblock
ovl_Bg_Spot11_Bakudankabe Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Bg_Spot11_Oasis Decompile 2 small files (code_8006BA00.c and code_8006C3A0.c) (#101) 2020-04-30 22:00:39 -04:00
ovl_Bg_Spot15_Rrbox
ovl_Bg_Spot16_Bombstone Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Bg_Spot17_Bakudankabe Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Bg_Spot18_Basket
ovl_Bg_Spot18_Shutter
ovl_Bg_Sst_Floor
ovl_Bg_Toki_Hikari
ovl_Bg_Vb_Sima
ovl_Bg_Ydan_Hasi
ovl_Bg_Ydan_Maruta
ovl_Bg_Ydan_Sp rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_Boss_Dodongo rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_Boss_Fd
ovl_Boss_Fd2
ovl_Boss_Ganon Fix some jump table labels being treated as separate functions (#120) 2020-05-06 14:56:35 -04:00
ovl_Boss_Ganon2
ovl_Boss_Ganondrof Remove unused asm files (#150) 2020-05-20 07:01:23 -04:00
ovl_Boss_Goma rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_Boss_Mo Decompile shrink_window.c (#232) 2020-07-08 21:54:39 -04:00
ovl_Boss_Sst rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_Boss_Tw
ovl_Boss_Va rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_Demo_6K
ovl_Demo_Du
ovl_Demo_Ec
ovl_Demo_Effect Decompiles fcurve_skelanime, code_8006C510, and actor MagicWind (#135) 2020-05-19 16:27:25 -04:00
ovl_Demo_Ext rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_Demo_Gj Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Demo_Go
ovl_Demo_Gt Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Demo_Ik
ovl_Demo_Im
ovl_Demo_Kankyo Fix remaining rom/ram pointers (#190) 2020-06-05 17:09:43 -04:00
ovl_Demo_Kekkai
ovl_Demo_Shd
ovl_Demo_Tre_Lgt Decompiles fcurve_skelanime, code_8006C510, and actor MagicWind (#135) 2020-05-19 16:27:25 -04:00
ovl_Door_Gerudo
ovl_Door_Killer
ovl_Door_Shutter
ovl_Door_Warp1
ovl_Efc_Erupc
ovl_Eff_Dust
ovl_Elf_Msg
ovl_Elf_Msg2
ovl_En_Am
ovl_En_Anubice
ovl_En_Anubice_Fire
ovl_En_Arrow Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_Attack_Niw
ovl_En_Ba rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Bb Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_Bdfire
ovl_En_Bigokuta
ovl_En_Bili
ovl_En_Blkobj
ovl_En_Bom rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Bom_Bowl_Man
ovl_En_Bom_Bowl_Pit
ovl_En_Bom_Chu Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_Bombf
ovl_En_Box
ovl_En_Brob
ovl_En_Bubble
ovl_En_Butte
ovl_En_Bw
ovl_En_Bx rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Changer
ovl_En_Clear_Tag
ovl_En_Crow
ovl_En_Cs
ovl_En_Daiku
ovl_En_Daiku_Kakariko
ovl_En_Dekubaba rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Dekunuts
ovl_En_Dh
ovl_En_Diving_Game
ovl_En_Dns
ovl_En_Dnt_Demo
ovl_En_Dnt_Jiji
ovl_En_Dnt_Nomal
ovl_En_Dodojr
ovl_En_Dodongo Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_Door
ovl_En_Du
ovl_En_Dy_Extra
ovl_En_Eiyer
ovl_En_Elf Fix some jump table labels being treated as separate functions (#120) 2020-05-06 14:56:35 -04:00
ovl_En_Encount1
ovl_En_Encount2
ovl_En_Ex_Item
ovl_En_Ex_Ruppy
ovl_En_Fd
ovl_En_Fd_Fire
ovl_En_fHG
ovl_En_Fhg_Fire
ovl_En_Fire_Rock
ovl_En_Firefly
ovl_En_Fish
ovl_En_Fr rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Fw
ovl_En_Fz rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_G_Switch Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_Ganon_Mant
ovl_En_Gb rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Ge1
ovl_En_Ge2
ovl_En_Ge3
ovl_En_GeldB Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_GirlA
ovl_En_Gm rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Go Fix some jump table labels being treated as separate functions (#120) 2020-05-06 14:56:35 -04:00
ovl_En_Go2 rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Goma
ovl_En_Goroiwa Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_Gs
ovl_En_Heishi2 Decompile the last function in z_en_heishi2.c (#195) 2020-06-07 12:37:44 -04:00
ovl_En_Heishi4
ovl_En_Holl
ovl_En_Honotrap
ovl_En_Horse Decompile z_camera data, and some camera WIP (#173) 2020-06-01 17:54:47 -04:00
ovl_En_Horse_Game_Check
ovl_En_Horse_Ganon Decompile most of ovl_En_Horse_Ganon (#108) 2020-05-04 11:43:04 -04:00
ovl_En_Horse_Link_Child
ovl_En_Horse_Normal
ovl_En_Horse_Zelda
ovl_En_Hs
ovl_En_Hs2
ovl_En_Hy
ovl_En_Ice_Hono
ovl_En_Ik Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_In Decompile shrink_window.c (#232) 2020-07-08 21:54:39 -04:00
ovl_En_Insect
ovl_En_Ishi Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_Jj
ovl_En_Js
ovl_En_Jsjutan
ovl_En_Kakasi
ovl_En_Kakasi2
ovl_En_Kakasi3
ovl_En_Kanban
ovl_En_Karebaba rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Ko Fix some jump table labels being treated as separate functions (#120) 2020-05-06 14:56:35 -04:00
ovl_En_Kusa Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_Light
ovl_En_M_Thunder
ovl_En_Mag Decompile 2 small files (code_8006BA00.c and code_8006C3A0.c) (#101) 2020-04-30 22:00:39 -04:00
ovl_En_Mb
ovl_En_Md
ovl_En_Mk
ovl_En_Mm
ovl_En_Mm2
ovl_En_Mu
ovl_En_Nb
ovl_En_Niw
ovl_En_Niw_Girl
ovl_En_Niw_Lady
ovl_En_Nwc
ovl_En_Ny
ovl_En_Okarina_Tag
ovl_En_Okuta
ovl_En_Ossan
ovl_En_Owl
ovl_En_Part
ovl_En_Peehat
ovl_En_Po_Desert
ovl_En_Po_Field
ovl_En_Po_Relay
ovl_En_Po_Sisters rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Poh
ovl_En_Rd
ovl_En_Reeba
ovl_En_River_Sound
ovl_En_Rl
ovl_En_Rr rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Sa
ovl_En_Sda
ovl_En_Shopnuts
ovl_En_Siofuki
ovl_En_Skb
ovl_En_Skj rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Ssh Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_St Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_Sth
ovl_En_Stream
ovl_En_Sw
ovl_En_Syateki_Itm
ovl_En_Syateki_Man
ovl_En_Syateki_Niw
ovl_En_Ta
ovl_En_Takara_Man
ovl_En_Test Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_Tg
ovl_En_Tite
ovl_En_Torch2 Decompile a bunch of small files (#160) 2020-05-25 23:18:14 +02:00
ovl_En_Toryo
ovl_En_Tp
ovl_En_Tr
ovl_En_Trap
ovl_En_Tubo_Trap Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_Vali
ovl_En_Vb_Ball
ovl_En_Viewer
ovl_En_Vm rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Wall_Tubo
ovl_En_Weather_Tag
ovl_En_Weiyer
ovl_En_Wf
ovl_En_Wonder_Item
ovl_En_Wonder_Talk
ovl_En_Wonder_Talk2
ovl_En_Wood02
ovl_En_Xc rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Yabusame_Mark
ovl_En_Yukabyun
ovl_En_Zf Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_En_Zl2 Decompiled ovl_En_Zl2 (2 nonmatchings) (#223) 2020-07-04 14:34:51 +02:00
ovl_En_Zl3 rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_En_Zl4 Decompile shrink_window.c (#232) 2020-07-08 21:54:39 -04:00
ovl_En_Zo
ovl_Fishing Decompile shrink_window.c (#232) 2020-07-08 21:54:39 -04:00
ovl_Item_B_Heart
ovl_Item_Etcetera
ovl_Item_Ocarina
ovl_Item_Shield
ovl_kaleido_scope z_select decompiled, 1 non matching left (#202) 2020-06-13 22:59:58 -04:00
ovl_Magic_Dark
ovl_Magic_Fire
ovl_Mir_Ray
ovl_Obj_Bean Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Obj_Dekujr
ovl_Obj_Hamishi Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Obj_Hana
ovl_Obj_Hsblock
ovl_Obj_Ice_Poly rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_Obj_Kibako Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Obj_Kibako2 Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Obj_Lift Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Obj_Lightswitch
ovl_Obj_Makeoshihiki
ovl_Obj_Mure
ovl_Obj_Mure2
ovl_Obj_Mure3
ovl_Obj_Oshihiki Fix some jump table labels being treated as separate functions (#120) 2020-05-06 14:56:35 -04:00
ovl_Obj_Switch
ovl_Obj_Syokudai
ovl_Obj_Timeblock
ovl_Obj_Tsubo Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Obj_Warp2block
ovl_Object_Kankyo
ovl_player_actor Decompile shrink_window.c (#232) 2020-07-08 21:54:39 -04:00