diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 10:20:01 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 10:20:01 -0400 |
| commit | 4d8f66774e791bd6d30023b41fed7f2e00b0edac (patch) | |
| tree | 57c1ce5af4a512e2f24be3a363b406a3b61938ed /asm/battle_setup.s | |
| parent | a7b278ac2ddc0bb87530064585b47bbcabb3a157 (diff) | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
Merge branch 'master' into trainers
Diffstat (limited to 'asm/battle_setup.s')
| -rw-r--r-- | asm/battle_setup.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 3f8d7ec4f..54f374c78 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -1999,13 +1999,13 @@ BattleSetup_GetScriptAddrAfterBattle: @ 80805E8 ldr r0, [r0] cmp r0, 0 bne _080805F4 - ldr r0, _080805FC @ =gUnknown_81C555B + ldr r0, _080805FC @ =EventScript_1C555B _080805F4: pop {r1} bx r1 .align 2, 0 _080805F8: .4byte gUnknown_20386C4 -_080805FC: .4byte gUnknown_81C555B +_080805FC: .4byte EventScript_1C555B thumb_func_end BattleSetup_GetScriptAddrAfterBattle thumb_func_start BattleSetup_GetTrainerPostBattleScript @@ -2015,13 +2015,13 @@ BattleSetup_GetTrainerPostBattleScript: @ 8080600 ldr r0, [r0] cmp r0, 0 bne _0808060C - ldr r0, _08080614 @ =gUnknown_81C555B + ldr r0, _08080614 @ =EventScript_1C555B _0808060C: pop {r1} bx r1 .align 2, 0 _08080610: .4byte gUnknown_20386C8 -_08080614: .4byte gUnknown_81C555B +_08080614: .4byte EventScript_1C555B thumb_func_end BattleSetup_GetTrainerPostBattleScript thumb_func_start sub_8080618 |