diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-17 16:13:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-17 16:13:02 -0400 |
| commit | 0b708aeadec55bcc0e9916e5c56ad50714995b98 (patch) | |
| tree | 32719527cdf76b46490037f766ae433b1673cb10 /asm | |
| parent | b919702f7d10fd2968e1be23f15c6758b9d8c116 (diff) | |
Initial trainers dump
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_setup.s | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 5a9797056..3f8d7ec4f 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -2033,8 +2033,8 @@ sub_8080618: @ 8080618 bx r0 thumb_func_end sub_8080618 - thumb_func_start sub_8080628 -sub_8080628: @ 8080628 + thumb_func_start PlayTrainerEncounterMusic +PlayTrainerEncounterMusic: @ 8080628 push {lr} ldr r0, _08080660 @ =gUnknown_203ADFA ldrb r0, [r0] @@ -2083,15 +2083,18 @@ _08080670: .4byte _080806AE .4byte _080806AE _080806A8: + @ MUS_SHOUJO movs r0, 0x8E lsls r0, 1 b _080806BA _080806AE: + @ MUS_SHOUNEN ldr r0, _080806B4 @ =0x0000011d b _080806BA .align 2, 0 _080806B4: .4byte 0x0000011d _080806B8: + @ MUS_ROCKET ldr r0, _080806C4 @ =0x0000011b _080806BA: bl PlayNewMapMusic @@ -2100,7 +2103,7 @@ _080806BE: bx r0 .align 2, 0 _080806C4: .4byte 0x0000011b - thumb_func_end sub_8080628 + thumb_func_end PlayTrainerEncounterMusic thumb_func_start sub_80806C8 sub_80806C8: @ 80806C8 |