ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 15:13:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #443 from Meowsy/misc-renamings

Browse Source 
Misc renamings.
This commit is contained in:
Marcus Huderle 2018-12-13 21:35:36 -06:00 committed by GitHub
commit 5e92481f51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data/event_scripts.s
View File

@ -4651,35 +4651,35 @@ gOtherText_DontYouAgree:: @ 8294301
.string "\n" .string "\n"
.string "Don't you agree?$" .string "Don't you agree?$"
gUnknown_08294313:: @ 8294313 gMauvilleManText_ISoWantToGoOnAVacation:: @ 8294313
.string "I so want to go on a vacation.\n" .string "I so want to go on a vacation.\n"
.string "Would you happen to know a nice place?$" .string "Would you happen to know a nice place?$"
gUnknown_08294359:: @ 8294359 gMauvilleManText_IBoughtCrayonsWith120Colors:: @ 8294359
.string "I bought crayons with 120 colors!\n" .string "I bought crayons with 120 colors!\n"
.string "Don't you think that's nice?$" .string "Don't you think that's nice?$"
gUnknown_08294398:: @ 8294398 gMauvilleManText_WouldntItBeNiceIfWeCouldFloat:: @ 8294398
.string "Wouldn't it be nice if we could float\n" .string "Wouldn't it be nice if we could float\n"
.string "away on a cloud of bubbles?$" .string "away on a cloud of bubbles?$"
gUnknown_082943DA:: @ 82943DA gMauvilleManText_WhenYouWriteOnASandyBeach:: @ 82943DA
.string "When you write on a sandy beach,\n" .string "When you write on a sandy beach,\n"
.string "they wash away. It makes me sad.$" .string "they wash away. It makes me sad.$"
gUnknown_0829441C:: @ 829441C gMauvilleManText_WhatsTheBottomOfTheSeaLike:: @ 829441C
.string "What's the bottom of the sea like?\n" .string "What's the bottom of the sea like?\n"
.string "Just once I would so love to go!$" .string "Just once I would so love to go!$"
gUnknown_08294460:: @ 8294460 gMauvilleManText_WhenYouSeeTheSettingSunDoesIt:: @ 8294460
.string "When you see the setting sun, does it\n" .string "When you see the setting sun, does it\n"
.string "make you want to go home?$" .string "make you want to go home?$"
gUnknown_082944A0:: @ 82944A0 gMauvilleManText_LyingBackInTheGreenGrass:: @ 82944A0
.string "Lying back in the green grass…\n" .string "Lying back in the green grass…\n"
.string "Oh, it's so, so nice!$" .string "Oh, it's so, so nice!$"
gUnknown_082944D5:: @ 82944D5 gMauvilleManText_SecretBasesAreSoWonderful:: @ 82944D5
.string "SECRET BASES are so wonderful!\n" .string "SECRET BASES are so wonderful!\n"
.string "Can't you feel the excitement?$" .string "Can't you feel the excitement?$"

2
include/battle_tower.h
View File

@ -9,7 +9,7 @@ struct RSBattleTowerRecord
/*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1];
/*0x0C*/ u8 trainerId[4]; /*0x0C*/ u8 trainerId[4];
/*0x10*/ u16 greeting[6]; /*0x10*/ u16 greeting[6];
/*0x1C*/ struct UnknownPokemonStruct party[3]; /*0x1C*/ struct BattleTowerPokemon party[3];
/*0xA0*/ u32 checksum; /*0xA0*/ u32 checksum;
}; };

16
include/event_scripts.h
View File

@ -405,14 +405,14 @@ extern const u8 gText_SoDesirable[];
extern const u8 gText_SoExciting[]; extern const u8 gText_SoExciting[];
extern const u8 gText_SoAmusing[]; extern const u8 gText_SoAmusing[];
extern const u8 gText_SoMagical[]; extern const u8 gText_SoMagical[];
extern const u8 gUnknown_08294313[]; extern const u8 gMauvilleManText_ISoWantToGoOnAVacation[];
extern const u8 gUnknown_08294359[]; extern const u8 gMauvilleManText_IBoughtCrayonsWith120Colors[];
extern const u8 gUnknown_08294398[]; extern const u8 gMauvilleManText_WouldntItBeNiceIfWeCouldFloat[];
extern const u8 gUnknown_082943DA[]; extern const u8 gMauvilleManText_WhenYouWriteOnASandyBeach[];
extern const u8 gUnknown_0829441C[]; extern const u8 gMauvilleManText_WhatsTheBottomOfTheSeaLike[];
extern const u8 gUnknown_08294460[]; extern const u8 gMauvilleManText_WhenYouSeeTheSettingSunDoesIt[];
extern const u8 gUnknown_082944A0[]; extern const u8 gMauvilleManText_LyingBackInTheGreenGrass[];
extern const u8 gUnknown_082944D5[]; extern const u8 gMauvilleManText_SecretBasesAreSoWonderful[];
extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E930[]; extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E930[];

6
include/global.h
View File

@ -307,7 +307,7 @@ struct Apprentice
u32 checksum; u32 checksum;
}; };
struct UnknownPokemonStruct struct BattleTowerPokemon
{ {
u16 species; u16 species;
u16 heldItem; u16 heldItem;
@ -344,7 +344,7 @@ struct EmeraldBattleTowerRecord
/*0x10*/ u16 greeting[6]; /*0x10*/ u16 greeting[6];
/*0x1C*/ u16 speechWon[6]; /*0x1C*/ u16 speechWon[6];
/*0x28*/ u16 speechLost[6]; /*0x28*/ u16 speechLost[6];
/*0x34*/ struct UnknownPokemonStruct party[4]; /*0x34*/ struct BattleTowerPokemon party[4];
/*0xE4*/ u8 language; /*0xE4*/ u8 language;
/*0xE8*/ u32 checksum; /*0xE8*/ u32 checksum;
}; };
@ -359,7 +359,7 @@ struct BattleTowerEReaderTrainer
/*0x10*/ u16 greeting[6]; /*0x10*/ u16 greeting[6];
/*0x1C*/ u16 farewellPlayerLost[6]; /*0x1C*/ u16 farewellPlayerLost[6];
/*0x28*/ u16 farewellPlayerWon[6]; /*0x28*/ u16 farewellPlayerWon[6];
/*0x34*/ struct UnknownPokemonStruct party[3]; /*0x34*/ struct BattleTowerPokemon party[3];
/*0xB8*/ u32 checksum; /*0xB8*/ u32 checksum;
}; };

6
include/pokemon.h
View File

@ -460,11 +460,11 @@ void CreateMaleMon(struct Pokemon *mon, u16 species, u8 level);
void CreateMonWithIVsPersonality(struct Pokemon *mon, u16 species, u8 level, u32 ivs, u32 personality); void CreateMonWithIVsPersonality(struct Pokemon *mon, u16 species, u8 level, u32 ivs, u32 personality);
void CreateMonWithIVsOTID(struct Pokemon *mon, u16 species, u8 level, u8 *ivs, u32 otId); void CreateMonWithIVsOTID(struct Pokemon *mon, u16 species, u8 level, u8 *ivs, u32 otId);
void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 evSpread); void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 evSpread);
void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src); void sub_806819C(struct Pokemon *mon, struct BattleTowerPokemon *src);
void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lvl50); void sub_8068338(struct Pokemon *mon, struct BattleTowerPokemon *src, bool8 lvl50);
void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 monId); void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 monId);
void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId); void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId);
void sub_80686FC(struct Pokemon *mon, struct UnknownPokemonStruct *dest); void sub_80686FC(struct Pokemon *mon, struct BattleTowerPokemon *dest);
void CreateObedientMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId); void CreateObedientMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId);
bool8 sub_80688F8(u8 caseId, u8 battlerId); bool8 sub_80688F8(u8 caseId, u8 battlerId);
void SetDeoxysStats(void); void SetDeoxysStats(void);

2
src/battle_tower.c
View File

@ -3245,7 +3245,7 @@ static void FillPartnerParty(u16 trainerId)
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
struct EmeraldBattleTowerRecord *record = &gSaveBlock2Ptr->frontier.towerRecords[trainerId]; struct EmeraldBattleTowerRecord *record = &gSaveBlock2Ptr->frontier.towerRecords[trainerId];
struct UnknownPokemonStruct monData = record->party[gSaveBlock2Ptr->frontier.field_CB4[18 + i]]; struct BattleTowerPokemon monData = record->party[gSaveBlock2Ptr->frontier.field_CB4[18 + i]];
StringCopy(trainerName, record->name); StringCopy(trainerName, record->name);
if (record->language == LANGUAGE_JAPANESE) if (record->language == LANGUAGE_JAPANESE)
{ {

16
src/mauville_old_man.c
View File

@ -62,14 +62,14 @@ static const u8 * const sGiddyAdjectives[] = {
}; };
static const u8 * const sGiddyQuestions[] = { static const u8 * const sGiddyQuestions[] = {
gUnknown_08294313, gMauvilleManText_ISoWantToGoOnAVacation,
gUnknown_08294359, gMauvilleManText_IBoughtCrayonsWith120Colors,
gUnknown_08294398, gMauvilleManText_WouldntItBeNiceIfWeCouldFloat,
gUnknown_082943DA, gMauvilleManText_WhenYouWriteOnASandyBeach,
gUnknown_0829441C, gMauvilleManText_WhatsTheBottomOfTheSeaLike,
gUnknown_08294460, gMauvilleManText_WhenYouSeeTheSettingSunDoesIt,
gUnknown_082944A0, gMauvilleManText_LyingBackInTheGreenGrass,
gUnknown_082944D5 gMauvilleManText_SecretBasesAreSoWonderful
}; };
static void SetupBard(void) static void SetupBard(void)

6
src/pokemon.c
View File

@ -2749,7 +2749,7 @@ void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedI
CalculateMonStats(mon); CalculateMonStats(mon);
} }
void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src) void sub_806819C(struct Pokemon *mon, struct BattleTowerPokemon *src)
{ {
s32 i; s32 i;
u8 nickname[30]; u8 nickname[30];
@ -2803,7 +2803,7 @@ void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src)
CalculateMonStats(mon); CalculateMonStats(mon);
} }
void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lvl50) void sub_8068338(struct Pokemon *mon, struct BattleTowerPokemon *src, bool8 lvl50)
{ {
s32 i; s32 i;
u8 nickname[30]; u8 nickname[30];
@ -2931,7 +2931,7 @@ void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level,
CalculateMonStats(mon); CalculateMonStats(mon);
} }
void sub_80686FC(struct Pokemon *mon, struct UnknownPokemonStruct *dest) void sub_80686FC(struct Pokemon *mon, struct BattleTowerPokemon *dest)
{ {
s32 i; s32 i;
u16 heldItem; u16 heldItem;

4
src/record_mixing.c
View File

@ -647,7 +647,7 @@ static void ReceiveOldManData(OldMan *oldMan, size_t recordSize, u8 which)
static void ReceiveBattleTowerData(void *battleTowerRecord, size_t recordSize, u8 which) static void ReceiveBattleTowerData(void *battleTowerRecord, size_t recordSize, u8 which)
{ {
struct EmeraldBattleTowerRecord *dest; struct EmeraldBattleTowerRecord *dest;
struct UnknownPokemonStruct *btPokemon; struct BattleTowerPokemon *btPokemon;
u32 mixIndices[4]; u32 mixIndices[4];
s32 i; s32 i;
@ -1866,7 +1866,7 @@ static void SanitizeEmeraldBattleTowerRecord(struct EmeraldBattleTowerRecord *ds
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
struct UnknownPokemonStruct *towerMon = &dst->party[i]; struct BattleTowerPokemon *towerMon = &dst->party[i];
if (towerMon->species != 0) if (towerMon->species != 0)
StripExtCtrlCodes(towerMon->nickname); StripExtCtrlCodes(towerMon->nickname);
} }