Move gText_Decimal to strings.h; dump box_party_pokemon_dropdown rodata
This commit is contained in:
BIN
Binary file not shown.
@@ -7,4 +7,12 @@
|
||||
.align 2
|
||||
|
||||
gUnknown_841F4B4:: @ 841F4B4
|
||||
.incbin "baserom.gba", 0x41f4b4, 0x20
|
||||
.2byte 0x0100, 0x0100
|
||||
.2byte 0x0200, 0x0100
|
||||
.2byte 0x0100, 0x0200
|
||||
.2byte 0x0200, 0x0200
|
||||
|
||||
.2byte 0x0080, 0x0080
|
||||
.2byte 0x0100, 0x0100
|
||||
.2byte 0x0200, 0x0200
|
||||
.2byte 0x0400, 0x0400
|
||||
|
||||
@@ -735,4 +735,7 @@ extern const u8 gText_WhichMoveShouldBeForgotten[];
|
||||
extern const u8 gText_TeachMoveQues[];
|
||||
extern const u8 gText_GiveUpTryingToTeachNewMove[];
|
||||
|
||||
// pokemon_size_record
|
||||
extern const u8 gText_DecimalPoint[];
|
||||
|
||||
#endif //GUARD_STRINGS_H
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user