dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ld_script.txt, tabs vs spaces & add: asmdiff.sh

Browse Source
This commit is contained in:
dheu
2019-07-08 17:50:20 +08:00
parent 78925baf89
commit 2b92e8f9d4
3 changed files with 119 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld_script.txt
-1
View File
@@ -215,7 +215,6 @@ SECTIONS {
asm/hall_of_fame.o(.text); asm/hall_of_fame.o(.text);
asm/credits.o(.text); asm/credits.o(.text);
src/diploma.o(.text); src/diploma.o(.text);
asm/diploma.o(.text);
asm/save_failed_screen.o(.text); asm/save_failed_screen.o(.text);
asm/clear_save_data_screen.o(.text); asm/clear_save_data_screen.o(.text);
asm/evolution_graphics.o(.text); asm/evolution_graphics.o(.text);
src/diploma.c
+112 -112
View File
@@ -48,142 +48,142 @@ struct Diploma
u8 state; u8 state;
u8 gfxStep; u8 gfxStep;
u8 callbackStep; u8 callbackStep;
u8 padding; u8 padding;
u8 tilemapBuffer[0x1000]; u8 tilemapBuffer[0x1000];
} }
*gDiploma = NULL; *gDiploma = NULL;
extern const u32 gUnknown_84154E8[]; extern const u32 gUnknown_84154E8[];
void CB2_DiplomaOam(void) void CB2_DiplomaOam(void)
{ {
LoadOam(); LoadOam();
ProcessSpriteCopyRequests(); ProcessSpriteCopyRequests();
TransferPlttBuffer(); TransferPlttBuffer();
} }
void DiplomaInit(void) void DiplomaInit(void)
{ {
gDiploma = AllocZeroed(sizeof(*gDiploma)); gDiploma = AllocZeroed(sizeof(*gDiploma));
gDiploma->state = 0; gDiploma->state = 0;
gDiploma->gfxStep = 0; gDiploma->gfxStep = 0;
gDiploma->callbackStep = 0; gDiploma->callbackStep = 0;
DiplomaBgInit(); DiplomaBgInit();
CreateTask(Task_DiplomaInit, 0); CreateTask(Task_DiplomaInit, 0);
SetMainCallback2(CB2_DiplomaInit); SetMainCallback2(CB2_DiplomaInit);
} }
void CB2_DiplomaInit(void) void CB2_DiplomaInit(void)
{ {
RunTasks(); RunTasks();
AnimateSprites(); AnimateSprites();
BuildOamBuffer(); BuildOamBuffer();
UpdatePaletteFade(); UpdatePaletteFade();
} }
void Task_DiplomaInit(u8 taskId) void Task_DiplomaInit(u8 taskId)
{ {
switch (gDiploma->callbackStep) switch (gDiploma->callbackStep)
{ {
case 0: case 0:
SetVBlankCallback(NULL); SetVBlankCallback(NULL);
break; break;
case 1: case 1:
DiplomaVblankHandler(); DiplomaVblankHandler();
break; break;
case 2: case 2:
if (!DiplomaLoadGfx()) if (!DiplomaLoadGfx())
{ {
return; return;
} }
break; break;
case 3: case 3:
CopyToBgTilemapBuffer(1, gUnknown_84154E8, 0, 0); CopyToBgTilemapBuffer(1, gUnknown_84154E8, 0, 0);
break; break;
case 4: case 4:
if (sub_8088F84()) if (sub_8088F84())
{ {
SetGpuReg(REG_OFFSET_BG1HOFS, 0x80 << 1); SetGpuReg(REG_OFFSET_BG1HOFS, 0x80 << 1);
} }
else else
{ {
SetGpuReg(REG_OFFSET_BG1HOFS, 0); SetGpuReg(REG_OFFSET_BG1HOFS, 0);
} }
break; break;
case 5: case 5:
DiplomaPrintText(); DiplomaPrintText();
break; break;
case 6: case 6:
CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(0);
CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(1);
break; break;
case 7: case 7:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
break; break;
case 8: case 8:
SetVBlankCallback(CB2_DiplomaOam); SetVBlankCallback(CB2_DiplomaOam);
break; break;
default: default:
if (gPaletteFade.active) if (gPaletteFade.active)
{ {
break; break;
} }
PlayFanfareByFanfareNum(5); PlayFanfareByFanfareNum(5);
gTasks[taskId].func = Task_WaitForExit; gTasks[taskId].func = Task_WaitForExit;
} }
gDiploma->callbackStep++; gDiploma->callbackStep++;
} }
void Task_WaitForExit(u8 taskId) void Task_WaitForExit(u8 taskId)
{ {
switch (gDiploma->state) switch (gDiploma->state)
{ {
case 0: case 0:
if (WaitFanfare(0)) if (WaitFanfare(0))
{ {
gDiploma->state++; gDiploma->state++;
} }
break; break;
case 1: case 1:
if (JOY_NEW(A_BUTTON)) if (JOY_NEW(A_BUTTON))
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gDiploma->state++; gDiploma->state++;
} }
break; break;
case 2: case 2:
Task_DiplomaReturnToOverworld(taskId); Task_DiplomaReturnToOverworld(taskId);
break; break;
} }
} }
void Task_DiplomaReturnToOverworld(u8 taskId) void Task_DiplomaReturnToOverworld(u8 taskId)
{ {
if (gPaletteFade.active) if (gPaletteFade.active)
return; return;
DestroyTask(taskId); DestroyTask(taskId);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
FREE_AND_SET_NULL(gDiploma); FREE_AND_SET_NULL(gDiploma);
SetMainCallback2(sub_80568FC); SetMainCallback2(sub_80568FC);
} }
void DiplomaBgInit(void) void DiplomaBgInit(void)
{ {
ResetSpriteData(); ResetSpriteData();
ResetPaletteFade(); ResetPaletteFade();
FreeAllSpritePalettes(); FreeAllSpritePalettes();
ResetTasks(); ResetTasks();
ScanlineEffect_Stop(); ScanlineEffect_Stop();
} }
void DiplomaVblankHandler(void) void DiplomaVblankHandler(void)
{ {
void *vram = (void *)VRAM; void *vram = (void *)VRAM;
DmaClearLarge16(3, vram, VRAM_SIZE, 0x1000); DmaClearLarge16(3, vram, VRAM_SIZE, 0x1000);
DmaClear32(3, (void *)OAM, OAM_SIZE); DmaClear32(3, (void *)OAM, OAM_SIZE);
DmaClear16(3, (void *)PLTT, PLTT_SIZE); DmaClear16(3, (void *)PLTT, PLTT_SIZE);
SetGpuReg(REG_OFFSET_DISPCNT, 0); SetGpuReg(REG_OFFSET_DISPCNT, 0);
ResetBgsAndClearDma3BusyFlags(0); ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, gUnknown_8415A08, 2); InitBgsFromTemplates(0, gUnknown_8415A08, 2);
ChangeBgX(0, 0, 0); ChangeBgX(0, 0, 0);
ChangeBgY(0, 0, 0); ChangeBgY(0, 0, 0);
@@ -193,10 +193,10 @@ void DiplomaVblankHandler(void)
ChangeBgY(2, 0, 0); ChangeBgY(2, 0, 0);
ChangeBgX(3, 0, 0); ChangeBgX(3, 0, 0);
ChangeBgY(3, 0, 0); ChangeBgY(3, 0, 0);
InitWindows(gUnknown_8415A10); InitWindows(gUnknown_8415A10);
DeactivateAllTextPrinters(); DeactivateAllTextPrinters();
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
SetBgTilemapBuffer(1, gDiploma->tilemapBuffer); SetBgTilemapBuffer(1, gDiploma->tilemapBuffer);
ShowBg(0); ShowBg(0);
ShowBg(1); ShowBg(1);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
@@ -205,27 +205,27 @@ void DiplomaVblankHandler(void)
u8 DiplomaLoadGfx(void) u8 DiplomaLoadGfx(void)
{ {
switch (gDiploma->gfxStep) switch (gDiploma->gfxStep)
{ {
case 0: case 0:
ResetTempTileDataBuffers(); ResetTempTileDataBuffers();
break; break;
case 1: case 1:
DecompressAndCopyTileDataToVram(1, gUnknown_84147C0, 0, 0, 0); DecompressAndCopyTileDataToVram(1, gUnknown_84147C0, 0, 0, 0);
break; break;
case 2: case 2:
if (!(FreeTempTileDataBuffersIfPossible() == 1)) if (!(FreeTempTileDataBuffersIfPossible() == 1))
{ {
break; break;
} }
return 0; return 0;
case 3: case 3:
LoadPalette(gUnknown_8415954, 0, 0x40); LoadPalette(gUnknown_8415954, 0, 0x40);
default: default:
return 1; return 1;
} }
gDiploma->gfxStep++; gDiploma->gfxStep++;
return 0; return 0;
} }
void DiplomaPrintText(void) void DiplomaPrintText(void)
tools/asmdiff.sh
Executable
+7
View File
@@ -0,0 +1,7 @@
#!/bin/bash
OBJDUMP="./tools/binutils/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
OPTIONS="--start-address=$1 --stop-address=$2"
$OBJDUMP $OPTIONS baserom.gba > baserom.dump
$OBJDUMP $OPTIONS pokefirered.gba > pokefirered.dump
diff -u baserom.dump pokefirered.dump