mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-27 16:12:48 -04:00
77cfd399d0
* starting * a bunch * and another bunch * a bunch * Match func_800EB1DC * func_800EB4B4 * func_800EB6F8 * 2 more * fix prototype of a random kankyo function * func_800EBD60 non matching * func_800EC678 matched? * func_800EC6D4 * break * func_800ECD7C * A bunch of functions * func_800EE200 * func_800EDF78 and func_800EE0CC * func_800EDBE0 NON_MATCHING * Cutscene_Init NON_MATCHING * func_800EA324 NON_EQUIVALENT * Fix warnings * func_800EC924 NON_EQUIVALENT * Cutscene_ProcessCommands NON_EQUIVALENT * Format * Split z_demo data and import it * Import bss * Match func_800EB364 * Rename Cutscene_Command_SetTime * Improve Cutscene_ProcessCommands a bit (still not equivalent, probably) * Improve Cutscene_ProcessCommands thanks to engineer and anon * Cutscene_ProcessCommands NON_MATCHING * Name some commands * Fix * Renames based on Engineer knowledge of Audio stuff * More command names * Cutscene_Command_GiveTatlToPlayer * Some cutscene commands macros * more command macros * Macros for unknown commands * Improve Cutscene_Command_Textbox a bit * Rename stuff * Name Terminator and Camera * MOTIONBLUR * Macros for textbox commands * CS_PLAYER_ACTION_LIST * A few macro renames * Small cleaning * A bit more of cleanup * Rumble * Entrance comments in func_800EB6F8 * Some var renames * CS_CMD_FADESCREEN * More clean up * Clean functions protos * Move CutsceneStateHandler out of z64.h * Cutscene_DoNothing * Cutscene_IsPlayingCs & Cutscene_GetSceneSetupIndex * And more renames * name some stuff in the cutscenecontext struct * npcActionIndex->actorActionIndex * Undo names of CS_STATE_ enum * Name Cutscene_ActorTranslate family of functions * small docs pass * sfxconvert and format * Hopefully last cleanup * Add some missing functions to actorfixer * Fix merge issues and remove trailing commas * Cutscene commands fix * Cutscene_Command_Misc improved by engineer * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Address review * bss * Match Cutscene_Command_Textbox by anon58 * Fix merge issues * Match Cutscene_Command_Misc by @hensldm * review * float time macros * fix merge issues * format * Fix building assets * fix merge issues * format * Fix * format * fix merge issues * fix * fix * format * fix issues and run format * bss * Fix conflicts, bss and formatter * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64cutscene.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64cutscene.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64cutscene.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * address review and fix some stuff * fix merge problems * more fixes and format * Fixes * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Engineer suggestions * format * Elliptic review * Use dec for ShrinkWindow_SetLetterboxTarget * add a few comments * Cutscene_Command_ChooseCreditsScenes * Update src/code/z_demo.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * format * some cleanups and some comments * change actorActionCmd from hex to dec in the codebase * minor comment on textboxcmd * ahhhh * Update src/code/z_demo.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * brackets * minor comments * rewording * im dumb * brackets * another bracket * Dawn of the New Day * Update src/code/z_demo.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * fixes * Cutscene_Command_TransitionFX by Anon Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
164 lines
5.7 KiB
C
164 lines
5.7 KiB
C
#include "global.h"
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F5090.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F50D4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Kankyo_Init.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F5954.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Environment_LerpWeight.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F5B10.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F5CD0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6834.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F694C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6A04.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6A40.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6AB8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6B44.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6CEC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6EA4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Kankyo_IsSceneUpsideDown.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6FF8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F8554.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F88C4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F8970.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F8A9C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F8CD4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F8D84.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F9728.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F9824.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FA39C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FA3C4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FA9FC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FAAB4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FAC20.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FAF74.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FB010.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Environment_AddLightningBolts.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FB388.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FB758.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FB9B4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FBCBC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Kankyo_InitGameOverLights.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Kankyo_FadeInGameOverLights.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Kankyo_FadeOutGameOverLights.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FC3DC.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FC444.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FC64C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD2B4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD538.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD59C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD5E0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD654.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD698.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/get_days_elapsed.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/reset_days_elapsed.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/get_current_day.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD750.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD768.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD78C.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD858.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD928.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD980.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FDAF8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FDC94.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE390.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE3E0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE484.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE498.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE4A8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE4B8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE590.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE5D0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE610.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE620.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE658.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE6F8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE778.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE788.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE798.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE7A8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE9B4.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FEA50.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FEAB0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FEAC0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FEAF4.s")
|