1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-05 01:06:37 +00:00
Commit graph

1302 commits

Author SHA1 Message Date
petrie911
3c18de2f83
Match func_800344BC and make func_8002FBAC equivalent (#778)
* format

* now equivalent

* another match

* cleanup

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-15 01:10:03 +02:00
Lucas Shaw
70978762b8
ovl_En_Xc and object_xc OK (#746)
* Started

* did some more

* did a few more

* update

* Fixed corrupted git repo

* did some more

* Did a few more functions

* taking a break

* fix undefined

* matched the stupid hard function

* a few more

* did some more, done for tonight

* commit in case i mess up

* 3 non matching

* .

* remove tools/ZAP2 from origin master

* idk

* i cant figure this out

* object_xc OK

* compiles now

* the evil function is now ok

* z_en_xc OK

* some documentation

* more documentation i guess

* more documentation

* more z_en_xc docs

* z_en_xc updates

* Final pass, its been nearly a year

* Remove unnecessary comment

* forgot to remove unused asm

* Merge

* Made suggested changes and fixed warnings in z_en_xc

* Remove symbols from undefined_syms.txt

* Add some missing animmode to en_Xc

* review

* review

* fix tot cutscene

* comment

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-14 18:49:56 -04:00
Anghelo Carvajal
9e956cbe3f
object_horse and object_hni (#772)
* object_horse_zelda

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse_normal

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse_link_child

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse_ganon

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse

Signed-off-by: angie <angheloalf95@gmail.com>

* object_hni

Signed-off-by: Angie <angheloalf95@gmail.com>

* ZAPD is falling to do vtx

Signed-off-by: Angie <angheloalf95@gmail.com>

* Testing

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename horse_link_child variables

Signed-off-by: angie <angheloalf95@gmail.com>

* horse_zelda with names

Signed-off-by: angie <angheloalf95@gmail.com>

* I'm suspecting that this game doesn't use z_en_horse_ganon

Signed-off-by: angie <angheloalf95@gmail.com>

* Child epona eye textures

Signed-off-by: Angie <angheloalf95@gmail.com>

* Extract eyes textures from Epona

Signed-off-by: Angie <angheloalf95@gmail.com>

* Small rename

Signed-off-by: Angie <angheloalf95@gmail.com>

* change references in EnHorseNormal

Signed-off-by: angie <angheloalf95@gmail.com>

* Rename a few HorseNormal animations

Signed-off-by: angie <angheloalf95@gmail.com>

* Add normal horse eye texture

Signed-off-by: angie <angheloalf95@gmail.com>

* Add some textures

Signed-off-by: angie <angheloalf95@gmail.com>

* change pointers in EnViewer

Signed-off-by: angie <angheloalf95@gmail.com>

* Rename some animations of HorseGanon

Signed-off-by: angie <angheloalf95@gmail.com>

* Add a few dlists in object_horse

Signed-off-by: Angie <angheloalf95@gmail.com>

* Add whinnies

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename last animations remaining in horse_normal and horse_ganon

Signed-off-by: angie <angheloalf95@gmail.com>

* remove the other horses from this branch

Signed-off-by: angie <angheloalf95@gmail.com>

* Rename Epona animations

Signed-off-by: angie <angheloalf95@gmail.com>

* rename animations of ingo's horse

Signed-off-by: angie <angheloalf95@gmail.com>

* add textures in hni

Signed-off-by: angie <angheloalf95@gmail.com>

* Give proper animation names

Signed-off-by: angie <angheloalf95@gmail.com>

* Update symbols

Signed-off-by: angie <angheloalf95@gmail.com>

* cutscenes

Signed-off-by: angie <angheloalf95@gmail.com>

* ./format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* Apply suggestions from code review

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Add most of epona's textures and some limbs

Signed-off-by: angie <angheloalf95@gmail.com>

* add a bunch of textures and limbs of hni

Signed-off-by: Angie <angheloalf95@gmail.com>

* typo

Signed-off-by: Angie <angheloalf95@gmail.com>

* trailling comma memes

Signed-off-by: Angie <angheloalf95@gmail.com>

* all textures from hni

Signed-off-by: angie <angheloalf95@gmail.com>

* The remaining epona's textures

Signed-off-by: Angie <angheloalf95@gmail.com>

* Use proper names for bridge cutscene

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-04-14 17:12:00 -04:00
Tharo
1f6a74e636
Use gDPSetScissor more and fix a few gbi macros (#776)
* Change gDPSetScissorFrac usages to gDPSetScissor

* Wrap some macros in do-while statements to remove some matching tricks
2021-04-14 21:14:07 +02:00
Synray
c3880c5c99
Match en_elf func_80A0461C (#774) 2021-04-13 19:33:14 +02:00
Synray
e3c1b52887
EnGoma OK (#770)
* En_Goma OK

* Label Goma

* Remove asm

* Labeling

* Review changes

* Forgot a comment

* sizeof

* Review comments and fix warnings

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-12 19:45:58 +02:00
MNGoldenEagle
c952fd4490
Add near-matching decomped functions for SeqPlayer (#729)
* Add nearmatching decomped functions

* improved match

* greatly improved match

* small thing

* almost matching

* small cleanup

* remove commented array

* pad -> unk

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-12 12:20:46 +02:00
mzxrules
62df74991d
z_ovl_bg_spot07_taki OK (#766)
* z_bg_spot07_taki OK

* clean up code

* implement pr suggestions

* thisx fix
2021-04-11 21:33:29 -04:00
Synray
7f94088a3b
En_Horse OK (#554)
* En_Horse OK

* Remove reloc

* WIP

* Use EnIn

* Documentation

* Documentation

* Remove debug prints

* Warnings

* Cleanup

* Unused asm

* Review comment

* Review comments and reformat

* More review comments

* Rename flags

* Review changes

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-11 21:23:40 -04:00
louist103
d22b746128
Decompile King Dodongo and his fire effect (#744)
* Fixed upstream

* move .data

* match init

* mathc func_808C1D00

* match func_808C32F4, func_808C2B38, func_808C3224, func_808C2AB0

* match func_808C30F4, func_808C2A40, func_808C3704, func_808C3704

* func_808C18B0

* match another chain of functions

* Match func_808C29B0, Draw, and most of OverrideLimbDraw

* start update

* Really close

* Almost match update, match Override Limb Draw

* start the big switch

* Make a little progress on the big switch function

* Test

* chip away at the big one some more

* test

* progress

* More progress

* Add

* Finished another chain of functions

* Decomp effect functions

* Get the whole file in C

* Move data to its own C file

* Start the effect file en_bdfire.c

* Messed up expected

* Finish EnBdfire.c

* A little clean up

* done as far as I can get it

* Delete scenes directory

* Delete graphs directory

* Delete graphovl.py

* match and such

* Delete BossDodongo_Update.s

* PR fixes

* restore old IDO

* Color Filter

* PR fixes (Roman)

* Fixed added assets

* remove asm

* PR fixes (Roman)

* quick format change

* remove unwanted files

Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-11 18:38:22 +02:00
EllipticEllipsis
8d2a2a8e46
Gerudo objects (#757)
* object_ge1

* more stuff named

* object_gla OK, symbols added to C

* eff fire fix in gameplay_keep

* object_nb OK, fixed gameplay_keep

* replaced symbols in EnNb, limb enums

* Change EnGeldB limb enums to hex

* Use enum in header too

* Add descriptions to EnGe2 and EnNb, rearrange xml

* Reorder xml

* review changes
2021-04-10 18:25:03 +02:00
EllipticEllipsis
c04806fc66
Player animation offsets (#762)
* Changed PlayerAnimations to be named with offsets

* named hover boots timer

* update EnIshi sCylinderInits
2021-04-10 18:07:25 +02:00
Liam Nobel
3432a7d4b3
EnMu header and pointer fixes (#765)
* Commit Before Draw Decomp

* Closer EnMu_Draw

* Matched draw function

* EnMu Matching with OK

* Removed ASM

* EnMu OK

* Implemented pull request changes as of 2020/03/16

* Reverted header

* Split increment and switched 0s to NULLs

* Fixed compiler warnings

* EnMu pointer fixes

* Apply suggestions from code review

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* Changed line breaks and dialogState to npcInfo

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
2021-04-10 17:48:10 +02:00
louist103
25dd8e54dc
Decompile and mostly document EnSkj, EnSkjNeedle, and OBJECT_SKJ. One NON_MATCHING (#750)
* match a few

* delete ASM

* Almost done

* One reg swap left

* GlobalCtx2 YEP

* Start object SKJ

* Start some documentation

* Big doc pass

* Name the first batch of functions

* Done

* fix some issues real quick

* lets try this again

* remove left over doc tools and add 3 textures

* Finish object_skj docs

* PR fixes

* PR fixes

* Delete BuildInfo.ha

* PR fixes (Roman)

* PR fixes (Roman)
2021-04-10 17:39:25 +02:00
petrie911
ed78d18a25
Match Jsjutan and Tr and improve match of Yabusame_mark and holl (#769)
* some cleanup

* .s

* more matches

* .s and yabu

* holl try

* format

* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
2021-04-09 19:19:30 -04:00
petrie911
ab05eb9776
three more matches in BgJyaCobra (#758)
* two matches

* cleanup and formatting

* Update assets/xml/overlays/ovl_Bg_Jya_Cobra.xml

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* no more extract

* format

* owl exterminators

* new match

* new match

* small thing

* whoops

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2021-04-09 19:02:16 -04:00
petrie911
99fbbd8390
Remove horrible fake match from En_Clear_Tag (#767)
* cleanup

* whoops stack

* eh, couple more things

* OK one more

* format

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-08 19:11:54 +02:00
petrie911
792056699d
Match two functions in z_eff_blure (#764)
* new matches

* format

* .s

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-07 20:13:32 -04:00
Roman971
03882c9214
Match the last function in PreRender.c (#763) 2021-04-06 14:56:30 -04:00
Roman971
2126685472
Match the last 4 functions in sys_matrix.c (#761) 2021-04-05 23:56:52 -04:00
Roman971
7e8d74d6ca
Match Sram_OpenSave from z_sram.c (#759) 2021-04-05 21:07:53 -04:00
Roman971
7d3692a266
Match the last function in z_skin_awb.c (#760) 2021-04-05 20:40:04 -04:00
petrie911
d47528ee59
Bongo Bongo (ovl_Boss_Sst) (#458)
* First pass

* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* more matching fun

* fun with bongo

* clean this up later

* found the matching versions

* diff.py has escaped?

* now with more docs

* Now with floor and more docs

* one more thing

* incremental progress

* It's Bongo time

* one little thing

* merge ZAP

* update

* camera

* gfx now in their own file

* now with more object decomp

* name animations

* now shiftable

* missed some. also DECR

* opd merge

* start xml

* now with xml asset extraction

* format

* cleanup

* removed union

Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-06 01:08:45 +02:00
Roman971
b72ba754a2
Match demo_6k (#756) 2021-04-05 16:15:03 -04:00
gamestabled
03b81c71c2
named members of TitleCardContext (#749)
* named members of TitleCardContext

* changed screenX/Y to just x/y

* added clarifying comments and renamed timer -> duration because i think its better

* changed names to delayTimer and durationTimer

* made texture a void*

Co-authored-by: gamestabled <chandler2016@yahoo.com>
2021-04-05 13:37:46 -04:00
petrie911
1398898b70
object_goma (#754)
* testing

* all named

* oh god spelling

* fixes

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-04 17:54:56 -04:00
Tharo
208167361b
Poe Objects (#743)
* poe objects

* Last unaccounted resolved, name suffix fixes

* remove _tex

* missed 2

* format

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-04 23:48:12 +02:00
engineer124
8b87e53b76
Graveyard objects: bg_spot02_objects (#751)
* BgSpot02Objects 4 non-matching

* Bg_Spot02 3 non-matching but all down to regalloc

* finish file

* spec

* asm

* rename var

* rename func

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-04 00:32:23 +02:00
Dragorn421
288320317c
Gohma (ovl_Boss_Goma) (#397)
* ovl_Boss_Goma OK, except func_80917D98

* ovl_Boss_Goma OK and documented

* Minor cleanup: shorten enums, use named constants...

* Floats with .0f, less useless static usage, details on oversight about spawning child gohmas, cleanup...

* More documentation, hopefully less weird about documenting setups and actions

* fix fhg_fire

* remove warnings

* formatting things

* newlines

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-03 16:58:33 -04:00
Anghelo Carvajal
9834f5517e
EnDivingGame OK (#745)
* update

* EnDivingGame_Draw OK

* dont feel like working on this function today

* fixed build errors

* fixing some merge conflicts

Signed-off-by: Angie <angheloalf95@gmail.com>

* more conflict fixing

Signed-off-by: Angie <angheloalf95@gmail.com>

* all merge conflicts fixed

Signed-off-by: Angie <angheloalf95@gmail.com>

* EnDivingGame_Update OK

Signed-off-by: Angie <angheloalf95@gmail.com>

* remove DECR

Signed-off-by: Angie <angheloalf95@gmail.com>

* format and unused_asm

Signed-off-by: Angie <angheloalf95@gmail.com>

* change reloc in spec

Signed-off-by: Angie <angheloalf95@gmail.com>

* damn reloc

Signed-off-by: Angie <angheloalf95@gmail.com>

* Apply suggestions from code review

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* use OPEN_DISPS macro

Signed-off-by: Angie <angheloalf95@gmail.com>

* batch of suggestions

Signed-off-by: Angie <angheloalf95@gmail.com>

* more suggestions

Signed-off-by: Angie <angheloalf95@gmail.com>

* more changes, but this isn't ready yet

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename two timers

Signed-off-by: angie <angheloalf95@gmail.com>

* Update src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* grabbedRuppiesCounter

Signed-off-by: angie <angheloalf95@gmail.com>

* a lot of vec

Signed-off-by: angie <angheloalf95@gmail.com>

* Apply suggestions from code review

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

* fix some typos

Signed-off-by: angie <angheloalf95@gmail.com>

* allRupeesThrowed

Signed-off-by: angie <angheloalf95@gmail.com>

* rupeesLeftToThrow

Signed-off-by: Angie <angheloalf95@gmail.com>

* boolean changes and minor comments

Signed-off-by: Angie <angheloalf95@gmail.com>

* and more renaming

Signed-off-by: Angie <angheloalf95@gmail.com>

* renaiming and chained assign

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename 3 functions

Signed-off-by: Angie <angheloalf95@gmail.com>

* final rename and add two enums

Signed-off-by: angie <angheloalf95@gmail.com>

* format

Signed-off-by: angie <angheloalf95@gmail.com>

* enum naming

Signed-off-by: angie <angheloalf95@gmail.com>

Co-authored-by: Lucas Shaw <lgs84@cornell.edu>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
2021-04-03 12:15:16 -04:00
Anghelo Carvajal
c94e595dc1
Misc objects problems (#748)
* fix hidan door

Signed-off-by: angie <angheloalf95@gmail.com>

* doors and lens of truth in gameplaykeep

Signed-off-by: angie <angheloalf95@gmail.com>

* other minor fixes

Signed-off-by: angie <angheloalf95@gmail.com>

* Fix a typo

Signed-off-by: Angie <angheloalf95@gmail.com>
2021-04-02 19:30:26 -04:00
Anghelo Carvajal
fa5e785760
Add needed rules for prerenders extraction (#752)
* update makefile

Signed-off-by: Angie <angheloalf95@gmail.com>

* change jfif to jpg

Signed-off-by: angie <angheloalf95@gmail.com>
2021-04-03 00:07:29 +02:00
petrie911
9b4482314a
OnePointDemo OK (#719)
* matches

* more matches

* progress?

* it's time

* so close

* organize declarations

* docs

* more fixes

* more fixes

* fix stage 1

* more fixes

* first try

* demo ids in decimal

* final cleanup

* one more thing

* fixes

* more cleanup

* onepointcs

* OnePointCutscene

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-31 12:18:31 -04:00
petrie911
28cfd82a4f
Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* It's Phantom Ganon time

* Fhg_Fire matched

* small touch up

* more documentation

* starting naming fire

* renaming

* cleanup

* hooray for new names

* merge

* first pass

* camera status

* bgcheck

* object 1

* object 2

* .s

* .s

* fig's comments

* implementing zel's suggestions and a few other things

* the work begins

* work continues

* docs, shifts, cleanup

* cleanup

* texture names

* addressing the rest of the notes

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-29 15:35:46 -04:00
mzxrules
86f16cf662
"decompile" ovl_map_mark_data, make minor tweaks to z_map_mark.c (#704)
* "decompile" ovl_map_mark_data, make minor tweaks to z_map_mark.c

* implement some suggestions

* eliminate wrapping braces
2021-03-29 19:24:08 +02:00
Kenix3
f4499a8de2
En_Clear_Tag OK and documented (#689)
* Decompile and document En_Clear_Tag

* Adds a define for setting the total count of ClearTag particles.

* Fixes swap in particle effect struct member names.

Additionally, implements the DECR macro where available.
Additionally, implements the CLAMP_MIN macro.
Additionally, adds more comments inside of functions explaining how the Arwing works.

* Reformats z_en_clear_tag.c after recent fixes.

* Removes not OK DECR and CLAMP_MIN macros.

I don't know why they built locally OK for me. May have had a stale build.

* Added static to data declarations.

Additionally added white spacing between data definitions.

* Various syling fixes in EnClearTag

Fixes inconsistent usage of particle/effect. They're Effect is the better name, so I went with that.

Fixed a naming issue in CalculateFloorTangent.

Adds s prefix to all the static variables.

Renames clearTagParticlesBuffer to sClearTagEffects

Consistent capitalization in comments.

Adds more descriptive comments to function level comments that didn't say a lot already.

Renamed gameplay.particleEffects to gameplay.specialEffects.

Renames cameraNumber to cameraId.

Fixed capitalization in display list variable names.

* Always capitalize the A in arwing.

* Fixes issue with overzealous replacement of arwing -> Arwing

* Renames arwing display lists to include the g prefix.

* Renames effect seed -> random

* Removes unnecessary decrement timer comments.

* Updates Arwing comments to detail why it's important that the roll is updated to zero.

* Updates stack variable names in EnClearTag_Update to be more consistent with each other.

* Updates Arwing crashing documentation.

* Further update documentation on arwing crashing.

* Even further updates to Arwing crashing docs.

* Fixes issue of missing newline in En_Clear_Tag.xml

* targetDirection reset now has a chained assignment

* Rotation angle to hex

* Fixes rotation hex and identifies float.

* Updates arwing fire check.

* Arwing cutscene timer is multiplied by 128 rather than shifting 7

* Updates scaledCrashingTimer assignment to be more consistent.

* Updates max scale to multiply by 2

* Gives name to the work buffer indices.

Additionally, makes enum names more consistent.

* Removes unnecessary globalCtx2 in EnClearTag_CreateFlashEffect

* Runs format.sh after recent changes.

* Updated path of ClearTag assets.

* Clear tag now uses Arwing in the display list name for all effects.

* Updates work buffer to expand and contract as new enums are added.

* Uses c99 defines in my c89

* Updates the unknown 8 bytes in en_clear_tag

* review

Co-authored-by: fig02 <fig02srl@gmail.com>
2021-03-29 19:14:08 +02:00
EllipticEllipsis
ed4021a6fe
EnJj and object_jj OK (#741)
* Shift to new branch

* object_jj decomped

* docs

* Documented blinking, various other things

* more naming

* Most stuff in the object named

* implement eye enums

* delete asm

* Changes from Fig's review

* Apply suggestions from code review

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 20:02:09 -04:00
fig02
1639417327
code_80110450 (game over) OK* (#739)
* OK (sort of)

* remove hack

* clean up comments
2021-03-28 19:50:46 -04:00
fig02
187d2d1500
document code_8008E6A0 (frame advance) (#737)
* OK

* fixes

* format

* remove gotos, thanks petrie
2021-03-28 19:35:16 -04:00
fig02
7f3be6e37f
en_mm and object_mm OK (#735)
* almost done

* progress

* OK

* update mm2

* delete asm

* whitespace

* Update assets/xml/objects/object_mm.xml

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

* Update src/overlays/actors/ovl_En_Mm/z_en_mm.c

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

* name data

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-28 19:18:41 -04:00
fig02
11e5be77d5
bg_ice_shelter OK (#736)
* ok

* OK

* asm
2021-03-28 18:53:28 -04:00
maekclena
941f79215c
ovl_Demo_6K (#726)
* ovl_Demo_6K

* PR review

* Update src/overlays/actors/ovl_Demo_6K/z_demo_6k.c

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

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-29 00:40:38 +02:00
fig02
71bbaab485
git subrepo pull --force tools/ZAPD (#742)
subrepo:
  subdir:   "tools/ZAPD"
  merged:   "c4773301a"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "c4773301a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2021-03-27 23:57:14 -04:00
Anghelo Carvajal
b338f12498
object_horse_ganon, object_horse_link_child, object_horse_normal and object_horse_zelda OK (#724)
* object_horse_zelda

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse_normal

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse_link_child

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse_ganon

Signed-off-by: angie <angheloalf95@gmail.com>

* object_horse

Signed-off-by: angie <angheloalf95@gmail.com>

* object_hni

Signed-off-by: Angie <angheloalf95@gmail.com>

* ZAPD is falling to do vtx

Signed-off-by: Angie <angheloalf95@gmail.com>

* Testing

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename horse_link_child variables

Signed-off-by: angie <angheloalf95@gmail.com>

* horse_zelda with names

Signed-off-by: angie <angheloalf95@gmail.com>

* I'm suspecting that this game doesn't use z_en_horse_ganon

Signed-off-by: angie <angheloalf95@gmail.com>

* Child epona eye textures

Signed-off-by: Angie <angheloalf95@gmail.com>

* Extract eyes textures from Epona

Signed-off-by: Angie <angheloalf95@gmail.com>

* Small rename

Signed-off-by: Angie <angheloalf95@gmail.com>

* change references in EnHorseNormal

Signed-off-by: angie <angheloalf95@gmail.com>

* Rename a few HorseNormal animations

Signed-off-by: angie <angheloalf95@gmail.com>

* Add normal horse eye texture

Signed-off-by: angie <angheloalf95@gmail.com>

* Add some textures

Signed-off-by: angie <angheloalf95@gmail.com>

* change pointers in EnViewer

Signed-off-by: angie <angheloalf95@gmail.com>

* Rename some animations of HorseGanon

Signed-off-by: angie <angheloalf95@gmail.com>

* Add a few dlists in object_horse

Signed-off-by: Angie <angheloalf95@gmail.com>

* Add whinnies

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename last animations remaining in horse_normal and horse_ganon

Signed-off-by: angie <angheloalf95@gmail.com>

* Remove epona and ingo's horse

Signed-off-by: angie <angheloalf95@gmail.com>

* ./format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* Give a proper name to horses animations

Signed-off-by: angie <angheloalf95@gmail.com>

* add trailling comma

Signed-off-by: Angie <angheloalf95@gmail.com>

* remove union of skeletons

Signed-off-by: angie <angheloalf95@gmail.com>

* change skeletonheader* to void*

Signed-off-by: angie <angheloalf95@gmail.com>

* remove cast

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

* remove cast 2

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

* format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-27 23:44:11 -04:00
Anghelo Carvajal
3aad8f7244
object_du OK (#693)
* .gitkeep and xml

Signed-off-by: angie <angheloalf95@gmail.com>

* comment out most of the xml

Signed-off-by: angie <angheloalf95@gmail.com>

* add all animations

Signed-off-by: angie <angheloalf95@gmail.com>

* textures

Signed-off-by: angie <angheloalf95@gmail.com>

* more textures

Signed-off-by: angie <angheloalf95@gmail.com>

* another texture

Signed-off-by: angie <angheloalf95@gmail.com>

* eye and mouth textures

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* add to spec and comment out a problematic skeleton

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* replace almost all d_ references

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* add missing include

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* fix problems with overlapping data

Signed-off-by: angie <angheloalf95@gmail.com>

* replace references to Darunia's skeleton

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename cutscenes in en_du

Signed-off-by: Angie <angheloalf95@gmail.com>

* last renaming

Signed-off-by: Angie <angheloalf95@gmail.com>

* ups, forgot to delete some pointers from undefined_syms.txt

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename the animations

Signed-off-by: angie <angheloalf95@gmail.com>

* run format

Signed-off-by: angie <angheloalf95@gmail.com>

* gDaruniaSageFormationAnim

Signed-off-by: angie <angheloalf95@gmail.com>

* update actor symbols from object

Signed-off-by: angie <angheloalf95@gmail.com>

* rename eyes

Signed-off-by: angie <angheloalf95@gmail.com>

* rename a mouth texture

Signed-off-by: angie <angheloalf95@gmail.com>

* run format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* typo

Signed-off-by: angie <angheloalf95@gmail.com>

* delete gitkeep

Signed-off-by: angie <angheloalf95@gmail.com>

* link of the pr

Signed-off-by: Angie <angheloalf95@gmail.com>

* update the cs name to the correct one

Signed-off-by: angie <angheloalf95@gmail.com>

* tlut

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

* add object name to outname in palettes

Signed-off-by: angie <angheloalf95@gmail.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-27 23:02:45 -04:00
Anghelo Carvajal
833dc2928d
ovl_En_Jsjutan with 1 non_matching (#713)
* Init

Signed-off-by: angie <angheloalf95@gmail.com>

* destroy and non_matching update

Signed-off-by: angie <angheloalf95@gmail.com>

* declare externs to data

Signed-off-by: angie <angheloalf95@gmail.com>

* nonmatching draw

Signed-off-by: angie <angheloalf95@gmail.com>

* everything is a disaster

Signed-off-by: angie <angheloalf95@gmail.com>

* import bss

Signed-off-by: angie <angheloalf95@gmail.com>

* first step to extract data

Signed-off-by: angie <angheloalf95@gmail.com>

* import data

Signed-off-by: angie <angheloalf95@gmail.com>

* func_80A89860

Signed-off-by: angie <angheloalf95@gmail.com>

* draw

Signed-off-by: angie <angheloalf95@gmail.com>

* func_80A89A6C is crap

Signed-off-by: angie <angheloalf95@gmail.com>

* EnJsjutan_Update

Signed-off-by: angie <angheloalf95@gmail.com>

* change some hexs into decs

Signed-off-by: angie <angheloalf95@gmail.com>

* convert hexs of D_80A8AA98 into decimals and run format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* move data to its own file

Signed-off-by: angie <angheloalf95@gmail.com>

* this function is nightmare

Signed-off-by: angie <angheloalf95@gmail.com>

* i'm really trying

Signed-off-by: angie <angheloalf95@gmail.com>

* i think i am finally doing it

Signed-off-by: angie <angheloalf95@gmail.com>

* move the temps to where they are used

Signed-off-by: angie <angheloalf95@gmail.com>

* rename distance

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename a few variables

Signed-off-by: Angie <angheloalf95@gmail.com>

* unclamp stuff :s

Signed-off-by: Angie <angheloalf95@gmail.com>

* i tried to see if i'm going better that older way

Signed-off-by: Angie <angheloalf95@gmail.com>

* moving stuff around

Signed-off-by: Angie <angheloalf95@gmail.com>

* this is the third try

Signed-off-by: angie <angheloalf95@gmail.com>

* changing bit by bit

Signed-off-by: angie <angheloalf95@gmail.com>

* step by step

Signed-off-by: angie <angheloalf95@gmail.com>

* more stuff

Signed-off-by: angie <angheloalf95@gmail.com>

* slow

Signed-off-by: angie <angheloalf95@gmail.com>

* a few small changes

Signed-off-by: angie <angheloalf95@gmail.com>

* go back to second try

Signed-off-by: Angie <angheloalf95@gmail.com>

* changing a s8 to u8 made a bigger difference than expected

Signed-off-by: Angie <angheloalf95@gmail.com>

* i am slowly doing it

Signed-off-by: Angie <angheloalf95@gmail.com>

* some problems are so dumb

Signed-off-by: Angie <angheloalf95@gmail.com>

* it is improving slowly again

Signed-off-by: Angie <angheloalf95@gmail.com>

* erase the old tries

Signed-off-by: Angie <angheloalf95@gmail.com>

* remove four variables

Signed-off-by: Angie <angheloalf95@gmail.com>

* fix the missing instructions at the end

Signed-off-by: angie <angheloalf95@gmail.com>

* theres only regalloc problems left

Signed-off-by: angie <angheloalf95@gmail.com>

* fix stack

Signed-off-by: angie <angheloalf95@gmail.com>

* add ifdef non_matching

Signed-off-by: Angie <angheloalf95@gmail.com>

* i'm getting desesperate

Signed-off-by: Angie <angheloalf95@gmail.com>

* Remove unnecessary casts

Signed-off-by: Angie <angheloalf95@gmail.com>

* random stuff that improves codegen

Signed-off-by: angie <angheloalf95@gmail.com>

* dumb is dumb

Signed-off-by: angie <angheloalf95@gmail.com>

* erase stuff

Signed-off-by: angie <angheloalf95@gmail.com>

* add some comments

Signed-off-by: Angie <angheloalf95@gmail.com>

* use bomb_explosion param and add some comments

Signed-off-by: angie <angheloalf95@gmail.com>

* add a few comments in about stuff

Signed-off-by: Angie <angheloalf95@gmail.com>

* extract carpet's texture instead of hardcode it

Signed-off-by: Angie <angheloalf95@gmail.com>

* set segment 128 in the xml

Signed-off-by: Angie <angheloalf95@gmail.com>

* Add baseaddress, which fixes dlist in xml

Signed-off-by: Angie <angheloalf95@gmail.com>

* fix the second dlist

Signed-off-by: Angie <angheloalf95@gmail.com>

* compiler complain that the symbol doesn't exists

Signed-off-by: angie <angheloalf95@gmail.com>

* last cleanup

Signed-off-by: angie <angheloalf95@gmail.com>

* format and delete unused asm

Signed-off-by: angie <angheloalf95@gmail.com>

* Cleanup and add a few comments

Signed-off-by: Angie <angheloalf95@gmail.com>

* add non matching to spec

Signed-off-by: angie <angheloalf95@gmail.com>

* update xml and add a note to future people

Signed-off-by: angie <angheloalf95@gmail.com>

* Finally remove z_en_jsjutan_data.c

Signed-off-by: angie <angheloalf95@gmail.com>

* Rename extracted variables

Signed-off-by: angie <angheloalf95@gmail.com>

* Update src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h

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

* Update src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-03-27 22:47:25 -04:00
Anghelo Carvajal
43b45b91c9
object_zl2, object_zl2_anime1 & object_zl2_anime2 OK (#694)
* xml

Signed-off-by: Angie <angheloalf95@gmail.com>

* add xmls of anime1 and anime2

Signed-off-by: Angie <angheloalf95@gmail.com>

* add unaccounted data from animes

Signed-off-by: Angie <angheloalf95@gmail.com>

* add all unaccounted data and a bit of renaming

Signed-off-by: Angie <angheloalf95@gmail.com>

* add to spec and change the pointer to the decompiled names

Signed-off-by: Angie <angheloalf95@gmail.com>

* add palettes

Signed-off-by: angie <angheloalf95@gmail.com>

* delete gitkeep

Signed-off-by: angie <angheloalf95@gmail.com>

* run format

Signed-off-by: angie <angheloalf95@gmail.com>

* change palette to Tlut

Signed-off-by: angie <angheloalf95@gmail.com>

* change `Tlut` to `TLUT`

Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-27 22:24:28 -04:00
Roman971
97f80eeb3f
Update asm_processor and use static variables in En_Torch2 (#740)
* Update asm_processor to current master

* Update variables in En_Torch2 to actually be static

This is now possible because asm_processor was updated to handle static symbols in GLOBAL_ASM

* Update tutorial to reflect changes about static symbol limitations
2021-03-27 16:26:59 -04:00
Liam Nobel
b863784893
EnMu OK (#722)
* Commit Before Draw Decomp

* Closer EnMu_Draw

* Matched draw function

* EnMu Matching with OK

* Removed ASM

* EnMu OK

* Implemented pull request changes as of 2020/03/16

* Reverted header

* Split increment and switched 0s to NULLs
2021-03-27 21:14:38 +01:00
petrie911
d141e39e77
Finished decomp of code_800F7260 (1 non-matching) (#733)
* improved match

* decomped

* I dunno

* matched

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-27 21:01:50 +01:00