in process

This commit is contained in:
MokhaLeee 2023-10-23 13:12:18 +00:00
parent 08f9ab49a1
commit ab21ac238b
5 changed files with 7 additions and 53 deletions

View File

@ -2,50 +2,6 @@
.SYNTAX UNIFIED
THUMB_FUNC_START EkrLvupApfxMain
EkrLvupApfxMain: @ 0x08074B40
push {r4, r5, lr}
adds r5, r0, #0
ldr r1, _08074B8C @ Pal_ManimLevelUpStatGainCycling
ldrh r0, [r5, #0x2e]
adds r4, r0, #1
strh r4, [r5, #0x2e]
movs r0, #3
ands r0, r4
cmp r0, #0
bne _08074B86
lsls r4, r4, #0x10
asrs r4, r4, #0x12
movs r0, #0xf
ands r4, r0
lsls r4, r4, #1
adds r4, r4, r1
movs r0, #0x2c
ldrsh r1, [r5, r0]
adds r1, #0x10
lsls r1, r1, #5
adds r1, #0x12
adds r0, r4, #0
movs r2, #0xe
bl CopyToPaletteBuffer
adds r4, #0x40
movs r0, #0x2c
ldrsh r1, [r5, r0]
adds r1, #0x11
lsls r1, r1, #5
adds r1, #0x12
adds r0, r4, #0
movs r2, #0xe
bl CopyToPaletteBuffer
_08074B86:
pop {r4, r5}
pop {r0}
bx r0
.align 2, 0
_08074B8C: .4byte Pal_ManimLevelUpStatGainCycling
THUMB_FUNC_END EkrLvupApfxMain
THUMB_FUNC_START NewEkrLvupApfx
NewEkrLvupApfx: @ 0x08074B90
push {r4, r5, lr}

View File

@ -96,7 +96,6 @@ extern u16 gEkrLvupPostStatus[EKRLVUP_STAT_MAX];
extern u16 gEkrLvupScrollPos1;
extern u16 gEkrLvupScrollPos2;
extern ProcPtr gpProcEkrLvupApfx;
extern int gEkrTriangleInvalid;
bool CheckEkrLvupDone(void);
void EndEkrLevelUp(void);

View File

@ -81,6 +81,8 @@ struct ProcEfxTriagnleQUAKE {
/* 60 */ ProcPtr qproc;
};
extern int gEkrTriangleInvalid;
extern CONST_DATA struct ProcCmd ProcScr_ekrTriangle[];
extern CONST_DATA struct ProcCmd ProcScr_ekrTriPegasusKnight[];
extern CONST_DATA struct ProcCmd ProcScr_ekrTriPegasusKnightBG[];

View File

@ -534,16 +534,14 @@ void EkrLvupApfxInit(struct ProcEkrLvupApfx * proc)
proc->clock = 0;
}
#if 0
void EkrLvupApfxMain(struct ProcEkrLvupApfx * proc)
{
int new_color_offset;
u16 * colors = Pal_ManimLevelUpStatGainCycling;
u16 *colors = Pal_ManimLevelUpStatGainCycling;
++proc->clock;
proc->clock++;
if ((proc->clock % 4) != 0)
if (proc->clock & 3)
return;
new_color_offset = (proc->clock >> 2) & 0xF;
@ -552,7 +550,6 @@ void EkrLvupApfxMain(struct ProcEkrLvupApfx * proc)
CopyToPaletteBuffer(colors + new_color_offset + 0x00, (0x10 + proc->pal + 0) * 0x20 + 0x12, 0x20 - 0x12);
CopyToPaletteBuffer(colors + new_color_offset + 0x20, (0x10 + proc->pal + 1) * 0x20 + 0x12, 0x20 - 0x12);
}
#endif
CONST_DATA struct ProcCmd ProcScr_EkrLvupApfx[] = {
PROC_CALL(EkrLvupApfxInit),

View File

@ -24,8 +24,8 @@ EWRAM_DATA u32 gUnknown_020200B8[8] = {0};
EWRAM_DATA ProcPtr gpProcEfxPartsofScroll = NULL;
EWRAM_DATA ProcPtr gpProcEfxleveluphb = NULL;
EWRAM_DATA struct Struct20200E0 gUnknown_020200E0 = {0};
EWRAM_DATA struct Unit *gpEkrLvupUnit = NULL;
EWRAM_DATA struct BattleUnit *gpEkrLvupBattleUnit = NULL;
EWRAM_DATA struct Unit * gpEkrLvupUnit = NULL;
EWRAM_DATA struct BattleUnit * gpEkrLvupBattleUnit = NULL;
EWRAM_DATA u16 gEkrLvupPreLevel = 0;
EWRAM_DATA u16 gEkrLvupPostLevel = 0;
EWRAM_DATA u16 gEkrLvupBaseStatus[EKRLVUP_STAT_MAX] = {0};