Name strings used in field_specials

This commit is contained in:
PikalaxALT
2019-10-25 14:59:46 -04:00
parent 359ec8dde1
commit 2fce740005
3 changed files with 72 additions and 72 deletions
+24 -24
View File
@@ -1820,40 +1820,40 @@ gUnknown_8417FB6:: @ 0x8417FB6
gUnknown_8417FB9:: @ 8417FB9 gUnknown_8417FB9:: @ 8417FB9
.string ".$" .string ".$"
gUnknown_8417FBB:: @ 8417FBB gText_BigGuy:: @ 8417FBB
.string "Big guy$" .string "Big guy$"
gUnknown_8417FC3:: @ 8417FC3 gText_BigGirl:: @ 8417FC3
.string "Big girl$" .string "Big girl$"
gUnknown_8417FCC:: @ 8417FCC gText_Daughter:: @ 8417FCC
.string "son$" .string "son$"
gUnknown_8417FD0:: @ 8417FD0 gText_Son:: @ 8417FD0
.string "daughter$" .string "daughter$"
gUnknown_8417FD9:: @ 0x8417FD9 gText_BoulderBadge:: @ 0x8417FD9
.string "BOULDERBADGE$" .string "BOULDERBADGE$"
gUnknown_8417FE6:: @ 0x8417FE6 gText_CascadeBadge:: @ 0x8417FE6
.string "CASCADEBADGE$" .string "CASCADEBADGE$"
gUnknown_8417FF3:: @ 0x8417FF3 gText_ThunderBadge:: @ 0x8417FF3
.string "THUNDERBADGE$" .string "THUNDERBADGE$"
gUnknown_8418000:: @ 0x8418000 gText_RainbowBadge:: @ 0x8418000
.string "RAINBOWBADGE$" .string "RAINBOWBADGE$"
gUnknown_841800D:: @ 0x841800D gText_SoulBadge:: @ 0x841800D
.string "SOULBADGE$" .string "SOULBADGE$"
gUnknown_8418017:: @ 0x8418017 gText_MarshBadge:: @ 0x8418017
.string "MARSHBADGE$" .string "MARSHBADGE$"
gUnknown_8418022:: @ 0x8418022 gText_VolcanoBadge:: @ 0x8418022
.string "VOLCANOBADGE$" .string "VOLCANOBADGE$"
gUnknown_841802F:: @ 0x841802F gText_EarthBadge:: @ 0x841802F
.string "EARTHBADGE$" .string "EARTHBADGE$"
gText_1F:: @ 0x841803A gText_1F:: @ 0x841803A
@@ -1904,7 +1904,7 @@ gText_B4F:: @ 0x8418069
gText_Rooftop:: @ 0x841806D gText_Rooftop:: @ 0x841806D
.string "ROOFTOP$" .string "ROOFTOP$"
gUnknown_8418075:: @ 8418075 gText_NowOn:: @ 8418075
.string "Now on:$" .string "Now on:$"
gText_LinkedGamePlay:: @ 0x841807D gText_LinkedGamePlay:: @ 0x841807D
@@ -1916,37 +1916,37 @@ gText_DirectCorner:: @ 0x841808E
gText_UnionRoom:: @ 0x841809C gText_UnionRoom:: @ 0x841809C
.string "UNION ROOM$" .string "UNION ROOM$"
gUnknown_84180A7:: @ 0x84180A7 gText_Energypowder_50:: @ 0x84180A7
.string "ENERGYPOWDER{CLEAR_TO 0x74}{SMALL}50$" .string "ENERGYPOWDER{CLEAR_TO 0x74}{SMALL}50$"
gUnknown_84180BC:: @ 0x84180BC gText_EnergyRoot_80:: @ 0x84180BC
.string "ENERGY ROOT{CLEAR_TO 0x74}{SMALL}80$" .string "ENERGY ROOT{CLEAR_TO 0x74}{SMALL}80$"
gUnknown_84180D0:: @ 0x84180D0 gText_HealPowder_50:: @ 0x84180D0
.string "HEAL POWDER{CLEAR_TO 0x74}{SMALL}50$" .string "HEAL POWDER{CLEAR_TO 0x74}{SMALL}50$"
gUnknown_84180E4:: @ 0x84180E4 gText_RevivalHerb_300:: @ 0x84180E4
.string "REVIVAL HERB{CLEAR_TO 0x6F}{SMALL}300$" .string "REVIVAL HERB{CLEAR_TO 0x6F}{SMALL}300$"
gUnknown_84180FA:: @ 0x84180FA gText_Protein_1000:: @ 0x84180FA
.string "PROTEIN{CLEAR_TO 0x65}{SMALL}1,000$" .string "PROTEIN{CLEAR_TO 0x65}{SMALL}1,000$"
gUnknown_841810D:: @ 0x841810D gText_Iron_1000:: @ 0x841810D
.string "IRON{CLEAR_TO 0x65}{SMALL}1,000$" .string "IRON{CLEAR_TO 0x65}{SMALL}1,000$"
gUnknown_841811D:: @ 0x841811D gText_Carbos_1000:: @ 0x841811D
.string "CARBOS{CLEAR_TO 0x65}{SMALL}1,000$" .string "CARBOS{CLEAR_TO 0x65}{SMALL}1,000$"
gUnknown_841812F:: @ 0x841812F gText_Calcium_1000:: @ 0x841812F
.string "CALCIUM{CLEAR_TO 0x65}{SMALL}1,000$" .string "CALCIUM{CLEAR_TO 0x65}{SMALL}1,000$"
gUnknown_8418142:: @ 0x8418142 gText_Zinc_1000:: @ 0x8418142
.string "ZINC{CLEAR_TO 0x65}{SMALL}1,000$" .string "ZINC{CLEAR_TO 0x65}{SMALL}1,000$"
gUnknown_8418152:: @ 0x8418152 gText_HpUp_1000:: @ 0x8418152
.string "HP UP{CLEAR_TO 0x65}{SMALL}1,000$" .string "HP UP{CLEAR_TO 0x65}{SMALL}1,000$"
gUnknown_8418163:: @ 0x8418163 gText_PpUp_3000:: @ 0x8418163
.string "PP UP{CLEAR_TO 0x65}{SMALL}3,000$" .string "PP UP{CLEAR_TO 0x65}{SMALL}3,000$"
gString_BattleRecords_PlayersBattleResults:: @ 8418174 gString_BattleRecords_PlayersBattleResults:: @ 8418174
+24 -24
View File
@@ -469,11 +469,11 @@ extern const u8 gSaveStatName_Time[];
extern const u8 gText_From[]; extern const u8 gText_From[];
// field_specials // field_specials
extern const u8 gUnknown_8417FBB[]; extern const u8 gText_BigGuy[];
extern const u8 gUnknown_8417FC3[]; extern const u8 gText_BigGirl[];
extern const u8 gUnknown_8417FD0[]; extern const u8 gText_Son[];
extern const u8 gUnknown_8417FCC[]; extern const u8 gText_Daughter[];
extern const u8 gUnknown_8418075[]; extern const u8 gText_NowOn[];
extern const u8 gText_B4F[]; extern const u8 gText_B4F[];
extern const u8 gText_B3F[]; extern const u8 gText_B3F[];
extern const u8 gText_B2F[]; extern const u8 gText_B2F[];
@@ -490,29 +490,29 @@ extern const u8 gText_9F[];
extern const u8 gText_10F[]; extern const u8 gText_10F[];
extern const u8 gText_11F[]; extern const u8 gText_11F[];
extern const u8 gText_Rooftop[]; extern const u8 gText_Rooftop[];
extern const u8 gUnknown_8417FD9[]; extern const u8 gText_BoulderBadge[];
extern const u8 gUnknown_8417FE6[]; extern const u8 gText_CascadeBadge[];
extern const u8 gUnknown_8417FF3[]; extern const u8 gText_ThunderBadge[];
extern const u8 gUnknown_8418000[]; extern const u8 gText_RainbowBadge[];
extern const u8 gUnknown_841800D[]; extern const u8 gText_SoulBadge[];
extern const u8 gUnknown_8418017[]; extern const u8 gText_MarshBadge[];
extern const u8 gUnknown_8418022[]; extern const u8 gText_VolcanoBadge[];
extern const u8 gUnknown_841802F[]; extern const u8 gText_EarthBadge[];
extern const u8 gText_LinkedGamePlay[]; extern const u8 gText_LinkedGamePlay[];
extern const u8 gText_DirectCorner[]; extern const u8 gText_DirectCorner[];
extern const u8 gText_UnionRoom[]; extern const u8 gText_UnionRoom[];
extern const u8 gOtherText_Quit[]; extern const u8 gOtherText_Quit[];
extern const u8 gUnknown_84180A7[]; extern const u8 gText_Energypowder_50[];
extern const u8 gUnknown_84180BC[]; extern const u8 gText_EnergyRoot_80[];
extern const u8 gUnknown_84180D0[]; extern const u8 gText_HealPowder_50[];
extern const u8 gUnknown_84180E4[]; extern const u8 gText_RevivalHerb_300[];
extern const u8 gUnknown_84180FA[]; extern const u8 gText_Protein_1000[];
extern const u8 gUnknown_841810D[]; extern const u8 gText_Iron_1000[];
extern const u8 gUnknown_841811D[]; extern const u8 gText_Carbos_1000[];
extern const u8 gUnknown_841812F[]; extern const u8 gText_Calcium_1000[];
extern const u8 gUnknown_8418142[]; extern const u8 gText_Zinc_1000[];
extern const u8 gUnknown_8418152[]; extern const u8 gText_HpUp_1000[];
extern const u8 gUnknown_8418163[]; extern const u8 gText_PpUp_3000[];
// script_menu // script_menu
extern const u8 gText_SomeoneSPc[]; extern const u8 gText_SomeoneSPc[];
+24 -24
View File
@@ -141,17 +141,17 @@ u8 Special_GetPlayerTrainerIdOnesDigit(void)
void Special_BufferBigGuyOrBigGirlString(void) void Special_BufferBigGuyOrBigGirlString(void)
{ {
if (gSaveBlock2Ptr->playerGender == MALE) if (gSaveBlock2Ptr->playerGender == MALE)
StringCopy(gStringVar1, gUnknown_8417FBB); StringCopy(gStringVar1, gText_BigGuy);
else else
StringCopy(gStringVar1, gUnknown_8417FC3); StringCopy(gStringVar1, gText_BigGirl);
} }
void Special_BufferSonOrDaughterString(void) void Special_BufferSonOrDaughterString(void)
{ {
if (gSaveBlock2Ptr->playerGender == MALE) if (gSaveBlock2Ptr->playerGender == MALE)
StringCopy(gStringVar1, gUnknown_8417FD0); StringCopy(gStringVar1, gText_Son);
else else
StringCopy(gStringVar1, gUnknown_8417FCC); StringCopy(gStringVar1, gText_Daughter);
} }
u8 Special_GetBattleOutcome(void) u8 Special_GetBattleOutcome(void)
@@ -1069,7 +1069,7 @@ void Special_DrawElevatorCurrentFloorWindow(void)
sElevatorCurrentFloorWindowId = AddWindow(&sElevatorCurrentFloorWindowTemplate); sElevatorCurrentFloorWindowId = AddWindow(&sElevatorCurrentFloorWindowTemplate);
TextWindow_SetStdFrame0_WithPal(sElevatorCurrentFloorWindowId, 0x21D, 0xD0); TextWindow_SetStdFrame0_WithPal(sElevatorCurrentFloorWindowId, 0x21D, 0xD0);
DrawStdFrameWithCustomTileAndPalette(sElevatorCurrentFloorWindowId, FALSE, 0x21D, 0xD); DrawStdFrameWithCustomTileAndPalette(sElevatorCurrentFloorWindowId, FALSE, 0x21D, 0xD);
AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, 2, gUnknown_8418075, 0, 2, 0xFF, NULL); AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, 2, gText_NowOn, 0, 2, 0xFF, NULL);
floorname = sFloorNamePointers[gSpecialVar_0x8005]; floorname = sFloorNamePointers[gSpecialVar_0x8005];
strwidth = GetStringWidth(2, floorname, 0); strwidth = GetStringWidth(2, floorname, 0);
AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, 2, floorname, 56 - strwidth, 16, 0xFF, NULL); AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, 2, floorname, 56 - strwidth, 16, 0xFF, NULL);
@@ -1227,14 +1227,14 @@ void Special_ListMenu(void)
static const u8 *const sListMenuLabels[][12] = { static const u8 *const sListMenuLabels[][12] = {
{ {
gUnknown_8417FD9, gText_BoulderBadge,
gUnknown_8417FE6, gText_CascadeBadge,
gUnknown_8417FF3, gText_ThunderBadge,
gUnknown_8418000, gText_RainbowBadge,
gUnknown_841800D, gText_SoulBadge,
gUnknown_8418017, gText_MarshBadge,
gUnknown_8418022, gText_VolcanoBadge,
gUnknown_841802F, gText_EarthBadge,
gOtherText_Exit, gOtherText_Exit,
}, { }, {
gText_11F, gText_11F,
@@ -1267,17 +1267,17 @@ static const u8 *const sListMenuLabels[][12] = {
gText_UnionRoom, gText_UnionRoom,
gOtherText_Quit, gOtherText_Quit,
}, { }, {
gUnknown_84180A7, gText_Energypowder_50,
gUnknown_84180BC, gText_EnergyRoot_80,
gUnknown_84180D0, gText_HealPowder_50,
gUnknown_84180E4, gText_RevivalHerb_300,
gUnknown_84180FA, gText_Protein_1000,
gUnknown_841810D, gText_Iron_1000,
gUnknown_841811D, gText_Carbos_1000,
gUnknown_841812F, gText_Calcium_1000,
gUnknown_8418142, gText_Zinc_1000,
gUnknown_8418152, gText_HpUp_1000,
gUnknown_8418163, gText_PpUp_3000,
gOtherText_Exit, gOtherText_Exit,
}, { }, {
gText_Rooftop, gText_Rooftop,