mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-24 23:21:26 -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>
110 lines
3.8 KiB
C
110 lines
3.8 KiB
C
#include "global.h"
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80147520.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80147564.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80147624.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80147734.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_801477B4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80147818.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80147F18.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80148558.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80148B98.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80148CBC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80148D64.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80149048.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_801491DC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80149454.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_801496C8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014995C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80149C18.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80149EBC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80149F74.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014AAD0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014ADBC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014C70C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014CC14.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014CCB4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014CDF0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014CFDC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014D304.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014D62C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014D7B4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80150A84.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80150D08.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_801514B0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_801518B0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80151938.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80151A68.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80151BB4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80151C9C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80151DA4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80152434.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80152464.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/Message_GetState.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8015268C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80152C64.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80152CAC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80152EC0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80152FB8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80153750.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80153E7C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80153EF0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_801541D4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80156758.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8015680C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_801586A4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/Message_Init.s")
|