dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up files and add entries to charmap

Browse Source
This commit is contained in:
Diegoisawesome
2018-07-24 21:18:23 -07:00
parent 731d6d59bc
commit 156fb472e1
57 changed files with 343 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon_summary_screen.c
+30 -30
View File
@@ -15,7 +15,7 @@
#include "sound.h"
#include "constants/species.h"
#include "sprite.h"
#include "unk_text_util.h"
#include "dynamic_placeholder_text_util.h"
#include "string_util.h"
#include "task.h"
#include "text.h"
@@ -149,7 +149,7 @@ extern u8 gUnknown_0861CE97[];
extern void sub_8199C30(u8 a, u8 b, u8 c, u8 d, u8 e, u8 f);
extern bool8 sub_81A6BF4();
extern bool8 sub_81B9E94();
extern void UnkTextUtil_Reset();
extern void DynamicPlaceholderTextUtil_Reset();
extern void sub_8124610(u8 *a, u8 b);
extern int GetPlayerIDAsU32();
extern u8 GetCurrentPpToMaxPpState(u8 a, u8 b);
@@ -2908,12 +2908,12 @@ void sub_81C307C()
{
struct PokeSummary *sum = &gUnknown_0203CF1C->summary;
u8 *text;
UnkTextUtil_Reset();
UnkTextUtil_SetPtrI(0, gUnknown_0861CE74);
UnkTextUtil_SetPtrI(1, gUnknown_0861CE7B);
DynamicPlaceholderTextUtil_Reset();
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_0861CE74);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gUnknown_0861CE7B);
sub_81C31C0();
if (sub_81A6BF4() == TRUE || sub_81B9E94() == TRUE || sub_81C3304() == TRUE)
UnkTextUtil_StringExpandPlaceholders(gStringVar4, gText_XNature);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_XNature);
else
{
u8 *alloced1 = Alloc(32);
@@ -2922,7 +2922,7 @@ void sub_81C307C()
if (sum->metLocation <= 0xD4)
{
sub_8124610(alloced2, sum->metLocation);
UnkTextUtil_SetPtrI(4, alloced2);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, alloced2);
}
if (sub_81C3220() == 1)
{
@@ -2937,7 +2937,7 @@ void sub_81C307C()
text = (sum->metLocation > 0xD4) ? gText_XNatureObtainedInTrade : gText_XNatureProbablyMetAt;
else
text = gText_XNatureObtainedInTrade;
UnkTextUtil_StringExpandPlaceholders(gStringVar4, text);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, text);
Free(alloced1);
Free(alloced2);
}
@@ -2951,8 +2951,8 @@ void sub_81C3194()
void sub_81C31C0()
{
struct UnkSummaryStruct *sumStruct = gUnknown_0203CF1C;
UnkTextUtil_SetPtrI(2, gNatureNamePointers[sumStruct->summary.nature]);
UnkTextUtil_SetPtrI(5, gText_EmptyString5);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gNatureNamePointers[sumStruct->summary.nature]);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, gText_EmptyString5);
}
void sub_81C31F0(u8 *a)
@@ -2961,7 +2961,7 @@ void sub_81C31F0(u8 *a)
if (level == 0)
level = EGG_HATCH_LEVEL;
ConvertIntToDecimalStringN(a, level, 0, 3);
UnkTextUtil_SetPtrI(3, a);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, a);
}
u8 sub_81C3220()
@@ -3216,12 +3216,12 @@ void sub_81C3710()
ConvertIntToDecimalStringN(alloced2, gUnknown_0203CF1C->summary.maxHP, 1, 3);
ConvertIntToDecimalStringN(alloced3, gUnknown_0203CF1C->summary.atk, 1, 7);
ConvertIntToDecimalStringN(alloced4, gUnknown_0203CF1C->summary.def, 1, 7);
UnkTextUtil_Reset();
UnkTextUtil_SetPtrI(0, alloced1);
UnkTextUtil_SetPtrI(1, alloced2);
UnkTextUtil_SetPtrI(2, alloced3);
UnkTextUtil_SetPtrI(3, alloced4);
UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_0861CE82);
DynamicPlaceholderTextUtil_Reset();
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, alloced1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, alloced2);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, alloced3);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, alloced4);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE82);
Free(alloced1);
Free(alloced2);
Free(alloced3);
@@ -3238,11 +3238,11 @@ void sub_81C3808()
ConvertIntToDecimalStringN(gStringVar1, gUnknown_0203CF1C->summary.spatk, 1, 3);
ConvertIntToDecimalStringN(gStringVar2, gUnknown_0203CF1C->summary.spdef, 1, 3);
ConvertIntToDecimalStringN(gStringVar3, gUnknown_0203CF1C->summary.speed, 1, 3);
UnkTextUtil_Reset();
UnkTextUtil_SetPtrI(0, gStringVar1);
UnkTextUtil_SetPtrI(1, gStringVar2);
UnkTextUtil_SetPtrI(2, gStringVar3);
UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_0861CE8E);
DynamicPlaceholderTextUtil_Reset();
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar2);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gStringVar3);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE8E);
}
void sub_81C3890()
@@ -3351,10 +3351,10 @@ void sub_81C3B08(u8 a)
sub_81C25A4(r8, gMoveNames[move], 0, (a<<4) + 1, 0, 1);
ConvertIntToDecimalStringN(gStringVar1, r10->summary.pp[a], 1, 2);
ConvertIntToDecimalStringN(gStringVar2, r6, 1, 2);
UnkTextUtil_Reset();
UnkTextUtil_SetPtrI(0, gStringVar1);
UnkTextUtil_SetPtrI(1, gStringVar2);
UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_0861CE97);
DynamicPlaceholderTextUtil_Reset();
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar2);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE97);
text = gStringVar4;
r5 = GetCurrentPpToMaxPpState(r10->summary.pp[a], r6) + 9;
offset = GetStringRightAlignXOffset(1, text, 0x2C);
@@ -3446,17 +3446,17 @@ void sub_81C3B08(u8 a)
movs r2, 0x1\n\
movs r3, 0x2\n\
bl ConvertIntToDecimalStringN\n\
bl UnkTextUtil_Reset\n\
bl DynamicPlaceholderTextUtil_Reset\n\
movs r0, 0\n\
mov r1, r8\n\
bl UnkTextUtil_SetPtrI\n\
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr\n\
movs r0, 0x1\n\
adds r1, r4, 0\n\
bl UnkTextUtil_SetPtrI\n\
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr\n\
ldr r4, =gStringVar4\n\
ldr r1, =gUnknown_0861CE97\n\
adds r0, r4, 0\n\
bl UnkTextUtil_StringExpandPlaceholders\n\
bl DynamicPlaceholderTextUtil_ExpandPlaceholders\n\
adds r7, r4, 0\n\
ldrb r0, [r5]\n\
adds r1, r6, 0\n\