diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-25 13:56:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 13:56:50 -0400 |
| commit | 1d4234bd7e295c553485b7d676d42c838e4762c4 (patch) | |
| tree | 67ac4179d9978baf4e989ef55245e4be0d777c04 /asm/battle_tower.s | |
| parent | 7f6d86a8bf2afe349135d502debc2237bafafff5 (diff) | |
| parent | 931bf4ce4b4fd7ea63d00f36adfd2bf720831a80 (diff) | |
Merge branch 'master' into PIE2
Diffstat (limited to 'asm/battle_tower.s')
| -rw-r--r-- | asm/battle_tower.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s index ee6856130..abb47aba9 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -929,8 +929,8 @@ _080E6062: _080E6074: .4byte gSaveBlock2Ptr thumb_func_end sub_80E5E7C - thumb_func_start sub_80E6078 -sub_80E6078: @ 80E6078 + thumb_func_start GetBattleTowerTrainerFrontSpriteId +GetBattleTowerTrainerFrontSpriteId: @ 80E6078 push {lr} ldr r0, _080E6094 @ =gSaveBlock2Ptr ldr r3, [r0] @@ -983,7 +983,7 @@ _080E60D6: .align 2, 0 _080E60DC: .4byte gFacilityClassToPicIndex _080E60E0: .4byte gUnknown_83FFAC4 - thumb_func_end sub_80E6078 + thumb_func_end GetBattleTowerTrainerFrontSpriteId thumb_func_start sub_80E60E4 sub_80E60E4: @ 80E60E4 |