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

Label unnamed symbols in trade_scene, 1

Browse Source
This commit is contained in:
PikalaxALT
2021-03-19 08:51:05 -04:00
parent 89faf387db
commit 8ccf95e502
3 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/save.h
+3 -3
View File
@@ -105,9 +105,9 @@ u16 CalculateChecksum(void *data, u16 size);
void UpdateSaveAddresses(void);
u8 HandleSavingData(u8 saveType);
u8 TrySavingData(u8 saveType);
u8 sub_80DA3AC(void);
bool8 sub_80DA3D8(void);
u8 sub_80DA40C(void);
u8 SaveGame_AfterLinkTrade(void);
bool8 AfterLinkTradeSaveFailed(void);
u8 ClearSaveAfterLinkTradeSaveFailure(void);
u8 sub_80DA434(void);
u8 sub_80DA45C(void);
bool8 sub_80DA4A0(void);
src/save.c
+7 -7
View File
@@ -702,7 +702,7 @@ OK:
return 1;
}
u8 sub_80DA3AC(void)
u8 SaveGame_AfterLinkTrade(void)
{
if (gFlashMemoryPresent != TRUE)
return 1;
@@ -712,18 +712,18 @@ u8 sub_80DA3AC(void)
return 0;
}
bool8 sub_80DA3D8(void)
bool8 AfterLinkTradeSaveFailed(void)
{
u8 retVal = sub_80D9AA4(0xE, gRamSaveSectionLocations);
if (gDamagedSaveSectors)
DoSaveFailedScreen(SAVE_NORMAL);
if (retVal == 0xFF)
if (retVal == SAVE_STATUS_ERROR)
return 1;
else
return 0;
}
u8 sub_80DA40C(void)
u8 ClearSaveAfterLinkTradeSaveFailure(void)
{
sub_80D9B04(0xE, gRamSaveSectionLocations);
if (gDamagedSaveSectors)
@@ -865,7 +865,7 @@ void Task_SaveGame_UpdatedLinkRecords(u8 taskId)
break;
case 3:
SetContinueGameWarpStatusToDynamicWarp();
sub_80DA3AC();
SaveGame_AfterLinkTrade();
gTasks[taskId].data[0] = 4;
break;
case 4:
@@ -876,13 +876,13 @@ void Task_SaveGame_UpdatedLinkRecords(u8 taskId)
}
break;
case 5:
if (sub_80DA3D8())
if (AfterLinkTradeSaveFailed())
gTasks[taskId].data[0] = 6;
else
gTasks[taskId].data[0] = 4;
break;
case 6:
sub_80DA40C();
ClearSaveAfterLinkTradeSaveFailure();
gTasks[taskId].data[0] = 7;
break;
case 7:
src/trade_scene.c
+37 -37
View File
@@ -134,7 +134,7 @@ static void BufferInGameTradeMonName(void);
static void GetInGameTradeMail(struct MailStruct * mail, const struct InGameTrade * inGameTrade);
static void CB2_RunTradeAnim_LinkTrade(void);
static void CB2_WaitAndAckTradeComplete(void);
static void sub_8053E8C(void);
static void CB2_HandleTradeEnded(void);
static void LinkTrade_TearDownAssets(void);
static void Task_WaitFadeAndStartInGameTradeAnim(u8 taskId);
static void CheckPartnersMonForRibbons(void);
@@ -144,26 +144,26 @@ static void Task_CloseCenterWhiteColumn(u8 taskId);
static const u16 sTradeBallPalette[] = INCBIN_U16("graphics/trade/ball.gbapal");
static const u8 sTradeBallTiles[] = INCBIN_U8("graphics/trade/ball.4bpp");
static const u8 gUnknown_826267C[] = INCBIN_U8("graphics/trade/pokeball_symbol.8bpp");
static const u16 gUnknown_826407C[] = INCBIN_U16("graphics/trade/cable_closeup_map.bin");
static const u16 gUnknown_083307C0[] = INCBIN_U16("graphics/trade/pokeball_symbol_map.bin");
static const u8 sPokeballSymbolTiles[] = INCBIN_U8("graphics/trade/pokeball_symbol.8bpp");
static const u16 sCableCloseupMap[] = INCBIN_U16("graphics/trade/cable_closeup_map.bin");
static const u16 sPokeballSymbolMap[] = INCBIN_U16("graphics/trade/pokeball_symbol_map.bin");
static const u16 sUnref_083308C0[] = INCBIN_U16("graphics/trade/unknown_3308C0.gbapal");
static const u16 sTradeGbaPal[] = INCBIN_U16("graphics/trade/gba.gbapal");
static const u16 gUnref_08330900[] = INCBIN_U16("graphics/trade/shadow.gbapal");
static const u16 gUnref_08330920[] = INCBIN_U16("graphics/trade/black.gbapal");
static const u16 sShadowPalette[] = INCBIN_U16("graphics/trade/shadow.gbapal");
static const u16 sBlackPalette[] = INCBIN_U16("graphics/trade/black.gbapal");
static const u16 sTradeGlowPal[] = INCBIN_U16("graphics/trade/misc.gbapal");
static const u8 sTradeGlow1Tiles[] = INCBIN_U8("graphics/trade/glow1.4bpp");
static const u8 sTradeGlow2Tiles[] = INCBIN_U8("graphics/trade/glow2.4bpp");
static const u8 sTradeCableEndTiles[] = INCBIN_U8("graphics/trade/cable_end.4bpp");
static const u8 sTradeGBAScreenTiles[] = INCBIN_U8("graphics/trade/gba_screen.4bpp");
const u16 gTradeOrHatchMonShadowTilemap[] = INCBIN_U16("graphics/trade/shadow_map.bin");
static const u8 gUnknown_826701C[] = INCBIN_U8("graphics/trade/gba_affine.8bpp");
static const u8 sGbaAffineTiles[] = INCBIN_U8("graphics/trade/gba_affine.8bpp");
static const u8 sFiller_08335760[64] = {};
static const u8 gUnknown_826985C[] = INCBIN_U8("graphics/trade/gba_affine_map_cable.bin");
static const u8 gUnknown_826995C[] = INCBIN_U8("graphics/trade/gba_affine_map_wireless.bin");
static const u16 gUnknown_8269A5C[] = INCBIN_U16("graphics/trade/gba_map_wireless.bin");
static const u16 gUnknown_826AA5C[] = INCBIN_U16("graphics/trade/gba_map_cable.bin");
static const u32 sUnknown_3379A0Bin[] = INCBIN_U32("graphics/trade/unknown_3379A0.bin.lz");
static const u8 sGbaAffineMapCable[] = INCBIN_U8("graphics/trade/gba_affine_map_cable.bin");
static const u8 sGbaAffineMapWireless[] = INCBIN_U8("graphics/trade/gba_affine_map_wireless.bin");
static const u16 sGbaMapWireless[] = INCBIN_U16("graphics/trade/gba_map_wireless.bin");
static const u16 sGbaMapCable[] = INCBIN_U16("graphics/trade/gba_map_cable.bin");
static const u32 sWirelessCloseupMap[] = INCBIN_U32("graphics/trade/unknown_3379A0.bin.lz");
static const u16 sWirelessSignalAnimPals_Outbound[] = INCBIN_U16("graphics/trade/wireless_signal_send.gbapal");
static const u16 sWirelessSignalAnimPals_Inbound[] = INCBIN_U16("graphics/trade/wireless_signal_receive.gbapal");
static const u16 sWirelessSignalAnimPals_Off[] = INCBIN_U16("graphics/trade/black.gbapal");
@@ -466,7 +466,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_PlayerPokePicAlt[
#include "data/ingame_trades.h"
static const struct WindowTemplate gUnknown_826D1BC[] = {
static const struct WindowTemplate sTradeMessageWindowTemplates[] = {
{
.bg = 0,
.tilemapLeft = 2,
@@ -488,7 +488,7 @@ const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate = {
.baseBlock = 0x0bc
};
static const struct BgTemplate gUnknown_826D1D4[] = {
static const struct BgTemplate sBgTemplates[] = {
{
.bg = 0,
.charBaseIndex = 3,
@@ -721,7 +721,7 @@ static void CheckLinkTimeout(void)
sTradeData->linkTimeoutCheck2 = sTradeData->linkTimeoutCheck1;
}
static u32 GetMultiplayerIdIfLinkTrade(void)
static u32 GetMultiplayerIdOfLinkTrade(void)
{
if (gReceivedRemoteLinkPlayers)
return GetMultiplayerId();
@@ -929,7 +929,7 @@ static void TradeAnimInit_LoadGfx(void)
{
SetGpuReg(REG_OFFSET_DISPCNT, 0);
ResetBgsAndClearDma3BusyFlags(FALSE);
InitBgsFromTemplates(0, gUnknown_826D1D4, NELEMS(gUnknown_826D1D4));
InitBgsFromTemplates(0, sBgTemplates, NELEMS(sBgTemplates));
ChangeBgX(0, 0, 0);
ChangeBgY(0, 0, 0);
SetBgTilemapBuffer(0, Alloc(BG_SCREEN_SIZE));
@@ -941,7 +941,7 @@ static void TradeAnimInit_LoadGfx(void)
LZDecompressWram(gBattleTextboxTilemap, gDecompressionBuffer);
CopyToBgTilemapBuffer(0, gDecompressionBuffer, BG_SCREEN_SIZE, 0);
LoadCompressedPalette(gBattleTextboxPalette, 0x000, 0x20);
InitWindows(gUnknown_826D1BC);
InitWindows(sTradeMessageWindowTemplates);
// ... and doing the same load again
DecompressAndLoadBgGfxUsingHeap(0, gBattleTextboxTiles, 0, 0, 0);
LZDecompressWram(gBattleTextboxTilemap, gDecompressionBuffer);
@@ -1133,11 +1133,11 @@ static void SetTradeSequenceBgGpuRegs(u8 state)
SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(18) | BGCNT_TXT256x512);
if (sTradeData->isCableTrade)
{
DmaCopy16Defvars(3, gUnknown_826AA5C, (void *)BG_SCREEN_ADDR(5), 0x1000);
DmaCopy16Defvars(3, sGbaMapCable, (void *)BG_SCREEN_ADDR(5), 0x1000);
}
else
{
DmaCopy16Defvars(3, gUnknown_8269A5C, (void *)BG_SCREEN_ADDR(5), 0x1000);
DmaCopy16Defvars(3, sGbaMapWireless, (void *)BG_SCREEN_ADDR(5), 0x1000);
}
DmaCopyLarge16(3, gTradeGba_Gfx, (void *)BG_CHAR_ADDR(0), 0x1420, 0x1000);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_OBJ_ON);
@@ -1148,13 +1148,13 @@ static void SetTradeSequenceBgGpuRegs(u8 state)
if (!sTradeData->isCableTrade)
{
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_OBJ_ON);
LZ77UnCompVram(sUnknown_3379A0Bin, (void *)BG_SCREEN_ADDR(5));
LZ77UnCompVram(sWirelessCloseupMap, (void *)BG_SCREEN_ADDR(5));
BlendPalettes(0x000000008, 0x10, RGB_BLACK);
}
else
{
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_OBJ_ON);
DmaCopy16Defvars(3, gUnknown_826407C, (void *)BG_SCREEN_ADDR(5), 0x800);
DmaCopy16Defvars(3, sCableCloseupMap, (void *)BG_SCREEN_ADDR(5), 0x800);
BlendPalettes(0x00000001, 0x10, RGB_BLACK);
}
break;
@@ -1173,14 +1173,14 @@ static void SetTradeSequenceBgGpuRegs(u8 state)
sTradeData->sXY = 0x20;
sTradeData->bg2Zoom = 0x400;
sTradeData->bg2alpha = 0;
DmaCopyLarge16(3, gUnknown_826701C, (void *)BG_CHAR_ADDR(1), 0x2840, 0x1000);
DmaCopyLarge16(3, sGbaAffineTiles, (void *)BG_CHAR_ADDR(1), 0x2840, 0x1000);
if (sTradeData->isCableTrade)
{
DmaCopy16Defvars(3, gUnknown_826985C, (void *)BG_SCREEN_ADDR(18), 0x100);
DmaCopy16Defvars(3, sGbaAffineMapCable, (void *)BG_SCREEN_ADDR(18), 0x100);
}
else
{
DmaCopy16Defvars(3, gUnknown_826995C, (void *)BG_SCREEN_ADDR(18), 0x100);
DmaCopy16Defvars(3, sGbaAffineMapWireless, (void *)BG_SCREEN_ADDR(18), 0x100);
}
break;
case 5:
@@ -1197,14 +1197,14 @@ static void SetTradeSequenceBgGpuRegs(u8 state)
sTradeData->bg2srcX = 0x78;
sTradeData->bg2srcY = 0x50;
sTradeData->bg2alpha = 0;
DmaCopyLarge16(3, gUnknown_826701C, BG_CHAR_ADDR(1), 0x2840, 0x1000);
DmaCopyLarge16(3, sGbaAffineTiles, BG_CHAR_ADDR(1), 0x2840, 0x1000);
if (sTradeData->isCableTrade)
{
DmaCopy16Defvars(3, gUnknown_826985C, (void *)BG_SCREEN_ADDR(18), 0x100);
DmaCopy16Defvars(3, sGbaAffineMapCable, (void *)BG_SCREEN_ADDR(18), 0x100);
}
else
{
DmaCopy16Defvars(3, gUnknown_826995C, (void *)BG_SCREEN_ADDR(18), 0x100);
DmaCopy16Defvars(3, sGbaAffineMapWireless, (void *)BG_SCREEN_ADDR(18), 0x100);
}
break;
case 7:
@@ -2279,7 +2279,7 @@ static bool8 DoTradeAnim_Wireless(void)
return FALSE;
}
static void sub_8053788(void)
static void CB2_TryEvolveAfterTrade(void)
{
u16 evoSpecies;
switch (gMain.state)
@@ -2289,12 +2289,12 @@ static void sub_8053788(void)
gSoftResetDisabled = TRUE;
break;
case 4:
gCB2_AfterEvolution = sub_8053E8C;
gCB2_AfterEvolution = CB2_HandleTradeEnded;
evoSpecies = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], EVO_MODE_TRADE, 0);
if (evoSpecies != SPECIES_NONE)
TradeEvolutionScene(&gPlayerParty[gSelectedTradeMonPositions[0]], evoSpecies, sTradeData->pokePicSpriteIdxs[1], gSelectedTradeMonPositions[0]);
else
SetMainCallback2(sub_8053E8C);
SetMainCallback2(CB2_HandleTradeEnded);
gSelectedTradeMonPositions[0] = 0xFF;
break;
}
@@ -2308,12 +2308,12 @@ static void sub_8053788(void)
static void HandleLinkDataReceive(void)
{
u8 recvStatus;
GetMultiplayerIdIfLinkTrade();
GetMultiplayerIdOfLinkTrade();
recvStatus = GetBlockReceivedStatus();
if (recvStatus & (1 << 0))
{
if (gBlockRecvBuffer[0][0] == 0xDCBA)
SetMainCallback2(sub_8053788);
SetMainCallback2(CB2_TryEvolveAfterTrade);
if (gBlockRecvBuffer[0][0] == 0xABCD)
sTradeData->tradeStatus1 = 1;
ResetBlockReceivedFlag(0);
@@ -2521,7 +2521,7 @@ static void CB2_RunTradeAnim_LinkTrade(void)
static void CB2_WaitAndAckTradeComplete(void)
{
u8 mpId = GetMultiplayerIdIfLinkTrade();
u8 mpId = GetMultiplayerIdOfLinkTrade();
HandleLinkDataReceive();
if (mpId == 0 && sTradeData->tradeStatus1 == 1 && sTradeData->tradeStatus2 == 1)
{
@@ -2536,7 +2536,7 @@ static void CB2_WaitAndAckTradeComplete(void)
UpdatePaletteFade();
}
static void sub_8053E8C(void)
static void CB2_HandleTradeEnded(void)
{
switch (gMain.state)
{
@@ -2587,7 +2587,7 @@ static void sub_8053E8C(void)
MEvent_RecordIdOfWonderCardSenderByEventType(2, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
}
SetContinueGameWarpStatusToDynamicWarp();
sub_80DA3AC();
SaveGame_AfterLinkTrade();
gMain.state++;
sTradeData->timer = 0;
break;
@@ -2598,7 +2598,7 @@ static void sub_8053E8C(void)
}
break;
case 52:
if (sub_80DA3D8())
if (AfterLinkTradeSaveFailed())
{
ClearContinueGameWarpStatus2();
gMain.state = 4;
@@ -2610,7 +2610,7 @@ static void sub_8053E8C(void)
}
break;
case 4:
sub_80DA40C();
ClearSaveAfterLinkTradeSaveFailure();
gMain.state = 40;
sTradeData->timer = 0;
break;