summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-11-11 17:08:21 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2019-11-11 17:08:21 -0500
commitf316b22f96753c8580d86a8b7957ec69d7bd0c3c (patch)
tree848219276b5c22c4c8b83ea7e498cf33bdf1a361 /src
parent68ac755bb91041868cde6d558b2af2123ddad0a0 (diff)
Move gText_Decimal to strings.h; dump box_party_pokemon_dropdown rodata
Diffstat (limited to 'src')
-rw-r--r--src/pokemon_size_record.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index 06e23618d..6eff367c5 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -6,6 +6,7 @@
#include "pokemon_size_record.h"
#include "string_util.h"
#include "text.h"
+#include "strings.h"
#include "constants/species.h"
#define DEFAULT_MAX_SIZE 0 // was 0x8100 in Ruby/Sapphire, 0x8000 in Emerald
@@ -28,13 +29,13 @@ static const struct UnknownStruct sBigMonSizeTable[] =
{ 800, 100, 7710 },
{ 900, 150, 17710 },
{ 1000, 150, 32710 },
- { 1100, 100, -17826 },
- { 1200, 50, -7826 },
- { 1300, 20, -2826 },
- { 1400, 5, -826 },
- { 1500, 2, -326 },
- { 1600, 1, -126 },
- { 1700, 1, -26 },
+ { 1100, 100, 47710 },
+ { 1200, 50, 57710 },
+ { 1300, 20, 62710 },
+ { 1400, 5, 64710 },
+ { 1500, 2, 65210 },
+ { 1600, 1, 65410 },
+ { 1700, 1, 65510 },
};
static const u8 sGiftRibbonsMonDataIds[] =
@@ -44,8 +45,6 @@ static const u8 sGiftRibbonsMonDataIds[] =
MON_DATA_GIFT_RIBBON_7
};
-extern const u8 gText_DecimalPoint[];
-
#define CM_PER_INCH 2.54
static u32 GetMonSizeHash(struct Pokemon * pkmn)