diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-03 16:18:45 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-03-03 17:45:25 -0500 |
| commit | 7af1b35d17b7077b13e04c2717b48a55960fa8ce (patch) | |
| tree | 75e74cfc0e365ec2aab4395f8ede0d8b8824db47 /asm | |
| parent | 1aa1f189721ba9c21597bae047282c4a785ab400 (diff) | |
Sync some specials/drop unnecessary prefixes
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/field_weather_effects.s | 6 | ||||
| -rw-r--r-- | asm/macros/event.inc | 2 | ||||
| -rw-r--r-- | asm/macros/trainer_tower.inc | 2 | ||||
| -rw-r--r-- | asm/overworld.s | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/asm/field_weather_effects.s b/asm/field_weather_effects.s index 0330bcbaf..81e97f211 100644 --- a/asm/field_weather_effects.s +++ b/asm/field_weather_effects.s @@ -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 diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 51f8e7330..35314ac3f 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -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 diff --git a/asm/macros/trainer_tower.inc b/asm/macros/trainer_tower.inc index 8e5f606ee..94d9efe77 100644 --- a/asm/macros/trainer_tower.inc +++ b/asm/macros/trainer_tower.inc @@ -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 diff --git a/asm/overworld.s b/asm/overworld.s index 7572f413a..1c366ef80 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -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 |