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

Merge branch 'master' of github.com:pret/pokefirered into modern_gcc

Browse Source
This commit is contained in:
PikalaxALT
2020-04-10 13:10:44 -04:00
parent 8626240b54 2880cf2a51
commit b22d3a821d
219 changed files with 5421 additions and 5579 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_anim.c
+2 -2
View File
@@ -1382,7 +1382,7 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] =
{gBattleAnimSpriteGfx_GreenSpike, 0x0080, ANIM_TAG_GREEN_SPIKE},
{gBattleAnimSpriteGfx_CircleOfLight, 0x0800, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT},
{gBattleAnimSpriteGfx_GlowyRedOrb, 0x0020, ANIM_TAG_GLOWY_BLUE_ORB},
{gBattleAnimSpriteGfx_Pokeblock, 0x0080, ANIM_TAG_POKEBLOCK},
{gBattleAnimSpriteGfx_SafariBait, 0x0080, ANIM_TAG_SAFARI_BAIT},
{gBattleAnimSpriteGfx_WhiteFeather, 0x0400, ANIM_TAG_WHITE_FEATHER},
{gBattleAnimSpriteGfx_Sparkle6, 0x0080, ANIM_TAG_SPARKLE_6},
{gBattleAnimSpriteGfx_Splash, 0x0800, ANIM_TAG_SPLASH},
@@ -1675,7 +1675,7 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] =
{gBattleAnimSpritePal_GreenSpike, ANIM_TAG_GREEN_SPIKE},
{gBattleAnimSpritePal_WhiteCircleOfLight, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT},
{gBattleAnimSpritePal_GlowyBlueOrb, ANIM_TAG_GLOWY_BLUE_ORB},
{gBattleAnimSpritePal_Pokeblock, ANIM_TAG_POKEBLOCK},
{gBattleAnimSpritePal_SafariBait, ANIM_TAG_SAFARI_BAIT},
{gBattleAnimSpritePal_WhiteFeather, ANIM_TAG_WHITE_FEATHER},
{gBattleAnimSpritePal_Sparkle6, ANIM_TAG_SPARKLE_6},
{gBattleAnimSpritePal_Splash, ANIM_TAG_SPLASH},
src/battle_anim_mons.c
+1 -1
View File
@@ -898,7 +898,7 @@ void sub_8075458(bool8 arg0)
}
}
void sub_8075490(struct Sprite *sprite)
void StartSpriteLinearTranslationFromCurrentPos(struct Sprite *sprite)
{
sprite->data[1] = sprite->pos1.x;
sprite->data[3] = sprite->pos1.y;
src/battle_anim_special.c
+10 -10
View File
@@ -375,10 +375,10 @@ static const u16 sBallOpenFadeColors[] =
RGB(4, 0, 0),
};
const struct SpriteTemplate gPokeblockSpriteTemplate =
const struct SpriteTemplate gSafariBaitSpriteTemplate =
{
.tileTag = ANIM_TAG_POKEBLOCK,
.paletteTag = ANIM_TAG_POKEBLOCK,
.tileTag = ANIM_TAG_SAFARI_BAIT,
.paletteTag = ANIM_TAG_SAFARI_BAIT,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
@@ -2205,20 +2205,20 @@ static void sub_80F1A80(struct Sprite *sprite)
}
}
void AnimTask_LoadPokeblockGfx(u8 taskId)
void AnimTask_LoadBaitGfx(u8 taskId)
{
u8 paletteIndex;
LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]);
LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]);
paletteIndex = IndexOfSpritePaletteTag(ANIM_TAG_POKEBLOCK);
LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_SAFARI_BAIT - ANIM_SPRITES_START]);
LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_SAFARI_BAIT - ANIM_SPRITES_START]);
paletteIndex = IndexOfSpritePaletteTag(ANIM_TAG_SAFARI_BAIT);
DestroyAnimVisualTask(taskId);
}
void AnimTask_FreePokeblockGfx(u8 taskId)
void AnimTask_FreeBaitGfx(u8 taskId)
{
FreeSpriteTilesByTag(ANIM_TAG_POKEBLOCK);
FreeSpritePaletteByTag(ANIM_TAG_POKEBLOCK);
FreeSpriteTilesByTag(ANIM_TAG_SAFARI_BAIT);
FreeSpritePaletteByTag(ANIM_TAG_SAFARI_BAIT);
DestroyAnimVisualTask(taskId);
}
src/battle_controller_safari.c
+1 -1
View File
@@ -171,7 +171,7 @@ static void HandleInputChooseAction(void)
BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_BALL, 0);
break;
case 1:
BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_POKEBLOCK, 0);
BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_BAIT, 0);
break;
case 2:
BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_GO_NEAR, 0);
src/battle_controllers.c
+1 -1
View File
@@ -37,7 +37,7 @@ void HandleLinkBattleSetup(void)
SetWirelessCommType1();
if (!gReceivedRemoteLinkPlayers)
OpenLink();
CreateTask(sub_8081A90, 0);
CreateTask(Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout, 0);
CreateTasksForSendRecvLinkBuffers();
}
}
src/battle_main.c
+3 -3
View File
@@ -569,7 +569,7 @@ static void (*const sTurnActionsFuncsTable[])(void) =
[B_ACTION_RUN] = HandleAction_Run,
[B_ACTION_SAFARI_WATCH_CAREFULLY] = HandleAction_WatchesCarefully,
[B_ACTION_SAFARI_BALL] = HandleAction_SafariZoneBallThrow,
[B_ACTION_SAFARI_POKEBLOCK] = HandleAction_ThrowBait,
[B_ACTION_SAFARI_BAIT] = HandleAction_ThrowBait,
[B_ACTION_SAFARI_GO_NEAR] = HandleAction_ThrowRock,
[B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun,
[B_ACTION_OLDMAN_THROW] = HandleAction_OldManBallThrow,
@@ -3260,7 +3260,7 @@ static void HandleTurnActionSelectionState(void)
case B_ACTION_SAFARI_BALL:
++gBattleCommunication[gActiveBattler];
break;
case B_ACTION_SAFARI_POKEBLOCK:
case B_ACTION_SAFARI_BAIT:
case B_ACTION_SAFARI_GO_NEAR:
++gBattleCommunication[gActiveBattler];
break;
@@ -3771,7 +3771,7 @@ static void HandleEndTurn_FinishBattle(void)
}
TrySetQuestLogBattleEvent();
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
sub_810CB90();
ClearRematchStateByTrainerId();
BeginFastPaletteFade(3);
FadeOutMapMusic(5);
gBattleMainFunc = FreeResetData_ReturnToOvOrDoEvolutions;
src/battle_message.c
+374 -374
View File
@@ -514,380 +514,380 @@ const u8 gUnknown_83FDD64[] = _("OAK: Hm! Excellent!\pIf you win, you earn prize
const u8 gUnknown_83FDDEB[] = _("OAK: Hm…\nHow disappointing…\pIf you win, you earn prize money,\nand your POKéMON grow.\pBut if you lose, {B_PLAYER_NAME}, you end\nup paying prize money…\pHowever, since you had no warning\nthis time, I'll pay for you.\pBut things won't be this way once\nyou step outside these doors.\pThat's why you must strengthen your\nPOKéMON by battling wild POKéMON.\p");
const u8 *const gBattleStringsTable[] = {
gUnknown_83FB219,
gUnknown_83FB265,
gUnknown_83FB28E,
gUnknown_83FB2A4,
gUnknown_83FB2B6,
gUnknown_83FB2D1,
gUnknown_83FB2FC,
gUnknown_83FB31F,
gUnknown_83FB32E,
gUnknown_83FB343,
gUnknown_83FD1B8,
gUnknown_83FB36B,
gUnknown_83FB37F,
gUnknown_83FCBA5,
gUnknown_83FB394,
gUnknown_83FB3EA,
gUnknown_83FB400,
gUnknown_83FB40D,
gUnknown_83FB41A,
gUnknown_83FB433,
gUnknown_83FB451,
gUnknown_83FB508,
gUnknown_83FB545,
gUnknown_83FB555,
gUnknown_83FB565,
gUnknown_83FB57C,
gUnknown_83FB592,
gUnknown_83FB5A8,
gUnknown_83FB5BC,
gUnknown_83FB5CD,
gUnknown_83FB5E2,
gUnknown_83FB5F8,
gUnknown_83FB610,
gUnknown_83FB626,
gUnknown_83FB641,
gUnknown_83FB650,
gUnknown_83FB663,
gUnknown_83FB692,
gUnknown_83FB6A7,
gUnknown_83FB6BF,
gUnknown_83FB6D3,
gUnknown_83FB6E5,
gUnknown_83FB6F7,
gUnknown_83FB70F,
gUnknown_83FB73A,
gUnknown_83FB76A,
gUnknown_83FB78A,
gUnknown_83FB7A3,
gUnknown_83FB7BF,
gUnknown_83FB7D5,
gUnknown_83FB7EE,
gUnknown_83FB806,
gUnknown_83FB826,
gUnknown_83FB844,
gUnknown_83FB854,
gUnknown_83FB871,
gUnknown_83FB885,
gUnknown_83FB89D,
gUnknown_83FB8AE,
gUnknown_83FB8C5,
gUnknown_83FB8E0,
gUnknown_83FB8F3,
gUnknown_83FB914,
gUnknown_83FB921,
gUnknown_83FB935,
gUnknown_83FB946,
gUnknown_83FB97F,
gUnknown_83FB9B8,
gUnknown_83FB9D9,
gUnknown_83FB9FF,
gUnknown_83FBA2F,
gUnknown_83FBA41,
gUnknown_83FBA5E,
gUnknown_83FBA79,
gUnknown_83FBA8E,
gUnknown_83FBAA3,
gUnknown_83FBAB2,
gUnknown_83FBAC3,
gUnknown_83FBAF3,
gUnknown_83FBB11,
gUnknown_83FBB4C,
gUnknown_83FBB62,
gUnknown_83FBB71,
gUnknown_83FBB83,
gUnknown_83FBB99,
gBattleText_MistShroud,
gUnknown_83FBBD0,
gBattleText_GetPumped,
gUnknown_83FBBFF,
gUnknown_83FBC16,
gUnknown_83FBC2B,
gUnknown_83FBC4C,
gUnknown_83FBC74,
gUnknown_83FBC83,
gUnknown_83FBC99,
gUnknown_83FBCBE,
gUnknown_83FBCD1,
gUnknown_83FBCDD,
gUnknown_83FBCFC,
gUnknown_83FBD16,
gUnknown_83FBD2B,
gUnknown_83FBD43,
gUnknown_83FBD53,
gUnknown_83FBD74,
gUnknown_83FBD86,
gUnknown_83FBDA3,
gUnknown_83FBDC4,
gUnknown_83FBDE2,
gUnknown_83FBE00,
gUnknown_83FBE16,
gUnknown_83FBE2B,
gUnknown_83FBE4E,
gUnknown_83FBE61,
gUnknown_83FBE73,
gUnknown_83FBE8B,
gUnknown_83FBEA1,
gUnknown_83FBEBE,
gUnknown_83FBEE2,
gUnknown_83FBEFA,
gUnknown_83FBF0C,
gUnknown_83FBF23,
gUnknown_83FC687,
gUnknown_83FBF39,
gUnknown_83FBF51,
gUnknown_83FBF63,
gUnknown_83FBF76,
gUnknown_83FBF89,
gUnknown_83FBF99,
gUnknown_83FBFBF,
gUnknown_83FBFD3,
gUnknown_83FBFEA,
gUnknown_83FBFFC,
gUnknown_83FC011,
gUnknown_83FC02B,
gUnknown_83FC048,
gUnknown_83FC072,
gUnknown_83FC090,
gUnknown_83FC0C6,
gUnknown_83FC0DC,
gUnknown_83FC0EE,
gUnknown_83FC10C,
gUnknown_83FC11E,
gUnknown_83FC132,
gUnknown_83FC140,
gUnknown_83FC168,
gUnknown_83FC185,
gUnknown_83FC19D,
gUnknown_83FC1B1,
gUnknown_83FC1C6,
gUnknown_83FC1DB,
gUnknown_83FC1F1,
gUnknown_83FC224,
gUnknown_83FC231,
gUnknown_83FC254,
gUnknown_83FC26D,
gUnknown_83FC28A,
gUnknown_83FC670,
gUnknown_83FC2AA,
gUnknown_83FC69D,
gUnknown_83FC2C7,
gUnknown_83FC2E3,
gUnknown_83FC6D6,
gUnknown_83FC2FA,
gUnknown_83FC312,
gUnknown_83FC377,
gUnknown_83FC38A,
gUnknown_83FC39A,
gUnknown_83FC3AF,
gUnknown_83FC3C5,
gUnknown_83FC3EB,
gUnknown_83FC40E,
gUnknown_83FC421,
gUnknown_83FC439,
gUnknown_83FC461,
gUnknown_83FC6F8,
gUnknown_83FC483,
gUnknown_83FC4AB,
gUnknown_83FC4D6,
gUnknown_83FC4F0,
gUnknown_83FC518,
gUnknown_83FC53D,
gUnknown_83FC715,
gUnknown_83FC72B,
gUnknown_83FC745,
gUnknown_83FC75D,
gUnknown_83FC780,
gUnknown_83FC7B6,
gUnknown_83FC7D3,
gUnknown_83FC7EF,
gUnknown_83FC809,
gUnknown_83FC825,
gUnknown_83FC841,
gUnknown_83FC860,
gUnknown_83FC87B,
gUnknown_83FC895,
gUnknown_83FC8B1,
gUnknown_83FC8C2,
gUnknown_83FCB41,
gBattleText_Rose,
gUnknown_83FCB50,
gUnknown_83FCB59,
gUnknown_83FCB5F,
gBattleText_UnknownString3,
gUnknown_83FCB8F,
gUnknown_83FCB9A,
gUnknown_83FCBE4,
gUnknown_83FCBF4,
gUnknown_83FCC07,
gUnknown_83FCC33,
gUnknown_83FCC5B,
gUnknown_83FCC74,
sText_GotAwaySafely,
gUnknown_83FCCD2,
gUnknown_83FCDB3,
gUnknown_83FCDE2,
gUnknown_83FCDF1,
gUnknown_83FCDF2,
gUnknown_83FCE08,
gUnknown_83FCE17,
gUnknown_83FCE38,
gUnknown_83FCE50,
gUnknown_83FCE64,
gUnknown_83FCE78,
gUnknown_83FCE90,
gUnknown_83FCEA8,
gUnknown_83FCEBA,
gUnknown_83FCECE,
gUnknown_83FCEE3,
gUnknown_83FCEFB,
gUnknown_83FCF14,
gUnknown_83FCF2C,
gUnknown_83FCF40,
gUnknown_83FCF54,
gUnknown_83FCF6C,
gUnknown_83FCF7E,
gUnknown_83FCFA0,
gUnknown_83FCFC2,
gUnknown_83FCFE4,
gUnknown_83FD006,
gUnknown_83FD022,
gUnknown_83FD048,
gUnknown_83FD068,
gUnknown_83FD077,
gUnknown_83FD0A7,
gUnknown_83FD0CA,
sText_PlayerUsedItem,
sText_OldManUsedItem,
sText_TrainerBlockedBall,
sText_DontBeAThief,
sText_ItDodgedBall,
sText_YouMissedPkmn,
sText_PkmnBrokeFree,
sText_ItAppearedCaught,
sText_AarghAlmostHadIt,
sText_ShootSoClose,
sText_GotchaPkmnCaught,
sText_GotchaPkmnCaught2,
sText_GiveNicknameCaptured,
sText_PkmnSentToPC,
gUnknown_83FD82B,
gUnknown_83FD850,
gUnknown_83FD85F,
gUnknown_83FB525,
gUnknown_83FD0F1,
gUnknown_83FD111,
gUnknown_83FD124,
gUnknown_83FD135,
gUnknown_83FD14B,
gUnknown_83FD15A,
gUnknown_83FD16A,
gUnknown_83FD186,
gUnknown_83FD1DF,
gUnknown_83FD1FA,
gUnknown_83FD218,
gUnknown_83FD232,
gUnknown_83FD23F,
gUnknown_83FB218,
gUnknown_83FB218,
gUnknown_83FD24D,
gUnknown_83FD8B9,
gUnknown_83FD8D2,
gUnknown_83FD8E8,
gUnknown_83FD901,
gUnknown_83FD917,
gUnknown_83FD937,
gUnknown_83FD95C,
gUnknown_83FD999,
gUnknown_83FD9B2,
gUnknown_83FD9CC,
gUnknown_83FD9E9,
gUnknown_83FDA0B,
gUnknown_83FDA33,
gUnknown_83FDA4C,
gUnknown_83FC8D5,
gUnknown_83FC8ED,
gUnknown_83FC913,
gUnknown_83FC935,
gUnknown_83FC979,
gUnknown_83FC993,
gUnknown_83FC9AA,
gUnknown_83FC9C7,
gUnknown_83FC9E5,
gUnknown_83FCA03,
gUnknown_83FC554,
gUnknown_83FC576,
gUnknown_83FBAD2,
gUnknown_83FBAE5,
gUnknown_83FCC39,
gUnknown_83FC591,
sText_PlayerDefeatedLinkTrainerTrainer1,
gUnknown_83FC5A2,
gUnknown_83FC5CC,
gUnknown_83FC5E8,
gUnknown_83FCB75,
gUnknown_83FC5F6,
gUnknown_83FC79D,
gUnknown_83FBB2F,
gUnknown_83FB282,
gUnknown_83FB283,
gUnknown_83FC955,
gUnknown_83FB3AF,
gUnknown_83FDAB1,
gUnknown_83FCA13,
gUnknown_83FC208,
gUnknown_83FC60C,
gUnknown_83FB359,
gUnknown_83FCCA0,
gUnknown_83FCCBB,
gUnknown_83FC631,
gUnknown_83FCA49,
gUnknown_83FD97A,
sText_Trainer1UsedItem,
gUnknown_83FD876,
gUnknown_83FB3D3,
gUnknown_83FCA71,
gUnknown_83FCA8E,
gUnknown_83FB67B,
gUnknown_83FCBC5,
gUnknown_83FC900,
gUnknown_83FBC62,
gUnknown_83FB997,
gUnknown_83FB95E,
gUnknown_83FC646,
gUnknown_83FCAAA,
gUnknown_83FCAD1,
gUnknown_83FB534,
gUnknown_83FC337,
gUnknown_83FC347,
gUnknown_83FC357,
gUnknown_83FC65A,
gUnknown_83FCAEF,
gUnknown_83FDD64,
gUnknown_83FDDEB,
gUnknown_83FB484,
gUnknown_83FB4BE,
Text_MonSentToBoxInSomeonesPC,
Text_MonSentToBoxInBillsPC,
Text_MonSentToBoxSomeonesBoxFull,
Text_MonSentToBoxBillsBoxFull,
sText_PokedudeUsedItem,
gUnknown_83FDA4D,
gUnknown_83FDA7A,
gUnknown_83FDA8C,
gUnknown_83FB21C,
gUnknown_83FB262,
gUnknown_83FB4F7,
gUnknown_83FCB0C,
gUnknown_83FCB26,
gUnknown_83FD322,
gUnknown_83FD34D,
gUnknown_83FB21F,
gUnknown_83FB232,
gUnknown_83FB235,
gUnknown_83FB248
[STRINGID_TRAINER1LOSETEXT - 12] = gUnknown_83FB219,
[STRINGID_PKMNGAINEDEXP - 12] = gUnknown_83FB265,
[STRINGID_PKMNGREWTOLV - 12] = gUnknown_83FB28E,
[STRINGID_PKMNLEARNEDMOVE - 12] = gUnknown_83FB2A4,
[STRINGID_TRYTOLEARNMOVE1 - 12] = gUnknown_83FB2B6,
[STRINGID_TRYTOLEARNMOVE2 - 12] = gUnknown_83FB2D1,
[STRINGID_TRYTOLEARNMOVE3 - 12] = gUnknown_83FB2FC,
[STRINGID_PKMNFORGOTMOVE - 12] = gUnknown_83FB31F,
[STRINGID_STOPLEARNINGMOVE - 12] = gUnknown_83FB32E,
[STRINGID_DIDNOTLEARNMOVE - 12] = gUnknown_83FB343,
[STRINGID_PKMNLEARNEDMOVE2 - 12] = gUnknown_83FD1B8,
[STRINGID_ATTACKMISSED - 12] = gUnknown_83FB36B,
[STRINGID_PKMNPROTECTEDITSELF - 12] = gUnknown_83FB37F,
[STRINGID_STATSWONTINCREASE2 - 12] = gUnknown_83FCBA5,
[STRINGID_AVOIDEDDAMAGE - 12] = gUnknown_83FB394,
[STRINGID_ITDOESNTAFFECT - 12] = gUnknown_83FB3EA,
[STRINGID_ATTACKERFAINTED - 12] = gUnknown_83FB400,
[STRINGID_TARGETFAINTED - 12] = gUnknown_83FB40D,
[STRINGID_PLAYERGOTMONEY - 12] = gUnknown_83FB41A,
[STRINGID_PLAYERWHITEOUT - 12] = gUnknown_83FB433,
[STRINGID_PLAYERWHITEOUT2 - 12] = gUnknown_83FB451,
[STRINGID_PREVENTSESCAPE - 12] = gUnknown_83FB508,
[STRINGID_HITXTIMES - 12] = gUnknown_83FB545,
[STRINGID_PKMNFELLASLEEP - 12] = gUnknown_83FB555,
[STRINGID_PKMNMADESLEEP - 12] = gUnknown_83FB565,
[STRINGID_PKMNALREADYASLEEP - 12] = gUnknown_83FB57C,
[STRINGID_PKMNALREADYASLEEP2 - 12] = gUnknown_83FB592,
[STRINGID_PKMNWASNTAFFECTED - 12] = gUnknown_83FB5A8,
[STRINGID_PKMNWASPOISONED - 12] = gUnknown_83FB5BC,
[STRINGID_PKMNPOISONEDBY - 12] = gUnknown_83FB5CD,
[STRINGID_PKMNHURTBYPOISON - 12] = gUnknown_83FB5E2,
[STRINGID_PKMNALREADYPOISONED - 12] = gUnknown_83FB5F8,
[STRINGID_PKMNBADLYPOISONED - 12] = gUnknown_83FB610,
[STRINGID_PKMNENERGYDRAINED - 12] = gUnknown_83FB626,
[STRINGID_PKMNWASBURNED - 12] = gUnknown_83FB641,
[STRINGID_PKMNBURNEDBY - 12] = gUnknown_83FB650,
[STRINGID_PKMNHURTBYBURN - 12] = gUnknown_83FB663,
[STRINGID_PKMNWASFROZEN - 12] = gUnknown_83FB692,
[STRINGID_PKMNFROZENBY - 12] = gUnknown_83FB6A7,
[STRINGID_PKMNISFROZEN - 12] = gUnknown_83FB6BF,
[STRINGID_PKMNWASDEFROSTED - 12] = gUnknown_83FB6D3,
[STRINGID_PKMNWASDEFROSTED2 - 12] = gUnknown_83FB6E5,
[STRINGID_PKMNWASDEFROSTEDBY - 12] = gUnknown_83FB6F7,
[STRINGID_PKMNWASPARALYZED - 12] = gUnknown_83FB70F,
[STRINGID_PKMNWASPARALYZEDBY - 12] = gUnknown_83FB73A,
[STRINGID_PKMNISPARALYZED - 12] = gUnknown_83FB76A,
[STRINGID_PKMNISALREADYPARALYZED - 12] = gUnknown_83FB78A,
[STRINGID_PKMNHEALEDPARALYSIS - 12] = gUnknown_83FB7A3,
[STRINGID_PKMNDREAMEATEN - 12] = gUnknown_83FB7BF,
[STRINGID_STATSWONTINCREASE - 12] = gUnknown_83FB7D5,
[STRINGID_STATSWONTDECREASE - 12] = gUnknown_83FB7EE,
[STRINGID_TEAMSTOPPEDWORKING - 12] = gUnknown_83FB806,
[STRINGID_FOESTOPPEDWORKING - 12] = gUnknown_83FB826,
[STRINGID_PKMNISCONFUSED - 12] = gUnknown_83FB844,
[STRINGID_PKMNHEALEDCONFUSION - 12] = gUnknown_83FB854,
[STRINGID_PKMNWASCONFUSED - 12] = gUnknown_83FB871,
[STRINGID_PKMNALREADYCONFUSED - 12] = gUnknown_83FB885,
[STRINGID_PKMNFELLINLOVE - 12] = gUnknown_83FB89D,
[STRINGID_PKMNINLOVE - 12] = gUnknown_83FB8AE,
[STRINGID_PKMNIMMOBILIZEDBYLOVE - 12] = gUnknown_83FB8C5,
[STRINGID_PKMNBLOWNAWAY - 12] = gUnknown_83FB8E0,
[STRINGID_PKMNCHANGEDTYPE - 12] = gUnknown_83FB8F3,
[STRINGID_PKMNFLINCHED - 12] = gUnknown_83FB914,
[STRINGID_PKMNREGAINEDHEALTH - 12] = gUnknown_83FB921,
[STRINGID_PKMNHPFULL - 12] = gUnknown_83FB935,
[STRINGID_PKMNRAISEDSPDEF - 12] = gUnknown_83FB946,
[STRINGID_PKMNRAISEDDEF - 12] = gUnknown_83FB97F,
[STRINGID_PKMNCOVEREDBYVEIL - 12] = gUnknown_83FB9B8,
[STRINGID_PKMNUSEDSAFEGUARD - 12] = gUnknown_83FB9D9,
[STRINGID_PKMNSAFEGUARDEXPIRED - 12] = gUnknown_83FB9FF,
[STRINGID_PKMNWENTTOSLEEP - 12] = gUnknown_83FBA2F,
[STRINGID_PKMNSLEPTHEALTHY - 12] = gUnknown_83FBA41,
[STRINGID_PKMNWHIPPEDWHIRLWIND - 12] = gUnknown_83FBA5E,
[STRINGID_PKMNTOOKSUNLIGHT - 12] = gUnknown_83FBA79,
[STRINGID_PKMNLOWEREDHEAD - 12] = gUnknown_83FBA8E,
[STRINGID_PKMNISGLOWING - 12] = gUnknown_83FBAA3,
[STRINGID_PKMNFLEWHIGH - 12] = gUnknown_83FBAB2,
[STRINGID_PKMNDUGHOLE - 12] = gUnknown_83FBAC3,
[STRINGID_PKMNSQUEEZEDBYBIND - 12] = gUnknown_83FBAF3,
[STRINGID_PKMNTRAPPEDINVORTEX - 12] = gUnknown_83FBB11,
[STRINGID_PKMNWRAPPEDBY - 12] = gUnknown_83FBB4C,
[STRINGID_PKMNCLAMPED - 12] = gUnknown_83FBB62,
[STRINGID_PKMNHURTBY - 12] = gUnknown_83FBB71,
[STRINGID_PKMNFREEDFROM - 12] = gUnknown_83FBB83,
[STRINGID_PKMNCRASHED - 12] = gUnknown_83FBB99,
[STRINGID_PKMNSHROUDEDINMIST - 12] = gBattleText_MistShroud,
[STRINGID_PKMNPROTECTEDBYMIST - 12] = gUnknown_83FBBD0,
[STRINGID_PKMNGETTINGPUMPED - 12] = gBattleText_GetPumped,
[STRINGID_PKMNHITWITHRECOIL - 12] = gUnknown_83FBBFF,
[STRINGID_PKMNPROTECTEDITSELF2 - 12] = gUnknown_83FBC16,
[STRINGID_PKMNBUFFETEDBYSANDSTORM - 12] = gUnknown_83FBC2B,
[STRINGID_PKMNPELTEDBYHAIL - 12] = gUnknown_83FBC4C,
[STRINGID_PKMNSEEDED - 12] = gUnknown_83FBC74,
[STRINGID_PKMNEVADEDATTACK - 12] = gUnknown_83FBC83,
[STRINGID_PKMNSAPPEDBYLEECHSEED - 12] = gUnknown_83FBC99,
[STRINGID_PKMNFASTASLEEP - 12] = gUnknown_83FBCBE,
[STRINGID_PKMNWOKEUP - 12] = gUnknown_83FBCD1,
[STRINGID_PKMNUPROARKEPTAWAKE - 12] = gUnknown_83FBCDD,
[STRINGID_PKMNWOKEUPINUPROAR - 12] = gUnknown_83FBCFC,
[STRINGID_PKMNCAUSEDUPROAR - 12] = gUnknown_83FBD16,
[STRINGID_PKMNMAKINGUPROAR - 12] = gUnknown_83FBD2B,
[STRINGID_PKMNCALMEDDOWN - 12] = gUnknown_83FBD43,
[STRINGID_PKMNCANTSLEEPINUPROAR - 12] = gUnknown_83FBD53,
[STRINGID_PKMNSTOCKPILED - 12] = gUnknown_83FBD74,
[STRINGID_PKMNCANTSTOCKPILE - 12] = gUnknown_83FBD86,
[STRINGID_PKMNCANTSLEEPINUPROAR2 - 12] = gUnknown_83FBDA3,
[STRINGID_UPROARKEPTPKMNAWAKE - 12] = gUnknown_83FBDC4,
[STRINGID_PKMNSTAYEDAWAKEUSING - 12] = gUnknown_83FBDE2,
[STRINGID_PKMNSTORINGENERGY - 12] = gUnknown_83FBE00,
[STRINGID_PKMNUNLEASHEDENERGY - 12] = gUnknown_83FBE16,
[STRINGID_PKMNFATIGUECONFUSION - 12] = gUnknown_83FBE2B,
[STRINGID_PKMNPICKEDUPITEM - 12] = gUnknown_83FBE4E,
[STRINGID_PKMNUNAFFECTED - 12] = gUnknown_83FBE61,
[STRINGID_PKMNTRANSFORMEDINTO - 12] = gUnknown_83FBE73,
[STRINGID_PKMNMADESUBSTITUTE - 12] = gUnknown_83FBE8B,
[STRINGID_PKMNHASSUBSTITUTE - 12] = gUnknown_83FBEA1,
[STRINGID_SUBSTITUTEDAMAGED - 12] = gUnknown_83FBEBE,
[STRINGID_PKMNSUBSTITUTEFADED - 12] = gUnknown_83FBEE2,
[STRINGID_PKMNMUSTRECHARGE - 12] = gUnknown_83FBEFA,
[STRINGID_PKMNRAGEBUILDING - 12] = gUnknown_83FBF0C,
[STRINGID_PKMNMOVEWASDISABLED - 12] = gUnknown_83FBF23,
[STRINGID_PKMNMOVEISDISABLED - 12] = gUnknown_83FC687,
[STRINGID_PKMNMOVEDISABLEDNOMORE - 12] = gUnknown_83FBF39,
[STRINGID_PKMNGOTENCORE - 12] = gUnknown_83FBF51,
[STRINGID_PKMNENCOREENDED - 12] = gUnknown_83FBF63,
[STRINGID_PKMNTOOKAIM - 12] = gUnknown_83FBF76,
[STRINGID_PKMNSKETCHEDMOVE - 12] = gUnknown_83FBF89,
[STRINGID_PKMNTRYINGTOTAKEFOE - 12] = gUnknown_83FBF99,
[STRINGID_PKMNTOOKFOE - 12] = gUnknown_83FBFBF,
[STRINGID_PKMNREDUCEDPP - 12] = gUnknown_83FBFD3,
[STRINGID_PKMNSTOLEITEM - 12] = gUnknown_83FBFEA,
[STRINGID_TARGETCANTESCAPENOW - 12] = gUnknown_83FBFFC,
[STRINGID_PKMNFELLINTONIGHTMARE - 12] = gUnknown_83FC011,
[STRINGID_PKMNLOCKEDINNIGHTMARE - 12] = gUnknown_83FC02B,
[STRINGID_PKMNLAIDCURSE - 12] = gUnknown_83FC048,
[STRINGID_PKMNAFFLICTEDBYCURSE - 12] = gUnknown_83FC072,
[STRINGID_SPIKESSCATTERED - 12] = gUnknown_83FC090,
[STRINGID_PKMNHURTBYSPIKES - 12] = gUnknown_83FC0C6,
[STRINGID_PKMNIDENTIFIED - 12] = gUnknown_83FC0DC,
[STRINGID_PKMNPERISHCOUNTFELL - 12] = gUnknown_83FC0EE,
[STRINGID_PKMNBRACEDITSELF - 12] = gUnknown_83FC10C,
[STRINGID_PKMNENDUREDHIT - 12] = gUnknown_83FC11E,
[STRINGID_MAGNITUDESTRENGTH - 12] = gUnknown_83FC132,
[STRINGID_PKMNCUTHPMAXEDATTACK - 12] = gUnknown_83FC140,
[STRINGID_PKMNCOPIEDSTATCHANGES - 12] = gUnknown_83FC168,
[STRINGID_PKMNGOTFREE - 12] = gUnknown_83FC185,
[STRINGID_PKMNSHEDLEECHSEED - 12] = gUnknown_83FC19D,
[STRINGID_PKMNBLEWAWAYSPIKES - 12] = gUnknown_83FC1B1,
[STRINGID_PKMNFLEDFROMBATTLE - 12] = gUnknown_83FC1C6,
[STRINGID_PKMNFORESAWATTACK - 12] = gUnknown_83FC1DB,
[STRINGID_PKMNTOOKATTACK - 12] = gUnknown_83FC1F1,
[STRINGID_PKMNATTACK - 12] = gUnknown_83FC224,
[STRINGID_PKMNCENTERATTENTION - 12] = gUnknown_83FC231,
[STRINGID_PKMNCHARGINGPOWER - 12] = gUnknown_83FC254,
[STRINGID_NATUREPOWERTURNEDINTO - 12] = gUnknown_83FC26D,
[STRINGID_PKMNSTATUSNORMAL - 12] = gUnknown_83FC28A,
[STRINGID_PKMNHASNOMOVESLEFT - 12] = gUnknown_83FC670,
[STRINGID_PKMNSUBJECTEDTOTORMENT - 12] = gUnknown_83FC2AA,
[STRINGID_PKMNCANTUSEMOVETORMENT - 12] = gUnknown_83FC69D,
[STRINGID_PKMNTIGHTENINGFOCUS - 12] = gUnknown_83FC2C7,
[STRINGID_PKMNFELLFORTAUNT - 12] = gUnknown_83FC2E3,
[STRINGID_PKMNCANTUSEMOVETAUNT - 12] = gUnknown_83FC6D6,
[STRINGID_PKMNREADYTOHELP - 12] = gUnknown_83FC2FA,
[STRINGID_PKMNSWITCHEDITEMS - 12] = gUnknown_83FC312,
[STRINGID_PKMNCOPIEDFOE - 12] = gUnknown_83FC377,
[STRINGID_PKMNMADEWISH - 12] = gUnknown_83FC38A,
[STRINGID_PKMNWISHCAMETRUE - 12] = gUnknown_83FC39A,
[STRINGID_PKMNPLANTEDROOTS - 12] = gUnknown_83FC3AF,
[STRINGID_PKMNABSORBEDNUTRIENTS - 12] = gUnknown_83FC3C5,
[STRINGID_PKMNANCHOREDITSELF - 12] = gUnknown_83FC3EB,
[STRINGID_PKMNWASMADEDROWSY - 12] = gUnknown_83FC40E,
[STRINGID_PKMNKNOCKEDOFF - 12] = gUnknown_83FC421,
[STRINGID_PKMNSWAPPEDABILITIES - 12] = gUnknown_83FC439,
[STRINGID_PKMNSEALEDOPPONENTMOVE - 12] = gUnknown_83FC461,
[STRINGID_PKMNCANTUSEMOVESEALED - 12] = gUnknown_83FC6F8,
[STRINGID_PKMNWANTSGRUDGE - 12] = gUnknown_83FC483,
[STRINGID_PKMNLOSTPPGRUDGE - 12] = gUnknown_83FC4AB,
[STRINGID_PKMNSHROUDEDITSELF - 12] = gUnknown_83FC4D6,
[STRINGID_PKMNMOVEBOUNCED - 12] = gUnknown_83FC4F0,
[STRINGID_PKMNWAITSFORTARGET - 12] = gUnknown_83FC518,
[STRINGID_PKMNSNATCHEDMOVE - 12] = gUnknown_83FC53D,
[STRINGID_PKMNMADEITRAIN - 12] = gUnknown_83FC715,
[STRINGID_PKMNRAISEDSPEED - 12] = gUnknown_83FC72B,
[STRINGID_PKMNPROTECTEDBY - 12] = gUnknown_83FC745,
[STRINGID_PKMNPREVENTSUSAGE - 12] = gUnknown_83FC75D,
[STRINGID_PKMNRESTOREDHPUSING - 12] = gUnknown_83FC780,
[STRINGID_PKMNCHANGEDTYPEWITH - 12] = gUnknown_83FC7B6,
[STRINGID_PKMNPREVENTSPARALYSISWITH - 12] = gUnknown_83FC7D3,
[STRINGID_PKMNPREVENTSROMANCEWITH - 12] = gUnknown_83FC7EF,
[STRINGID_PKMNPREVENTSPOISONINGWITH - 12] = gUnknown_83FC809,
[STRINGID_PKMNPREVENTSCONFUSIONWITH - 12] = gUnknown_83FC825,
[STRINGID_PKMNRAISEDFIREPOWERWITH - 12] = gUnknown_83FC841,
[STRINGID_PKMNANCHORSITSELFWITH - 12] = gUnknown_83FC860,
[STRINGID_PKMNCUTSATTACKWITH - 12] = gUnknown_83FC87B,
[STRINGID_PKMNPREVENTSSTATLOSSWITH - 12] = gUnknown_83FC895,
[STRINGID_PKMNHURTSWITH - 12] = gUnknown_83FC8B1,
[STRINGID_PKMNTRACED - 12] = gUnknown_83FC8C2,
[STRINGID_STATSHARPLY - 12] = gUnknown_83FCB41,
[STRINGID_STATROSE - 12] = gBattleText_Rose,
[STRINGID_STATHARSHLY - 12] = gUnknown_83FCB50,
[STRINGID_STATFELL - 12] = gUnknown_83FCB59,
[STRINGID_PKMNSSTATCHANGED - 12] = gUnknown_83FCB5F,
[STRINGID_PKMNSSTATCHANGED2 - 12] = gBattleText_UnknownString3,
[STRINGID_PKMNSSTATCHANGED3 - 12] = gUnknown_83FCB8F,
[STRINGID_PKMNSSTATCHANGED4 - 12] = gUnknown_83FCB9A,
[STRINGID_CRITICALHIT - 12] = gUnknown_83FCBE4,
[STRINGID_ONEHITKO - 12] = gUnknown_83FCBF4,
[STRINGID_123POOF - 12] = gUnknown_83FCC07,
[STRINGID_ANDELLIPSIS - 12] = gUnknown_83FCC33,
[STRINGID_NOTVERYEFFECTIVE - 12] = gUnknown_83FCC5B,
[STRINGID_SUPEREFFECTIVE - 12] = gUnknown_83FCC74,
[STRINGID_GOTAWAYSAFELY - 12] = sText_GotAwaySafely,
[STRINGID_WILDPKMNFLED - 12] = gUnknown_83FCCD2,
[STRINGID_NORUNNINGFROMTRAINERS - 12] = gUnknown_83FCDB3,
[STRINGID_CANTESCAPE - 12] = gUnknown_83FCDE2,
[STRINGID_DONTLEAVEBIRCH - 12] = gUnknown_83FCDF1,
[STRINGID_BUTNOTHINGHAPPENED - 12] = gUnknown_83FCDF2,
[STRINGID_BUTITFAILED - 12] = gUnknown_83FCE08,
[STRINGID_ITHURTCONFUSION - 12] = gUnknown_83FCE17,
[STRINGID_MIRRORMOVEFAILED - 12] = gUnknown_83FCE38,
[STRINGID_STARTEDTORAIN - 12] = gUnknown_83FCE50,
[STRINGID_DOWNPOURSTARTED - 12] = gUnknown_83FCE64,
[STRINGID_RAINCONTINUES - 12] = gUnknown_83FCE78,
[STRINGID_DOWNPOURCONTINUES - 12] = gUnknown_83FCE90,
[STRINGID_RAINSTOPPED - 12] = gUnknown_83FCEA8,
[STRINGID_SANDSTORMBREWED - 12] = gUnknown_83FCEBA,
[STRINGID_SANDSTORMRAGES - 12] = gUnknown_83FCECE,
[STRINGID_SANDSTORMSUBSIDED - 12] = gUnknown_83FCEE3,
[STRINGID_SUNLIGHTGOTBRIGHT - 12] = gUnknown_83FCEFB,
[STRINGID_SUNLIGHTSTRONG - 12] = gUnknown_83FCF14,
[STRINGID_SUNLIGHTFADED - 12] = gUnknown_83FCF2C,
[STRINGID_STARTEDHAIL - 12] = gUnknown_83FCF40,
[STRINGID_HAILCONTINUES - 12] = gUnknown_83FCF54,
[STRINGID_HAILSTOPPED - 12] = gUnknown_83FCF6C,
[STRINGID_FAILEDTOSPITUP - 12] = gUnknown_83FCF7E,
[STRINGID_FAILEDTOSWALLOW - 12] = gUnknown_83FCFA0,
[STRINGID_WINDBECAMEHEATWAVE - 12] = gUnknown_83FCFC2,
[STRINGID_STATCHANGESGONE - 12] = gUnknown_83FCFE4,
[STRINGID_COINSSCATTERED - 12] = gUnknown_83FD006,
[STRINGID_TOOWEAKFORSUBSTITUTE - 12] = gUnknown_83FD022,
[STRINGID_SHAREDPAIN - 12] = gUnknown_83FD048,
[STRINGID_BELLCHIMED - 12] = gUnknown_83FD068,
[STRINGID_FAINTINTHREE - 12] = gUnknown_83FD077,
[STRINGID_NOPPLEFT - 12] = gUnknown_83FD0A7,
[STRINGID_BUTNOPPLEFT - 12] = gUnknown_83FD0CA,
[STRINGID_PLAYERUSEDITEM - 12] = sText_PlayerUsedItem,
[STRINGID_OLDMANUSEDITEM - 12] = sText_OldManUsedItem,
[STRINGID_TRAINERBLOCKEDBALL - 12] = sText_TrainerBlockedBall,
[STRINGID_DONTBEATHIEF - 12] = sText_DontBeAThief,
[STRINGID_ITDODGEDBALL - 12] = sText_ItDodgedBall,
[STRINGID_YOUMISSEDPKMN - 12] = sText_YouMissedPkmn,
[STRINGID_PKMNBROKEFREE - 12] = sText_PkmnBrokeFree,
[STRINGID_ITAPPEAREDCAUGHT - 12] = sText_ItAppearedCaught,
[STRINGID_AARGHALMOSTHADIT - 12] = sText_AarghAlmostHadIt,
[STRINGID_SHOOTSOCLOSE - 12] = sText_ShootSoClose,
[STRINGID_GOTCHAPKMNCAUGHT - 12] = sText_GotchaPkmnCaught,
[STRINGID_GOTCHAPKMNCAUGHT2 - 12] = sText_GotchaPkmnCaught2,
[STRINGID_GIVENICKNAMECAPTURED - 12] = sText_GiveNicknameCaptured,
[STRINGID_PKMNSENTTOPC - 12] = sText_PkmnSentToPC,
[STRINGID_PKMNDATAADDEDTODEX - 12] = gUnknown_83FD82B,
[STRINGID_ITISRAINING - 12] = gUnknown_83FD850,
[STRINGID_SANDSTORMISRAGING - 12] = gUnknown_83FD85F,
[STRINGID_CANTESCAPE2 - 12] = gUnknown_83FB525,
[STRINGID_PKMNIGNORESASLEEP - 12] = gUnknown_83FD0F1,
[STRINGID_PKMNIGNOREDORDERS - 12] = gUnknown_83FD111,
[STRINGID_PKMNBEGANTONAP - 12] = gUnknown_83FD124,
[STRINGID_PKMNLOAFING - 12] = gUnknown_83FD135,
[STRINGID_PKMNWONTOBEY - 12] = gUnknown_83FD14B,
[STRINGID_PKMNTURNEDAWAY - 12] = gUnknown_83FD15A,
[STRINGID_PKMNPRETENDNOTNOTICE - 12] = gUnknown_83FD16A,
[STRINGID_ENEMYABOUTTOSWITCHPKMN - 12] = gUnknown_83FD186,
[STRINGID_THREWROCK - 12] = gUnknown_83FD1DF,
[STRINGID_THREWBAIT - 12] = gUnknown_83FD1FA,
[STRINGID_PKMNWATCHINGCAREFULLY - 12] = gUnknown_83FD218,
[STRINGID_PKMNANGRY - 12] = gUnknown_83FD232,
[STRINGID_PKMNEATING - 12] = gUnknown_83FD23F,
[STRINGID_DUMMY288 - 12] = gUnknown_83FB218,
[STRINGID_DUMMY289 - 12] = gUnknown_83FB218,
[STRINGID_OUTOFSAFARIBALLS - 12] = gUnknown_83FD24D,
[STRINGID_PKMNSITEMCUREDPARALYSIS - 12] = gUnknown_83FD8B9,
[STRINGID_PKMNSITEMCUREDPOISON - 12] = gUnknown_83FD8D2,
[STRINGID_PKMNSITEMHEALEDBURN - 12] = gUnknown_83FD8E8,
[STRINGID_PKMNSITEMDEFROSTEDIT - 12] = gUnknown_83FD901,
[STRINGID_PKMNSITEMWOKEIT - 12] = gUnknown_83FD917,
[STRINGID_PKMNSITEMSNAPPEDOUT - 12] = gUnknown_83FD937,
[STRINGID_PKMNSITEMCUREDPROBLEM - 12] = gUnknown_83FD95C,
[STRINGID_PKMNSITEMRESTOREDHEALTH - 12] = gUnknown_83FD999,
[STRINGID_PKMNSITEMRESTOREDPP - 12] = gUnknown_83FD9B2,
[STRINGID_PKMNSITEMRESTOREDSTATUS - 12] = gUnknown_83FD9CC,
[STRINGID_PKMNSITEMRESTOREDHPALITTLE - 12] = gUnknown_83FD9E9,
[STRINGID_ITEMALLOWSONLYYMOVE - 12] = gUnknown_83FDA0B,
[STRINGID_PKMNHUNGONWITHX - 12] = gUnknown_83FDA33,
[STRINGID_EMPTYSTRING3 - 12] = gUnknown_83FDA4C,
[STRINGID_PKMNSXPREVENTSBURNS - 12] = gUnknown_83FC8D5,
[STRINGID_PKMNSXBLOCKSY - 12] = gUnknown_83FC8ED,
[STRINGID_PKMNSXRESTOREDHPALITTLE2 - 12] = gUnknown_83FC913,
[STRINGID_PKMNSXWHIPPEDUPSANDSTORM - 12] = gUnknown_83FC935,
[STRINGID_PKMNSXPREVENTSYLOSS - 12] = gUnknown_83FC979,
[STRINGID_PKMNSXINFATUATEDY - 12] = gUnknown_83FC993,
[STRINGID_PKMNSXMADEYINEFFECTIVE - 12] = gUnknown_83FC9AA,
[STRINGID_PKMNSXCUREDYPROBLEM - 12] = gUnknown_83FC9C7,
[STRINGID_ITSUCKEDLIQUIDOOZE - 12] = gUnknown_83FC9E5,
[STRINGID_PKMNTRANSFORMED - 12] = gUnknown_83FCA03,
[STRINGID_ELECTRICITYWEAKENED - 12] = gUnknown_83FC554,
[STRINGID_FIREWEAKENED - 12] = gUnknown_83FC576,
[STRINGID_PKMNHIDUNDERWATER - 12] = gUnknown_83FBAD2,
[STRINGID_PKMNSPRANGUP - 12] = gUnknown_83FBAE5,
[STRINGID_HMMOVESCANTBEFORGOTTEN - 12] = gUnknown_83FCC39,
[STRINGID_XFOUNDONEY - 12] = gUnknown_83FC591,
[STRINGID_PLAYERDEFEATEDTRAINER1 - 12] = sText_PlayerDefeatedLinkTrainerTrainer1,
[STRINGID_SOOTHINGAROMA - 12] = gUnknown_83FC5A2,
[STRINGID_ITEMSCANTBEUSEDNOW - 12] = gUnknown_83FC5CC,
[STRINGID_FORXCOMMAYZ - 12] = gUnknown_83FC5E8,
[STRINGID_USINGXTHEYOFZN - 12] = gUnknown_83FCB75,
[STRINGID_PKMNUSEDXTOGETPUMPED - 12] = gUnknown_83FC5F6,
[STRINGID_PKMNSXMADEYUSELESS - 12] = gUnknown_83FC79D,
[STRINGID_PKMNTRAPPEDBYSANDTOMB - 12] = gUnknown_83FBB2F,
[STRINGID_EMPTYSTRING4 - 12] = gUnknown_83FB282,
[STRINGID_ABOOSTED - 12] = gUnknown_83FB283,
[STRINGID_PKMNSXINTENSIFIEDSUN - 12] = gUnknown_83FC955,
[STRINGID_PKMNMAKESGROUNDMISS - 12] = gUnknown_83FB3AF,
[STRINGID_YOUTHROWABALLNOWRIGHT - 12] = gUnknown_83FDAB1,
[STRINGID_PKMNSXTOOKATTACK - 12] = gUnknown_83FCA13,
[STRINGID_PKMNCHOSEXASDESTINY - 12] = gUnknown_83FC208,
[STRINGID_PKMNLOSTFOCUS - 12] = gUnknown_83FC60C,
[STRINGID_USENEXTPKMN - 12] = gUnknown_83FB359,
[STRINGID_PKMNFLEDUSINGITS - 12] = gUnknown_83FCCA0,
[STRINGID_PKMNFLEDUSING - 12] = gUnknown_83FCCBB,
[STRINGID_PKMNWASDRAGGEDOUT - 12] = gUnknown_83FC631,
[STRINGID_PREVENTEDFROMWORKING - 12] = gUnknown_83FCA49,
[STRINGID_PKMNSITEMNORMALIZEDSTATUS - 12] = gUnknown_83FD97A,
[STRINGID_TRAINER1USEDITEM - 12] = sText_Trainer1UsedItem,
[STRINGID_BOXISFULL - 12] = gUnknown_83FD876,
[STRINGID_PKMNAVOIDEDATTACK - 12] = gUnknown_83FB3D3,
[STRINGID_PKMNSXMADEITINEFFECTIVE - 12] = gUnknown_83FCA71,
[STRINGID_PKMNSXPREVENTSFLINCHING - 12] = gUnknown_83FCA8E,
[STRINGID_PKMNALREADYHASBURN - 12] = gUnknown_83FB67B,
[STRINGID_STATSWONTDECREASE2 - 12] = gUnknown_83FCBC5,
[STRINGID_PKMNSXBLOCKSY2 - 12] = gUnknown_83FC900,
[STRINGID_PKMNSXWOREOFF - 12] = gUnknown_83FBC62,
[STRINGID_PKMNRAISEDDEFALITTLE - 12] = gUnknown_83FB997,
[STRINGID_PKMNRAISEDSPDEFALITTLE - 12] = gUnknown_83FB95E,
[STRINGID_THEWALLSHATTERED - 12] = gUnknown_83FC646,
[STRINGID_PKMNSXPREVENTSYSZ - 12] = gUnknown_83FCAAA,
[STRINGID_PKMNSXCUREDITSYPROBLEM - 12] = gUnknown_83FCAD1,
[STRINGID_ATTACKERCANTESCAPE - 12] = gUnknown_83FB534,
[STRINGID_PKMNOBTAINEDX - 12] = gUnknown_83FC337,
[STRINGID_PKMNOBTAINEDX2 - 12] = gUnknown_83FC347,
[STRINGID_PKMNOBTAINEDXYOBTAINEDZ - 12] = gUnknown_83FC357,
[STRINGID_BUTNOEFFECT - 12] = gUnknown_83FC65A,
[STRINGID_PKMNSXHADNOEFFECTONY - 12] = gUnknown_83FCAEF,
[STRINGID_OAKPLAYERWON - 12] = gUnknown_83FDD64,
[STRINGID_OAKPLAYERLOST - 12] = gUnknown_83FDDEB,
[STRINGID_PLAYERLOSTAGAINSTENEMYTRAINER - 12] = gUnknown_83FB484,
[STRINGID_PLAYERPAIDPRIZEMONEY - 12] = gUnknown_83FB4BE,
[STRINGID_PKMNTRANSFERREDSOMEONESPC - 12] = Text_MonSentToBoxInSomeonesPC,
[STRINGID_PKMNTRANSFERREDBILLSPC - 12] = Text_MonSentToBoxInBillsPC,
[STRINGID_PKMNBOXSOMEONESPCFULL - 12] = Text_MonSentToBoxSomeonesBoxFull,
[STRINGID_PKMNBOXBILLSPCFULL - 12] = Text_MonSentToBoxBillsBoxFull,
[STRINGID_POKEDUDEUSED - 12] = sText_PokedudeUsedItem,
[STRINGID_POKEFLUTECATCHY - 12] = gUnknown_83FDA4D,
[STRINGID_POKEFLUTE - 12] = gUnknown_83FDA7A,
[STRINGID_MONHEARINGFLUTEAWOKE - 12] = gUnknown_83FDA8C,
[STRINGID_TRAINER2CLASS - 12] = gUnknown_83FB21C,
[STRINGID_TRAINER2NAME - 12] = gUnknown_83FB262,
[STRINGID_PLAYERWHITEDOUT - 12] = gUnknown_83FB4F7,
[STRINGID_MONTOOSCAREDTOMOVE - 12] = gUnknown_83FCB0C,
[STRINGID_GHOSTGETOUTGETOUT - 12] = gUnknown_83FCB26,
[STRINGID_SILPHSCOPEUNVEILED - 12] = gUnknown_83FD322,
[STRINGID_GHOSTWASMAROWAK - 12] = gUnknown_83FD34D,
[STRINGID_TRAINER1MON1COMEBACK - 12] = gUnknown_83FB21F,
[STRINGID_TRAINER1WINTEXT - 12] = gUnknown_83FB232,
[STRINGID_TRAINER1MON2COMEBACK - 12] = gUnknown_83FB235,
[STRINGID_TRAINER1MON1AND2COMEBACK - 12] = gUnknown_83FB248
};
const u16 gMissStringIds[] = {
src/battle_setup.c
+6 -7
View File
@@ -417,7 +417,7 @@ static void CB2_EndWildBattle(void)
else
{
SetMainCallback2(CB2_ReturnToField);
gFieldCallback = sub_807E3EC;
gFieldCallback = FieldCB_SafariZoneRanOutOfBalls;
}
}
@@ -794,13 +794,13 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
SetMapVarsToTrainer();
return EventScript_TryDoDoubleTrainerBattle;
case TRAINER_BATTLE_REMATCH_DOUBLE:
sub_811231C();
FinishRecordingQuestLogScene();
TrainerBattleLoadArgs(sDoubleBattleParams, data);
SetMapVarsToTrainer();
gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A);
return EventScript_TryDoDoubleRematchBattle;
case TRAINER_BATTLE_REMATCH:
sub_811231C();
FinishRecordingQuestLogScene();
TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
SetMapVarsToTrainer();
gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A);
@@ -951,8 +951,8 @@ static void CB2_EndRematchBattle(void)
{
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
SetBattledTrainerFlag();
sub_810CDE8();
sub_81138F8();
ClearRematchStateOfLastTalked();
ResetDeferredLinkEvent();
}
}
@@ -994,8 +994,7 @@ void PlayTrainerEncounterMusic(void)
{
u16 music;
if (gQuestLogState != 2
&& gQuestLogState != 3
if (!QL_IS_PLAYBACK_STATE
&& sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC
&& sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC)
{
src/cable_club.c
+4 -4
View File
@@ -173,7 +173,7 @@ static void sub_80809C4(u8 taskId)
gTasks[taskId].data[0]++;
if (gTasks[taskId].data[0] == 10)
{
sub_800A474(2);
Link_PrepareCmd0xCCCC_Rfu0xA100(2);
DestroyTask(taskId);
}
}
@@ -369,7 +369,7 @@ static void Task_LinkupMaster_6(u8 taskId)
sub_800A900(gFieldLinkPlayerCount);
TrainerCard_GenerateCardForLinkPlayer((void*)gBlockSendBuffer);
gTasks[taskId].func = Task_Linkup_6a;
sub_800A474(2);
Link_PrepareCmd0xCCCC_Rfu0xA100(2);
}
}
}
@@ -532,7 +532,7 @@ static void Task_ReestablishLinkInCableClubRoom_0(u8 taskId)
{
OpenLink();
ResetLinkPlayers();
CreateTask(sub_8081A90, 80);
CreateTask(Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout, 80);
}
else if (data[0] > 9)
gTasks[taskId].func = Task_ReestablishLinkInCableClubRoom_1;
@@ -934,7 +934,7 @@ bool32 GetSeeingLinkPlayerCardMsg(u8 who)
return TRUE;
}
void sub_8081A90(u8 taskId)
void Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout(u8 taskId)
{
struct Task * task = &gTasks[taskId];
task->data[0]++;
src/cereader_tool.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "gflib.h"
#include "util.h"
#include "save.h"
#include "malloc.h"
#include "cereader_tool.h"
u8 sub_815D654(void)
src/coins.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "string_util.h"
#include "text.h"
#include "menu.h"
#include "text_window.h"
#include "strings.h"
src/credits.c
+1 -6
View File
@@ -1,19 +1,14 @@
#include "global.h"
#include "malloc.h"
#include "bg.h"
#include "gflib.h"
#include "credits.h"
#include "palette.h"
#include "gpu_regs.h"
#include "task.h"
#include "overworld.h"
#include "event_data.h"
#include "window.h"
#include "new_menu_helpers.h"
#include "decompress.h"
#include "graphics.h"
#include "strings.h"
#include "trainer_pokemon_sprites.h"
#include "sound.h"
#include "constants/species.h"
#include "constants/maps.h"
#include "constants/field_weather.h"
src/dark.c
+1 -2
View File
@@ -1,8 +1,7 @@
#include "global.h"
#include "gflib.h"
#include "battle_anim.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "palette.h"
#include "scanline_effect.h"
#include "trig.h"
#include "util.h"
src/data.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "battle.h"
#include "data.h"
#include "graphics.h"
src/decompress.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "decompress.h"
#include "pokemon.h"
#include "constants/species.h"
src/digit_obj_util.c
+1 -2
View File
@@ -1,8 +1,7 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "decompress.h"
#include "digit_obj_util.h"
#include "main.h"
struct DigitPrinterAlloc
{
src/diploma.c
+3 -12
View File
@@ -1,23 +1,14 @@
#include "global.h"
#include "bg.h"
#include "constants/fanfares.h"
#include "gflib.h"
#include "dynamic_placeholder_text_util.h"
#include "gba/macro.h"
#include "gpu_regs.h"
#include "main.h"
#include "malloc.h"
#include "menu.h"
#include "new_menu_helpers.h"
#include "overworld.h"
#include "palette.h"
#include "pokedex.h"
#include "scanline_effect.h"
#include "sound.h"
#include "sprite.h"
#include "strings.h"
#include "task.h"
#include "text.h"
#include "window.h"
#include "constants/fanfares.h"
struct Diploma
{
@@ -193,7 +184,7 @@ static void Task_DiplomaReturnToOverworld(u8 taskId)
DestroyTask(taskId);
FreeAllWindowBuffers();
FREE_AND_SET_NULL(gDiploma);
SetMainCallback2(sub_80568FC);
SetMainCallback2(CB2_ReturnToFieldFromDiploma);
}
static void DiplomaBgInit(void)
src/dynamic_placeholder_text_util.c
+1 -2
View File
@@ -1,6 +1,5 @@
#include "global.h"
#include "text.h"
#include "string_util.h"
#include "gflib.h"
#include "constants/event_objects.h"
static EWRAM_DATA const u8 *sStringPointers[8] = {0};
src/easy_chat.c
+1 -2
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "data.h"
#include "easy_chat.h"
#include "event_data.h"
@@ -9,7 +9,6 @@
#include "mail.h"
#include "pokedex.h"
#include "random.h"
#include "string_util.h"
#include "strings.h"
#include "constants/easy_chat.h"
#include "constants/flags.h"
src/event_data.c
+2 -2
View File
@@ -179,7 +179,7 @@ u16 *GetVarPointer(u16 idx)
return NULL;
if (idx < SPECIAL_VARS_START)
{
switch (gUnknown_3005E88)
switch (gQuestLogPlaybackState)
{
case 0:
default:
@@ -250,7 +250,7 @@ u8 *GetFlagAddr(u16 idx)
return NULL;
if (idx < SPECIAL_FLAGS_START)
{
switch (gUnknown_3005E88)
switch (gQuestLogPlaybackState)
{
case 0:
default:
src/event_object_lock.c
+14 -13
View File
@@ -4,6 +4,7 @@
#include "event_object_movement.h"
#include "script_movement.h"
#include "event_data.h"
#include "constants/event_objects.h"
bool8 walkrun_is_standing_still(void)
{
@@ -13,18 +14,18 @@ bool8 walkrun_is_standing_still(void)
return TRUE;
}
void sub_8069570(u8 taskId)
void Task_WaitPlayerStopMoving(u8 taskId)
{
if (walkrun_is_standing_still())
{
sub_805C270();
HandleEnforcedLookDirectionOnPlayerStopMoving();
DestroyTask(taskId);
}
}
bool8 sub_8069590(void)
bool8 NativeScript_WaitPlayerStopMoving(void)
{
if (FuncIsActiveTask(sub_8069570))
if (FuncIsActiveTask(Task_WaitPlayerStopMoving))
return FALSE;
else
{
@@ -36,16 +37,16 @@ bool8 sub_8069590(void)
void ScriptFreezeObjectEvents(void)
{
FreezeObjectEvents();
CreateTask(sub_8069570, 80);
CreateTask(Task_WaitPlayerStopMoving, 80);
}
void sub_80695CC(u8 taskId)
void Task_WaitPlayerAndTargetNPCStopMoving(u8 taskId)
{
struct Task * task = &gTasks[taskId];
if (task->data[0] == 0 && walkrun_is_standing_still() == TRUE)
{
sub_805C270();
HandleEnforcedLookDirectionOnPlayerStopMoving();
task->data[0] = 1;
}
@@ -59,9 +60,9 @@ void sub_80695CC(u8 taskId)
DestroyTask(taskId);
}
bool8 sub_8069648(void)
bool8 NativeScript_WaitPlayerAndTargetNPCStopMoving(void)
{
if (FuncIsActiveTask(sub_80695CC))
if (FuncIsActiveTask(Task_WaitPlayerAndTargetNPCStopMoving))
return FALSE;
else
{
@@ -75,7 +76,7 @@ void LockSelectedObjectEvent(void)
u8 taskId;
FreezeObjectEventsExceptOne(gSelectedObjectEvent);
taskId = CreateTask(sub_80695CC, 80);
taskId = CreateTask(Task_WaitPlayerAndTargetNPCStopMoving, 80);
if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive)
{
FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
@@ -83,9 +84,9 @@ void LockSelectedObjectEvent(void)
}
}
void sub_80696C0(void)
void ClearPlayerHeldMovementAndUnfreezeObjectEvents(void)
{
u8 objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
u8 objectEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
@@ -96,7 +97,7 @@ void UnionRoom_UnlockPlayerAndChatPartner(void)
u8 objectEventId;
if (gObjectEvents[gSelectedObjectEvent].active)
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
objectEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
src/event_object_movement.c
+4 -5
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "event_data.h"
#include "event_object_movement.h"
#include "field_camera.h"
@@ -10,7 +10,6 @@
#include "fieldmap.h"
#include "metatile_behavior.h"
#include "overworld.h"
#include "palette.h"
#include "quest_log.h"
#include "random.h"
#include "script.h"
@@ -2805,7 +2804,7 @@ u8 sub_805FC9C(u8 localId, u8 mapNum, u8 mapGroup)
return gObjectEvents[objectEventId].trainerType;
}
u16 sub_805FCD8(u8 localId, u8 mapNum, u8 mapGroup)
u16 GetObjectEventFlagByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
{
return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->trainerType;
}
@@ -5530,7 +5529,7 @@ static void sub_8064544(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
objectEvent->heldMovementFinished = TRUE;
if (objectEvent->graphicsId == 0x61)
sub_806DE28(objectEvent);
HandleBoulderFallThroughHole(objectEvent);
}
}
@@ -5550,7 +5549,7 @@ static void ObjectEventSetSingleMovement(struct ObjectEvent *objectEvent, struct
objectEvent->movementActionId = animId;
sprite->data[2] = 0;
if (gUnknown_3005E88 == 2)
if (gQuestLogPlaybackState == 2)
{
sub_81124EC(objectEvent->localId, objectEvent->mapNum, objectEvent->mapGroup, animId);
}
src/evolution_graphics.c
+1 -2
View File
@@ -1,9 +1,8 @@
#include "global.h"
#include "gflib.h"
#include "trig.h"
#include "random.h"
#include "decompress.h"
#include "palette.h"
#include "sound.h"
#include "task.h"
#include "evolution_scene.h"
#include "evolution_graphics.h"
src/evolution_scene.c
+1 -10
View File
@@ -1,34 +1,25 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "battle.h"
#include "battle_message.h"
#include "bg.h"
#include "data.h"
#include "decompress.h"
#include "help_system.h"
#include "evolution_scene.h"
#include "evolution_graphics.h"
#include "gpu_regs.h"
#include "link.h"
#include "link_rfu.h"
#include "m4a.h"
#include "event_data.h"
#include "trade_scene.h"
#include "main.h"
#include "new_menu_helpers.h"
#include "menu.h"
#include "overworld.h"
#include "palette.h"
#include "pokedex.h"
#include "pokemon.h"
#include "pokemon_summary_screen.h"
#include "scanline_effect.h"
#include "sound.h"
#include "sprite.h"
#include "string_util.h"
#include "strings.h"
#include "task.h"
#include "text.h"
#include "text_window.h"
#include "trig.h"
#include "battle_string_ids.h"
src/fame_checker.c
+1 -10
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "constants/songs.h"
#include "sprite.h"
#include "bg.h"
#include "event_data.h"
#include "event_scripts.h"
#include "graphics.h"
@@ -13,15 +12,7 @@
#include "new_menu_helpers.h"
#include "item_menu.h"
#include "list_menu.h"
#include "gpu_regs.h"
#include "palette.h"
#include "task.h"
#include "malloc.h"
#include "main.h"
#include "sound.h"
#include "text.h"
#include "window.h"
#include "string_util.h"
#include "event_object_movement.h"
#include "menu_indicators.h"
#include "text_window.h"
src/field_control_avatar.c
+16 -17
View File
@@ -107,7 +107,7 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
{
if ((newKeys & START_BUTTON) && !(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING))
input->pressedStartButton = TRUE;
if (gQuestLogState != QL_STATE_2 && gQuestLogState != QL_STATE_3)
if (!QL_IS_PLAYBACK_STATE)
{
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING))
{
@@ -123,7 +123,7 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
}
}
if (gQuestLogState != QL_STATE_2 && gQuestLogState != QL_STATE_3)
if (!QL_IS_PLAYBACK_STATE)
{
if (heldKeys & (DPAD_UP | DPAD_DOWN | DPAD_LEFT | DPAD_RIGHT))
{
@@ -142,7 +142,7 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
input->checkStandardWildEncounter = TRUE;
}
if (gQuestLogState != QL_STATE_2 && gQuestLogState != QL_STATE_3)
if (!QL_IS_PLAYBACK_STATE)
{
if (heldKeys & DPAD_UP)
input->dpadDirection = DIR_NORTH;
@@ -650,7 +650,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
{
if (InUnionRoom() == TRUE)
return FALSE;
if (gQuestLogState == QL_STATE_2)
if (gQuestLogState == QL_STATE_PLAYBACK)
return FALSE;
UpdateHappinessStepCounter();
@@ -836,17 +836,17 @@ static bool8 TryArrowWarp(struct MapPosition *position, u16 metatileBehavior, u8
DoWarp();
return TRUE;
}
else if (sub_806DB84(metatileBehavior, direction) == TRUE)
else if (IsDirectionalStairWarpMetatileBehavior(metatileBehavior, direction) == TRUE)
{
delay = 0;
if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
{
SetPlayerAvatarTransitionFlags(1);
SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
delay = 12;
}
StoreInitialPlayerAvatarState();
SetupWarp(&gMapHeader, warpEventId, position);
sub_807E4A0(metatileBehavior, delay);
DoStairWarp(metatileBehavior, delay);
return TRUE;
}
}
@@ -921,20 +921,20 @@ static bool8 IsWarpMetatileBehavior(u16 metatileBehavior)
return FALSE;
}
bool8 sub_806DB84(u16 metatileBehavior, u8 playerDirection)
bool8 IsDirectionalStairWarpMetatileBehavior(u16 metatileBehavior, u8 playerDirection)
{
switch (playerDirection)
{
case DIR_WEST:
if (MetatileBehavior_IsUnknownWarp6D(metatileBehavior))
if (MetatileBehavior_IsDirectionalUpLeftStairWarp(metatileBehavior))
return TRUE;
if (MetatileBehavior_IsUnknownWarp6F(metatileBehavior))
if (MetatileBehavior_IsDirectionalDownLeftStairWarp(metatileBehavior))
return TRUE;
break;
case DIR_EAST:
if (MetatileBehavior_IsUnknownWarp6C(metatileBehavior))
if (MetatileBehavior_IsDirectionalUpRightStairWarp(metatileBehavior))
return TRUE;
if (MetatileBehavior_IsUnknownWarp6E(metatileBehavior))
if (MetatileBehavior_IsDirectionalDownRightStairWarp(metatileBehavior))
return TRUE;
break;
}
@@ -1063,18 +1063,17 @@ static const u8 *GetCoordEventScriptAtPosition(struct MapHeader *mapHeader, u16
return NULL;
}
void sub_806DE28(struct ObjectEvent * object)
void HandleBoulderFallThroughHole(struct ObjectEvent * object)
{
if (MapGridGetMetatileBehaviorAt(object->currentCoords.x, object->currentCoords.y) == MB_FALL_WARP)
{
PlaySE(SE_RU_HYUU);
// w-why?!
RemoveObjectEventByLocalIdAndMap(object->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
FlagClear(sub_805FCD8(object->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup));
FlagClear(GetObjectEventFlagByLocalIdAndMap(object->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup));
}
}
void sub_806DE70(u16 x, u16 y)
void HandleBoulderActivateVictoryRoadSwitch(u16 x, u16 y)
{
int i;
const struct CoordEvent * events = gMapHeader.events->coordEvents;
@@ -1086,7 +1085,7 @@ void sub_806DE70(u16 x, u16 y)
{
if (events[i].x + 7 == x && events[i].y + 7 == y)
{
QuestLog_OnInteractionWithSpecialNpc();
QuestLog_CutRecording();
ScriptContext1_SetupScript(events[i].script);
ScriptContext2_Enable();
}
src/field_effect.c
+6 -6
View File
@@ -1105,7 +1105,7 @@ void FieldCB_FallWarpExit(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
ScriptContext2_Enable();
FreezeObjectEvents();
CreateTask(Task_FallWarpFieldEffect, 0);
@@ -1409,7 +1409,7 @@ static void FieldCB_EscalatorWarpIn(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
ScriptContext2_Enable();
FreezeObjectEvents();
CreateTask(Task_EscalatorWarpInFieldEffect, 0);
@@ -1819,7 +1819,7 @@ static void FieldCB_LavaridgeGymB1FWarpExit(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
ScriptContext2_Enable();
gFieldCallback = NULL;
CreateTask(Task_LavaridgeGymB1FWarpExit, 0);
@@ -2186,7 +2186,7 @@ static void FieldCallback_EscapeRopeExit(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
ScriptContext2_Enable();
FreezeObjectEvents();
gFieldCallback = NULL;
@@ -2350,7 +2350,7 @@ static void FieldCallback_TeleportIn(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
ScriptContext2_Enable();
FreezeObjectEvents();
gFieldCallback = NULL;
@@ -2984,7 +2984,7 @@ static void (*const sUseVsSeekerEffectFuncs[])(struct Task * task) = {
u32 FldEff_UseVsSeeker(void)
{
if (gQuestLogState == QL_STATE_1)
if (gQuestLogState == QL_STATE_RECORDING)
sub_811278C(8, 89);
CreateTask(Task_FldEffUseVsSeeker, 0xFF);
return 0;
src/field_effect_helpers.c
+1 -2
View File
@@ -1,12 +1,11 @@
#include "global.h"
#include "gflib.h"
#include "event_object_movement.h"
#include "field_camera.h"
#include "field_effect.h"
#include "field_weather.h"
#include "fieldmap.h"
#include "metatile_behavior.h"
#include "sound.h"
#include "sprite.h"
#include "constants/field_effects.h"
#include "constants/songs.h"
src/field_fadetransition.c
+44 -44
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "palette.h"
#include "gflib.h"
#include "field_fadetransition.h"
#include "overworld.h"
#include "fldeff.h"
@@ -14,7 +14,6 @@
#include "quest_log.h"
#include "link.h"
#include "event_object_movement.h"
#include "sound.h"
#include "field_door.h"
#include "field_effect.h"
#include "field_screen_effect.h"
@@ -23,6 +22,7 @@
#include "start_menu.h"
#include "constants/songs.h"
#include "constants/event_object_movement.h"
#include "constants/event_objects.h"
#include "constants/field_weather.h"
static void sub_807DF4C(u8 a0);
@@ -30,10 +30,10 @@ static void sub_807DFBC(u8 taskId);
static void task_map_chg_seq_0807E20C(u8 taskId);
static void task_map_chg_seq_0807E2CC(u8 taskId);
static void Task_TeleportWarpIn(u8 taskId);
static void sub_807E718(u8 taskId);
static void Task_Teleport2Warp(u8 taskId);
static void Task_TeleportWarp(u8 taskId);
static void sub_807E80C(u8 taskId);
static void sub_807E980(u8 taskId);
static void Task_DoorWarp(u8 taskId);
static void Task_StairWarp(u8 taskId);
static void sub_807EB64(u16, s16*, s16*);
static void sub_807EBBC(u8 a0, s16 *a1, s16 *a2);
static void sub_807EAC4(s16, s16, s16*, s16*, s16*);
@@ -262,7 +262,7 @@ static void sub_807DE78(bool8 a0)
sub_807DF4C(a0);
if (MetatileBehavior_IsNonAnimDoor(behavior) == TRUE)
func = task_map_chg_seq_0807E20C;
else if (MetatileBehavior_IsUnknownWarp6C_to_6F(behavior) == TRUE)
else if (MetatileBehavior_IsDirectionalStairWarp(behavior) == TRUE)
{
u8 tmp = gUnknown_2031DE0;
func = task_map_chg_seq_0807E2CC;
@@ -287,7 +287,7 @@ static void sub_807DF4C(bool8 a0)
void FieldCB_DefaultWarpExit(void)
{
Overworld_PlaySpecialMapMusic();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
sub_807DE78(FALSE);
ScriptContext2_Enable();
}
@@ -295,7 +295,7 @@ void FieldCB_DefaultWarpExit(void)
void FieldCB_WarpExitFadeFromBlack(void)
{
Overworld_PlaySpecialMapMusic();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
sub_807DE78(TRUE);
ScriptContext2_Enable();
}
@@ -304,7 +304,7 @@ static void FieldCB_TeleportWarpIn(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
PlaySE(SE_TK_WARPOUT);
CreateTask(Task_TeleportWarpIn, 10);
ScriptContext2_Enable();
@@ -350,7 +350,7 @@ static void sub_807DFBC(u8 taskId)
{
PlayerGetDestCoords(&task->data[12], &task->data[13]);
sub_807DCB0(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
task->data[0] = 8;
}
break;
@@ -365,7 +365,7 @@ static void sub_807DFBC(u8 taskId)
case 9:
if (FieldFadeTransitionBackgroundEffectIsFinished() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(Task_BarnDoorWipe))
{
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
task->data[0] = 4;
}
break;
@@ -374,7 +374,7 @@ static void sub_807DFBC(u8 taskId)
if (FieldFadeTransitionBackgroundEffectIsFinished())
{
sub_807DCB0(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
task->data[0] = 2;
}
break;
@@ -382,7 +382,7 @@ static void sub_807DFBC(u8 taskId)
if (walkrun_is_standing_still())
{
task->data[1] = FieldAnimateDoorClose(*x, *y);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
task->data[0] = 3;
}
break;
@@ -416,7 +416,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
if (FieldFadeTransitionBackgroundEffectIsFinished())
{
sub_807DCB0(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
task->data[0] = 2;
}
break;
@@ -497,22 +497,22 @@ bool8 FieldCB_ReturnToFieldOpenStartMenu(void)
return FALSE;
}
static void task_mpl_807E3C8(u8 taskId)
static void Task_SafariZoneRanOutOfBalls(u8 taskId)
{
if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
ScriptContext2_Disable();
DestroyTask(taskId);
sub_80696C0();
ClearPlayerHeldMovementAndUnfreezeObjectEvents();
}
}
void sub_807E3EC(void)
void FieldCB_SafariZoneRanOutOfBalls(void)
{
ScriptContext2_Enable();
Overworld_PlaySpecialMapMusic();
FadeInFromBlack();
CreateTask(task_mpl_807E3C8, 10);
CreateTask(Task_SafariZoneRanOutOfBalls, 10);
}
static bool32 WaitWarpFadeOutScreen(void)
@@ -536,7 +536,7 @@ void DoWarp(void)
PlayRainStoppingSoundEffect();
PlaySE(SE_KAIDAN);
gFieldCallback = FieldCB_DefaultWarpExit;
CreateTask(sub_807E718, 10);
CreateTask(Task_Teleport2Warp, 10);
}
void DoDiveWarp(void)
@@ -546,28 +546,28 @@ void DoDiveWarp(void)
WarpFadeOutScreen();
PlayRainStoppingSoundEffect();
gFieldCallback = FieldCB_DefaultWarpExit;
CreateTask(sub_807E718, 10);
CreateTask(Task_Teleport2Warp, 10);
}
void sub_807E4A0(u16 metatileBehavior, u16 delay)
void DoStairWarp(u16 metatileBehavior, u16 delay)
{
u8 taskId = CreateTask(sub_807E980, 10);
u8 taskId = CreateTask(Task_StairWarp, 10);
gTasks[taskId].data[1] = metatileBehavior;
gTasks[taskId].data[15] = delay;
sub_807E980(taskId);
Task_StairWarp(taskId);
}
void DoDoorWarp(void)
{
ScriptContext2_Enable();
gFieldCallback = FieldCB_DefaultWarpExit;
CreateTask(sub_807E80C, 10);
CreateTask(Task_DoorWarp, 10);
}
void sub_807E500(void)
void DoTeleport2Warp(void)
{
ScriptContext2_Enable();
CreateTask(sub_807E718, 10);
CreateTask(Task_Teleport2Warp, 10);
gFieldCallback = FieldCB_TeleportWarpIn;
}
@@ -614,11 +614,11 @@ void sub_807E5C4(void)
{
ScriptContext2_Enable();
WarpFadeOutScreen();
CreateTask(sub_807E718, 10);
CreateTask(Task_Teleport2Warp, 10);
gFieldCallback = nullsub_60;
}
static void sub_807E5EC(u8 taskId)
static void Task_CableClubWarp(u8 taskId)
{
struct Task * task = &gTasks[taskId];
switch (task->data[0])
@@ -645,10 +645,10 @@ void DoCableClubWarp(void)
TryFadeOutOldMapMusic();
WarpFadeOutScreen();
PlaySE(SE_KAIDAN);
CreateTask(sub_807E5EC, 10);
CreateTask(Task_CableClubWarp, 10);
}
static void sub_807E678(u8 taskId)
static void Task_ReturnFromLinkRoomWarp(u8 taskId)
{
s16 * data = gTasks[taskId].data;
switch (data[0])
@@ -680,10 +680,10 @@ static void sub_807E678(u8 taskId)
void ReturnFromLinkRoom(void)
{
CreateTask(sub_807E678, 10);
CreateTask(Task_ReturnFromLinkRoomWarp, 10);
}
static void sub_807E718(u8 taskId)
static void Task_Teleport2Warp(u8 taskId)
{
struct Task *task = &gTasks[taskId];
switch (task->data[0])
@@ -736,7 +736,7 @@ static void Task_TeleportWarp(u8 taskId)
}
}
static void sub_807E80C(u8 taskId)
static void Task_DoorWarp(u8 taskId)
{
struct Task *task = &gTasks[taskId];
s16 * xp = &task->data[2];
@@ -753,8 +753,8 @@ static void sub_807E80C(u8 taskId)
case 1:
if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
{
ObjectEventClearHeldMovementIfActive(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_UP);
ObjectEventClearHeldMovementIfActive(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_UP);
task->data[0] = 2;
}
break;
@@ -762,7 +762,7 @@ static void sub_807E80C(u8 taskId)
if (walkrun_is_standing_still())
{
task->data[1] = FieldAnimateDoorClose(*xp, *yp - 1);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
sub_807DCB0(FALSE);
task->data[0] = 3;
}
@@ -778,18 +778,18 @@ static void sub_807E80C(u8 taskId)
WarpFadeOutScreen();
PlayRainStoppingSoundEffect();
task->data[0] = 0;
task->func = sub_807E718;
task->func = Task_Teleport2Warp;
break;
case 5:
TryFadeOutOldMapMusic();
PlayRainStoppingSoundEffect();
task->data[0] = 0;
task->func = sub_807E718;
task->func = Task_Teleport2Warp;
break;
}
}
static void sub_807E980(u8 taskId)
static void Task_StairWarp(u8 taskId)
{
s16 * data = gTasks[taskId].data;
struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -865,22 +865,22 @@ static void sub_807EB64(u16 a0, s16 *a1, s16 *a2)
static void sub_807EBBC(u8 a0, s16 *a1, s16 *a2)
{
if (MetatileBehavior_IsUnknownWarp6C(a0))
if (MetatileBehavior_IsDirectionalUpRightStairWarp(a0))
{
*a1 = 16;
*a2 = -10;
}
else if (MetatileBehavior_IsUnknownWarp6D(a0))
else if (MetatileBehavior_IsDirectionalUpLeftStairWarp(a0))
{
*a1 = -17;
*a2 = -10;
}
else if (MetatileBehavior_IsUnknownWarp6E(a0))
else if (MetatileBehavior_IsDirectionalDownRightStairWarp(a0))
{
*a1 = 17;
*a2 = 3;
}
else if (MetatileBehavior_IsUnknownWarp6F(a0))
else if (MetatileBehavior_IsDirectionalDownLeftStairWarp(a0))
{
*a1 = -17;
*a2 = 3;
@@ -927,7 +927,7 @@ static void sub_807ECBC(s16 *a0, s16 *a1, s16 *a2, s16 *a3, s16 *a4)
struct Sprite *sprite;
PlayerGetDestCoords(&x, &y);
behavior = MapGridGetMetatileBehaviorAt(x, y);
if (MetatileBehavior_IsUnknownWarp6E(behavior) || MetatileBehavior_IsUnknownWarp6C(behavior))
if (MetatileBehavior_IsDirectionalDownRightStairWarp(behavior) || MetatileBehavior_IsDirectionalUpRightStairWarp(behavior))
r1 = 3;
else
r1 = 4;
src/field_message_box.c
+1 -1
View File
@@ -24,7 +24,7 @@ static void Task_RunFieldMessageBoxPrinter(u8 taskId)
switch (task->data[0])
{
case 0:
if (gQuestLogState == QL_STATE_2)
if (gQuestLogState == QL_STATE_PLAYBACK)
{
gTextFlags.autoScroll = TRUE;
TextWindow_LoadTilesStdFrame1(0, 0x200);
src/field_player_avatar.c
+8 -8
View File
@@ -556,7 +556,7 @@ static u8 CheckForPlayerAvatarCollision(u8 direction)
x = playerObjEvent->currentCoords.x;
y = playerObjEvent->currentCoords.y;
if (sub_806DB84(MapGridGetMetatileBehaviorAt(x, y), direction))
if (IsDirectionalStairWarpMetatileBehavior(MapGridGetMetatileBehaviorAt(x, y), direction))
return 8;
MoveCoords(direction, &x, &y);
return CheckForObjectEventCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y));
@@ -673,7 +673,7 @@ static void CheckAcroBikeCollision(s16 x, s16 y, u8 metatileBehavior, u8 *collis
}
}
void SetPlayerAvatarTransitionFlags(bool16 flags)
void SetPlayerAvatarTransitionFlags(u16 flags)
{
gPlayerAvatar.transitionFlags |= flags;
DoPlayerAvatarTransition();
@@ -910,7 +910,7 @@ void sub_805C260(void)
PlayerSetAnimId(MOVEMENT_ACTION_0x9F, 0);
}
void sub_805C270(void)
void HandleEnforcedLookDirectionOnPlayerStopMoving(void)
{
if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING)
{
@@ -1006,12 +1006,12 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 direction)
{
if (direction == DIR_WEST)
{
if (MetatileBehavior_IsUnknownWarp6D(metatileBehavior) || MetatileBehavior_IsUnknownWarp6F(metatileBehavior))
if (MetatileBehavior_IsDirectionalUpLeftStairWarp(metatileBehavior) || MetatileBehavior_IsDirectionalDownLeftStairWarp(metatileBehavior))
return;
}
if (direction == DIR_EAST)
{
if (MetatileBehavior_IsUnknownWarp6C(metatileBehavior) || MetatileBehavior_IsUnknownWarp6E(metatileBehavior))
if (MetatileBehavior_IsDirectionalUpRightStairWarp(metatileBehavior) || MetatileBehavior_IsDirectionalDownRightStairWarp(metatileBehavior))
return;
}
if (direction == DIR_NORTH)
@@ -1445,8 +1445,8 @@ static bool8 sub_805CE20(struct Task *task, struct ObjectEvent *playerObject, st
{
ObjectEventClearHeldMovementIfFinished(playerObject);
ObjectEventClearHeldMovementIfFinished(strengthObject);
sub_806DE28(strengthObject);
sub_806DE70(strengthObject->currentCoords.x, strengthObject->currentCoords.y);
HandleBoulderFallThroughHole(strengthObject);
HandleBoulderActivateVictoryRoadSwitch(strengthObject->currentCoords.x, strengthObject->currentCoords.y);
gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable();
DestroyTask(FindTaskIdByFunc(Task_BumpBoulder));
@@ -1598,7 +1598,7 @@ void CreateStopSurfingTask_NoMusicChange(u8 direction)
void SeafoamIslandsB4F_CurrentDumpsPlayerOnLand(void)
{
if (gUnknown_3005E88 != 1 && gUnknown_3005E88 != 3)
if (gQuestLogPlaybackState != 1 && gQuestLogPlaybackState != 3)
{
sub_811278C(gUnknown_835B820[DIR_NORTH], 16);
CreateStopSurfingTask(DIR_NORTH);
src/field_poison.c
+1 -1
View File
@@ -1,9 +1,9 @@
#include "global.h"
#include "gflib.h"
#include "strings.h"
#include "task.h"
#include "field_message_box.h"
#include "script.h"
#include "string_util.h"
#include "event_data.h"
#include "fldeff.h"
#include "party_menu.h"
src/field_screen_effect.c
+1 -3
View File
@@ -1,13 +1,11 @@
#include "global.h"
#include "gflib.h"
#include "field_screen_effect.h"
#include "gpu_regs.h"
#include "overworld.h"
#include "scanline_effect.h"
#include "script.h"
#include "task.h"
#include "window.h"
#include "strings.h"
#include "string_util.h"
#include "menu.h"
#include "heal_location.h"
#include "new_menu_helpers.h"
src/field_specials.c
+77 -82
View File
@@ -1,6 +1,5 @@
#include "global.h"
#include "malloc.h"
#include "palette.h"
#include "gflib.h"
#include "quest_log.h"
#include "list_menu.h"
#include "diploma.h"
@@ -9,7 +8,6 @@
#include "overworld.h"
#include "field_message_box.h"
#include "event_data.h"
#include "string_util.h"
#include "strings.h"
#include "battle.h"
#include "fieldmap.h"
@@ -24,13 +22,10 @@
#include "random.h"
#include "mail_data.h"
#include "help_system.h"
#include "sound.h"
#include "text.h"
#include "pokemon_storage_system.h"
#include "script_menu.h"
#include "data.h"
#include "pokedex.h"
#include "window.h"
#include "text_window.h"
#include "menu.h"
#include "mevent.h"
@@ -95,15 +90,15 @@ static u8 *const sStringVarPtrs[] = {
void ShowDiploma(void)
{
QuestLog_OnInteractionWithSpecialNpc();
QuestLog_CutRecording();
SetMainCallback2(CB2_ShowDiploma);
ScriptContext2_Enable();
}
void ForcePlayerOntoBike(void)
{
if (gPlayerAvatar.flags & 1)
SetPlayerAvatarTransitionFlags(2);
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ON_FOOT)
SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_MACH_BIKE);
Overworld_SetSavedMusic(MUS_CYCLING);
Overworld_ChangeMusicTo(MUS_CYCLING);
}
@@ -187,7 +182,7 @@ u8 GetLeadMonFriendship(void)
void ShowTownMap(void)
{
QuestLog_OnInteractionWithSpecialNpc();
QuestLog_CutRecording();
InitRegionMapWithExitCB(REGIONMAP_TYPE_WALL, CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
@@ -1519,7 +1514,7 @@ static void Task_ListMenuRemoveScrollIndicatorArrowPair(u8 taskId)
void ForcePlayerToStartSurfing(void)
{
SetHelpContext(HELPCONTEXT_SURFING);
SetPlayerAvatarTransitionFlags(8);
SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_SURFING);
}
static const u16 sStarterSpecies[] = {
@@ -1775,18 +1770,18 @@ bool8 DoesPlayerPartyContainSpecies(void)
}
static const u8 sMartMaps[][3] = {
{MAP_GROUP(VIRIDIAN_CITY_MART), MAP_NUM(VIRIDIAN_CITY_MART), 1},
{MAP_GROUP(PEWTER_CITY_MART), MAP_NUM(PEWTER_CITY_MART), 3},
{MAP_GROUP(CERULEAN_CITY_MART), MAP_NUM(CERULEAN_CITY_MART), 1},
{MAP_GROUP(LAVENDER_TOWN_MART), MAP_NUM(LAVENDER_TOWN_MART), 1},
{MAP_GROUP(VERMILION_CITY_MART), MAP_NUM(VERMILION_CITY_MART), 1},
{MAP_GROUP(FUCHSIA_CITY_MART), MAP_NUM(FUCHSIA_CITY_MART), 1},
{MAP_GROUP(CINNABAR_ISLAND_MART), MAP_NUM(CINNABAR_ISLAND_MART), 1},
{MAP_GROUP(SAFFRON_CITY_MART), MAP_NUM(SAFFRON_CITY_MART), 1},
{MAP_GROUP(THREE_ISLAND_MART), MAP_NUM(THREE_ISLAND_MART), 1},
{MAP_GROUP(FOUR_ISLAND_MART), MAP_NUM(FOUR_ISLAND_MART), 1},
{MAP_GROUP(SEVEN_ISLAND_MART), MAP_NUM(SEVEN_ISLAND_MART), 1},
{MAP_GROUP(SIX_ISLAND_MART), MAP_NUM(SIX_ISLAND_MART), 1}
{MAP(VIRIDIAN_CITY_MART), 1},
{MAP(PEWTER_CITY_MART), 3},
{MAP(CERULEAN_CITY_MART), 1},
{MAP(LAVENDER_TOWN_MART), 1},
{MAP(VERMILION_CITY_MART), 1},
{MAP(FUCHSIA_CITY_MART), 1},
{MAP(CINNABAR_ISLAND_MART), 1},
{MAP(SAFFRON_CITY_MART), 1},
{MAP(THREE_ISLAND_MART), 1},
{MAP(FOUR_ISLAND_MART), 1},
{MAP(SEVEN_ISLAND_MART), 1},
{MAP(SIX_ISLAND_MART), 1}
};
u8 GetMartClerkObjectId(void)
@@ -1811,57 +1806,57 @@ static const struct {
u16 grp2;
u16 num2;
} sInsideOutsidePairs[51] = {
{MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_1F), MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_1F), MAP_GROUP(PALLET_TOWN), MAP_NUM(PALLET_TOWN)},
{MAP_GROUP(PALLET_TOWN_PROFESSOR_OAKS_LAB), MAP_NUM(PALLET_TOWN_PROFESSOR_OAKS_LAB), MAP_GROUP(PALLET_TOWN), MAP_NUM(PALLET_TOWN)},
{MAP_GROUP(VIRIDIAN_CITY_GYM), MAP_NUM(VIRIDIAN_CITY_GYM), MAP_GROUP(VIRIDIAN_CITY), MAP_NUM(VIRIDIAN_CITY)},
{MAP_GROUP(ROUTE22_NORTH_ENTRANCE), MAP_NUM(ROUTE22_NORTH_ENTRANCE), MAP_GROUP(ROUTE22), MAP_NUM(ROUTE22)},
{MAP_GROUP(ROUTE22_NORTH_ENTRANCE), MAP_NUM(ROUTE22_NORTH_ENTRANCE), MAP_GROUP(ROUTE23), MAP_NUM(ROUTE23)},
{MAP_GROUP(VIRIDIAN_FOREST), MAP_NUM(VIRIDIAN_FOREST), MAP_GROUP(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE), MAP_NUM(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE)},
{MAP_GROUP(VIRIDIAN_FOREST), MAP_NUM(VIRIDIAN_FOREST), MAP_GROUP(ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE), MAP_NUM(ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE)},
{MAP_GROUP(PEWTER_CITY_MUSEUM_1F), MAP_NUM(PEWTER_CITY_MUSEUM_1F), MAP_GROUP(PEWTER_CITY), MAP_NUM(PEWTER_CITY)},
{MAP_GROUP(PEWTER_CITY_GYM), MAP_NUM(PEWTER_CITY_GYM), MAP_GROUP(PEWTER_CITY), MAP_NUM(PEWTER_CITY)},
{MAP_GROUP(MT_MOON_1F), MAP_NUM(MT_MOON_1F), MAP_GROUP(ROUTE4), MAP_NUM(ROUTE4)},
{MAP_GROUP(MT_MOON_B1F), MAP_NUM(MT_MOON_B1F), MAP_GROUP(ROUTE4), MAP_NUM(ROUTE4)},
{MAP_GROUP(CERULEAN_CITY_GYM), MAP_NUM(CERULEAN_CITY_GYM), MAP_GROUP(CERULEAN_CITY), MAP_NUM(CERULEAN_CITY)},
{MAP_GROUP(CERULEAN_CITY_BIKE_SHOP), MAP_NUM(CERULEAN_CITY_BIKE_SHOP), MAP_GROUP(CERULEAN_CITY), MAP_NUM(CERULEAN_CITY)},
{MAP_GROUP(ROUTE25_SEA_COTTAGE), MAP_NUM(ROUTE25_SEA_COTTAGE), MAP_GROUP(ROUTE25), MAP_NUM(ROUTE25)},
{MAP_GROUP(ROUTE5_POKEMON_DAY_CARE), MAP_NUM(ROUTE5_POKEMON_DAY_CARE), MAP_GROUP(ROUTE5), MAP_NUM(ROUTE5)},
{MAP_GROUP(UNDERGROUND_PATH_NORTH_ENTRANCE), MAP_NUM(UNDERGROUND_PATH_NORTH_ENTRANCE), MAP_GROUP(ROUTE5), MAP_NUM(ROUTE5)},
{MAP_GROUP(UNDERGROUND_PATH_SOUTH_ENTRANCE), MAP_NUM(UNDERGROUND_PATH_SOUTH_ENTRANCE), MAP_GROUP(ROUTE6), MAP_NUM(ROUTE6)},
{MAP_GROUP(VERMILION_CITY_POKEMON_FAN_CLUB), MAP_NUM(VERMILION_CITY_POKEMON_FAN_CLUB), MAP_GROUP(VERMILION_CITY), MAP_NUM(VERMILION_CITY)},
{MAP_GROUP(VERMILION_CITY_GYM), MAP_NUM(VERMILION_CITY_GYM), MAP_GROUP(VERMILION_CITY), MAP_NUM(VERMILION_CITY)},
{MAP_GROUP(SSANNE_1F_CORRIDOR), MAP_NUM(SSANNE_1F_CORRIDOR), MAP_GROUP(VERMILION_CITY), MAP_NUM(VERMILION_CITY)},
{MAP_GROUP(DIGLETTS_CAVE_NORTH_ENTRANCE), MAP_NUM(DIGLETTS_CAVE_NORTH_ENTRANCE), MAP_GROUP(ROUTE2), MAP_NUM(ROUTE2)},
{MAP_GROUP(DIGLETTS_CAVE_SOUTH_ENTRANCE), MAP_NUM(DIGLETTS_CAVE_SOUTH_ENTRANCE), MAP_GROUP(ROUTE11), MAP_NUM(ROUTE11)},
{MAP_GROUP(ROCK_TUNNEL_1F), MAP_NUM(ROCK_TUNNEL_1F), MAP_GROUP(ROUTE10), MAP_NUM(ROUTE10)},
{MAP_GROUP(ROCK_TUNNEL_1F), MAP_NUM(ROCK_TUNNEL_1F), MAP_GROUP(ROUTE10), MAP_NUM(ROUTE10)},
{MAP_GROUP(POWER_PLANT), MAP_NUM(POWER_PLANT), MAP_GROUP(ROUTE10), MAP_NUM(ROUTE10)},
{MAP_GROUP(POKEMON_TOWER_1F), MAP_NUM(POKEMON_TOWER_1F), MAP_GROUP(LAVENDER_TOWN), MAP_NUM(LAVENDER_TOWN)},
{MAP_GROUP(LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE), MAP_NUM(LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE), MAP_GROUP(LAVENDER_TOWN), MAP_NUM(LAVENDER_TOWN)},
{MAP_GROUP(LAVENDER_TOWN_HOUSE2), MAP_NUM(LAVENDER_TOWN_HOUSE2), MAP_GROUP(LAVENDER_TOWN), MAP_NUM(LAVENDER_TOWN)},
{MAP_GROUP(UNDERGROUND_PATH_EAST_ENTRANCE), MAP_NUM(UNDERGROUND_PATH_EAST_ENTRANCE), MAP_GROUP(ROUTE8), MAP_NUM(ROUTE8)},
{MAP_GROUP(UNDERGROUND_PATH_WEST_ENTRANCE), MAP_NUM(UNDERGROUND_PATH_WEST_ENTRANCE), MAP_GROUP(ROUTE7), MAP_NUM(ROUTE7)},
{MAP_GROUP(CELADON_CITY_DEPARTMENT_STORE_1F), MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_1F), MAP_GROUP(CELADON_CITY), MAP_NUM(CELADON_CITY)},
{MAP_GROUP(CELADON_CITY_CONDOMINIUMS_1F), MAP_NUM(CELADON_CITY_CONDOMINIUMS_1F), MAP_GROUP(CELADON_CITY), MAP_NUM(CELADON_CITY)},
{MAP_GROUP(CELADON_CITY_GAME_CORNER), MAP_NUM(CELADON_CITY_GAME_CORNER), MAP_GROUP(CELADON_CITY), MAP_NUM(CELADON_CITY)},
{MAP_GROUP(CELADON_CITY_GYM), MAP_NUM(CELADON_CITY_GYM), MAP_GROUP(CELADON_CITY), MAP_NUM(CELADON_CITY)},
{MAP_GROUP(CELADON_CITY_RESTAURANT), MAP_NUM(CELADON_CITY_RESTAURANT), MAP_GROUP(CELADON_CITY), MAP_NUM(CELADON_CITY)},
{MAP_GROUP(ROCKET_HIDEOUT_B1F), MAP_NUM(ROCKET_HIDEOUT_B1F), MAP_GROUP(CELADON_CITY_GAME_CORNER), MAP_NUM(CELADON_CITY_GAME_CORNER)},
{MAP_GROUP(SAFARI_ZONE_CENTER), MAP_NUM(SAFARI_ZONE_CENTER), MAP_GROUP(FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE), MAP_NUM(FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE)},
{MAP_GROUP(FUCHSIA_CITY_GYM), MAP_NUM(FUCHSIA_CITY_GYM), MAP_GROUP(FUCHSIA_CITY), MAP_NUM(FUCHSIA_CITY)},
{MAP_GROUP(FUCHSIA_CITY_WARDENS_HOUSE), MAP_NUM(FUCHSIA_CITY_WARDENS_HOUSE), MAP_GROUP(FUCHSIA_CITY), MAP_NUM(FUCHSIA_CITY)},
{MAP_GROUP(SAFFRON_CITY_DOJO), MAP_NUM(SAFFRON_CITY_DOJO), MAP_GROUP(SAFFRON_CITY), MAP_NUM(SAFFRON_CITY)},
{MAP_GROUP(SAFFRON_CITY_GYM), MAP_NUM(SAFFRON_CITY_GYM), MAP_GROUP(SAFFRON_CITY), MAP_NUM(SAFFRON_CITY)},
{MAP_GROUP(SILPH_CO_1F), MAP_NUM(SILPH_CO_1F), MAP_GROUP(SAFFRON_CITY), MAP_NUM(SAFFRON_CITY)},
{MAP_GROUP(SEAFOAM_ISLANDS_1F), MAP_NUM(SEAFOAM_ISLANDS_1F), MAP_GROUP(ROUTE20), MAP_NUM(ROUTE20)},
{MAP_GROUP(SEAFOAM_ISLANDS_1F), MAP_NUM(SEAFOAM_ISLANDS_1F), MAP_GROUP(ROUTE20), MAP_NUM(ROUTE20)},
{MAP_GROUP(POKEMON_MANSION_1F), MAP_NUM(POKEMON_MANSION_1F), MAP_GROUP(CINNABAR_ISLAND), MAP_NUM(CINNABAR_ISLAND)},
{MAP_GROUP(CINNABAR_ISLAND_GYM), MAP_NUM(CINNABAR_ISLAND_GYM), MAP_GROUP(CINNABAR_ISLAND), MAP_NUM(CINNABAR_ISLAND)},
{MAP_GROUP(CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE), MAP_NUM(CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE), MAP_GROUP(CINNABAR_ISLAND), MAP_NUM(CINNABAR_ISLAND)},
{MAP_GROUP(VICTORY_ROAD_1F), MAP_NUM(VICTORY_ROAD_1F), MAP_GROUP(ROUTE23), MAP_NUM(ROUTE23)},
{MAP_GROUP(VICTORY_ROAD_2F), MAP_NUM(VICTORY_ROAD_2F), MAP_GROUP(ROUTE23), MAP_NUM(ROUTE23)},
{MAP_GROUP(INDIGO_PLATEAU_POKEMON_CENTER_1F), MAP_NUM(INDIGO_PLATEAU_POKEMON_CENTER_1F), MAP_GROUP(INDIGO_PLATEAU_EXTERIOR), MAP_NUM(INDIGO_PLATEAU_EXTERIOR)},
{MAP_GROUP(CERULEAN_CAVE_1F), MAP_NUM(CERULEAN_CAVE_1F), MAP_GROUP(CERULEAN_CITY), MAP_NUM(CERULEAN_CITY)}
[QL_LOCATION_HOME] = {MAP(PALLET_TOWN_PLAYERS_HOUSE_1F), MAP(PALLET_TOWN)},
[QL_LOCATION_OAKS_LAB] = {MAP(PALLET_TOWN_PROFESSOR_OAKS_LAB), MAP(PALLET_TOWN)},
[QL_LOCATION_VIRIDIAN_GYM] = {MAP(VIRIDIAN_CITY_GYM), MAP(VIRIDIAN_CITY)},
[QL_LOCATION_LEAGUE_GATE_1] = {MAP(ROUTE22_NORTH_ENTRANCE), MAP(ROUTE22)},
[QL_LOCATION_LEAGUE_GATE_2] = {MAP(ROUTE22_NORTH_ENTRANCE), MAP(ROUTE23)},
[QL_LOCATION_VIRIDIAN_FOREST_1] = {MAP(VIRIDIAN_FOREST), MAP(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE)},
[QL_LOCATION_VIRIDIAN_FOREST_2] = {MAP(VIRIDIAN_FOREST), MAP(ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE)},
[QL_LOCATION_PEWTER_MUSEUM] = {MAP(PEWTER_CITY_MUSEUM_1F), MAP(PEWTER_CITY)},
[QL_LOCATION_PEWTER_GYM] = {MAP(PEWTER_CITY_GYM), MAP(PEWTER_CITY)},
[QL_LOCATION_MT_MOON_1] = {MAP(MT_MOON_1F), MAP(ROUTE4)},
[QL_LOCATION_MT_MOON_2] = {MAP(MT_MOON_B1F), MAP(ROUTE4)},
[QL_LOCATION_CERULEAN_GYM] = {MAP(CERULEAN_CITY_GYM), MAP(CERULEAN_CITY)},
[QL_LOCATION_BIKE_SHOP] = {MAP(CERULEAN_CITY_BIKE_SHOP), MAP(CERULEAN_CITY)},
[QL_LOCATION_BILLS_HOUSE] = {MAP(ROUTE25_SEA_COTTAGE), MAP(ROUTE25)},
[QL_LOCATION_DAY_CARE] = {MAP(ROUTE5_POKEMON_DAY_CARE), MAP(ROUTE5)},
[QL_LOCATION_UNDERGROUND_PATH_1] = {MAP(UNDERGROUND_PATH_NORTH_ENTRANCE), MAP(ROUTE5)},
[QL_LOCATION_UNDERGROUND_PATH_2] = {MAP(UNDERGROUND_PATH_SOUTH_ENTRANCE), MAP(ROUTE6)},
[QL_LOCATION_PKMN_FAN_CLUB] = {MAP(VERMILION_CITY_POKEMON_FAN_CLUB), MAP(VERMILION_CITY)},
[QL_LOCATION_VERMILION_GYM] = {MAP(VERMILION_CITY_GYM), MAP(VERMILION_CITY)},
[QL_LOCATION_SS_ANNE] = {MAP(SSANNE_1F_CORRIDOR), MAP(VERMILION_CITY)},
[QL_LOCATION_DIGLETTS_CAVE_1] = {MAP(DIGLETTS_CAVE_NORTH_ENTRANCE), MAP(ROUTE2)},
[QL_LOCATION_DIGLETTS_CAVE_2] = {MAP(DIGLETTS_CAVE_SOUTH_ENTRANCE), MAP(ROUTE11)},
[QL_LOCATION_ROCK_TUNNEL_1] = {MAP(ROCK_TUNNEL_1F), MAP(ROUTE10)},
[QL_LOCATION_ROCK_TUNNEL_2] = {MAP(ROCK_TUNNEL_1F), MAP(ROUTE10)},
[QL_LOCATION_POWER_PLANT] = {MAP(POWER_PLANT), MAP(ROUTE10)},
[QL_LOCATION_PKMN_TOWER] = {MAP(POKEMON_TOWER_1F), MAP(LAVENDER_TOWN)},
[QL_LOCATION_VOLUNTEER_HOUSE] = {MAP(LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE), MAP(LAVENDER_TOWN)},
[QL_LOCATION_NAME_RATERS_HOUSE] = {MAP(LAVENDER_TOWN_HOUSE2), MAP(LAVENDER_TOWN)},
[QL_LOCATION_UNDERGROUND_PATH_3] = {MAP(UNDERGROUND_PATH_EAST_ENTRANCE), MAP(ROUTE8)},
[QL_LOCATION_UNDERGROUND_PATH_4] = {MAP(UNDERGROUND_PATH_WEST_ENTRANCE), MAP(ROUTE7)},
[QL_LOCATION_CELADON_DEPT_STORE] = {MAP(CELADON_CITY_DEPARTMENT_STORE_1F), MAP(CELADON_CITY)},
[QL_LOCATION_CELADON_MANSION] = {MAP(CELADON_CITY_CONDOMINIUMS_1F), MAP(CELADON_CITY)},
[QL_LOCATION_GAME_CORNER] = {MAP(CELADON_CITY_GAME_CORNER), MAP(CELADON_CITY)},
[QL_LOCATION_CELADON_GYM] = {MAP(CELADON_CITY_GYM), MAP(CELADON_CITY)},
[QL_LOCATION_CELADON_RESTAURANT] = {MAP(CELADON_CITY_RESTAURANT), MAP(CELADON_CITY)},
[QL_LOCATION_ROCKET_HIDEOUT] = {MAP(ROCKET_HIDEOUT_B1F), MAP(CELADON_CITY_GAME_CORNER)},
[QL_LOCATION_SAFARI_ZONE] = {MAP(SAFARI_ZONE_CENTER), MAP(FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE)},
[QL_LOCATION_FUCHSIA_GYM] = {MAP(FUCHSIA_CITY_GYM), MAP(FUCHSIA_CITY)},
[QL_LOCATION_WARDENS_HOME] = {MAP(FUCHSIA_CITY_WARDENS_HOUSE), MAP(FUCHSIA_CITY)},
[QL_LOCATION_FIGHTING_DOJO] = {MAP(SAFFRON_CITY_DOJO), MAP(SAFFRON_CITY)},
[QL_LOCATION_SAFFRON_GYM] = {MAP(SAFFRON_CITY_GYM), MAP(SAFFRON_CITY)},
[QL_LOCATION_SILPH_CO] = {MAP(SILPH_CO_1F), MAP(SAFFRON_CITY)},
[QL_LOCATION_SEAFOAM_ISLANDS_1] = {MAP(SEAFOAM_ISLANDS_1F), MAP(ROUTE20)},
[QL_LOCATION_SEAFOAM_ISLANDS_2] = {MAP(SEAFOAM_ISLANDS_1F), MAP(ROUTE20)},
[QL_LOCATION_PKMN_MANSION] = {MAP(POKEMON_MANSION_1F), MAP(CINNABAR_ISLAND)},
[QL_LOCATION_CINNABAR_GYM] = {MAP(CINNABAR_ISLAND_GYM), MAP(CINNABAR_ISLAND)},
[QL_LOCATION_CINNABAR_LAB] = {MAP(CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE), MAP(CINNABAR_ISLAND)},
[QL_LOCATION_VICTORY_ROAD_1] = {MAP(VICTORY_ROAD_1F), MAP(ROUTE23)},
[QL_LOCATION_VICTORY_ROAD_2] = {MAP(VICTORY_ROAD_2F), MAP(ROUTE23)},
[QL_LOCATION_PKMN_LEAGUE] = {MAP(INDIGO_PLATEAU_POKEMON_CENTER_1F), MAP(INDIGO_PLATEAU_EXTERIOR)},
[QL_LOCATION_CERULEAN_CAVE] = {MAP(CERULEAN_CAVE_1F), MAP(CERULEAN_CITY)}
};
void sub_80CC534(void)
@@ -1871,7 +1866,7 @@ void sub_80CC534(void)
{
if (gSaveBlock1Ptr->location.mapGroup == sInsideOutsidePairs[i].grp && gSaveBlock1Ptr->location.mapNum == sInsideOutsidePairs[i].num)
{
if (VarGet(VAR_0x404D) != 35 || i != 32)
if (VarGet(VAR_0x404D) != QL_LOCATION_ROCKET_HIDEOUT || i != QL_LOCATION_GAME_CORNER)
{
VarSet(VAR_0x404D, i);
FlagSet(FLAG_0x808);
@@ -1893,7 +1888,7 @@ void sub_80CC59C(void)
sp0.unk1 = 0;
if (FlagGet(FLAG_0x808))
{
if (r5 == 5)
if (r5 == QL_LOCATION_VIRIDIAN_FOREST_1)
{
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE) && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE)))
{
@@ -1907,7 +1902,7 @@ void sub_80CC59C(void)
return;
}
}
else if (r5 == 3)
else if (r5 == QL_LOCATION_LEAGUE_GATE_1)
{
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE22) && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE22) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE23)))
{
@@ -1925,13 +1920,13 @@ void sub_80CC59C(void)
{
sp0.unk0 = Overworld_GetMapHeaderByGroupAndId(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId;
sp0.unk1 = r5;
if (r5 == 22)
if (r5 == QL_LOCATION_ROCK_TUNNEL_1)
{
PlayerGetDestCoords(&x, &y);
if (x != 15 || y != 26)
sp0.unk1++;
}
else if (r5 == 42)
else if (r5 == QL_LOCATION_SEAFOAM_ISLANDS_1)
{
PlayerGetDestCoords(&x, &y);
if (x != 67 || y != 15)
@@ -1939,9 +1934,9 @@ void sub_80CC59C(void)
}
SetQuestLogEvent(QL_EVENT_DEPARTED, (void *)&sp0);
FlagClear(FLAG_0x808);
if (r5 == 35)
if (r5 == QL_LOCATION_ROCKET_HIDEOUT)
{
VarSet(VAR_0x404D, 32);
VarSet(VAR_0x404D, QL_LOCATION_GAME_CORNER);
FlagSet(FLAG_0x808);
}
}
@@ -2481,7 +2476,7 @@ void BrailleCursorToggle(void)
// 8005 = y
// 8006 = action (0 = create, 1 = delete)
u16 x;
if (gQuestLogState != 2)
if (gQuestLogState != QL_STATE_PLAYBACK)
{
x = gSpecialVar_0x8004 + 27;
if (gSpecialVar_0x8006 == 0)
src/field_tasks.c
+2 -2
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "gflib.h"
#include "bike.h"
#include "event_data.h"
#include "field_camera.h"
@@ -9,7 +10,6 @@
#include "overworld.h"
#include "quest_log.h"
#include "script.h"
#include "sound.h"
#include "task.h"
#include "constants/field_tasks.h"
#include "constants/flags.h"
@@ -61,7 +61,7 @@ static void Task_RunTimeBasedEvents(u8 taskId)
if (!ScriptContext2_IsEnabled())
{
if (gQuestLogState != 2 && gQuestLogState != 3)
if (!QL_IS_PLAYBACK_STATE)
{
UpdateAmbientCry(&data[1], &data[2]);
}
src/field_weather_effects.c
-1
View File
@@ -4,7 +4,6 @@
#include "event_object_movement.h"
#include "field_weather.h"
#include "field_weather_effects.h"
#include "overworld.h"
#include "random.h"
#include "script.h"
#include "constants/weather.h"
src/fieldmap.c
+1 -2
View File
@@ -1,6 +1,5 @@
#include "global.h"
#include "bg.h"
#include "palette.h"
#include "gflib.h"
#include "overworld.h"
#include "script.h"
#include "new_menu_helpers.h"
src/fighting.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "battle_anim.h"
#include "gpu_regs.h"
#include "random.h"
#include "task.h"
#include "trig.h"
src/fldeff_cut.c
+1 -1
View File
@@ -287,7 +287,7 @@ static void SpriteCallback_CutGrass_Cleanup(struct Sprite * sprite)
}
FieldEffectStop(&gSprites[sCutGrassSpriteArrayPtr[0]], FLDEFF_CUT_GRASS);
Free(sCutGrassSpriteArrayPtr);
sub_80696C0();
ClearPlayerHeldMovementAndUnfreezeObjectEvents();
ScriptContext2_Disable();
}
src/fldeff_poison.c
+1 -2
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "task.h"
#include "bg.h"
#include "sound.h"
#include "constants/songs.h"
static void Task_FieldPoisonEffect(u8 taskId)
src/fldeff_rocksmash.c
+1 -2
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "global.fieldmap.h"
#include "gflib.h"
#include "field_player_avatar.h"
#include "field_effect.h"
#include "party_menu.h"
@@ -7,7 +7,6 @@
#include "script.h"
#include "fldeff.h"
#include "event_scripts.h"
#include "sound.h"
#include "overworld.h"
#include "event_object_movement.h"
#include "constants/songs.h"
src/fldeff_softboiled.c
+1 -2
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "party_menu.h"
#include "sound.h"
#include "string_util.h"
#include "menu.h"
#include "new_menu_helpers.h"
#include "constants/songs.h"
src/fldeff_sweetscent.c
+1 -3
View File
@@ -1,14 +1,12 @@
#include "global.h"
#include "gflib.h"
#include "field_player_avatar.h"
#include "field_effect.h"
#include "party_menu.h"
#include "malloc.h"
#include "script.h"
#include "fldeff.h"
#include "event_scripts.h"
#include "field_weather.h"
#include "sound.h"
#include "palette.h"
#include "wild_encounter.h"
#include "constants/songs.h"
src/flying.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "battle_anim.h"
#include "palette.h"
#include "gflib.h"
#include "trig.h"
#include "constants/battle_anim.h"
#include "random.h"
src/ghost.c
+1 -5
View File
@@ -1,12 +1,8 @@
#include "global.h"
#include "gflib.h"
#include "battle_anim.h"
#include "bg.h"
#include "gpu_regs.h"
#include "palette.h"
#include "scanline_effect.h"
#include "malloc.h"
#include "graphics.h"
#include "sound.h"
#include "trig.h"
#include "util.h"
#include "decompress.h"
src/gpu_regs.c
-1
View File
@@ -1,5 +1,4 @@
#include "global.h"
#include "gpu_regs.h"
#define GPU_REG_BUF_SIZE 0x60
src/graphics.c
+2 -2
View File
@@ -1003,8 +1003,8 @@ const u32 gBattleAnimSpritePal_Splash[] = INCBIN_U32("graphics/battle_anims/spri
const u32 gBattleAnimSpriteGfx_SweatBead[] = INCBIN_U32("graphics/battle_anims/sprites/sweat_bead.4bpp.lz");
const u32 gBattleAnimSpriteGfx_Pokeblock[] = INCBIN_U32("graphics/battle_anims/sprites/pokeblock.4bpp.lz");
const u32 gBattleAnimSpritePal_Pokeblock[] = INCBIN_U32("graphics/battle_anims/sprites/pokeblock.gbapal.lz");
const u32 gBattleAnimSpriteGfx_SafariBait[] = INCBIN_U32("graphics/battle_anims/sprites/safari_bait.4bpp.lz");
const u32 gBattleAnimSpritePal_SafariBait[] = INCBIN_U32("graphics/battle_anims/sprites/safari_bait.gbapal.lz");
const u32 gBattleAnimSpriteGfx_Gem1[] = INCBIN_U32("graphics/battle_anims/sprites/gem_1.4bpp.lz");
const u32 gBattleAnimSpriteGfx_Gem2[] = INCBIN_U32("graphics/battle_anims/sprites/gem_2.4bpp.lz");
src/hall_of_fame.c
+1 -7
View File
@@ -1,14 +1,8 @@
#include "global.h"
#include "palette.h"
#include "malloc.h"
#include "gflib.h"
#include "decompress.h"
#include "bg.h"
#include "scanline_effect.h"
#include "gpu_regs.h"
#include "task.h"
#include "text.h"
#include "main.h"
#include "sound.h"
#include "save.h"
#include "data.h"
#include "m4a.h"
src/help_message.c
+196
View File
@@ -0,0 +1,196 @@
#include "global.h"
#include "menu.h"
static EWRAM_DATA u8 sHelpMessageWindowId = 0;
const u16 gUnknown_84566A8[] = INCBIN_U16("graphics/unknown/unknown_84566a8.bin");
static const struct WindowTemplate sHelpMessageWindowTemplate = {
.bg = 0,
.tilemapLeft = 0,
.tilemapTop = 15,
.width = 30,
.height = 5,
.paletteNum = 15,
.baseBlock = 0x08F
};
void MapNamePopupWindowIdSetDummy(void)
{
sHelpMessageWindowId = 0xFF;
}
u8 CreateHelpMessageWindow(void)
{
if (sHelpMessageWindowId == 0xFF)
{
sHelpMessageWindowId = AddWindow(&sHelpMessageWindowTemplate);
PutWindowTilemap(sHelpMessageWindowId);
}
return sHelpMessageWindowId;
}
void DestroyHelpMessageWindow(u8 a0)
{
if (sHelpMessageWindowId != 0xFF)
{
FillWindowPixelBuffer(sHelpMessageWindowId, PIXEL_FILL(0));
ClearWindowTilemap(sHelpMessageWindowId);
if (a0)
CopyWindowToVram(sHelpMessageWindowId, a0);
RemoveWindow(sHelpMessageWindowId);
sHelpMessageWindowId = 0xFF;
}
}
#ifdef NONMATCHING
void sub_8112F18(u8 windowId)
{
u8 width = GetWindowAttribute(windowId, WINDOW_WIDTH);
u8 height = GetWindowAttribute(windowId, WINDOW_HEIGHT);
u8 *buffer = Alloc(32 * width * height);
u8 i, j;
u8 k;
if (buffer != NULL)
{
for (i = 0; i < height; i++)
{
for (j = 0; j < width; j++)
{
if (i == 0)
k = 0;
else if (i == height - 1)
k = 14;
else
k = 5;
CpuCopy32(
(void *)gUnknown_84566A8 + 32 * k, // operand swap on "add" instruction
buffer + 32 * (i * width + j),
32
);
}
}
CopyToWindowPixelBuffer(windowId, buffer, width * height * 32, 0);
Free(buffer);
}
}
#else
NAKED
void sub_8112F18(u8 windowId)
{
asm_unified("\tpush {r4-r7,lr}\n"
"\tmov r7, r10\n"
"\tmov r6, r9\n"
"\tmov r5, r8\n"
"\tpush {r5-r7}\n"
"\tsub sp, 0x8\n"
"\tlsls r0, 24\n"
"\tlsrs r0, 24\n"
"\tmov r10, r0\n"
"\tmovs r1, 0x3\n"
"\tbl GetWindowAttribute\n"
"\tlsls r0, 24\n"
"\tlsrs r6, r0, 24\n"
"\tmov r0, r10\n"
"\tmovs r1, 0x4\n"
"\tbl GetWindowAttribute\n"
"\tlsls r0, 24\n"
"\tlsrs r7, r0, 24\n"
"\tlsls r0, r7, 5\n"
"\tmuls r0, r6\n"
"\tbl Alloc\n"
"\tmov r8, r0\n"
"\tcmp r0, 0\n"
"\tbeq _08112FB8\n"
"\tmovs r5, 0\n"
"\tadds r0, r6, 0\n"
"\tmuls r0, r7\n"
"\tstr r0, [sp]\n"
"\tcmp r5, r7\n"
"\tbcs _08112FA2\n"
"_08112F5A:\n"
"\tmovs r4, 0\n"
"\tadds r1, r5, 0x1\n"
"\tmov r9, r1\n"
"\tcmp r4, r6\n"
"\tbcs _08112F98\n"
"\tsubs r3, r7, 0x1\n"
"_08112F66:\n"
"\tmovs r0, 0\n"
"\tcmp r5, 0\n"
"\tbeq _08112F74\n"
"\tmovs r0, 0x5\n"
"\tcmp r5, r3\n"
"\tbne _08112F74\n"
"\tmovs r0, 0xE\n"
"_08112F74:\n"
"\tlsls r0, 5\n"
"\tldr r1, _08112FC8 @ =gUnknown_84566A8\n"
"\tadds r0, r1, r0\n"
"\tadds r1, r5, 0\n"
"\tmuls r1, r6\n"
"\tadds r1, r4\n"
"\tlsls r1, 5\n"
"\tadd r1, r8\n"
"\tldr r2, _08112FCC @ =0x04000008\n"
"\tstr r3, [sp, 0x4]\n"
"\tbl CpuSet\n"
"\tadds r0, r4, 0x1\n"
"\tlsls r0, 24\n"
"\tlsrs r4, r0, 24\n"
"\tldr r3, [sp, 0x4]\n"
"\tcmp r4, r6\n"
"\tbcc _08112F66\n"
"_08112F98:\n"
"\tmov r1, r9\n"
"\tlsls r0, r1, 24\n"
"\tlsrs r5, r0, 24\n"
"\tcmp r5, r7\n"
"\tbcc _08112F5A\n"
"_08112FA2:\n"
"\tldr r0, [sp]\n"
"\tlsls r2, r0, 21\n"
"\tlsrs r2, 16\n"
"\tmov r0, r10\n"
"\tmov r1, r8\n"
"\tmovs r3, 0\n"
"\tbl CopyToWindowPixelBuffer\n"
"\tmov r0, r8\n"
"\tbl Free\n"
"_08112FB8:\n"
"\tadd sp, 0x8\n"
"\tpop {r3-r5}\n"
"\tmov r8, r3\n"
"\tmov r9, r4\n"
"\tmov r10, r5\n"
"\tpop {r4-r7}\n"
"\tpop {r0}\n"
"\tbx r0\n"
"\t.align 2, 0\n"
"_08112FC8: .4byte gUnknown_84566A8\n"
"_08112FCC: .4byte 0x04000008");
}
#endif
static void sub_8112FD0(void)
{
sub_8112F18(sHelpMessageWindowId);
}
static const u8 sHelpMessageTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GREY};
static void PrintHelpMessageText(const u8 *text)
{
AddTextPrinterParameterized4(sHelpMessageWindowId, 2, 2, 5, 1, 1, sHelpMessageTextColors, -1, text);
}
void PrintTextOnHelpMessageWindow(const u8 *text, u8 mode)
{
sub_8112FD0();
PrintHelpMessageText(text);
if (mode)
CopyWindowToVram(sHelpMessageWindowId, mode);
}
src/help_system.c
+1 -6
View File
@@ -1,15 +1,10 @@
#include "global.h"
#include "gflib.h"
#include "decompress.h"
#include "gpu_regs.h"
#include "main.h"
#include "m4a.h"
#include "dma3.h"
#include "help_system.h"
#include "list_menu.h"
#include "sound.h"
#include "strings.h"
#include "text.h"
#include "blit.h"
#include "constants/songs.h"
extern u8 gGlyphInfo[];
src/help_system_812B1E0.c
+2 -2
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "gflib.h"
#include "event_data.h"
#include "event_scripts.h"
#include "field_player_avatar.h"
@@ -10,7 +11,6 @@
#include "quest_log.h"
#include "save.h"
#include "save_location.h"
#include "sound.h"
#include "strings.h"
#include "constants/items.h"
#include "constants/maps.h"
@@ -1892,7 +1892,7 @@ void HelpSystem_Disable(void)
void HelpSystem_Enable(void)
{
if (gQuestLogState != 2 && gQuestLogState != 3)
if (!QL_IS_PLAYBACK_STATE)
{
gHelpSystemEnabled = TRUE;
HelpSystem_EnableToggleWithRButton();
src/hof_pc.c
+1 -3
View File
@@ -1,12 +1,10 @@
#include "global.h"
#include "gflib.h"
#include "hall_of_fame.h"
#include "palette.h"
#include "overworld.h"
#include "script.h"
#include "script_menu.h"
#include "task.h"
#include "bg.h"
#include "window.h"
static void ReshowPCMenuAfterHallOfFamePC(void);
static void Task_WaitForPaletteFade(u8 taskId);
src/ice.c
+1 -4
View File
@@ -1,11 +1,8 @@
#include "global.h"
#include "gflib.h"
#include "battle_anim.h"
#include "bg.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "palette.h"
#include "random.h"
#include "sprite.h"
#include "task.h"
#include "trig.h"
#include "constants/battle_anim.h"
src/isagbprn.c
-1
View File
@@ -1,6 +1,5 @@
#include <stdarg.h>
#include <stdio.h>
#include "global.h"
#include "config.h"
#include "gba/gba.h"
src/item.c
+1 -2
View File
@@ -1,12 +1,11 @@
#include "global.h"
#include "gflib.h"
#include "berry.h"
#include "event_data.h"
#include "item.h"
#include "item_use.h"
#include "load_save.h"
#include "malloc.h"
#include "quest_log.h"
#include "string_util.h"
#include "strings.h"
#include "constants/hold_effects.h"
#include "constants/items.h"
src/item_menu.c
+1 -1
View File
@@ -2035,7 +2035,7 @@ bool8 UseRegisteredKeyItemOnField(void)
{
ScriptContext2_Enable();
FreezeObjectEvents();
sub_805C270();
HandleEnforcedLookDirectionOnPlayerStopMoving();
StopPlayerAvatar();
gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem;
taskId = CreateTask(ItemId_GetFieldFunc(gSaveBlock1Ptr->registeredItem), 8);
src/item_menu_icons.c
+1 -1
View File
@@ -1,8 +1,8 @@
#include "global.h"
#include "gflib.h"
#include "decompress.h"
#include "graphics.h"
#include "item_menu_icons.h"
#include "malloc.h"
#include "constants/items.h"
static EWRAM_DATA u8 sItemMenuIconSpriteIds[12] = {0};
src/item_pc.c
+1 -7
View File
@@ -1,8 +1,7 @@
#include "global.h"
#include "bg.h"
#include "gflib.h"
#include "data.h"
#include "decompress.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "help_system.h"
#include "item.h"
@@ -11,18 +10,13 @@
#include "list_menu.h"
#include "item_pc.h"
#include "item_use.h"
#include "main.h"
#include "malloc.h"
#include "menu.h"
#include "menu_helpers.h"
#include "menu_indicators.h"
#include "new_menu_helpers.h"
#include "palette.h"
#include "party_menu.h"
#include "pc_screen_effect.h"
#include "scanline_effect.h"
#include "sound.h"
#include "string_util.h"
#include "strings.h"
#include "task.h"
#include "text_window.h"
src/item_use.c
+38 -42
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "gflib.h"
#include "battle.h"
#include "berry_pouch.h"
#include "berry_powder.h"
@@ -17,19 +18,14 @@
#include "item_use.h"
#include "itemfinder.h"
#include "mail.h"
#include "main.h"
#include "malloc.h"
#include "event_object_lock.h"
#include "metatile_behavior.h"
#include "new_menu_helpers.h"
#include "overworld.h"
#include "palette.h"
#include "party_menu.h"
#include "quest_log.h"
#include "region_map.h"
#include "script.h"
#include "sound.h"
#include "string_util.h"
#include "strings.h"
#include "task.h"
#include "teachy_tv.h"
@@ -45,9 +41,9 @@
static EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL;
static void sub_80A1084(void);
static void sub_80A109C(u8 taskId);
static void sub_80A112C(u8 taskId);
static void FieldCB_FadeInFromBlack(void);
static void Task_WaitFadeIn_CallItemUseOnFieldCB(u8 taskId);
static void Task_ItemUse_CloseMessageBoxAndReturnToField(u8 taskId);
static void sub_80A11C0(u8 taskId);
static bool8 sub_80A1194(void);
static void sub_80A1208(void);
@@ -130,14 +126,14 @@ static const u8 sUnref_83E27B4[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static void (*const gUnknown_83E2954[])(void) = {
static void (*const sExitCallbackByItemType[])(void) = {
CB2_ShowPartyMenuForItemUse,
CB2_ReturnToField,
NULL,
NULL
};
static void sub_80A0FBC(u8 taskId)
static void Task_FadeOuFromBackToField(u8 taskId)
{
u8 itemType;
if (gSpecialVar_ItemId == ITEM_ENIGMA_BERRY)
@@ -146,12 +142,12 @@ static void sub_80A0FBC(u8 taskId)
itemType = ItemId_GetType(gSpecialVar_ItemId) - 1;
if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH)
{
BerryPouch_SetExitCallback(gUnknown_83E2954[itemType]);
BerryPouch_SetExitCallback(sExitCallbackByItemType[itemType]);
BerryPouch_StartFadeToExitCallback(taskId);
}
else
{
ItemMenu_SetExitCallback(gUnknown_83E2954[itemType]);
ItemMenu_SetExitCallback(sExitCallbackByItemType[itemType]);
if (itemType == 1)
Bag_BeginCloseWin0Animation();
ItemMenu_StartFadeToExitCallback(taskId);
@@ -162,20 +158,20 @@ static void sub_80A103C(u8 taskId)
{
if (gTasks[taskId].data[3] != 1)
{
gFieldCallback = sub_80A1084;
sub_80A0FBC(taskId);
gFieldCallback = FieldCB_FadeInFromBlack;
Task_FadeOuFromBackToField(taskId);
}
else
sItemUseOnFieldCB(taskId);
}
static void sub_80A1084(void)
static void FieldCB_FadeInFromBlack(void)
{
FadeInFromBlack();
CreateTask(sub_80A109C, 8);
CreateTask(Task_WaitFadeIn_CallItemUseOnFieldCB, 8);
}
static void sub_80A109C(u8 taskId)
static void Task_WaitFadeIn_CallItemUseOnFieldCB(u8 taskId)
{
if (IsWeatherNotFadingIn() == TRUE)
{
@@ -183,25 +179,25 @@ static void sub_80A109C(u8 taskId)
}
}
static void sub_80A10C4(u8 taskId, bool8 a1, u8 a2, const u8 * str)
static void DisplayItemMessageInCurrentContext(u8 taskId, bool8 inField, u8 textSpeed, const u8 * str)
{
StringExpandPlaceholders(gStringVar4, str);
if (a1 == FALSE)
DisplayItemMessageInBag(taskId, a2, gStringVar4, Task_ReturnToBagFromContextMenu);
if (inField == FALSE)
DisplayItemMessageInBag(taskId, textSpeed, gStringVar4, Task_ReturnToBagFromContextMenu);
else
DisplayItemMessageOnField(taskId, a2, gStringVar4, sub_80A112C);
DisplayItemMessageOnField(taskId, textSpeed, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField);
}
static void sub_80A1110(u8 taskId, bool8 a1)
static void PrintNotTheTimeToUseThat(u8 taskId, bool8 inField)
{
sub_80A10C4(taskId, a1, 4, gUnknown_8416425);
DisplayItemMessageInCurrentContext(taskId, inField, 4, gText_OakForbidsUseOfItemHere);
}
static void sub_80A112C(u8 taskId)
static void Task_ItemUse_CloseMessageBoxAndReturnToField(u8 taskId)
{
ClearDialogWindowAndFrame(0, 1);
DestroyTask(taskId);
sub_80696C0();
ClearPlayerHeldMovementAndUnfreezeObjectEvents();
ScriptContext2_Disable();
}
@@ -267,14 +263,14 @@ void FieldUseFunc_MachBike(u8 taskId)
|| MetatileBehavior_IsHorizontalRail(behavior) == TRUE
|| MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE
|| MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE)
sub_80A10C4(taskId, gTasks[taskId].data[3], 2, gUnknown_8416451);
DisplayItemMessageInCurrentContext(taskId, gTasks[taskId].data[3], 2, gUnknown_8416451);
else if (Overworld_IsBikingAllowed() == TRUE && !MetatileAtPlayerPositionForbidsBiking())
{
sItemUseOnFieldCB = ItemUseOnFieldCB_Bicycle;
sub_80A103C(taskId);
}
else
sub_80A1110(taskId, gTasks[taskId].data[3]);
PrintNotTheTimeToUseThat(taskId, gTasks[taskId].data[3]);
}
static void ItemUseOnFieldCB_Bicycle(u8 taskId)
@@ -282,7 +278,7 @@ static void ItemUseOnFieldCB_Bicycle(u8 taskId)
if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
PlaySE(SE_JITENSYA);
StartTransitionToFlipBikeState(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE);
sub_80696C0();
ClearPlayerHeldMovementAndUnfreezeObjectEvents();
ScriptContext2_Disable();
DestroyTask(taskId);
}
@@ -295,7 +291,7 @@ void FieldUseFunc_OldRod(u8 taskId)
sub_80A103C(taskId);
}
else
sub_80A1110(taskId, gTasks[taskId].data[3]);
PrintNotTheTimeToUseThat(taskId, gTasks[taskId].data[3]);
}
static bool8 ItemUseCheckFunc_Rod(void)
@@ -346,7 +342,7 @@ void FieldUseFunc_CoinCase(u8 taskId)
if (gTasks[taskId].data[3] == 0)
DisplayItemMessageInBag(taskId, 2, gStringVar4, Task_ReturnToBagFromContextMenu);
else
DisplayItemMessageOnField(taskId, 2, gStringVar4, sub_80A112C);
DisplayItemMessageOnField(taskId, 2, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField);
}
void FieldUseFunc_PowderJar(u8 taskId)
@@ -357,7 +353,7 @@ void FieldUseFunc_PowderJar(u8 taskId)
if (gTasks[taskId].data[3] == 0)
DisplayItemMessageInBag(taskId, 2, gStringVar4, Task_ReturnToBagFromContextMenu);
else
DisplayItemMessageOnField(taskId, 2, gStringVar4, sub_80A112C);
DisplayItemMessageOnField(taskId, 2, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField);
}
void FieldUseFunc_PokeFlute(u8 taskId)
@@ -385,7 +381,7 @@ void FieldUseFunc_PokeFlute(u8 taskId)
if (gTasks[taskId].data[3] == 0)
DisplayItemMessageInBag(taskId, 2, gUnknown_841665C, Task_ReturnToBagFromContextMenu);
else
DisplayItemMessageOnField(taskId, 2, gUnknown_841665C, sub_80A112C);
DisplayItemMessageOnField(taskId, 2, gUnknown_841665C, Task_ItemUse_CloseMessageBoxAndReturnToField);
}
}
@@ -402,13 +398,13 @@ static void sub_80A1674(u8 taskId)
if (gTasks[taskId].data[3] == 0)
DisplayItemMessageInBag(taskId, 2, gUnknown_84166A7, Task_ReturnToBagFromContextMenu);
else
DisplayItemMessageOnField(taskId, 2, gUnknown_84166A7, sub_80A112C);
DisplayItemMessageOnField(taskId, 2, gUnknown_84166A7, Task_ItemUse_CloseMessageBoxAndReturnToField);
}
}
static void sub_80A16D0(u8 taskId)
{
sub_80A0FBC(taskId);
Task_FadeOuFromBackToField(taskId);
}
void FieldUseFunc_Medicine(u8 taskId)
@@ -444,7 +440,7 @@ void FieldUseFunc_EvoItem(u8 taskId)
void FieldUseFunc_SacredAsh(u8 taskId)
{
gItemUseCB = ItemUseCB_SacredAsh;
sub_80A0FBC(taskId);
Task_FadeOuFromBackToField(taskId);
}
void FieldUseFunc_TmCase(u8 taskId)
@@ -633,7 +629,7 @@ void ItemUseOutOfBattle_EscapeRope(u8 taskId)
sub_80A103C(taskId);
}
else
sub_80A1110(taskId, gTasks[taskId].data[3]);
PrintNotTheTimeToUseThat(taskId, gTasks[taskId].data[3]);
}
static void sub_80A1C08(u8 taskId)
@@ -725,7 +721,7 @@ void FieldUseFunc_VsSeeker(u8 taskId)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(THREE_ISLAND_BERRY_FOREST)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(SIX_ISLAND_PATTERN_BUSH))))
{
sub_80A1110(taskId, gTasks[taskId].data[3]);
PrintNotTheTimeToUseThat(taskId, gTasks[taskId].data[3]);
}
else
{
@@ -734,9 +730,9 @@ void FieldUseFunc_VsSeeker(u8 taskId)
}
}
void sub_80A1E0C(u8 taskId)
void Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker(u8 taskId)
{
sub_80A112C(taskId);
Task_ItemUse_CloseMessageBoxAndReturnToField(taskId);
}
void BattleUseFunc_PokeBallEtc(u8 taskId)
@@ -835,7 +831,7 @@ void BattleUseFunc_PokeDoll(u8 taskId)
DisplayItemMessageInBag(taskId, 2, gStringVar4, ItemMenu_StartFadeToExitCallback);
}
else
sub_80A1110(taskId, 0);
PrintNotTheTimeToUseThat(taskId, 0);
}
void ItemUseOutOfBattle_EnigmaBerry(u8 taskId)
@@ -911,11 +907,11 @@ void FieldUseFunc_OakStopsYou(u8 taskId)
{
if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH)
{
StringExpandPlaceholders(gStringVar4, gUnknown_8416425);
StringExpandPlaceholders(gStringVar4, gText_OakForbidsUseOfItemHere);
DisplayItemMessageInBerryPouch(taskId, 4, gStringVar4, Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu);
}
else
sub_80A1110(taskId, gTasks[taskId].data[3]);
PrintNotTheTimeToUseThat(taskId, gTasks[taskId].data[3]);
}
void ItemUse_SetQuestLogEvent(u8 eventId, struct Pokemon * pokemon, u16 itemId, u16 param)
src/itemfinder.c
+3 -3
View File
@@ -1,11 +1,11 @@
#include "global.h"
#include "gflib.h"
#include "task.h"
#include "new_menu_helpers.h"
#include "strings.h"
#include "event_scripts.h"
#include "event_object_lock.h"
#include "script.h"
#include "sound.h"
#include "event_data.h"
#include "field_player_avatar.h"
#include "field_specials.h"
@@ -150,7 +150,7 @@ void ItemUseOnFieldCB_Itemfinder(u8 taskId)
static void Task_NoResponse_CleanUp(u8 taskId)
{
ClearDialogWindowAndFrame(0, TRUE);
sub_80696C0();
ClearPlayerHeldMovementAndUnfreezeObjectEvents();
ScriptContext2_Disable();
DestroyTask(taskId);
}
@@ -486,7 +486,7 @@ static void Task_ItemfinderResponseCleanUp(u8 taskId)
{
DestroyArrowAndStarTiles();
ClearDialogWindowAndFrame(0, TRUE);
sub_80696C0();
ClearPlayerHeldMovementAndUnfreezeObjectEvents();
ScriptContext2_Disable();
DestroyTask(taskId);
}
src/learn_move.c
+1 -7
View File
@@ -1,13 +1,9 @@
#include "global.h"
#include "bg.h"
#include "malloc.h"
#include "gpu_regs.h"
#include "palette.h"
#include "gflib.h"
#include "script.h"
#include "task.h"
#include "data.h"
#include "trig.h"
#include "window.h"
#include "field_fadetransition.h"
#include "overworld.h"
#include "new_menu_helpers.h"
@@ -15,10 +11,8 @@
#include "list_menu.h"
#include "event_data.h"
#include "text_window.h"
#include "string_util.h"
#include "pokemon_summary_screen.h"
#include "graphics.h"
#include "sound.h"
#include "strings.h"
#include "constants/songs.h"
#include "constants/moves.h"
src/librfu_intr.c
-1
View File
@@ -1,4 +1,3 @@
#include "global.h"
#include "librfu.h"
static void sio32intr_clock_master(void);
src/link.c
+5 -12
View File
@@ -1,12 +1,9 @@
#include "global.h"
#include "palette.h"
#include "bg.h"
#include "gflib.h"
#include "m4a.h"
#include "scanline_effect.h"
#include "bg_regs.h"
#include "gpu_regs.h"
#include "decompress.h"
#include "malloc.h"
#include "save.h"
#include "battle.h"
#include "quest_log.h"
@@ -15,16 +12,12 @@
#include "random.h"
#include "task.h"
#include "event_data.h"
#include "string_util.h"
#include "item_menu.h"
#include "trade.h"
#include "text.h"
#include "sound.h"
#include "menu.h"
#include "overworld.h"
#include "new_menu_helpers.h"
#include "link.h"
#include "window.h"
#include "graphics.h"
#include "strings.h"
#include "help_system.h"
@@ -229,7 +222,7 @@ static const u8 sLinkErrorTextColor[] = { 0x00, 0x01, 0x02 };
bool8 IsWirelessAdapterConnected(void)
{
if (gQuestLogState == 2 || gQuestLogState == 3)
if (QL_IS_PLAYBACK_STATE)
return FALSE;
SetWirelessCommType1();
@@ -816,7 +809,7 @@ u8 GetLinkPlayerDataExchangeStatusTimed(int lower, int upper)
{
if (gLinkPlayers[0].linkType == 0x1133)
{
switch (sub_804FB34())
switch (Trade_CalcLinkPlayerCompatibilityParam())
{
case 0:
sPlayerDataExchangeStatus = EXCHANGE_COMPLETE;
@@ -1006,11 +999,11 @@ bool8 SendBlock(u8 unused, const void *src, u16 size)
return InitBlockSend(src, size);
}
bool8 sub_800A474(u8 blockRequestType)
bool8 Link_PrepareCmd0xCCCC_Rfu0xA100(u8 blockRequestType)
{
if (gWirelessCommType == 1)
{
return sub_80FA0F8(blockRequestType);
return LinkRfu_PrepareCmd0xA100(blockRequestType);
}
if (gLinkCallback == NULL)
{
src/link_rfu_2.c
+17 -19
View File
@@ -1,15 +1,13 @@
#include "global.h"
#include "battle.h"
#include "gpu_regs.h"
#include "gflib.h"
#include "librfu.h"
#include "battle.h"
#include "link.h"
#include "link_rfu.h"
#include "mystery_gift_menu.h"
#include "overworld.h"
#include "palette.h"
#include "quest_log.h"
#include "random.h"
#include "string_util.h"
#include "task.h"
#include "constants/species.h"
#include "constants/union_room.h"
@@ -499,7 +497,7 @@ void LinkRfu_Shutdown(void)
{
u8 i;
if (gQuestLogState == 2 || gQuestLogState == 3)
if (QL_IS_PLAYBACK_STATE)
return;
rfu_LMAN_powerDownRFU();
@@ -538,7 +536,7 @@ void LinkRfu_Shutdown(void)
static void CreateTask_LinkLeaderSearchForChildren(void)
{
if (gQuestLogState == 2 || gQuestLogState == 3)
if (QL_IS_PLAYBACK_STATE)
return;
Rfu.unk_67 = CreateTask(Task_LinkLeaderSearchForChildren, 1);
}
@@ -564,7 +562,7 @@ static bool32 IsParentSuccessfullyReconnected(void)
static void CreateTask_JoinGroupSearchForParent(void)
{
if (gQuestLogState == 2 || gQuestLogState == 3)
if (QL_IS_PLAYBACK_STATE)
return;
Rfu.unk_67 = CreateTask(Task_JoinGroupSearchForParent, 1);
}
@@ -1147,7 +1145,7 @@ static void RfuPrepareSendBuffer(u16 command)
break;
case RFU_COMMAND_0xa100:
if (Cmd8000recvIsFinished())
gSendCmd[1] = Rfu.unk_5a;
gSendCmd[1] = Rfu.cmdA100_blockRequestType;
break;
case RFU_COMMAND_0x7700:
case RFU_COMMAND_0x7800:
@@ -1274,9 +1272,9 @@ static void RfuFunc_SendLastBlock(void)
Rfu.RfuFunc = NULL;
}
bool8 sub_80FA0F8(u8 a0)
bool8 LinkRfu_PrepareCmd0xA100(u8 blockRequestType)
{
Rfu.unk_5a = a0;
Rfu.cmdA100_blockRequestType = blockRequestType;
RfuPrepareSendBuffer(RFU_COMMAND_0xa100);
return TRUE;
}
@@ -1286,7 +1284,7 @@ static void RfuFunc_End5F00_PowerDownRfu(void)
rfu_clearAllSlot();
rfu_LMAN_powerDownRFU();
gReceivedRemoteLinkPlayers = 0;
Rfu.unk_ef = 1;
Rfu.isShuttingDown = TRUE;
Rfu.RfuFunc = NULL;
}
@@ -1454,7 +1452,7 @@ bool32 RfuSerialNumberIsValid(u32 serialNo)
return TRUE;
}
u8 sub_80FA484(bool32 a0)
u8 ToggleLMANlinkRecovery(bool32 a0)
{
if (!a0)
return rfu_LMAN_setLinkRecovery(0, 0);
@@ -1662,7 +1660,7 @@ static void sub_80FA834(u8 taskId)
{
if (Cmd8000recvIsFinished())
{
Rfu.unk_5a = 0;
Rfu.cmdA100_blockRequestType = 0;
RfuPrepareSendBuffer(RFU_COMMAND_0xa100);
gTasks[taskId].data[0]++;
}
@@ -1881,7 +1879,7 @@ bool32 LinkRfuMain1(void)
bool32 retval = FALSE;
Rfu.parentId = 0;
rfu_LMAN_manager_entity(Random());
if (Rfu.unk_ef == 0)
if (!Rfu.isShuttingDown)
{
switch (Rfu.parent_child)
{
@@ -1902,7 +1900,7 @@ bool32 LinkRfuMain1(void)
bool32 LinkRfuMain2(void)
{
bool32 retval = FALSE;
if (Rfu.unk_ef == 0)
if (!Rfu.isShuttingDown)
{
if (Rfu.parent_child == MODE_PARENT)
retval = sub_80F9204();
@@ -2093,7 +2091,7 @@ static void LmanCallback_Parent2(u8 msg, u8 param_count)
case LMAN_MSG_LMAN_API_ERROR_RETURN:
RfuSetErrorStatus(1, msg);
GetLinkmanErrorParams(msg);
Rfu.unk_ef = 1;
Rfu.isShuttingDown = TRUE;
break;
case LMAN_MSG_REQ_API_ERROR:
case LMAN_MSG_WATCH_DOG_TIMER_ERROR:
@@ -2166,7 +2164,7 @@ static void LmanCallback_Child(u8 msg, u8 param_count)
case LMAN_MSG_LMAN_API_ERROR_RETURN:
RfuSetErrorStatus(1, msg);
GetLinkmanErrorParams(msg);
Rfu.unk_ef = 1;
Rfu.isShuttingDown = TRUE;
break;
case LMAN_MSG_REQ_API_ERROR:
case LMAN_MSG_WATCH_DOG_TIMER_ERROR:
@@ -2343,7 +2341,7 @@ static void LmanCallback_Parent(u8 msg, u8 param_count)
case LMAN_MSG_LMAN_API_ERROR_RETURN:
RfuSetErrorStatus(1, msg);
GetLinkmanErrorParams(msg);
Rfu.unk_ef = 1;
Rfu.isShuttingDown = TRUE;
break;
case LMAN_MSG_REQ_API_ERROR:
case LMAN_MSG_WATCH_DOG_TIMER_ERROR:
@@ -2481,7 +2479,7 @@ void InitializeRfuLinkManager_JoinGroup(void)
void InitializeRfuLinkManager_EnterUnionRoom(void)
{
if (gQuestLogState == 2 || gQuestLogState == 3)
if (QL_IS_PLAYBACK_STATE)
return;
Rfu.parent_child = 2;
CopyPlayerNameToUnameBuffer();
src/link_rfu_3.c
+1 -3
View File
@@ -1,12 +1,10 @@
#include "global.h"
#include "gflib.h"
#include "decompress.h"
#include "event_data.h"
#include "link.h"
#include "link_rfu.h"
#include "malloc.h"
#include "random.h"
#include "string_util.h"
#include "text.h"
#include "constants/flags.h"
static EWRAM_DATA u8 gWirelessStatusIndicatorSpriteId = 0;
src/list_menu.c
+1 -4
View File
@@ -1,16 +1,13 @@
#include "global.h"
#include "gflib.h"
#include "menu.h"
#include "list_menu.h"
#include "menu_indicators.h"
#include "new_menu_helpers.h"
#include "window.h"
#include "text_window.h"
#include "main.h"
#include "task.h"
#include "graphics.h"
#include "palette.h"
#include "strings.h"
#include "sound.h"
#include "pokemon_icon.h"
#include "constants/songs.h"
src/load_save.c
+2 -3
View File
@@ -1,10 +1,9 @@
#include "global.h"
#include "gflib.h"
#include "gba/flash_internal.h"
#include "load_save.h"
#include "main.h"
#include "pokemon.h"
#include "random.h"
#include "malloc.h"
#include "item.h"
#include "save_location.h"
#include "berry_powder.h"
@@ -78,7 +77,7 @@ void SetSaveBlocksPointers(void)
gPokemonStoragePtr = (void*)(&gPokemonStorage) + offset;
SetBagPocketsPointers();
sub_8110840(oldSave);
SetQuestLogRecordAndPlaybackPointers(oldSave);
}
void MoveSaveBlocks_ResetHeap(void)
src/mail.c
+1 -5
View File
@@ -1,12 +1,8 @@
#include "global.h"
#include "malloc.h"
#include "bg.h"
#include "gflib.h"
#include "scanline_effect.h"
#include "palette.h"
#include "gpu_regs.h"
#include "window.h"
#include "text_window.h"
#include "main.h"
#include "easy_chat.h"
#include "mail.h"
#include "task.h"
src/mail_data.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "text.h"
#include "gflib.h"
#include "mail.h"
#include "mail_data.h"
#include "constants/species.h"
src/mailbox_pc.c
+1 -4
View File
@@ -1,14 +1,11 @@
#include "global.h"
#include "malloc.h"
#include "window.h"
#include "gflib.h"
#include "menu.h"
#include "string_util.h"
#include "new_menu_helpers.h"
#include "list_menu.h"
#include "player_pc.h"
#include "strings.h"
#include "menu_indicators.h"
#include "sound.h"
#include "constants/songs.h"
static EWRAM_DATA u8 sWindowIds[3] = {};
src/main.c
+2 -8
View File
@@ -1,20 +1,14 @@
#include "global.h"
#include "bg.h"
#include "gpu_regs.h"
#include "gflib.h"
#include "link.h"
#include "link_rfu.h"
#include "load_save.h"
#include "main.h"
#include "m4a.h"
#include "random.h"
#include "dma3.h"
#include "gba/flash_internal.h"
#include "help_system.h"
#include "sound.h"
#include "new_menu_helpers.h"
#include "malloc.h"
#include "overworld.h"
#include "sprite.h"
#include "play_time.h"
#include "intro.h"
#include "battle_controllers.h"
@@ -207,7 +201,7 @@ static void InitMainCallbacks(void)
gSaveBlock2Ptr = &gSaveBlock2;
gSaveBlock1Ptr = &gSaveBlock1;
gSaveBlock2.encryptionKey = 0;
gUnknown_3005E88 = 0;
gQuestLogPlaybackState = 0;
}
static void CallCallbacks(void)
src/main_menu.c
+1 -8
View File
@@ -1,14 +1,9 @@
#include "global.h"
#include "palette.h"
#include "gpu_regs.h"
#include "gflib.h"
#include "scanline_effect.h"
#include "bg.h"
#include "dma3.h"
#include "task.h"
#include "text.h"
#include "save.h"
#include "event_data.h"
#include "window.h"
#include "menu.h"
#include "link.h"
#include "oak_speech.h"
@@ -16,10 +11,8 @@
#include "quest_log.h"
#include "mystery_gift_menu.h"
#include "strings.h"
#include "sound.h"
#include "title_screen.h"
#include "help_system.h"
#include "string_util.h"
#include "pokedex.h"
#include "text_window.h"
#include "text_window_graphics.h"
src/map_name_popup.c
+2 -7
View File
@@ -1,16 +1,11 @@
#include "global.h"
#include "bg.h"
#include "gpu_regs.h"
#include "window.h"
#include "palette.h"
#include "gflib.h"
#include "task.h"
#include "event_data.h"
#include "text_window.h"
#include "quest_log.h"
#include "region_map.h"
#include "text.h"
#include "strings.h"
#include "string_util.h"
#include "constants/flags.h"
static void Task_MapNamePopup(u8 taskId);
@@ -31,7 +26,7 @@ static u8 *MapNamePopupAppendFloorNum(u8 *dest, s8 flags);
void ShowMapNamePopup(bool32 palIntoFadedBuffer)
{
u8 taskId;
if (FlagGet(FLAG_DONT_SHOW_MAP_NAME_POPUP) != TRUE && !(gQuestLogState == QL_STATE_2 || gQuestLogState == QL_STATE_3))
if (FlagGet(FLAG_DONT_SHOW_MAP_NAME_POPUP) != TRUE && !QL_IS_PLAYBACK_STATE)
{
taskId = FindTaskIdByFunc(Task_MapNamePopup);
if (taskId == 0xFF)
src/map_preview_screen.c
+2 -6
View File
@@ -1,11 +1,7 @@
#include "global.h"
#include "gpu_regs.h"
#include "bg.h"
#include "palette.h"
#include "malloc.h"
#include "gflib.h"
#include "quest_log.h"
#include "new_menu_helpers.h"
#include "window.h"
#include "region_map.h"
#include "menu.h"
#include "field_fadetransition.h"
@@ -366,7 +362,7 @@ bool8 MapHasPreviewScreen(u8 mapsec, u8 type)
bool32 MapHasPreviewScreen_HandleQLState2(u8 mapsec, u8 type)
{
if (gQuestLogState == QL_STATE_2)
if (gQuestLogState == QL_STATE_PLAYBACK)
{
return FALSE;
}
src/menu.c
+1 -4
View File
@@ -1,12 +1,9 @@
#include "global.h"
#include "bg.h"
#include "gflib.h"
#include "menu.h"
#include "menu_helpers.h"
#include "strings.h"
#include "text_window.h"
#include "window.h"
#include "sound.h"
#include "palette.h"
#include "constants/songs.h"
struct Menu
src/menu2.c
+1 -4
View File
@@ -1,10 +1,7 @@
#include "global.h"
#include "text.h"
#include "blit.h"
#include "gpu_regs.h"
#include "gflib.h"
#include "task.h"
#include "wild_encounter.h"
#include "string_util.h"
#include "constants/species.h"
static void Task_SmoothBlendLayers(u8 taskId);
src/menu_helpers.c
+1 -6
View File
@@ -1,14 +1,9 @@
#include "global.h"
#include "gflib.h"
#include "task.h"
#include "bg.h"
#include "gpu_regs.h"
#include "window.h"
#include "menu.h"
#include "menu_helpers.h"
#include "new_menu_helpers.h"
#include "string_util.h"
#include "text.h"
#include "sound.h"
#include "link.h"
#include "overworld.h"
#include "mail_data.h"
src/menu_indicators.c
+1 -3
View File
@@ -1,9 +1,7 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "task.h"
#include "decompress.h"
#include "palette.h"
#include "sprite.h"
#include "trig.h"
#include "list_menu.h"
#include "menu_indicators.h"
src/metatile_behavior.c
+13 -13
View File
@@ -131,51 +131,51 @@ bool8 MetatileBehavior_IsEscalator(u8 metatileBehavior)
return FALSE;
}
bool8 MetatileBehavior_IsUnknownWarp6C(u8 metatileBehavior)
bool8 MetatileBehavior_IsDirectionalUpRightStairWarp(u8 metatileBehavior)
{
u8 result = FALSE;
if(metatileBehavior == MB_UNKNOWN_WARP_6C)
if(metatileBehavior == MB_UP_RIGHT_STAIR_WARP)
result = TRUE;
return result;
}
bool8 MetatileBehavior_IsUnknownWarp6D(u8 metatileBehavior)
bool8 MetatileBehavior_IsDirectionalUpLeftStairWarp(u8 metatileBehavior)
{
u8 result = FALSE;
if(metatileBehavior == MB_UNKNOWN_WARP_6D)
if(metatileBehavior == MB_UP_LEFT_STAIR_WARP)
result = TRUE;
return result;
}
bool8 MetatileBehavior_IsUnknownWarp6E(u8 metatileBehavior)
bool8 MetatileBehavior_IsDirectionalDownRightStairWarp(u8 metatileBehavior)
{
u8 result = FALSE;
if(metatileBehavior == MB_UNKNOWN_WARP_6E)
if(metatileBehavior == MB_DOWN_RIGHT_STAIR_WARP)
result = TRUE;
return result;
}
bool8 MetatileBehavior_IsUnknownWarp6F(u8 metatileBehavior)
bool8 MetatileBehavior_IsDirectionalDownLeftStairWarp(u8 metatileBehavior)
{
u8 result = FALSE;
if(metatileBehavior == MB_UNKNOWN_WARP_6F)
if(metatileBehavior == MB_DOWN_LEFT_STAIR_WARP)
result = TRUE;
return result;
}
bool8 MetatileBehavior_IsUnknownWarp6C_to_6F(u8 metatileBehavior)
bool8 MetatileBehavior_IsDirectionalStairWarp(u8 metatileBehavior)
{
bool8 result = FALSE;
if(metatileBehavior >= MB_UNKNOWN_WARP_6C && metatileBehavior <= MB_UNKNOWN_WARP_6F)
if(metatileBehavior >= MB_UP_RIGHT_STAIR_WARP && metatileBehavior <= MB_DOWN_LEFT_STAIR_WARP)
result = TRUE;
else
result = FALSE;
@@ -484,7 +484,7 @@ bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior)
bool8 MetatileBehavior_IsUnableToEmerge(u8 metatileBehavior)
{
if(metatileBehavior == MB_19)
if(metatileBehavior == MB_UNDERWATER_BLOCKED_ABOVE)
return TRUE;
else
return FALSE;
@@ -622,7 +622,7 @@ bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_IsLavaridge1FWarp(u8 metatileBehavior)
{
if(metatileBehavior == MB_68)
if(metatileBehavior == MB_LAVARIDGE_1F_WARP)
return TRUE;
else
return FALSE;
@@ -685,7 +685,7 @@ bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior)
{
if(metatileBehavior == MB_22)
if(metatileBehavior == MB_SEAWEED)
return TRUE;
else
return FALSE;
src/mevent.c
+1 -4
View File
@@ -1,10 +1,8 @@
#include "global.h"
#include "gflib.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "malloc.h"
#include "sound.h"
#include "easy_chat.h"
#include "main.h"
#include "task.h"
#include "decompress.h"
#include "link.h"
@@ -15,7 +13,6 @@
#include "event_data.h"
#include "battle_tower.h"
#include "new_game.h"
#include "string_util.h"
#include "menews_jisan.h"
#include "cereader_tool.h"
#include "mystery_gift_menu.h"
src/mevent_client.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "decompress.h"
#include "overworld.h"
#include "script.h"
src/mevent_server.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "script.h"
#include "mevent.h"
#include "mevent_server.h"
src/mevent_show_card.c
+1 -4
View File
@@ -1,14 +1,11 @@
#include "global.h"
#include "gflib.h"
#include "constants/species.h"
#include "bg.h"
#include "palette.h"
#include "decompress.h"
#include "malloc.h"
#include "menu.h"
#include "new_menu_helpers.h"
#include "pokemon_icon.h"
#include "mystery_gift_menu.h"
#include "string_util.h"
#include "mevent.h"
#include "battle_anim.h"
src/minigame_countdown.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "decompress.h"
#include "sound.h"
#include "task.h"
#include "trig.h"
#include "constants/songs.h"
src/mon_markings.c
+1 -2
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "dma3.h"
#include "gflib.h"
#include "text_window_graphics.h"
#include "sound.h"
#include "mon_markings.h"
#include "graphics.h"
#include "constants/songs.h"
src/money.c
+1 -2
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "event_data.h"
#include "text.h"
#include "string_util.h"
#include "menu.h"
#include "text_window.h"
#include "strings.h"
src/mystery_event_script.c
+1 -3
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "gflib.h"
#include "berry.h"
#include "battle_tower.h"
#include "easy_chat.h"
@@ -6,13 +7,10 @@
#include "mail_data.h"
#include "mystery_event_script.h"
#include "pokedex.h"
#include "pokemon.h"
#include "pokemon_size_record.h"
#include "script.h"
#include "constants/species.h"
#include "strings.h"
#include "string_util.h"
#include "text.h"
#include "util.h"
#include "mystery_event_msg.h"
#include "pokemon_storage_system.h"
src/mystery_gift_menu.c
+2 -9
View File
@@ -1,21 +1,14 @@
#include "global.h"
#include "palette.h"
#include "gpu_regs.h"
#include "bg.h"
#include "gflib.h"
#include "task.h"
#include "scanline_effect.h"
#include "malloc.h"
#include "text.h"
#include "window.h"
#include "text_window.h"
#include "menu.h"
#include "new_menu_helpers.h"
#include "sound.h"
#include "mystery_gift_menu.h"
#include "title_screen.h"
#include "list_menu.h"
#include "link_rfu.h"
#include "string_util.h"
#include "mevent.h"
#include "save.h"
#include "link.h"
@@ -398,7 +391,7 @@ bool32 HandleMysteryGiftOrEReaderSetup(s32 mg_or_ereader)
SetBgTilemapBuffer(0, Alloc(0x800));
LoadUserWindowBorderGfx(0, 10, 0xE0);
sub_814FDA0(0, 1, 0xF0);
DrawWindowBorderWithStdpal3(0, 1, 0xF0);
DecompressAndLoadBgGfxUsingHeap(3, gUnkTextboxBorderGfx, 0x100, 0, 0);
InitWindows(sMainWindows);
DeactivateAllTextPrinters();
src/new_game.c
+1 -2
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "random.h"
#include "main.h"
#include "overworld.h"
#include "constants/maps.h"
#include "load_save.h"
@@ -10,7 +10,6 @@
#include "quest_log.h"
#include "wild_encounter.h"
#include "event_data.h"
#include "string_util.h"
#include "mail_data.h"
#include "play_time.h"
#include "money.h"
src/new_menu_helpers.c
+8 -13
View File
@@ -1,18 +1,13 @@
#include "global.h"
#include "malloc.h"
#include "dma3.h"
#include "task.h"
#include "bg.h"
#include "window.h"
#include "gflib.h"
#include "help_message.h"
#include "menu.h"
#include "menu_helpers.h"
#include "new_menu_helpers.h"
#include "quest_log.h"
#include "text.h"
#include "field_specials.h"
#include "text_window.h"
#include "script.h"
#include "palette.h"
#define DLG_WINDOW_PALETTE_NUM 15
#define DLG_WINDOW_BASE_TILE_NUM 0x200
@@ -457,7 +452,7 @@ void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonP
void LoadStdWindowFrameGfx(void)
{
if (gQuestLogState == QL_STATE_2)
if (gQuestLogState == QL_STATE_PLAYBACK)
{
gTextFlags.autoScroll = 1;
TextWindow_LoadTilesStdFrame1(0, DLG_WINDOW_BASE_TILE_NUM);
@@ -495,7 +490,7 @@ void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram)
ClearWindowTilemap(windowId);
if (copyToVram == TRUE)
CopyWindowToVram(windowId, 3);
if (gQuestLogState == QL_STATE_2)
if (gQuestLogState == QL_STATE_PLAYBACK)
CommitQuestLogWindow1();
}
@@ -527,7 +522,7 @@ static void WindowFunc_DrawStandardFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u
static void WindowFunc_DrawDialogueFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
{
if (!IsMsgSignPost() || gQuestLogState == QL_STATE_2)
if (!IsMsgSignPost() || gQuestLogState == QL_STATE_PLAYBACK)
{
FillBgTilemapBufferRect(bg, DLG_WINDOW_BASE_TILE_NUM + 0, tilemapLeft - 2, tilemapTop - 1, 1, 1, DLG_WINDOW_PALETTE_NUM);
FillBgTilemapBufferRect(bg, DLG_WINDOW_BASE_TILE_NUM + 1, tilemapLeft - 1, tilemapTop - 1, 1, 1, DLG_WINDOW_PALETTE_NUM);
@@ -611,7 +606,7 @@ void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram)
void sub_80F7768(u8 windowId, bool8 copyToVram)
{
if (gQuestLogState == QL_STATE_2)
if (gQuestLogState == QL_STATE_PLAYBACK)
{
gTextFlags.autoScroll = 1;
TextWindow_LoadTilesStdFrame1(0, DLG_WINDOW_BASE_TILE_NUM);
@@ -645,10 +640,10 @@ static u16 GetStdPalColor(u8 colorNum)
return gTMCaseMainWindowPalette[colorNum];
}
void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *string, TaskFunc callback)
void DisplayItemMessageOnField(u8 taskId, u8 textSpeed, const u8 *string, TaskFunc callback)
{
LoadStdWindowFrameGfx();
DisplayMessageAndContinueTask(taskId, 0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM, bgId, GetTextSpeedSetting(), string, callback);
DisplayMessageAndContinueTask(taskId, 0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM, textSpeed, GetTextSpeedSetting(), string, callback);
CopyWindowToVram(0, 3);
}
src/normal.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "battle_anim.h"
#include "palette.h"
#include "random.h"
#include "task.h"
#include "trig.h"
src/oak_speech.c
+1 -10
View File
@@ -1,23 +1,14 @@
#include "global.h"
#include "main.h"
#include "gflib.h"
#include "decompress.h"
#include "task.h"
#include "malloc.h"
#include "gpu_regs.h"
#include "palette.h"
#include "blend_palette.h"
#include "text.h"
#include "window.h"
#include "text_window.h"
#include "bg.h"
#include "menu.h"
#include "help_system.h"
#include "new_menu_helpers.h"
#include "pokemon.h"
#include "sound.h"
#include "event_scripts.h"
#include "scanline_effect.h"
#include "string_util.h"
#include "pokeball.h"
#include "naming_screen.h"
#include "math_util.h"
src/option_menu.c
+2 -9
View File
@@ -1,20 +1,13 @@
#include "global.h"
#include "gpu_regs.h"
#include "gflib.h"
#include "scanline_effect.h"
#include "text_window_graphics.h"
#include "menu.h"
#include "menu_helpers.h"
#include "task.h"
#include "palette.h"
#include "overworld.h"
#include "malloc.h"
#include "help_system.h"
#include "main.h"
#include "bg.h"
#include "window.h"
#include "text.h"
#include "text_window.h"
#include "string_util.h"
#include "strings.h"
#include "field_fadetransition.h"
#include "gba/m4a_internal.h"
@@ -352,7 +345,7 @@ static bool8 LoadOptionMenuPalette(void)
LoadPalette(stdpal_get(2), 0xF0, 0x20);
break;
case 3:
sub_814FDA0(1, 0x1B3, 0x30);
DrawWindowBorderWithStdpal3(1, 0x1B3, 0x30);
break;
default:
return TRUE;
src/overworld.c
+33 -33
View File
@@ -160,9 +160,9 @@ static void SetCameraToTrackGuestPlayer_2(void);
static void sub_8057178(void);
static void sub_80571A8(void);
static void CreateLinkPlayerSprites(void);
static void sub_80572D8(void);
static void sub_8057300(u8 *state);
static bool32 sub_8057314(u8 *state);
static void CB2_LoadMapForQLPlayback(void);
static void DoLoadMap_QLPlayback(u8 *state);
static bool32 LoadMap_QLPlayback(u8 *state);
static bool32 SetUpScrollSceneForCredits(u8 *state, u8 unused);
static bool8 MapLdr_Credits(void);
static void CameraCB_CreditsPan(struct CameraObject * camera);
@@ -340,7 +340,7 @@ static void Overworld_ResetStateAfterWhitingOut(void)
VarSet(VAR_0x404D, 0);
}
static void sub_8054E40(void)
static void Overworld_ResetStateOnContinue(void)
{
FlagClear(FLAG_SYS_SAFARI_MODE);
VarSet(VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0);
@@ -763,7 +763,7 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum)
ClearTempFieldEventData();
ResetCyclingRoadChallengeData();
RestartWildEncounterImmunitySteps();
TryUpdateRandomTrainerRematches(mapGroup, mapNum);
MapResetTrainerRematches(mapGroup, mapNum);
SetSav1WeatherFromCurrMapHeader();
ChooseAmbientCrySpecies();
SetDefaultFlashLevel();
@@ -798,7 +798,7 @@ static void mli0_load_map(bool32 a1)
ClearTempFieldEventData();
ResetCyclingRoadChallengeData();
RestartWildEncounterImmunitySteps();
TryUpdateRandomTrainerRematches(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum);
MapResetTrainerRematches(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum);
SetSav1WeatherFromCurrMapHeader();
ChooseAmbientCrySpecies();
if (isOutdoors)
@@ -921,9 +921,9 @@ static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStr
return DIR_EAST;
else if (MetatileBehavior_IsEastArrowWarp(metatileBehavior) == TRUE)
return DIR_WEST;
else if (MetatileBehavior_IsUnknownWarp6C(metatileBehavior) == TRUE || MetatileBehavior_IsUnknownWarp6E(metatileBehavior) == TRUE)
else if (MetatileBehavior_IsDirectionalUpRightStairWarp(metatileBehavior) == TRUE || MetatileBehavior_IsDirectionalDownRightStairWarp(metatileBehavior) == TRUE)
return DIR_WEST;
else if (MetatileBehavior_IsUnknownWarp6D(metatileBehavior) == TRUE || MetatileBehavior_IsUnknownWarp6F(metatileBehavior) == TRUE)
else if (MetatileBehavior_IsDirectionalUpLeftStairWarp(metatileBehavior) == TRUE || MetatileBehavior_IsDirectionalDownLeftStairWarp(metatileBehavior) == TRUE)
return DIR_EAST;
else if ((playerStruct->transitionFlags == PLAYER_AVATAR_FLAG_UNDERWATER && transitionFlags == PLAYER_AVATAR_FLAG_SURFING)
|| (playerStruct->transitionFlags == PLAYER_AVATAR_FLAG_SURFING && transitionFlags == PLAYER_AVATAR_FLAG_UNDERWATER ))
@@ -979,7 +979,7 @@ void SetCurrentMapLayout(u16 mapLayoutId)
gMapHeader.mapLayout = GetMapLayout();
}
void sub_8055D5C(struct WarpData * warp)
void Overworld_SetWarpDestinationFromWarp(struct WarpData * warp)
{
sWarpDestination = *warp;
}
@@ -1406,7 +1406,7 @@ static void DoCB1_Overworld(u16 newKeys, u16 heldKeys)
{
if (ProcessPlayerFieldInput(&fieldInput) == TRUE)
{
if (gUnknown_3005E88 == 2)
if (gQuestLogPlaybackState == 2)
sub_81127F8(&gInputToStoreInQuestLogMaybe);
ScriptContext2_Enable();
DismissMapNamePopup();
@@ -1441,7 +1441,7 @@ static void DoCB1_Overworld_QuestLogPlayback(void)
RunQuestLogCB();
}
}
else if (sub_8111CD0() == TRUE)
else if (QuestLogScenePlaybackIsEnding() == TRUE)
{
RunQuestLogCB();
}
@@ -1452,7 +1452,7 @@ void CB1_Overworld(void)
{
if (gMain.callback2 == CB2_Overworld)
{
if (sub_8112CAC() == TRUE || gQuestLogState == QL_STATE_2)
if (sub_8112CAC() == 1 || gQuestLogState == QL_STATE_PLAYBACK)
DoCB1_Overworld_QuestLogPlayback();
else
DoCB1_Overworld(gMain.newKeys, gMain.heldKeys);
@@ -1555,7 +1555,7 @@ void CB2_WhiteOut(void)
gFieldCallback = FieldCB_RushInjuredPokemonToCenter;
val = 0;
do_load_map_stuff_loop(&val);
QuestLog_OnInteractionWithSpecialNpc();
QuestLog_CutRecording();
SetFieldVBlankCallback();
SetMainCallback1(CB1_Overworld);
SetMainCallback2(CB2_Overworld);
@@ -1575,9 +1575,9 @@ void CB2_LoadMap(void)
static void CB2_LoadMap2(void)
{
do_load_map_stuff_loop(&gMain.state);
if (sub_8113748() == TRUE)
if (QuestLog_ShouldEndSceneOnMapChange() == TRUE)
{
sub_81119C8();
QuestLog_AdvancePlayhead_();
}
else
{
@@ -1671,14 +1671,14 @@ void CB2_ReturnToFieldContinueScriptPlayMapMusic(void)
CB2_ReturnToField();
}
void sub_80568FC(void)
void CB2_ReturnToFieldFromDiploma(void)
{
FieldClearVBlankHBlankCallbacks();
gFieldCallback = FieldCB_WarpExitFadeFromBlack;
CB2_ReturnToField();
}
static void sub_8056918(void)
static void FieldCB_ShowMapNameOnContinue(void)
{
if (SHOW_MAP_NAME_ENABLED)
ShowMapNamePopup(FALSE);
@@ -1693,7 +1693,7 @@ void CB2_ContinueSavedGame(void)
LoadSaveblockMapHeader();
LoadSaveblockObjEventScripts();
UnfreezeObjectEvents();
sub_8054E40();
Overworld_ResetStateOnContinue();
InitMapFromSavedGame();
PlayTimeCounter_Start();
ScriptContext1_Init();
@@ -1709,7 +1709,7 @@ void CB2_ContinueSavedGame(void)
}
else
{
gFieldCallback = sub_8056918;
gFieldCallback = FieldCB_ShowMapNameOnContinue;
SetMainCallback1(CB1_Overworld);
CB2_ReturnToField();
}
@@ -1861,14 +1861,14 @@ static bool32 load_map_stuff(u8 *state, bool32 a1)
(*state)++;
break;
case 3:
if (sub_8113748() == TRUE)
if (QuestLog_ShouldEndSceneOnMapChange() == TRUE)
return TRUE;
(*state)++;
break;
case 4:
mli4_mapscripts_and_other();
sub_8057114();
if (gQuestLogState != QL_STATE_2)
if (gQuestLogState != QL_STATE_PLAYBACK)
{
sub_80CC534();
sub_80CC59C();
@@ -2205,7 +2205,7 @@ static void CreateLinkPlayerSprites(void)
// Quest Log
void sub_805726C(void)
void CB2_SetUpOverworldForQLPlaybackWithWarpExit(void)
{
FieldClearVBlankHBlankCallbacks();
gUnknown_2036E28 = 1;
@@ -2213,10 +2213,10 @@ void sub_805726C(void)
ScriptContext2_Disable();
SetMainCallback1(NULL);
SetMainCallback2(CB2_DoChangeMap);
gMain.savedCallback = sub_80572D8;
gMain.savedCallback = CB2_LoadMapForQLPlayback;
}
void sub_80572A8(void)
void CB2_SetUpOverworldForQLPlayback(void)
{
FieldClearVBlankHBlankCallbacks();
gUnknown_2036E28 = 1;
@@ -2224,24 +2224,24 @@ void sub_80572A8(void)
ScriptContext1_Init();
ScriptContext2_Disable();
SetMainCallback1(NULL);
SetMainCallback2(sub_80572D8);
SetMainCallback2(CB2_LoadMapForQLPlayback);
}
static void sub_80572D8(void)
static void CB2_LoadMapForQLPlayback(void)
{
sub_8057300(&gMain.state);
DoLoadMap_QLPlayback(&gMain.state);
SetFieldVBlankCallback();
SetMainCallback1(CB1_Overworld);
SetMainCallback2(CB2_Overworld);
}
static void sub_8057300(u8 *state)
static void DoLoadMap_QLPlayback(u8 *state)
{
while (!sub_8057314(state))
while (!LoadMap_QLPlayback(state))
;
}
static bool32 sub_8057314(u8 *state)
static bool32 LoadMap_QLPlayback(u8 *state)
{
switch (*state)
{
@@ -2251,7 +2251,7 @@ static bool32 sub_8057314(u8 *state)
sub_8111F14();
sub_81113E4();
sub_8111438();
if (sub_8110AC8() == 2)
if (GetQuestLogStartType() == QL_START_WARP)
{
gUnknown_2031DE0 = FALSE;
mli0_load_map(FALSE);
@@ -2317,7 +2317,7 @@ static bool32 sub_8057314(u8 *state)
return FALSE;
}
void sub_8057430(void)
void CB2_EnterFieldFromQuestLog(void)
{
FieldClearVBlankHBlankCallbacks();
StopMapMusic();
@@ -2326,7 +2326,7 @@ void sub_8057430(void)
LoadSaveblockMapHeader();
LoadSaveblockObjEventScripts();
UnfreezeObjectEvents();
sub_8054E40();
Overworld_ResetStateOnContinue();
InitMapFromSavedGame();
PlayTimeCounter_Start();
ScriptContext1_Init();
src/palette.c
+1 -2
View File
@@ -1,8 +1,7 @@
#include "global.h"
#include "palette.h"
#include "gflib.h"
#include "util.h"
#include "decompress.h"
#include "gpu_regs.h"
#include "task.h"
enum
src/party_menu.c
+1
View File
@@ -19,6 +19,7 @@
#include "fieldmap.h"
#include "fldeff.h"
#include "graphics.h"
#include "help_message.h"
#include "help_system.h"
#include "item.h"
#include "item_menu.h"
src/party_menu_specials.c
+1 -3
View File
@@ -1,14 +1,12 @@
#include "global.h"
#include "gflib.h"
#include "data.h"
#include "script.h"
#include "overworld.h"
#include "palette.h"
#include "pokemon.h"
#include "party_menu.h"
#include "field_fadetransition.h"
#include "pokemon_summary_screen.h"
#include "event_data.h"
#include "string_util.h"
#include "constants/moves.h"
static void sub_80BF97C(u8 taskId);
src/pc_screen_effect.c
+1 -2
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "task.h"
#include "gpu_regs.h"
#include "palette.h"
/*
* Animates the screen as though it was a CRT monitor turning on or off.
src/player_pc.c
+1 -3
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "palette.h"
#include "gflib.h"
#include "item.h"
#include "task.h"
#include "menu_indicators.h"
@@ -9,7 +9,6 @@
#include "mail.h"
#include "mail_data.h"
#include "help_system.h"
#include "sound.h"
#include "overworld.h"
#include "script.h"
#include "mailbox_pc.h"
@@ -17,7 +16,6 @@
#include "field_weather.h"
#include "event_scripts.h"
#include "field_fadetransition.h"
#include "string_util.h"
#include "item_menu.h"
#include "item_pc.h"
#include "party_menu.h"
src/pokeball.c
+1 -4
View File
@@ -1,14 +1,11 @@
#include "global.h"
#include "gflib.h"
#include "battle.h"
#include "battle_anim.h"
#include "decompress.h"
#include "graphics.h"
#include "main.h"
#include "m4a.h"
#include "pokeball.h"
#include "pokemon.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
#include "trig.h"
#include "util.h"

Some files were not shown because too many files have changed in this diff Show More