Sync some specials/drop unnecessary prefixes
This commit is contained in:
@@ -526,8 +526,8 @@ sub_807B6BC: @ 807B6BC
|
||||
bx lr
|
||||
thumb_func_end sub_807B6BC
|
||||
|
||||
thumb_func_start sub_807B6C0
|
||||
sub_807B6C0: @ 807B6C0
|
||||
thumb_func_start StartDroughtWeatherBlend
|
||||
StartDroughtWeatherBlend: @ 807B6C0
|
||||
push {lr}
|
||||
ldr r0, _0807B6D0 @ =task50_0807B6D4
|
||||
movs r1, 0x50
|
||||
@@ -536,7 +536,7 @@ sub_807B6C0: @ 807B6C0
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0807B6D0: .4byte task50_0807B6D4
|
||||
thumb_func_end sub_807B6C0
|
||||
thumb_func_end StartDroughtWeatherBlend
|
||||
|
||||
thumb_func_start task50_0807B6D4
|
||||
task50_0807B6D4: @ 807B6D4
|
||||
|
||||
@@ -1629,7 +1629,7 @@
|
||||
|
||||
@ Jumps to dest if the Quest Log is currently showing playback scenes (dest is usually a release/end)
|
||||
.macro goto_if_questlog dest:req
|
||||
special Special_GetQuestLogState
|
||||
special GetQuestLogState
|
||||
compare VAR_RESULT, 2
|
||||
goto_if_eq \dest
|
||||
.endm
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
special CallTrainerTowerFunc
|
||||
.endm
|
||||
|
||||
@ Unused. Displays Trainer Tower results. Handled by Special_BattleRecords instead
|
||||
@ Unused. Displays Trainer Tower results. Handled by ShowBattleRecords instead
|
||||
.macro ttower_showresults
|
||||
setvar VAR_0x8004, TRAINER_TOWER_FUNC_SHOW_RESULTS
|
||||
special CallTrainerTowerFunc
|
||||
|
||||
+3
-3
@@ -66,8 +66,8 @@ _08054C40: .4byte sWhiteOutMoneyLossMultipliers
|
||||
_08054C44: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end ComputeWhiteOutMoneyLoss
|
||||
|
||||
thumb_func_start Special_OverworldWhiteOutGetMoneyLoss
|
||||
Special_OverworldWhiteOutGetMoneyLoss: @ 8054C48
|
||||
thumb_func_start OverworldWhiteOutGetMoneyLoss
|
||||
OverworldWhiteOutGetMoneyLoss: @ 8054C48
|
||||
push {r4,r5,lr}
|
||||
bl ComputeWhiteOutMoneyLoss
|
||||
adds r4, r0, 0
|
||||
@@ -85,7 +85,7 @@ Special_OverworldWhiteOutGetMoneyLoss: @ 8054C48
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08054C6C: .4byte gStringVar1
|
||||
thumb_func_end Special_OverworldWhiteOutGetMoneyLoss
|
||||
thumb_func_end OverworldWhiteOutGetMoneyLoss
|
||||
|
||||
thumb_func_start CountBadgesForOverworldWhiteOutLossCalculation
|
||||
CountBadgesForOverworldWhiteOutLossCalculation: @ 8054C70
|
||||
|
||||
Reference in New Issue
Block a user