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

sub_80E9780

Browse Source
This commit is contained in:
PikalaxALT 2017-10-25 08:41:25 -04:00
parent b4f9acd039
commit ea507b8d43
3 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
asm/secret_base.s
View File

@ -5,52 +5,6 @@
.text .text
thumb_func_start sub_80E9780
sub_80E9780: @ 80E9780
push {r4-r6,lr}
mov r6, r8
push {r6}
adds r6, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r0, =gSaveBlock1Ptr
mov r8, r0
lsls r5, r1, 2
adds r5, r1
lsls r5, 5
ldr r4, [r0]
adds r4, r5, r4
ldr r1, =0x00001a9e
adds r4, r1
adds r0, r4, 0
bl sub_80E8DF4
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r6, 0
adds r1, r4, 0
bl StringCopyN
movs r1, 0xFF
strb r1, [r0]
mov r1, r8
ldr r0, [r1]
adds r0, r5
ldr r1, =0x00001aa9
adds r0, r1
ldrb r1, [r0]
adds r0, r6, 0
bl ConvertInternationalString
ldr r1, =gText_ApostropheSBase
adds r0, r6, 0
bl StringAppend
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r1}
bx r1
.pool
thumb_func_end sub_80E9780
thumb_func_start GetSecretBaseMapName thumb_func_start GetSecretBaseMapName
GetSecretBaseMapName: @ 80E97EC GetSecretBaseMapName: @ 80E97EC
push {r4,lr} push {r4,lr}

1
include/event_scripts.h
View File

@ -361,5 +361,6 @@ extern const u8 gPokeNewsTextLilycove_Ending[];
extern const u8 gPokeNewsTextBlendMaster_Upcoming[]; extern const u8 gPokeNewsTextBlendMaster_Upcoming[];
extern const u8 gPokeNewsTextBlendMaster_Ongoing[]; extern const u8 gPokeNewsTextBlendMaster_Ongoing[];
extern const u8 gPokeNewsTextBlendMaster_Ending[]; extern const u8 gPokeNewsTextBlendMaster_Ending[];
extern const u8 gText_ApostropheSBase[];
#endif //GUARD_EVENT_SCRIPTS_H #endif //GUARD_EVENT_SCRIPTS_H

7
src/secret_base.c
View File

@ -570,3 +570,10 @@ void sub_80E9744(void)
gScriptResult = FALSE; gScriptResult = FALSE;
} }
} }
u8 *sub_80E9780(u8 *dest, u8 sbId)
{
*StringCopyN(dest, gSaveBlock1Ptr->secretBases[sbId].trainerName, sub_80E8DF4(gSaveBlock1Ptr->secretBases[sbId].trainerName)) = EOS;
ConvertInternationalString(dest, gSaveBlock1Ptr->secretBases[sbId].language);
return StringAppend(dest, gText_ApostropheSBase);
}