diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/field_control_avatar.s | 8 | ||||
| -rw-r--r-- | asm/field_player_avatar.s | 2 | ||||
| -rw-r--r-- | asm/field_weather_effects.s | 6 | ||||
| -rw-r--r-- | asm/macros/event.inc | 2 | ||||
| -rw-r--r-- | asm/macros/movement.inc | 2 | ||||
| -rw-r--r-- | asm/macros/trainer_tower.inc | 2 | ||||
| -rw-r--r-- | asm/naming_screen.s | 8 | ||||
| -rw-r--r-- | asm/overworld.s | 14 | ||||
| -rw-r--r-- | asm/pokemon_storage_system.s | 12 | ||||
| -rw-r--r-- | asm/pokemon_summary_screen.s | 20 |
10 files changed, 38 insertions, 38 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 7d5432f8e..58a6b6e76 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1664,16 +1664,16 @@ _0806D5A4: lsrs r0, 24 cmp r0, 0x1 bne _0806D5D8 - ldr r0, _0806D5D4 @ =EventScript_InteractWithWaterfall + ldr r0, _0806D5D4 @ =EventScript_Waterfall b _0806D5E2 .align 2, 0 _0806D5D0: .4byte 0x00000826 -_0806D5D4: .4byte EventScript_InteractWithWaterfall +_0806D5D4: .4byte EventScript_Waterfall _0806D5D8: - ldr r0, _0806D5DC @ =EventScript_81BE2FF + ldr r0, _0806D5DC @ =EventScript_CantUseWaterfall b _0806D5E2 .align 2, 0 -_0806D5DC: .4byte EventScript_81BE2FF +_0806D5DC: .4byte EventScript_CantUseWaterfall _0806D5E0: movs r0, 0 _0806D5E2: diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 754294337..79ac729b8 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -4157,7 +4157,7 @@ sub_805D240: @ 805D240 bl DestroySprite adds r0, r5, 0 bl DestroyTask - bl sub_812B35C + bl SetHelpContextForMap _0805D2AE: pop {r4-r6} pop {r0} diff --git a/asm/field_weather_effects.s b/asm/field_weather_effects.s index 24ccbcf94..decfe4078 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/movement.inc b/asm/macros/movement.inc index c4ca78010..9f11f4460 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -109,7 +109,7 @@ create_movement emote_x create_movement emote_double_exclamation_mark create_movement emote_smile - create_movement step_67 + create_movement reveal_trainer create_movement rock_smash_break create_movement cut_tree 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/naming_screen.s b/asm/naming_screen.s index 233c71d6d..1e0d2ef68 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -491,9 +491,9 @@ sub_809DD60: @ 809DD60 bl CreateTask ldr r0, _0809DD84 @ =sub_809FB70 bl SetMainCallback2 - bl HelpSystem_BackupSomeVariable - movs r0, 0x3 - bl HelpSystem_SetSomeVariable2 + bl BackupHelpContext + movs r0, 0x3 @ HELPCONTEXT_NAMING_SCREEN + bl SetHelpContext pop {r0} bx r0 .align 2, 0 @@ -868,7 +868,7 @@ _0809E06C: ldr r0, [r4] bl Free str r5, [r4] - bl HelpSystem_RestoreSomeVariable + bl RestoreHelpContext _0809E096: movs r0, 0 pop {r4,r5} diff --git a/asm/overworld.s b/asm/overworld.s index 6b7744e52..571d305b4 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 @@ -4012,7 +4012,7 @@ _08056ACE: bl sub_8057074 bl sub_80571A8 bl sub_8057140 - bl sub_812B35C + bl SetHelpContextForMap b _08056B62 _08056AE4: bl InitCurrentFlashLevelScanlineEffect @@ -4152,7 +4152,7 @@ _08056BFE: bl sub_80CC534 bl sub_80CC59C _08056C16: - bl sub_812B35C + bl SetHelpContextForMap b _08056CCA .align 2, 0 _08056C1C: .4byte gQuestLogState @@ -4275,7 +4275,7 @@ _08056D04: b _08056D30 _08056D1C: bl sub_8056F08 - bl sub_812B35C + bl SetHelpContextForMap b _08056D30 _08056D26: bl map_post_load_hook_exec @@ -4343,7 +4343,7 @@ _08056DAE: bl sub_8057230 bl sub_8057100 bl sub_805715C - bl sub_812B35C + bl SetHelpContextForMap b _08056E3E _08056DC0: bl InitCurrentFlashLevelScanlineEffect diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 79966093f..a5e53f6f3 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1411,8 +1411,8 @@ _0808C3CC: .4byte _0808C5A6 .4byte _0808C680 _0808C3E0: - movs r0, 0x1C - bl HelpSystem_SetSomeVariable2 + movs r0, 0x1C @ HELPCONTEXT_BILLS_PC + bl SetHelpContext ldrb r0, [r5, 0xA] adds r1, r5, 0 adds r1, 0x26 @@ -2715,8 +2715,8 @@ _0808CE18: bl CreateTask ldr r1, [r4] strb r0, [r1, 0x4] - movs r0, 0x1C - bl HelpSystem_SetSomeVariable2 + movs r0, 0x1C @ HELPCONTEXT_BILLS_PC + bl SetHelpContext bl StorageGetCurrentBox ldr r1, _0808CE58 @ =gUnknown_20397B8 strb r0, [r1] @@ -2766,8 +2766,8 @@ _0808CE8C: bl CreateTask ldr r1, [r4] strb r0, [r1, 0x4] - movs r0, 0x1C - bl HelpSystem_SetSomeVariable2 + movs r0, 0x1C @ HELPCONTEXT_BILLS_PC + bl SetHelpContext ldr r0, _0808CEC4 @ =c2_Box bl SetMainCallback2 _0808CEB6: diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 19b838f47..b0c2b9a87 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -106,8 +106,8 @@ _081345D0: cmp r0, 0x5 beq _08134604 _081345D4: - movs r0, 0x6 - bl HelpSystem_SetSomeVariable2 + movs r0, 0x6 @ HELPCONTEXT_POKEMON_INFO + bl SetHelpContext ldr r2, _081345F8 @ =gUnknown_203B140 ldr r0, [r2] ldr r3, _081345FC @ =0x00003214 @@ -127,8 +127,8 @@ _081345F8: .4byte gUnknown_203B140 _081345FC: .4byte 0x00003214 _08134600: .4byte 0x00003234 _08134604: - movs r0, 0x6 - bl HelpSystem_SetSomeVariable2 + movs r0, 0x6 @ HELPCONTEXT_POKEMON_INFO + bl SetHelpContext ldr r0, [r4] ldr r3, _08134628 @ =0x00003214 adds r0, r3 @@ -148,8 +148,8 @@ _08134628: .4byte 0x00003214 _0813462C: .4byte 0x0000321c _08134630: .4byte 0x00003234 _08134634: - movs r0, 0x8 - bl HelpSystem_SetSomeVariable2 + movs r0, 0x8 @ HELPCONTEXT_POKEMON_MOVES + bl SetHelpContext ldr r0, [r4] ldr r3, _08134710 @ =0x00003214 adds r0, r3 @@ -7600,15 +7600,15 @@ _08138460: .4byte 0x00003214 _08138464: cmp r0, 0x3 bgt _08138476 - movs r0, 0x8 + movs r0, 0x8 @ HELPCONTEXT_POKEMON_MOVES b _08138472 _0813846C: - movs r0, 0x6 + movs r0, 0x6 @ HELPCONTEXT_POKEMON_INFO b _08138472 _08138470: - movs r0, 0x7 + movs r0, 0x7 @ HELPCONTEXT_POKEMON_SKILLS _08138472: - bl HelpSystem_SetSomeVariable2 + bl SetHelpContext _08138476: pop {r0} bx r0 |