* objmure2 about halfway
* all decompiled, one non-matching
* some documentation
* mure2 done, one nonmatching
* Update spec
* Update z_obj_mure2.c
* Update z_obj_mure2.c
* Add files via upload
* fix formatting
* Fix fake match
* Changed data formatting
* More formatting changes
* fixed name of var
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* match
* sfx fix
* should be good to go
* comments and such
* Matrix macros escape me
* format
* fix bubble
* remove comments
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* bwall
* cleanup
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* slug-o-cola
* sfx macros
* Matched
* this will have to do
* well maybe a little more
* good enough
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* a good start
* done
* Log
* formatting
* thisx
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* OK
* documented (with one odd float value)
* delete asm and alter spec
* uniformise spawn data to sIsSpawned,
fix compile warnings in Bg_Jya_Lift and Bg_Mori_Elevator
* translate last printf
* re-delete modified asm
* addressed review comments
* remove outdated comment
* addressed comments, made defines
* untrack scenes dir
* remove scenes dir
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* Oh boy more giant functions
* now functional, but not equivalent
* Now only non-matching
* cleaned up illusion room
* much closer. static variables still suck though
* much closer. static variables still suck though
* some docs and cleanup. matching is horrible.
* static varaibles are a troublesome lot
* ifdef
* merge ZAP
* merge again
* small cleanup
* small fixes
* swordstate
* resolve conflict
* comments and such
Co-authored-by: fig <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* init, destroy, update, couple of others decomped
* 2 functions remain
* data migrated
* 1 function left
* OK
thanks mostly to Petrie and the permuter,
and no thanks to my find/replace skills
* documented and deleted asm
* updated spec
* delete data
* address review comments
* Apply review suggestions
* getting things started
* all matched, rock solid
* deleted assembly, formatted, and cleaned spec
* yikes, forgot to hit -d on deleting the asm
* Fixed suggestions and some documentation
* fixing a few compiler warnings
* added suggestions
* removing assembly to fix merge issues
* Documented function names
* Fix some non matchings in actors and parameter
- `EnTuboTrap_HandleImpact` from `z_en_tubo_trap.c` (fully matching)
- `func_80ADA35C` from `z_en_po_sisters.c` (fully matching)
- `func_80B0B81C` from `z_en_stream.c` (fully matching)
- `Item_Give` from `z_parameter.c` (1 non matching left)
* Rectify bss ordering comment
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* a few fake syms
* two more
* format
* EnStream_Init OK
* func_80B0B7A0 OK
* EnStream_Destroy OK
* EnStream_Update OK
* Make func_80B0B7A0 take this instead of thisx like other SetupActions
* func_80B0BAC8 OK
* func_80B0B934 OK
* func_80B0B81C not OK, but very close and I give up
* EnStream_Draw OK
* Delete unused ASM and do a little cleanup
* Provide better names for functions
* Make the file buildable when NONMATCHING is used
* Flip comparisons in EnStream_SuckPlayer as per review
* NONMATCHING -> NON_MATCHING
* Remove & for function pointers
* Type D_06000950 and remove the & in Draw
* Remove unnecessary "struct"
* Remove unnecessary forward declaration
* Make func_80B0B81C take Vec3f*, not PosRot*
* Use the generated reloc when NON_MATCHING
* Move func_80B0B81C forward declare to the else block
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* rupees and, for some reason, pots
* and now an even larger man
* now for the gallery
* more progress
* naming continues
* even more docs
* another match
* match, fix, a new enum
* Update src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
* fixes except globalctx
* well one more
* and now globalCtx
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* woo watch out
* data and such
* stuff
* more decomp
* another match
* match and docs
* more docs
* little more cleanup
* SFX macros
* little more
* more attempts to match
* naming things
* I give up on the match
* also spec
* changes
* hex
* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.h
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Fully decompiles demo_effect actor.
* Formats z_demo_effect.c
* GET_ACTOR_TYPE is renamed to GET_EFFECT_TYPE
* Implements OPEN_DISPS macros for all draw functions.
* Fixes ugly float values
* Removes unnecessary union structs in the DemoEffect actor struct
* Renames DemoEffect SkelAnimeCurve member to skelCurve
* Names initObjectBankIndex DemoEffect struct member
* Renames jewel display list holders
* Renames initialization function pointers to initUpdateFunc and initDrawFunc
* Renames primitive and environment color DemoEffect struct members.
* Fixes a couple missed floats.
* Renames most draw and update functions.
* Finishes naming all update functions.
* Adds additional SFX defines.
* Renames the rest of the functions
* Renames all external object display lists and vertex references
* Renames DemoEffect global data variables
* Renames DemoEffect Medal function to GetItem because it's used by LightArrows too
* Fixes DemoEffect Timewarp_Timeblock documentation.
* DemoEffect_TimewarpTimeblock updates shrink functions to use decimal
* Converts DemoEffect hex to decimal where appopriate
* Names the rest of DemoEffect struct members.
* Names DemoEffect triforceSpot crystalLightOpacity
* Adds DemoEffect enums for light effect color and god lgt types.
* Renames DemoEffect_UpdateBlueOrb to DemoEffect_UpdateBlueOrbGrow
* Fixes compiler warning in DemoEffect_JewelSparkle
* Renames DemoEffect_MedalSparkle argument
* Reformatting DemoEffect struct offset comments.
* Formats z_demo_effect
* Updates DemoEffect oGfxCtx to use the new macros.
* Adds comments detailing what each function in the DemoEffect system does.
* Removes z_demo_effect.data.s
* Renames DemoEffect global variables and sets them to static
* Removes pointer from DemoEffect function references
* Removes unncecessary default: break; statements in DemoEffect
* Converts rotation values to hex in DemoEffect
* DemoEffect effectFlags now uses ~1 rather than 65534
* DemoEffect_DrawGodLgt now uses a cleaner conditional statement
* eventChkInf in DemoEffect now uses 1 << 9 and 1 << 11
* DemoEffect now uses VT macros.
* Converts DemoEffect colors to hex.
* Changes M_PI / 32768.0f to M_PI / 0x8000
* Updates demo_effect enums to be all caps
* ovl_demo_effect reloc info is now included via build process rather than included from original asm
* Adds param packing macro
* DemoEffect struct unions are now typedef'd outside of the main struct
* Reformats DemoEffect sJewelSparkleColors
* Removes an if(globalCtx){} in DemoEffect_Init
* Removes ActorFunc cast in DemoEffect_Wait
* Removes unncessary comment in DemoEffect_MedalSparkle
* Timer check in DemoEffect_UpdateLightRingShrinking now uses <= 255 rather than < 256
* Removes unnecessary comment in DemoEffect_SetJewelColor
* Removes unncessary comment in DemoEffect_MoveJewelActivateDoorOfTime
* Converts an angle to hex in DemoEffect_MoveJewelActivateDoorOfTime
* Converts a while to for loop in DemoEffect_JewelSparkle
* Moves stack variables in DemoEffect_UpdateDust to a new line for each one
* Removes globalCtx2 assignment to the beginning of the function in DemoEffect_DrawJewel
* Removes unnecessary comment in DemoEffect_DrawCrystalLight
* No longer wrapping rotation reset in if(1){} in DemoEffect_DrawGodLgt
* Converts DemoEffect if statements to use != 0 and == 0 when non-boolean ints are checked.
* DemoEffect initDrawFunc now uses type ActorFunc rather than DemoEffectFunc
* review 2
Co-authored-by: fig <fig02srl@gmail.com>
* All functions decompiled, most named
* asm deleted, spec and undefined_syms included
* missed a static
* Some cleanup on comments and osSyncPrintfs
* asm
Co-authored-by: fig02 <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* I can't wait to bomb some do dodongos
* a whole heap of bombchus
* matched
* more names
* Dodongo dislikes smoke
* i am error
* merge
* fixes
* Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* more matchings, some cleanup
* small cleanup
* decomped most functions, 2 left
* all functions decomped except for Init
* just regalloc left in Init(?)
* Init finally matched, translation, some naming
* most other variables named
* Delete asm
* Whoops, actually deleted asm this time
* review
* review 2
Co-authored-by: fig02 <fig02srl@gmail.com>
* Fixed upstream
* Migrate data and Decomp Init
* Decomp a few more functions
* Small change before starting
* Back to this file
* Match action func chains, func_8096DE94, func_8096DF9C, func_8096E0A4
* Match all except 1 function in first back of actionFuncs
* matched a bunch in bank D_8097053C
* Match the first few draw functions
* match a few more draws and start one
* All matched but one. All equivalent
* Name setup funcs
* finish naming functions
* Fix Gfx stuff
* Remove 'expectedc'
* General clean up
* fix
* progress
* cleanup
* remove reloc
* review 2
* fix awful function pointer thing
Co-authored-by: fig <fig02srl@gmail.com>
* starting the decomp for en_kusa -> the bushes
* in the bushes of love
* maybe the init_function is done?
* The functions that call functions never end
* more progress. almost matches init
* fig helped a bunch...ty fig
* moving things along
* yikes
* more things matching
* moar matches! fixed casting issues on some data
* progress
* progress
* One function left to go
* yeah, idk....its close though
* closer
* Ok
* En_Kusa: Ok
* removing the asm files
* fixed suggestions
* small fixes I forgot
* messed things up, had to go back, back to being OK
* named a couple more functions and fixed some logic
* fixing some names I guessed wrong on
* fixed suggested changes
Co-authored-by: fig <fig02srl@gmail.com>
* Poe actors progress
* Some more progress, En_Poh almost matching
* Further progress
* Fix merge
* Decompile data
* Actor struct cleanups
* More functions OK
* Progress
* Last function decompiled, some nonmatchings left
* Few more OK, skelanime_init definition changes
* Progress
* Style improvements, OPEN/CLOSE_DISPS, few more OK
* Few more style improvements, function prototype additions/changes, another function OK
* Remove unused asm, begin documentation
* Use generated reloc
* Cleanup, format
* Remove a few no longer needed comments
* PR suggestions
* DISP macros
* Missed some FrameUpdateMatrix != 0 replacements
* EnPoField_InteractWithSoul -> EnPoField_SoulInteract, eyeImageIdx -> eyeTextureIdx
* Fix merge, reformat
* Review Suggestions
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Further review suggestions
* Ran formatter
* Less DECR usage
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* EnFd OK
* decompile En_Fd_Fire, document some of En_Fd
* fw wip
* match a few more of ovl_en_fw, properly organize data
* Ovl_En_Fw OK
* Documentation, formatting.
* change Color_RGBA8_n to Color_RGBA8
* PR updates
* fix errors with merge
* review
* dunno why jenkins failed
* review
Co-authored-by: fig <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* new matches
* format
* again
* Update src/overlays/actors/ovl_En_Door/z_en_door.c
* Update src/overlays/actors/ovl_En_Mb/z_en_mb.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Renamed functions based on decomp
* Update function name changes
* Karebaba decomp and documentation with one non-matching function
* Cleaned up some messiness
* Forgot a file
* Addressing code review
* Updated based on code review
* Unnecessary define
* This function is going down
* Removed remaining asm, renamed symbols as recommended, and added comments to give context around the display lists
* Forgot a file
* Fix renamed function
* Addressed issues raised in code review
* Minor cleanup
* Addressed issues identified in code review
* Addressed the issues betterer
* Updated to use poly disp macros
* review 2
Co-authored-by: fig <fig02srl@gmail.com>
* ovl_Obj_Switch OK
* Documentation & Cleanup
* Remove unneeded prototypes, use documentation comments format, add struct offsets
* Got rid of symbols not referenced by code, at the costly price of warnings
* review 2
* remove asm
* review 2
Co-authored-by: fig <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* Many likes alike
* matched
* merge ZAP
* now with names
* merge and small cleanup
* removed commends
* got formatter to behave
* move static array
* fixed variable names
* fixes
* pedantic comments
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* Is this where I make a Mr Hands joke?
* Manos: the Hands of Fate
* cleanup
* and format
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* eek spiders
* now with names
* fixes and formatting
* expanded enum
* void* limb draw
* started nabooru
* more work on nabooru
* did more
* file name
* almost done with z_en_nb
* did some more
* most of en_nb decomp
* data migrated en_nb
* did more
* almost finished
* started some documentation on ovl_en_nb
* did more documentation on en_nb
* did some more
* one non matching in en_nb
* ran format.sh
* update
* updated undefined_syms
* updated descriptions
* use DISP macros, delete japanese files. NABOORU IS 100% MATCHING POGGERS
* made suggested changes and removed reloc file
* Made some suggetsed changes
* Made some updates
* review 3
Co-authored-by: fig <fig02srl@gmail.com>
* merge upstream
* Merge upstream
* Small formatting
* Data section
* MagicDark_Draw
* Gross match of func_80B874E4
* Add func_8005A9CC to functions.h
* Work on func_80B87A18
* func_80B8772C
* Remove comment
* Work on func_80B87A18
* Correct fp constant
* Add regalloc comment ;(
* Move negatives to numbers
* Stupid casts >:(
* Use this->actor when possible
* It's so close
* Use cast + 0xFF
* func_80B87A18
* Delete asm and replace globalCtx2
* Update spec
* static everything
* Name scale
* Use decimal for alpha
* Name some stuff
* Delete reloc
* Name orbOffset
* Name some functions
* Make unused data colors (because it probably is)
* Change >= to >
* Use clamps
* Name MagicDark_DimLighting
* Name gfx
* Rename prototype params
* Cleanup
* Funny cast
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
* Progress
* deleting more function files
* more
* more
* More
* more
* more
* more
* more
* 2 more
* more
* more
* more
* more
* more
* more
* more
* more
* more
* master update
* 4 more
* Merged
* 3 more
* One more done!
* ug
* Ido Recomp test
* try 2
* Recomp by default
* Fix Jenkinsfile
* Fix 2
* Fixing struct
* CFE errors
* CFE fix -O2
* Cleanup
* More progress, almost done...
* Almost..
* Update and some progress
* formatting
* Cleanup
* Major cleanup
* done for now
* PR comments
* PR comments
* merge master and format
* a few things
Co-authored-by: fig <fig02srl@gmail.com>
* En_Dns OK
All functions matching, several named. I left unnamed the really short ones that just do purchase checks, and the string of action functions near the end where the purposes are somewhat opaque.
* Addressed all comments
(with the exception of one that didn't match)
* missed the header
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* else if review comment addressed
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Fixed upstream
* Migrate .data
* Start functions
* Decomp func_80AB9F24
* Add files via upload
Decomp: func_80ABB228(Draw),EnNiwLady_OverrideLimbDraw,func_80ABB0A0
* Matched a few more
* matched more
* progress
* All matched up. Whole file OK
* Format, use reloc, deletet ASM
* Fixed a fake match and removed padding from struct
* Small cleanup
* Small cleanup
* Cleanup and some name changes
* Small cleanup
* Add POLY_OPA_DISP macro
* Fix issue in Draw
* Fix ZAP. hopefully
* PR fixes
* PR fixes
* PR fixes
Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
* merge upstream
* Merge upstream
* BgGanonOtyuka_Init
* Migrate data
* Use texture symbol in dlist
* Split gfx into another file
* Cool data stuff
* Cleanup more data
* Name some more stuff
* Add newline
* BgGanonOtyuka_Destroy
* Rename shockwave to flash
* Work on BgGanonOtyuka_Draw
* Work more on draw
* More progress
* More BgGanonOtyuka_Draw
* Stuff
* Terrible match BgGanonOtyuka_Draw
* BgGanonOtyuka_Update
* func_808760DC
* Cleanup BgGanonOtyuka_Draw
* Cleanup
* More cleanup
* Work on func_80875A0C
* Rename to color
* func_80875C88
* func_80875A0C
* Stuff
* Stuff
* Name top and bottom dlists
* Name some verts
* Add back in accidentally removed D_808772E0
* Name side dlist
* Name dlists
* Name flash verts
* Only add unk_198 to BossGanon
* Name drop timer
* Name isFalling
* Name stuff
* Name stuff relating to sides
* Use Side enum
* Use cardinal directions for sides
* More naming / cleanup
* Rename to SIDE_ALL
* Replace enum with defines
* Flash state
* Reorder add
* Rename to flashHeight
* Revert "Rename to flashHeight"
This reverts commit fa1ca87630.
* Correct sides
* Rename to unwalledSides
* Put f32 on 0x8000
* Cleanup
* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Cleanup
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Decompiled en_horse_zelda
* Deleted some asm files I missed
* Replaced approximation with a fraction
* Turns out the f32 cast is unnecessary
* Converted coordinates to decimal, replaced actor struct padding with char arrays
* Properly converted to decimal
* Renamed actionIndex to action, replaced += 1 with ++
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* marginal improvement
* matched functions. Also fixed a serious lack of static
* format
* more static
* fixing a function prototype
* skelanime OK
* forgot .s
* skin matrix matched
* format
* merge upstream
* Merge upstream
* Migrate data
* Progress
* Progress
* Progress
* Cleanup data
* Match EnOkuta_Update
* EnOkuta_Draw
* func_80AC25D8
* Work on func_80AC2350
* Name EnOkuta_OverrideLimbDraw
* More progress
* More progress
* Progress
* Progress
* func_80AC2350
* func_80AC1938
* Use LINK_IS_ADULT
* func_80AC1B80
* Name some stuff
* Update spec and remove asm
* Name EnOkuta_SpawnSplash
* Name more stuff
* Name EnOkuta_Appear
* Name ColliderInits
* Reorder comparison to make more sense
* Name some Octorock related functions
* Name some projectile stuff
* Reorder comparison
* Convert remaining uses of unk_194 to decimal
* Name some more stuff
* Rename some wait functions to have 'to'
* Consolidate timers
* Name some more stuff
* Change EnOkuta_SetupWaitToAppear to take this
* Name jumpHeight
* Name this->scale
* Name shots
* Name _SetupWaitToShoot and _SetupShoot
* Name more stuff (might change)
* Name EnOkuta_ColliderCheck for now
* Replace some floating point constants
* Change name to make a bit more sense
* Rename mouth to snout
* Just rename parameter to scale
* Fun magic number I guess
* Remove several returns
* Cleanup
* Update src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Clang format
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* merge upstream
* Merge upstream
* Progress
* Progress
* Fixes
* Migrate bss for now ig
* func_80A772EC
* Use rom reloc
* Cleanup
* Correct prototype
* Rename to _PlayBGM
* Eh revert to _StartMusic
* Match func_80A74398 more
* Fixes
* Work on func_80A74398
* Work on func_80A74398
* Match func_80A74398
* Use thisx
* Name, static, and move some stuff
* Match some graphics functions
* Rename asm for named functions
* Forgot one
* More graphics stuff
* Progress
* More progress
* Fix jump table
* Figure out types for a lot of data
* Fix data
* Type remaining data
* Work on func_80A7492C
* Ugly match for func_80A7492C
* Fix func_80A7492C
* Match some interesting stuff
* Move and remove forward declarations
* Sort declarations
* Progress
* Use quotes for vt import
* Slightly better diff
* Better diff again
* Fix stack on func_80A74BA4
* match func_80A74BA4
* func_80A74674
* Progress
* Progress
* Progress
* Progress
* Eh early return probably makes more sense here
* Progress
* Progress
* Progress
* Autocomplete sucks
* Name stuff in func_80A76E2C
* Work a bit on func_80A75C38
* Ugly match func_80A75FA0
* Name it prevInvincibilityTimer
* EnIk_PostLimbDraw3
* Use hex for line numbers in EnIk_PostLimbDraw3
* EnIk_PostLimbDraw2
* EnIk_PostLimbDraw1
* Use hex for line numbers in EnIk_PostLimbDraw1
* Use ACTORTYPE_ENEMY
* Progress
* Possible fake match of func_80A75C38
* Update spec and remove asm
* Cleanup forward declarations
* Move data to fun places
* Move data into func_80A76E2C
* Move data into func_80A75A38
* Make D_80A7847C an array
* Remove struct padding
* Revert "Remove struct padding"
This reverts commit 87b0bd73da.
* Name colliders
* Use else
* Name shieldColliderItems
* Use new graphics macros
* Cleanup
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* gate
* done
* done
* now with names
* OK - data transferred and two functions done
* Not OK
* Not OK
* OK - several more functions
* OK - another function
* OK - 2 more functions
* OK - another function
* OK - one function lefet
* Cleaned up file and removed ASM files
* Removed unneeded forward declaration
* Some cleanup
* More cleanup
* Minor cleanup
* Minor cleanup
* Minor cleanup
* Addressed a few issues
* Changed include statement format
* Changed numbers to hex
* Changed another number to hex
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* wonder item and incidental cleanup on wondertalk2
* merge update
* now with function names
* static variables
* the macros will rise again
* better (?) translation
* fix names
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* Leevers and Tektites and Wolfos, ohmy!
* changes and cleanup
* the need for speed
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* long firewall is long
* Fwbig documented, some cleanup on Zl1
* format
* merge and cleanup
* last things
* Decompiled ovl_bg_spot11_oasis
* Forgot to rename the init chain
* Renamed draw function, corrected include statments, corrected the waterbox pointer assignment, removed early return, removed unnecessary cast
* Forgot to add a newline
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* matching
* format
* document and format
* .s files
* cleanup and macros in block-related actors
* fixed a few more things, also an error I cso an error I caught in another file.
* merge upstream
* Merge upstream
* Match EnHorseNormal_Init
* Work on EnHorseNormal_Draw (probably finish depending functions first)
* func_80A6CC88
* Work on EnHorseNormal_Draw
* Clang format
* Properly use OPEN_DISPS
* Stop using thisx lol
* Use the funny angle number
* Use &D_04049AD0 because it's not a display list?
* Stop using fun macros to fix stack
* EnHorseNormal_Draw
* EnHorseNormal_Destroy
* EnHorseNormal_Update
* Use disp macros EnHorseNormal_Draw
* Correctly type D_04049AD0
* func_80A6C570
* Name some draw stuff
* Fix names
* Make if condition more readable
* func_80A6B30C and fix incorrect pointer types
* Function prototypes
* func_80A6B250
* Add header comment
* Move skin function to functions.h
* Change to stable
* Cleanup a little
* Match some more
* Work on func_80A6BE6C (won't compile yet)
* Work on func_80A6BE6C again
* Progress
* func_80A6CAFC
* Match all but one :)
* Work on func_80A6BE6C
* Work more on func_80A6BE6C
* Multiply floating point by integer lol
* Reorder assignment to almost match
* func_80A6BE6C
* Fix warning and remove unnecessary forward declarations
* Data section
* Cleanup data a bit
* More cleanup and clang format
* Clang format is a little confused
* More cleanup
* Formatting
* Revert formatting on z_bg_spot01_objects2.c
* Name unk_14C
* Add clone comment
* Name clonePos
* Name and cleanup
* Name some animation related stuff
* Remove unnecessary assignment
* Name cloneRotY
* Use ARRAY_COUNT for sAnimations
* Add more to unknown struct layout
* Use u8 for last struct member
* Use s32 for length
* Add padding disclaimer
* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Various suggestions
* Replace 10430.378f
* Remove padding because alignment
* Move function array out of function
* Remove struct name being present twice unecessarily
* Oops forgot the s
* Don't separate static vars from others
* Some cleanup
* Use ARRAY_COUNT(sJntSphItemsInit)
* Minor cleanup
* Rename enum members
* Oops forgot to rename enum
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* merge upstream
* Merge upstream
* Use Petrie's data section
* Move assignment to declaration
* EnIshi_Init without messing with formatting
* EnIshi_Draw
* Update asm
* Remove war of the zeros
* Type function pointers
* Match a few
* Remove extra * in comment
* Progress
* func_80A7E5A8 and add translation
* Cleanup func_80A7E5A8 and work on func_80A7E824
* Work on func_80A7E824
* Cursed asf match for func_80A7E824
* Re-use variable in cursed function to avoid warning
* func_80A7F0A8
* func_80A7F514
* Use C data
* Various fixes
* Move data around
* Clang format and stuff
* Stuff
* Pretty suspicious just saying
* Add janky hack warnings
* Use enum for type
* Cleanup enum a bit
* Use small and large instead of rock and boulder
* Name EnIshi_SetupCollider
* Remove static var space
* Update translation
* Name some stuff
* Name sRockScales
* Use object id defines for func_80029E8C
* Properly type var to s16
* Make match slightly less fake
* Yay no more fake match for func_80A7E824!
* Use thisx all throughout func_80A7E824 for consistency
* Rename to EnIshi_InitCollider
* Remove asm
* Only use thisx where required in func_80A7E824
* Cleanup and naming
* More naming
* Naming
* Finish naming
* Rename sCylinderInit to sCylinderInits
* Actually finish naming
* Minor cleanup
* Header comment
* Format effect function usage properly
* More formatting
* Various changes
* Minor cleanup
* review
Co-authored-by: fig02 <fig02srl@gmail.com>
* Migrate data, fix header, add undefined symbol, decompile Init function
* Decompiled Destroy function
* Decompiled func_808ADEF0 and adjusted struct some
* Decompiled Update function
* Fixed sInitChain stuff
* Preliminary Draw function decompilation
* Replaced code with OPEN_DISPS and CLOSE_DISPS and some hex with decimal
* Working on Draw function still
* More permuter test stuff
* Got Draw matching except for one little TwoTex issue
* Added NON_MATCHING
* Removed false alarm
* Got most of the functions decompiled; 1 non-matching, 1 not started
* Ran format.sh on file
* These two symbols should be arrays
* Got func_808ADAE0 mostly decompiled
* Got func_808ADAE0 fully decompiled!
* Removed necessary files (except _Draw)
* Successfully decompiled Draw function
* Decompiled Draw function
+ Added proper includes to spec
* Removed Draw function assembly
* Moved func_800F46E0 prototype to functions.h
* Renamed unk_174 to bufferIndex
* Replaced state constants with enum
* Renamed func_808ADAE0 to BgSpot03Taki_ApplyOpeningAlpha
* Renamed func_808ADAE0 to BgSpot03Taki_ApplyOpeningAlpha
* Made changes as per pull request comments
Co-authored-by: fig02 <fig02srl@gmail.com>
* Approx. half of en_rl matched
* More En_Rl work
* 5 functions left
* One function left
* En_Rl OK and all matching
* Formatted and cleaned up style things.
* Deleted asm and fixed spec
* Forgot to delete the stuff in the data folder again
* Made all requested changes.
* Forgot one requested change
* Implemented dragorn's documentation suggestions
* Implemented dragorn's documentation suggestions
* Made further requested changes
Co-authored-by: fig02 <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* bonk
* static var cleanup
* one more rename
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* flame circles
* merge and description
* Update src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* formatting and other cleanup
* names
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* and now for poe sister stuff
* more matches
* awful control flow still needed
* complex control is comples
* matched and documented
* also remove .s
* ZAP
* .s files never die
* more cleaning
* a little more cleanup
* data cleanup
* merge and fix
* removing globalCtx2
* dlists
* forgot this
* now with ColHeader
* a little more
* one last name change
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* spinny wall
* cleanup
* wait for mori tex
* merge and better (?) names
