diff options
Diffstat (limited to 'arm9')
| -rw-r--r-- | arm9/global.inc | 2 | ||||
| -rw-r--r-- | arm9/modules/11/asm/module_11_thumb2.s | 2 | ||||
| -rw-r--r-- | arm9/src/script_buffers.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arm9/global.inc b/arm9/global.inc index 9cf7312a..369083f7 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -566,7 +566,7 @@ .extern BufferPoketchAppName .extern BufferTrainerClassName .extern BufferTrainerClassNameWithArticle -.extern BufferTrainerClassName2 +.extern BufferTrainerClassNameFromDataStruct .extern BufferTrainerName .extern BufferTrainerNameFromDataStruct .extern BufferUndergroundItemName diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 46816d64..15f4c237 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -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 diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c index 10ec9094..0c1b3996 100644 --- a/arm9/src/script_buffers.c +++ b/arm9/src/script_buffers.c @@ -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); } |