dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Change "navgear" to "pokenav"

Browse Source
This commit is contained in:
Phlosioneer
2019-04-07 18:10:53 -04:00
parent 0dc73b0b3a
commit d352999cd8
5 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/pokenav_unk_4.s
+2 -2
View File
@@ -1787,7 +1787,7 @@ sub_81CC058: @ 81CC058
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
bl PauseSpinningNavgearSprite bl PauseSpinningPokenavSprite
movs r2, 0 movs r2, 0
movs r1, 0x18 movs r1, 0x18
strh r1, [r0, 0x20] strh r1, [r0, 0x20]
@@ -1971,7 +1971,7 @@ _081CC1C4:
sub_81CC1DC: @ 81CC1DC sub_81CC1DC: @ 81CC1DC
push {lr} push {lr}
sub sp, 0x8 sub sp, 0x8
bl ResumeSpinningNavgearSprite bl ResumeSpinningPokenavSprite
movs r0, 0x20 movs r0, 0x20
str r0, [sp] str r0, [sp]
movs r0, 0x14 movs r0, 0x14
include/strings.h
+15 -15
View File
@@ -1008,21 +1008,21 @@ extern const u8 gText_SomeonesPC[];
extern const u8 gText_PlayersPC[]; extern const u8 gText_PlayersPC[];
extern const u8 gText_WhichPCShouldBeAccessed[]; extern const u8 gText_WhichPCShouldBeAccessed[];
extern const u8 gText_NavgearMatchCall_Strategy[]; extern const u8 gText_PokenavMatchCall_Strategy[];
extern const u8 gText_NavgearMatchCall_TrainerPokemon[]; extern const u8 gText_PokenavMatchCall_TrainerPokemon[];
extern const u8 gText_NavgearMatchCall_SelfIntroduction[]; extern const u8 gText_PokenavMatchCall_SelfIntroduction[];
extern const u8 gText_Navgear_ClearButtonList[]; extern const u8 gText_Pokenav_ClearButtonList[];
extern const u8 gText_NavgearMap_ZoomedOutButtons[]; extern const u8 gText_PokenavMap_ZoomedOutButtons[];
extern const u8 gText_NavgearMap_ZoomedInButtons[]; extern const u8 gText_PokenavMap_ZoomedInButtons[];
extern const u8 gText_NavgearCondition_MonListButtons[]; extern const u8 gText_PokenavCondition_MonListButtons[];
extern const u8 gText_NavgearCondition_MonStatusButtons[]; extern const u8 gText_PokenavCondition_MonStatusButtons[];
extern const u8 gText_NavgearCondition_MarkingButtons[]; extern const u8 gText_PokenavCondition_MarkingButtons[];
extern const u8 gText_NavgearMatchCall_TrainerListButtons[]; extern const u8 gText_PokenavMatchCall_TrainerListButtons[];
extern const u8 gText_NavgearMatchCall_CallMenuButtons[]; extern const u8 gText_PokenavMatchCall_CallMenuButtons[];
extern const u8 gText_NavgearMatchCall_CheckTrainerButtons[]; extern const u8 gText_PokenavMatchCall_CheckTrainerButtons[];
extern const u8 gText_NavgearRibbons_MonListButtons[]; extern const u8 gText_PokenavRibbons_MonListButtons[];
extern const u8 gText_NavgearRibbons_RibbonListButtons[]; extern const u8 gText_PokenavRibbons_RibbonListButtons[];
extern const u8 gText_NavgearRibbons_RibbonCheckButtons[]; extern const u8 gText_PokenavRibbons_RibbonCheckButtons[];
extern const u8 gUnknown_085EAD37[]; extern const u8 gUnknown_085EAD37[];
extern const u8 gUnknown_085EAD41[]; extern const u8 gUnknown_085EAD41[];
src/pokenav_main_menu.c
+79 -79
View File
@@ -15,28 +15,28 @@
enum enum
{ {
NAVGEAR_GFX_MAIN_MENU, POKENAV_GFX_MAIN_MENU,
NAVGEAR_GFX_CONDITION_MENU, POKENAV_GFX_CONDITION_MENU,
NAVGEAR_GFX_RIBBONS_MENU, POKENAV_GFX_RIBBONS_MENU,
NAVGEAR_GFX_MATCH_CALL_MENU, POKENAV_GFX_MATCH_CALL_MENU,
// One of these is for the zoomed-in map, and the other is for the // One of these is for the zoomed-in map, and the other is for the
// zoomed-out map. Don't know which is which yet. // zoomed-out map. Don't know which is which yet.
NAVGEAR_GFX_MAP_MENU_UNK0, POKENAV_GFX_MAP_MENU_UNK0,
NAVGEAR_GFX_MAP_MENU_UNK1, POKENAV_GFX_MAP_MENU_UNK1,
NAVGEAR_GFX_PARTY_MENU, POKENAV_GFX_PARTY_MENU,
NAVGEAR_GFX_SEARCH_MENU, POKENAV_GFX_SEARCH_MENU,
NAVGEAR_GFX_COOL_MENU, POKENAV_GFX_COOL_MENU,
NAVGEAR_GFX_BEAUTY_MENU, POKENAV_GFX_BEAUTY_MENU,
NAVGEAR_GFX_CUTE_MENU, POKENAV_GFX_CUTE_MENU,
NAVGEAR_GFX_SMART_MENU, POKENAV_GFX_SMART_MENU,
NAVGEAR_GFX_TOUGH_MENU, POKENAV_GFX_TOUGH_MENU,
NAVGEAR_GFX_MENUS_END POKENAV_GFX_MENUS_END
}; };
#define NAVGEAR_GFX_SUBMENUS_START NAVGEAR_GFX_PARTY_MENU #define POKENAV_GFX_SUBMENUS_START POKENAV_GFX_PARTY_MENU
struct PokenavMainMenuResources struct PokenavMainMenuResources
{ {
@@ -46,7 +46,7 @@ struct PokenavMainMenuResources
u32 currentTaskId; u32 currentTaskId;
u32 unk10; u32 unk10;
u32 unk14; u32 unk14;
struct Sprite *spinningNavgear; struct Sprite *spinningPokenav;
struct Sprite *leftHeaderSprites[2]; struct Sprite *leftHeaderSprites[2];
struct Sprite *submenuLeftHeaderSprites[2]; struct Sprite *submenuLeftHeaderSprites[2];
u8 tilemapBuffer[0x800]; u8 tilemapBuffer[0x800];
@@ -79,12 +79,12 @@ u32 LoopedTask_ScrollMenuHeaderUp(s32 a0);
void sub_81C7BF8(u32 a0); void sub_81C7BF8(u32 a0);
void SpriteCB_SpinningNavgear(struct Sprite* sprite); void SpriteCB_SpinningPokenav(struct Sprite* sprite);
u32 LoopedTask_InitPokenavMenu(s32 a0); u32 LoopedTask_InitPokenavMenu(s32 a0);
const u16 gSpinningNavgearPaletteData[] = INCBIN_U16("graphics/pokenav/icon2.gbapal"); const u16 gSpinningPokenavPaletteData[] = INCBIN_U16("graphics/pokenav/icon2.gbapal");
const u32 gSpinningNavgearGfx[] = INCBIN_U32("graphics/pokenav/icon2.4bpp.lz"); const u32 gSpinningPokenavGfx[] = INCBIN_U32("graphics/pokenav/icon2.4bpp.lz");
const u32 gUnused_SpinningNavgearGfx2[] = INCBIN_U32("graphics/pokenav/icon2_unused.4bpp.lz"); const u32 gUnused_SpinningPokenavGfx2[] = INCBIN_U32("graphics/pokenav/icon2_unused.4bpp.lz");
const struct BgTemplate gPokenavMainMenuBgTemplates[] = const struct BgTemplate gPokenavMainMenuBgTemplates[] =
{ {
@@ -123,18 +123,18 @@ const struct WindowTemplate gUnknown_0861FA08[2] =
const u8 *const (sMenuButtonReminders[12]) = const u8 *const (sMenuButtonReminders[12]) =
{ {
gText_Navgear_ClearButtonList, gText_Pokenav_ClearButtonList,
gText_NavgearMap_ZoomedOutButtons, gText_PokenavMap_ZoomedOutButtons,
gText_NavgearMap_ZoomedInButtons, gText_PokenavMap_ZoomedInButtons,
gText_NavgearCondition_MonListButtons, gText_PokenavCondition_MonListButtons,
gText_NavgearCondition_MonStatusButtons, gText_PokenavCondition_MonStatusButtons,
gText_NavgearCondition_MarkingButtons, gText_PokenavCondition_MarkingButtons,
gText_NavgearMatchCall_TrainerListButtons, gText_PokenavMatchCall_TrainerListButtons,
gText_NavgearMatchCall_CallMenuButtons, gText_PokenavMatchCall_CallMenuButtons,
gText_NavgearMatchCall_CheckTrainerButtons, gText_PokenavMatchCall_CheckTrainerButtons,
gText_NavgearRibbons_MonListButtons, gText_PokenavRibbons_MonListButtons,
gText_NavgearRibbons_RibbonListButtons, gText_PokenavRibbons_RibbonListButtons,
gText_NavgearRibbons_RibbonCheckButtons, gText_PokenavRibbons_RibbonCheckButtons,
}; };
const u8 gMenuButtonReminderColor[4] = const u8 gMenuButtonReminderColor[4] =
@@ -142,19 +142,19 @@ const u8 gMenuButtonReminderColor[4] =
4, 1, 2, 0 4, 1, 2, 0
}; };
static const struct CompressedSpriteSheet gSpinningNavgearSpriteSheet[] = static const struct CompressedSpriteSheet gSpinningPokenavSpriteSheet[] =
{ {
{ {
.data = gSpinningNavgearGfx, .data = gSpinningPokenavGfx,
.size = 0x1000, .size = 0x1000,
.tag = 0, .tag = 0,
} }
}; };
static const struct SpritePalette gSpinningNavgearPalette[] = static const struct SpritePalette gSpinningPokenavPalette[] =
{ {
{ {
.data = gSpinningNavgearPaletteData, .data = gSpinningPokenavPaletteData,
.tag = 0, .tag = 0,
}, },
{} {}
@@ -169,32 +169,32 @@ static const struct CompressedSpriteSheet sPokenavHoenMapLeftHeaderSpriteSheet =
static const struct CompressedSpriteSheet sPokenavMenuLeftHeaderSpriteSheets[] = static const struct CompressedSpriteSheet sPokenavMenuLeftHeaderSpriteSheets[] =
{ {
[NAVGEAR_GFX_MAIN_MENU] = { [POKENAV_GFX_MAIN_MENU] = {
.data = gPokenavLeftHeaderMainMenu_Gfx, .data = gPokenavLeftHeaderMainMenu_Gfx,
.size = 0x20, .size = 0x20,
.tag = 3 .tag = 3
}, },
[NAVGEAR_GFX_CONDITION_MENU] = { [POKENAV_GFX_CONDITION_MENU] = {
.data = gPokenavLeftHeaderCondition_Gfx, .data = gPokenavLeftHeaderCondition_Gfx,
.size = 0x20, .size = 0x20,
.tag = 1 .tag = 1
}, },
[NAVGEAR_GFX_RIBBONS_MENU] = { [POKENAV_GFX_RIBBONS_MENU] = {
.data = gPokenavLeftHeaderRibbons_Gfx, .data = gPokenavLeftHeaderRibbons_Gfx,
.size = 0x20, .size = 0x20,
.tag = 2 .tag = 2
}, },
[NAVGEAR_GFX_MATCH_CALL_MENU] = { [POKENAV_GFX_MATCH_CALL_MENU] = {
.data = gPokenavLeftHeaderMatchCall_Gfx, .data = gPokenavLeftHeaderMatchCall_Gfx,
.size = 0x20, .size = 0x20,
.tag = 4 .tag = 4
}, },
[NAVGEAR_GFX_MAP_MENU_UNK0] = { [POKENAV_GFX_MAP_MENU_UNK0] = {
.data = gPokenavLeftHeaderHoennMap_Gfx, .data = gPokenavLeftHeaderHoennMap_Gfx,
.size = 0x20, .size = 0x20,
.tag = 0 .tag = 0
}, },
[NAVGEAR_GFX_MAP_MENU_UNK1] = { [POKENAV_GFX_MAP_MENU_UNK1] = {
.data = gPokenavLeftHeaderHoennMap_Gfx, .data = gPokenavLeftHeaderHoennMap_Gfx,
.size = 0x40, .size = 0x40,
.tag = 0 .tag = 0
@@ -203,37 +203,37 @@ static const struct CompressedSpriteSheet sPokenavMenuLeftHeaderSpriteSheets[] =
static const struct CompressedSpriteSheetNoSize sPokenavSubMenuLeftHeaderSpriteSheets[] = static const struct CompressedSpriteSheetNoSize sPokenavSubMenuLeftHeaderSpriteSheets[] =
{ {
[NAVGEAR_GFX_PARTY_MENU - NAVGEAR_GFX_SUBMENUS_START] = { [POKENAV_GFX_PARTY_MENU - POKENAV_GFX_SUBMENUS_START] = {
.data = gPokenavLeftHeaderParty_Gfx, .data = gPokenavLeftHeaderParty_Gfx,
.tag = 1 .tag = 1
}, },
[NAVGEAR_GFX_SEARCH_MENU - NAVGEAR_GFX_SUBMENUS_START] = { [POKENAV_GFX_SEARCH_MENU - POKENAV_GFX_SUBMENUS_START] = {
.data = gPokenavLeftHeaderSearch_Gfx, .data = gPokenavLeftHeaderSearch_Gfx,
.tag = 1 .tag = 1
}, },
[NAVGEAR_GFX_COOL_MENU - NAVGEAR_GFX_SUBMENUS_START] = { [POKENAV_GFX_COOL_MENU - POKENAV_GFX_SUBMENUS_START] = {
.data = gPokenavLeftHeaderCool_Gfx, .data = gPokenavLeftHeaderCool_Gfx,
.tag = 4 .tag = 4
}, },
[NAVGEAR_GFX_BEAUTY_MENU - NAVGEAR_GFX_SUBMENUS_START] = { [POKENAV_GFX_BEAUTY_MENU - POKENAV_GFX_SUBMENUS_START] = {
.data = gPokenavLeftHeaderBeauty_Gfx, .data = gPokenavLeftHeaderBeauty_Gfx,
.tag = 1 .tag = 1
}, },
[NAVGEAR_GFX_CUTE_MENU - NAVGEAR_GFX_SUBMENUS_START] = { [POKENAV_GFX_CUTE_MENU - POKENAV_GFX_SUBMENUS_START] = {
.data = gPokenavLeftHeaderCute_Gfx, .data = gPokenavLeftHeaderCute_Gfx,
.tag = 2 .tag = 2
}, },
[NAVGEAR_GFX_SMART_MENU - NAVGEAR_GFX_SUBMENUS_START] = { [POKENAV_GFX_SMART_MENU - POKENAV_GFX_SUBMENUS_START] = {
.data = gPokenavLeftHeaderSmart_Gfx, .data = gPokenavLeftHeaderSmart_Gfx,
.tag = 0 .tag = 0
}, },
[NAVGEAR_GFX_TOUGH_MENU - NAVGEAR_GFX_SUBMENUS_START] = { [POKENAV_GFX_TOUGH_MENU - POKENAV_GFX_SUBMENUS_START] = {
.data = gPokenavLeftHeaderTough_Gfx, .data = gPokenavLeftHeaderTough_Gfx,
.tag = 0 .tag = 0
} }
}; };
static const struct OamData sSpinningNavgearSpriteOam = static const struct OamData sSpinningPokenavSpriteOam =
{ {
.y = 0, .y = 0,
.affineMode = 0, .affineMode = 0,
@@ -250,7 +250,7 @@ static const struct OamData sSpinningNavgearSpriteOam =
.affineParam = 0 .affineParam = 0
}; };
static const union AnimCmd sSpinningNavgearAnims[] = static const union AnimCmd sSpinningPokenavAnims[] =
{ {
ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(16, 8), ANIMCMD_FRAME(16, 8),
@@ -263,20 +263,20 @@ static const union AnimCmd sSpinningNavgearAnims[] =
ANIMCMD_JUMP(0) ANIMCMD_JUMP(0)
}; };
static const union AnimCmd *const sSpinningNavgearAnimTable[] = static const union AnimCmd *const sSpinningPokenavAnimTable[] =
{ {
sSpinningNavgearAnims sSpinningPokenavAnims
}; };
static const struct SpriteTemplate sSpinningNavgearSpriteTemplate = static const struct SpriteTemplate sSpinningPokenavSpriteTemplate =
{ {
.tileTag = 0, .tileTag = 0,
.paletteTag = 0, .paletteTag = 0,
.oam = &sSpinningNavgearSpriteOam, .oam = &sSpinningPokenavSpriteOam,
.anims = sSpinningNavgearAnimTable, .anims = sSpinningPokenavAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCB_SpinningNavgear .callback = SpriteCB_SpinningPokenav
}; };
static const struct OamData sPokenavLeftHeaderHoenMapSpriteOam = static const struct OamData sPokenavLeftHeaderHoenMapSpriteOam =
@@ -727,48 +727,48 @@ void InitPokenavMainMenuResources(void)
u8 spriteId; u8 spriteId;
struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0); struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
for (i = 0; i < ARRAY_COUNT(gSpinningNavgearSpriteSheet); i++) for (i = 0; i < ARRAY_COUNT(gSpinningPokenavSpriteSheet); i++)
LoadCompressedSpriteSheet(&gSpinningNavgearSpriteSheet[i]); LoadCompressedSpriteSheet(&gSpinningPokenavSpriteSheet[i]);
Pokenav_AllocAndLoadPalettes(gSpinningNavgearPalette); Pokenav_AllocAndLoadPalettes(gSpinningPokenavPalette);
structPtr->unk14 = ~1 & ~(0x10000 << IndexOfSpritePaletteTag(0)); structPtr->unk14 = ~1 & ~(0x10000 << IndexOfSpritePaletteTag(0));
spriteId = CreateSprite(&sSpinningNavgearSpriteTemplate, 220, 12, 0); spriteId = CreateSprite(&sSpinningPokenavSpriteTemplate, 220, 12, 0);
structPtr->spinningNavgear = &gSprites[spriteId]; structPtr->spinningPokenav = &gSprites[spriteId];
} }
void CleanupPokenavMainMenuResources(void) void CleanupPokenavMainMenuResources(void)
{ {
struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0); struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
DestroySprite(structPtr->spinningNavgear); DestroySprite(structPtr->spinningPokenav);
FreeSpriteTilesByTag(0); FreeSpriteTilesByTag(0);
FreeSpritePaletteByTag(0); FreeSpritePaletteByTag(0);
} }
void SpriteCB_SpinningNavgear(struct Sprite *sprite) void SpriteCB_SpinningPokenav(struct Sprite *sprite)
{ {
// If the background starts scrolling, follow it. // If the background starts scrolling, follow it.
sprite->pos2.y = (GetBgY(0) / 256u) * -1; sprite->pos2.y = (GetBgY(0) / 256u) * -1;
} }
struct Sprite *PauseSpinningNavgearSprite(void) struct Sprite *PauseSpinningPokenavSprite(void)
{ {
struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0); struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
structPtr->spinningNavgear->callback = SpriteCallbackDummy; structPtr->spinningPokenav->callback = SpriteCallbackDummy;
return structPtr->spinningNavgear; return structPtr->spinningPokenav;
} }
void ResumeSpinningNavgearSprite(void) void ResumeSpinningPokenavSprite(void)
{ {
struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0); struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
structPtr->spinningNavgear->pos1.x = 220; structPtr->spinningPokenav->pos1.x = 220;
structPtr->spinningNavgear->pos1.y = 12; structPtr->spinningPokenav->pos1.y = 12;
structPtr->spinningNavgear->callback = SpriteCB_SpinningNavgear; structPtr->spinningPokenav->callback = SpriteCB_SpinningPokenav;
structPtr->spinningNavgear->invisible = FALSE; structPtr->spinningPokenav->invisible = FALSE;
structPtr->spinningNavgear->oam.priority = 0; structPtr->spinningPokenav->oam.priority = 0;
structPtr->spinningNavgear->subpriority = 0; structPtr->spinningPokenav->subpriority = 0;
} }
void InitHoenMapHeaderSprites(void) void InitHoenMapHeaderSprites(void)
@@ -797,10 +797,10 @@ void InitHoenMapHeaderSprites(void)
void LoadLeftHeaderGfxForIndex(u32 arg0) void LoadLeftHeaderGfxForIndex(u32 arg0)
{ {
if (arg0 < NAVGEAR_GFX_SUBMENUS_START) if (arg0 < POKENAV_GFX_SUBMENUS_START)
LoadLeftHeaderGfxForMenu(arg0); LoadLeftHeaderGfxForMenu(arg0);
else else
LoadLeftHeaderGfxForSubMenu(arg0 - NAVGEAR_GFX_SUBMENUS_START); LoadLeftHeaderGfxForSubMenu(arg0 - POKENAV_GFX_SUBMENUS_START);
} }
void sub_81C7E14(u32 arg0) void sub_81C7E14(u32 arg0)
@@ -818,7 +818,7 @@ void LoadLeftHeaderGfxForMenu(u32 index)
struct PokenavMainMenuResources *structPtr; struct PokenavMainMenuResources *structPtr;
u32 size, tag; u32 size, tag;
if (index >= NAVGEAR_GFX_SUBMENUS_START) if (index >= POKENAV_GFX_SUBMENUS_START)
return; return;
structPtr = GetSubstructPtr(0); structPtr = GetSubstructPtr(0);
@@ -829,7 +829,7 @@ void LoadLeftHeaderGfxForMenu(u32 index)
RequestDma3Copy(gDecompressionBuffer, (void *)VRAM + 0x10000 + (GetSpriteTileStartByTag(2) * 32), size, 1); RequestDma3Copy(gDecompressionBuffer, (void *)VRAM + 0x10000 + (GetSpriteTileStartByTag(2) * 32), size, 1);
structPtr->leftHeaderSprites[1]->oam.tileNum = GetSpriteTileStartByTag(2) + sPokenavMenuLeftHeaderSpriteSheets[index].size; structPtr->leftHeaderSprites[1]->oam.tileNum = GetSpriteTileStartByTag(2) + sPokenavMenuLeftHeaderSpriteSheets[index].size;
if (index == NAVGEAR_GFX_MAP_MENU_UNK0 || index == NAVGEAR_GFX_MAP_MENU_UNK1) if (index == POKENAV_GFX_MAP_MENU_UNK0 || index == POKENAV_GFX_MAP_MENU_UNK1)
structPtr->leftHeaderSprites[1]->pos2.x = 56; structPtr->leftHeaderSprites[1]->pos2.x = 56;
else else
structPtr->leftHeaderSprites[1]->pos2.x = 64; structPtr->leftHeaderSprites[1]->pos2.x = 64;
@@ -839,7 +839,7 @@ void LoadLeftHeaderGfxForSubMenu(u32 arg0)
{ {
u32 size, tag; u32 size, tag;
if (arg0 >= NAVGEAR_GFX_MENUS_END - NAVGEAR_GFX_SUBMENUS_START) if (arg0 >= POKENAV_GFX_MENUS_END - POKENAV_GFX_SUBMENUS_START)
return; return;
tag = sPokenavSubMenuLeftHeaderSpriteSheets[arg0].tag; tag = sPokenavSubMenuLeftHeaderSpriteSheets[arg0].tag;
src/pokenav_match_call_ui.c
+3 -3
View File
@@ -121,9 +121,9 @@ static const u8 sPokenavColors_0861FBE4[] =
static const u8 *const sMatchCallFieldNames[] = static const u8 *const sMatchCallFieldNames[] =
{ {
gText_NavgearMatchCall_Strategy, gText_PokenavMatchCall_Strategy,
gText_NavgearMatchCall_TrainerPokemon, gText_PokenavMatchCall_TrainerPokemon,
gText_NavgearMatchCall_SelfIntroduction gText_PokenavMatchCall_SelfIntroduction
}; };
static const u8 sMatchCallFieldColors[] = static const u8 sMatchCallFieldColors[] =
src/strings.c
+15 -15
View File
@@ -962,21 +962,21 @@ const u8 gUnknown_085EBE7D[] = _("DETAIL");
const u8 gUnknown_085EBE84[] = _("CALL"); const u8 gUnknown_085EBE84[] = _("CALL");
const u8 gUnknown_085EBE89[] = _("EXIT"); const u8 gUnknown_085EBE89[] = _("EXIT");
const u8 gUnknown_085EBE8E[] = _("Can't call opponent here."); const u8 gUnknown_085EBE8E[] = _("Can't call opponent here.");
const u8 gText_NavgearMatchCall_Strategy[] = _("STRATEGY"); const u8 gText_PokenavMatchCall_Strategy[] = _("STRATEGY");
const u8 gText_NavgearMatchCall_TrainerPokemon[] = _("TRAINER'S POKéMON"); const u8 gText_PokenavMatchCall_TrainerPokemon[] = _("TRAINER'S POKéMON");
const u8 gText_NavgearMatchCall_SelfIntroduction[] = _("SELF-INTRODUCTION"); const u8 gText_PokenavMatchCall_SelfIntroduction[] = _("SELF-INTRODUCTION");
const u8 gText_Navgear_ClearButtonList[] = _("{CLEAR 0x80}"); const u8 gText_Pokenav_ClearButtonList[] = _("{CLEAR 0x80}");
const u8 gText_NavgearMap_ZoomedOutButtons[] = _("{A_BUTTON}ZOOM {B_BUTTON}CANCEL"); const u8 gText_PokenavMap_ZoomedOutButtons[] = _("{A_BUTTON}ZOOM {B_BUTTON}CANCEL");
const u8 gText_NavgearMap_ZoomedInButtons[] = _("{A_BUTTON}FULL {B_BUTTON}CANCEL"); const u8 gText_PokenavMap_ZoomedInButtons[] = _("{A_BUTTON}FULL {B_BUTTON}CANCEL");
const u8 gText_NavgearCondition_MonListButtons[] = _("{A_BUTTON}CONDITION {B_BUTTON}CANCEL"); const u8 gText_PokenavCondition_MonListButtons[] = _("{A_BUTTON}CONDITION {B_BUTTON}CANCEL");
const u8 gText_NavgearCondition_MonStatusButtons[] = _("{A_BUTTON}MARKINGS {B_BUTTON}CANCEL"); const u8 gText_PokenavCondition_MonStatusButtons[] = _("{A_BUTTON}MARKINGS {B_BUTTON}CANCEL");
const u8 gText_NavgearCondition_MarkingButtons[] = _("{A_BUTTON}SELECT MARK {B_BUTTON}CANCEL"); const u8 gText_PokenavCondition_MarkingButtons[] = _("{A_BUTTON}SELECT MARK {B_BUTTON}CANCEL");
const u8 gText_NavgearMatchCall_TrainerListButtons[] = _("{A_BUTTON}MENU {B_BUTTON}CANCEL"); const u8 gText_PokenavMatchCall_TrainerListButtons[] = _("{A_BUTTON}MENU {B_BUTTON}CANCEL");
const u8 gText_NavgearMatchCall_CallMenuButtons[] = _("{A_BUTTON}OK {B_BUTTON}CANCEL"); const u8 gText_PokenavMatchCall_CallMenuButtons[] = _("{A_BUTTON}OK {B_BUTTON}CANCEL");
const u8 gText_NavgearMatchCall_CheckTrainerButtons[] = _("{B_BUTTON}CANCEL"); const u8 gText_PokenavMatchCall_CheckTrainerButtons[] = _("{B_BUTTON}CANCEL");
const u8 gText_NavgearRibbons_MonListButtons[] = _("{A_BUTTON}RIBBONS {B_BUTTON}CANCEL"); const u8 gText_PokenavRibbons_MonListButtons[] = _("{A_BUTTON}RIBBONS {B_BUTTON}CANCEL");
const u8 gText_NavgearRibbons_RibbonListButtons[] = _("{A_BUTTON}CHECK {B_BUTTON}CANCEL"); const u8 gText_PokenavRibbons_RibbonListButtons[] = _("{A_BUTTON}CHECK {B_BUTTON}CANCEL");
const u8 gText_NavgearRibbons_RibbonCheckButtons[] = _("{B_BUTTON}CANCEL"); const u8 gText_PokenavRibbons_RibbonCheckButtons[] = _("{B_BUTTON}CANCEL");
const u8 gText_NatureSlash[] = _("NATURE/"); const u8 gText_NatureSlash[] = _("NATURE/");
const u8 gText_TrainerCloseBy[] = _("That TRAINER is close by.\nTalk to the TRAINER in person!"); const u8 gText_TrainerCloseBy[] = _("That TRAINER is close by.\nTalk to the TRAINER in person!");
const u8 gText_InParty[] = _("IN PARTY"); const u8 gText_InParty[] = _("IN PARTY");