Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-25 07:28:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

some copyformatstring clean-up

Browse Source
This commit is contained in:
DizzyEggg 2024-10-29 16:21:15 +01:00
parent 25f63324c7
commit 98b1caf5a8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/code_809447C.c
View File

@ -91,11 +91,11 @@ void sub_8094558(u32 param_1,u8 *param_2,UnkDungeonGlobal_unk1CE98_sub *param_3)
sub_80922B4(gFormatBuffer_Monsters[1], param_3->buffer2, POKEMON_NAME_LENGTH);
if (sub_8094528(param_3->moveID) != 0) {
// $m1 was defeated by
CopyFormatString(*gUnknown_8113868,buffer,(u8*)((u32 **)&buffer + 50),0); // TODO: fix this hack
CopyFormatString(*gUnknown_8113868,buffer, buffer + sizeof(buffer),0);
}
else {
// $m1
CopyFormatString(*gUnknown_8113870,buffer,(u8*)((u32 **)&buffer + 50),0); // TODO: fix this hack
CopyFormatString(*gUnknown_8113870,buffer, buffer + sizeof(buffer),0);
}
x = (0xb0 - sub_8008ED0(buffer)) / 2;

11
src/code_809A560.c
View File

@ -1,6 +1,7 @@
#include "global.h"
#include "text1.h"
#include "memory.h"
#include "string_format.h"
#include "structs/str_3001B64.h"
IWRAM_DATA struct unkStruct_3001B64 *gUnknown_3001B64 = {0};
@ -8,11 +9,9 @@ IWRAM_DATA struct unkStruct_3001B64 *gUnknown_3001B64 = {0};
extern u16 gUnknown_20399DC;
extern u16 gUnknown_20399DE;
extern u8 gInvalidityText[];
extern u8 gFormatBuffer_Monsters[];
extern u8 gFormatBuffer_Names[];
extern u8 ScriptPrintText_809B2B8(u32 *, u32, u32, u32);
extern u32 IsTextboxOpen_809B40C(u32 *);
extern u32 IsTextboxOpen_809B40C(u32 *);
extern void sub_801416C(s32, s32);
extern void sub_80095CC(u32, u32);
extern void sub_8009408(u32, u32);
@ -180,7 +179,7 @@ void sub_809A7EC(void)
temp = &gUnknown_3001B64->unk43C[0];
for(counter = 0; counter < 10; counter++, temp++)
{
{
temp->unk0 |= -1;
temp->speciesID = MONSTER_NONE;
temp->unk4 = 0;
@ -217,8 +216,8 @@ void sub_809A83C(s16 param_1)
temp->unk10 = 0;
temp->faceData = NULL;
temp->unk1C = 0;
strcpy(gFormatBuffer_Monsters + (param_1 * 0x50), gInvalidityText);
strcpy(gFormatBuffer_Names + (param_1 * 0x50), gInvalidityText);
strcpy(gFormatBuffer_Monsters[param_1], gInvalidityText);
strcpy(gFormatBuffer_Names[param_1], gInvalidityText);
if(temp->faceFile)
{
CloseFile(temp->faceFile);