diff options
author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-05-05 16:16:54 +0200 |
---|---|---|
committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-05-05 09:47:54 -0700 |
commit | c8e8e7dcfc60ab2769c0c1ada5a580ec1c1c4d5d (patch) | |
tree | c7033d6f1eb7b30a8be59c2e721ff6b13f1a7ce0 | |
parent | 1d0e8cbbd6955b4e20fb25d8a3df9297bb378f1b (diff) |
Remove trailing whitespace
-rw-r--r-- | src/battle_811DA74.c | 6 | ||||
-rw-r--r-- | src/battle_ai.c | 2 | ||||
-rw-r--r-- | src/battle_party_menu.c | 14 | ||||
-rw-r--r-- | src/bike.c | 8 | ||||
-rw-r--r-- | src/field_map_obj.c | 154 | ||||
-rw-r--r-- | src/fldeff_cut.c | 26 | ||||
-rw-r--r-- | src/mauville_old_man.c | 28 | ||||
-rw-r--r-- | src/metatile_behavior.c | 2 | ||||
-rw-r--r-- | src/naming_screen.c | 132 | ||||
-rw-r--r-- | src/player_pc.c | 4 | ||||
-rw-r--r-- | src/rom3.c | 52 | ||||
-rw-r--r-- | src/rom4.c | 2 | ||||
-rw-r--r-- | src/rom6.c | 12 | ||||
-rw-r--r-- | src/script_movement.c | 28 | ||||
-rw-r--r-- | src/script_pokemon_util_80C4BF0.c | 30 | ||||
-rw-r--r-- | src/script_pokemon_util_80F99CC.c | 10 | ||||
-rw-r--r-- | src/shop.c | 10 | ||||
-rw-r--r-- | src/smokescreen.c | 2 | ||||
-rw-r--r-- | src/strings.c | 2 |
19 files changed, 262 insertions, 262 deletions
diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c index 1ceb129fe..4d66910ba 100644 --- a/src/battle_811DA74.c +++ b/src/battle_811DA74.c @@ -360,7 +360,7 @@ void dp01t_00_3_getattr(void) u8 unk[256]; int r6 = 0; s32 i; - + if (gUnknown_02023A60[gUnknown_02024A60][2] == 0) { r6 = dp01_getattr_by_ch1_for_player_pokemon(gUnknown_02024A6A[gUnknown_02024A60], unk); @@ -389,7 +389,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) s16 data16; u32 data32; s32 size = 0; - + switch (gUnknown_02023A60[gUnknown_02024A60][1]) { case 0: @@ -694,7 +694,7 @@ void sub_811EC10(void) { u8 i; u8 r4; - + if (gUnknown_02023A60[gUnknown_02024A60][2] == 0) { sub_811EC68(gUnknown_02024A6A[gUnknown_02024A60]); diff --git a/src/battle_ai.c b/src/battle_ai.c index cefa8fecb..bd320904f 100644 --- a/src/battle_ai.c +++ b/src/battle_ai.c @@ -421,7 +421,7 @@ void BattleAI_DoAIProcessing(void) AI_THINKING_STRUCT->aiState = AIState_SettingUp; // as long as their are more moves to process, keep setting this to setup state. else AI_THINKING_STRUCT->aiState++; // done processing. - AI_THINKING_STRUCT->aiAction &= (AI_ACTION_FLEE | AI_ACTION_WATCH | AI_ACTION_DO_NOT_ATTACK | + AI_THINKING_STRUCT->aiAction &= (AI_ACTION_FLEE | AI_ACTION_WATCH | AI_ACTION_DO_NOT_ATTACK | AI_ACTION_UNK5 | AI_ACTION_UNK6 | AI_ACTION_UNK7 | AI_ACTION_UNK8); // disable AI_ACTION_DONE. } break; diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index d61da637e..820d16465 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -129,7 +129,7 @@ int SetUpBattlePartyMenu(void) { EWRAM_1B000.unk266 = 0; EWRAM_1B000.unk264++; - } + } } break; case 1: @@ -223,7 +223,7 @@ void SetUpBattlePokemonMenu(u8 a) gUnknown_03004AE4(a, gScriptItemId, Task_80952E4); return; } - + switch (sub_806BD80(a)) { case 1: @@ -331,7 +331,7 @@ static void Task_809538C(void) static void Task_HandlePopupMenuInput(u8 taskId) { TaskFunc func; - + if (!gPaletteFade.active) { if (gMain.newAndRepeatedKeys & DPAD_UP) @@ -347,7 +347,7 @@ static void Task_HandlePopupMenuInput(u8 taskId) return; } if (gMain.newKeys & A_BUTTON) - { + { PlaySE(SE_SELECT); func = PartyMenuGetPopupMenuFunc(gTasks[taskId].data[4], sBattlePartyPopupMenus, @@ -374,7 +374,7 @@ static void Task_80954C0(u8 taskId) static void Task_ShowSummaryScreen(u8 taskId) { u8 partySelection = sub_806CA38(taskId); - + if (!gPaletteFade.active) { DestroyTask(taskId); @@ -395,7 +395,7 @@ static void Task_BattlePartyMenuShift(u8 taskId) u8 partySelection; u8 i; u8 r4; - + sub_806E7D0(gTasks[taskId].data[4], sBattlePartyPopupMenus); partySelection = sub_806CA38(taskId); if (IsLinkDoubleBattle() == TRUE && (partySelection == 1 || partySelection == 4 || partySelection == 5)) @@ -458,7 +458,7 @@ static void Task_BattlePartyMenuShift(u8 taskId) { u8 r0; u8 r4 = gUnknown_02024E6C; - + sub_806D5A4(); r0 = pokemon_order_func(gUnknown_02024A6A[r4]); GetMonNickname(&gPlayerParty[r0], gStringVar1); diff --git a/src/bike.c b/src/bike.c index 4faa6329f..d7175b5e0 100644 --- a/src/bike.c +++ b/src/bike.c @@ -303,7 +303,7 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys *newDirection = gPlayerAvatar.unk9; gPlayerAvatar.bikeFrameCounter++; - + //Wait 6 frames before actually changing direction if (gPlayerAvatar.bikeFrameCounter > 6) { @@ -341,7 +341,7 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *ptr, u16 newKeys, u16 heldKeys) direction = player_get_direction_upper_nybble(); playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; gPlayerAvatar.running2 = 0; - + if (heldKeys & B_BUTTON) gPlayerAvatar.bikeFrameCounter++; else @@ -406,9 +406,9 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *ptr, u16 newKeys, u16 heldKeys) return 4; } } - + //B Button is still held - + if (*ptr == DIR_NONE) { *ptr = direction; diff --git a/src/field_map_obj.c b/src/field_map_obj.c index e049aae57..f7e09aacf 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -105,7 +105,7 @@ void sub_805AAB0(void) u8 sub_805AB54(void) { u8 i; - + for (i = 0; i < 16; i++) { if (!gMapObjects[i].active) @@ -134,7 +134,7 @@ bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 u8 GetFieldObjectIdByXY(s16 x, s16 y) { u8 i; - + for (i = 0; i < 16; i++) { if (gMapObjects[i].active && gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y) @@ -146,7 +146,7 @@ u8 GetFieldObjectIdByXY(s16 x, s16 y) u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroup) { u8 i; - + for (i = 0; i < 16; i++) { if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup) @@ -158,7 +158,7 @@ u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroup) u8 GetFieldObjectIdByLocalId(u8 localId) { u8 i; - + for (i = 0; i < 16; i++) { if (gMapObjects[i].active && gMapObjects[i].localId == localId) @@ -174,7 +174,7 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 u8 var; u16 r3; u16 r2; - + //asm("nop"::"r"(b)); if (GetAvailableFieldObjectSlot(template->localId, b, c, &var) != 0) return 16; @@ -382,14 +382,14 @@ u8 sub_805ADDC(u8 localId) { u8 objectCount; u8 i; - + if (gMapHeader.events == NULL) return 16; objectCount = gMapHeader.events->mapObjectCount; for (i = 0; i < objectCount; i++) { struct MapObjectTemplate *template = &gSaveBlock1.mapObjectTemplates[i]; - + if (template->localId == localId && !FlagGet(template->flagId)) return InitFieldObjectStateFromTemplate(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } @@ -399,7 +399,7 @@ u8 sub_805ADDC(u8 localId) u8 GetAvailableFieldObjectSlot(u16 a, u8 b, u8 c, u8 *d) { u8 i = 0; - + for (i = 0; i < 16 && gMapObjects[i].active; i++) { if (gMapObjects[i].localId == a && gMapObjects[i].mapNum == b && gMapObjects[i].mapGroup == c) @@ -425,7 +425,7 @@ void RemoveFieldObject(struct MapObject *mapObject) void RemoveFieldObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { u8 mapObjectId; - + if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) return; FlagSet(GetFieldObjectFlagIdByFieldObjectId(mapObjectId)); @@ -436,7 +436,7 @@ void RemoveFieldObjectInternal(struct MapObject *mapObject) { struct SpriteFrameImage image; const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); - + image.size = gfxInfo->size; gSprites[mapObject->spriteId].images = ℑ DestroySprite(&gSprites[mapObject->spriteId]); @@ -445,7 +445,7 @@ void RemoveFieldObjectInternal(struct MapObject *mapObject) void npc_hide_all_but_player(void) { u8 i; - + for (i = 0; i < 16; i++) { if (i != gPlayerAvatar.mapObjectId) @@ -460,11 +460,11 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * const struct MapObjectGraphicsInfo *gfxInfo; struct MapObject *mapObject; struct Sprite *sprite; - + mapObjectId = InitFieldObjectStateFromTemplate(mapObjTemplate, c, d); if (mapObjectId == 16) return 16; - + mapObject = &gMapObjects[mapObjectId]; gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); if (gfxInfo->paletteSlot == 0) @@ -473,7 +473,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * npc_load_two_palettes__and_record(gfxInfo->paletteTag1, gfxInfo->paletteSlot); if (mapObject->animPattern == 0x4C) mapObject->mapobj_bit_13 = TRUE; - + #ifdef NONMATCHING sprTemplate->paletteTag = 0xFFFF; #else @@ -510,7 +510,7 @@ u8 SpawnFieldObject(struct MapObjectTemplate *mapObjTemplate, u8 b, u8 c, s16 d, struct SpriteFrameImage spriteFrameImage; const struct MapObjectGraphicsInfo *gfxInfo; u8 mapObjectId; - + gfxInfo = GetFieldObjectGraphicsInfo(mapObjTemplate->graphicsId); MakeObjectTemplateFromFieldObjectTemplate(mapObjTemplate, &spriteTemplate, &subspriteTables); spriteFrameImage.size = gfxInfo->size; @@ -528,7 +528,7 @@ u8 SpawnSpecialFieldObject(struct MapObjectTemplate *mapObjTemplate) { s16 x; s16 y; - + GetFieldObjectMovingCameraOffset(&x, &y); return SpawnFieldObject(mapObjTemplate, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, x, y); } @@ -536,7 +536,7 @@ u8 SpawnSpecialFieldObject(struct MapObjectTemplate *mapObjTemplate) u8 SpawnSpecialFieldObjectParametrized(u8 a, u8 b, u8 c, s16 d, s16 e, u8 f) { struct MapObjectTemplate mapObjTemplate; - + d -= 7; e -= 7; mapObjTemplate.localId = c; @@ -558,7 +558,7 @@ u8 show_sprite(u8 a, u8 b, u8 c) struct MapObjectTemplate *r5; s16 x; s16 y; - + r5 = GetFieldObjectTemplateByLocalIdAndMap(a, b, c); if (r5 == NULL) return 16; @@ -569,7 +569,7 @@ u8 show_sprite(u8 a, u8 b, u8 c) void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, struct SubspriteTable **subspriteTables) { const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(graphicsId); - + sprTemplate->tileTag = gfxInfo->tileTag; sprTemplate->paletteTag = gfxInfo->paletteTag1; sprTemplate->oam = gfxInfo->oam; @@ -595,7 +595,7 @@ u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 c struct SpriteTemplate spriteTemplate; struct SubspriteTable *subspriteTables; u8 spriteId; - + MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, callback, &spriteTemplate, &subspriteTables); if (spriteTemplate.paletteTag != 0xFFFF) sub_805BDF8(spriteTemplate.paletteTag); @@ -618,7 +618,7 @@ u8 sub_805B410(u8 a, u8 b, s16 c, s16 d, u8 e, u8 f) struct SpriteTemplate spriteTemplate; struct SubspriteTable *subspriteTables; u8 spriteId; - + gfxInfo = GetFieldObjectGraphicsInfo(a); MakeObjectTemplateFromFieldObjectGraphicsInfo(a, sub_8064970, &spriteTemplate, &subspriteTables); #ifdef NONMATCHING @@ -633,7 +633,7 @@ u8 sub_805B410(u8 a, u8 b, s16 c, s16 d, u8 e, u8 f) if (spriteId != 64) { struct Sprite *sprite = &gSprites[spriteId]; - + sprite->centerToCornerVecX = -(gfxInfo->width >> 1); sprite->centerToCornerVecY = -(gfxInfo->height >> 1); sprite->pos1.y += sprite->centerToCornerVecY; @@ -658,7 +658,7 @@ u8 sub_805B410(u8 a, u8 b, s16 c, s16 d, u8 e, u8 f) void sub_805B55C(s16 a, s16 b) { u8 i; - + if (gMapHeader.events != NULL) { s16 r9 = gSaveBlock1.pos.x - 2; @@ -666,13 +666,13 @@ void sub_805B55C(s16 a, s16 b) s16 r10 = gSaveBlock1.pos.y; s16 spC = gSaveBlock1.pos.y + 16; u8 objectCount = gMapHeader.events->mapObjectCount; - + for (i = 0; i < objectCount; i++) { struct MapObjectTemplate *template = &gSaveBlock1.mapObjectTemplates[i]; s16 foo = template->x + 7; s16 bar = template->y + 7; - + if (r10 <= bar && spC >= bar && r9 <= foo && sp8 >= foo && !FlagGet(template->flagId)) SpawnFieldObject(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, a, b); @@ -686,11 +686,11 @@ void RemoveFieldObjectsOutsideView(void) { u8 i; u8 j; - + for (i = 0; i < 16; i++) { bool8 isActiveLinkPlayer; - + for (j = 0, isActiveLinkPlayer = 0; j < 4; j++) { if (gLinkPlayerMapObjects[j].active && i == gLinkPlayerMapObjects[j].mapObjId) @@ -699,7 +699,7 @@ void RemoveFieldObjectsOutsideView(void) if (!isActiveLinkPlayer) { struct MapObject *mapObject = &gMapObjects[i]; - + if (mapObject->active && !mapObject->mapobj_bit_16) RemoveFieldObjectIfOutsideView(mapObject); } @@ -712,7 +712,7 @@ void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject) s16 r5 = gSaveBlock1.pos.x + 17; s16 r4 = gSaveBlock1.pos.y; s16 r6 = gSaveBlock1.pos.y + 16; - + if (mapObject->coords2.x >= r7 && mapObject->coords2.x <= r5 && mapObject->coords2.y >= r4 && mapObject->coords2.y <= r6) return; @@ -727,7 +727,7 @@ void sub_805B75C(u8, s16, s16); void sub_805B710(u16 a, u16 b) { u8 i; - + ClearPlayerAvatarInfo(); for (i = 0; i < 16; i++) { @@ -748,7 +748,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) const struct MapObjectGraphicsInfo *gfxInfo; struct MapObject *mapObject; u8 spriteId; - + #define i spriteId for (i = 0; i < 4; i++) { @@ -756,7 +756,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) return; } #undef i - + mapObject = &gMapObjects[a]; asm("":::"r5"); subspriteTables = NULL; @@ -774,7 +774,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) if (spriteId != 64) { struct Sprite *sprite = &gSprites[spriteId]; - + sub_8060388(b + mapObject->coords2.x, c + mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(gfxInfo->width >> 1); sprite->centerToCornerVecY = -(gfxInfo->height >> 1); @@ -824,7 +824,7 @@ void sub_805B980(struct MapObject *mapObject, u8 graphicsId) { const struct MapObjectGraphicsInfo *gfxInfo; struct Sprite *sprite; - + gfxInfo = GetFieldObjectGraphicsInfo(graphicsId); sprite = &gSprites[mapObject->spriteId]; if (gfxInfo->paletteSlot == 0) @@ -851,7 +851,7 @@ void sub_805B980(struct MapObject *mapObject, u8 graphicsId) void unref_sub_805BA80(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) { u8 mapObjectId; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) sub_805B980(&gMapObjects[mapObjectId], graphicsId); } @@ -869,7 +869,7 @@ void FieldObjectTurn(struct MapObject *mapObject, u8 direction) void FieldObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) { u8 mapObjectId; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) FieldObjectTurn(&gMapObjects[mapObjectId], direction); } @@ -883,7 +883,7 @@ void get_berry_tree_graphics(struct MapObject *mapObject, struct Sprite *sprite) { u8 treeStage; u8 treeId; - + mapObject->mapobj_bit_13 = TRUE; sprite->invisible = TRUE; treeStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId); @@ -920,7 +920,7 @@ void FieldObjectHandleDynamicGraphicsId(struct MapObject *mapObject) void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGroup, u8 d) { u8 mapObjectId; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) gMapObjects[mapObjectId].mapobj_bit_13 = d; } @@ -936,7 +936,7 @@ void sub_805BCC0(s16 x, s16 y) { u8 mapObjectId; struct MapObject *mapObject; - + mapObjectId = GetFieldObjectIdByXY(x, y); if (mapObjectId != 16) { @@ -950,7 +950,7 @@ void sub_805BCF0(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) u8 mapObjectId; struct MapObject *mapObject; struct Sprite *sprite; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { mapObject = &gMapObjects[mapObjectId]; @@ -964,7 +964,7 @@ void sub_805BD48(u8 localId, u8 mapNum, u8 mapGroup) { u8 mapObjectId; struct MapObject *mapObject; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { mapObject = &gMapObjects[mapObjectId]; @@ -977,7 +977,7 @@ void sub_805BD90(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { u8 mapObjectId; struct Sprite *sprite; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { sprite = &gSprites[gMapObjects[mapObjectId].spriteId]; @@ -995,7 +995,7 @@ void gpu_pal_allocator_reset__manage_upper_four(void) void sub_805BDF8(u16 tag) { u16 paletteIndex = FindFieldObjectPaletteIndexByTag(tag); - + if (paletteIndex != 0x11FF) //always happens. FindFieldObjectPaletteIndexByTag returns u8 sub_805BE58(&gUnknown_0837377C[paletteIndex]); } @@ -1003,7 +1003,7 @@ void sub_805BDF8(u16 tag) void unref_sub_805BE24(u16 *arr) { u8 i; - + for (i = 0; arr[i] != 0x11FF; i++) sub_805BDF8(arr[i]); } @@ -1020,7 +1020,7 @@ void pal_patch_for_npc(u16 a, u16 b) { u8 var = b; u8 paletteIndex = FindFieldObjectPaletteIndexByTag(a); - + LoadPalette(gUnknown_0837377C[paletteIndex].data, var * 16 + 0x100, 0x20); } @@ -1033,7 +1033,7 @@ void pal_patch_for_npc_range(const u16 *arr, u8 b, u8 c) u8 FindFieldObjectPaletteIndexByTag(u16 tag) { u8 i; - + for (i = 0; gUnknown_0837377C[i].tag != 0x11FF; i++) { if (gUnknown_0837377C[i].tag == tag) @@ -1047,7 +1047,7 @@ const u8 gUnknown_0830FD14[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0 void npc_load_two_palettes__no_record(u16 a, u8 b) { u8 i; - + pal_patch_for_npc(a, b); for (i = 0; gUnknown_08373874[i].tag != 0x11FF; i++) { @@ -1062,7 +1062,7 @@ void npc_load_two_palettes__no_record(u16 a, u8 b) void npc_load_two_palettes__and_record(u16 a, u8 b) { u8 i; - + gUnknown_030005A6 = a; pal_patch_for_npc(a, b); for (i = 0; gUnknown_083738E4[i].tag != 0x11FF; i++) @@ -1103,7 +1103,7 @@ void sub_805C058(struct MapObject *mapObject, s16 x, s16 y) { struct Sprite *sprite = &gSprites[mapObject->spriteId]; const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); - + npc_coords_set(mapObject, x, y); sub_80603CC(mapObject->coords2.x, mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(gfxInfo->width >> 1); @@ -1118,7 +1118,7 @@ void sub_805C058(struct MapObject *mapObject, s16 x, s16 y) void sub_805C0F8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { u8 mapObjectId; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { x += 7; @@ -1137,17 +1137,17 @@ void UpdateFieldObjectCoordsForCameraUpdate(void) u8 i; s16 deltaX; s16 deltaY; - + #ifndef NONMATCHING asm(""::"r"(i)); //makes the compiler store i in r3 #endif if (gUnknown_0202E844.field_0) - { + { for (i = 0, deltaX = gUnknown_0202E844.x, deltaY = gUnknown_0202E844.y; i < 16; i++) { struct MapObject *mapObject = &gMapObjects[i]; - + if (mapObject->active) { mapObject->coords1.x -= deltaX; @@ -1166,7 +1166,7 @@ bool8 FieldObjectDoesZCoordMatch(struct MapObject *, u8); u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z) { u8 i; - + for (i = 0; i < 16; i++) { if (gMapObjects[i].active && gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y @@ -1207,7 +1207,7 @@ const struct SpriteTemplate gSpriteTemplate_830FD24 = u8 AddCameraObject(u8 a) { u8 spriteId = CreateSprite(&gSpriteTemplate_830FD24, 0, 0, 4); - + gSprites[spriteId].invisible = TRUE; gSprites[spriteId].data0 = a; return spriteId; @@ -1225,7 +1225,7 @@ void ObjectCB_CameraObject(struct Sprite *sprite) CameraObject_1, CameraObject_2, }; - + cameraObjectFuncs[sprite->data1](sprite); } @@ -1242,7 +1242,7 @@ void CameraObject_1(struct Sprite *sprite) { s16 x = gSprites[sprite->data0].pos1.x; s16 y = gSprites[sprite->data0].pos1.y; - + sprite->data2 = x - sprite->pos1.x; sprite->data3 = y - sprite->pos1.y; sprite->pos1.x = x; @@ -1260,7 +1260,7 @@ void CameraObject_2(struct Sprite *sprite) struct Sprite *FindCameraObject(void) { u8 i; - + for (i = 0; i < 64; i++) { if (gSprites[i].inUse && gSprites[i].callback == ObjectCB_CameraObject) @@ -1272,7 +1272,7 @@ struct Sprite *FindCameraObject(void) void CameraObjectReset1(void) { struct Sprite *cameraSprite = FindCameraObject(); - + if (cameraSprite != NULL) { cameraSprite->data1 = 0; @@ -1283,7 +1283,7 @@ void CameraObjectReset1(void) void CameraObjectSetFollowedObjectId(u8 state) { struct Sprite *cameraSprite = FindCameraObject(); - + if (cameraSprite != NULL) { cameraSprite->data0 = state; @@ -1294,7 +1294,7 @@ void CameraObjectSetFollowedObjectId(u8 state) u8 CameraObjectGetFollowedObjectId(void) { struct Sprite *cameraSprite = FindCameraObject(); - + if (cameraSprite == NULL) return 64; else @@ -1304,14 +1304,14 @@ u8 CameraObjectGetFollowedObjectId(void) void CameraObjectReset2(void) { struct Sprite *cameraSprite = FindCameraObject(); - + cameraSprite->data1 = 2; } u8 unref_sub_805C43C(struct Sprite *src, s16 x, s16 y, u8 subpriority) { u8 i; - + for (i = 0; i < 64; i++) { if (!gSprites[i].inUse) @@ -1329,7 +1329,7 @@ u8 unref_sub_805C43C(struct Sprite *src, s16 x, s16 y, u8 subpriority) u8 obj_unfreeze(struct Sprite *src, s16 x, s16 y, u8 subpriority) { s16 i; - + for (i = 63; i > -1; i--) { if (!gSprites[i].inUse) @@ -1358,7 +1358,7 @@ void FieldObjectSetDirection(struct MapObject *mapObject, u8 direction) u8 *GetFieldObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { struct MapObjectTemplate *template = GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - + return template->script; } @@ -1370,7 +1370,7 @@ u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId) u16 GetFieldObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { struct MapObjectTemplate *template = GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - + return template->flagId; } @@ -1382,7 +1382,7 @@ u16 GetFieldObjectFlagIdByFieldObjectId(u8 mapObjectId) u8 unref_sub_805C5D0(u8 localId, u8 mapNum, u8 mapGroup) { u8 mapObjectId; - + if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) return 0xFF; else @@ -1397,7 +1397,7 @@ u8 unref_sub_805C60C(u8 mapObjectId) u8 unref_sub_805C624(u8 localId, u8 mapNum, u8 mapGroup) { u8 mapObjectId; - + if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) return 0xFF; else @@ -1418,7 +1418,7 @@ struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 m else { struct MapHeader *mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum); - + return FindFieldObjectTemplateInArrayByLocalId(localId, mapHeader->events->mapObjects, mapHeader->events->mapObjectCount); } } @@ -1426,7 +1426,7 @@ struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 m struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count) { u8 i; - + for (i = 0; i < count; i++) { if (templates[i].localId == localId) @@ -1438,11 +1438,11 @@ struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, st struct MapObjectTemplate *sub_805C700(struct MapObject *mapObject) { s32 i; - + if (mapObject->mapNum != gSaveBlock1.location.mapNum || mapObject->mapGroup != gSaveBlock1.location.mapGroup) return NULL; - + for (i = 0; i < 64; i++) { if (mapObject->localId == gSaveBlock1.mapObjectTemplates[i].localId) @@ -1454,7 +1454,7 @@ struct MapObjectTemplate *sub_805C700(struct MapObject *mapObject) void sub_805C754(struct MapObject *mapObject) { struct MapObjectTemplate *template = sub_805C700(mapObject); - + if (template != NULL) { template->x = mapObject->coords2.x - 7; @@ -1465,7 +1465,7 @@ void sub_805C754(struct MapObject *mapObject) void sub_805C774(struct MapObject *mapObject, u8 movementType) { struct MapObjectTemplate *template = sub_805C700(mapObject); - + if (template != NULL) template->movementType = movementType; } @@ -1473,7 +1473,7 @@ void sub_805C774(struct MapObject *mapObject, u8 movementType) void sub_805C78C(u8 localId, u8 mapNum, u8 mapGroup) { u8 mapObjectId; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) sub_805C754(&gMapObjects[mapObjectId]); } @@ -1489,10 +1489,10 @@ void sub_805C7C4(u8 a) u16 npc_paltag_by_palslot(u8 a) { u8 i; - + if (a < 10) return gUnknown_0837399C[gUnknown_030005A4][a]; - + for (i = 0; gUnknown_083738E4[i].tag != 0x11FF; i++) { if (gUnknown_083738E4[i].tag == gUnknown_030005A6) diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 1f5f49850..77c8752d1 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -87,7 +87,7 @@ void sub_80A25E8(void) bool8 FldEff_UseCutOnGrass(void) { u8 taskId = oei_task_add(); - + gTasks[taskId].data[8] = (u32)sub_80A2684 >> 16; gTasks[taskId].data[9] = (u32)sub_80A2684; IncrementGameStat(0x12); @@ -103,7 +103,7 @@ void sub_80A2634(void) bool8 FldEff_UseCutOnTree(void) { u8 taskId = oei_task_add(); - + gTasks[taskId].data[8] = (u32)sub_80A2B00 >> 16; gTasks[taskId].data[9] = (u32)sub_80A2B00; IncrementGameStat(0x12); @@ -157,7 +157,7 @@ bool8 FldEff_CutGrass(void) void sub_80A27A8(s16 x, s16 y) { int metatileId = MapGridGetMetatileIdAt(x, y); - + switch(metatileId) { case 0x208: @@ -167,19 +167,19 @@ void sub_80A27A8(s16 x, s16 y) break; case 0x1C6: MapGridSetMetatileIdAt(x, y, 0x1CE); - break; + break; case 0x1C7: MapGridSetMetatileIdAt(x, y, 0x1CF); - break; + break; case 0x281: MapGridSetMetatileIdAt(x, y, 0x279); - break; + break; case 0x282: MapGridSetMetatileIdAt(x, y, 0x27A); - break; + break; case 0x283: MapGridSetMetatileIdAt(x, y, 0x27B); - break; + break; case 0x206: case 0x207: MapGridSetMetatileIdAt(x, y, 0x271); @@ -197,7 +197,7 @@ void sub_80A27A8(s16 x, s16 y) s32 sub_80A28A0(s16 x, s16 y) { u16 metatileId = MapGridGetMetatileIdAt(x, y); - + if(metatileId == 1) return 1; else if(metatileId == 633) @@ -214,7 +214,7 @@ void sub_80A28F4(s16 x, s16 y) { s16 i; u16 lowerY = y + 3; - + for(i = 0; i < 3; i++) { u16 currentX = x + i; @@ -266,7 +266,7 @@ void objc_8097BBC(struct Sprite *sprite) sprite->pos2.x = Sin(sprite->data2, sprite->data0); sprite->pos2.y = Cos(sprite->data2, sprite->data0); - + sprite->data2 = (sprite->data2 + 8) & 0xFF; sprite->data0 += ((tempdata2 = sprite->data3) << 16 >> 18) + 1; // what? sprite->data3 = tempdata2 + 1; @@ -281,12 +281,12 @@ void objc_8097BBC(struct Sprite *sprite) void sub_80A2AB8(void) { u8 i; - + for(i = 1; i < 8; i++) { DestroySprite(&gSprites[gCutGrassSpriteArray[i]]); } - + FieldEffectStop(&gSprites[gCutGrassSpriteArray[0]], 0x3A); sub_8064E2C(); ScriptContext2_Disable(); diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 70bb6d669..25651702d 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -28,7 +28,7 @@ void sub_80F7A34(void) oldMan->oldMan1.unk_2D94 = 0; oldMan->oldMan1.unk_2DBD = 0; - + for(i = 0; i < 6; i++) oldMan->oldMan1.mauvilleOldMan_ecArray[i] = gUnknown_083E537C[i]; } @@ -36,7 +36,7 @@ void sub_80F7A34(void) void sub_80F7A6C(void) { struct UnkMauvilleOldManStruct *bard = &gSaveBlock1.oldMan.oldMan1; - + bard->unk_2D94 = 1; bard->unk_2D95 = 0; } @@ -49,7 +49,7 @@ void sub_80F7A7C(void) void sub_80F7A88(void) { OldMan *oldMan = &gSaveBlock1.oldMan; - + oldMan->oldMan1.unk_2D94 = 4; oldMan->oldMan1.unk_2D95 = 0; } @@ -62,7 +62,7 @@ void sub_80F7A98(void) void SetMauvilleOldMan(void) { u32 var = ((u16)((gSaveBlock2.playerTrainerId[1] << 8 | gSaveBlock2.playerTrainerId[0])) % 10) / 2; - + switch(var) { case 0: @@ -100,7 +100,7 @@ void sub_80F7B2C(void) { u16 *scriptPtr = &gScriptResult; // why?? OldMan *oldMan = &gSaveBlock1.oldMan; - + *scriptPtr = oldMan->oldMan1.unk_2DBD; } @@ -109,15 +109,15 @@ void sub_80F7B40(void) u16 i; OldMan *oldMan = &gSaveBlock1.oldMan; //struct UnkMauvilleOldManStruct *oldManStruct = &gSaveBlock1.oldManStruct; - + StringCopy(oldMan->oldMan1.playerName, gSaveBlock2.playerName); - + for(i = 0; i < 4; i++) oldMan->oldMan1.playerTrainerId[i] = gSaveBlock2.playerTrainerId[i]; - + for(i = 0; i < 6; i++) oldMan->oldMan1.mauvilleOldMan_ecArray[i] = oldMan->oldMan1.mauvilleOldMan_ecArray2[i]; - + oldMan->oldMan1.unk_2DBD = 1; } @@ -237,14 +237,14 @@ void sub_80F7C70(void) { u16 *scriptPtr = &gScriptResult; // again?? OldMan *oldMan = &gSaveBlock1.oldMan; - + *scriptPtr = oldMan->oldMan1.unk_2D95; } void sub_80F7C84(void) { OldMan *oldMan = &gSaveBlock1.oldMan; - + oldMan->oldMan1.unk_2D95 = 1; } @@ -266,7 +266,7 @@ void sub_80F7C90(void) void sub_80F7CC8(void) { OldMan *oldMan = &gSaveBlock1.oldMan; - + if(oldMan->oldMan1.unk_2D95 == 10) { gScriptResult = FALSE; @@ -282,7 +282,7 @@ void sub_80F7CF4(void) { u8 *stringPtr; OldMan *oldMan = &gSaveBlock1.oldMan; - + if(oldMan->oldMan2.unk1 == 0) sub_80F7DC0(); @@ -302,7 +302,7 @@ void sub_80F7CF4(void) oldMan->oldMan2.unk1 = 10; else oldMan->oldMan2.unk1++; - + gScriptResult = TRUE; } #else diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index a7fb5abef..befd6f20d 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -3,7 +3,7 @@ #define TILE_ATTRIBUTES(three, two, one) (((one) ? 1 : 0) | ((two) ? 2 : 0) | ((three) ? 4 : 0)) -static const u8 sTileBitAttributes[] = +static const u8 sTileBitAttributes[] = { TILE_ATTRIBUTES(TRUE, FALSE, FALSE), TILE_ATTRIBUTES(FALSE, FALSE, FALSE), diff --git a/src/naming_screen.c b/src/naming_screen.c index cd108740b..f00a9bd3e 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -209,7 +209,7 @@ static void VBlankCB_NamingScreen(void) static void StoreNamingScreenParameters(u8 templateNum, u8 *destBuffer, u16 c, u16 d, u32 e, MainCallback returnCallback) { struct Task *task; - + //Create a task that does nothing, and use it as a temporary space to store parameters task = &gTasks[CreateTask(Task_DoNothing, 0xFF)]; task->data[0] = templateNum; @@ -225,7 +225,7 @@ static void GetNamingScreenParameters(void) { u8 taskId; struct Task *task; - + taskId = FindTaskIdByFunc(Task_DoNothing); task = &gTasks[taskId]; namingScreenData.templateNum = task->data[0]; @@ -251,7 +251,7 @@ static void NamingScreen_TurnOffScreen(void) static void NamingScreen_InitDisplayMode(void) { u16 savedIme; - + SetVBlankCallback(VBlankCB_NamingScreen); savedIme = REG_IME; REG_IME = 0; @@ -401,7 +401,7 @@ static bool8 (*const sMainStateFuncs[])(struct Task *) = static void sub_80B5E50(void) { u8 taskId; - + taskId = CreateTask(Task_NamingScreenMain, 2); Task_NamingScreenMain(taskId); } @@ -462,7 +462,7 @@ static bool8 MainState_WaitPageSwap(struct Task *task) { s16 cursorX; s16 cursorY; - + if (IsPageSwapAnimNotInProgress()) { namingScreenData.state = MAIN_STATE_HANDLE_INPUT; @@ -552,7 +552,7 @@ static bool8 HandleKeyboardEvent(void) { u8 event = GetInputEvent(); u8 keyRole = GetKeyRoleAtCursorPos(); - + if (event == KBEVENT_PRESSED_SELECT) return sub_80B61C8(); else if (event == KBEVENT_PRESSED_B) @@ -574,7 +574,7 @@ static bool8 KeyboardKeyHandler_Character(u8 event) if (event == KBEVENT_PRESSED_A) { u8 var = sub_80B7004(); - + sub_80B6914(); if (var) { @@ -656,14 +656,14 @@ static void InputInit(void) static u8 GetInputEvent(void) { u8 taskId = FindTaskIdByFunc(Task_HandleInput); - + return gTasks[taskId].tKeyboardEvent; } static void SetInputState(u8 state) { u8 taskId = FindTaskIdByFunc(Task_HandleInput); - + gTasks[taskId].tState = state; } @@ -731,7 +731,7 @@ static void HandleDpadMovement(struct Task *task) s16 cursorY; u16 dpadDir; s16 prevCursorX; - + GetCursorPos(&cursorX, &cursorY); dpadDir = 0; if (gMain.newAndRepeatedKeys & DPAD_UP) @@ -742,18 +742,18 @@ static void HandleDpadMovement(struct Task *task) dpadDir = 3; if (gMain.newAndRepeatedKeys & DPAD_RIGHT) dpadDir = 4; - + //Get new cursor position prevCursorX = cursorX; cursorX += sDpadDeltaX[dpadDir]; cursorY += sDpadDeltaY[dpadDir]; - + //Wrap cursor position in the X direction if (cursorX < 0) cursorX = 8; if (cursorX > 8) cursorX = 0; - + //Handle cursor movement in X direction if (sDpadDeltaX[dpadDir] != 0) { @@ -765,7 +765,7 @@ static void HandleDpadMovement(struct Task *task) else cursorX = 5; } - + if (cursorX == 8) { //We are now on the last column @@ -780,7 +780,7 @@ static void HandleDpadMovement(struct Task *task) cursorY = gUnknown_083CE274[cursorY]; } } - + if (cursorX == 8) { //There are only 3 keys on the last column, unlike the others, @@ -809,7 +809,7 @@ static void HandleDpadMovement(struct Task *task) #undef tKbFunctionKey //-------------------------------------------------- -// +// //-------------------------------------------------- static void Task_80B64D4(u8); @@ -820,7 +820,7 @@ static void sub_80B65D4(struct Task *, u8, u8); static void sub_80B6438(void) { u8 taskId; - + taskId = CreateTask(Task_80B64D4, 3); gTasks[taskId].data[0] = 3; } @@ -828,7 +828,7 @@ static void sub_80B6438(void) static void sub_80B6460(u8 a, u8 b, u8 c) { struct Task *task = &gTasks[FindTaskIdByFunc(Task_80B64D4)]; - + if (a == task->data[0] && c == 0) { task->data[1] = b; @@ -845,7 +845,7 @@ static void sub_80B6460(u8 a, u8 b, u8 c) static void Task_80B64D4(u8 taskId) { struct Task *task = &gTasks[taskId]; - + if (task->data[0] == 3 || task->data[2] == 0) return; MultiplyInvertedPaletteRGBComponents(sub_80B654C(task->data[0]), task->data[3], task->data[3], task->data[3]); @@ -874,14 +874,14 @@ static u16 sub_80B654C(u8 a) IndexOfSpritePaletteTag(6) * 16 + 0x10C, IndexOfSpritePaletteTag(6) * 16 + 0x10E, }; - + return arr[a]; } static void sub_80B65AC(u8 a) { u16 index = sub_80B654C(a); - + gPlttBufferFaded[index] = gPlttBufferUnfaded[index]; } @@ -918,7 +918,7 @@ static bool8 (*const sPageSwapAnimStateFuncs[])(struct Task *) = static void StartPageSwapAnim(void) { u8 taskId; - + taskId = CreateTask(Task_HandlePageSwapAnim, 0); Task_HandlePageSwapAnim(taskId); } @@ -952,14 +952,14 @@ static bool8 PageSwapAnimState_1(struct Task *task) &namingScreenData.bg2vOffset, &namingScreenData.bg1vOffset }; - + task->tFrameCount += 4; *arr[namingScreenData.unkC] = Sin(task->tFrameCount, 40); *arr[namingScreenData.unkD] = Sin((task->tFrameCount + 128) & 0xFF, 40); if (task->tFrameCount >= 64) { u8 temp = namingScreenData.unk8; //Why u8 and not u16? - + namingScreenData.unk8 = namingScreenData.unkA; namingScreenData.unkA = temp; task->tState++; @@ -970,14 +970,14 @@ static bool8 PageSwapAnimState_1(struct Task *task) static bool8 PageSwapAnimState_2(struct Task *task) { u16 *const arr[] = {&namingScreenData.bg2vOffset, &namingScreenData.bg1vOffset}; - + task->tFrameCount += 4; *arr[namingScreenData.unkC] = Sin(task->tFrameCount, 40); *arr[namingScreenData.unkD] = Sin((task->tFrameCount + 128) & 0xFF, 40); if (task->tFrameCount >= 128) { u8 temp = namingScreenData.unkC; - + namingScreenData.unkC = namingScreenData.unkD; namingScreenData.unkD = temp; task->tState++; @@ -1023,7 +1023,7 @@ static u8 CursorColToKeyboardCol(s16 x) static void SetCursorPos(s16 x, s16 y) { struct Sprite *cursorSprite = &gSprites[namingScreenData.cursorSpriteId]; - + cursorSprite->pos1.x = CursorColToKeyboardCol(x) * 8 + 27; cursorSprite->pos1.y = y * 16 + 80; cursorSprite->data2 = cursorSprite->data0; @@ -1035,7 +1035,7 @@ static void SetCursorPos(s16 x, s16 y) static void GetCursorPos(s16 *x, s16 *y) { struct Sprite *cursorSprite = &gSprites[namingScreenData.cursorSpriteId]; - + *x = cursorSprite->data0; *y = cursorSprite->data1; } @@ -1073,7 +1073,7 @@ static u8 GetKeyRoleAtCursorPos(void) const u8 keyRoles[] = {KEY_ROLE_PAGE, KEY_ROLE_BACKSPACE, KEY_ROLE_OK}; s16 cursorX; s16 cursorY; - + GetCursorPos(&cursorX, &cursorY); if (cursorX < 8) return KEY_ROLE_CHAR; @@ -1108,7 +1108,7 @@ void sub_80B6998(struct Sprite *sprite) s8 gb = sprite->data5; s8 r = sprite->data5 >> 1; u16 index = IndexOfSpritePaletteTag(5) * 16 + 0x0101; - + MultiplyInvertedPaletteRGBComponents(index, r, gb, gb); } } @@ -1118,15 +1118,15 @@ static void sub_80B6A80(void) u8 spriteId1; u8 spriteId2; u8 spriteId3; - + spriteId1 = CreateSprite(&gSpriteTemplate_83CE5C8, 0xCC, 0x50, 0); namingScreenData.unk10 = spriteId1; SetSubspriteTables(&gSprites[spriteId1], gSubspriteTables_83CE558); - + spriteId2 = CreateSprite(&gSpriteTemplate_83CE5F8, 0xCC, 0x4C, 1); gSprites[spriteId1].data6 = spriteId2; SetSubspriteTables(&gSprites[spriteId2], gSubspriteTables_83CE560); - + spriteId3 = CreateSprite(&gSpriteTemplate_83CE5E0, 0xCC, 0x4B, 2); gSprites[spriteId3].oam.priority = 1; gSprites[spriteId1].data7 = spriteId3; @@ -1135,7 +1135,7 @@ static void sub_80B6A80(void) static void sub_80B6B14(void) { struct Sprite *sprite = &gSprites[namingScreenData.unk10]; - + sprite->data0 = 2; sprite->data1 = namingScreenData.currentPage; } @@ -1178,7 +1178,7 @@ static u8 sub_80B6B9C(struct Sprite *sprite) { struct Sprite *r4 = &gSprites[sprite->data6]; struct Sprite *r5 = &gSprites[sprite->data7]; - + r4->pos2.y++; if (r4->pos2.y > 7) { @@ -1193,7 +1193,7 @@ static u8 sub_80B6B9C(struct Sprite *sprite) static u8 sub_80B6C08(struct Sprite *sprite) { struct Sprite *r2 = &gSprites[sprite->data6]; - + r2->invisible = FALSE; r2->pos2.y++; if (r2->pos2.y >= 0) @@ -1219,10 +1219,10 @@ static void sub_80B6C48(u8 a, struct Sprite *b, struct Sprite *c) static void sub_80B6CA8(void) { u8 spriteId; - + spriteId = CreateSprite(&gSpriteTemplate_83CE610, 0xCC, 0x6C, 0); SetSubspriteTables(&gSprites[spriteId], gSubspriteTables_83CE578); - + spriteId = CreateSprite(&gSpriteTemplate_83CE628, 0xCC, 0x84, 0); SetSubspriteTables(&gSprites[spriteId], gSubspriteTables_83CE578); } @@ -1232,7 +1232,7 @@ static void sub_80B6D04(void) u8 spriteId; s16 r1; u8 i; - + r1 = (namingScreenData.unk2 - 1) * 8 + 4; spriteId = CreateSprite(&gSpriteTemplate_83CE658, r1, 0x28, 0); gSprites[spriteId].oam.priority = 3; @@ -1248,7 +1248,7 @@ static void sub_80B6D04(void) void sub_80B6D9C(struct Sprite *sprite) { const s16 arr[] = {0, -4, -2, -1}; - + if (sprite->data0 == 0 || --sprite->data0 == 0) { sprite->data0 = 8; @@ -1261,7 +1261,7 @@ void sub_80B6DE8(struct Sprite *sprite) { const s16 arr[] = {2, 3, 2, 1}; u8 var; - + var = GetTextCaretPosition(); if (var != (u8)sprite->data0) { @@ -1309,7 +1309,7 @@ static void sub_80B6E68(void) { u8 rivalGfxId; u8 spriteId; - + rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, namingScreenData.unk3E); spriteId = AddPseudoFieldObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x18, 0); gSprites[spriteId].oam.priority = 3; @@ -1319,7 +1319,7 @@ static void sub_80B6E68(void) static void sub_80B6EBC(void) { u8 spriteId; - + spriteId = CreateSprite(&gSpriteTemplate_83CE688, 0x34, 0x18, 0); SetSubspriteTables(&gSprites[spriteId], gSubspriteTables_83CE580); gSprites[spriteId].oam.priority = 3; @@ -1328,7 +1328,7 @@ static void sub_80B6EBC(void) static void sub_80B6EFC(void) { u8 spriteId; - + sub_809D51C(); spriteId = CreateMonIcon(namingScreenData.unk3E, SpriteCallbackDummy, 0x34, 0x18, 0, namingScreenData.unk42); gSprites[spriteId].oam.priority = 3; @@ -1337,7 +1337,7 @@ static void sub_80B6EFC(void) static u8 GetTextCaretPosition(void) { u8 i; - + for (i = 0; i < namingScreenData.template->maxChars; i++) { if (namingScreenData.textBuffer[i] == EOS) @@ -1349,7 +1349,7 @@ static u8 GetTextCaretPosition(void) static u8 GetPreviousTextCaretPosition(void) { s8 i; - + for (i = namingScreenData.template->maxChars - 1; i > 0; i--) { if (namingScreenData.textBuffer[i] != EOS) @@ -1362,7 +1362,7 @@ static void DeleteTextCharacter(void) { u8 index; u8 var2; - + index = GetPreviousTextCaretPosition(); namingScreenData.textBuffer[index] = 0; sub_80B7960(); @@ -1379,7 +1379,7 @@ static bool8 sub_80B7004(void) s16 y; u8 ch; bool8 r4; - + GetCursorPos(&x, &y); x = CursorColToKeyboardCol(x); ch = GetCharAtKeyboardPos(x, y); @@ -1404,7 +1404,7 @@ static void sub_80B7090(void) // DoInput? { u8 r5; u8 r4; - + r5 = GetPreviousTextCaretPosition(); r4 = namingScreenData.textBuffer[r5]; if (sub_80B7198(r4)) @@ -1429,7 +1429,7 @@ static bool8 sub_80B7104(void) { u8 r5; u8 r4; - + r5 = GetPreviousTextCaretPosition(); r4 = namingScreenData.textBuffer[r5]; if (sub_80B720C(r4)) @@ -1444,7 +1444,7 @@ static bool8 sub_80B713C(void) { u8 r5; u8 r4; - + r5 = GetPreviousTextCaretPosition(); r4 = namingScreenData.textBuffer[r5]; if (sub_80B7264(r4)) @@ -1458,7 +1458,7 @@ static bool8 sub_80B713C(void) static void AddTextCharacter(u8 ch) { u8 index = GetTextCaretPosition(); - + namingScreenData.textBuffer[index] = ch; } @@ -1510,7 +1510,7 @@ static bool8 sub_80B7264(u8 a) static void sub_80B72A4(u8 a, u8 b) { u8 chr = a; - + if (a >= 6 && a <= 10) chr = a + 0x31; else if (a >= 11 && a <= 15) @@ -1537,7 +1537,7 @@ static void sub_80B72A4(u8 a, u8 b) static void sub_80B7370(u8 a, u8 b) { u8 chr = a; - + if (a >= 26 && a <= 30) chr = a + 0x31; else if (a >= 70 && a <= 74) @@ -1552,7 +1552,7 @@ static void sub_80B7370(u8 a, u8 b) static void sub_80B73CC(u8 a, u8 b) { u8 chr = a; - + if (a >= 55 && a <= 59) chr = a + 0xCF; else if (a >= 60 && a <= 64) @@ -1575,7 +1575,7 @@ static void sub_80B73CC(u8 a, u8 b) static void sub_80B7474(u8 a, u8 b) { u8 chr = a; - + if (a >= 75 && a <= 79) chr = a + 0xCF; else if (a >= 155 && a <= 159) @@ -1586,7 +1586,7 @@ static void sub_80B7474(u8 a, u8 b) static void sub_80B74B0(void) { u8 i; - + for (i = 0; i < namingScreenData.template->maxChars; i++) { if (namingScreenData.textBuffer[i] != 0 && namingScreenData.textBuffer[i] != 0xFF) @@ -1622,11 +1622,11 @@ static void sub_80B7568(void) { const void *src; void *dst; - + src = gNamingScreenMenu_Gfx; dst = (void *)(VRAM + gMenuMessageBoxContentTileOffset * 32); DmaCopy16(3, src, dst, 0x800); - + src = gNamingScreenMenu_Gfx; dst = (void *)(VRAM + 0x8000 + gMenuMessageBoxContentTileOffset * 32); DmaCopy16(3, src, dst, 0x800); @@ -1655,7 +1655,7 @@ static void sub_80B75C4(void) (u16 *)(VRAM + 0xE000), (u16 *)(VRAM + 0xE800), }; - + gUnknown_083CE2F0[namingScreenData.currentPage][0](arr[namingScreenData.unkC]); gUnknown_083CE2F0[namingScreenData.currentPage][1](arr[namingScreenData.unkD]); } @@ -1667,7 +1667,7 @@ static void sub_80B7614(void) (u16 *)(VRAM + 0xE000), (u16 *)(VRAM + 0xE800), }; - + gUnknown_083CE2F0[namingScreenData.currentPage][1](arr[namingScreenData.unkD]); } @@ -1695,7 +1695,7 @@ static void sub_80B7698(u16 *vramBuffer, const u16 *src) { s16 i; s16 j; - + for (i = 0; i < 20; i++) { for (j = 0; j < 30; j++, src++) @@ -1709,7 +1709,7 @@ static void sub_80B76E0(u16 *vramBuffer, const u16 *src) { s16 i; s16 j; - + for (i = 0; i < 20; i++) { for (j = 0; j < 30; j++, src++) @@ -1827,7 +1827,7 @@ static void PrintKeyboardCharacters(u8 page) //print letters on page { s16 i; s16 r5; - + for (i = 0, r5 = 9; i < 4; i++, r5 += 2) MenuPrint(sKeyboardCharacters[page][i], 3, r5); } @@ -1856,7 +1856,7 @@ static void nullsub_62(void) static void sub_80B7924(void) { u8 genderSymbol[2] = _("♂"); - + if ((s16)namingScreenData.unk40 != MON_GENDERLESS) { if ((s16)namingScreenData.unk40 == MON_FEMALE) @@ -1868,7 +1868,7 @@ static void sub_80B7924(void) static void sub_80B7960(void) { u8 *string = gStringVar1; - + string[0] = 0xFC; string[1] = 0x14; string[2] = 8; diff --git a/src/player_pc.c b/src/player_pc.c index 1096adc5c..02a2dc1a2 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -701,10 +701,10 @@ void sub_813AA30(u8 taskId, u8 arg) sub_813AD58(gSaveBlock1.pcItems[var].itemId); } - /* + /* THEORY: This check produces essentially dead code, but it might have been working in an earlier build in which case it allows a programmer to easily duplicate items without the use of a debug menu. - With the removal of a lot of the debug menus close to release, a programmer may have added this to + With the removal of a lot of the debug menus close to release, a programmer may have added this to help test things with a low key (such as planting a lot of duplicated berries, which requires this lazy "cheat") without bringing the relevent debug menus back. The commented out line is intentionally left in below to show what it may have looked like. diff --git a/src/rom3.c b/src/rom3.c index 2d00b647f..351d5d44b 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -90,7 +90,7 @@ void sub_800B858(void) void setup_poochyena_battle(void) { s32 i; - + gUnknown_030042D4 = nullsub_41; for (i = 0; i < 4; i++) { @@ -118,7 +118,7 @@ void setup_poochyena_battle(void) void sub_800B950(void) { s32 i; - + if (gBattleTypeFlags & BATTLE_TYPE_LINK) sub_800BA78(); else @@ -166,7 +166,7 @@ void sub_800BA78(void) { u8 multiplayerId; int i; - + if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { if (gBattleTypeFlags & BATTLE_TYPE_WILD) @@ -214,7 +214,7 @@ void sub_800BA78(void) gUnknown_03004330[2] = sub_8037510; gUnknown_02024A72[2] = 3; gUnknown_02024A68 = 4; - + } return; } @@ -234,7 +234,7 @@ void sub_800BA78(void) sub_8094978(gLinkPlayers[i].lp_field_18, 1); break; } - + if (i == multiplayerId) { gUnknown_03004330[gLinkPlayers[i].lp_field_18] = sub_802BF74; @@ -298,7 +298,7 @@ void sub_800BD54(void) { int i; int j; - + if (!(gBattleTypeFlags & BATTLE_TYPE_40)) { for (i = 0; i < gUnknown_02024A68; i++) @@ -365,7 +365,7 @@ void sub_800BD54(void) void dp01_prepare_buffer(u8 a, u8 *b, u16 c) { int i; - + if (gBattleTypeFlags & BATTLE_TYPE_LINK) { dp01_prepare_buffer_wireless_probably(a, c, b); @@ -413,7 +413,7 @@ void dp01_prepare_buffer_wireless_probably(u8 a, u16 b, u8 *c) { s32 r9; int i; - + r9 = b - b % 4 + 4; if (gTasks[gUnknown_020238C4].data[14] + r9 + 9 > 0x1000) { @@ -436,7 +436,7 @@ void dp01_prepare_buffer_wireless_probably(u8 a, u16 b, u8 *c) void sub_800C1A8(u8 taskId) { u16 var; - + switch (gTasks[taskId].data[11]) { case 0: @@ -509,7 +509,7 @@ void sub_800C35C(void) u8 *recvBuffer; //r3 u8 *dest; //r5 u8 *src; //r4 - + if (gReceivedRemoteLinkPlayers != 0 && (gBattleTypeFlags & 0x20) && gLinkPlayers[0].linkType == 0x2211) { for (i = 0; i < GetLinkPlayerCount(); i++) @@ -545,7 +545,7 @@ void sub_800C47C(u8 taskId) u16 r7; u8 r4; u8 r2; - + if (gTasks[taskId].data[15] != gTasks[taskId].data[14]) { if (gTasks[taskId].data[15] > gTasks[taskId].data[14] @@ -604,7 +604,7 @@ void dp01_build_cmdbuf_x01_a_b_0(u8 a, int b, int c) void dp01_build_cmdbuf_x02_a_b_varargs(u8 a, int b, int c, u8 d, u8 *e) { int i; - + gUnknown_03004040[0] = 2; gUnknown_03004040[1] = b; gUnknown_03004040[2] = c; @@ -616,7 +616,7 @@ void dp01_build_cmdbuf_x02_a_b_varargs(u8 a, int b, int c, u8 d, u8 *e) void unref_sub_800C6A4(u8 a, int b, u8 c, u8 *d) { int i; - + gUnknown_03004040[0] = 3; gUnknown_03004040[1] = b; gUnknown_03004040[2] = c; @@ -714,7 +714,7 @@ void dp01_build_cmdbuf_x0D_a(u8 a, int b) void unref_sub_800C828(u8 a, u8 b, u8 *c) { int i; - + gUnknown_03004040[0] = 14; gUnknown_03004040[1] = b; for (i = 0; i < b * 3; i++) @@ -757,16 +757,16 @@ void dp01_build_cmdbuf_x10_TODO(u8 a, u16 b) { int i; //u16 *r12; - + gUnknown_03004040[0] = 16; gUnknown_03004040[1] = gUnknown_02024D26; gUnknown_03004040[2] = b; gUnknown_03004040[3] = (b & 0xFF00) >> 8; - + *((u16 *)&gUnknown_03004040[4]) = gUnknown_02024BE6; *((u16 *)&gUnknown_03004040[6]) = gUnknown_02024BE8; *((u16 *)&gUnknown_03004040[8]) = gUnknown_02024C04; - + gUnknown_03004040[10] = byte_2024C06; gUnknown_03004040[11] = unk_2000000[0x16000 + 3]; gUnknown_03004040[12] = unk_2000000[0x16000 + 0x5E]; @@ -1059,7 +1059,7 @@ void unref_sub_800CB84(u8 a, int b) void sub_800CBA4(u8 a, int b, int c, u8 *d) { u32 i; - + gUnknown_03004040[0] = 20; gUnknown_03004040[1] = b; gUnknown_03004040[2] = c; @@ -1072,7 +1072,7 @@ void sub_800CBA4(u8 a, int b, int c, u8 *d) void sub_800CBE0(u8 a, u8 *b) { int i; - + gUnknown_03004040[0] = 21; for (i = 0; i < 3; i++) gUnknown_03004040[1 + i] = b[i]; @@ -1082,7 +1082,7 @@ void sub_800CBE0(u8 a, u8 *b) void dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f(u8 a, int b, int c, int d, u8 *e) { int i; - + gUnknown_03004040[0] = 22; gUnknown_03004040[1] = b; gUnknown_03004040[2] = c; @@ -1154,7 +1154,7 @@ void dp01_build_cmdbuf_x1C_a(u8 a, int b) void dp01_build_cmdbuf_x1D_1D_numargs_varargs(u8 a, u16 b, u8 *c) { int i; - + gUnknown_03004040[0] = 29; gUnknown_03004040[1] = 29; gUnknown_03004040[2] = b; @@ -1167,7 +1167,7 @@ void dp01_build_cmdbuf_x1D_1D_numargs_varargs(u8 a, u16 b, u8 *c) void unref_sub_800CDD4(u8 a, u32 b, u16 c, u8 *d) { int i; - + gUnknown_03004040[0] = 30; gUnknown_03004040[1] = b; gUnknown_03004040[2] = (b & 0x0000FF00) >> 8; @@ -1183,7 +1183,7 @@ void unref_sub_800CDD4(u8 a, u32 b, u16 c, u8 *d) void unref_sub_800CE3C(u8 a, u16 b, u8 *c) { int i; - + gUnknown_03004040[0] = 31; gUnknown_03004040[1] = b; gUnknown_03004040[2] = (b & 0xFF00) >> 8; @@ -1195,7 +1195,7 @@ void unref_sub_800CE3C(u8 a, u16 b, u8 *c) void unref_sub_800CE84(u8 a, u16 b, u8 *c) { int i; - + gUnknown_03004040[0] = 32; gUnknown_03004040[1] = b; gUnknown_03004040[2] = (b & 0xFF00) >> 8; @@ -1216,7 +1216,7 @@ void dp01_build_cmdbuf_x21_a_bb(u8 a, int b, u16 c) void dp01_build_cmdbuf_x22_a_three_bytes(u8 a, int b, u8 *c) { int i; - + gUnknown_03004040[0] = 34; gUnknown_03004040[1] = b; for (i = 0; i < 3; i++) @@ -1340,7 +1340,7 @@ void dp01_build_cmdbuf_x2F_2F_2F_2F(u8 a) void dp01_build_cmdbuf_x30_TODO(u8 a, u8 *b, u8 c) { int i; - + gUnknown_03004040[0] = 48; gUnknown_03004040[1] = c & 0x7F; gUnknown_03004040[2] = (c & 0x80) >> 7; diff --git a/src/rom4.c b/src/rom4.c index 3d388fd6d..e1b9dc302 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -469,7 +469,7 @@ struct MapConnection *sub_8053818(u8 dir) if (connection == NULL) return NULL; - + for(i = 0; i < count; i++, connection++) if (connection->direction == dir) return connection; diff --git a/src/rom6.c b/src/rom6.c index 0cc510914..a2b52c9aa 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -35,7 +35,7 @@ static void sub_810B634(void); bool8 npc_before_player_of_type(u8 a) { u8 mapObjId; - + GetXYCoordsOneStepInFrontOfPlayer(&gUnknown_0203923C.x, &gUnknown_0203923C.y); gUnknown_0203923C.height = PlayerGetZCoord(); mapObjId = GetFieldObjectIdByXYZ(gUnknown_0203923C.x, gUnknown_0203923C.y, gUnknown_0203923C.height); @@ -59,7 +59,7 @@ u8 oei_task_add(void) static void task08_080C9820(u8 taskId) { u8 mapObjId; - + ScriptContext2_Enable(); gPlayerAvatar.unk6 = 1; mapObjId = gPlayerAvatar.mapObjectId; @@ -112,7 +112,7 @@ static void sub_810B428(u8 taskId) static void sub_810B4CC(u8 taskId) { void (*func)(void) = (void (*)(void))(((u16)gTasks[taskId].data[8] << 16) | (u16)gTasks[taskId].data[9]); - + func(); gPlayerAvatar.unk6 = 0; DestroyTask(taskId); @@ -141,7 +141,7 @@ static void sub_810B53C(void) int FldEff_RockSmash(void) { u8 taskId = oei_task_add(); - + gTasks[taskId].data[8] = (u32)sub_810B58C >> 16; gTasks[taskId].data[9] = (u32)sub_810B58C; IncrementGameStat(0x13); @@ -179,7 +179,7 @@ static void sub_810B5D8(void) int FldEff_UseDig(void) { u8 taskId = oei_task_add(); - + gTasks[taskId].data[8] = (u32)sub_810B634 >> 16; gTasks[taskId].data[9] = (u32)sub_810B634; if (!ShouldDoBrailleDigEffect()) @@ -190,7 +190,7 @@ int FldEff_UseDig(void) static void sub_810B634(void) { u8 taskId; - + FieldEffectActiveListRemove(0x26); if (ShouldDoBrailleDigEffect()) { diff --git a/src/script_movement.c b/src/script_movement.c index 13d0ff7ac..2dc816532 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -22,7 +22,7 @@ static void sub_80A2490(u8, u8, u8, u8 *); bool8 exec_movement(u8 a, u8 b, u8 c, u8 *d) { u8 mapObjId; - + if (TryGetFieldObjectIdByLocalIdAndMap(a, b, c, &mapObjId)) return TRUE; if (!FuncIsActiveTask(Task_80A244C)) @@ -35,7 +35,7 @@ bool8 sub_80A212C(u8 a, u8 b, u8 c) u8 mapObjId; u8 r4; u8 r1; - + if (TryGetFieldObjectIdByLocalIdAndMap(a, b, c, &mapObjId)) return 1; r4 = sub_80A21E0(); @@ -48,7 +48,7 @@ bool8 sub_80A212C(u8 a, u8 b, u8 c) void sub_80A2178(void) { u8 taskId; - + taskId = sub_80A21E0(); if (taskId != 0xFF) { @@ -61,7 +61,7 @@ static void sub_80A2198(u8 priority) { u8 taskId; u8 i; - + taskId = CreateTask(Task_80A244C, priority); for (i = 1; i < 16; i++) gTasks[taskId].data[i] = 0xFFFF; @@ -75,7 +75,7 @@ static u8 sub_80A21E0(void) static bool8 sub_80A21F4(u8 taskId, u8 b, u8 *c) { u8 r4; - + r4 = sub_80A2260(taskId, b); if (r4 != 16) { @@ -101,7 +101,7 @@ static u8 sub_80A2260(u8 taskId, u8 b) { u8 *ptr; u8 i; - + ptr = (u8 *)&gTasks[taskId].data[1]; for (i = 0; i < 16; i++, ptr++) { @@ -114,7 +114,7 @@ static u8 sub_80A2260(u8 taskId, u8 b) static void sub_80A229C(u8 taskId, u8 b, u8 **c) { u8 i; - + *c = (u8 *)&gTasks[taskId].data[1]; for (i = 0; i < b; i++, (*c)++) ; @@ -123,7 +123,7 @@ static void sub_80A229C(u8 taskId, u8 b, u8 **c) static void sub_80A22D0(u8 taskId, u8 b, u8 c) { u8 *ptr; - + sub_80A229C(taskId, b, &ptr); *ptr = c; //what is this supposed to do? } @@ -131,7 +131,7 @@ static void sub_80A22D0(u8 taskId, u8 b, u8 c) static void sub_80A22F4(u8 taskId, u8 b, u8 *c) { u8 *ptr; - + sub_80A229C(taskId, b, &ptr); *c = *ptr; } @@ -139,7 +139,7 @@ static void sub_80A22F4(u8 taskId, u8 b, u8 *c) static void sub_80A2318(u8 a, u8 b) { u16 var = ~gBitTable[b]; - + gTasks[a].data[0] &= var; } @@ -179,7 +179,7 @@ static void sub_80A2408(u8 a) { u8 *ptr; u8 i; - + ptr = (u8 *)&gTasks[a].data[1]; for (i = 0; i < 16; i++, ptr++) { @@ -192,7 +192,7 @@ static void Task_80A244C(u8 taskId) { u8 i; u8 var; - + for (i = 0; i < 16; i++) { sub_80A22F4(taskId, i, &var); @@ -204,11 +204,11 @@ static void Task_80A244C(u8 taskId) static void sub_80A2490(u8 taskId, u8 b, u8 c, u8 *d) { u8 var; - + if (FieldObjectIsSpecialAnimActive(&gMapObjects[c]) && !FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[c])) return; - + var = *d; if (var == 0xFE) { diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index a65a6ae9e..912458655 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -120,7 +120,7 @@ void sub_80C4C78(void) var = 12; break; } - + returnVar = gSaveBlock1.sbStruct.unkSB2.sb1_2EFC_struct2[var].var; if(returnVar == 0) @@ -436,8 +436,8 @@ void ShowContestEntryMonPic(void) taskId = CreateTask(sub_80C5190, 0x50); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = species; - HandleLoadSpecialPokePic((struct SpriteSheet *)&gMonFrontPicTable[species].data, - gMonFrontPicCoords[species].x, gMonFrontPicCoords[species].y, + HandleLoadSpecialPokePic((struct SpriteSheet *)&gMonFrontPicTable[species].data, + gMonFrontPicCoords[species].x, gMonFrontPicCoords[species].y, (u32)gUnknown_081FAF4C[0], gUnknown_081FAF4C[1], species, var1); paletteData = sub_80409C8(species, var2, var1); LoadCompressedObjectPalette(paletteData); @@ -455,7 +455,7 @@ void ShowContestEntryMonPic(void) void sub_80C5164(void) { u8 taskId = FindTaskIdByFunc(sub_80C5190); - + if(taskId != 0xFF) gTasks[taskId].data[0]++; } @@ -464,7 +464,7 @@ void sub_80C5190(u8 taskId) { struct Task *task = &gTasks[taskId]; struct Sprite *sprite; - + switch(task->data[0]) { case 2: @@ -531,7 +531,7 @@ void HealPlayerParty(void) arg[1] = maxHP >> 8; SetMonData(&gPlayerParty[i], MON_DATA_HP, arg); ppBonuses = GetMonData(&gPlayerParty[i], MON_DATA_PP_BONUSES); - + // restore PP. for(j = 0; j < 4; j++) { @@ -583,7 +583,7 @@ u8 ScriptGiveEgg(u16 value) sub_8042044(&mon, value, 1); data = 1; SetMonData(&mon, MON_DATA_IS_EGG, &data); - + return GiveMonToPlayer(&mon); } @@ -608,7 +608,7 @@ void CheckForAlivePartyMons(void) bool8 CheckPartyMonHasHeldItem(u16 item) { int i; - + for(i = 0; i < 6; i++) { u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); @@ -621,7 +621,7 @@ bool8 CheckPartyMonHasHeldItem(u16 item) bool8 GetNameOfEnigmaBerryInPlayerParty(void) { bool8 hasItem = CheckPartyMonHasHeldItem(ITEM_ENIGMA_BERRY); - + if(hasItem == TRUE) GetBerryNameByBerryType(ItemIdToBerryType(ITEM_ENIGMA_BERRY), gStringVar1); @@ -634,7 +634,7 @@ void ScriptWildBattle(u16 species, u8 level, u16 item) ZeroEnemyPartyMons(); CreateMon(&gEnemyParty[0], species, level, 0x20, 0, 0, 0, 0); - + if(item) { data[0] = item; @@ -647,7 +647,7 @@ void ScriptSetMonMoveSlot(u8 monIndex, u16 move, u8 slot) { if(monIndex > 6) monIndex = gPlayerPartyCount - 1; - + SetMonMoveSlot(&gPlayerParty[monIndex], move, slot); } @@ -660,7 +660,7 @@ void sub_80C5568(void) void sub_80C5580(void) { u8 var = gSelectedOrderFromParty[0]; - + switch(var) { case 0: @@ -670,7 +670,7 @@ void sub_80C5580(void) gScriptResult = 1; break; } - + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); } @@ -683,7 +683,7 @@ void ChooseBattleTowerPlayerParty(void) void SetBattleTowerPlayerParty(void) { u8 var = gSelectedOrderFromParty[0]; - + switch(var) { case 0: // player quit battle tower? @@ -695,7 +695,7 @@ void SetBattleTowerPlayerParty(void) gScriptResult = 1; break; } - + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); } diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index 1f12c4943..ce62f2abb 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -144,7 +144,7 @@ bool8 sub_80F9ACC(void) void sub_80F9C00(void) { u8 i; - + for(i = 0; i < gPlayerPartyCount; i++) { switch(sub_80AE47C(&gPlayerParty[i])) @@ -251,7 +251,7 @@ bool8 sub_80F9CE8(void) // this is the same function as sub_80F9ACC except case void sub_80F9E1C(void) { u8 i; - + for(i = 0; i < gPlayerPartyCount; i++) { if(!sub_8040574(&gPlayerParty[i])) @@ -293,7 +293,7 @@ void sub_80F9F3C(void) // count pokemon moves u8 i; gScriptResult = 0; - + for(i = 0; i < 4; i++) // checks MOVE1-MOVE4 if(GetMonData(&gPlayerParty[gSpecialVar_0x8004], i + 13)) gScriptResult++; @@ -440,7 +440,7 @@ void sub_80FA0DC(void) SetMonMoveSlot(&gPlayerParty[gSpecialVar_0x8004], 0, gSpecialVar_0x8005); RemoveMonPPBonus(&gPlayerParty[gSpecialVar_0x8004], gSpecialVar_0x8005); - + for(i = gSpecialVar_0x8005; i < 3; i++) sub_80F9FDC(&gPlayerParty[gSpecialVar_0x8004], i, i + 1); } @@ -449,7 +449,7 @@ void sub_80FA148(void) { struct Pokemon *party = &gPlayerParty[gSpecialVar_0x8004]; gScriptResult = 0; - + if(GetMonData(party, MON_DATA_IS_EGG)) gScriptResult = 1; } diff --git a/src/shop.c b/src/shop.c index a533936c5..c78771be7 100644 --- a/src/shop.c +++ b/src/shop.c @@ -75,7 +75,7 @@ u8 CreateShopMenu(bool8 var) PrintMenuItemsReordered(1, 1, 2, gUnknown_083CC6D0, (u8 *)gUnknown_083CC6EB); } InitMenu(0, 1, 1, gUnknown_03000708.unkA + 1, 0, 9); - + return CreateTask(sub_80B2E38, 8); } @@ -160,7 +160,7 @@ void HandleShopMenuQuit(u8 taskId) sub_80BE3BC(); // in tv.s? ScriptContext2_Disable(); DestroyTask(taskId); - + if(gUnknown_03000708.callback) gUnknown_03000708.callback(); // run the callback if it exists. } @@ -289,7 +289,7 @@ void BuyMenuDrawGraphics(void) void sub_80B3240(void) { u16 tempArr[2]; - + memcpy(tempArr, gUnknown_083CC710, sizeof(tempArr)); LoadPalette(&tempArr[1], 0xD1, 2); LoadPalette(&tempArr[0], 0xD8, 2); @@ -298,7 +298,7 @@ void sub_80B3240(void) void sub_80B3270(void) { sub_80F944C(); - + if(gUnknown_03000708.itemCount > 7) { CreateVerticalScrollIndicators(0, 172, 12); @@ -313,7 +313,7 @@ void sub_80B32A4(void) sub_80F979C(0, 1); else sub_80F979C(0, 0); - + if(gUnknown_03000708.unkB + 7 >= gUnknown_03000708.itemCount) sub_80F979C(1, 1); else diff --git a/src/smokescreen.c b/src/smokescreen.c index d7ca7167c..1d3a14a5b 100644 --- a/src/smokescreen.c +++ b/src/smokescreen.c @@ -61,7 +61,7 @@ static void sub_8046388(struct Sprite *sprite) if (!sprite->data1) DestroySprite(sprite); else - sprite->callback = SpriteCallbackDummy; + sprite->callback = SpriteCallbackDummy; } } diff --git a/src/strings.c b/src/strings.c index fed0c86e2..8742b327b 100644 --- a/src/strings.c +++ b/src/strings.c @@ -195,7 +195,7 @@ const u8 OtherText_TheField[] = _("the field."); const u8 OtherText_TheField2[] = _("the field."); const u8 OtherText_ThePC[] = _("the PC."); -const struct TextStruct gUnknown_0840E740[7] = +const struct TextStruct gUnknown_0840E740[7] = { OtherText_TheField3, OtherText_TheBattle, |