pret/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-09-30 15:26:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

clean up whitespace

Browse Source
This commit is contained in:
YamaArashi
2017-05-03 18:16:31 -07:00
parent 218b9abd41
commit c26ecaec0f
4 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/global.h
+18 -18
View File
@@ -73,12 +73,12 @@ enum
struct TextStruct
{
const u8 *text;
const u8 *text;
};
struct FuncStruct
{
void *func;
void *func;
};
struct Coords16
@@ -177,7 +177,7 @@ struct RamScript
struct SB1_2EFC_Struct
{
u16 var;
u16 var;
u8 unknown[0x1E];
};
@@ -287,41 +287,41 @@ struct UnkMauvilleOldManStruct
/*0x2DB6*/ u8 filler_2DB6[0x3];
/*0x2DB9*/ u8 playerTrainerId[4];
u8 unk_2DBD;
/* size = 0x2C */
/* size = 0x2C */
};
struct UnkMauvilleOldManStruct2
{
u8 filler0;
u8 unk1;
u8 unk2;
u16 mauvilleOldMan_ecArray[10];
u16 mauvilleOldMan_ecArray2[6];
u8 filler0;
u8 unk1;
u8 unk2;
u16 mauvilleOldMan_ecArray[10];
u16 mauvilleOldMan_ecArray2[6];
u8 fillerF[0x2];
/* size = 0x2C */
/* size = 0x2C */
};
typedef union OldMan {
struct UnkMauvilleOldManStruct oldMan1;
struct UnkMauvilleOldManStruct2 oldMan2;
struct UnkMauvilleOldManStruct oldMan1;
struct UnkMauvilleOldManStruct2 oldMan2;
} OldMan;
struct Unk_SB_Access_Struct1
{
u8 filler0[0xF8];
struct SB1_2EFC_Struct sb1_2EFC_struct[5];
u8 filler0[0xF8];
struct SB1_2EFC_Struct sb1_2EFC_struct[5];
};
struct Unk_SB_Access_Struct2
{
struct SB1_2EFC_Struct sb1_2EFC_struct2[12]; // each is 0x20
struct SB1_2EFC_Struct sb1_2EFC_struct2[12]; // each is 0x20
/*0x2F84*/ u8 filler[0x18];
};
/*0x2E04*/
typedef union SB_Struct {
struct Unk_SB_Access_Struct1 unkSB1;
struct Unk_SB_Access_Struct2 unkSB2;
struct Unk_SB_Access_Struct1 unkSB1;
struct Unk_SB_Access_Struct2 unkSB2;
} SB_Struct;
// size is 0x198
@@ -395,7 +395,7 @@ struct SaveBlock1 /* 0x02025734 */
/*0x2DC0*/ u8 unk_2DC0[0x14];
/*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff
/*0x2DFC*/ u8 filler_2DFC[0x8];
/*0x2E04*/ SB_Struct sbStruct;
/*0x2E04*/ SB_Struct sbStruct;
/*0x2F9C*/ u8 filler_2F9C[0xA0];
/*0x303C*/ u8 filler_303C[0x38];
/*0x3074*/ u8 filler_3074[0x42];
src/battle_anim.c
+1 -1
View File
@@ -645,7 +645,7 @@ static void ScriptCmd_end(void)
m4aMPlayStop(&gMPlay_SE2);
}
}
// the SE has halted, so set the SE Frame Counter to 0 and continue.
gSoundAnimFramesToWait = 0;
src/item_use.c
+32 -32
View File
@@ -115,25 +115,25 @@ void ItemUseOutOfBattle_CannotUse(u8);
const u8 gSSTidalBetaString[] = _("この　チケットで　ふねに　のりほうだい\nはやく　のってみたいな");
const u8 gSSTidalBetaString2[] = _("この　チケットで　ふねに　のりほうだい\nはやく　のってみたいな");
const struct TextStruct gUnknown_083D61DC[2] =
const struct TextStruct gUnknown_083D61DC[2] =
{
gSSTidalBetaString,
gSSTidalBetaString2,
gSSTidalBetaString,
gSSTidalBetaString2,
};
const struct FuncStruct gExitToOverworldFuncList[3] =
const struct FuncStruct gExitToOverworldFuncList[3] =
{
sub_808B020,
c2_exit_to_overworld_2_switch,
sub_810B96C,
sub_808B020,
c2_exit_to_overworld_2_switch,
sub_810B96C,
};
const u8 gItemFinderDirections[] = { DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST };
const struct FuncStruct gUnknown_083D61F4[2] =
const struct FuncStruct gUnknown_083D61F4[2] =
{
sub_80C9FC0,
CleanUpItemMenuMessage,
sub_80C9FC0,
CleanUpItemMenuMessage,
};
void ExecuteSwitchToOverworldFromItemUse(u8 taskId)
@@ -399,7 +399,7 @@ bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId)
sub_80C9838(taskId, newDistanceX, newDistanceY); // send coordinates of the item relative to the player
}
}
sub_80C9720(taskId);
sub_80C9720(taskId);
// hidden item detected?
if(gTasks[taskId].data[2] == TRUE)
@@ -433,9 +433,9 @@ bool8 sub_80C9688(struct MapConnection *connection, int x, int y)
u16 localX, localY;
u32 localOffset;
s32 localLength;
mapHeader = mapconnection_get_mapheader(connection);
switch(connection->direction)
{
// same weird temp variable behavior seen in HiddenItemAtPos
@@ -651,7 +651,7 @@ void sub_80C9838(u8 taskId, s16 x, s16 y)
{
s16 *data = gTasks[taskId].data;
s16 var1, var2, var3, var4;
if(data[2] == FALSE)
{
data[0] = x;
@@ -666,22 +666,22 @@ void sub_80C9838(u8 taskId, s16 x, s16 y)
var1 = data[0] * -1; // item is to the left
else
var1 = data[0]; // item is to the right
if(data[1] < 0)
var2 = data[1] * -1; // item is to the north
else
var2 = data[1]; // item is to the south
if(x < 0)
var3 = x * -1;
else
var3 = x;
if(y < 0)
var4 = y * -1;
else
var4 = y;
if(var1 + var2 > var3 + var4)
{
data[0] = x;
@@ -716,7 +716,7 @@ u8 GetPlayerDirectionTowardsHiddenItem(s16 itemX, s16 itemY)
abY = itemY * -1;
else
abY = itemY;
if(abX > abY)
{
if(itemX < 0)
@@ -738,7 +738,7 @@ u8 GetPlayerDirectionTowardsHiddenItem(s16 itemX, s16 itemY)
if(itemY < 0)
return DIR_SOUTH;
else
return DIR_WEST;
return DIR_WEST;
}
return DIR_NONE; // should never get here. return something so it doesnt crash.
}
@@ -761,7 +761,7 @@ void DisplayItemRespondingMessageAndExitItemfinder(u8 taskId)
void RotatePlayerAndExitItemfinder(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if(FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE
|| data[2] == FALSE)
{
@@ -769,7 +769,7 @@ void RotatePlayerAndExitItemfinder(u8 taskId)
data[2] = 1;
data[5] = (data[5] + 1) & 3;
data[3]++;
if(data[3] == 4)
DisplayItemMessageOnField(taskId, gOtherText_ItemfinderItemUnderfoot, ExitItemfinder, 0);
}
@@ -798,7 +798,7 @@ void ItemUseOutOfBattle_CoinCase(u8 taskId)
{
ConvertIntToDecimalStringN(gStringVar1, GetCoins(), 0, 4);
StringExpandPlaceholders(gStringVar4, gOtherText_Coins3);
if(!gTasks[taskId].data[2])
{
MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
@@ -896,9 +896,9 @@ void ItemUseOutOfBattle_Medicine(u8 taskId)
void ItemUseOutOfBattle_SacredAsh(u8 taskId)
{
u8 i;
gLastFieldPokeMenuOpened = 0;
for(i = 0; i < 6; i++)
{
if(GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != 0 && GetMonData(&gPlayerParty[i], MON_DATA_HP) == 0)
@@ -927,13 +927,13 @@ void ItemUseOutOfBattle_PPUp(u8 taskId)
void ItemUseOutOfBattle_RareCandy(u8 taskId)
{
gUnknown_03004AE4 = DoRareCandyItemEffect;
sub_80C9D98(taskId);
sub_80C9D98(taskId);
}
void ItemUseOutOfBattle_TMHM(u8 taskId)
{
MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
if(gScriptItemId >= ITEM_HM01)
DisplayItemMessageOnField(taskId, gOtherText_BootedHM, sub_80C9EE4, 1); // HM
else
@@ -1103,9 +1103,9 @@ void sub_80CA2BC(u8 taskId)
void ItemUseInBattle_StatIncrease(u8 taskId)
{
u16 partyId = gUnknown_02024A6A[gUnknown_02024E6C];
MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
if(ExecuteTableBasedItemEffect_(&gPlayerParty[partyId], gScriptItemId, partyId, 0) != FALSE)
{
DisplayItemMessageOnField(taskId, gOtherText_WontHaveAnyEffect, CleanUpItemMenuMessage, 1);
@@ -1152,9 +1152,9 @@ void ItemUseInBattle_PPRecovery(u8 var)
}
void unref_sub_80CA448(u8 var)
{
{
MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
if(ExecuteTableBasedItemEffect__(0, gScriptItemId, 0) == FALSE)
{
RemoveBagItem(gScriptItemId, 1);
@@ -1171,7 +1171,7 @@ void unref_sub_80CA448(u8 var)
void ItemUseInBattle_Escape(u8 taskId)
{
MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
if((gBattleTypeFlags & BATTLE_TYPE_TRAINER) == FALSE)
{
sub_80C9FDC();
src/player_pc.c
+20 -20
View File
@@ -348,7 +348,7 @@ void sub_813A280(u8 taskId)
{
s16 *data = gTasks[taskId].data;
s16 var;
if (gMain.newAndRepeatedKeys & DPAD_UP)
{
if(data[0])
@@ -401,7 +401,7 @@ void sub_813A280(u8 taskId)
PlaySE(5);
data[1]++;
sub_813AE0C(taskId);
if (data[9])
MoveMenuCursor(0);
}
@@ -481,7 +481,7 @@ void sub_813A4B4(u8 taskId)
sub_80F996C(0);
sub_80F996C(1);
if(!data[6])
{
if(gSaveBlock1.pcItems[var].quantity == 1)
@@ -515,7 +515,7 @@ void HandleQuantityRolling(u8 taskId)
{
s16 *data = gTasks[taskId].data;
u8 var = data[0] + data[1];
if(gMain.newAndRepeatedKeys & DPAD_UP)
{
if(data[3] != gSaveBlock1.pcItems[var].quantity)
@@ -577,7 +577,7 @@ void sub_813A6FC(u8 taskId)
{
s16 *data = gTasks[taskId].data;
u8 var = data[0] + data[1];
if(AddBagItem(gSaveBlock1.pcItems[var].itemId, data[3]) == TRUE) // add item works.
{
CopyItemName(gSaveBlock1.pcItems[var].itemId, gStringVar1);
@@ -597,7 +597,7 @@ void sub_813A794(u8 taskId)
{
s16 *data = gTasks[taskId].data;
u8 var = data[0] + data[1];
if(ItemId_GetImportance(gSaveBlock1.pcItems[var].itemId) == FALSE)
{
CopyItemName(gSaveBlock1.pcItems[var].itemId, gStringVar1);
@@ -624,7 +624,7 @@ void sub_813A83C(u8 taskId)
void sub_813A878(u8 taskId)
{
s16 *data = gTasks[taskId].data;
MenuZeroFillWindowRect(0x6, 0x6, 0xD, 0xB);
InitMenu(0, 16, 2, data[4], data[0], 0xD);
sub_80F98DC(0);
@@ -638,17 +638,17 @@ void sub_813A8F0(u8 taskId)
s16 *data = gTasks[taskId].data;
u16 var;
u8 usedItemSlots;
if(gMain.newKeys & 0x1 || gMain.newKeys == 0x2)
{
RemovePCItem(data[0] + data[1], data[3]);
var = data[2];
usedItemSlots = CountUsedPCItemSlots();
data[2] = usedItemSlots;
if((s16)var != usedItemSlots && (s16)var < data[4] + data[1] && data[1] != 0)
data[1]--;
sub_813A240(taskId);
sub_813A9EC(taskId);
InitMenu(0, 16, 2, data[4], data[0], 0xD);
@@ -658,7 +658,7 @@ void sub_813A8F0(u8 taskId)
void sub_813A984(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if(gMain.newKeys & 0x1 || gMain.newKeys == 2)
{
sub_813AD58(gSaveBlock1.pcItems[data[1] + data[0]].itemId);
@@ -701,7 +701,7 @@ void sub_813AA30(u8 taskId, u8 arg)
{
sub_813AD58(gSaveBlock1.pcItems[var].itemId);
}
// dead code not getting optimized out what the fuck???
{
register int data8 asm("r1") = data[8];
@@ -713,7 +713,7 @@ void sub_813AA30(u8 taskId, u8 arg)
void sub_813AAC4(u16 arg1, enum StringConvertMode arg2, u8 arg3, u8 arg4, int arg5)
{
sub_80A4164(gStringVar1, arg1, arg2, arg4);
if(arg5)
MenuPrint(gUnknown_0840632A, 0x1A, arg3);
else
@@ -728,7 +728,7 @@ void sub_813AB10(u8 var)
void sub_813AB28(struct ItemSlot *itemSlot, u8 var, int var2)
{
CopyItemName(itemSlot->itemId, gStringVar1);
if(var2)
MenuPrint(gUnknown_0840631E, 16, var);
else
@@ -750,7 +750,7 @@ void sub_813AB90(struct ItemSlot *itemSlot, u8 var, int var2)
void sub_813ABAC(struct ItemSlot *itemSlot, u8 var, int var2)
{
sub_813AB28(itemSlot, var, var2);
if(itemSlot->itemId < ITEM_HM01)
sub_813AAC4(itemSlot->quantity, STR_CONV_MODE_RIGHT_ALIGN, var, 3, var2);
else
@@ -763,20 +763,20 @@ void sub_813ABE8(u8 taskId)
u16 i;
int tempArg;
u16 j = 0;
// r5 is i and is unsigned 16-bit.
for(i = data[1]; i < data[1] + data[4]; i++)
{
j = (i - data[1]) * 2;
if(i != data[2])
{
tempArg = 0;
if(data[9] != 0 && i == data[8])
tempArg = 1;
switch(GetPocketByItemId(gSaveBlock1.pcItems[i].itemId) - 1)
{
case 0:
@@ -801,7 +801,7 @@ void sub_813ABE8(u8 taskId)
beforeLabel:
if(i - data[1] < 8)
MenuFillWindowRectWithBlankTile(16, j + 4, 0x1C, 0x12);
switch(data[1])
{
default: