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
2019-10-30 18:47:02 -04:00
parent 1907fdacca
commit 71dbb00800
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/decompress.h
-1
View File
@@ -24,7 +24,6 @@ void DecompressPicFromTable_DontHandleDeoxys(const struct CompressedSpriteSheet
void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality); void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
void HandleLoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality); void HandleLoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic); void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);
void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic); void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);
src/data/ingame_trades.h
+9 -9
View File
@@ -3,7 +3,7 @@ const struct InGameTrade gInGameTrades[] = {
.nickname = _("MIMIEN"), .nickname = _("MIMIEN"),
.species = SPECIES_MR_MIME, .species = SPECIES_MR_MIME,
.ivs = {20, 15, 17, 24, 23, 22}, .ivs = {20, 15, 17, 24, 23, 22},
.abilityNum = FALSE, .abilityNum = 0,
.otId = 1985, .otId = 1985,
.conditions = {5, 5, 5, 30, 5}, .conditions = {5, 5, 5, 30, 5},
.personality = 0x00009cae, .personality = 0x00009cae,
@@ -17,7 +17,7 @@ const struct InGameTrade gInGameTrades[] = {
.nickname = _("ZYNX"), .nickname = _("ZYNX"),
.species = SPECIES_JYNX, .species = SPECIES_JYNX,
.ivs = {18, 17, 18, 22, 25, 21}, .ivs = {18, 17, 18, 22, 25, 21},
.abilityNum = FALSE, .abilityNum = 0,
.otId = 36728, .otId = 36728,
.conditions = {5, 30, 5, 5, 5}, .conditions = {5, 30, 5, 5, 5},
.personality = 0x498a2e1d, .personality = 0x498a2e1d,
@@ -31,7 +31,7 @@ const struct InGameTrade gInGameTrades[] = {
.nickname = _("MS. NIDO"), .nickname = _("MS. NIDO"),
.species = SPECIES_NIDORAN_F, .species = SPECIES_NIDORAN_F,
.ivs = {22, 18, 25, 19, 15, 22}, .ivs = {22, 18, 25, 19, 15, 22},
.abilityNum = FALSE, .abilityNum = 0,
.otId = 63184, .otId = 63184,
.conditions = {5, 5, 5, 5, 30}, .conditions = {5, 5, 5, 5, 30},
.personality = 0x4c970b89, .personality = 0x4c970b89,
@@ -45,7 +45,7 @@ const struct InGameTrade gInGameTrades[] = {
.nickname = _("CH'DING"), .nickname = _("CH'DING"),
.species = SPECIES_FARFETCHD, .species = SPECIES_FARFETCHD,
.ivs = {20, 25, 21, 24, 15, 20}, .ivs = {20, 25, 21, 24, 15, 20},
.abilityNum = FALSE, .abilityNum = 0,
.otId = 8810, .otId = 8810,
.conditions = {30, 5, 5, 5, 5}, .conditions = {30, 5, 5, 5, 5},
.personality = 0x151943d7, .personality = 0x151943d7,
@@ -59,7 +59,7 @@ const struct InGameTrade gInGameTrades[] = {
.nickname = _("NINA"), .nickname = _("NINA"),
.species = SPECIES_NIDORINA, .species = SPECIES_NIDORINA,
.ivs = {22, 25, 18, 19, 22, 15}, .ivs = {22, 25, 18, 19, 22, 15},
.abilityNum = FALSE, .abilityNum = 0,
.otId = 13637, .otId = 13637,
.conditions = {5, 5, 30, 5, 5}, .conditions = {5, 5, 30, 5, 5},
.personality = 0x00eeca15, .personality = 0x00eeca15,
@@ -73,7 +73,7 @@ const struct InGameTrade gInGameTrades[] = {
.nickname = _("MARC"), .nickname = _("MARC"),
.species = SPECIES_LICKITUNG, .species = SPECIES_LICKITUNG,
.ivs = {24, 19, 21, 15, 23, 21}, .ivs = {24, 19, 21, 15, 23, 21},
.abilityNum = FALSE, .abilityNum = 0,
.otId = 1239, .otId = 1239,
.conditions = {5, 5, 5, 5, 30}, .conditions = {5, 5, 5, 5, 30},
.personality = 0x451308ab, .personality = 0x451308ab,
@@ -87,7 +87,7 @@ const struct InGameTrade gInGameTrades[] = {
.nickname = _("ESPHERE"), .nickname = _("ESPHERE"),
.species = SPECIES_ELECTRODE, .species = SPECIES_ELECTRODE,
.ivs = {19, 16, 18, 25, 25, 19}, .ivs = {19, 16, 18, 25, 25, 19},
.abilityNum = TRUE, .abilityNum = 1,
.otId = 50298, .otId = 50298,
.conditions = {30, 5, 5, 5, 5}, .conditions = {30, 5, 5, 5, 5},
.personality = 0x06341016, .personality = 0x06341016,
@@ -101,7 +101,7 @@ const struct InGameTrade gInGameTrades[] = {
.nickname = _("TANGENY"), .nickname = _("TANGENY"),
.species = SPECIES_TANGELA, .species = SPECIES_TANGELA,
.ivs = {22, 17, 25, 16, 23, 20}, .ivs = {22, 17, 25, 16, 23, 20},
.abilityNum = FALSE, .abilityNum = 0,
.otId = 60042, .otId = 60042,
.conditions = {5, 5, 30, 5, 5}, .conditions = {5, 5, 30, 5, 5},
.personality = 0x5c77ecfa, .personality = 0x5c77ecfa,
@@ -116,7 +116,7 @@ const struct InGameTrade gInGameTrades[] = {
.nickname = _("SEELOR"), .nickname = _("SEELOR"),
.species = SPECIES_SEEL, .species = SPECIES_SEEL,
.ivs = {24, 15, 22, 16, 23, 22}, .ivs = {24, 15, 22, 16, 23, 22},
.abilityNum = FALSE, .abilityNum = 0,
.otId = 9853, .otId = 9853,
.conditions = {5, 5, 5, 5, 30}, .conditions = {5, 5, 5, 5, 30},
.personality = 0x482cac89, .personality = 0x482cac89,