Game-Decompilation/fireemblem8u
1
0
Fork 0
mirror of https://github.com/FireEmblemUniverse/fireemblem8u.git synced 2024-11-23 05:10:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #676 from minirop/matching-cleanups

Browse Source 
sub_808679C matched, DisplayExtendedSysHand less ugly match
This commit is contained in:
Revo 2024-10-05 20:40:01 -04:00 committed by GitHub
commit 0490874b1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/eventcall.h
View File

@ -148,7 +148,7 @@ void AutolevelSecondaryLord();
extern u8 gUdefCnt;
extern struct UnitDefinition gUdefs[];
extern struct REDA gUdefREDAs[];
extern CONST_DATA u8 gAutoUdefJids[8];
extern CONST_DATA u8 gAutoUdefJids[2][4];
extern CONST_DATA EventListScr EventScr_9EEA58[];
extern CONST_DATA EventListScr EventScr_9EEAAC[];

38
src/events/unused-eventscript.h
View File

@ -17,8 +17,8 @@ CONST_DATA EventListScr EventScr_UnkCh3B_EndingScene[] = {
ENDA
};
CONST_DATA u8 gAutoUdefJids[8] = {
0x58, 0x5B, 0x5F, 0x61, 0, 0, 0, 0
CONST_DATA u8 gAutoUdefJids[2][4] = {
CLASS_BAEL, CLASS_MAUTHEDOOG, CLASS_MOGALL, CLASS_GORGON, 0, 0, 0, 0
};
void AutoGenerateUnitdef(u8 idx, int jid, s8 x_from, s8 y_from, s8 x_to, s8 y_to)
@ -62,40 +62,16 @@ void AutoGenerateUnitdef(u8 idx, int jid, s8 x_from, s8 y_from, s8 x_to, s8 y_to
void sub_808679C(void)
{
#if NONMATCHING
AutoGenerateUnitdef(0, gAutoUdefJids[0 + 4 * gUdefCnt], 0, 2, 14, 2);
AutoGenerateUnitdef(1, gAutoUdefJids[1 + 4 * gUdefCnt], 0, 3, 14, 3);
AutoGenerateUnitdef(2, gAutoUdefJids[2 + 4 * gUdefCnt], 0, 4, 14, 4);
AutoGenerateUnitdef(3, gAutoUdefJids[3 + 4 * gUdefCnt], 0, 5, 14, 5);
#else
int val;
u8 jid;
u8 * jid_lut;
jid = gAutoUdefJids[0 + 4 * gUdefCnt];
AutoGenerateUnitdef(0, jid, 0, 2, 14, 2);
val = 4 * gUdefCnt;
jid_lut = gAutoUdefJids + 1;
jid = jid_lut[val];
AutoGenerateUnitdef(1, jid, 0, 3, 14, 3);
val = 4 * gUdefCnt;
jid_lut = gAutoUdefJids + 2;
jid = jid_lut[val];
AutoGenerateUnitdef(2, jid, 0, 4, 14, 4);
val = 4 * gUdefCnt;
jid_lut = gAutoUdefJids + 3;
jid = jid_lut[val];
AutoGenerateUnitdef(3, jid, 0, 5, 14, 5);
#endif
AutoGenerateUnitdef(0, gAutoUdefJids[gUdefCnt][0], 0, 2, 14, 2);
AutoGenerateUnitdef(1, gAutoUdefJids[gUdefCnt][1], 0, 3, 14, 3);
AutoGenerateUnitdef(2, gAutoUdefJids[gUdefCnt][2], 0, 4, 14, 4);
AutoGenerateUnitdef(3, gAutoUdefJids[gUdefCnt][3], 0, 5, 14, 5);
/* Terminator */
gUdefs[4].charIndex = 0;
gUdefCnt++;
if (gAutoUdefJids[4 * gUdefCnt] == 0)
if (gAutoUdefJids[gUdefCnt][0] == 0)
gUdefCnt = 0;
}

13
src/sysutil.c
View File

@ -277,19 +277,8 @@ void DisplayExtendedSysHand(struct SysHandCursorProc * proc)
{
int i;
#if !NONMATCHING
u32 clk;
u16 * src, * dst, * _dst;
clk = GetGameClock();
dst = gPaletteBuffer;
_dst = dst + (proc->pal_bank * 0x10 + 0x10E);
src = &PAL_BUF_COLOR(Pal_08A1D448, gPlaySt.config.windowColor, (clk / 4) % 0x10);
*_dst = *src;
#else
gPaletteBuffer[proc->pal_bank * 0x10 + 0x10E] =
Pal_08A1D448[gPlaySt.config.windowColor * 0x10 + ((GetGameClock() / 5) % 0x10)];
#endif
((gPlaySt.config.windowColor << 4) + ((GetGameClock() / 4) % 0x10))[Pal_08A1D448];
EnablePaletteSync();
PutSpriteExt(4, proc->x, proc->y + 8, gObject_8x8,