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

Clean up pokedex screen text

Browse Source
This commit is contained in:
GriffinR
2020-11-12 00:03:59 -05:00
parent 66e9059578
commit 1d820d4e0f
4 changed files with 145 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/pokedex_screen.s
+25 -25
View File
@@ -399,7 +399,7 @@ _08105878:
adds r0, r6, r0 adds r0, r6, r0
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r2, _081058C0 @ =gUnknown_8415F8F ldr r2, _081058C0 @ =gText_PokedexPokemon
str r7, [sp] str r7, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
mov r0, r8 mov r0, r8
@@ -413,7 +413,7 @@ _08105878:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_081058C0: .4byte gUnknown_8415F8F _081058C0: .4byte gText_PokedexPokemon
thumb_func_end sub_8105800 thumb_func_end sub_8105800
thumb_func_start sub_81058C4 thumb_func_start sub_81058C4
@@ -442,7 +442,7 @@ sub_81058C4: @ 81058C4
lsls r1, 2 lsls r1, 2
adds r1, r2 adds r1, r2
ldrh r4, [r1, 0xC] ldrh r4, [r1, 0xC]
ldr r1, _08105978 @ =gUnknown_8415F98 ldr r1, _08105978 @ =gText_HT
mov r10, r1 mov r10, r1
movs r3, 0 movs r3, 0
add r2, sp, 0x8 add r2, sp, 0x8
@@ -501,7 +501,7 @@ _0810593A:
b _08105998 b _08105998
.align 2, 0 .align 2, 0
_08105974: .4byte gPokedexEntries _08105974: .4byte gPokedexEntries
_08105978: .4byte gUnknown_8415F98 _08105978: .4byte gText_HT
_0810597C: .4byte 0x00002710 _0810597C: .4byte 0x00002710
_08105980: _08105980:
add r1, sp, 0xC add r1, sp, 0xC
@@ -848,12 +848,12 @@ _08105BE6:
adds r5, 0x1E adds r5, 0x1E
cmp r2, r1 cmp r2, r1
bcs _08105C60 bcs _08105C60
ldr r3, _08105CA8 @ =gUnknown_8415FA0 ldr r3, _08105CA8 @ =gText_Lbs
ldrb r0, [r3] ldrb r0, [r3]
cmp r0, 0xFF cmp r0, 0xFF
beq _08105C60 beq _08105C60
adds r3, r1, 0 adds r3, r1, 0
ldr r4, _08105CA8 @ =gUnknown_8415FA0 ldr r4, _08105CA8 @ =gText_Lbs
adds r1, r7, 0 adds r1, r7, 0
add r1, sp add r1, sp
adds r1, 0x8 adds r1, 0x8
@@ -881,7 +881,7 @@ _08105C60:
str r4, [sp, 0x4] str r4, [sp, 0x4]
mov r0, r10 mov r0, r10
movs r1, 0 movs r1, 0
ldr r2, _08105CAC @ =gUnknown_8415F9B ldr r2, _08105CAC @ =gText_WT
mov r3, r8 mov r3, r8
bl sub_81047C8 bl sub_81047C8
lsls r0, r5, 24 lsls r0, r5, 24
@@ -904,8 +904,8 @@ _08105C60:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08105CA8: .4byte gUnknown_8415FA0 _08105CA8: .4byte gText_Lbs
_08105CAC: .4byte gUnknown_8415F9B _08105CAC: .4byte gText_WT
thumb_func_end sub_8105A3C thumb_func_end sub_8105A3C
thumb_func_start sub_8105CB0 thumb_func_start sub_8105CB0
@@ -1277,7 +1277,7 @@ sub_8105E1C: @ 8105E1C
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
cmp r6, 0 cmp r6, 0
bne _08105FEC bne _08105FEC
ldr r2, _08105FE4 @ =gUnknown_8415FAD ldr r2, _08105FE4 @ =gText_Cry
movs r0, 0x2 movs r0, 0x2
str r0, [sp] str r0, [sp]
movs r0, 0x4 movs r0, 0x4
@@ -1286,7 +1286,7 @@ sub_8105E1C: @ 8105E1C
movs r1, 0 movs r1, 0
movs r3, 0x8 movs r3, 0x8
bl sub_81047C8 bl sub_81047C8
ldr r0, _08105FE8 @ =gUnknown_8415FB3 ldr r0, _08105FE8 @ =gText_NextDataCancel
bl sub_8104C2C bl sub_8104C2C
b _08105FF2 b _08105FF2
.align 2, 0 .align 2, 0
@@ -1295,10 +1295,10 @@ _08105FD4: .4byte gUnknown_203ACF0
_08105FD8: .4byte gUnknown_84521DC _08105FD8: .4byte gUnknown_84521DC
_08105FDC: .4byte gUnknown_84521E4 _08105FDC: .4byte gUnknown_84521E4
_08105FE0: .4byte gSpeciesNames _08105FE0: .4byte gSpeciesNames
_08105FE4: .4byte gUnknown_8415FAD _08105FE4: .4byte gText_Cry
_08105FE8: .4byte gUnknown_8415FB3 _08105FE8: .4byte gText_NextDataCancel
_08105FEC: _08105FEC:
ldr r0, _08106010 @ =gUnknown_8415FC8 ldr r0, _08106010 @ =gText_Next
bl sub_8104C2C bl sub_8104C2C
_08105FF2: _08105FF2:
movs r0, 0x1 movs r0, 0x1
@@ -1314,7 +1314,7 @@ _08105FF2:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_08106010: .4byte gUnknown_8415FC8 _08106010: .4byte gText_Next
thumb_func_end sub_8105E1C thumb_func_end sub_8105E1C
thumb_func_start sub_8106014 thumb_func_start sub_8106014
@@ -1691,7 +1691,7 @@ _081062B4:
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
ldr r4, _08106470 @ =gUnknown_8415FED ldr r4, _08106470 @ =gText_Size
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -1728,7 +1728,7 @@ _081062B4:
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
ldr r4, _08106474 @ =gUnknown_8415FE8 ldr r4, _08106474 @ =gText_Area
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -1805,8 +1805,8 @@ _08106460: .4byte gUnknown_84521FC
_08106464: .4byte gUnknown_8452204 _08106464: .4byte gUnknown_8452204
_08106468: .4byte gUnknown_84521EC _08106468: .4byte gUnknown_84521EC
_0810646C: .4byte gUnknown_845220C _0810646C: .4byte gUnknown_845220C
_08106470: .4byte gUnknown_8415FED _08106470: .4byte gText_Size
_08106474: .4byte gUnknown_8415FE8 _08106474: .4byte gText_Area
_08106478: _08106478:
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x52 adds r0, 0x52
@@ -2130,7 +2130,7 @@ _081066E2:
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl BlitBitmapRectToWindow bl BlitBitmapRectToWindow
ldr r4, _081067B4 @ =gUnknown_8415FF2 ldr r4, _081067B4 @ =gText_AreaUnknown
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -2161,7 +2161,7 @@ _0810675A:
movs r0, 0x1 movs r0, 0x1
movs r1, 0xFF movs r1, 0xFF
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
ldr r2, _081067B8 @ =gUnknown_8415FAD ldr r2, _081067B8 @ =gText_Cry
movs r0, 0x2 movs r0, 0x2
str r0, [sp] str r0, [sp]
movs r0, 0x4 movs r0, 0x4
@@ -2170,7 +2170,7 @@ _0810675A:
movs r1, 0 movs r1, 0
movs r3, 0x8 movs r3, 0x8
bl sub_81047C8 bl sub_81047C8
ldr r0, _081067BC @ =gUnknown_8415FCF ldr r0, _081067BC @ =gText_CancelPreviousData
bl sub_8104C2C bl sub_8104C2C
movs r0, 0x1 movs r0, 0x1
bl PutWindowTilemap bl PutWindowTilemap
@@ -2190,9 +2190,9 @@ _0810675A:
_081067A8: .4byte 0x000007d1 _081067A8: .4byte 0x000007d1
_081067AC: .4byte gUnknown_203ACF0 _081067AC: .4byte gUnknown_203ACF0
_081067B0: .4byte gUnknown_8443D00 _081067B0: .4byte gUnknown_8443D00
_081067B4: .4byte gUnknown_8415FF2 _081067B4: .4byte gText_AreaUnknown
_081067B8: .4byte gUnknown_8415FAD _081067B8: .4byte gText_Cry
_081067BC: .4byte gUnknown_8415FCF _081067BC: .4byte gText_CancelPreviousData
thumb_func_end sub_810603C thumb_func_end sub_810603C
thumb_func_start sub_81067C0 thumb_func_start sub_81067C0
include/strings.h
+44 -35
View File
@@ -964,18 +964,50 @@ extern const u8 gText_HereYouGoThankYou[];
extern const u8 gText_NoMoreRoomForThis[]; extern const u8 gText_NoMoreRoomForThis[];
// pokedex_screen // pokedex_screen
extern const u8 gUnknown_8415D9C[]; extern const u8 gText_PokedexTableOfContents[];
extern const u8 gUnknown_8415DB8[]; extern const u8 gText_PickOK[];
extern const u8 gUnknown_8415DC4[]; extern const u8 gText_Seen[];
extern const u8 gUnknown_8415DCA[]; extern const u8 gText_Owned[];
extern const u8 gUnknown_8415DD1[]; extern const u8 gText_Kanto[];
extern const u8 gUnknown_8415DD7[]; extern const u8 gText_National[];
extern const u8 gUnknown_8415F3D[]; extern const u8 gText_PokemonListNoColor[];
extern const u8 gUnknown_8415F4A[]; extern const u8 gText_SearchNoColor[];
extern const u8 gUnknown_8415F66[]; extern const u8 gText_5Dashes[];
extern const u8 gUnknown_8415F6C[]; extern const u8 gText_PickFlipPageCheckCancel[];
extern const u8 gUnknown_8415FFF[]; extern const u8 gText_PokedexNo[];
extern const u8 gUnknown_8416002[]; extern const u8 gText_Page[];
extern const u8 gText_DexCategory_GrasslandPkmn[];
extern const u8 gText_DexCategory_ForestPkmn[];
extern const u8 gText_DexCategory_WatersEdgePkmn[];
extern const u8 gText_DexCategory_SeaPkmn[];
extern const u8 gText_DexCategory_CavePkmn[];
extern const u8 gText_DexCategory_MountainPkmn[];
extern const u8 gText_DexCategory_RoughTerrainPkmn[];
extern const u8 gText_DexCategory_UrbanPkmn[];
extern const u8 gText_DexCategory_RarePkmn[];
extern const u8 gText_PokemonList[];
extern const u8 gText_NumericalMode[];
extern const u8 gText_PokemonHabitats[];
extern const u8 gText_Search[];
extern const u8 gText_AToZMode[];
extern const u8 gText_TypeMode[];
extern const u8 gText_LightestMode[];
extern const u8 gText_SmallestMode[];
extern const u8 gText_PokedexOther[];
extern const u8 gText_ClosePokedex[];
extern const u8 gText_NumericalModeKanto[];
extern const u8 gText_NumericalModeNational[];
extern const u8 gText_PokedexPokemon[];
extern const u8 gText_HT[];
extern const u8 gText_WT[];
extern const u8 gText_Lbs[];
extern const u8 gText_Cry[];
extern const u8 gText_NextDataCancel[];
extern const u8 gText_Next[];
extern const u8 gText_CancelPreviousData[];
extern const u8 gText_Area[];
extern const u8 gText_Size[];
extern const u8 gText_AreaUnknown[];
// daycare // daycare
extern const u8 gText_Lv[]; extern const u8 gText_Lv[];
@@ -1516,27 +1548,4 @@ extern const u8 gUnknown_8419AA2[];
extern const u8 gUnknown_8419ADE[]; extern const u8 gUnknown_8419ADE[];
extern const u8 gUnknown_8419B18[]; extern const u8 gUnknown_8419B18[];
// pokedex_screen
extern const u8 gText_DexCategory_GrasslandPkmn[];
extern const u8 gText_DexCategory_ForestPkmn[];
extern const u8 gText_DexCategory_WatersEdgePkmn[];
extern const u8 gText_DexCategory_SeaPkmn[];
extern const u8 gText_DexCategory_CavePkmn[];
extern const u8 gText_DexCategory_MountainPkmn[];
extern const u8 gText_DexCategory_RoughTerrainPkmn[];
extern const u8 gText_DexCategory_UrbanPkmn[];
extern const u8 gText_DexCategory_RarePkmn[];
extern const u8 gUnknown_8415EFB[];
extern const u8 gUnknown_8415E95[];
extern const u8 gUnknown_8415DE0[];
extern const u8 gUnknown_8415E88[];
extern const u8 gUnknown_8415EA4[];
extern const u8 gUnknown_8415ED5[];
extern const u8 gUnknown_8415EDF[];
extern const u8 gUnknown_8415EED[];
extern const u8 gUnknown_8415EB0[];
extern const u8 gUnknown_8415EC7[];
extern const u8 gUnknown_8415F0E[];
extern const u8 gUnknown_8415F24[];
#endif //GUARD_STRINGS_H #endif //GUARD_STRINGS_H
src/pokedex_screen.c
+38 -39
View File
@@ -189,7 +189,6 @@ static const u8 gExpandedPlaceholder_PokedexDescription[] = _("");
#include "data/pokemon/pokedex_text.h" #include "data/pokemon/pokedex_text.h"
#include "data/pokemon/pokedex_entries.h" #include "data/pokemon/pokedex_entries.h"
static const struct BgTemplate sUnknown_8451EBC[] = { static const struct BgTemplate sUnknown_8451EBC[] = {
{ {
.bg = 0, .bg = 0,
@@ -305,9 +304,9 @@ static const struct WindowTemplate sUnknown_8451F64 = {
}; };
static const struct ListMenuItem sUnknown_8451F6C[] = { static const struct ListMenuItem sUnknown_8451F6C[] = {
{gUnknown_8415EFB, -3}, {gText_PokemonList, -3},
{gUnknown_8415E95, 9}, {gText_NumericalMode, 9},
{gUnknown_8415DE0, -3}, {gText_PokemonHabitats, -3},
{gText_DexCategory_GrasslandPkmn, 0}, {gText_DexCategory_GrasslandPkmn, 0},
{gText_DexCategory_ForestPkmn, 1}, {gText_DexCategory_ForestPkmn, 1},
{gText_DexCategory_WatersEdgePkmn, 2}, {gText_DexCategory_WatersEdgePkmn, 2},
@@ -317,13 +316,13 @@ static const struct ListMenuItem sUnknown_8451F6C[] = {
{gText_DexCategory_RoughTerrainPkmn, 6}, {gText_DexCategory_RoughTerrainPkmn, 6},
{gText_DexCategory_UrbanPkmn, 7}, {gText_DexCategory_UrbanPkmn, 7},
{gText_DexCategory_RarePkmn, 8}, {gText_DexCategory_RarePkmn, 8},
{gUnknown_8415E88, -3}, {gText_Search, -3},
{gUnknown_8415EA4, 10}, {gText_AToZMode, 10},
{gUnknown_8415ED5, 11}, {gText_TypeMode, 11},
{gUnknown_8415EDF, 12}, {gText_LightestMode, 12},
{gUnknown_8415EED, 13}, {gText_SmallestMode, 13},
{gUnknown_8415EB0, -3}, {gText_PokedexOther, -3},
{gUnknown_8415EC7, -2}, {gText_ClosePokedex, -2},
}; };
static const struct ListMenuTemplate sUnknown_8452004 = { static const struct ListMenuTemplate sUnknown_8452004 = {
@@ -348,10 +347,10 @@ static const struct ListMenuTemplate sUnknown_8452004 = {
}; };
static const struct ListMenuItem sUnknown_845201C[] = { static const struct ListMenuItem sUnknown_845201C[] = {
{gUnknown_8415EFB, -3}, {gText_PokemonList, -3},
{gUnknown_8415F0E, 9}, {gText_NumericalModeKanto, 9},
{gUnknown_8415F24, 14}, {gText_NumericalModeNational, 14},
{gUnknown_8415DE0, -3}, {gText_PokemonHabitats, -3},
{gText_DexCategory_GrasslandPkmn, 0}, {gText_DexCategory_GrasslandPkmn, 0},
{gText_DexCategory_ForestPkmn, 1}, {gText_DexCategory_ForestPkmn, 1},
{gText_DexCategory_WatersEdgePkmn, 2}, {gText_DexCategory_WatersEdgePkmn, 2},
@@ -361,13 +360,13 @@ static const struct ListMenuItem sUnknown_845201C[] = {
{gText_DexCategory_RoughTerrainPkmn, 6}, {gText_DexCategory_RoughTerrainPkmn, 6},
{gText_DexCategory_UrbanPkmn, 7}, {gText_DexCategory_UrbanPkmn, 7},
{gText_DexCategory_RarePkmn, 8}, {gText_DexCategory_RarePkmn, 8},
{gUnknown_8415E88, -3}, {gText_Search, -3},
{gUnknown_8415EA4, 10}, {gText_AToZMode, 10},
{gUnknown_8415ED5, 11}, {gText_TypeMode, 11},
{gUnknown_8415EDF, 12}, {gText_LightestMode, 12},
{gUnknown_8415EED, 13}, {gText_SmallestMode, 13},
{gUnknown_8415EB0, -3}, {gText_PokedexOther, -3},
{gUnknown_8415EC7, -2}, {gText_ClosePokedex, -2},
}; };
static const struct ListMenuTemplate sUnknown_84520BC = { static const struct ListMenuTemplate sUnknown_84520BC = {
@@ -1090,15 +1089,15 @@ static void sub_8102C28(void)
listMenuTemplate.windowId = gUnknown_203ACF0->field_14; listMenuTemplate.windowId = gUnknown_203ACF0->field_14;
gUnknown_203ACF0->field_17 = ListMenuInit(&listMenuTemplate, gUnknown_203ACF0->field_12, gUnknown_203ACF0->field_10); gUnknown_203ACF0->field_17 = ListMenuInit(&listMenuTemplate, gUnknown_203ACF0->field_12, gUnknown_203ACF0->field_10);
FillWindowPixelBuffer(gUnknown_203ACF0->field_16, PIXEL_FILL(0)); FillWindowPixelBuffer(gUnknown_203ACF0->field_16, PIXEL_FILL(0));
sub_81047C8(gUnknown_203ACF0->field_16, 0, gUnknown_8415DC4, 0, 2, 0); sub_81047C8(gUnknown_203ACF0->field_16, 0, gText_Seen, 0, 2, 0);
sub_81047C8(gUnknown_203ACF0->field_16, 0, gUnknown_8415DD1, 8, 13, 0); sub_81047C8(gUnknown_203ACF0->field_16, 0, gText_Kanto, 8, 13, 0);
sub_810491C(gUnknown_203ACF0->field_16, 0, gUnknown_203ACF0->field_66, 52, 13, 2); sub_810491C(gUnknown_203ACF0->field_16, 0, gUnknown_203ACF0->field_66, 52, 13, 2);
sub_81047C8(gUnknown_203ACF0->field_16, 0, gUnknown_8415DD7, 8, 24, 0); sub_81047C8(gUnknown_203ACF0->field_16, 0, gText_National, 8, 24, 0);
sub_810491C(gUnknown_203ACF0->field_16, 0, gUnknown_203ACF0->field_6A, 52, 24, 2); sub_810491C(gUnknown_203ACF0->field_16, 0, gUnknown_203ACF0->field_6A, 52, 24, 2);
sub_81047C8(gUnknown_203ACF0->field_16, 0, gUnknown_8415DCA, 0, 37, 0); sub_81047C8(gUnknown_203ACF0->field_16, 0, gText_Owned, 0, 37, 0);
sub_81047C8(gUnknown_203ACF0->field_16, 0, gUnknown_8415DD1, 8, 48, 0); sub_81047C8(gUnknown_203ACF0->field_16, 0, gText_Kanto, 8, 48, 0);
sub_810491C(gUnknown_203ACF0->field_16, 0, gUnknown_203ACF0->field_68, 52, 48, 2); sub_810491C(gUnknown_203ACF0->field_16, 0, gUnknown_203ACF0->field_68, 52, 48, 2);
sub_81047C8(gUnknown_203ACF0->field_16, 0, gUnknown_8415DD7, 8, 59, 0); sub_81047C8(gUnknown_203ACF0->field_16, 0, gText_National, 8, 59, 0);
sub_810491C(gUnknown_203ACF0->field_16, 0, gUnknown_203ACF0->field_6C, 52, 59, 2); sub_810491C(gUnknown_203ACF0->field_16, 0, gUnknown_203ACF0->field_6C, 52, 59, 2);
} }
else else
@@ -1107,15 +1106,15 @@ static void sub_8102C28(void)
listMenuTemplate.windowId = gUnknown_203ACF0->field_14; listMenuTemplate.windowId = gUnknown_203ACF0->field_14;
gUnknown_203ACF0->field_17 = ListMenuInit(&listMenuTemplate, gUnknown_203ACF0->field_12, gUnknown_203ACF0->field_10); gUnknown_203ACF0->field_17 = ListMenuInit(&listMenuTemplate, gUnknown_203ACF0->field_12, gUnknown_203ACF0->field_10);
FillWindowPixelBuffer(gUnknown_203ACF0->field_16, PIXEL_FILL(0)); FillWindowPixelBuffer(gUnknown_203ACF0->field_16, PIXEL_FILL(0));
sub_81047C8(gUnknown_203ACF0->field_16, 1, gUnknown_8415DC4, 0, 9, 0); sub_81047C8(gUnknown_203ACF0->field_16, 1, gText_Seen, 0, 9, 0);
sub_810491C(gUnknown_203ACF0->field_16, 1, gUnknown_203ACF0->field_66, 32, 21, 2); sub_810491C(gUnknown_203ACF0->field_16, 1, gUnknown_203ACF0->field_66, 32, 21, 2);
sub_81047C8(gUnknown_203ACF0->field_16, 1, gUnknown_8415DCA, 0, 37, 0); sub_81047C8(gUnknown_203ACF0->field_16, 1, gText_Owned, 0, 37, 0);
sub_810491C(gUnknown_203ACF0->field_16, 1, gUnknown_203ACF0->field_68, 32, 49, 2); sub_810491C(gUnknown_203ACF0->field_16, 1, gUnknown_203ACF0->field_68, 32, 49, 2);
} }
FillWindowPixelBuffer(0, PIXEL_FILL(15)); FillWindowPixelBuffer(0, PIXEL_FILL(15));
sub_8106E78(gUnknown_8415D9C, 1); sub_8106E78(gText_PokedexTableOfContents, 1);
FillWindowPixelBuffer(1, PIXEL_FILL(15)); FillWindowPixelBuffer(1, PIXEL_FILL(15));
sub_8104C2C(gUnknown_8415DB8); sub_8104C2C(gText_PickOK);
PutWindowTilemap(0); PutWindowTilemap(0);
CopyWindowToVram(0, COPYWIN_GFX); CopyWindowToVram(0, COPYWIN_GFX);
PutWindowTilemap(1); PutWindowTilemap(1);
@@ -1230,7 +1229,7 @@ static void sub_810317C(void)
template.totalItems = gUnknown_203ACF0->field_48; template.totalItems = gUnknown_203ACF0->field_48;
sub_8103924(&template, gUnknown_203ACF0->field_42); sub_8103924(&template, gUnknown_203ACF0->field_42);
FillWindowPixelBuffer(0, PIXEL_FILL(15)); FillWindowPixelBuffer(0, PIXEL_FILL(15));
sub_8106E78(gUnknown_8415F3D, 1); sub_8106E78(gText_PokemonListNoColor, 1);
FillWindowPixelBuffer(1, PIXEL_FILL(15)); FillWindowPixelBuffer(1, PIXEL_FILL(15));
sub_8104C2C(gText_PickOKExit); sub_8104C2C(gText_PickOKExit);
CopyWindowToVram(0, COPYWIN_GFX); CopyWindowToVram(0, COPYWIN_GFX);
@@ -1316,7 +1315,7 @@ static void sub_810345C(void)
template.totalItems = gUnknown_203ACF0->field_48; template.totalItems = gUnknown_203ACF0->field_48;
sub_8103924(&template, gUnknown_203ACF0->field_42); sub_8103924(&template, gUnknown_203ACF0->field_42);
FillWindowPixelBuffer(0, PIXEL_FILL(15)); FillWindowPixelBuffer(0, PIXEL_FILL(15));
sub_8106E78(gUnknown_8415F4A, 1); sub_8106E78(gText_SearchNoColor, 1);
FillWindowPixelBuffer(1, PIXEL_FILL(15)); FillWindowPixelBuffer(1, PIXEL_FILL(15));
sub_8104C2C(gText_PickOKExit); sub_8104C2C(gText_PickOKExit);
CopyWindowToVram(0, COPYWIN_GFX); CopyWindowToVram(0, COPYWIN_GFX);
@@ -1348,7 +1347,7 @@ static u16 sub_8103518(u8 a0)
} }
else else
{ {
gUnknown_203ACF0->field_44[i].label = gUnknown_8415F66; gUnknown_203ACF0->field_44[i].label = gText_5Dashes;
} }
gUnknown_203ACF0->field_44[i].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(ndex_num); gUnknown_203ACF0->field_44[i].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(ndex_num);
} }
@@ -1434,7 +1433,7 @@ static u16 sub_8103518(u8 a0)
} }
else else
{ {
gUnknown_203ACF0->field_44[i].label = gUnknown_8415F66; gUnknown_203ACF0->field_44[i].label = gText_5Dashes;
} }
gUnknown_203ACF0->field_44[i].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(ndex_num); gUnknown_203ACF0->field_44[i].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(ndex_num);
} }
@@ -2168,7 +2167,7 @@ void sub_81049FC(u8 windowId, u16 species, u16 paletteOffset)
void sub_8104A34(u8 windowId, u8 fontId, u16 species, u8 x, u8 y) void sub_8104A34(u8 windowId, u8 fontId, u16 species, u8 x, u8 y)
{ {
u16 dexNum = SpeciesToNationalPokedexNum(species); u16 dexNum = SpeciesToNationalPokedexNum(species);
sub_81047C8(windowId, fontId, gUnknown_8415FFF, x, y, 0); sub_81047C8(windowId, fontId, gText_PokedexNo, x, y, 0);
sub_8104880(windowId, fontId, dexNum, x + 9, y, 0); sub_8104880(windowId, fontId, dexNum, x + 9, y, 0);
} }
@@ -2307,7 +2306,7 @@ void sub_8104E90(void)
void sub_8104EC0(u8 unused, u16 a1, u16 a2, u8 unused2, u8 unused3) void sub_8104EC0(u8 unused, u16 a1, u16 a2, u8 unused2, u8 unused3)
{ {
u8 buffer[30]; u8 buffer[30];
u8 *ptr = StringCopy(buffer, gUnknown_8416002); u8 *ptr = StringCopy(buffer, gText_Page);
ptr = ConvertIntToDecimalStringN(ptr, a1, STR_CONV_MODE_RIGHT_ALIGN, 2); ptr = ConvertIntToDecimalStringN(ptr, a1, STR_CONV_MODE_RIGHT_ALIGN, 2);
*ptr++ = CHAR_SLASH; *ptr++ = CHAR_SLASH;
ptr = ConvertIntToDecimalStringN(ptr, a2, STR_CONV_MODE_RIGHT_ALIGN, 2); ptr = ConvertIntToDecimalStringN(ptr, a2, STR_CONV_MODE_RIGHT_ALIGN, 2);
@@ -2333,7 +2332,7 @@ bool8 sub_8104F0C(bool8 a0)
CopyWindowToVram(0, COPYWIN_GFX); CopyWindowToVram(0, COPYWIN_GFX);
FillWindowPixelBuffer(1, PIXEL_FILL(15)); FillWindowPixelBuffer(1, PIXEL_FILL(15));
if (!a0) if (!a0)
sub_8104C2C(gUnknown_8415F6C); sub_8104C2C(gText_PickFlipPageCheckCancel);
CopyWindowToVram(1, COPYWIN_GFX); CopyWindowToVram(1, COPYWIN_GFX);
if (gUnknown_203ACF0->field_18[0] != 0xFFFF) if (gUnknown_203ACF0->field_18[0] != 0xFFFF)
sub_8104C64(gUnknown_203ACF0->field_18[0], 0, gUnknown_203ACF0->field_2C); sub_8104C64(gUnknown_203ACF0->field_18[0], 0, gUnknown_203ACF0->field_2C);
src/strings.c
+38 -38
View File
@@ -52,13 +52,13 @@ ALIGNED(4) const u8 gText_UPDOWNPick_ABUTTONBBUTTONCancel[] = _("{DPAD_UPDOWN}PI
ALIGNED(4) const u8 gText_ABUTTONExit[] = _("{A_BUTTON}EXIT"); ALIGNED(4) const u8 gText_ABUTTONExit[] = _("{A_BUTTON}EXIT");
const u8 gText_Boy[] = _("BOY"); const u8 gText_Boy[] = _("BOY");
const u8 gText_Girl[] = _("GIRL"); const u8 gText_Girl[] = _("GIRL");
const u8 gUnknown_8415D9C[] = _("POKéDEX TABLE OF CONTENTS"); const u8 gText_PokedexTableOfContents[] = _("POKéDEX TABLE OF CONTENTS");
const u8 gUnknown_8415DB8[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}OK"); const u8 gText_PickOK[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}OK");
const u8 gUnknown_8415DC4[] = _("Seen:"); const u8 gText_Seen[] = _("Seen:");
const u8 gUnknown_8415DCA[] = _("Owned:"); const u8 gText_Owned[] = _("Owned:");
const u8 gUnknown_8415DD1[] = _("KANTO"); const u8 gText_Kanto[] = _("KANTO");
const u8 gUnknown_8415DD7[] = _("NATIONAL"); const u8 gText_National[] = _("NATIONAL");
const u8 gUnknown_8415DE0[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}POKéMON HABITATS"); const u8 gText_PokemonHabitats[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}POKéMON HABITATS");
const u8 gText_DexCategory_GrasslandPkmn[] = _("Grassland POKéMON"); const u8 gText_DexCategory_GrasslandPkmn[] = _("Grassland POKéMON");
const u8 gText_DexCategory_ForestPkmn[] = _("Forest POKéMON"); const u8 gText_DexCategory_ForestPkmn[] = _("Forest POKéMON");
const u8 gText_DexCategory_WatersEdgePkmn[] = _("Water's-edge POKéMON"); const u8 gText_DexCategory_WatersEdgePkmn[] = _("Water's-edge POKéMON");
@@ -68,38 +68,38 @@ const u8 gText_DexCategory_MountainPkmn[] = _("Mountain POKéMON");
const u8 gText_DexCategory_RoughTerrainPkmn[] = _("Rough-terrain POKéMON"); const u8 gText_DexCategory_RoughTerrainPkmn[] = _("Rough-terrain POKéMON");
const u8 gText_DexCategory_UrbanPkmn[] = _("Urban POKéMON"); const u8 gText_DexCategory_UrbanPkmn[] = _("Urban POKéMON");
const u8 gText_DexCategory_RarePkmn[] = _("Rare POKéMON"); const u8 gText_DexCategory_RarePkmn[] = _("Rare POKéMON");
const u8 gUnknown_8415E88[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}SEARCH"); const u8 gText_Search[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}SEARCH");
const u8 gUnknown_8415E95[] = _("NUMERICAL MODE"); const u8 gText_NumericalMode[] = _("NUMERICAL MODE");
const u8 gUnknown_8415EA4[] = _("A TO Z MODE"); const u8 gText_AToZMode[] = _("A TO Z MODE");
const u8 gUnknown_8415EB0[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}OTHER"); const u8 gText_PokedexOther[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}OTHER");
const u8 gUnknown_8415EBC[] = _("ずかんの つかいかた"); const u8 gTextJP_HowToUsePokedex[] = _("ずかんの つかいかた");
const u8 gUnknown_8415EC7[] = _("CLOSE POKéDEX"); const u8 gText_ClosePokedex[] = _("CLOSE POKéDEX");
const u8 gUnknown_8415ED5[] = _("TYPE MODE"); const u8 gText_TypeMode[] = _("TYPE MODE");
const u8 gUnknown_8415EDF[] = _("LIGHTEST MODE"); const u8 gText_LightestMode[] = _("LIGHTEST MODE");
const u8 gUnknown_8415EED[] = _("SMALLEST MODE"); const u8 gText_SmallestMode[] = _("SMALLEST MODE");
const u8 gUnknown_8415EFB[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}POKéMON LIST"); const u8 gText_PokemonList[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}POKéMON LIST");
const u8 gUnknown_8415F0E[] = _("NUMERICAL MODE: KANTO"); const u8 gText_NumericalModeKanto[] = _("NUMERICAL MODE: KANTO");
const u8 gUnknown_8415F24[] = _("NUMERICAL MODE: NATIONAL"); const u8 gText_NumericalModeNational[] = _("NUMERICAL MODE: NATIONAL");
const u8 gUnknown_8415F3D[] = _("POKéMON LIST"); const u8 gText_PokemonListNoColor[] = _("POKéMON LIST");
const u8 gUnknown_8415F4A[] = _("SEARCH"); const u8 gText_SearchNoColor[] = _("SEARCH");
const u8 gText_PickOKExit[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}CANCEL"); const u8 gText_PickOKExit[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}CANCEL");
const u8 gUnknown_8415F66[] = _("-----"); const u8 gText_5Dashes[] = _("-----");
const u8 gUnknown_8415F6C[] = _("{DPAD_LEFTRIGHT}PICK{PLUS}FLIP PAGE {A_BUTTON}CHECK {B_BUTTON}CANCEL"); const u8 gText_PickFlipPageCheckCancel[] = _("{DPAD_LEFTRIGHT}PICK{PLUS}FLIP PAGE {A_BUTTON}CHECK {B_BUTTON}CANCEL");
const u8 gUnknown_8415F8F[] = _(" POKéMON"); const u8 gText_PokedexPokemon[] = _(" POKéMON");
const u8 gUnknown_8415F98[] = _("HT"); const u8 gText_HT[] = _("HT");
const u8 gUnknown_8415F9B[] = _("WT"); const u8 gText_WT[] = _("WT");
const u8 gUnknown_8415F9E[] = _("”"); const u8 gText_PokedexQuotationMark[] = _("”"); // Unused
const u8 gUnknown_8415FA0[] = _("lbs."); const u8 gText_Lbs[] = _("lbs.");
const u8 gUnknown_8415FA5[] = _("ポケモンデ-タ"); const u8 gTextJP_PokemonData[] = _("ポケモンデ-タ");
const u8 gUnknown_8415FAD[] = _("{START_BUTTON}CRY"); const u8 gText_Cry[] = _("{START_BUTTON}CRY");
const u8 gUnknown_8415FB3[] = _("{A_BUTTON}NEXT DATA {B_BUTTON}CANCEL"); const u8 gText_NextDataCancel[] = _("{A_BUTTON}NEXT DATA {B_BUTTON}CANCEL");
const u8 gUnknown_8415FC8[] = _("{A_BUTTON}NEXT"); const u8 gText_Next[] = _("{A_BUTTON}NEXT");
const u8 gUnknown_8415FCF[] = _("{A_BUTTON}CANCEL {B_BUTTON}PREVIOUS DATA"); const u8 gText_CancelPreviousData[] = _("{A_BUTTON}CANCEL {B_BUTTON}PREVIOUS DATA");
const u8 gUnknown_8415FE8[] = _("AREA"); const u8 gText_Area[] = _("AREA");
const u8 gUnknown_8415FED[] = _("SIZE"); const u8 gText_Size[] = _("SIZE");
const u8 gUnknown_8415FF2[] = _("AREA UNKNOWN"); const u8 gText_AreaUnknown[] = _("AREA UNKNOWN");
const u8 gUnknown_8415FFF[] = _("{NO}"); const u8 gText_PokedexNo[] = _("{NO}");
const u8 gUnknown_8416002[] = _("PAGE"); const u8 gText_Page[] = _("PAGE");
ALIGNED(4) const u8 gText_WelcomeToHOF[] = _("Welcome to the HALL OF FAME!"); ALIGNED(4) const u8 gText_WelcomeToHOF[] = _("Welcome to the HALL OF FAME!");
ALIGNED(4) const u8 gUnknown_8416028[] = _("みつけた ポケモン {STR_VAR_1}!\nつかまえた ポケモン {STR_VAR_2}!\pオダマキはかせの\nポケモンずかん ひょうか!\pオダマキ“どれどれ\p"); ALIGNED(4) const u8 gUnknown_8416028[] = _("みつけた ポケモン {STR_VAR_1}!\nつかまえた ポケモン {STR_VAR_2}!\pオダマキはかせの\nポケモンずかん ひょうか!\pオダマキ“どれどれ\p");
ALIGNED(4) const u8 gUnknown_8416068[] = _("ここまでの レポ-トを かきしるしています!\nでんげんを きらないでください"); ALIGNED(4) const u8 gUnknown_8416068[] = _("ここまでの レポ-トを かきしるしています!\nでんげんを きらないでください");