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

Review fixes

Browse Source
This commit is contained in:
KDSKardabox 2018-02-13 09:16:38 +05:30
parent 54922641af
commit 7b360b2e33
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/text.h
View File

@ -249,4 +249,26 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese);
u32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese); u32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese);
void DecompressGlyphFont9(u16 glyphId); void DecompressGlyphFont9(u16 glyphId);
extern const u8 gBirchDexRatingText_LessThan10[];
extern const u8 gBirchDexRatingText_LessThan20[];
extern const u8 gBirchDexRatingText_LessThan30[];
extern const u8 gBirchDexRatingText_LessThan40[];
extern const u8 gBirchDexRatingText_LessThan50[];
extern const u8 gBirchDexRatingText_LessThan60[];
extern const u8 gBirchDexRatingText_LessThan70[];
extern const u8 gBirchDexRatingText_LessThan80[];
extern const u8 gBirchDexRatingText_LessThan90[];
extern const u8 gBirchDexRatingText_LessThan100[];
extern const u8 gBirchDexRatingText_LessThan110[];
extern const u8 gBirchDexRatingText_LessThan120[];
extern const u8 gBirchDexRatingText_LessThan130[];
extern const u8 gBirchDexRatingText_LessThan140[];
extern const u8 gBirchDexRatingText_LessThan150[];
extern const u8 gBirchDexRatingText_LessThan160[];
extern const u8 gBirchDexRatingText_LessThan170[];
extern const u8 gBirchDexRatingText_LessThan180[];
extern const u8 gBirchDexRatingText_LessThan190[];
extern const u8 gBirchDexRatingText_LessThan200[];
extern const u8 gBirchDexRatingText_DexCompleted[];
#endif // GUARD_TEXT_H #endif // GUARD_TEXT_H

23
src/birch_pc.c
View File

@ -3,33 +3,12 @@
#include "field_message_box.h" #include "field_message_box.h"
#include "pokedex.h" #include "pokedex.h"
#include "constants/species.h" #include "constants/species.h"
#include "text.h"
extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8004;
extern u16 gSpecialVar_0x8005; extern u16 gSpecialVar_0x8005;
extern u16 gSpecialVar_0x8006; extern u16 gSpecialVar_0x8006;
extern const u8 gBirchDexRatingText_LessThan10[];
extern const u8 gBirchDexRatingText_LessThan20[];
extern const u8 gBirchDexRatingText_LessThan30[];
extern const u8 gBirchDexRatingText_LessThan40[];
extern const u8 gBirchDexRatingText_LessThan50[];
extern const u8 gBirchDexRatingText_LessThan60[];
extern const u8 gBirchDexRatingText_LessThan70[];
extern const u8 gBirchDexRatingText_LessThan80[];
extern const u8 gBirchDexRatingText_LessThan90[];
extern const u8 gBirchDexRatingText_LessThan100[];
extern const u8 gBirchDexRatingText_LessThan110[];
extern const u8 gBirchDexRatingText_LessThan120[];
extern const u8 gBirchDexRatingText_LessThan130[];
extern const u8 gBirchDexRatingText_LessThan140[];
extern const u8 gBirchDexRatingText_LessThan150[];
extern const u8 gBirchDexRatingText_LessThan160[];
extern const u8 gBirchDexRatingText_LessThan170[];
extern const u8 gBirchDexRatingText_LessThan180[];
extern const u8 gBirchDexRatingText_LessThan190[];
extern const u8 gBirchDexRatingText_LessThan200[];
extern const u8 gBirchDexRatingText_DexCompleted[];
bool16 ScriptGetPokedexInfo(void) bool16 ScriptGetPokedexInfo(void)
{ {
if (gSpecialVar_0x8004 == 0) // is national dex not present? if (gSpecialVar_0x8004 == 0) // is national dex not present?

2
src/smokescreen.c
View File

@ -4,10 +4,8 @@
#include "sprite.h" #include "sprite.h"
#include "util.h" #include "util.h"
static void sub_8075370(struct Sprite *); static void sub_8075370(struct Sprite *);
u8 sub_807521C(s16 x, s16 y, u8 a3) u8 sub_807521C(s16 x, s16 y, u8 a3)
{ {
u8 mainSpriteId; u8 mainSpriteId;