mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-23 06:54:14 -04:00
TrulyNaN
84ce52ae4e
* test commit * undoing test commit * making sure this is the right repo * removing test file * init for OSH bombable wall started. put back Actor* in function declarations. * BgKin2Bombwall_Init is matching. * started z_bg_kin2_bombwall destroy function. One mismatch right now. * BgKin2Bombwall_Destroy matches. * BgKin2Bombwall_Draw matches. * Fixed BgKin2Bombwall_Init * BgKin2Bombwall_Init and BgKin2Bombwall_Destroy both match. Fixed s32 array in struct. * BgKin2Bombwall_Draw and BgKin2Bombwall_Update match. * Only func_80B6E020 and func_80B6E090 left to match in ovl_Bg_Kin2_Bombwall. * func_80B6E020 from ovl_Bg_Kin2_Bombwall matches. * Went from 8925 to about 5-6k diff score for func_80B6E090 in ovl_Bg_Kin2_Bombwall * Took func_80B6E090 from about 5300 diff score to about 4300 diff score in ovl_Bg_Kin2_Bombwall. * Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 4k ish to 3277 * Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 3277 to 2262. * Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 2262 to 1589. * only slight progress on ovl_Bg_Kinw_Bombwall's func_80B6E090 * Got to 1473 diff score on ovl_Bg_Kinw_Bombwall's func_80B6E090 * Put in the changes made by EllipticEllipsis and hensldm for ovl_Bg_Kin2_Bombwall's func_8066E090. * renamed some symbols. Fake symbol removal makes nonzero diff, but rom OK's after make. * moving declarations around, ordering. * One.word.away. from importing data in ovl_Bg_Kin2_Bombwall. * ovl_Bg_Kin2_Bombwall data imported. Matching. * Edited spec for reloc of ovl_Bg_Kin2_Bombwall. * Removed extra comments for ovl_Bg_Kin2_Bombwall. * unpushed stuff. dunno. * forgot to save z_bg_kin2_bombwall.c * need to commit before make-ing in master. * Ported z_bg_kin2_bombwall's code. Data next. * Imported data for merging z_bg_kin2_bombwall. Yes, I yelled when it OK'd. * Added comments to remember what does what in z_bg_kin2_bombwall. * Some comments in z_bg_kin2_bombwall.c and function names ideas. * Added comments for function name ideas. Cleaned up temps in z_bg_kin2_bombwall except in func_80B6E090. * Renamed most functions and some variables in z_bg_kin2_bombwall. * Made a name suggestion for func_80B6E020 after testing in game. * Ran format.sh. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c 1 and 0 replaced by true and false in func_80B6E020. Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Bending to the x-- supremacy. Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * PR fixes (not done yet) including more consistent use of THIS, removing arg0 and arg1 variable names, standardizing params for z_bg_kin2_bombwall, turning some if-return to if-else, removing unnecessary casts. * Applied isghj5's and EllipticEllipsis' suggestions except for the object file in z_bg_kin2_bombwall. Object file next. * Screwd up formatting. * Thinking of playing with object_kin2_obj. * Documented most of object_kin2_obj based on bombwall, fence and shelf actors. * Had forgotten an arg1 in z_bg_kin2_bombwall.c * First commit for ovl_Bg_Ikana_Mirror branch. * Started decompiling ovl_Bg_Ikana_Mirror. Setup functions and _Update done matching. * Replaced a float by its fractional representation. I need to learn float magic. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Applied more formatting and naming remarks from PR about the C file. Assets and object stuff next. * Display lists and collision header in z_bg_kin2_bombwall.c renamed after their descriptive names in the object's XML file. Name for Ocean Spider House drawers chests left to change. * Working on BgIkanaMirror_Destroy. Stack and registers left essentially. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * One extra line in an if, collision naming convention applied and renamed Ocean Spider House nightstands to drawers chests. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Changed drawers chest to chest of drawers in object_kin2_obj and z_bg_kin2_shelf. * Removed some unnecessary comment. * almost done with BgIkanaMirror_Destroy function. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * BgIkanaMirror_Destroy OK. * Almost done with BgIkanaMirror_Init. Mostly stack stuff left. * Registers and stack left to fix for BgIkanaMirror_Init. * BgIkanaMirror_Init matching. * Ran permuter to improve BgIkanaMirror_Draw's score. * Actually not mad at permuter for BgIkanaMirror_Draw headstart. * Matched func_80B7F730 in ovl_Bg_Ikana_Mirror. Progress on its _Init done too. * func_80B7FA9C in ovl_Bg_Ikana_Mirror is matching. _Init left then documentation. * Mistake in last commit message: actually, _Draw is left for ovl_Bg_Ikana_Mirror. * Going to do some groceries, so pushing. About 2/3 across func_80B7FBA4 in ovl_Bg_Ikana_Mirror. * func_80B7FBA4 in ovl_Bg_Ikana_Mirror is matching. _Draw then data left. * Need to switch branch. * Fixed BgKin2Bombwall_SpawnEffects after the Rand_Next() type update. * Switching branch. * Learning to decomp draw functions with BgIkanaMirror_Draw. YEP * Switching branch. * Went through the first wave of graphics macros attempts for BgIkanaMirror_Draw. * Removed some temps in BgIkanaMirror_Draw. * Second pass of macro attempts for BgIkanaMirror_Draw. * Diff score for BgIkanaMirror_Draw at 1873. Getting there. * BgIkanaMirror_Draw diff score down to 854. 4 instructions off and registers to fix. * Instructions are matching for BgIkanaMirror_Draw. Registers left. * BgIkanaMirror_Draw matches. Data next. Adding some co-authors * BgIkanaMirror_Draw matches. Data next. Adding some co-authors Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Tom-Overton <hensley.derek58@gmail.com> Co-authored-by: Isghj5 <isghj5@gmail.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> * Data imported and OK. Co-authored-by: Maide <eeeedddccc@hotmail.co.uk> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> * Removed commented lines of unused code and useless externs. Documenting C file and object next. * Renamed fields in actor and variables in 3 functions for ovl_bg_ikana_mirror. Some conventions applied. * Renamed more variables in the struct and C file for ovl_bg_ikana_mirror. * More cleanups and naming in ovl_Bg_Ikana_Mirror. * Renamed some functions in ovl_Bg_Ikana_Mirror. More cleanups. Object documentation next once function names confirmed. * Renamed collision header, animated textures and display lists for ovl_Bg_Ikana_Mirror in ovl_Bg_Ikana_Mirror and object_ikana_obj. Some textures left to rename. * Renamed textures only used by ovl_Bg_Ikana_Mirror. Must go back through docs for conventions and styles plus an extra cleanup before PR. * Went through merging and review docs for extra cleanups. Adding co-authors for documentation. Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> * Creating branch to merge ovl_Bg_Ikana_Mirror. * Fixed the merge from zeldaret/mm. ovl_Bg_Ikana_Mirror OK and documented. PR-ready. * Applied first batch of fixes from PR comments. Adding co-authors for documentation and a function rewrite. Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk> * Renamed the colliders in ovl_Bg_Ikana_Mirror's struct and fixed naming in object file plus spacing cleanups. * Full rename for data and temps with respect to the mirror's and light rays' respective colliders. * Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Formatting needed to be applied after commiting suggestions. * Renamed more textures and removed unnecessary array sizes in the data. * Forgot to run formatter. Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Isghj5 <isghj5@gmail.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
68 lines
6.2 KiB
XML
68 lines
6.2 KiB
XML
<Root>
|
|
<File Name="object_ikana_obj" Segment="6">
|
|
<DList Name="object_ikana_obj_DL_000040" Offset="0x40" />
|
|
<DList Name="object_ikana_obj_DL_000048" Offset="0x48" />
|
|
<Collision Name="object_ikana_obj_Colheader_000128" Offset="0x128" />
|
|
<DList Name="object_ikana_obj_DL_000280" Offset="0x280" />
|
|
<DList Name="object_ikana_obj_DL_000288" Offset="0x288" />
|
|
<DList Name="object_ikana_obj_DL_000370" Offset="0x370" />
|
|
<DList Name="object_ikana_obj_DL_000378" Offset="0x378" />
|
|
<Collision Name="object_ikana_obj_Colheader_000488" Offset="0x488" />
|
|
<DList Name="object_ikana_obj_DL_0008C0" Offset="0x8C0" />
|
|
<DList Name="gStoneTowerTemplePunchablePillarDL" Offset="0x8C8" />
|
|
<Collision Name="gStoneTowerTemplePunchablePillarCol" Offset="0xC50" />
|
|
<DList Name="object_ikana_obj_DL_000CE0" Offset="0xCE0" />
|
|
<DList Name="object_ikana_obj_DL_000CE8" Offset="0xCE8" />
|
|
<Collision Name="object_ikana_obj_Colheader_000F28" Offset="0xF28" />
|
|
<DList Name="object_ikana_obj_DL_001100" Offset="0x1100" />
|
|
<DList Name="object_ikana_obj_DL_001210" Offset="0x1210" />
|
|
<TextureAnimation Name="object_ikana_obj_Matanimheader_001228" Offset="0x1228" />
|
|
<DList Name="gStoneTowerTempleMirrorLightAbsorptionDL" Offset="0x14B0" />
|
|
<DList Name="object_ikana_obj_DL_001660" Offset="0x1660" />
|
|
<TextureAnimation Name="gStoneTowerTempleMirrorLightAbsorptionTexAnim" Offset="0x1678" />
|
|
<DList Name="gStoneTowerTempleMirrorLightEmissionDL" Offset="0x1880" />
|
|
<DList Name="object_ikana_obj_DL_001AC0" Offset="0x1AC0" />
|
|
<TextureAnimation Name="gStoneTowerTempleMirrorLightEmissionTexAnim" Offset="0x1AD8" />
|
|
<DList Name="object_ikana_obj_DL_001E10" Offset="0x1E10" />
|
|
<DList Name="gStoneTowerTempleMirrorDL" Offset="0x1E18" />
|
|
<Collision Name="gStoneTowerTempleMirrorCol" Offset="0x2358" />
|
|
<DList Name="object_ikana_obj_DL_004710" Offset="0x4710" />
|
|
<DList Name="object_ikana_obj_DL_0048A0" Offset="0x48A0" />
|
|
<Collision Name="object_ikana_obj_Colheader_006368" Offset="0x6368" />
|
|
<DList Name="object_ikana_obj_DL_007360" Offset="0x7360" />
|
|
<DList Name="object_ikana_obj_DL_007448" Offset="0x7448" />
|
|
<TextureAnimation Name="object_ikana_obj_Matanimheader_007B68" Offset="0x7B68" />
|
|
<Collision Name="object_ikana_obj_Colheader_0084F8" Offset="0x84F8" />
|
|
<Texture Name="object_ikana_obj_TLUT_008530" OutName="tlut_008530" Format="rgba16" Width="4" Height="4" Offset="0x8530" />
|
|
<!-- <Blob Name="object_ikana_obj_Blob_008550" Size="0x40" Offset="0x8550" /> -->
|
|
<Texture Name="object_ikana_obj_TLUT_008590" OutName="tlut_008590" Format="rgba16" Width="4" Height="4" Offset="0x8590" />
|
|
<Texture Name="object_ikana_obj_Tex_0085B0" OutName="tex_0085B0" Format="rgba16" Width="16" Height="16" Offset="0x85B0" />
|
|
<Texture Name="object_ikana_obj_Tex_0087B0" OutName="tex_0087B0" Format="ci4" Width="64" Height="64" Offset="0x87B0" />
|
|
<Texture Name="gStoneTowerTemplePunchablePillarTex" OutName="stone_tower_temple_punchable_pillar" Format="rgba16" Width="32" Height="64" Offset="0x8FB0" />
|
|
<Texture Name="gStoneTowerTempleMirrorFrameTex" OutName="stone_tower_temple_mirror_frame" Format="rgba16" Width="16" Height="16" Offset="0x9FB0" />
|
|
<Texture Name="object_ikana_obj_Tex_00A1B0" OutName="tex_00A1B0" Format="rgba16" Width="16" Height="16" Offset="0xA1B0" />
|
|
<Texture Name="object_ikana_obj_Tex_00A3B0" OutName="tex_00A3B0" Format="rgba16" Width="32" Height="32" Offset="0xA3B0" />
|
|
<Texture Name="object_ikana_obj_Tex_00ABB0" OutName="tex_00ABB0" Format="rgba16" Width="32" Height="32" Offset="0xABB0" />
|
|
<Texture Name="object_ikana_obj_Tex_00B3B0" OutName="tex_00B3B0" Format="rgba16" Width="16" Height="16" Offset="0xB3B0" />
|
|
<Texture Name="object_ikana_obj_Tex_00B5B0" OutName="tex_00B5B0" Format="rgba16" Width="32" Height="32" Offset="0xB5B0" />
|
|
<Texture Name="object_ikana_obj_Tex_00BDB0" OutName="tex_00BDB0" Format="ci4" Width="16" Height="128" Offset="0xBDB0" />
|
|
<Texture Name="object_ikana_obj_Tex_00C1B0" OutName="tex_00C1B0" Format="rgba16" Width="16" Height="64" Offset="0xC1B0" />
|
|
<Texture Name="object_ikana_obj_Tex_00C9B0" OutName="tex_00C9B0" Format="ia8" Width="32" Height="64" Offset="0xC9B0" />
|
|
<Texture Name="object_ikana_obj_Tex_00D1B0" OutName="tex_00D1B0" Format="rgba16" Width="16" Height="64" Offset="0xD1B0" />
|
|
<Texture Name="object_ikana_obj_Tex_00D9B0" OutName="tex_00D9B0" Format="rgba16" Width="32" Height="32" Offset="0xD9B0" />
|
|
<Texture Name="object_ikana_obj_Tex_00E1B0" OutName="tex_00E1B0" Format="ia8" Width="32" Height="64" Offset="0xE1B0" />
|
|
<Texture Name="gStoneTowerTempleLightRaysTex" OutName="stone_tower_temple_light_rays" Format="ia16" Width="16" Height="64" Offset="0xE9B0" />
|
|
<Texture Name="gStoneTowerTempleLightPatternTex" OutName="stone_tower_temple_light_pattern" Format="rgba16" Width="32" Height="32" Offset="0xF1B0" />
|
|
<Texture Name="gStoneTowerTempleMirrorEmissionLightRaysTex" OutName="stone_tower_temple_mirror_emission_light_rays" Format="ia16" Width="16" Height="64" Offset="0xF9B0" />
|
|
<Texture Name="gStoneTowerTempleMirrorSurfaceTex" OutName="stone_tower_temple_mirror_surface" Format="rgba16" Width="32" Height="32" Offset="0x101B0" />
|
|
<Texture Name="gStoneTowerEmblemFrameTex" OutName="stone_tower_temple_emblem_frame" Format="ia8" Width="32" Height="64" Offset="0x109B0" />
|
|
<Texture Name="object_ikana_obj_Tex_0111B0" OutName="tex_0111B0" Format="rgba16" Width="32" Height="32" Offset="0x111B0" />
|
|
<Texture Name="object_ikana_obj_Tex_0119B0" OutName="tex_0119B0" Format="rgba16" Width="32" Height="32" Offset="0x119B0" />
|
|
<DList Name="object_ikana_obj_DL_012B70" Offset="0x12B70" />
|
|
<DList Name="object_ikana_obj_DL_013EA0" Offset="0x13EA0" />
|
|
<DList Name="object_ikana_obj_DL_013EA8" Offset="0x13EA8" />
|
|
<DList Name="object_ikana_obj_DL_014A40" Offset="0x14A40" />
|
|
<Texture Name="object_ikana_obj_Tex_014BA0" OutName="tex_014BA0" Format="rgba16" Width="32" Height="64" Offset="0x14BA0" />
|
|
</File>
|
|
</Root>
|