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

Address review comments

Browse Source
This commit is contained in:
PikalaxALT
2020-01-19 16:19:35 -05:00
parent 23949274b6
commit c365f58833
20 changed files with 82 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/graphics.s
+2 -2
View File
@@ -13476,7 +13476,7 @@ gTrainerBackPic_Leaf:: @ 8E6C6BC
.incbin "graphics/trainers/back_pics/leaf_back_pic.4bpp" .incbin "graphics/trainers/back_pics/leaf_back_pic.4bpp"
.align 2 .align 2
gTrainerBackPic_PokeDude:: @ 8E6EEBC gTrainerBackPic_Pokedude:: @ 8E6EEBC
.incbin "graphics/trainers/back_pics/pokedude_back_pic.4bpp" .incbin "graphics/trainers/back_pics/pokedude_back_pic.4bpp"
.align 2 .align 2
@@ -13500,7 +13500,7 @@ gTrainerPalette_LeafBackPic:: @ 8E76EE4
.incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz" .incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz"
.align 2 .align 2
gTrainerPalette_PokeDudeBackPic:: @ 8E76F0C gTrainerPalette_PokedudeBackPic:: @ 8E76F0C
.incbin "graphics/trainers/palettes/pokedude_back_pic.gbapal.lz" .incbin "graphics/trainers/palettes/pokedude_back_pic.gbapal.lz"
.align 2 .align 2
data/text/teachy_tv.inc
+3 -3
View File
@@ -19,7 +19,7 @@ gTeachyTvString_RegisterItem:: @ 841B81B
gTeachyTvString_Cancel:: @ 841B836 gTeachyTvString_Cancel:: @ 841B836
.string "CANCEL$" .string "CANCEL$"
gTeachyTvText_PokeDudeSaysHello:: @ 841B83D gTeachyTvText_PokedudeSaysHello:: @ 841B83D
.string "Hey, all you TRAINERS out there!\n" .string "Hey, all you TRAINERS out there!\n"
.string "HELLO, TRAINERS!\p" .string "HELLO, TRAINERS!\p"
.string "……… ……… ………\p" .string "……… ……… ………\p"
@@ -164,7 +164,7 @@ gTeachyTvText_TMsScript1:: @ 841C459
.string "You can check them out in detail,\n" .string "You can check them out in detail,\n"
.string "too.$" .string "too.$"
gPokeDudeText_TMTypes:: @ 841C587 gPokedudeText_TMTypes:: @ 841C587
.string "POKé DUDE: NORMAL, WATER, GRASS…\n" .string "POKé DUDE: NORMAL, WATER, GRASS…\n"
.string "TMs also come in types.\p" .string "TMs also come in types.\p"
.string "Check the type and teach it to\n" .string "Check the type and teach it to\n"
@@ -175,7 +175,7 @@ gPokeDudeText_TMTypes:: @ 841C587
.string "GRASS-type POKéMON can learn.\p" .string "GRASS-type POKéMON can learn.\p"
.string "There's one other thing!$" .string "There's one other thing!$"
gPokeDudeText_ReadTMDescription:: @ 841C693 gPokedudeText_ReadTMDescription:: @ 841C693
.string "Don't just look at the type, read\n" .string "Don't just look at the type, read\n"
.string "the description, too.\p" .string "the description, too.\p"
.string "It will contain hints about what\n" .string "It will contain hints about what\n"
include/constants/item_menu.h
+1 -1
View File
@@ -12,7 +12,7 @@
#define ITEMMENULOCATION_ITEMPC 3 #define ITEMMENULOCATION_ITEMPC 3
#define ITEMMENULOCATION_PCBOX 4 #define ITEMMENULOCATION_PCBOX 4
#define ITEMMENULOCATION_BATTLE 5 #define ITEMMENULOCATION_BATTLE 5
#define ITEMMENULOCATION_OLDMAN 6 #define ITEMMENULOCATION_OLD_MAN 6
#define ITEMMENULOCATION_TTVSCR_STATUS 7 #define ITEMMENULOCATION_TTVSCR_STATUS 7
#define ITEMMENULOCATION_TTVSCR_CATCHING 8 #define ITEMMENULOCATION_TTVSCR_CATCHING 8
#define ITEMMENULOCATION_TTVSCR_REGISTER 9 #define ITEMMENULOCATION_TTVSCR_REGISTER 9
include/data.h
+1 -1
View File
@@ -57,7 +57,7 @@ extern const struct SpriteFrameImage gUnknown_82346D8[];
extern const struct SpriteFrameImage gUnknown_82346F8[]; extern const struct SpriteFrameImage gUnknown_82346F8[];
extern const struct SpriteFrameImage gTrainerBackPicTable_Red[]; extern const struct SpriteFrameImage gTrainerBackPicTable_Red[];
extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[]; extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[];
extern const struct SpriteFrameImage gTrainerBackPicTable_PokeDude[]; extern const struct SpriteFrameImage gTrainerBackPicTable_Pokedude[];
extern const struct SpriteFrameImage gTrainerBackPicTable_OldMan[]; extern const struct SpriteFrameImage gTrainerBackPicTable_OldMan[];
extern const struct SpriteFrameImage gTrainerBackPicTable_RSBrendan[]; extern const struct SpriteFrameImage gTrainerBackPicTable_RSBrendan[];
extern const struct SpriteFrameImage gTrainerBackPicTable_RSMay[]; extern const struct SpriteFrameImage gTrainerBackPicTable_RSMay[];
include/graphics.h
+2 -2
View File
@@ -2652,7 +2652,7 @@ extern const u32 gTrainerPalette_RSBrendan1[];
extern const u32 gTrainerPalette_RSMay1[]; extern const u32 gTrainerPalette_RSMay1[];
extern const u32 gTrainerPalette_LeafBackPic[]; extern const u32 gTrainerPalette_LeafBackPic[];
extern const u32 gTrainerPalette_RedBackPic[]; extern const u32 gTrainerPalette_RedBackPic[];
extern const u32 gTrainerPalette_PokeDudeBackPic[]; extern const u32 gTrainerPalette_PokedudeBackPic[];
extern const u32 gTrainerPalette_OldManBackPic[]; extern const u32 gTrainerPalette_OldManBackPic[];
extern const u32 gTrainerPalette_PokemonBreederM[]; extern const u32 gTrainerPalette_PokemonBreederM[];
extern const u32 gTrainerPalette_RSPokemonBreederF[]; extern const u32 gTrainerPalette_RSPokemonBreederF[];
@@ -4354,7 +4354,7 @@ extern const u8 gBerryPouchBg1Tilemap[];
extern const u8 gTrainerBackPic_Red[]; extern const u8 gTrainerBackPic_Red[];
extern const u8 gTrainerBackPic_Leaf[]; extern const u8 gTrainerBackPic_Leaf[];
extern const u8 gTrainerBackPic_PokeDude[]; extern const u8 gTrainerBackPic_Pokedude[];
extern const u8 gTrainerBackPic_OldMan[]; extern const u8 gTrainerBackPic_OldMan[];
extern const u8 gTrainerBackPic_RSBrendan[]; extern const u8 gTrainerBackPic_RSBrendan[];
extern const u8 gTrainerBackPic_RSMay[]; extern const u8 gTrainerBackPic_RSMay[];
include/item_menu.h
+3 -3
View File
@@ -11,9 +11,9 @@
struct BagStruct struct BagStruct
{ {
void (*bagCallback)(void); MainCallback bagCallback;
u8 location; u8 location;
u8 bagOpen; bool8 bagOpen;
u16 pocket; u16 pocket;
u16 itemsAbove[3]; u16 itemsAbove[3];
u16 cursorPos[3]; u16 cursorPos[3];
@@ -28,7 +28,7 @@ void sub_81AAC50(void);
void sub_81AAC70(void); void sub_81AAC70(void);
void CB2_SetUpReshowBattleScreenAfterMenu(void); void CB2_SetUpReshowBattleScreenAfterMenu(void);
void ResetBagCursorPositions(void); void ResetBagCursorPositions(void);
void InitPokeDudeBag(u8); void InitPokedudeBag(u8);
void CB2_BagMenuFromStartMenu(void); void CB2_BagMenuFromStartMenu(void);
void MoveItemSlotInList(struct ItemSlot * itemSlots_, u32 from, u32 to_); void MoveItemSlotInList(struct ItemSlot * itemSlots_, u32 from, u32 to_);
void ItemMenu_StartFadeToExitCallback(u8 taskId); void ItemMenu_StartFadeToExitCallback(u8 taskId);
include/strings.h
+3 -3
View File
@@ -112,8 +112,8 @@ extern const u8 gText_OhNoICantBuyThat[];
extern const u8 gText_HowManyWouldYouLikeToSell[]; extern const u8 gText_HowManyWouldYouLikeToSell[];
extern const u8 gText_ICanPayThisMuch_WouldThatBeOkay[]; extern const u8 gText_ICanPayThisMuch_WouldThatBeOkay[];
extern const u8 gText_TurnedOverItemsWorthYen[]; extern const u8 gText_TurnedOverItemsWorthYen[];
extern const u8 gPokeDudeText_TMTypes[]; extern const u8 gPokedudeText_TMTypes[];
extern const u8 gPokeDudeText_ReadTMDescription[]; extern const u8 gPokedudeText_ReadTMDescription[];
extern const u8 gFameCheckerText_Cancel[]; extern const u8 gFameCheckerText_Cancel[];
extern const u8 gFameCheckerText_ListMenuCursor[]; extern const u8 gFameCheckerText_ListMenuCursor[];
extern const u8 gFameCheckerText_FameCheckerWillBeClosed[]; extern const u8 gFameCheckerText_FameCheckerWillBeClosed[];
@@ -134,7 +134,7 @@ extern const u8 gTeachyTvString_CatchPkmn[];
extern const u8 gTeachyTvString_AboutTMs[]; extern const u8 gTeachyTvString_AboutTMs[];
extern const u8 gTeachyTvString_RegisterItem[]; extern const u8 gTeachyTvString_RegisterItem[];
extern const u8 gTeachyTvString_Cancel[]; extern const u8 gTeachyTvString_Cancel[];
extern const u8 gTeachyTvText_PokeDudeSaysHello[]; extern const u8 gTeachyTvText_PokedudeSaysHello[];
extern const u8 gTeachyTvText_BattleScript1[]; extern const u8 gTeachyTvText_BattleScript1[];
extern const u8 gTeachyTvText_StatusScript1[]; extern const u8 gTeachyTvText_StatusScript1[];
extern const u8 gTeachyTvText_MatchupsScript1[]; extern const u8 gTeachyTvText_MatchupsScript1[];
include/tm_case.h
+1 -1
View File
@@ -13,6 +13,6 @@ enum TmCaseType
void InitTMCase(u8 a0, void (* a1)(void), u8 a2); void InitTMCase(u8 a0, void (* a1)(void), u8 a2);
void ResetTMCaseCursorPos(void); void ResetTMCaseCursorPos(void);
void PokeDude_InitTMCase(void); void Pokedude_InitTMCase(void);
#endif //GUARD_TM_CASE_H #endif //GUARD_TM_CASE_H
src/battle_controller_pokedude.c
+1 -1
View File
@@ -742,7 +742,7 @@ static void OpenBagAndChooseItem(void)
callbackId = ITEMMENULOCATION_TTVSCR_CATCHING; callbackId = ITEMMENULOCATION_TTVSCR_CATCHING;
break; break;
} }
InitPokeDudeBag(callbackId); InitPokedudeBag(callbackId);
} }
} }
src/battle_main.c
+3 -3
View File
@@ -86,7 +86,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum);
static void CB2_HandleStartBattle(void); static void CB2_HandleStartBattle(void);
static void TryCorrectShedinjaLanguage(struct Pokemon *mon); static void TryCorrectShedinjaLanguage(struct Pokemon *mon);
static void BattleMainCB1(void); static void BattleMainCB1(void);
static void CB2_QuitPokeDudeBattle(void); static void CB2_QuitPokedudeBattle(void);
static void sub_80111FC(struct Sprite *sprite); static void sub_80111FC(struct Sprite *sprite);
static void sub_8011B94(void); static void sub_8011B94(void);
static void sub_8011BB0(void); static void sub_8011BB0(void);
@@ -1438,7 +1438,7 @@ void BattleMainCB2(void)
gSpecialVar_Result = gBattleOutcome = B_OUTCOME_DREW; gSpecialVar_Result = gBattleOutcome = B_OUTCOME_DREW;
ResetPaletteFadeControl(); ResetPaletteFadeControl();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
SetMainCallback2(CB2_QuitPokeDudeBattle); SetMainCallback2(CB2_QuitPokedudeBattle);
} }
} }
@@ -1454,7 +1454,7 @@ void FreeRestoreBattleData(void)
FreeBattleResources(); FreeBattleResources();
} }
static void CB2_QuitPokeDudeBattle(void) static void CB2_QuitPokedudeBattle(void)
{ {
UpdatePaletteFade(); UpdatePaletteFade();
if (!gPaletteFade.active) if (!gPaletteFade.active)
src/battle_message.c
+2 -2
View File
@@ -463,7 +463,7 @@ const u8 *const gPokeblockWasTooXStringTable[] = {
static const u8 sText_PlayerUsedItem[] = _("{B_PLAYER_NAME} used\n{B_LAST_ITEM}!"); static const u8 sText_PlayerUsedItem[] = _("{B_PLAYER_NAME} used\n{B_LAST_ITEM}!");
static const u8 sText_OldManUsedItem[] = _("The old man used\n{B_LAST_ITEM}!"); static const u8 sText_OldManUsedItem[] = _("The old man used\n{B_LAST_ITEM}!");
static const u8 sText_PokeDudeUsedItem[] = _("The POKé DUDE used\n{B_LAST_ITEM}!"); static const u8 sText_PokedudeUsedItem[] = _("The POKé DUDE used\n{B_LAST_ITEM}!");
static const u8 sText_Trainer1UsedItem[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME}\nused {B_LAST_ITEM}!"); static const u8 sText_Trainer1UsedItem[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME}\nused {B_LAST_ITEM}!");
static const u8 sText_TrainerBlockedBall[] = _("The TRAINER blocked the BALL!"); static const u8 sText_TrainerBlockedBall[] = _("The TRAINER blocked the BALL!");
static const u8 sText_DontBeAThief[] = _("Don't be a thief!"); static const u8 sText_DontBeAThief[] = _("Don't be a thief!");
@@ -876,7 +876,7 @@ const u8 *const gBattleStringsTable[] = {
Text_1A5D31, Text_1A5D31,
Text_1A5D6E, Text_1A5D6E,
Text_1A5DB1, Text_1A5DB1,
sText_PokeDudeUsedItem, sText_PokedudeUsedItem,
gUnknown_83FDA4D, gUnknown_83FDA4D,
gUnknown_83FDA7A, gUnknown_83FDA7A,
gUnknown_83FDA8C, gUnknown_83FDA8C,
src/data.c
+5 -5
View File
@@ -60,12 +60,12 @@ const struct SpriteFrameImage gTrainerBackPicTable_Leaf[] =
gTrainerBackPic_Leaf + 0x2000, 0x0800, gTrainerBackPic_Leaf + 0x2000, 0x0800,
}; };
const struct SpriteFrameImage gTrainerBackPicTable_PokeDude[] = const struct SpriteFrameImage gTrainerBackPicTable_Pokedude[] =
{ {
gTrainerBackPic_PokeDude, 0x0800, gTrainerBackPic_Pokedude, 0x0800,
gTrainerBackPic_PokeDude + 0x0800, 0x0800, gTrainerBackPic_Pokedude + 0x0800, 0x0800,
gTrainerBackPic_PokeDude + 0x1000, 0x0800, gTrainerBackPic_Pokedude + 0x1000, 0x0800,
gTrainerBackPic_PokeDude + 0x1800, 0x0800, gTrainerBackPic_Pokedude + 0x1800, 0x0800,
}; };
const struct SpriteFrameImage gTrainerBackPicTable_OldMan[] = const struct SpriteFrameImage gTrainerBackPicTable_OldMan[] =
src/data/trainer_graphics/back_pic_anims.h
+4 -4
View File
@@ -16,7 +16,7 @@ static const union AnimCmd sAnimCmd_Leaf_1[] = {
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sAnimCmd_PokeDude_1[] = { static const union AnimCmd sAnimCmd_Pokedude_1[] = {
ANIMCMD_FRAME(1, 24), ANIMCMD_FRAME(1, 24),
ANIMCMD_FRAME(2, 9), ANIMCMD_FRAME(2, 9),
ANIMCMD_FRAME(3, 24), ANIMCMD_FRAME(3, 24),
@@ -60,9 +60,9 @@ const union AnimCmd *const sBackAnims_Leaf[] = {
sAnimCmd_Leaf_1 sAnimCmd_Leaf_1
}; };
const union AnimCmd *const sBackAnims_PokeDude[] = { const union AnimCmd *const sBackAnims_Pokedude[] = {
sAnim_GeneralFrame0, sAnim_GeneralFrame0,
sAnimCmd_PokeDude_1 sAnimCmd_Pokedude_1
}; };
const union AnimCmd *const sBackAnims_OldMan[] = { const union AnimCmd *const sBackAnims_OldMan[] = {
@@ -85,6 +85,6 @@ const union AnimCmd *const *const gTrainerBackAnimsPtrTable[] = {
sBackAnims_Leaf, sBackAnims_Leaf,
sBackAnims_RSBrendan, sBackAnims_RSBrendan,
sBackAnims_RSMay, sBackAnims_RSMay,
sBackAnims_PokeDude, sBackAnims_Pokedude,
sBackAnims_OldMan sBackAnims_OldMan
}; };
src/data/trainer_graphics/back_pic_tables.h
+2 -2
View File
@@ -12,7 +12,7 @@ const struct CompressedSpriteSheet gTrainerBackPicTable[] = {
{ (const u32 *)gTrainerBackPic_Leaf, 0x2800, 1 }, { (const u32 *)gTrainerBackPic_Leaf, 0x2800, 1 },
{ (const u32 *)gTrainerBackPic_RSBrendan, 0x2000, 2 }, { (const u32 *)gTrainerBackPic_RSBrendan, 0x2000, 2 },
{ (const u32 *)gTrainerBackPic_RSMay, 0x2000, 3 }, { (const u32 *)gTrainerBackPic_RSMay, 0x2000, 3 },
{ (const u32 *)gTrainerBackPic_PokeDude, 0x2000, 4 }, { (const u32 *)gTrainerBackPic_Pokedude, 0x2000, 4 },
{ (const u32 *)gTrainerBackPic_OldMan, 0x2000, 5 } { (const u32 *)gTrainerBackPic_OldMan, 0x2000, 5 }
}; };
@@ -21,6 +21,6 @@ const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] = {
{ gTrainerPalette_LeafBackPic, 1 }, { gTrainerPalette_LeafBackPic, 1 },
{ gTrainerPalette_RSBrendan1, 2 }, { gTrainerPalette_RSBrendan1, 2 },
{ gTrainerPalette_RSMay1, 3 }, { gTrainerPalette_RSMay1, 3 },
{ gTrainerPalette_PokeDudeBackPic, 4 }, { gTrainerPalette_PokedudeBackPic, 4 },
{ gTrainerPalette_OldManBackPic, 5 } { gTrainerPalette_OldManBackPic, 5 }
}; };
src/graphics.c
View File
src/item_menu.c
+28 -27
View File
@@ -152,8 +152,8 @@ static void Task_SelectQuantityToDeposit(u8 taskId);
static void Task_TryDoItemDeposit(u8 taskId); static void Task_TryDoItemDeposit(u8 taskId);
static bool8 BagIsTutorial(void); static bool8 BagIsTutorial(void);
static void Task_Bag_OldManTutorial(u8 taskId); static void Task_Bag_OldManTutorial(u8 taskId);
static void Task_PokeDude_FadeFromBag(u8 taskId); static void Task_Pokedude_FadeFromBag(u8 taskId);
static void Task_PokeDude_WaitFadeAndExitBag(u8 taskId); static void Task_Pokedude_WaitFadeAndExitBag(u8 taskId);
static void Task_Bag_TeachyTvRegister(u8 taskId); static void Task_Bag_TeachyTvRegister(u8 taskId);
static void Task_Bag_TeachyTvCatching(u8 taskId); static void Task_Bag_TeachyTvCatching(u8 taskId);
static void Task_Bag_TeachyTvStatus(u8 taskId); static void Task_Bag_TeachyTvStatus(u8 taskId);
@@ -276,7 +276,7 @@ static const TaskFunc sItemContextTaskFuncs[] = {
[ITEMMENULOCATION_ITEMPC] = Task_ItemContext_Deposit, [ITEMMENULOCATION_ITEMPC] = Task_ItemContext_Deposit,
[ITEMMENULOCATION_PCBOX] = Task_ItemContext_PcBoxGive, [ITEMMENULOCATION_PCBOX] = Task_ItemContext_PcBoxGive,
[ITEMMENULOCATION_BATTLE] = Task_ItemContext_FieldOrBattle, [ITEMMENULOCATION_BATTLE] = Task_ItemContext_FieldOrBattle,
[ITEMMENULOCATION_OLDMAN] = NULL [ITEMMENULOCATION_OLD_MAN] = NULL
}; };
static const struct YesNoFuncTable sYesNoMenu_Toss = { static const struct YesNoFuncTable sYesNoMenu_Toss = {
@@ -331,7 +331,7 @@ void GoToBagMenu(u8 location, u8 pocket, MainCallback bagCallback)
sBagMenuDisplay->pocketSwitchArrowsTask = 0xFF; sBagMenuDisplay->pocketSwitchArrowsTask = 0xFF;
if (location == ITEMMENULOCATION_ITEMPC) if (location == ITEMMENULOCATION_ITEMPC)
sBagMenuDisplay->pocketSwitchMode = 1; sBagMenuDisplay->pocketSwitchMode = 1;
else if (location == ITEMMENULOCATION_OLDMAN) else if (location == ITEMMENULOCATION_OLD_MAN)
sBagMenuDisplay->pocketSwitchMode = 2; sBagMenuDisplay->pocketSwitchMode = 2;
else else
sBagMenuDisplay->pocketSwitchMode = 0; sBagMenuDisplay->pocketSwitchMode = 0;
@@ -609,7 +609,7 @@ static u8 CreateBagInputHandlerTask(u8 location)
{ {
switch (location) switch (location)
{ {
case ITEMMENULOCATION_OLDMAN: case ITEMMENULOCATION_OLD_MAN:
return CreateTask(Task_Bag_OldManTutorial, 0); return CreateTask(Task_Bag_OldManTutorial, 0);
case ITEMMENULOCATION_TTVSCR_REGISTER: case ITEMMENULOCATION_TTVSCR_REGISTER:
return CreateTask(Task_Bag_TeachyTvRegister, 0); return CreateTask(Task_Bag_TeachyTvRegister, 0);
@@ -626,10 +626,11 @@ static u8 CreateBagInputHandlerTask(u8 location)
static bool8 TryAllocListMenuBuffers(void) static bool8 TryAllocListMenuBuffers(void)
{ {
sListMenuItems = Alloc(43 * sizeof(struct ListMenuItem)); // The items pocket has the highest capacity, + 1 for CANCEL
sListMenuItems = Alloc((BAG_ITEMS_COUNT + 1) * sizeof(struct ListMenuItem));
if (sListMenuItems == NULL) if (sListMenuItems == NULL)
return FALSE; return FALSE;
sListMenuItemStrings = Alloc(43 * 19); sListMenuItemStrings = Alloc((BAG_ITEMS_COUNT + 1) * sizeof(*sListMenuItemStrings));
if (sListMenuItemStrings == NULL) if (sListMenuItemStrings == NULL)
return FALSE; return FALSE;
return TRUE; return TRUE;
@@ -835,7 +836,7 @@ void ResetBagCursorPositions(void)
{ {
u8 i; u8 i;
gBagMenuState.pocket = POCKET_ITEMS - 1; gBagMenuState.pocket = POCKET_ITEMS - 1;
gBagMenuState.bagOpen = 0; gBagMenuState.bagOpen = FALSE;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
gBagMenuState.itemsAbove[i] = 0; gBagMenuState.itemsAbove[i] = 0;
@@ -923,10 +924,10 @@ static void ShowBagOrBeginWin0OpenTask(void)
LoadPalette(&paldata, 0x00, 0x02); LoadPalette(&paldata, 0x00, 0x02);
SetGpuReg(REG_OFFSET_WININ, 0); SetGpuReg(REG_OFFSET_WININ, 0);
SetGpuReg(REG_OFFSET_WINOUT, 0x3F); SetGpuReg(REG_OFFSET_WINOUT, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
if (gBagMenuState.bagOpen == 1) if (gBagMenuState.bagOpen == TRUE)
{ {
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 240)); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 240));
SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(0, 0)); SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(0, 0));
@@ -938,7 +939,7 @@ static void ShowBagOrBeginWin0OpenTask(void)
taskId = CreateTask(Task_AnimateWin0v, 0); taskId = CreateTask(Task_AnimateWin0v, 0);
gTasks[taskId].data[0] = 192; gTasks[taskId].data[0] = 192;
gTasks[taskId].data[1] = -16; gTasks[taskId].data[1] = -16;
gBagMenuState.bagOpen = 1; gBagMenuState.bagOpen = TRUE;
} }
} }
@@ -948,12 +949,12 @@ void Bag_BeginCloseWin0Animation(void)
u8 taskId = CreateTask(Task_AnimateWin0v, 0); u8 taskId = CreateTask(Task_AnimateWin0v, 0);
gTasks[taskId].data[0] = -16; gTasks[taskId].data[0] = -16;
gTasks[taskId].data[1] = 16; gTasks[taskId].data[1] = 16;
gBagMenuState.bagOpen = 0; gBagMenuState.bagOpen = FALSE;
} }
void CB2_SetUpReshowBattleScreenAfterMenu(void) void CB2_SetUpReshowBattleScreenAfterMenu(void)
{ {
gBagMenuState.bagOpen = 0; gBagMenuState.bagOpen = FALSE;
} }
static void Task_AnimateWin0v(u8 taskId) static void Task_AnimateWin0v(u8 taskId)
@@ -1363,7 +1364,7 @@ static void OpenContextMenu(u8 taskId)
sContextMenuNumItems = 1; sContextMenuNumItems = 1;
} }
break; break;
case ITEMMENULOCATION_OLDMAN: case ITEMMENULOCATION_OLD_MAN:
case ITEMMENULOCATION_TTVSCR_CATCHING: case ITEMMENULOCATION_TTVSCR_CATCHING:
sContextMenuItemsPtr = sContextMenuItems_BattleUse; sContextMenuItemsPtr = sContextMenuItems_BattleUse;
sContextMenuNumItems = 2; sContextMenuNumItems = 2;
@@ -2050,7 +2051,7 @@ bool8 UseRegisteredKeyItemOnField(void)
static bool8 BagIsTutorial(void) static bool8 BagIsTutorial(void)
{ {
if ( if (
gBagMenuState.location == ITEMMENULOCATION_OLDMAN gBagMenuState.location == ITEMMENULOCATION_OLD_MAN
|| gBagMenuState.location == ITEMMENULOCATION_TTVSCR_CATCHING || gBagMenuState.location == ITEMMENULOCATION_TTVSCR_CATCHING
|| gBagMenuState.location == ITEMMENULOCATION_TTVSCR_STATUS || gBagMenuState.location == ITEMMENULOCATION_TTVSCR_STATUS
|| gBagMenuState.location == ITEMMENULOCATION_TTVSCR_REGISTER || gBagMenuState.location == ITEMMENULOCATION_TTVSCR_REGISTER
@@ -2102,7 +2103,7 @@ void InitOldManBag(void)
BackUpPlayerBag(); BackUpPlayerBag();
AddBagItem(ITEM_POTION, 1); AddBagItem(ITEM_POTION, 1);
AddBagItem(ITEM_POKE_BALL, 1); AddBagItem(ITEM_POKE_BALL, 1);
GoToBagMenu(ITEMMENULOCATION_OLDMAN, OPEN_BAG_ITEMS, SetCB2ToReshowScreenAfterMenu2); GoToBagMenu(ITEMMENULOCATION_OLD_MAN, OPEN_BAG_ITEMS, SetCB2ToReshowScreenAfterMenu2);
} }
static void Task_Bag_OldManTutorial(u8 taskId) static void Task_Bag_OldManTutorial(u8 taskId)
@@ -2134,20 +2135,20 @@ static void Task_Bag_OldManTutorial(u8 taskId)
DestroyListMenuTask(data[0], NULL, NULL); DestroyListMenuTask(data[0], NULL, NULL);
RestorePlayerBag(); RestorePlayerBag();
Bag_BeginCloseWin0Animation(); Bag_BeginCloseWin0Animation();
gTasks[taskId].func = Task_PokeDude_FadeFromBag; gTasks[taskId].func = Task_Pokedude_FadeFromBag;
return; return;
} }
data[8]++; data[8]++;
} }
} }
static void Task_PokeDude_FadeFromBag(u8 taskId) static void Task_Pokedude_FadeFromBag(u8 taskId)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_PokeDude_WaitFadeAndExitBag; gTasks[taskId].func = Task_Pokedude_WaitFadeAndExitBag;
} }
static void Task_PokeDude_WaitFadeAndExitBag(u8 taskId) static void Task_Pokedude_WaitFadeAndExitBag(u8 taskId)
{ {
if (!gPaletteFade.active && FuncIsActiveTask(Task_AnimateWin0v) != TRUE) if (!gPaletteFade.active && FuncIsActiveTask(Task_AnimateWin0v) != TRUE)
{ {
@@ -2161,7 +2162,7 @@ static void Task_PokeDude_WaitFadeAndExitBag(u8 taskId)
} }
} }
void InitPokeDudeBag(u8 a0) void InitPokedudeBag(u8 a0)
{ {
MainCallback cb2; MainCallback cb2;
u8 location; u8 location;
@@ -2198,7 +2199,7 @@ static bool8 Task_BButtonInterruptTeachyTv(u8 taskId)
RestorePlayerBag(); RestorePlayerBag();
SetTeachyTvControllerModeToResume(); SetTeachyTvControllerModeToResume();
sBagMenuDisplay->exitCB = CB2_ReturnToTeachyTV; sBagMenuDisplay->exitCB = CB2_ReturnToTeachyTV;
gTasks[taskId].func = Task_PokeDude_FadeFromBag; gTasks[taskId].func = Task_Pokedude_FadeFromBag;
return TRUE; return TRUE;
} }
else else
@@ -2254,7 +2255,7 @@ static void Task_Bag_TeachyTvRegister(u8 taskId)
DestroyListMenuTask(data[0], NULL, NULL); DestroyListMenuTask(data[0], NULL, NULL);
RestorePlayerBag(); RestorePlayerBag();
Bag_BeginCloseWin0Animation(); Bag_BeginCloseWin0Animation();
gTasks[taskId].func = Task_PokeDude_FadeFromBag; gTasks[taskId].func = Task_Pokedude_FadeFromBag;
return; return;
} }
data[8]++; data[8]++;
@@ -2308,7 +2309,7 @@ static void Task_Bag_TeachyTvCatching(u8 taskId)
DestroyListMenuTask(data[0], NULL, NULL); DestroyListMenuTask(data[0], NULL, NULL);
RestorePlayerBag(); RestorePlayerBag();
Bag_BeginCloseWin0Animation(); Bag_BeginCloseWin0Animation();
gTasks[taskId].func = Task_PokeDude_FadeFromBag; gTasks[taskId].func = Task_Pokedude_FadeFromBag;
return; return;
} }
data[8]++; data[8]++;
@@ -2351,7 +2352,7 @@ static void Task_Bag_TeachyTvStatus(u8 taskId)
RestorePlayerBag(); RestorePlayerBag();
gItemUseCB = ItemUseCB_MedicineStep; gItemUseCB = ItemUseCB_MedicineStep;
ItemMenu_SetExitCallback(ChooseMonForInBattleItem); ItemMenu_SetExitCallback(ChooseMonForInBattleItem);
gTasks[taskId].func = Task_PokeDude_FadeFromBag; gTasks[taskId].func = Task_Pokedude_FadeFromBag;
return; return;
} }
data[8]++; data[8]++;
@@ -2390,8 +2391,8 @@ static void Task_Bag_TeachyTvTMs(u8 taskId)
CopyWindowToVram(0, 1); CopyWindowToVram(0, 1);
DestroyListMenuTask(data[0], NULL, NULL); DestroyListMenuTask(data[0], NULL, NULL);
RestorePlayerBag(); RestorePlayerBag();
sBagMenuDisplay->exitCB = PokeDude_InitTMCase; sBagMenuDisplay->exitCB = Pokedude_InitTMCase;
gTasks[taskId].func = Task_PokeDude_FadeFromBag; gTasks[taskId].func = Task_Pokedude_FadeFromBag;
return; return;
} }
data[8]++; data[8]++;
src/item_pc.c
+3 -3
View File
@@ -781,7 +781,7 @@ static void ItemPc_MoveItemModeInit(u8 taskId, s16 pos)
FillWindowPixelBuffer(1, 0x00); FillWindowPixelBuffer(1, 0x00);
ItemPc_AddTextPrinterParameterized(1, 2, gStringVar4, 0, 3, 2, 3, 0, 0); ItemPc_AddTextPrinterParameterized(1, 2, gStringVar4, 0, 3, 2, 3, 0, 0);
ItemMenuIcons_MoveInsertIndicatorBar(-32, ListMenuGetYCoordForPrintingArrowCursor(data[0])); ItemMenuIcons_MoveInsertIndicatorBar(-32, ListMenuGetYCoordForPrintingArrowCursor(data[0]));
ItemMenuIcons_ToggleInsertIndicatorBarVisibility(0); ItemMenuIcons_ToggleInsertIndicatorBarVisibility(FALSE);
ItemPc_PrintOrRemoveCursor(data[0], 2); ItemPc_PrintOrRemoveCursor(data[0], 2);
gTasks[taskId].func = Task_ItemPcMoveItemModeRun; gTasks[taskId].func = Task_ItemPcMoveItemModeRun;
} }
@@ -820,7 +820,7 @@ static void ItemPc_InsertItemIntoNewSlot(u8 taskId, u32 pos)
sListMenuState.row--; sListMenuState.row--;
ItemPc_BuildListMenuTemplate(); ItemPc_BuildListMenuTemplate();
data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sListMenuState.scroll, sListMenuState.row); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sListMenuState.scroll, sListMenuState.row);
ItemMenuIcons_ToggleInsertIndicatorBarVisibility(1); ItemMenuIcons_ToggleInsertIndicatorBarVisibility(TRUE);
gTasks[taskId].func = Task_ItemPcMain; gTasks[taskId].func = Task_ItemPcMain;
} }
} }
@@ -834,7 +834,7 @@ static void ItemPc_MoveItemModeCancel(u8 taskId, u32 pos)
sListMenuState.row--; sListMenuState.row--;
ItemPc_BuildListMenuTemplate(); ItemPc_BuildListMenuTemplate();
data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sListMenuState.scroll, sListMenuState.row); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sListMenuState.scroll, sListMenuState.row);
ItemMenuIcons_ToggleInsertIndicatorBarVisibility(1); ItemMenuIcons_ToggleInsertIndicatorBarVisibility(TRUE);
gTasks[taskId].func = Task_ItemPcMain; gTasks[taskId].func = Task_ItemPcMain;
} }
src/pokemon.c
+1 -1
View File
@@ -1547,7 +1547,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.paletteTag = 0, .paletteTag = 0,
.oam = &gOamData_824F018, .oam = &gOamData_824F018,
.anims = NULL, .anims = NULL,
.images = gTrainerBackPicTable_PokeDude, .images = gTrainerBackPicTable_Pokedude,
.affineAnims = gSpriteAffineAnimTable_82348C8, .affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4, .callback = sub_80120C4,
}, },
src/teachy_tv.c
+3 -3
View File
@@ -795,7 +795,7 @@ static void TTVcmd_NpcMoveAndSetupTextPrinter(u8 taskId)
if (spriteAddr->pos2.x == 0x78) if (spriteAddr->pos2.x == 0x78)
{ {
StartSpriteAnim(&gSprites[data[1]], 0); StartSpriteAnim(&gSprites[data[1]], 0);
TeachyTvInitTextPrinter(gTeachyTvText_PokeDudeSaysHello); TeachyTvInitTextPrinter(gTeachyTvText_PokedudeSaysHello);
data[2] = 0; data[2] = 0;
++data[3]; ++data[3];
} }
@@ -1093,9 +1093,9 @@ static void TTVcmd_TaskBattleOrFadeByOptionChosen(u8 taskId)
static void TeachyTvSetupBagItemsByOptionChosen(void) static void TeachyTvSetupBagItemsByOptionChosen(void)
{ {
if (sStaticResources.whichScript == TTVSCR_TMS) if (sStaticResources.whichScript == TTVSCR_TMS)
InitPokeDudeBag(ITEMMENULOCATION_TTVSCR_TMS); InitPokedudeBag(ITEMMENULOCATION_TTVSCR_TMS);
else else
InitPokeDudeBag(ITEMMENULOCATION_TTVSCR_REGISTER); InitPokedudeBag(ITEMMENULOCATION_TTVSCR_REGISTER);
} }
static void TeachyTvPostBattleFadeControl(u8 taskId) static void TeachyTvPostBattleFadeControl(u8 taskId)
src/tm_case.c
+14 -14
View File
@@ -67,7 +67,7 @@ struct UnkStruct_203B11C
static EWRAM_DATA struct UnkStruct_203B10C sTMCaseStaticResources = {}; static EWRAM_DATA struct UnkStruct_203B10C sTMCaseStaticResources = {};
static EWRAM_DATA struct UnkStruct_203B118 * sTMCaseDynamicResources = NULL; static EWRAM_DATA struct UnkStruct_203B118 * sTMCaseDynamicResources = NULL;
static EWRAM_DATA struct UnkStruct_203B11C * sPokeDudePackBackup = NULL; static EWRAM_DATA struct UnkStruct_203B11C * sPokedudePackBackup = NULL;
static EWRAM_DATA void * sTilemapBuffer = NULL; // tilemap buffer static EWRAM_DATA void * sTilemapBuffer = NULL; // tilemap buffer
static EWRAM_DATA struct ListMenuItem * sListMenuItemsBuffer = NULL; static EWRAM_DATA struct ListMenuItem * sListMenuItemsBuffer = NULL;
static EWRAM_DATA u8 (* sListMenuStringsBuffer)[29] = NULL; static EWRAM_DATA u8 (* sListMenuStringsBuffer)[29] = NULL;
@@ -1133,13 +1133,13 @@ static void Task_AfterSale_ReturnToList(u8 taskId)
} }
} }
void PokeDude_InitTMCase(void) void Pokedude_InitTMCase(void)
{ {
sPokeDudePackBackup = AllocZeroed(sizeof(*sPokeDudePackBackup)); sPokedudePackBackup = AllocZeroed(sizeof(*sPokedudePackBackup));
memcpy(sPokeDudePackBackup->bagPocket_TMHM, gSaveBlock1Ptr->bagPocket_TMHM, sizeof(gSaveBlock1Ptr->bagPocket_TMHM)); memcpy(sPokedudePackBackup->bagPocket_TMHM, gSaveBlock1Ptr->bagPocket_TMHM, sizeof(gSaveBlock1Ptr->bagPocket_TMHM));
memcpy(sPokeDudePackBackup->bagPocket_KeyItems, gSaveBlock1Ptr->bagPocket_KeyItems, sizeof(gSaveBlock1Ptr->bagPocket_KeyItems)); memcpy(sPokedudePackBackup->bagPocket_KeyItems, gSaveBlock1Ptr->bagPocket_KeyItems, sizeof(gSaveBlock1Ptr->bagPocket_KeyItems));
sPokeDudePackBackup->unk_160 = sTMCaseStaticResources.selectedRow; sPokedudePackBackup->unk_160 = sTMCaseStaticResources.selectedRow;
sPokeDudePackBackup->unk_162 = sTMCaseStaticResources.scrollOffset; sPokedudePackBackup->unk_162 = sTMCaseStaticResources.scrollOffset;
ClearItemSlots(gSaveBlock1Ptr->bagPocket_TMHM, NELEMS(gSaveBlock1Ptr->bagPocket_TMHM)); ClearItemSlots(gSaveBlock1Ptr->bagPocket_TMHM, NELEMS(gSaveBlock1Ptr->bagPocket_TMHM));
ClearItemSlots(gSaveBlock1Ptr->bagPocket_KeyItems, NELEMS(gSaveBlock1Ptr->bagPocket_KeyItems)); ClearItemSlots(gSaveBlock1Ptr->bagPocket_KeyItems, NELEMS(gSaveBlock1Ptr->bagPocket_KeyItems));
ResetTMCaseCursorPos(); ResetTMCaseCursorPos();
@@ -1234,7 +1234,7 @@ static void Task_TMCaseDude_Playback(u8 taskId)
break; break;
case 8: case 8:
FillBG2RowWithPalette_2timesNplus1(1); FillBG2RowWithPalette_2timesNplus1(1);
TMCase_PrintMessageWithFollowupTask(taskId, 4, gPokeDudeText_TMTypes, 0); TMCase_PrintMessageWithFollowupTask(taskId, 4, gPokedudeText_TMTypes, 0);
gTasks[taskId].func = Task_TMCaseDude_Playback; gTasks[taskId].func = Task_TMCaseDude_Playback;
data[8]++; data[8]++;
break; break;
@@ -1256,7 +1256,7 @@ static void Task_TMCaseDude_Playback(u8 taskId)
break; break;
case 18: case 18:
FillBG2RowWithPalette_2timesNplus1(1); FillBG2RowWithPalette_2timesNplus1(1);
TMCase_PrintMessageWithFollowupTask(taskId, 4, gPokeDudeText_ReadTMDescription, NULL); TMCase_PrintMessageWithFollowupTask(taskId, 4, gPokedudeText_ReadTMDescription, NULL);
gTasks[taskId].func = Task_TMCaseDude_Playback; // this function gTasks[taskId].func = Task_TMCaseDude_Playback; // this function
data[8]++; data[8]++;
break; break;
@@ -1267,12 +1267,12 @@ static void Task_TMCaseDude_Playback(u8 taskId)
case 21: case 21:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
memcpy(gSaveBlock1Ptr->bagPocket_TMHM, sPokeDudePackBackup->bagPocket_TMHM, sizeof(gSaveBlock1Ptr->bagPocket_TMHM)); memcpy(gSaveBlock1Ptr->bagPocket_TMHM, sPokedudePackBackup->bagPocket_TMHM, sizeof(gSaveBlock1Ptr->bagPocket_TMHM));
memcpy(gSaveBlock1Ptr->bagPocket_KeyItems, sPokeDudePackBackup->bagPocket_KeyItems, sizeof(gSaveBlock1Ptr->bagPocket_KeyItems)); memcpy(gSaveBlock1Ptr->bagPocket_KeyItems, sPokedudePackBackup->bagPocket_KeyItems, sizeof(gSaveBlock1Ptr->bagPocket_KeyItems));
DestroyListMenuTask(data[0], NULL, NULL); DestroyListMenuTask(data[0], NULL, NULL);
sTMCaseStaticResources.selectedRow = sPokeDudePackBackup->unk_160; sTMCaseStaticResources.selectedRow = sPokedudePackBackup->unk_160;
sTMCaseStaticResources.scrollOffset = sPokeDudePackBackup->unk_162; sTMCaseStaticResources.scrollOffset = sPokedudePackBackup->unk_162;
Free(sPokeDudePackBackup); Free(sPokedudePackBackup);
CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
CB2_SetUpReshowBattleScreenAfterMenu(); CB2_SetUpReshowBattleScreenAfterMenu();
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, 0);