Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-08-06 18:53:21 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix struct definition in script_buffers.c

Browse Source
This commit is contained in:
PikalaxALT 2020-09-02 15:25:26 -04:00
parent 2fce276582
commit dfe8aabe4a
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arm9/global.inc
View File

@ -566,7 +566,7 @@
.extern BufferPoketchAppName
.extern BufferTrainerClassName
.extern BufferTrainerClassNameWithArticle
.extern BufferTrainerClassName2
.extern BufferTrainerClassNameFromDataStruct
.extern BufferTrainerName
.extern BufferTrainerNameFromDataStruct
.extern BufferUndergroundItemName

2
arm9/modules/11/asm/module_11_thumb2.s
View File

@ -6187,7 +6187,7 @@ MOD11_022321AC: ; 0x022321AC
add r2, r0, #0
ldr r0, [r5, #0x14]
add r1, r4, #0
bl BufferTrainerClassName2
bl BufferTrainerClassNameFromDataStruct
pop {r3, r4, r5, pc}
thumb_func_start MOD11_022321C4

4
arm9/src/script_buffers.c
View File

@ -364,12 +364,12 @@ void BufferTrainerClassNameWithArticle(struct ScrStrBufs * mgr, u32 idx, u32 trc
}
}
void BufferTrainerClassName2(struct ScrStrBufs * mgr, u32 idx, struct Trainer * tr)
void BufferTrainerClassNameFromDataStruct(struct ScrStrBufs * mgr, u32 idx, struct TrainerDataLoaded * tr)
{
struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 560, mgr->heap_id);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, tr->unk1, mgr->tmpbuf);
ReadMsgDataIntoString(msgData, tr->data.trainerClass, mgr->tmpbuf);
SetStringAsPlaceholder(mgr, idx, mgr->tmpbuf, NULL);
DestroyMsgData(msgData);
}

8
include/script_buffers.h
View File

@ -24,12 +24,6 @@ struct ScrStrBufs
struct String * tmpbuf;
};
struct Trainer
{
u8 unk0;
u8 unk1;
};
struct UnkStruct_0200B870_sub
{
u8 filler_00[16];
@ -76,7 +70,7 @@ void BufferLandmarkName(struct ScrStrBufs * mgr, u32 idx, u32 landmark);
void BufferPoketchAppName(struct ScrStrBufs * mgr, u32 idx, u32 app);
void BufferTrainerClassName(struct ScrStrBufs * mgr, u32 idx, u32 trclass);
void BufferTrainerClassNameWithArticle(struct ScrStrBufs * mgr, u32 idx, u32 trclass);
void BufferTrainerClassName2(struct ScrStrBufs * mgr, u32 idx, struct Trainer * tr);
void BufferTrainerClassNameFromDataStruct(struct ScrStrBufs * mgr, u32 idx, struct TrainerDataLoaded * tr);
void BufferTrainerName(struct ScrStrBufs * mgr, u32 idx, u32 msgno);
void BufferTrainerNameFromDataStruct(struct ScrStrBufs * mgr, u32 idx, struct TrainerDataLoaded * trdata);
void BufferUndergroundItemName(struct ScrStrBufs * mgr, u32 idx, u32 item);