mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-08 13:26:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

ovl_daytelop OK (#277)

Browse Source 
* eeeee

* nonequivalents

* draw

* Import data

* Match Daytelop_LoadGraphics

* draw kinda better

* extract daytelops and gameover

* SEGMENT_ROM macros

* Use extracted symbols for daytelop

* match Daytelop_Draw

* Fix bss

* draw cleanup

* Daytelop_Update from non equivalent to non matching

* Some renames and spec

* Run formatter

* enum

* sfx

* Use SEGMENT_ROM_START macros everywhere

* more macros

* run formatter

* Add description

* update variables.txt

* Remove extra stuff in gbi.h

* Would this fix it?

* and again

* whoops

* Apply suggestions from code review

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Tharo's suggestions

* match Daytelop_Update

* run formatter

* fix merge issues

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal
2021-09-22 22:50:35 -03:00
committed by GitHub
parent a59943bc4a
commit 2ff7320409
27 changed files with 419 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+4 -4
View File
@@ -2814,9 +2814,9 @@ void func_801434E4(GameState* gamestate, SkyboxContext* skyboxCtx, s16 skyType);
// void func_80143A04(void);
void func_80143A10(u8 owlId);
// void func_80143A54(void);
// void func_80143AC4(void);
void func_80143AC4(void);
void func_80143B0C(GlobalContext* globalCtx);
// void Sram_IncrementDay(void);
void Sram_IncrementDay(void);
u32 Sram_CalcChecksum(u8* data, u32 length);
// void func_80144628(void);
// void Sram_GenerateRandomSaveFields(void);
@@ -2927,7 +2927,7 @@ void ShrinkWindow_SetPillarboxTarget(s8 target);
void ShrinkWindow_SetPillarboxMagnitude(u8 magnitude);
// s32 ShrinkWindow_GetPillarboxMagnitude(void);
// void ShrinkWindow_Init(void);
// void ShrinkWindow_Fini(void);
void ShrinkWindow_Fini(void);
void ShrinkWindow_Step(s32 framerateDivisor);
void ShrinkWindow_Draw(GlobalContext* globalCtx);
// void func_80161180(void);
@@ -3061,7 +3061,7 @@ s32 FrameAdvance_IsEnabled(GlobalContext* globalCtx);
// void func_8016A168(void);
// void func_8016A178(void);
// void func_8016A268(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5, UNK_TYPE1 param_6);
void Play_Init(GlobalContext* globalCtx);
void Play_Init(GameState* gameState);
// void func_8016AC10(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9, UNK_TYPE4 param_10);
// void func_8016AE1C(void);
// void func_8016B278(void);
include/macros.h
+1 -1
View File
@@ -34,7 +34,7 @@
//#define LINK_IS_CHILD (gSaveContext.linkAge != 0)
#define LINK_IS_ADULT (gSaveContext.linkAge == 0)
#define CURRENT_DAY (gSaveContext.day % 5)
#define CURRENT_DAY (((void)0, gSaveContext.day) % 5)
#define CLOCK_TIME(hr, min) ((s32)(((hr) * 60 + (min)) * 0x10000 / (24 * 60)))
include/segment_symbols.h
+13 -1
View File
@@ -19,6 +19,18 @@
DECLARE_SEGMENT(ovl_##name) \
DECLARE_ROM_SEGMENT(ovl_##name)
#define SEGMENT_START(segment) (_ ## segment ## SegmentStart)
#define SEGMENT_END(segment) (_ ## segment ## SegmentEnd)
#define SEGMENT_SIZE(segment) ((uintptr_t)SEGMENT_END(segment) - (uintptr_t)SEGMENT_START(segment))
#define SEGMENT_ROM_START(segment) (_ ## segment ## SegmentRomStart)
#define SEGMENT_ROM_END(segment) (_ ## segment ## SegmentRomEnd)
#define SEGMENT_ROM_SIZE(segment) ((uintptr_t)SEGMENT_ROM_END(segment) - (uintptr_t)SEGMENT_ROM_START(segment))
#define SEGMENT_BSS_START(segment) (_ ## segment ## SegmentBssStart)
#define SEGMENT_BSS_END(segment) (_ ## segment ## SegmentBssEnd)
#define SEGMENT_BSS_SIZE(segment) ((uintptr_t)SEGMENT_BSS_END(segment) - (uintptr_t)SEGMENT_BSS_START(segment))
DECLARE_SEGMENT(boot)
DECLARE_ROM_SEGMENT(boot)
@@ -1156,7 +1168,7 @@ DECLARE_ROM_SEGMENT(week_static)
DECLARE_ROM_SEGMENT(daytelop_static)
DECLARE_ROM_SEGMENT(ger_daytelop_static)
DECLARE_ROM_SEGMENT(fra_daytelop_static)
DECLARE_ROM_SEGMENT(spa_daytelop_static)
DECLARE_ROM_SEGMENT(esp_daytelop_static)
DECLARE_ROM_SEGMENT(d2_fine_static)
DECLARE_ROM_SEGMENT(d2_cloud_static)
DECLARE_ROM_SEGMENT(d2_fine_pal_static)
include/variables.h
+1 -1
View File
@@ -983,7 +983,7 @@ extern u8 kanfontOrdering[92];
// extern UNK_TYPE1 D_801BDBBC;
// extern UNK_TYPE1 D_801BDBC0;
// extern UNK_TYPE1 D_801BDBC4;
// extern UNK_TYPE1 D_801BDBC8;
extern u8 D_801BDBC8;
// extern UNK_TYPE1 D_801BDBCC;
// extern UNK_TYPE1 D_801BDCF4;
// extern UNK_TYPE1 D_801BE38E;
include/z64animation.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include "z64math.h"
#define LINK_ANIMETION_OFFSET(addr, offset) \
(((u32)&_link_animetionSegmentRomStart) + ((u32)addr & 0xFFFFFF) + ((u32)offset))
(SEGMENT_ROM_START(link_animetion) + ((u32)addr & 0xFFFFFF) + ((u32)offset))
#define LIMB_DONE 0xFF
#define ANIMATION_ENTRY_MAX 50
include/z64save.h
+1 -1
View File
@@ -159,7 +159,7 @@ typedef struct {
/* 0x3F45 */ u8 zTargetSetting; // 0: Switch; 1: Hold
/* 0x3F46 */ u16 unk_3F46; // "NottoriBgm"
/* 0x3F48 */ u8 unk_3F48; // "fade_go"
/* 0x3F4A */ u16 unk_3F4A; // "next_daytime"
/* 0x3F4A */ u16 nextCutsceneIndex; // "next_daytime"
/* 0x3F4C */ u8 cutsceneTrigger; // "doukidemo"
/* 0x3F4D */ u8 unk_3F4D; // "Kenjya_no"
/* 0x3F4E */ u16 nextDayTime; // "next_zelda_time"