mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity
1063 commits 1 branch 0 tags 501 MiB
Commit graph

266 commits

Author SHA1 Message Date
fig02
296b20e925
En_Light OK (#332) 
* fix colliderinit typo

* en_light OK

* format

* remove asm

* cleanup

* pr review

* no U

* few changes
 2020-08-19 22:57:31 -04:00
Kelebek1
c25b87923e
Attack_Niw (#272) 
* Attack!

* Decimal indexes

* a

* PR

* PR

* PR

* Why break it
 2020-08-19 22:17:42 -04:00
fullgrowngaming
13891f1366
z_en_yukabyun decompiled (#318) 
* Decomped Yukabyun (flying floor tiles)

* z_en_yukabyun

* Ran the formatting script, plus fixed negative number stuff in the Update function

* Changed unk_152 to unsigned to get rid of cast

* Made all the suggested changes.

* Update undefined_syms.txt

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-08-18 13:52:44 -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
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
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
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
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
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
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
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
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
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
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
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
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
snablu
4e1fc875c3
Decompiled z_en_md.c (#246) 
* Decompile z_bg_haka_trap.c

* Update spec

delete old .reloc.s file

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

* Deleted reloc.s and made style changes to function pointers and local vars

* Renamed timer field, added more useful temp names

* Implemented Roman's suggestions, including moving enum to header file, moving some static variables inside functions, removing unnecessary casts, removing unnecessary temps, and fixing a few style issues

* Commented dual purpose of unk_16A and formatted file again

* Decompiled z_en_md.c

decompiled EnMd_Init

Decompiled EnMd_Draw

Decompiled EnMd_Destroy and EnMd_Update

Decompiled func_80AAC104

Decompiled func_80AAA92C

Decompiled func_80AAA93C

Decompiled func_80AAA274

Decompiled func_80AAA308

Decompiled func_80AAA39C

Decompiled func_80AAA474

Decompiled func_80AAA508

Decompiled func_80AAA5A4

Decompiled func_80AAA638

Decompiled func_80AAA6D4

Decompiled func_80AAA768

Decompiled func_80AAA7FC

Decompiled func_80AAA890

Decompiled func_80AAA93C

Decompiled func_80AAA250

Decompiled func_80AAB874

Decompile func_80AAAA24

Decompiled func_80AABD0C

Decompiled func_80AAB8F8

Decompiled func_80AAAE94

Decompiled func_80AAACF8

Decompiled func_80AAADE0

Decompiled func_80AAAE14

Decompiled func_80AAB03C

Decompiled func_80AAB0E0

Decompiled func_80AAB370

Decompiled func_80AAB4DC

Decompiled func_80AAB5A4

Decompiled func_80AABC10

Decompiled func_80AAAC78

Decompiled func_80AABEF0

Decompiled func_80AAB158

Decompiled func_80AAAF04

Decompiled func_80AAB948

Migrated data into C file

Commented out data file (migrated data)

Removed data file from spec

about to try changing alpha type

cleaned up functions except for last two

fixed player and player2 issue

Decompiled z_en_md.c

* updated actor field names to match upstream changes

* deleted old asm nonmatchings (whoops)

* Update src/overlays/actors/ovl_En_Md/z_en_md.h

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* removed unnecessary forward declarations

* got rid of unnecessary temps in path functions, added names based on strong copy paste similarity with en_kz, minor formatting changes

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* pass EnMd* to appropriate functions instead of Actor*

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* finish renaming limb draw funcs

* inlined vector data and moved static data

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* ran formatter and completed name change in PostLimbDraw

* removed address-of array for sAnimations

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-07-14 15:59:45 -04:00
Ethan Roseman
eb10acb8ed
Decompiled ovl_En_Blkobj (#242) 
* Decompiled ovl_En_Blkobj

* PR suggestions

* gfx commands
 2020-07-14 01:15:43 -04:00
fig02
8b6e86649d
En_Heishi1 and Eff_Ss_Solder_Srch_Ball OK (#234) 
* progress

* init ok and merge master

* enheishi1 and srchball OK

* cleanup

* cleanup

* cleanup

* more cleanup

* done

* more comments

* add file headers

* some review comments

* move vectors

* more review comments

* angle in decimal

* add prototype

* semicolon would be good

* fix

* make unset actor ids 0

* reword comment

* no &
 2020-07-09 15:12:03 -04:00
Ethan Roseman
7f6e9d55fe
Decompiled ovl_Demo_Sa (#231) 
* Decompiled ovl_Demo_Sa

* PR suggestions

* ff -> alpha

* PR suggestions

* Reverting cutscene data
 2020-07-08 19:40:09 -04:00
Ethan Roseman
a5aee3d691
Decompiled ovl_En_Zl2 (2 nonmatchings) (#223) 
* Almost dun

* 3 more, progress...

* 2 more

* Fixing field rename

* improvement

* 1 more

* progress

* more

* work

* Preparing for PR

* Comments

* tidbits

* more tidbits

* fixes

* PR comments

* Nonmatching reloc

* PR suggestions

* PR suggestions
 2020-07-04 14:34:51 +02:00
louist103
7946d6698c
Decomp BgJyaLift (#216) 
* Re upload

* Decomp BgJyaLift

* Fixed issues

Fixed issues from review

* Edits after review

* Review Fixes

Made some fixes and also changed an unknown variable name

* Fixes to file

Fixed some styling things and renamed the last function

* Added fixes

Added roman's fixes

* Delete filemap.pyc

* Fixes

Removed ctx.c and replaced tabs with spaces spec.
 2020-06-24 18:34:31 -04:00
Ethan Roseman
5f61c105b4
Decompiled ovl_Bg_Spot01_Idohashira (1 non-matching) (#213) 
* Almost done

* one non-matching

* PR suggestions

* Further suggestions

* minor correction
 2020-06-21 17:50:01 -04:00
fig02
67d13fe190
Arms_Hook OK (#210) 
* Arms_Hook OK

* cleanup

* decr

* remove redundant include

* missed some things

* rename things

Co-authored-by: dark-samus <mathmcclintic@gmail.com>
 2020-06-17 15:44:22 -04:00
snablu
4e70a24274
Decompile z_bg_haka_trap.c (#201) 
* Decompile z_bg_haka_trap.c

* Update spec

delete old .reloc.s file

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

* Deleted reloc.s and made style changes to function pointers and local vars

* Renamed timer field, added more useful temp names

* Implemented Roman's suggestions, including moving enum to header file, moving some static variables inside functions, removing unnecessary casts, removing unnecessary temps, and fixing a few style issues

* Commented dual purpose of unk_16A and formatted file again

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
 2020-06-11 17:39:47 -04:00
Tharo
b2df45ae06
Decompile ovl_Bg_Spot16_Doughnut (#187) 
* Decompile ovl_Bg_Spot16_Doughnut

* Ran formatter

* Shorten float values

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

* Fix last float values

* Rename Update2 and Draw2

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-06-07 10:54:44 -04:00
fig02
78d0883f04
Actor Cleanups (#177) 
* rename init chains, colchkinfo, colider inits, damage tables

* actor cleanups

* fix collider init script names

* small fixes

* ichain arg name

* change dynapoly types and names

* revert enru1 data name

* and the type

* pr suggestions
 2020-05-31 05:55:48 -04:00
Ethan Roseman
13a94482e5
Decompiled ovl_En_Zl1 (#169) 
* Some progress

* progs

* More

* 1 more

* Init

* Slightly better score on one function

* 1 down!

* some progress

* Prep for PR

* PR suggestions

* OK!

* Formatting

* formatting again

* PR comments

* updating ZAP2
 2020-05-30 09:33:29 -04:00
fig02
ac97807762
En_Kz OK (#176) 
* start kz

* remove irrelevant file

* kz progress

* en_kz progress

* match kz switch

* progress

* kz OK

* kz OK

* sync

* kz done

* delete asm files

* pr suggestions 1
 2020-05-29 17:20:00 -04:00
Ethan Roseman
038ab888f6
Decompiled ovl_Bg_Treemouth (#168) 
* Almost done

* header

* Decompiled ovl_Bg_Treemouth

* fixing undefined sims

* PR suggestions

* PR suggestions
 2020-05-29 17:08:40 -04:00
Lucas Shaw
248c0587d6
ovl_End_Title OK (#161) 
* One non matching left in ovl_End_Title

* ovl_End_Title OK

* formatting

* removed unused asm files

* changed 0xFF to 255

* updated dlist

* made suggested changes
 2020-05-27 11:51:11 -04:00
Roman971
235b0b8e0b
Fix more raw pointers (rsp and part of .data) (#170) 
Known files left with pointers in .data after this (possibly the only ones since I checked roughly everything):
- flg_set.c
- z_camera.c
- db_camera.c
- code_800D7CD0.c (ucode_disas.c)
- audio (not sure which ones, see the structure sheet)
 2020-05-27 09:06:37 -04:00
gamestabled
c68d752813
EnHata OK (#155) 
* EnHata OK

* made/attempted suggested changes. still havent been able to fix the THIS in Update
 2020-05-26 20:05:09 -04:00
fig02
442b15c79f
en_sb OK (#159) 
* en_sb OK

* en_sb done

* remove asm

* remove diff.txt

* pr changes

* pr changes 2

* merge master and add description
 2020-05-26 11:57:54 -04:00
Half-asian
3175f5c988
En_Skjneedle OK (#162) 
* En_Skjneedle OK

* fix

* file deletions

* file deletions 2

* fix extern

* fix

* cleanup
 2020-05-26 10:53:27 -04:00
gamestabled
13b1dc03bb
EnHintnuts OK (#154) 
* merged from upstream

* matching

* named functions

* made suggested changes
 2020-05-24 04:30:24 -04:00
Blackop778
e6b00f03bf
Decompile en_guest (#151) 
* Start work on ovl_En_Guest

* Match func_80A5046C and func_80A50518

* Everything but func_80A509D4 matches

* Match last function, cleanup, rename stuff

* Run formatter

* Temp didn't need to be used

* I should have ran the formatter again

* Use tcrf translation for debug string

* Apply suggestions from code review

Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>

* Rename  references to function  and fix semicolon

* Apply suggestions from code review

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

* PR Suggestions

* More comments

Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
 2020-05-23 04:21:36 +02:00
Zelllll
785011c33c
Decompile En_Dha (#130) 
* Decompile En_Dha

* Removed original reloc data and fixed actor struct

* Update z_en_dha.c

- Removed unnecessary line breaks
- Changed `colliderSphere` to `collider` and `colliderSphereItem` to `colliderItem`
- Removed unnecessary & pointers
- Renamed various functions

* Update z_en_dha.h

Changed collider names

* Fixed all issues with `En_Dha`

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

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

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

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

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

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

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

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

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

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

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

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

* All suggested changes applied

* Update z_en_dha.c

Fixed unresolved changes that were marked as resolved. Whoops!

Co-authored-by: Zelllll <elijah@DESKTOP-QDIECM7.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-05-18 04:34:34 -04:00
Random
d556999b2b
Decompile remaining z_vis... files (#131) 
* Decompile z_vismono.c / code_800AD920.c

- z_vismono.c: OK
- code_800AD920.c: OK

* Minor fixes in PR #131
 2020-05-15 05:02:39 -04:00
fig02
2a7bdc5c28
en_fu OK (#126) 
* 1 function left

* 1 function left

* en_fu OK, still need to document

* en_fu OK

* spec comment

* remove asm files

* clang and final fixes

* fix floormas formatting things

* pr suggestions

* pr suggestions 2
 2020-05-13 21:18:45 -04:00
Lucas Shaw
8e7ca2d497
35/37 Functions Decompiled in ovl_En_Heishi2 (#117) 
* started

* did more work

* did some more

* Update

* Merged master

* EnHeishi2_Update OK

* func_80A549E8 OK

* func_80A54954 OK

* EnHeishi2_Draw OK

* Removed unused asm

* func_80A543A0 OK

* func_80A53638 OK. Fixed type of func_8008F08C

* done for rn, will work on it later

* func_80A53850 OK

* func_80A53F30 OK

* func_80A53D0C OK

* Made cylinderInit in En_Ma3 static

* Made suggested changes. Removed return from functions by adding else

* Made suggested changes. Removed a.out file that accidentally got added

* Made suggested changes

* moved #include <vt.h> from header to c file

* fixed formatting

* added line break

* Made suggested changes

* ran format

* Fixed unk_2F2
 2020-05-10 19:44:04 -04:00
Lucas Shaw
7d7c851289
ovl_En_Heishi3 OK (#121) 
* almost done with heishi3

* heishi3 ok

* Added function names to heishi3

* EnHeishi3 OK

* Made some suggested changes. Still have questions about others

* Made suggsted changes

* fixed formatting

* fixed formatting
 2020-05-10 19:19:27 -04:00
Random
3e5ed389b9
Decompile the remaining Oceff actors + Add ichaindis.py (#125) 
* Decompile the remaining Oceff actors + Add ichaindis.py

- z_oceff_spot.c: OK
- z_oceff_storm.c : 1 non-matching left
- Add ichaindis.py

* Rename SetActionFunc to SetupAction + Add Actor descriptions

* Minor fixes in PR #125
 2020-05-10 13:09:26 -04:00
Random
40836f5d82
Decompile z_oceff_wipe (#122) 
* Decompile z_oceff_wipe

- z_oceff_wipe: OK
- z_oceff_wipe2: OK
- z_oceff_wipe3: OK
- z_oceff_wipe4: OK
- Add patched libmalloc to ido 7 to prevent segfaults
- Add CUR_CAM macro

* Rename CUR_CAM to ACTIVE_CAM

* Fixes in PR #122
 2020-05-09 16:58:02 -04:00
krimtonz
0ebe904d0c
En_Floormas OK (#97) 
* EnFloorMas wip

* floormaster formatting

* floormaster wip

* ovl_En_Floormas OK

* pr recommendations

* pr updates
 2020-05-07 19:18:09 -04:00
zelda2773
8efddb0fe0
Decompiled ovl_Bg_Ddan_Kd (#110) 
* Decompiled ovl_Bg_Ddan_Kd

* ovl_Bg_Ddan_Kd renamed arguments
 2020-05-04 14:29:53 -04:00
Ethan Roseman
713de9b942
Decompiled ovl_En_Cow (#113) 
* Beginning the Cow

* Decompiled ovl_En_Cow

* Giving the cow milk
 2020-05-04 12:11:37 -04:00
Nathan Faltermeier
a65554d586
Decompile most of ovl_En_Horse_Ganon (#108) 
* Work on horse ganon

* Match destroy, init matches but need mv data -> .c

* Match EnHorseGanon_Draw and func_80A68E14

* Move some data to .c

* Decomp func_80A68870

* EnHorseGanon_Update nearly matches

* func_80A68FA8 and func_80A686A8 match

* Fix EnHorseGanon_Init, start on func_80A68B20

* match func_80A68B20

* Migrate data but something doesn't match

* Matches with migrated data, fix most warnings

* Rename some variables, some clean up

* A little more cleanup before PR

* Move commented out code to NON_MATCHING blocks

* Run formatter and delete unused line, char -> u8

* Update function was matched
Also imports another type from z_skin.Seeing as they are somewhat
tentative I decided not to put them in any global file.

* Update src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c

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

* PR Changes

* Apply suggestions from code review

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

* PR Changes round 2

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-05-04 11:43:04 -04:00
Roman971
e36015837b
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) 
Just rectifying effect files to their correct original names, which was planned for a while.
 2020-05-02 00:05:44 -04:00
Ethan Roseman
363d5d4194
Decompiled ovl_En_Ma2 (#93) 
* first steps

* some more

* fixing merge

* more progress

* progs

* Decompiled ovl_En_Ma1

* newline

* Pr suggestion

* 2 to go

* Makefile machinery work

* Updating Jenkinsfile

* Initial setup for OSX repo support

* Adding ido7 to repo

* Makefile reversion

* Iniital Dockerfile

* iconv fix

* Docker stuff

* Dun

* Fixing stuff

* Updating Dockerfile

* Update README-OSX.md

* Restore functions.h

* Formatting

* Defining some funcs

* Renaming funcs

* Removing unnecessary README-OSX

* Addressing PR comments
 2020-05-01 06:08:39 -04:00
Ethan Roseman
d58983494c
Decompiled ovl_En_Ma1 (#83) 
* first steps

* some more

* fixing merge

* more progress

* progs

* Decompiled ovl_En_Ma1

* newline

* Pr suggestion

* Fixing some small things

* Update src/overlays/actors/ovl_En_Ma1/z_en_ma1.c

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

* Removing padding

* Fixing script

* Fixing some things

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-04-27 01:47:35 -04:00
Roman971
aecf375b84
Fix all RAM pointers in overlays (#81) 2020-04-19 11:57:38 -04:00
Ethan Roseman
cb5a604ea7
Decompiled ovl_En_Ru1 (#72) 
* Decompiled ovl_En_Ru1

* Formatting

* Actor/TransitionDrawTable struct fixes

* addressing PR comments

* addressing PR comments (2)
 2020-04-18 04:50:41 -04:00
Roman971
262f6c507c
Decompile z_play.c and Match/Document some of z_view.c (#74) 
* Decompile z_play.c and Match/Document some of z_view.c

Also fix the last non matching in z_sample.c and update some game state functions.

* Suggestions from PR #74

* Fix undefined reference to Gameplay_DrawOverlay

* Suggestion from PR #74 (2)

* Fix a fake argument in func_800BC450
 2020-04-16 17:36:12 -04:00
Ethan Roseman
f3c945cc82
Decompiled ovl_Bg_Bdan_Objects (#66) 
* Decompiled ovl_Bg_Bdan_Objects

* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

* Header update

* formatting

* Update include/z64.h

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

* Fixing structs

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-04-12 12:04:14 -04:00
chandler
8f9ea21511 cleaned up a bit 2020-04-07 19:42:33 -04:00
chandler
d852f291e4 merged from master 2020-04-07 18:00:34 -04:00
chandler
fa7874137b matching 2020-04-07 10:57:04 -04:00
chandler
0265ad21c0 merge with upstream 2020-04-06 14:38:23 -04:00
Gamestabled
9a87ce3c04 firewall OK 2020-04-06 03:06:00 -04:00
Gamestabled
a00a8bbaeb all functions match, now learning how to do data/rodata 2020-04-06 03:05:54 -04:00
Ethan Roseman
546811bba8 Decompiled ovl_Bg_Spot12_Saku 2020-04-04 22:48:30 -04:00
shawlucas
c218f38635 Fixed merge conflict 2020-04-02 09:40:01 -07:00
shawlucas
45ce20a6e0 Decompiled ovl_Bg_Spot05_Soko 2020-04-01 17:28:00 -07:00
zelda2773
eeb31944f8 Merge remote-tracking branch 'upstream/master' 2020-03-30 22:07:42 -04:00
zelda2773
ba49ef6a0e Decompiled ovl_Obj_Comb 2020-03-30 21:56:36 -04:00
fig02
10c74eb958
Merge pull request #39 from zelda2773/master 
Decompiled ovl_En_Ds
 2020-03-28 02:45:24 -04:00
zelda2773
105ea6c5cd Decompiled ovl_En_Ds 2020-03-27 10:32:46 -04:00
Ethan Roseman
a4be535164 Merge branch 'master' into ovl_En_Ru2_new 2020-03-25 18:56:09 -04:00
Ethan Roseman
36119f6c65 PR suggestions 2020-03-25 18:39:51 -04:00
KrimtonZ
498d19655b Merge branch 'master' into skelanime 2020-03-25 10:52:04 -05:00
KrimtonZ
8970968cfc name SkelAnime_InitLinkAnimetion, name load animation types and callbacks, rename several segement addresses in decompiled actors 2020-03-25 10:51:25 -05:00
Ethan Roseman
7376fe5cad Decompiled ovl_Bg_Spot12_Gate 2020-03-24 21:42:07 -04:00
KrimtonZ
2b0b6a6c12 readd merge conflicts 2020-03-24 11:57:01 -05:00
Ethan Roseman
b3f865dc58 Merge branch 'master' into ovl_En_Ru2_new 2020-03-24 00:30:09 -04:00
Ethan Roseman
2fcc450890
Merge branch 'master' into ovl_Bg_Spot09_Obj 2020-03-24 00:20:17 -04:00
Roman971
c2b9feb5d3
Merge pull request #27 from ethteck/ovl_Bg_Haka_Megane 
Decompiled ovl_Bg_Haka_Megane
 2020-03-23 23:19:57 +01:00
Ethan Roseman
4ab558d628 Almost done 2020-03-23 17:33:12 -04:00
Lucas Shaw
6a45dcba7f Fixed merge conflict 2020-03-22 22:57:24 -07:00
Lucas Shaw
8c99bdd00f ovl_Bg_Zg OK 2020-03-22 22:55:05 -07:00
Ethan Roseman
4c3b764461 Almost done 2020-03-23 01:31:03 -04:00
Ethan Roseman
ab976edca4 Merge branch 'master' into ovl_Bg_Gate_Shutter 2020-03-22 19:21:39 -04:00
Ethan Roseman
80bced5204 Decompiled ovl_Bg_Gate_Shutter 2020-03-22 17:56:08 -04:00
Roman971
51290f6126 Partially format header files 2020-03-22 22:50:15 +01:00
Ethan Roseman
4600faad8b 5 to go 2020-03-22 16:40:08 -04:00
glank
fd7c3c9e56 Responding to PR comments 2020-03-22 18:55:23 +01:00
glank
d7b0ba7c06 Merge branch 'master' into z_en_tk 2020-03-22 18:43:40 +01:00
shawlucas
f581128e6b Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Bg_toki_swd 2020-03-21 20:38:59 -07:00
fig02
8057d95195
Merge pull request #20 from ethteck/ovl_Demo_Geff 
Decompiled ovl_Demo_Geff
 2020-03-21 21:42:02 -04:00
shawlucas
08b73fe685 fixed merge conflict 2020-03-21 18:14:17 -07:00
Ethan Roseman
c6a7cb2c8e Beginning 2020-03-21 19:05:38 -04:00
Lucas Shaw
f374ac8d2b started ovl_bg_toki_swd 2020-03-21 11:54:45 -07:00
glank
fa4c848cad Merge branch 'master' into z_en_tk 2020-03-21 12:31:29 +01:00
Ethan Roseman
31deeb865b Merge branch 'master' into ovl_Demo_Geff 2020-03-21 03:16:37 -04:00
fig02
ea075560c8 merge bombiwa 2020-03-20 08:25:26 -04:00
fig02
aa603ca229 merge and change scene thing 2020-03-20 08:17:48 -04:00
fig02
f3b509eb68 en_dog OK 2020-03-20 08:04:35 -04:00
Thar0
ad417f8824 Remove duplicate en_lightbox syms added by merge 2020-03-20 01:04:19 +00:00
Thar0
f263ce0b9c Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Obj_Bombiwa 2020-03-20 00:52:28 +00:00
Thar0
adbcbb6434 Decompile Obj_Bombiwa 2020-03-20 00:50:20 +00:00
Ethan Roseman
2d00e319fe Merge branch 'master' into ovl_Demo_Geff 2020-03-19 20:07:08 -04:00
Ethan Roseman
db822f7d0f More 2020-03-19 20:06:46 -04:00
Roman971
9f434ad733
Merge pull request #12 from Random06457/master 
Decompiled z_title.c
 2020-03-20 01:01:21 +01:00
Random
c931cd5837 Decompiled z_title.c 
`z_title.c` : matching
 2020-03-19 23:29:33 +01:00
glank
86c4472662 ovl_En_Tk OK 2020-03-19 13:01:17 +01:00
Faschz
b0e6f3b698 Decompiled ovl_En_Lightbox 2020-03-18 20:12:13 -05:00
Roman971
85237605e2 Fix and cleanup ovl_En_Tubo_Trap (4/7 matched) 2020-03-18 21:22:00 +01:00
fig02
898a103b78 move en_dog progress from old repo 2020-03-17 04:38:46 -04:00
Jack Walker
087f561f77 First proper commit. 2020-03-17 00:31:30 -04:00