ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix calcrom partial doc becoming negative

Browse Source
This commit is contained in:
GriffinR 2021-11-10 13:14:11 -05:00
parent 342b7da5d3
commit 57be596ce4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/calcrom/calcrom.pl vendored
View File

@ -63,14 +63,14 @@ while (my $line = <$file>)
# though. Uniq is pretty fast! # though. Uniq is pretty fast!
my $base_cmd = "nm $elffname | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq"; my $base_cmd = "nm $elffname | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq";
# This looks for Unknown_, Unknown_, or sub_, followed by just numbers. Note that # This looks for Unknown_, Unknown_, or sub_, followed by an address. Note that
# it matches even if stuff precedes the unknown, like sUnknown/gUnknown. # it matches even if stuff precedes the unknown, like sUnknown/gUnknown.
my $undoc_cmd = "grep '[Uu]nknown_[0-9a-fA-F]*\\|sub_[0-9a-fA-F]*'"; my $undoc_cmd = "grep '[Uu]nknown_[0-9a-fA-F]\\{5,7\\}\\|sub_[0-9a-fA-F]\\{5,7\\}'";
# This looks for every symbol with an address at the end of it. Some things are # This looks for every symbol with an address at the end of it. Some things are
# given a name based on their type / location, but still have an unknown purpose. # given a name based on their type / location, but still have an unknown purpose.
# For example, FooMap_EventScript_FFFFFFF. # For example, FooMap_EventScript_FFFFFFF.
my $partial_doc_cmd = "grep '_[0-28][0-9a-fA-F]\\{5,6\\}'"; my $partial_doc_cmd = "grep '_[0-28][0-9a-fA-F]\\{5,7\\}'";
my $count_cmd = "wc -l"; my $count_cmd = "wc -l";

8
src/dodrio_berry_picking.c
View File

@ -3056,16 +3056,16 @@ static const u16 sDebug_BerryResults[MAX_RFU_PLAYERS][4] =
}; };
static const u8 sJPText_Vowels[] = _("あいうえおかき"); static const u8 sJPText_Vowels[] = _("あいうえおかき");
static const u8 sText_ABCDEFG[] = _("ABCDEFG"); static const u8 sText_Letters[] = _("ABCDEFG");
static const u8 sText_0123456[] = _("0123456"); static const u8 sText_Digits[] = _("0123456");
static const u8 *const sDebug_PlayerNames[] = static const u8 *const sDebug_PlayerNames[] =
{ {
sJPText_Vowels, sJPText_Vowels,
sJPText_Vowels, sJPText_Vowels,
sJPText_Vowels, sJPText_Vowels,
sText_ABCDEFG, sText_Letters,
sText_0123456 sText_Digits
}; };
static void Debug_UpdateNumPlayers(void) static void Debug_UpdateNumPlayers(void)