diff options
| -rw-r--r-- | data/tilesets/secondary/ever_grande/anim/flowers/0.png | bin | 257 -> 257 bytes | |||
| -rw-r--r-- | data/tilesets/secondary/ever_grande/anim/flowers/1.png | bin | 257 -> 257 bytes | |||
| -rw-r--r-- | data/tilesets/secondary/ever_grande/anim/flowers/2.png | bin | 253 -> 253 bytes | |||
| -rw-r--r-- | data/tilesets/secondary/ever_grande/anim/flowers/3.png | bin | 255 -> 255 bytes | |||
| -rw-r--r-- | data/tilesets/secondary/ever_grande/anim/flowers/4.png | bin | 257 -> 257 bytes | |||
| -rw-r--r-- | data/tilesets/secondary/ever_grande/anim/flowers/5.png | bin | 257 -> 257 bytes | |||
| -rw-r--r-- | data/tilesets/secondary/ever_grande/anim/flowers/6.png | bin | 254 -> 254 bytes | |||
| -rw-r--r-- | data/tilesets/secondary/ever_grande/anim/flowers/7.png | bin | 254 -> 254 bytes | |||
| -rw-r--r-- | src/trade.c | 3 |
9 files changed, 2 insertions, 1 deletions
diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/0.png b/data/tilesets/secondary/ever_grande/anim/flowers/0.png Binary files differindex 6493e2e82..ae9198645 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/0.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/0.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/1.png b/data/tilesets/secondary/ever_grande/anim/flowers/1.png Binary files differindex 6493e2e82..ae9198645 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/1.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/1.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/2.png b/data/tilesets/secondary/ever_grande/anim/flowers/2.png Binary files differindex 0b1f568cb..05b979637 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/2.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/2.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/3.png b/data/tilesets/secondary/ever_grande/anim/flowers/3.png Binary files differindex edc7220b8..a4cea04e6 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/3.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/3.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/4.png b/data/tilesets/secondary/ever_grande/anim/flowers/4.png Binary files differindex 6493e2e82..ae9198645 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/4.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/4.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/5.png b/data/tilesets/secondary/ever_grande/anim/flowers/5.png Binary files differindex 6493e2e82..ae9198645 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/5.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/5.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/6.png b/data/tilesets/secondary/ever_grande/anim/flowers/6.png Binary files differindex 4d43dfd0a..c45b6188c 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/6.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/6.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/7.png b/data/tilesets/secondary/ever_grande/anim/flowers/7.png Binary files differindex 4d43dfd0a..c45b6188c 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/7.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/7.png diff --git a/src/trade.c b/src/trade.c index 3e9f033b5..935a89b02 100644 --- a/src/trade.c +++ b/src/trade.c @@ -4531,7 +4531,8 @@ static void _CreateInGameTradePokemon(u8 whichPlayerMon, u8 whichInGameTrade) CalculateMonStats(&gEnemyParty[0]); } -static void SetInGameTradeMail(struct Mail *mail, const struct InGameTrade *trade) { +static void SetInGameTradeMail(struct Mail *mail, const struct InGameTrade *trade) +{ s32 i; for (i = 0; i < MAIL_WORDS_COUNT; i++) |
