diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-09 20:25:41 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-09 20:25:41 -0400 |
| commit | f1d07acc48e483f00f8d6d573af12199f68123d4 (patch) | |
| tree | 6e9ace8e4822e19224561dc99728d80699eaa635 /asm/battle_setup.s | |
| parent | 6d66081be0b1b26ce55a6f1a2a20644e2ae5c7f7 (diff) | |
| parent | 8914645231c9301579ed39bdd9200ad50e5296d0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into use_build
Diffstat (limited to 'asm/battle_setup.s')
| -rw-r--r-- | asm/battle_setup.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index fcc0de95b..fbedfff2f 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -2617,8 +2617,8 @@ _080B1C96: .pool thumb_func_end sub_80B1C7C - thumb_func_start sub_80B1CA4 -sub_80B1CA4: @ 80B1CA4 + thumb_func_start GetTrainer1LoseText +GetTrainer1LoseText: @ 80B1CA4 push {r4,lr} ldr r0, =gTrainerBattleOpponent_A ldrh r1, [r0] @@ -2643,10 +2643,10 @@ _080B1CC0: pop {r1} bx r1 .pool - thumb_func_end sub_80B1CA4 + thumb_func_end GetTrainer1LoseText - thumb_func_start sub_80B1CE0 -sub_80B1CE0: @ 80B1CE0 + thumb_func_start GetTrainer2LoseText +GetTrainer2LoseText: @ 80B1CE0 push {r4,lr} ldr r4, =gStringVar4 ldr r0, =gUnknown_02038BE0 @@ -2660,7 +2660,7 @@ sub_80B1CE0: @ 80B1CE0 pop {r1} bx r1 .pool - thumb_func_end sub_80B1CE0 + thumb_func_end GetTrainer2LoseText thumb_func_start sub_80B1D04 sub_80B1D04: @ 80B1D04 |