ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-04 10:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

More camelCase

Browse Source
This commit is contained in:
PikalaxALT 2017-11-01 23:54:11 -04:00
parent 9945d57f07
commit 9884147cd9
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/secret_base.c
View File

@ -496,57 +496,57 @@ void sub_80E9238(u8 flagIn)
void sub_80E933C(void) void sub_80E933C(void)
{ {
u8 *roomdecor; u8 *roomDecor;
u8 *roomdecorpos; u8 *roomDecorPos;
u8 decidx; u8 decorIdx;
u8 objid; u8 objIdx;
u8 metatile; u8 metatile;
u8 category; u8 category;
u8 permission; u8 permission;
u8 nDecor; u8 nDecor;
u16 curBase; u16 curBase;
objid = 0; objIdx = 0;
if (!CurrentMapIsSecretBase()) if (!CurrentMapIsSecretBase())
{ {
roomdecor = gSaveBlock1Ptr->playerRoomDecor; roomDecor = gSaveBlock1Ptr->playerRoomDecor;
roomdecorpos = gSaveBlock1Ptr->playerRoomDecorPos; roomDecorPos = gSaveBlock1Ptr->playerRoomDecorPos;
nDecor = 12; nDecor = 12;
} }
else else
{ {
curBase = VarGet(VAR_0x4054); curBase = VarGet(VAR_0x4054);
roomdecor = gSaveBlock1Ptr->secretBases[curBase].decorations; roomDecor = gSaveBlock1Ptr->secretBases[curBase].decorations;
roomdecorpos = gSaveBlock1Ptr->secretBases[curBase].decorationPos; roomDecorPos = gSaveBlock1Ptr->secretBases[curBase].decorationPos;
nDecor = 16; nDecor = 16;
} }
for (decidx = 0; decidx < nDecor; decidx ++) for (decorIdx = 0; decorIdx < nDecor; decorIdx ++)
{ {
if (roomdecor[decidx] != DECOR_NONE) if (roomDecor[decorIdx] != DECOR_NONE)
{ {
permission = gDecorations[roomdecor[decidx]].permission; permission = gDecorations[roomDecor[decorIdx]].permission;
category = gDecorations[roomdecor[decidx]].category; category = gDecorations[roomDecor[decorIdx]].category;
if (permission == DECORPERM_SOLID_MAT) if (permission == DECORPERM_SOLID_MAT)
{ {
for (objid = 0; objid < gMapHeader.events->mapObjectCount; objid ++) for (objIdx = 0; objIdx < gMapHeader.events->mapObjectCount; objIdx ++)
{ {
if (gMapHeader.events->mapObjects[objid].flagId == gSpecialVar_0x8004 + 0xAE) if (gMapHeader.events->mapObjects[objIdx].flagId == gSpecialVar_0x8004 + 0xAE)
{ {
break; break;
} }
} }
if (objid == gMapHeader.events->mapObjectCount) if (objIdx == gMapHeader.events->mapObjectCount)
{ {
continue; continue;
} }
gSpecialVar_0x8006 = roomdecorpos[decidx] >> 4; gSpecialVar_0x8006 = roomDecorPos[decorIdx] >> 4;
gSpecialVar_0x8007 = roomdecorpos[decidx] & 0xF; gSpecialVar_0x8007 = roomDecorPos[decorIdx] & 0xF;
metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7); metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7);
if (MetatileBehavior_IsMB_B5(metatile) == TRUE || MetatileBehavior_IsMB_C3(metatile) == TRUE) if (MetatileBehavior_IsMB_B5(metatile) == TRUE || MetatileBehavior_IsMB_C3(metatile) == TRUE)
{ {
gScriptResult = gMapHeader.events->mapObjects[objid].graphicsId + VAR_0x3F20; gScriptResult = gMapHeader.events->mapObjects[objIdx].graphicsId + VAR_0x3F20;
VarSet(gScriptResult, gDecorations[roomdecor[decidx]].tiles[0]); VarSet(gScriptResult, gDecorations[roomDecor[decorIdx]].tiles[0]);
gScriptResult = gMapHeader.events->mapObjects[objid].localId; gScriptResult = gMapHeader.events->mapObjects[objIdx].localId;
FlagClear(gSpecialVar_0x8004 + 0xAE); FlagClear(gSpecialVar_0x8004 + 0xAE);
show_sprite(gScriptResult, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); show_sprite(gScriptResult, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
sub_808EBA8(gScriptResult, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); sub_808EBA8(gScriptResult, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);