mirror of
https://github.com/zeldaret/mm.git
synced 2026-08-10 03:05:14 -04:00
Anghelo Carvajal
6069a1585f
* Match Player_GetHeight * Another bunch * Fix merge conflict * rename Gfx_DrawDListXlu * add WEEROR * Actor_Spawn * almost Actor_SpawnTransitionActors and Actor_Delete * A bunch of small actors * More renames * format * Some Player renames * a few more * import data * run formatter * func_800B7170 * whoops * Fix merge issues * Whoops 2 * func_800B83BC and func_800B83F8 * Actor_IsActorFacingPlayerAndWithinRange * add some prototypes * match Actor_UpdateBgCheckInfo * func_800B7678 * mark Actor_SpawnAsChildAndCutscene as non_matching * Actor_Draw * Update is chaotic * 2 new matches * func_800BC8B8 * Another bunch * function renames * run formatter * cleanup * remove unnecesary casts * add missing sfx * Fix renames * fix merge * func_800BF7CC * small bunch * another bunch * func_800BE184 non_matching * two more * split z_cheap_proc * Another bunch * another bunch * a few and a non matching * yeee * a * Actor_DrawAll non_equivalent * Actor_RecordUndrawnActor * i don't know what to put in this commit message * func_800B4B50 non matching * func_800B42F8 non matching * func_800B5040 * func_800B5814 non_equiv * func_800B6584 * func_800B6608 * func_800B6680 * func_800B7E04 * func_800B8118 * func_800b9170 * , * func_800BC4EC * func_800BA6FC * func_800BA798 * func_800BA8B8 * Actor_LoadOverlay * small cleanup * func_800BB2D0 * meh * func_800BBAC0 * func_800BC270 * func_800B5208 non matching * Fix warnings * meh * rename some ActorShadow_ functions * fairy * Flags_ * fix warnings * format * Actor_PickUp and family * func_800B8E58 * match Actor_RemoveFromCategory * another bit of docs * Match func_800B86C8 * And another bit * rename Player_GetRunSpeedLimit * func_800B9E84 * func_800BE63C * func_800BB8EC * match func_800B5814 * match func_800B9334 * cleanup * fix conflicts: first pass * another fix * actorfixer fix * fix conflicts * func_800BE680 non_equivalent * Improve func_800BE680 a bit * func_800BE680 equivalent (?) * func_800BE680 equivalent * Actor_UpdateActor equivalent * format * use some ExchangeItemID enum values * Some more cleaning * more cleanup * More name stealing from OoT * match func_800B82EC * match func_800B9D1C and a bit of cleanup * Add ACTOR_FLAGS placeholders * Renames and match func_800BE184 * last pass of name stealing * format * fix conflicts * more cleanup * more cleanup * cleanup and OVERLAY_RELOCATION_OFFSET macro * Remove prototypes of obviously internal-only functions, update variable names, forward declare where necessary, remove all `param_\d`s * remove newlines * minor rename * Use ACTOR_FLAGS in z_actor * Match func_800BE3D0 * Rename movement functions * Document Actor_CalcOffsetOrientedToDrawRotation * velX -> horizontalSpeed * A bit of documentation for actor movement functions * format * Fix merge issues * format * Format * Fix renames * fix warnings * fix conflicts * review :D * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Fix * format * Actor_SpawnSetupActors * engineer review * Update src/code/z_actor.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * A bunch of Engineer's reviews * more Engineer's review * a * whoops * run actorfixer * c'mon * 😮💨 * whoops * warning * More engineer's review * run format * I'm dumb * a * match func_800BE680 * Match Actor_DrawZTarget * Match Actor_SpawnAsChildAndCutscene, fix non-equivalent in Actor_UpdateActor * Fix merge issue * format * update actor * Steal a bit of @Thar0 documentation from OoT's z_message * Run actorfixer * Fix renames * Match func_800B4B50 thanks to @hensldm * Improve ActorShadow_DrawFeet thanks to @hensldm * whoops * Actor_PlaySfxAtProjectedPos * Actor_UpdateActor matched by @hensldm * Match func_800BA2FC by @hensldm * Match Actor_SpawnTransitionActors by @hensldm * Match func_800BB604 by @hensldm * Match Actor_DrawAll by @hensldm * ActorShadow_DrawFeet by @hensldm * Actor_UpdateAll by @hensldm * Match func_800BCCDC by @engineer124 * Small Actor_PlaySfxAtPos by @engineer124 * ACTOR_FLAGS_ALL and a bit of cleanup * Add invisible comment * Small docs pass * Fix merge * Engineer's review * format lol * Actor_DrawDoorLock docs * Actor_SpawnShieldParticlesMetal * fix merge issues * sActorFaultClient * fix * commit message * Run actorfixer.py && format.sh * Fix warnings * fixes * format * bss * Update include/functions.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Address review * Fix merge issues, format and such * fix merge issues * Add ACTORCAT_MAX * actorList -> actorLists * Fix merge issues * format * Enable WERROR on jenkinsfile * Fix merge * Use object symbols * address review * format * review * fix merge issues * fix * VRAM_PTR_SIZE, small cleanup and format * review Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
90 lines
9.0 KiB
XML
90 lines
9.0 KiB
XML
<Root>
|
|
<File Name="gameplay_dangeon_keep" Segment="5">
|
|
<DList Name="gDoorLockDL" Offset="0x140" />
|
|
<DList Name="gDoorChainsDL" Offset="0x230" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_0002C0" OutName="tex_0002C0" Format="rgba16" Width="32" Height="32" Offset="0x2C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_000AC0" OutName="tex_000AC0" Format="rgba16" Width="32" Height="32" Offset="0xAC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_0012C0" OutName="tex_0012C0" Format="rgba16" Width="16" Height="128" Offset="0x12C0" />
|
|
<Blob Name="gameplay_dangeon_keep_Blob_0022C0" Size="0x5000" Offset="0x22C0" />
|
|
<DList Name="gameplay_dangeon_keep_DL_007300" Offset="0x7300" />
|
|
<Collision Name="gameplay_dangeon_keep_Colheader_007498" Offset="0x7498" />
|
|
<DList Name="gameplay_dangeon_keep_DL_007650" Offset="0x7650" />
|
|
<DList Name="gameplay_dangeon_keep_DL_007890" Offset="0x7890" />
|
|
<DList Name="gameplay_dangeon_keep_DL_007980" Offset="0x7980" />
|
|
<DList Name="gameplay_dangeon_keep_DL_007A50" Offset="0x7A50" />
|
|
<DList Name="gameplay_dangeon_keep_DL_007B20" Offset="0x7B20" />
|
|
<DList Name="gameplay_dangeon_keep_DL_007BF0" Offset="0x7BF0" />
|
|
<DList Name="gameplay_dangeon_keep_DL_007E00" Offset="0x7E00" />
|
|
<Collision Name="gameplay_dangeon_keep_Colheader_008018" Offset="0x8018" />
|
|
<DList Name="gameplay_dangeon_keep_DL_0081D0" Offset="0x81D0" />
|
|
<DList Name="gameplay_dangeon_keep_DL_0083F0" Offset="0x83F0" />
|
|
<DList Name="gameplay_dangeon_keep_DL_0085F0" Offset="0x85F0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_0086C0" OutName="tex_0086C0" Format="rgba16" Width="32" Height="32" Offset="0x86C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_008EC0" OutName="tex_008EC0" Format="rgba16" Width="32" Height="32" Offset="0x8EC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_0096C0" OutName="tex_0096C0" Format="rgba16" Width="32" Height="32" Offset="0x96C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_009EC0" OutName="tex_009EC0" Format="rgba16" Width="32" Height="32" Offset="0x9EC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00A6C0" OutName="tex_00A6C0" Format="rgba16" Width="32" Height="32" Offset="0xA6C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00AEC0" OutName="tex_00AEC0" Format="rgba16" Width="32" Height="32" Offset="0xAEC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00B6C0" OutName="tex_00B6C0" Format="rgba16" Width="32" Height="32" Offset="0xB6C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00BEC0" OutName="tex_00BEC0" Format="rgba16" Width="32" Height="32" Offset="0xBEC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00C6C0" OutName="tex_00C6C0" Format="rgba16" Width="32" Height="32" Offset="0xC6C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00CEC0" OutName="tex_00CEC0" Format="rgba16" Width="32" Height="32" Offset="0xCEC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00D6C0" OutName="tex_00D6C0" Format="rgba16" Width="32" Height="32" Offset="0xD6C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00DEC0" OutName="tex_00DEC0" Format="rgba16" Width="32" Height="32" Offset="0xDEC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00E6C0" OutName="tex_00E6C0" Format="rgba16" Width="32" Height="32" Offset="0xE6C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00EEC0" OutName="tex_00EEC0" Format="i8" Width="32" Height="32" Offset="0xEEC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00F2C0" OutName="tex_00F2C0" Format="i8" Width="32" Height="32" Offset="0xF2C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00F6C0" OutName="tex_00F6C0" Format="rgba16" Width="32" Height="32" Offset="0xF6C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_00FEC0" OutName="tex_00FEC0" Format="rgba16" Width="64" Height="32" Offset="0xFEC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_010EC0" OutName="tex_010EC0" Format="rgba16" Width="32" Height="64" Offset="0x10EC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_011EC0" OutName="tex_011EC0" Format="rgba16" Width="16" Height="16" Offset="0x11EC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_0120C0" OutName="tex_0120C0" Format="rgba16" Width="16" Height="16" Offset="0x120C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_0122C0" OutName="tex_0122C0" Format="rgba16" Width="32" Height="64" Offset="0x122C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_0132C0" OutName="tex_0132C0" Format="rgba16" Width="64" Height="16" Offset="0x132C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_013AC0" OutName="tex_013AC0" Format="rgba16" Width="32" Height="32" Offset="0x13AC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_0142C0" OutName="tex_0142C0" Format="rgba16" Width="32" Height="32" Offset="0x142C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_014AC0" OutName="tex_014AC0" Format="rgba16" Width="32" Height="32" Offset="0x14AC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_0152C0" OutName="tex_0152C0" Format="rgba16" Width="32" Height="32" Offset="0x152C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_015AC0" OutName="tex_015AC0" Format="i8" Width="32" Height="32" Offset="0x15AC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_015EC0" OutName="tex_015EC0" Format="i8" Width="32" Height="32" Offset="0x15EC0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_0162C0" OutName="tex_0162C0" Format="i8" Width="64" Height="64" Offset="0x162C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_0172C0" OutName="tex_0172C0" Format="rgba16" Width="32" Height="32" Offset="0x172C0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_017AC0" OutName="tex_017AC0" Format="ia16" Width="4" Height="4" Offset="0x17AC0" />
|
|
<DList Name="gameplay_dangeon_keep_DL_017EA0" Offset="0x17EA0" />
|
|
<DList Name="gameplay_dangeon_keep_DL_018090" Offset="0x18090" />
|
|
<DList Name="gameplay_dangeon_keep_DL_0182A0" Offset="0x182A0" />
|
|
<DList Name="gameplay_dangeon_keep_DL_0182A8" Offset="0x182A8" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_018350" OutName="tex_018350" Format="i8" Width="64" Height="64" Offset="0x18350" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_019350" OutName="tex_019350" Format="i8" Width="64" Height="64" Offset="0x19350" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_01A350" OutName="tex_01A350" Format="i8" Width="64" Height="64" Offset="0x1A350" />
|
|
<TextureAnimation Name="gameplay_dangeon_keep_Matanimheader_01B370" Offset="0x1B370" />
|
|
<DList Name="gameplay_dangeon_keep_DL_01B500" Offset="0x1B500" />
|
|
<DList Name="gameplay_dangeon_keep_DL_01B508" Offset="0x1B508" />
|
|
<DList Name="gameplay_dangeon_keep_DL_01B780" Offset="0x1B780" />
|
|
<DList Name="gameplay_dangeon_keep_DL_01B788" Offset="0x1B788" />
|
|
<DList Name="gameplay_dangeon_keep_DL_01B9F0" Offset="0x1B9F0" />
|
|
<DList Name="gameplay_dangeon_keep_DL_01B9F8" Offset="0x1B9F8" />
|
|
<DList Name="gameplay_dangeon_keep_DL_01BEE0" Offset="0x1BEE0" />
|
|
<DList Name="gameplay_dangeon_keep_DL_01BFB8" Offset="0x1BFB8" />
|
|
<DList Name="gameplay_dangeon_keep_DL_01C058" Offset="0x1C058" />
|
|
<TextureAnimation Name="gameplay_dangeon_keep_Matanimheader_01C118" Offset="0x1C118" />
|
|
<DList Name="gameplay_dangeon_keep_DL_01C220" Offset="0x1C220" />
|
|
<DList Name="gameplay_dangeon_keep_DL_01C228" Offset="0x1C228" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_01C2D8" OutName="tex_01C2D8" Format="rgba16" Width="32" Height="64" Offset="0x1C2D8" />
|
|
<Collision Name="gameplay_dangeon_keep_Colheader_01D488" Offset="0x1D488" />
|
|
<DList Name="gameplay_dangeon_keep_DL_01D980" Offset="0x1D980" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_01DC70" OutName="tex_01DC70" Format="rgba16" Width="32" Height="32" Offset="0x1DC70" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_01E470" OutName="tex_01E470" Format="rgba16" Width="32" Height="32" Offset="0x1E470" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_01EC70" OutName="tex_01EC70" Format="rgba16" Width="32" Height="32" Offset="0x1EC70" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_01F470" OutName="tex_01F470" Format="i4" Width="64" Height="64" Offset="0x1F470" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_01FC70" OutName="tex_01FC70" Format="i4" Width="64" Height="64" Offset="0x1FC70" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_020470" OutName="tex_020470" Format="i4" Width="64" Height="64" Offset="0x20470" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_020C70" OutName="tex_020C70" Format="i4" Width="64" Height="64" Offset="0x20C70" />
|
|
<DList Name="gameplay_dangeon_keep_DL_0219E0" Offset="0x219E0" />
|
|
<DList Name="gameplay_dangeon_keep_DL_021EF0" Offset="0x21EF0" />
|
|
<Texture Name="gameplay_dangeon_keep_Tex_021FF8" OutName="tex_021FF8" Format="rgba32" Width="32" Height="32" Offset="0x21FF8" />
|
|
<TextureAnimation Name="gameplay_dangeon_keep_Matanimheader_023008" Offset="0x23008" />
|
|
<Collision Name="gameplay_dangeon_keep_Colheader_02324C" Offset="0x2324C" />
|
|
</File>
|
|
</Root>
|