mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-26 14:46:16 +00:00
Code Issues Projects Releases Wiki Activity
581 commits 1 branch 0 tags 485 MiB
Commit graph

581 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roman971
3dc3722570
Fix reloc data used for some actors and Match Bg_Spot01_Idohashira (#327) 2020-08-17 17:47:48 -04:00
krimtonz
f11a74d41d
Math3D and olib updates (#315) 
* wip

* Olib updates

* wip

* wip

* rename most Math3D functions, few matches, documentation

* wip

* document most of math3d

* pr updates

* pr updates

* add missing comment block finalizer
 2020-08-17 15:42:08 -04:00
Roman971
2826421c98
Match the last 2 functions in graph.c (#328) 
* Match the last 2 functions in graph.c

* Minor graph improvements
 2020-08-16 17:59:55 -04:00
zelda2774
46f8eee4fe
Fix some %hi's (#326) 
Co-authored-by: zelda2774 <zelda2774@invalid>
 2020-08-15 20:36:34 -04:00
louist103
da58af403b
Decomp EnNiwGirl (#306) 
* Fix Repo

* Update z_en_niw.h

* PR fixes

* Update z_en_niw_girl.c

Add all masks to switch at 142

* Added currentMask enum

* Small fixes

* Cleaned up a lot of little things

* PR fixes
 2020-08-15 19:37:26 -04:00
fig02
117b1f6a5c
this -> thisx cleanup (#325) 2020-08-15 18:26:13 -04:00
Sirius902
c9729e638d
ovl_Magic_Dark 3 matching, 4 nonmatching (#310) 
* match MagicDark_Init

* update struct fields and add THIS comment thanks to Ethan

* match MagicDark_Destroy

* start on func_80B874E4

* move func_80B874E4 to a comment for now

* match MagicDark_Update (again thanks to Ethan)

* comment out func_80B8772C and use macro for ACTIVE_CAM

* various changes

* implement permuter suggestion

* reorder nayru temps to fix stack

* use LINK_IS_CHILD

* match func_80B874E4 a bit more

* initially store msgMode in temp_t2

* add msgMode temp

* comment out func_80B874E4 because regalloc >:(

* comment out func_80B874E4 again

* add unk_90C to Player

* change unk_14F to an array for more explicit padding

* remove partially completed functions

* remove matched functions from asm

* clang format

* subtract SFX_FLAG

* combine unk_14F and unk_150
 2020-08-15 14:12:21 -04:00
Ethan Roseman
d374d8d026
Various repo improvements (#316) 
* Narrowing down ido5-required files, assist.py, permuter settings

* OSX support changes, +x on setup scripts

* ZAP2 Update for OSX

* Remove assist.py

* Removing ido 5 things
 2020-08-15 14:08:53 -04:00
Ethan Roseman
40fc24420a
Decompiled ovl_Demo_Im (#296) 
* First steps

* more

* more

* clean

* Decompiled ovl_Demo_Im

* fixes

* comment update

* consistency

* PR comments
 2020-08-15 14:07:28 -04:00
zelda2774
d68f9893fd
audio_playback, audio_effects OK (#313) 
* audio_playback.c

* format.sh

* rename functions

* Audio_SequenceChannelProcessSound

* Audio_SequencePlayerProcessSound

* Audio_GetPortamentoFreqScale

* Audio_GetVibratoPitchChange

* Audio_GetVibratoFreqScale

* Audio_NoteVibratoInit, Audio_NoteVibratoUpdate

* Audio_NotePortamentoInit

* Audio_AdsrInit

* Audio_AdsrUpdate

* Common bitfield formatting

* format.sh

* review

Co-authored-by: zelda2774 <zelda2774@invalid>
 2020-08-15 14:06:26 -04:00
Roman971
ac8796cbc9
Fix _DW with permuter and GeometryMode macros (#323) 2020-08-15 14:04:27 -04:00
Kelebek1
337aaf2937
Match Interface_Update (#322) 
* Match Interface_Update

* z_actor.c func_8002C124
 2020-08-15 14:03:03 -04:00
Random
d8d789d2a5
Match a few functions (#324) 
* match a few functions

* run formath.sh

* minor fixes
 2020-08-15 13:23:29 -04:00
Tom Overton
d3b88e1b1c
Ovl_Bg_Spot01_Idomizu OK (#303) 
* Init OK (with weird goto)

* func_808ABB84 matching

* BgSpot01Idomizu_Destroy matching

* Run ./format.sh

* BgSpot01Idomizu_Update matching

* Remove Init's goto

* BgSpot01Idomizu_Draw matching

* Delete BgSpot01Idomizu asm files

* Variable naming and cleanup

* Update spec

* Delete unused ASM

* Address review feedback

* Fix fake match in Draw caused by not doing dispRefs[4]
 2020-08-14 00:17:25 -04:00
louist103
fb548ac9e4
Fix Bug with colliderinit.py (#321) 2020-08-13 22:59:44 -04:00
AdamKiddle
54f762b419
z_skin_matrix.c decompiled (1 non matching, 1 non equivalent) (#243) 
* func_800A7BE4 and func_800A7C20 done

- func_800A7BE4 copy of "Math_Vec3f_ToVec3s" in z_lib.c
- func_800A7C20 copy of "Math_Vec3s_ToVec3f" in z_lib.c

* done func_800A7A24

* func_800A76A4 done

* func_800A6E10 done

* func_800A6EF4 done

* func_800A6FA0 done

* func_800A72FC done

* Deleted z_skin_matrix.data.s and updated spec

* func_800A730C done

* func_800A735C done

* func_800A7E70 done, func_800A7C60 matching but I'm not happy with it (weird types in function params)

* Corrections. func_800A7C60 in skin_matrix done, Matrix_MtxFToMtx in sys_matrix done.

* func_800A7EC0 nonmatching

* func_800A8030 nonmatching but VERY close (two registers swapped)

* func_800A8030 done

* updating comments

* func_800A7704 done

* func_800A7894 done

* halfway through deciphering mips_to_c for func_800A73E0

* func_800A73E0 functional but non-matching (saved register differences and probably regalloc)

* Renaming some arguments and rewriting comments

* Renamed files across whole project and deleted asm nonmatchings

* ran format.sh

* fixed function name

* fixing multiplcation order in SkinMatrix_MtxFMtxFMult

* Corrections in SkinMatrix_MtxFMtxFMult

* Formatting changes after review

* Changes as per code review

* fixing rename error

* fixing rename error

* rename fixes

* fixing function rename error

* ran ./format.sh

* last couple of changes as per code review

* renamed SetScaling -> SetScale

* Skin_Matrix_Invert -> SkinMatrix_Invert

* Renaming and fixing debug message print

* Renamed argument "mf" to more specific "clear" in SkinMatrix_GetClear

* renamed again to "mfp"

* snake case to camel case changes
 2020-08-08 11:23:16 -04:00
i82orbom
34c73dda62
Decompiles z_bg_ingate (#301) 
* Decompiles z_bg_ingate

	* BgIngate_SetupAction
	* BgIngate_Init
	* BgIngate_Destroy
	* BgIngate_Update
	* func_80892990
	* func_80892890
	* BgIngate_Draw
Removes unused asm's
Formats z_bg_ingate.c

* Addresses PR comments

* Fixes usage of cutscene id instead of regular scene

* Addresses PR comments
 2020-08-04 14:30:46 -04:00
louist103
91299ed21f
Decomp BgJyaBombiwa (#294) 
* Decomp BgJyaBombiwa

* Delete z_bg_jya_bombiwa.data.s

* Delete z_bg_jya_bombiwa.reloc.s

* PR fixes

* Delete cur_list.txt

* Delete old_data_list.txt

* Delete data_list.txt

* Delete old_list.txt

* PR fixes

* PR fixes
 2020-08-04 20:01:40 +02:00
louist103
449b2247fd
Math Sizes (#297) 
* Math Sizes

Added sizes to most variable types

* Removed sizes and fixed pads

Removed sizes from base types and cleaned up pads

* PR fixes
 2020-07-30 21:50:18 +02:00
Lucas Shaw
c3421dda0c
ovl_Item_Etcetera OK (#281) 
* started item_etcetera

* ovl_Item_Etcetera OK

* z_item_etcetera cleanup

* fixed

* removed padding

* z_item_etcetera updates

* made suggested changes

* change member in enum
 2020-07-29 00:17:26 -04:00
fig02
b35f2007ad
Match EnFhgFire_Draw (#291) 
* fix colliderinit typo

* match fhgfire draw

* format

* remove macro block
 2020-07-28 22:44:35 -04:00
fig02
19c990b852
Bomb Related Effect Overlays (#283) 
* 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

* match bomb2

* asm file

* pr review
 2020-07-28 15:49:00 -04:00
Random
c76c584006
add vt_fmt.py script (#295) 2020-07-28 13:19:24 -04:00
Ethan Roseman
56156d5577
Decompiled ovl_Obj_Makeoshihiki (#285) 
* Decompiled ovl_Obj_Makeoshihiki

* typo

* PR comments

* oops

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Fixing dumb thing

* oops

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-07-24 17:37:44 -04:00
fig02
c94aaa327a
Fix EnBombf_Update (#290) 
* fix colliderinit typo

* EnBombf_Update OK

* fix thisx to effect call
 2020-07-23 18:29:24 -04:00
Lucas Shaw
e3afc9ab5c
ovl_Bg_Mori_Hineri OK (#279) 
* bg_mori_hineri OK

* added description and removed reloc

* made suggested changes from fig

* made suggested changes

* Named a few functions in ovl_Bg_Mori_Hineri
 2020-07-23 06:51:02 -04:00
Ethan Roseman
5f3f065aa7
Decompiled ovl_Bg_Jya_Block (#286) 
* Decompiled ovl_Bg_Jya_Block

* PR comments
 2020-07-22 23:44:18 -04:00
Ethan Roseman
8a309a4e19
Finished ovl_Demo_Go (#287) 
* Finished ovl_Demo_Go

* renaming arg
 2020-07-22 20:15:56 -04:00
Nick
3c3cfa6751
z_en_bg_hidan_rsekizou (#282) 
* RSekizou 4/5

* func_8088C70C on its way.

* ROM got shifted?

* RSekizou is OK

* Cleanup

* Removed unused ASM. Jenkins!

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Tidy Roman-ization. ;)

* UNK_TYPE array instead of illegal UNK_PTR array.

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-07-22 17:12:47 -04:00
louist103
4c8ed0e328
Bg jya1flift (#269) 
* Update ZAP2

* BgJya1flift progress

* BgJya1flift Progress

* Rename unknown variables

* BgJya1flift Progress

* Finish Decomp for BgJya1flift

FInished decomp and added missing functions to functions.h

* Fix struct padding

* PR fixes

* PR fixes

* Pr Fixes
 2020-07-22 03:48:31 -04:00
Kelebek1
9ddc6b5d6d
EnGirlA (#233) 
* EnGirlA all matching but 2

* Fix warnings, remove files

* PR 1

* Fix

* aaa

* Put this asm file back

* Revert "Put this asm file back"

This reverts commit 7e8e1080d7.

* PR

* Fix

* GirlA matched

* Unused asm
 2020-07-21 00:06:50 -04:00
Tharo
e6cee80a7b
Decompile ovl_Bg_Haka_Tubo (#280) 
* Bg_Haka_Tubo OK

* Ran formatter

* Review suggestions

* Fix commented field offsets in header

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

* Fix other field offset

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

* Named data and made static

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-07-20 19:57:02 -04:00
Lucas Shaw
b39cddd576
ovl_Obj_Dekujr OK (#276) 
* started dekujr

* ovl_Obj_Dekujr OK

* cleanup

* Made suggested changes
 2020-07-20 18:06:04 -04:00
Kelebek1
00836ddebc
EnBx (#266) 
* EnBx

* Memes

* PR

* PR
 2020-07-20 02:49:42 -04:00
Tharo
741c140aef
Split remaining unsplit asm files and migrate more rodata (#277) 
* Split files

* Format rodata

* Some more code rodata migrated

* Some more actor rodata migrated

* Migrate rodata for ovl_Boss_Ganon

* Migrate rodata for code_800EC960

* Remove unused rodata

* x1b occurences all lowercase b
 2020-07-19 21:08:50 -04:00
Ethan Roseman
e672778b0e
Fx bootstrap (#278) 
* script

* update

* dun?
 2020-07-19 19:42:59 -04:00
Lucas Shaw
3dd521eef5
ovl_En_Okarina_Tag OK (#273) 
* started okarinatag

* did more

* z_en_okarina_tag OK

* finished okarinatag

* Made suggested changes
 2020-07-19 17:41:59 -04:00
Ethan Roseman
71e65af9b7
Decompiled ovl_Door_Gerudo (#274) 
* Decompiled ovl_Door_Gerudo

* Update include/z64actor.h

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

* Update src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c

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

* Update src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c

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

* Update include/z64actor.h

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-07-19 16:36:18 -04:00
Roman971
3d36fe510f
Add COMPARE and NON_MATCHING build options (#275) 
* Add COMPARE and NON_MATCHING build options

* Add a -m/--make option to first_diff.py

* Minor comment update
 2020-07-19 15:42:05 -04:00
fig02
15038468ac
En_Bom and En_Bombf (#264) 
* data migrated

* progress

* progress

* enbom ok

* cleanup

* progress

* still have stack issues

* bombf done

* done i think

* review comments 1

* add type enums

* move enums and use -1

* remove unwanted file
 2020-07-19 14:04:30 -04:00
Ethan Roseman
15f75b0ddd
Decompiled ovl_Item_B_Heart <3 (#271) 
* Decompiled ovl_Item_B_Heart <3

* Update src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-07-19 12:54:30 -04:00
fig02
5f7bce6e2e
Bg_Heavy_Block and Eff_Ss_Dust (#258) 
* heavy_rock progress

* heavy block progress, 2 functions left

* progress

* progress

* heavy_block OK

* comments

* heavy block done

* eff ss dust ok

* naming

* done i think

* comment

* clean up dust usages

* remove docs

* remove reloc

* move enum and rename flag

* effect enum
 2020-07-19 09:54:24 -04:00
louist103
66e9475b25
Decomp BgYdanHasi (#263) 
* Decomp BgYdanHasi

* PR fixes.

* More PR fixes

* FIx issue with missing Extern
 2020-07-18 23:06:26 -04:00
Kelebek1
83d08078c3
Gossip Stone, 1 nonmatching (#251) 
* Gossip Stone, 1 nonmatching

* Appease the Fig

* spec

* Fix last function ordering

* Ethan Review 1

* a

* Hidden PR notes QQ

* a

* Fixed now??

* a
 2020-07-18 20:35:12 -04:00
Ethan Roseman
06d1743d22
Effect rodata migration (#268) 
* Some rodata migrated

* Migrated all effect rodata

* cleanup

* clean

* Removing .balign
 2020-07-18 20:34:23 -04:00
Nathan Faltermeier
a982d40480
Decompile ovl_En_Insect (#244) 
* Start decompiling bugs

* Decomp func_80A7BFA0

* Match 4 functions

* Match a few functions, really close on another

* Consolidate if statements

* Progress on func_80A7C86C

* Decompile a few small functions

* func_80A7CEC0 still needs stack and regalloc work

* Finish up func_80A7CEC0, do a couple functions

* Start on func_80A7D460

* func_80A7D460 is mostly down to regalloc

* Match update and draw, more work on func_80A7D460

* func_80A7D460 is really close to matching

* func_80A7D460 matches

* Cleanup

* Run formatter

* Missed reversing a couple flout comparisons

* Apply suggestions from code review

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

* PR Comments

* PR Comments #2

* Missed one

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-07-18 17:40:27 -04:00
jacobly0
e29442f1a9
Decomp and matching in fault.c and game.c (#265) 
* Match Fault_WaitForInputImpl.

* Decomp Fault_AddAddrConvClient, similar issues as Fault_AddClient.

* Decomp Fault_WaitForButtonCombo, regalloc issues.

* Rename func_800D59F8 to Fault_WalkStack.

* Decomp Fault_DrawStackTrace.

* Decomp Fault_WalkStack.

* Decomp Fault_LogStackTrace.

* Match Fault_ThreadEntry.

* Improve Fault_DrawMemDump matching.

* Improve code consistency in fault.c.

* Match GameState_Update.

* Match GameState_Realloc.

* Match GameState_DrawInputDisplay.

* Trivial cleanup of sBtnChars.
 2020-07-18 05:55:35 -04:00
fig02
24ab14f748
Change Colors To Decimal (#260) 
* fix colliderinit typo

* convert as many colors i can find to decimal

* fix GPACK_RGBA5551, merge fhgFire

* fix remaining colors

* remove unwanted file

* alpha as 1
 2020-07-16 21:37:53 -04:00
Léo Peltier
bc14f6d93e
Decompile ovl_En_Fhg_Fire (#248) 
* Decomp EnFhgFire_Init and EnFhgFire_SetActorFunc

* Decomp EnFhgFire_Destroy

* Decomp func_80A0F6F8

* Run format

* Decomp func_80A0FA90

* Decomp func_80A0FC48

* Decomp func_80A0FD8C

* Decomp EffectSsFhgFlash_Spawn

ex func_80029CF0

* Decomp EffectSsFhgFlash_Spawn2

ex func_80029D5C

* Decomp EnFhgFire_Update

* Decomp EnFhgFire_Draw, not matching

* Decomp func_80A10F18

* Move InitVars

* PR fixes

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-07-16 06:02:27 -04:00
Roman971
106f7a3f6a
Match and improve some non matchings (#254) 2020-07-15 11:23:57 -04:00