diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-14 08:03:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 08:03:22 -0500 |
| commit | dfa5403aac7989d5d9cff255cee206d905734650 (patch) | |
| tree | 247d5532a603f9265ca2574e8f111baf2d56831b /asm | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
| parent | f4e4efedc701fc09c5fed97ddb3dff87b29f575b (diff) | |
Merge pull request #20 from PikalaxALT/dump_trainer_class_names
Dump trainer class names
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_message.s | 4 | ||||
| -rw-r--r-- | asm/link_rfu_3.s | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_message.s b/asm/battle_message.s index 0b58fd3fb..47dbf0870 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -1726,12 +1726,12 @@ _080D8084: movs r0, 0xD _080D8094: muls r1, r0 - ldr r0, _080D80A0 @ =gUnknown_823E558 + ldr r0, _080D80A0 @ =gTrainerClassNames adds r4, r1, r0 b _080D8382 .align 2, 0 _080D809C: .4byte gTrainers -_080D80A0: .4byte gUnknown_823E558 +_080D80A0: .4byte gTrainerClassNames _080D80A4: ldr r0, _080D80E8 @ =gTrainerBattleOpponent_A ldrh r2, [r0] diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index b2c004058..9954d2b4a 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -10960,7 +10960,7 @@ sub_811B31C: @ 811B31C lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _0811B4B4 @ =gUnknown_823E558 + ldr r0, _0811B4B4 @ =gTrainerClassNames adds r1, r0 adds r0, r6, 0 bl StringCopy @@ -11109,7 +11109,7 @@ _0811B45E: b _0811B4F0 .align 2, 0 _0811B4B0: .4byte gUnknown_2039624 -_0811B4B4: .4byte gUnknown_823E558 +_0811B4B4: .4byte gTrainerClassNames _0811B4B8: .4byte gUnknown_84594B0 _0811B4BC: .4byte gUnknown_84594C4 _0811B4C0: .4byte gStringVar4 |