diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_setup.s | 442 | ||||
| -rwxr-xr-x | asm/battle_tower.s | 2 | ||||
| -rw-r--r-- | asm/battle_transition.s | 6 | ||||
| -rw-r--r-- | asm/bike.s | 2 | ||||
| -rw-r--r-- | asm/field_effect.s | 2 | ||||
| -rw-r--r-- | asm/field_player_avatar.s | 2 | ||||
| -rw-r--r-- | asm/rom4.s | 10 | ||||
| -rw-r--r-- | asm/trainer_see.s | 12 |
8 files changed, 40 insertions, 438 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 207856474..14117ae31 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -9,405 +9,7 @@ - thumb_func_start sub_80B100C -sub_80B100C: @ 80B100C - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, =gEnemyParty - movs r1, 0x38 - bl GetMonData - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x1 - bl GetSumOfPlayerPartyLevel - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - bcs _080B1090 - cmp r5, 0xA - beq _080B1048 - cmp r5, 0xA - bgt _080B1040 - cmp r5, 0x3 - beq _080B105C - b _080B106C - .pool -_080B1040: - cmp r5, 0xD - bgt _080B106C - movs r0, 0x4 - b _080B1120 -_080B1048: - ldr r4, =gUnknown_0854FEA4 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - b _080B1114 - .pool -_080B105C: - ldr r4, =gUnknown_0854FEA7 - bl Random - ands r5, r0 - lsls r0, r5, 16 - b _080B111A - .pool -_080B106C: - ldr r0, =0x000040ce - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x3 - beq _080B10EC - ldr r4, =gUnknown_0854FE98 - bl Random - lsls r0, 16 - lsrs r0, 16 - b _080B1112 - .pool -_080B1090: - cmp r5, 0xA - beq _080B10A6 - cmp r5, 0xA - bgt _080B109E - cmp r5, 0x3 - beq _080B10B8 - b _080B10C8 -_080B109E: - cmp r5, 0xD - bgt _080B10C8 - movs r0, 0x3 - b _080B1120 -_080B10A6: - ldr r4, =gUnknown_0854FEA4 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - b _080B1114 - .pool -_080B10B8: - ldr r4, =gUnknown_0854FEA7 - bl Random - ands r5, r0 - lsls r0, r5, 16 - b _080B111A - .pool -_080B10C8: - ldr r0, =0x000040ce - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x3 - beq _080B10EC - ldr r4, =gUnknown_0854FE98 - bl Random - lsls r0, 16 - lsrs r0, 16 - b _080B1112 - .pool -_080B10EC: - ldr r0, =gSaveBlock2Ptr - ldr r1, [r0] - ldr r2, =0x00000cb2 - adds r0, r1, r2 - ldrh r0, [r0] - lsls r2, r0, 2 - ldr r3, =0x00000cb4 - adds r1, r3 - adds r2, r1, r2 - lsls r0, 1 - adds r0, 0x1 - lsls r0, 1 - adds r1, r0 - ldrh r0, [r1] - ldrh r2, [r2] - adds r0, r2 - lsls r0, 16 - lsrs r0, 16 - ldr r4, =gUnknown_0854FE98 -_080B1112: - movs r1, 0xC -_080B1114: - bl __umodsi3 - lsls r0, 16 -_080B111A: - lsrs r0, 16 - adds r0, r4 - ldrb r0, [r0] -_080B1120: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B100C - - thumb_func_start sub_80B1138 -sub_80B1138: @ 80B1138 - push {lr} - ldr r0, =CB2_ChooseStarter - bl SetMainCallback2 - ldr r1, =gMain - ldr r0, =sub_80B1158 - str r0, [r1, 0x8] - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B1138 - - thumb_func_start sub_80B1158 -sub_80B1158: @ 80B1158 - push {lr} - sub sp, 0x8 - ldr r0, =0x00004023 - bl GetVarPointer - ldr r2, =gSpecialVar_Result - ldrh r1, [r2] - strh r1, [r0] - ldrh r0, [r2] - bl GetStarterPokemon - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - movs r1, 0x5 - movs r2, 0 - movs r3, 0 - bl ScriptGiveMon - bl ResetTasks - bl PlayBattleBGM - ldr r0, =sub_80B11A8 - bl SetMainCallback2 - movs r0, 0 - bl sub_8145F10 - add sp, 0x8 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B1158 - - thumb_func_start sub_80B11A8 -sub_80B11A8: @ 80B11A8 - push {lr} - bl UpdatePaletteFade - bl RunTasks - bl IsBattleTransitionDone - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080B11F0 - ldr r1, =gBattleTypeFlags - movs r0, 0x10 - str r0, [r1] - ldr r1, =gMain - ldr r0, =sub_80B1204 - str r0, [r1, 0x8] - bl FreeAllWindowBuffers - ldr r0, =CB2_InitBattle - bl SetMainCallback2 - bl prev_quest_postbuffer_cursor_backup_reset - bl ResetPoisonStepCounter - movs r0, 0x7 - bl IncrementGameStat - movs r0, 0x8 - bl IncrementGameStat - bl sub_80EECC8 - bl sub_80B1218 -_080B11F0: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B11A8 - - thumb_func_start sub_80B1204 -sub_80B1204: @ 80B1204 - push {lr} - bl sav1_reset_battle_music_maybe - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music - bl SetMainCallback2 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B1204 - - thumb_func_start sub_80B1218 -sub_80B1218: @ 80B1218 - push {lr} - movs r0, 0x8 - bl GetGameStat - movs r1, 0x3C - bl __umodsi3 - cmp r0, 0 - bne _080B122E - bl sub_81DA57C -_080B122E: - pop {r0} - bx r0 - thumb_func_end sub_80B1218 - thumb_func_start sub_80B1234 -sub_80B1234: @ 80B1234 - push {lr} - movs r0, 0x9 - bl GetGameStat - movs r1, 0x14 - bl __umodsi3 - cmp r0, 0 - bne _080B124A - bl sub_81DA57C -_080B124A: - pop {r0} - bx r0 - thumb_func_end sub_80B1234 - - thumb_func_start TrainerBattleLoadArg32 -@ u32 TrainerBattleLoadArg32(u8 *arg) -TrainerBattleLoadArg32: @ 80B1250 - adds r2, r0, 0 - ldrb r0, [r2] - ldrb r1, [r2, 0x1] - lsls r1, 8 - orrs r0, r1 - ldrb r1, [r2, 0x2] - lsls r1, 16 - orrs r0, r1 - ldrb r1, [r2, 0x3] - lsls r1, 24 - orrs r0, r1 - bx lr - thumb_func_end TrainerBattleLoadArg32 - - thumb_func_start TrainerBattleLoadArg16 -@ u16 TrainerBattleLoadArg16(u8 *arg) -TrainerBattleLoadArg16: @ 80B1268 - adds r1, r0, 0 - ldrb r0, [r1] - ldrb r1, [r1, 0x1] - lsls r1, 8 - orrs r0, r1 - bx lr - thumb_func_end TrainerBattleLoadArg16 - - thumb_func_start TrainerBattleLoadArg8 -@ u8 TrainerBattleLoadArg8(u8 *arg) -TrainerBattleLoadArg8: @ 80B1274 - ldrb r0, [r0] - bx lr - thumb_func_end TrainerBattleLoadArg8 - - thumb_func_start trainerflag_opponent -trainerflag_opponent: @ 80B1278 - ldr r1, =gTrainerBattleOpponent_A - movs r2, 0xA0 - lsls r2, 3 - adds r0, r2, 0 - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - bx lr - .pool - thumb_func_end trainerflag_opponent - - thumb_func_start sub_80B1290 -sub_80B1290: @ 80B1290 - ldr r1, =gTrainerBattleOpponent_B - movs r2, 0xA0 - lsls r2, 3 - adds r0, r2, 0 - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - bx lr - .pool - thumb_func_end sub_80B1290 - - thumb_func_start IsPlayerDefeated -IsPlayerDefeated: @ 80B12A8 - push {lr} - subs r0, 0x1 - cmp r0, 0x6 - bhi _080B12E0 - lsls r0, 2 - ldr r1, =_080B12C0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080B12C0: - .4byte _080B12E0 - .4byte _080B12DC - .4byte _080B12DC - .4byte _080B12E0 - .4byte _080B12E0 - .4byte _080B12E0 - .4byte _080B12E0 -_080B12DC: - movs r0, 0x1 - b _080B12E2 -_080B12E0: - movs r0, 0 -_080B12E2: - pop {r1} - bx r1 - thumb_func_end IsPlayerDefeated - - thumb_func_start ResetTrainerOpponentIds -ResetTrainerOpponentIds: @ 80B12E8 - ldr r0, =gTrainerBattleOpponent_A - movs r1, 0 - strh r1, [r0] - ldr r0, =gTrainerBattleOpponent_B - strh r1, [r0] - bx lr - .pool - thumb_func_end ResetTrainerOpponentIds - - thumb_func_start InitTrainerBattleVariables -@ void InitTrainerBattleVariables() -InitTrainerBattleVariables: @ 80B12FC - push {lr} - ldr r0, =gUnknown_02038BC8 - movs r1, 0 - strh r1, [r0] - ldr r0, =gUnknown_02038BFC - ldrb r1, [r0] - cmp r1, 0 - bne _080B132C - ldr r0, =gUnknown_02038BD4 - str r1, [r0] - ldr r0, =gUnknown_02038BDC - str r1, [r0] - ldr r0, =gUnknown_02038BF0 - b _080B1338 - .pool -_080B132C: - ldr r0, =gUnknown_02038BD8 - movs r1, 0 - str r1, [r0] - ldr r0, =gUnknown_02038BE0 - str r1, [r0] - ldr r0, =gUnknown_02038BF4 -_080B1338: - str r1, [r0] - ldr r1, =gUnknown_02038BD0 - movs r0, 0 - strh r0, [r1] - ldr r0, =gUnknown_02038BE4 - movs r1, 0 - str r1, [r0] - ldr r0, =gUnknown_02038BE8 - str r1, [r0] - ldr r0, =gUnknown_02038BEC - str r1, [r0] - pop {r0} - bx r0 - .pool - thumb_func_end InitTrainerBattleVariables thumb_func_start TrainerBattleLoadArgs @ void TrainerBattleLoadArgs(struct TrainerBattleArgSpec *argSpecs, u8 *args) @@ -483,7 +85,7 @@ _080B13EC: thumb_func_start battle_80801F0 battle_80801F0: @ 80B13F8 push {lr} - ldr r0, =gUnknown_02038BD0 + ldr r0, =sTrainerMapObjectLocalId ldrh r1, [r0] cmp r1, 0 beq _080B141A @@ -510,7 +112,7 @@ BattleSetup_ConfigureTrainerBattle: @ 80B1430 push {r4,r5,lr} adds r5, r0, 0 bl InitTrainerBattleVariables - ldr r4, =gUnknown_02038BC8 + ldr r4, =sTrainerBattleMode adds r0, r5, 0 bl TrainerBattleLoadArg8 lsls r0, 24 @@ -554,7 +156,7 @@ _080B14A8: b _080B14D6 .pool _080B14B0: - ldr r0, =gUnknown_02038BFC + ldr r0, =gApproachingTrainerId ldrb r0, [r0] cmp r0, 0 bne _080B14C4 @@ -603,7 +205,7 @@ _080B1514: b _080B161E .pool _080B153C: - ldr r0, =gUnknown_02038BFC + ldr r0, =gApproachingTrainerId ldrb r0, [r0] cmp r0, 0 bne _080B156C @@ -643,7 +245,7 @@ _080B159A: b _080B161E .pool _080B15A8: - ldr r0, =gUnknown_02038BFC + ldr r0, =gApproachingTrainerId ldrb r0, [r0] cmp r0, 0 bne _080B15D8 @@ -667,7 +269,7 @@ _080B15D8: b _080B157C .pool _080B15F4: - ldr r0, =gUnknown_02038BFC + ldr r0, =gApproachingTrainerId ldrb r0, [r0] cmp r0, 0 bne _080B1614 @@ -802,7 +404,7 @@ sub_80B16D8: @ 80B16D8 thumb_func_start sub_80B170C sub_80B170C: @ 80B170C - ldr r0, =gUnknown_02038BC8 + ldr r0, =sTrainerBattleMode ldrb r0, [r0] bx lr .pool @@ -825,7 +427,7 @@ _080B1734: bl InTrainerHill cmp r0, 0 bne _080B174A - bl trainerflag_opponent + bl GetTrainerAFlag lsls r0, 16 lsrs r0, 16 bl FlagGet @@ -849,12 +451,12 @@ rom_npc_set_flag_for_script_id: @ 80B1760 ldrh r0, [r0] cmp r0, 0 beq _080B1776 - bl sub_80B1290 + bl GetTrainerBFlag lsls r0, 16 lsrs r0, 16 bl FlagSet _080B1776: - bl trainerflag_opponent + bl GetTrainerAFlag lsls r0, 16 lsrs r0, 16 bl FlagSet @@ -866,7 +468,7 @@ _080B1776: thumb_func_start sub_80B178C sub_80B178C: @ 80B178C push {lr} - bl trainerflag_opponent + bl GetTrainerAFlag lsls r0, 16 lsrs r0, 16 bl FlagSet @@ -1161,7 +763,7 @@ sub_80B1A14: @ 80B1A14 _080B1A44: ldr r3, =gMapObjects ldr r2, =gUnknown_03006090 - ldr r0, =gUnknown_02038BFC + ldr r0, =gApproachingTrainerId ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1201,7 +803,7 @@ _080B1A7C: _080B1AAC: ldr r3, =gMapObjects ldr r2, =gUnknown_03006090 - ldr r0, =gUnknown_02038BFC + ldr r0, =gApproachingTrainerId ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1295,7 +897,7 @@ special_trainer_unable_to_battle: @ 80B1B60 @ void SetUpTrainerEncounterMusic() SetUpTrainerEncounterMusic: @ 80B1B70 push {lr} - ldr r0, =gUnknown_02038BFC + ldr r0, =gApproachingTrainerId ldrb r0, [r0] cmp r0, 0 bne _080B1B88 @@ -1306,7 +908,7 @@ _080B1B88: ldr r0, =gTrainerBattleOpponent_B _080B1B8A: ldrh r1, [r0] - ldr r0, =gUnknown_02038BC8 + ldr r0, =sTrainerBattleMode ldrh r0, [r0] cmp r0, 0x1 beq _080B1C62 @@ -1418,15 +1020,15 @@ _080B1C74: thumb_func_start sub_80B1C7C sub_80B1C7C: @ 80B1C7C push {lr} - ldr r0, =gUnknown_02038BFC + ldr r0, =gApproachingTrainerId ldrb r0, [r0] cmp r0, 0 beq _080B1C94 - ldr r0, =gUnknown_02038BD8 + ldr r0, =sTrainerBIntroSpeech b _080B1C96 .pool _080B1C94: - ldr r0, =gUnknown_02038BD4 + ldr r0, =sTrainerAIntroSpeech _080B1C96: ldr r0, [r0] bl ReturnEmptyStringIfNull @@ -1448,7 +1050,7 @@ GetTrainer1LoseText: @ 80B1CA4 b _080B1CC0 .pool _080B1CBC: - ldr r0, =gUnknown_02038BDC + ldr r0, =sTrainerADefeatSpeech ldr r0, [r0] _080B1CC0: ldr r4, =gStringVar4 @@ -1467,7 +1069,7 @@ _080B1CC0: GetTrainer2LoseText: @ 80B1CE0 push {r4,lr} ldr r4, =gStringVar4 - ldr r0, =gUnknown_02038BE0 + ldr r0, =sTrainerBDefeatSpeech ldr r0, [r0] bl ReturnEmptyStringIfNull adds r1, r0, 0 @@ -1483,7 +1085,7 @@ GetTrainer2LoseText: @ 80B1CE0 thumb_func_start sub_80B1D04 sub_80B1D04: @ 80B1D04 push {lr} - ldr r0, =gUnknown_02038BE4 + ldr r0, =sTrainerVictorySpeech ldr r0, [r0] bl ReturnEmptyStringIfNull pop {r1} @@ -1494,7 +1096,7 @@ sub_80B1D04: @ 80B1D04 thumb_func_start sub_80B1D18 sub_80B1D18: @ 80B1D18 push {lr} - ldr r0, =gUnknown_02038BE8 + ldr r0, =sTrainerCannotBattleSpeech ldr r0, [r0] bl ReturnEmptyStringIfNull pop {r1} diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 1a8ca411b..96769dcbf 100755 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -3544,7 +3544,7 @@ _08163E2C: ldr r5, =0x00000c03 adds r0, r5, 0 bl sub_8165404 - ldr r4, =gUnknown_02038BFC + ldr r4, =gApproachingTrainerId movs r0, 0 strb r0, [r4] ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224157 + 1 diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 13869eea9..b7f2746ec 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -71,15 +71,15 @@ BattleTransition_StartOnField: @ 8145EF4 .pool thumb_func_end BattleTransition_StartOnField - thumb_func_start sub_8145F10 -sub_8145F10: @ 8145F10 + thumb_func_start BattleTransition_Start +BattleTransition_Start: @ 8145F10 push {lr} lsls r0, 24 lsrs r0, 24 bl LaunchBattleTransitionTask pop {r0} bx r0 - thumb_func_end sub_8145F10 + thumb_func_end BattleTransition_Start thumb_func_start IsBattleTransitionDone IsBattleTransitionDone: @ 8145F20 diff --git a/asm/bike.s b/asm/bike.s index b5d40a312..89791b987 100644 --- a/asm/bike.s +++ b/asm/bike.s @@ -2004,7 +2004,7 @@ GetOnOffBike: @ 811A080 beq _0811A0B0 movs r0, 0x1 bl SetPlayerAvatarTransitionFlags - bl sav1_reset_battle_music_maybe + bl Overworld_ClearSavedMusic bl sub_8085784 b _0811A0C4 .pool diff --git a/asm/field_effect.s b/asm/field_effect.s index 62362529b..170aa6a63 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -6295,7 +6295,7 @@ sub_80B8D44: @ 80B8D44 ldr r0, =gFieldEffectArguments ldr r0, [r0] strh r0, [r1, 0x26] - bl sav1_reset_battle_music_maybe + bl Overworld_ClearSavedMusic ldr r0, =0x0000016d bl Overworld_ChangeMusicTo movs r0, 0 diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index ae405f127..62681e7fb 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -3896,7 +3896,7 @@ sub_808C750: @ 808C750 lsls r4, 24 lsrs r4, 24 bl ScriptContext2_Enable - bl sav1_reset_battle_music_maybe + bl Overworld_ClearSavedMusic bl Overworld_ChangeMusicToDefault ldr r2, =gPlayerAvatar ldrb r1, [r2] diff --git a/asm/rom4.s b/asm/rom4.s index 00d1d1376..f4e5a4fa3 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -1386,7 +1386,7 @@ _080850C8: bl sub_80AEDBC bl sub_8085B2C bl update_sav1_flash_used_on_map - bl sav1_reset_battle_music_maybe + bl Overworld_ClearSavedMusic bl mapheader_run_script_with_tag_x3 bl not_trainer_hill_battle_pyramid ldr r0, [r4] @@ -1491,7 +1491,7 @@ _080851EE: bl FlagClear _08085200: bl update_sav1_flash_used_on_map - bl sav1_reset_battle_music_maybe + bl Overworld_ClearSavedMusic bl mapheader_run_script_with_tag_x3 bl UpdateLocationHistoryForRoamer bl RoamerMoveToOtherLocationSet @@ -2272,15 +2272,15 @@ Overworld_SetSavedMusic: @ 80857F4 .pool thumb_func_end Overworld_SetSavedMusic - thumb_func_start sav1_reset_battle_music_maybe -sav1_reset_battle_music_maybe: @ 8085800 + thumb_func_start Overworld_ClearSavedMusic +Overworld_ClearSavedMusic: @ 8085800 ldr r0, =gSaveBlock1Ptr ldr r1, [r0] movs r0, 0 strh r0, [r1, 0x2C] bx lr .pool - thumb_func_end sav1_reset_battle_music_maybe + thumb_func_end Overworld_ClearSavedMusic thumb_func_start sub_8085810 sub_8085810: @ 8085810 diff --git a/asm/trainer_see.s b/asm/trainer_see.s index ad6cc370e..7a3086bfd 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -12,7 +12,7 @@ CheckForTrainersWantingBattle: @ 80B3BE8 ldr r0, =gUnknown_030060A8 movs r1, 0 strb r1, [r0] - ldr r0, =gUnknown_02038BFC + ldr r0, =gApproachingTrainerId strb r1, [r0] movs r4, 0 ldr r6, =gMapObjects @@ -89,7 +89,7 @@ _080B3C88: bcs _080B3CC6 ldr r6, =gUnknown_03006090 adds r7, r6, 0x4 - ldr r5, =gUnknown_02038BFC + ldr r5, =gApproachingTrainerId _080B3CA0: lsls r1, r4, 1 adds r1, r4 @@ -111,7 +111,7 @@ _080B3CA0: bcc _080B3CA0 _080B3CC6: bl TwoTrainersWantBattleExecuteScript - ldr r1, =gUnknown_02038BFC + ldr r1, =gApproachingTrainerId movs r0, 0 strb r0, [r1] ldr r1, =gUnknown_030060AC @@ -645,7 +645,7 @@ TrainerApproachPlayer: @ 80B406C sub_80B40C8: @ 80B40C8 push {r4,r5,lr} adds r2, r0, 0 - ldr r0, =gUnknown_02038BFC + ldr r0, =gApproachingTrainerId ldrb r0, [r0] cmp r0, 0 bne _080B40E4 @@ -1294,7 +1294,7 @@ sub_80B45D0: @ 80B45D0 ldrb r0, [r0] cmp r0, 0x2 bne _080B4610 - ldr r1, =gUnknown_02038BFC + ldr r1, =gApproachingTrainerId ldrb r0, [r1] cmp r0, 0 bne _080B460C @@ -1531,7 +1531,7 @@ _080B47B2: thumb_func_start sub_80B47BC sub_80B47BC: @ 80B47BC push {lr} - ldr r0, =gUnknown_02038BFC + ldr r0, =gApproachingTrainerId ldrb r0, [r0] cmp r0, 0 beq _080B47D4 |