dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

document battle_setup symbols

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-19 03:14:17 +08:00
parent 34b440a358
commit e48725d9b5
39 changed files with 400 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_controller_oak.s
+3 -3
View File
@@ -10,8 +10,8 @@ nullsub_81: @ 80E75AC
bx lr bx lr
thumb_func_end nullsub_81 thumb_func_end nullsub_81
thumb_func_start SetControllerToOakOrOldman thumb_func_start SetControllerToOakOrOldMan
SetControllerToOakOrOldman: @ 80E75B0 SetControllerToOakOrOldMan: @ 80E75B0
ldr r1, _080E75DC @ =gBattlerControllerFuncs ldr r1, _080E75DC @ =gBattlerControllerFuncs
ldr r0, _080E75E0 @ =gActiveBattler ldr r0, _080E75E0 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
@@ -39,7 +39,7 @@ _080E75DC: .4byte gBattlerControllerFuncs
_080E75E0: .4byte gActiveBattler _080E75E0: .4byte gActiveBattler
_080E75E4: .4byte sub_80E75EC _080E75E4: .4byte sub_80E75EC
_080E75E8: .4byte gBattleStruct _080E75E8: .4byte gBattleStruct
thumb_func_end SetControllerToOakOrOldman thumb_func_end SetControllerToOakOrOldMan
thumb_func_start sub_80E75EC thumb_func_start sub_80E75EC
sub_80E75EC: @ 80E75EC sub_80E75EC: @ 80E75EC
asm/battle_controller_pokedude.s
+3 -3
View File
@@ -10,8 +10,8 @@ nullsub_99: @ 81560A0
bx lr bx lr
thumb_func_end nullsub_99 thumb_func_end nullsub_99
thumb_func_start SetControllerToPokedude thumb_func_start SetControllerToPokeDude
SetControllerToPokedude: @ 81560A4 SetControllerToPokeDude: @ 81560A4
ldr r1, _081560C8 @ =gBattlerControllerFuncs ldr r1, _081560C8 @ =gBattlerControllerFuncs
ldr r0, _081560CC @ =gActiveBattler ldr r0, _081560CC @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
@@ -36,7 +36,7 @@ _081560CC: .4byte gActiveBattler
_081560D0: .4byte sub_81560DC _081560D0: .4byte sub_81560DC
_081560D4: .4byte gBattleStruct _081560D4: .4byte gBattleStruct
_081560D8: .4byte gSpecialVar_0x8004 _081560D8: .4byte gSpecialVar_0x8004
thumb_func_end SetControllerToPokedude thumb_func_end SetControllerToPokeDude
thumb_func_start sub_81560DC thumb_func_start sub_81560DC
sub_81560DC: @ 81560DC sub_81560DC: @ 81560DC
asm/battle_message.s
+2 -2
View File
@@ -1917,7 +1917,7 @@ _080D81E8:
_080D8204: .4byte gBattleTypeFlags _080D8204: .4byte gBattleTypeFlags
_080D8208: .4byte gStringVar4 _080D8208: .4byte gStringVar4
_080D820C: _080D820C:
bl sub_80806EC bl GetTrainerALoseText
adds r4, r0, 0 adds r4, r0, 0
b _080D8382 b _080D8382
_080D8214: _080D8214:
@@ -1937,7 +1937,7 @@ _080D8214:
_080D8230: .4byte gBattleTypeFlags _080D8230: .4byte gBattleTypeFlags
_080D8234: .4byte gStringVar4 _080D8234: .4byte gStringVar4
_080D8238: _080D8238:
bl sub_8080710 bl GetTrainerBLoseText
adds r4, r0, 0 adds r4, r0, 0
b _080D8382 b _080D8382
_080D8240: _080D8240:
asm/battle_setup.s
+251 -251
View File
File diff suppressed because it is too large Load Diff
asm/field_control_avatar.s
+3 -3
View File
@@ -1953,13 +1953,13 @@ _0806D7E2:
bx r1 bx r1
thumb_func_end DoPoisonFieldEffect_step thumb_func_end DoPoisonFieldEffect_step
thumb_func_start sub_806D7E8 thumb_func_start RestartWildEncounterImmunitySteps
sub_806D7E8: @ 806D7E8 RestartWildEncounterImmunitySteps: @ 806D7E8
push {lr} push {lr}
bl sub_80832D4 bl sub_80832D4
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_806D7E8 thumb_func_end RestartWildEncounterImmunitySteps
thumb_func_start is_it_battle_time_3 thumb_func_start is_it_battle_time_3
is_it_battle_time_3: @ 806D7F4 is_it_battle_time_3: @ 806D7F4
asm/field_effect.s
+14 -14
View File
@@ -1989,7 +1989,7 @@ mapldr_080842E8: @ 80842E8
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
ldr r1, _0808430C @ =gFieldCallback ldr r1, _0808430C @ =gFieldCallback
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
@@ -2092,7 +2092,7 @@ mapldr_08084390: @ 8084390
bl FieldObjectTurn bl FieldObjectTurn
_080843D2: _080843D2:
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
ldr r1, _080843F4 @ =gFieldCallback ldr r1, _080843F4 @ =gFieldCallback
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
@@ -2158,7 +2158,7 @@ sub_8084454: @ 8084454
bl pal_fill_for_maplights bl pal_fill_for_maplights
bl sub_8111CF0 bl sub_8111CF0
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
ldr r0, _0808447C @ =sub_8084484 ldr r0, _0808447C @ =sub_8084484
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
@@ -2626,7 +2626,7 @@ _080847F4: .4byte gUnknown_83CC050
sub_80847F8: @ 80847F8 sub_80847F8: @ 80847F8
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl player_bitmagic bl FreezeEventObjects
bl CameraObjectReset2 bl CameraObjectReset2
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
bl sub_809C448 bl sub_809C448
@@ -2889,7 +2889,7 @@ sub_80849F4: @ 80849F4
bl pal_fill_for_maplights bl pal_fill_for_maplights
bl sub_8111CF0 bl sub_8111CF0
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
ldr r0, _08084A1C @ =sub_8084A24 ldr r0, _08084A1C @ =sub_8084A24
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
@@ -3630,7 +3630,7 @@ sub_8084FA0: @ 8084FA0
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
bl player_bitmagic bl FreezeEventObjects
bl CameraObjectReset2 bl CameraObjectReset2
movs r0, 0 movs r0, 0
bl SetCameraPanningCallback bl SetCameraPanningCallback
@@ -3977,7 +3977,7 @@ sub_8085244: @ 8085244
adds r5, r0, 0 adds r5, r0, 0
adds r4, r1, 0 adds r4, r1, 0
bl CameraObjectReset2 bl CameraObjectReset2
bl player_bitmagic bl FreezeEventObjects
ldr r1, _08085270 @ =gPlayerAvatar ldr r1, _08085270 @ =gPlayerAvatar
movs r0, 0x1 movs r0, 0x1
strb r0, [r1, 0x6] strb r0, [r1, 0x6]
@@ -4239,7 +4239,7 @@ sub_8085440: @ 8085440
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r4, r1, 0 adds r4, r1, 0
bl player_bitmagic bl FreezeEventObjects
bl CameraObjectReset2 bl CameraObjectReset2
ldr r1, _0808546C @ =gPlayerAvatar ldr r1, _0808546C @ =gPlayerAvatar
movs r0, 0x1 movs r0, 0x1
@@ -4482,7 +4482,7 @@ _0808561C:
sub_8085620: @ 8085620 sub_8085620: @ 8085620
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
ldr r0, _08085638 @ =sub_808563C ldr r0, _08085638 @ =sub_808563C
movs r1, 0x50 movs r1, 0x50
bl CreateTask bl CreateTask
@@ -4969,7 +4969,7 @@ sub_80859D4: @ 80859D4
bl pal_fill_for_maplights bl pal_fill_for_maplights
bl sub_8111CF0 bl sub_8111CF0
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
ldr r1, _08085A14 @ =gFieldCallback ldr r1, _08085A14 @ =gFieldCallback
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
@@ -5198,7 +5198,7 @@ sub_8085BA8: @ 8085BA8
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
bl CameraObjectReset2 bl CameraObjectReset2
bl GetPlayerFacingDirection bl GetPlayerFacingDirection
lsls r0, 24 lsls r0, 24
@@ -5435,7 +5435,7 @@ mapldr_08085D88: @ 8085D88
bl pal_fill_for_maplights bl pal_fill_for_maplights
bl sub_8111CF0 bl sub_8111CF0
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
ldr r1, _08085DCC @ =gFieldCallback ldr r1, _08085DCC @ =gFieldCallback
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
@@ -7000,7 +7000,7 @@ sub_80869C0: @ 80869C0
push {r6} push {r6}
adds r4, r0, 0 adds r4, r0, 0
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
ldr r5, _08086A18 @ =gPlayerAvatar ldr r5, _08086A18 @ =gPlayerAvatar
movs r0, 0x1 movs r0, 0x1
strb r0, [r5, 0x6] strb r0, [r5, 0x6]
@@ -7276,7 +7276,7 @@ sub_8086C00: @ 8086C00
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
ldr r1, _08086C20 @ =gPlayerAvatar ldr r1, _08086C20 @ =gPlayerAvatar
movs r0, 0x1 movs r0, 0x1
strb r0, [r1, 0x6] strb r0, [r1, 0x6]
asm/field_map_obj.s
+6 -6
View File
@@ -12214,8 +12214,8 @@ _0806360C:
bx r1 bx r1
thumb_func_end sub_80635DC thumb_func_end sub_80635DC
thumb_func_start npc_set_running_behaviour_etc thumb_func_start SetTrainerMovementType
npc_set_running_behaviour_etc: @ 8063610 SetTrainerMovementType: @ 8063610
push {r4,lr} push {r4,lr}
mov r12, r0 mov r12, r0
lsls r1, 24 lsls r1, 24
@@ -12253,10 +12253,10 @@ npc_set_running_behaviour_etc: @ 8063610
.align 2, 0 .align 2, 0
_08063654: .4byte gSprites _08063654: .4byte gSprites
_08063658: .4byte gUnknown_839FBC8 _08063658: .4byte gUnknown_839FBC8
thumb_func_end npc_set_running_behaviour_etc thumb_func_end SetTrainerMovementType
thumb_func_start npc_running_behaviour_by_direction thumb_func_start GetTrainerFacingDirectionMovementType
npc_running_behaviour_by_direction: @ 806365C GetTrainerFacingDirectionMovementType: @ 806365C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, _08063668 @ =gUnknown_83A649C ldr r1, _08063668 @ =gUnknown_83A649C
@@ -12265,7 +12265,7 @@ npc_running_behaviour_by_direction: @ 806365C
bx lr bx lr
.align 2, 0 .align 2, 0
_08063668: .4byte gUnknown_83A649C _08063668: .4byte gUnknown_83A649C
thumb_func_end npc_running_behaviour_by_direction thumb_func_end GetTrainerFacingDirectionMovementType
thumb_func_start npc_block_way__next_tile thumb_func_start npc_block_way__next_tile
npc_block_way__next_tile: @ 806366C npc_block_way__next_tile: @ 806366C
asm/field_player_avatar.s
+2 -2
View File
@@ -3964,7 +3964,7 @@ sub_805D0F8: @ 805D0F8
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
bl sav1_reset_battle_music_maybe bl sav1_reset_battle_music_maybe
bl Overworld_ChangeMusicToDefault bl Overworld_ChangeMusicToDefault
ldr r2, _0805D148 @ =gPlayerAvatar ldr r2, _0805D148 @ =gPlayerAvatar
@@ -4005,7 +4005,7 @@ sub_805D154: @ 805D154
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
ldr r2, _0805D19C @ =gPlayerAvatar ldr r2, _0805D19C @ =gPlayerAvatar
ldrb r1, [r2] ldrb r1, [r2]
movs r0, 0xF7 movs r0, 0xF7
asm/field_screen_effect.s
+1 -1
View File
@@ -306,7 +306,7 @@ sub_807F028: @ 807F028
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r4, r0, 0 adds r4, r0, 0
bl sav1_get_flash_used_on_map bl Overworld_GetFlashLevel
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r5, 0 movs r5, 0
asm/item_menu.s
+1 -1
View File
@@ -5845,7 +5845,7 @@ _0810AD1E:
cmp r6, 0x1 cmp r6, 0x1
bne _0810AD90 bne _0810AD90
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl FreezeEventObjects
bl sub_805C270 bl sub_805C270
bl sub_805C780 bl sub_805C780
ldr r2, _0810AD88 @ =gSpecialVar_ItemId ldr r2, _0810AD88 @ =gSpecialVar_ItemId
asm/map_obj_80688E4.s
+3 -3
View File
@@ -82,8 +82,8 @@ _0806896E:
bx r1 bx r1
thumb_func_end FreezeMapObject thumb_func_end FreezeMapObject
thumb_func_start player_bitmagic thumb_func_start FreezeEventObjects
player_bitmagic: @ 8068974 FreezeEventObjects: @ 8068974
push {r4,r5,lr} push {r4,r5,lr}
movs r4, 0 movs r4, 0
ldr r5, _080689A8 @ =gMapObjects ldr r5, _080689A8 @ =gMapObjects
@@ -114,7 +114,7 @@ _08068998:
.align 2, 0 .align 2, 0
_080689A8: .4byte gMapObjects _080689A8: .4byte gMapObjects
_080689AC: .4byte gPlayerAvatar _080689AC: .4byte gPlayerAvatar
thumb_func_end player_bitmagic thumb_func_end FreezeEventObjects
thumb_func_start FreezeMapObjectsExceptOne thumb_func_start FreezeMapObjectsExceptOne
FreezeMapObjectsExceptOne: @ 80689B0 FreezeMapObjectsExceptOne: @ 80689B0
asm/overworld.s
+6 -6
View File
@@ -1708,7 +1708,7 @@ sub_8055864: @ 8055864
bl TrySetMapSaveWarpStatus bl TrySetMapSaveWarpStatus
bl sub_806E110 bl sub_806E110
bl nullsub_74 bl nullsub_74
bl sub_806D7E8 bl RestartWildEncounterImmunitySteps
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_810C578 bl sub_810C578
@@ -1771,7 +1771,7 @@ sub_8055920: @ 8055920
bl TrySetMapSaveWarpStatus bl TrySetMapSaveWarpStatus
bl sub_806E110 bl sub_806E110
bl nullsub_74 bl nullsub_74
bl sub_806D7E8 bl RestartWildEncounterImmunitySteps
ldr r0, _080559A0 @ =gSaveBlock1Ptr ldr r0, _080559A0 @ =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x4 movs r0, 0x4
@@ -2284,8 +2284,8 @@ _08055D28: .4byte gUnknown_83C68E0
_08055D2C: .4byte gSaveBlock1Ptr _08055D2C: .4byte gSaveBlock1Ptr
thumb_func_end Overworld_SetFlashLevel thumb_func_end Overworld_SetFlashLevel
thumb_func_start sav1_get_flash_used_on_map thumb_func_start Overworld_GetFlashLevel
sav1_get_flash_used_on_map: @ 8055D30 Overworld_GetFlashLevel: @ 8055D30
ldr r0, _08055D3C @ =gSaveBlock1Ptr ldr r0, _08055D3C @ =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x30 adds r0, 0x30
@@ -2293,7 +2293,7 @@ sav1_get_flash_used_on_map: @ 8055D30
bx lr bx lr
.align 2, 0 .align 2, 0
_08055D3C: .4byte gSaveBlock1Ptr _08055D3C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_get_flash_used_on_map thumb_func_end Overworld_GetFlashLevel
thumb_func_start SetCurrentMapLayout thumb_func_start SetCurrentMapLayout
SetCurrentMapLayout: @ 8055D40 SetCurrentMapLayout: @ 8055D40
@@ -3944,7 +3944,7 @@ VBlankCB_Field: @ 8056A14
thumb_func_start sub_8056A34 thumb_func_start sub_8056A34
sub_8056A34: @ 8056A34 sub_8056A34: @ 8056A34
push {lr} push {lr}
bl sav1_get_flash_used_on_map bl Overworld_GetFlashLevel
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0 cmp r0, 0
asm/trainer_see.s
+7 -7
View File
@@ -87,7 +87,7 @@ sub_8081B84: @ 8081B84
_08081BC0: _08081BC0:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r6, 0 adds r1, r6, 0
bl TrainerWantsBattle bl ConfigureAndSetUpOneTrainerBattle
adds r0, r4, r5 adds r0, r4, r5
lsls r0, 2 lsls r0, 2
ldr r1, _08081BE0 @ =gMapObjects ldr r1, _08081BE0 @ =gMapObjects
@@ -718,16 +718,16 @@ _0808204A:
ldrb r0, [r4, 0x18] ldrb r0, [r4, 0x18]
lsls r0, 28 lsls r0, 28
lsrs r0, 28 lsrs r0, 28
bl npc_running_behaviour_by_direction bl GetTrainerFacingDirectionMovementType
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
adds r0, r4, 0 adds r0, r4, 0
bl npc_set_running_behaviour_etc bl SetTrainerMovementType
ldrb r0, [r4, 0x18] ldrb r0, [r4, 0x18]
lsls r0, 28 lsls r0, 28
lsrs r0, 28 lsrs r0, 28
bl npc_running_behaviour_by_direction bl GetTrainerFacingDirectionMovementType
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@@ -1277,17 +1277,17 @@ _0808246E:
ldrb r0, [r4, 0x18] ldrb r0, [r4, 0x18]
lsls r0, 28 lsls r0, 28
lsrs r0, 28 lsrs r0, 28
bl npc_running_behaviour_by_direction bl GetTrainerFacingDirectionMovementType
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
adds r0, r4, 0 adds r0, r4, 0
bl npc_set_running_behaviour_etc bl SetTrainerMovementType
ldr r4, [sp] ldr r4, [sp]
ldrb r0, [r4, 0x18] ldrb r0, [r4, 0x18]
lsls r0, 28 lsls r0, 28
lsrs r0, 28 lsrs r0, 28
bl npc_running_behaviour_by_direction bl GetTrainerFacingDirectionMovementType
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
asm/wild_encounter.s
+6 -6
View File
@@ -932,7 +932,7 @@ _08082DFA:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08082E46 beq _08082E46
bl sub_807F78C bl BattleSetup_StartRoamerBattle
movs r0, 0x1 movs r0, 0x1
b _08082E48 b _08082E48
.align 2, 0 .align 2, 0
@@ -950,7 +950,7 @@ _08082E24:
cmp r0, 0x1 cmp r0, 0x1
bne _08082E40 bne _08082E40
_08082E38: _08082E38:
bl sub_807F704 bl BattleSetup_StartWildBattle
movs r0, 0x1 movs r0, 0x1
b _08082E48 b _08082E48
_08082E40: _08082E40:
@@ -999,7 +999,7 @@ sub_8082E54: @ 8082E54
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0x1 cmp r4, 0x1
bne _08082EB0 bne _08082EB0
bl sub_807F704 bl BattleSetup_StartWildBattle
_08082E9C: _08082E9C:
ldr r0, _08082EAC @ =gSpecialVar_Result ldr r0, _08082EAC @ =gSpecialVar_Result
strh r4, [r0] strh r4, [r0]
@@ -1079,7 +1079,7 @@ _08082F1C:
cmp r0, 0x1 cmp r0, 0x1
bne _08082F44 bne _08082F44
_08082F3C: _08082F3C:
bl sub_807F78C bl BattleSetup_StartRoamerBattle
movs r0, 0x1 movs r0, 0x1
b _08082F6E b _08082F6E
_08082F44: _08082F44:
@@ -1096,7 +1096,7 @@ _08082F44:
_08082F58: _08082F58:
movs r2, 0 movs r2, 0
bl sub_8082AEC bl sub_8082AEC
bl sub_807F704 bl BattleSetup_StartWildBattle
movs r0, 0x1 movs r0, 0x1
b _08082F6E b _08082F6E
.align 2, 0 .align 2, 0
@@ -1160,7 +1160,7 @@ sub_8082FB0: @ 8082FB0
bl sub_8082B64 bl sub_8082B64
movs r0, 0xC movs r0, 0xC
bl IncrementGameStat bl IncrementGameStat
bl sub_807F704 bl BattleSetup_StartWildBattle
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
data/data_835B488.s
+7 -7
View File
@@ -13,28 +13,28 @@ gUnknown_83C68E4:: @ 83C68E4
gUnknown_83C68EC:: @ 83C68EC gUnknown_83C68EC:: @ 83C68EC
.incbin "baserom.gba", 0x3C68EC, 0x4 .incbin "baserom.gba", 0x3C68EC, 0x4
gUnknown_83C68F0:: @ 83C68F0 sBattleTransitionTable_Wild:: @ 83C68F0
.incbin "baserom.gba", 0x3C68F0, 0x8 .incbin "baserom.gba", 0x3C68F0, 0x8
gUnknown_83C68F8:: @ 83C68F8 sBattleTransitionTable_Trainer:: @ 83C68F8
.incbin "baserom.gba", 0x3C68F8, 0x8 .incbin "baserom.gba", 0x3C68F8, 0x8
gUnknown_83C6900:: @ 83C6900 sOrdinaryBattleParams:: @ 83C6900
.incbin "baserom.gba", 0x3C6900, 0x48 .incbin "baserom.gba", 0x3C6900, 0x48
gUnknown_83C6948:: @ 83C6948 sContinueScriptBattleParams:: @ 83C6948
.incbin "baserom.gba", 0x3C6948, 0x48 .incbin "baserom.gba", 0x3C6948, 0x48
gUnknown_83C6990:: @ 83C6990 sDoubleBattleParams:: @ 83C6990
.incbin "baserom.gba", 0x3C6990, 0x48 .incbin "baserom.gba", 0x3C6990, 0x48
gUnknown_83C69D8:: @ 83C69D8 sOrdinaryNoIntroBattleParams:: @ 83C69D8
.incbin "baserom.gba", 0x3C69D8, 0x48 .incbin "baserom.gba", 0x3C69D8, 0x48
gUnknown_83C6A20:: @ 83C6A20 gUnknown_83C6A20:: @ 83C6A20
.incbin "baserom.gba", 0x3C6A20, 0x48 .incbin "baserom.gba", 0x3C6A20, 0x48
gUnknown_83C6A68:: @ 83C6A68 sContinueScriptDoubleBattleParams:: @ 83C6A68
.incbin "baserom.gba", 0x3C6A68, 0x48 .incbin "baserom.gba", 0x3C6A68, 0x48
gUnknown_83C6AB0:: @ 83C6AB0 gUnknown_83C6AB0:: @ 83C6AB0
data/map_event_scripts.inc
+24 -24
View File
@@ -780,12 +780,12 @@ EventScript_1A4EAF:: @ 81A4EAF
gUnknown_81A4EB4:: @ 81A4EB4 gUnknown_81A4EB4:: @ 81A4EB4
lock lock
special sub_8080628 special SetUpTrainerEncounterMusic
special ScrSpecial_EndTrainerApproach special ScrSpecial_EndTrainerApproach
waitstate waitstate
goto EventScript_1A4FC7 goto EventScript_1A4FC7
gUnknown_81A4EC1:: @ 81A4EC1 EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1
lock lock
faceplayer faceplayer
applymovement VAR_LAST_TALKED, Movement_1A4FC5 applymovement VAR_LAST_TALKED, Movement_1A4FC5
@@ -793,14 +793,14 @@ gUnknown_81A4EC1:: @ 81A4EC1
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_if 5, EventScript_1A4EE8 goto_if 5, EventScript_1A4EE8
special sub_8080628 special SetUpTrainerEncounterMusic
special sub_8080398 special SetUpTrainerMovement
goto EventScript_1A4FC7 goto EventScript_1A4FC7
EventScript_1A4EE8:: @ 81A4EE8 EventScript_1A4EE8:: @ 81A4EE8
ontrainerbattleend ontrainerbattleend
gUnknown_81A4EE9:: @ 81A4EE9 EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
lock lock
faceplayer faceplayer
call EventScript_1A4FBA call EventScript_1A4FBA
@@ -810,12 +810,12 @@ gUnknown_81A4EE9:: @ 81A4EE9
special CheckForAlivePartyMons special CheckForAlivePartyMons
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_if 5, EventScript_1A4F19 goto_if 5, EventScript_1A4F19
special sub_8080628 special SetUpTrainerEncounterMusic
special sub_8080398 special SetUpTrainerMovement
goto EventScript_1A4FC7 goto EventScript_1A4FC7
EventScript_1A4F19:: @ 81A4F19 EventScript_1A4F19:: @ 81A4F19
special sub_8080618 special ShowTrainerCantBattleSpeech
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
@@ -824,30 +824,30 @@ EventScript_1A4F19:: @ 81A4F19
EventScript_1A4F20:: @ 81A4F20 EventScript_1A4F20:: @ 81A4F20
ontrainerbattleend ontrainerbattleend
gUnknown_81A4F21:: @ 81A4F21 EventScript_DoTrainerBattle:: @ 81A4F21
applymovement VAR_LAST_TALKED, Movement_1A4FC5 applymovement VAR_LAST_TALKED, Movement_1A4FC5
waitmovement 0 waitmovement 0
special sub_8080628 special SetUpTrainerEncounterMusic
special sub_8110AB4 special sub_8110AB4
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A501A goto_if_eq EventScript_1A501A
battlebegin battlebegin
ontrainerbattleend ontrainerbattleend
gUnknown_81A4F3E:: @ 81A4F3E EventScript_TryDoRematchBattle:: @ 81A4F3E
call EventScript_1A4FBA call EventScript_1A4FBA
specialvar VAR_RESULT, sub_810CEB4 specialvar VAR_RESULT, sub_810CEB4
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_1A4F72 goto_if_eq EventScript_1A4F72
special sub_8080628 special SetUpTrainerEncounterMusic
special sub_8080398 special SetUpTrainerMovement
special sub_80805D8 special ShowTrainerIntroSpeech
waitmessage waitmessage
waitbuttonpress waitbuttonpress
special sub_8110AB4 special sub_8110AB4
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A4FB8 goto_if_eq EventScript_1A4FB8
special sub_80805B0 special BattleSetup_StartRematchBattle
waitstate waitstate
releaseall releaseall
end end
@@ -855,22 +855,22 @@ gUnknown_81A4F3E:: @ 81A4F3E
EventScript_1A4F72:: @ 81A4F72 EventScript_1A4F72:: @ 81A4F72
ontrainerbattleend ontrainerbattleend
gUnknown_81A4F73:: @ 81A4F73 EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
specialvar VAR_RESULT, sub_810CEB4 specialvar VAR_RESULT, sub_810CEB4
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_1A4FB0 goto_if_eq EventScript_1A4FB0
special CheckForAlivePartyMons special CheckForAlivePartyMons
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_if 5, EventScript_1A4FB1 goto_if 5, EventScript_1A4FB1
special sub_8080628 special SetUpTrainerEncounterMusic
special sub_8080398 special SetUpTrainerMovement
special sub_80805D8 special ShowTrainerIntroSpeech
waitmessage waitmessage
waitbuttonpress waitbuttonpress
special sub_8110AB4 special sub_8110AB4
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A4FB8 goto_if_eq EventScript_1A4FB8
special sub_80805B0 special BattleSetup_StartRematchBattle
waitstate waitstate
releaseall releaseall
end end
@@ -879,7 +879,7 @@ EventScript_1A4FB0:: @ 81A4FB0
ontrainerbattleend ontrainerbattleend
EventScript_1A4FB1:: @ 81A4FB1 EventScript_1A4FB1:: @ 81A4FB1
special sub_8080618 special ShowTrainerCantBattleSpeech
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
@@ -899,14 +899,14 @@ Movement_1A4FC5:: @ 81A4FC5
step_end step_end
EventScript_1A4FC7:: @ 81A4FC7 EventScript_1A4FC7:: @ 81A4FC7
special sub_80805D8 special ShowTrainerIntroSpeech
waitmessage waitmessage
waitbuttonpress waitbuttonpress
special sub_8110AB4 special sub_8110AB4
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A501A goto_if_eq EventScript_1A501A
battlebegin battlebegin
specialvar VAR_RESULT, sub_80803CC specialvar VAR_RESULT, GetTrainerBattleMode
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_1A5017 goto_if_eq EventScript_1A5017
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
@@ -926,7 +926,7 @@ EventScript_1A5019:: @ 81A5019
ontrainerbattleendgoto ontrainerbattleendgoto
EventScript_1A501A:: @ 81A501A EventScript_1A501A:: @ 81A501A
special sub_80803FC special SetBattledTrainerFlag
releaseall releaseall
end end
data/maps/BirthIsland_Exterior/scripts.inc
+1 -1
View File
@@ -92,7 +92,7 @@ EventScript_1652C0:: @ 81652C0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CreateObedientEnemyMon special CreateObedientEnemyMon
setflag FLAG_0x807 setflag FLAG_0x807
special sub_807F9D8 special BattleSetup_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_0x807 clearflag FLAG_0x807
specialvar VAR_RESULT, sub_80CA74C specialvar VAR_RESULT, sub_80CA74C
data/maps/CeruleanCave_B1F/scripts.inc
+1 -1
View File
@@ -41,7 +41,7 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
waitbuttonpress waitbuttonpress
setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
setflag FLAG_0x807 setflag FLAG_0x807
special sub_807F9D8 special BattleSetup_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_0x807 clearflag FLAG_0x807
specialvar VAR_RESULT, sub_80CA74C specialvar VAR_RESULT, sub_80CA74C
data/maps/MtEmber_Summit/scripts.inc
+1 -1
View File
@@ -41,7 +41,7 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
playbgm MUS_EXEYE, 0 playbgm MUS_EXEYE, 0
waitbuttonpress waitbuttonpress
setflag FLAG_0x807 setflag FLAG_0x807
special sub_807F9D8 special BattleSetup_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_0x807 clearflag FLAG_0x807
specialvar VAR_RESULT, sub_80CA74C specialvar VAR_RESULT, sub_80CA74C
data/maps/NavelRock_Base/scripts.inc
+1 -1
View File
@@ -65,7 +65,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CreateObedientEnemyMon special CreateObedientEnemyMon
setflag FLAG_0x807 setflag FLAG_0x807
special sub_807F9D8 special BattleSetup_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_0x807 clearflag FLAG_0x807
specialvar VAR_RESULT, sub_80CA74C specialvar VAR_RESULT, sub_80CA74C
data/maps/NavelRock_Summit/scripts.inc
+1 -1
View File
@@ -69,7 +69,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CreateObedientEnemyMon special CreateObedientEnemyMon
setflag FLAG_0x807 setflag FLAG_0x807
special sub_807F9D8 special BattleSetup_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_0x807 clearflag FLAG_0x807
setvar VAR_LAST_TALKED, 1 setvar VAR_LAST_TALKED, 1
data/maps/PokemonTower_6F/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0 goto_if_eq EventScript_1A7AE0
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
special sub_807F904 special BattleSetup_StartMarowakBattle
waitstate waitstate
special sub_8112364 special sub_8112364
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
data/maps/PowerPlant/scripts.inc
+1 -1
View File
@@ -54,7 +54,7 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
playbgm MUS_EXEYE, 0 playbgm MUS_EXEYE, 0
waitbuttonpress waitbuttonpress
setflag FLAG_0x807 setflag FLAG_0x807
special sub_807F9D8 special BattleSetup_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_0x807 clearflag FLAG_0x807
specialvar VAR_RESULT, sub_80CA74C specialvar VAR_RESULT, sub_80CA74C
data/maps/SeafoamIslands_B4F/scripts.inc
+1 -1
View File
@@ -179,7 +179,7 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
playbgm MUS_EXEYE, 0 playbgm MUS_EXEYE, 0
waitbuttonpress waitbuttonpress
setflag FLAG_0x807 setflag FLAG_0x807
special sub_807F9D8 special BattleSetup_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_0x807 clearflag FLAG_0x807
specialvar VAR_RESULT, sub_80CA74C specialvar VAR_RESULT, sub_80CA74C
data/maps/ViridianCity/scripts.inc
+2 -2
View File
@@ -151,7 +151,7 @@ EventScript_165A65:: @ 8165A65
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0 goto_if_eq EventScript_1A7AE0
special sub_8112364 special sub_8112364
special sub_807F888 special BattleSetup_StartOldManTutorialBattle
waitstate waitstate
release release
end end
@@ -246,7 +246,7 @@ EventScript_165B4C:: @ 8165B4C
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0 goto_if_eq EventScript_1A7AE0
special sub_8112364 special sub_8112364
special sub_807F888 special BattleSetup_StartOldManTutorialBattle
waitstate waitstate
lock lock
faceplayer faceplayer
data/specials.inc
+11 -11
View File
@@ -60,15 +60,15 @@ gSpecials:: @ 815FD60
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special IsEnigmaBerryValid def_special IsEnigmaBerryValid
def_special sub_80803CC def_special GetTrainerBattleMode
def_special sub_80805D8 def_special ShowTrainerIntroSpeech
def_special sub_8080618 def_special ShowTrainerCantBattleSpeech
def_special ScrSpecial_HasTrainerBeenFought def_special ScrSpecial_HasTrainerBeenFought
def_special ScrSpecial_EndTrainerApproach def_special ScrSpecial_EndTrainerApproach
def_special sub_8080628 def_special SetUpTrainerEncounterMusic
def_special sub_810CD4C def_special sub_810CD4C
def_special sub_810CEB4 def_special sub_810CEB4
def_special sub_80805B0 def_special BattleSetup_StartRematchBattle
def_special sub_808C6A8 def_special sub_808C6A8
def_special CheckForAlivePartyMons def_special CheckForAlivePartyMons
def_special nullsub_75 def_special nullsub_75
@@ -166,7 +166,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special sub_807F888 def_special BattleSetup_StartOldManTutorialBattle
def_special ChangePokemonNickname def_special ChangePokemonNickname
def_special sub_80BF8FC def_special sub_80BF8FC
def_special nullsub_75 def_special nullsub_75
@@ -320,10 +320,10 @@ gSpecials:: @ 815FD60
def_special sub_80CAC08 def_special sub_80CAC08
def_special sub_806E99C def_special sub_806E99C
def_special sub_80CAC28 def_special sub_80CAC28
def_special sub_807FA68 def_special BattleSetup_StartIceCaveBattle
def_special sub_807F9D8 def_special BattleSetup_StartLegendaryBattle
def_special sub_807FABC def_special sub_807FABC
def_special sub_8080398 def_special SetUpTrainerMovement
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special sub_807B6C0 def_special sub_807B6C0
@@ -351,7 +351,7 @@ gSpecials:: @ 815FD60
def_special GetNameOfEnigmaBerryInPlayerParty def_special GetNameOfEnigmaBerryInPlayerParty
def_special nullsub_75 def_special nullsub_75
def_special sub_810B82C def_special sub_810B82C
def_special sub_807F904 def_special BattleSetup_StartMarowakBattle
def_special sub_80CA630 def_special sub_80CA630
def_special sub_80CB7C4 def_special sub_80CB7C4
def_special sub_80CBC5C def_special sub_80CBC5C
@@ -408,7 +408,7 @@ gSpecials:: @ 815FD60
def_special sub_809D620 def_special sub_809D620
def_special sub_812781C def_special sub_812781C
def_special sub_8127888 def_special sub_8127888
def_special sub_80803FC def_special SetBattledTrainerFlag
def_special sub_812B35C def_special sub_812B35C
def_special Special_SSAnneDepartureCutscene def_special Special_SSAnneDepartureCutscene
def_special sub_8149A18 def_special sub_8149A18
include/battle_controllers.h
+2 -2
View File
@@ -260,10 +260,10 @@ void SetControllerToPlayerPartner(void);
void SetControllerToSafari(void); void SetControllerToSafari(void);
// pokedude controller // pokedude controller
void SetControllerToPokedude(void); void SetControllerToPokeDude(void);
// oak controller // oak controller
void SetControllerToOakOrOldman(void); void SetControllerToOakOrOldMan(void);
bool8 sub_80EB2E0(u8); bool8 sub_80EB2E0(u8);
void sub_80EB2F4(u8); void sub_80EB2F4(u8);
void sub_80E8570(void); void sub_80E8570(void);
include/battle_setup.h
+2 -2
View File
@@ -16,9 +16,9 @@ void ClearTrainerFlag(u16);
void BattleSetup_StartTrainerBattle(void); void BattleSetup_StartTrainerBattle(void);
u8 *BattleSetup_GetScriptAddrAfterBattle(void); u8 *BattleSetup_GetScriptAddrAfterBattle(void);
u8 *BattleSetup_GetTrainerPostBattleScript(void); u8 *BattleSetup_GetTrainerPostBattleScript(void);
void sub_80803FC(void); void SetBattledTrainerFlag(void);
u8 sub_8080060(void); u8 sub_8080060(void);
u8 sub_80803CC(void); u8 GetTrainerBattleMode(void);
u16 sub_80803D8(void); u16 sub_80803D8(void);
#endif // GUARD_BATTLE_SETUP_H #endif // GUARD_BATTLE_SETUP_H
include/field_map_obj.h
+1 -1
View File
@@ -85,7 +85,7 @@ void sub_8063E28(struct MapObject *, struct Sprite *);
void FieldObjectSetHeldMovement(struct MapObject *, u8); void FieldObjectSetHeldMovement(struct MapObject *, u8);
void npc_coords_shift_still(struct MapObject *); void npc_coords_shift_still(struct MapObject *);
void sub_805FE7C(struct MapObject *, u8); void sub_805FE7C(struct MapObject *, u8);
void npc_set_running_behaviour_etc(struct MapObject *, u8); void SetTrainerMovementType(struct MapObject *, u8);
u8 sub_80634F0(u8 direction); u8 sub_80634F0(u8 direction);
u8 sub_8063500(u8 a0); u8 sub_8063500(u8 a0);
void EventObjectSetGraphicsId(struct MapObject *mapObject, u8 a1); void EventObjectSetGraphicsId(struct MapObject *mapObject, u8 a1);
include/map_obj_80688E4.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "global.h" #include "global.h"
void player_bitmagic(void); void FreezeEventObjects(void);
void FreezeMapObject(struct MapObject *); void FreezeMapObject(struct MapObject *);
void FreezeMapObjectsExceptOne(u8 mapObjectId); void FreezeMapObjectsExceptOne(u8 mapObjectId);
src/battle_controllers.c
+7 -7
View File
@@ -85,9 +85,9 @@ static void InitSinglePlayerBtlControllers(void)
gBattleMainFunc = BeginBattleIntro; gBattleMainFunc = BeginBattleIntro;
if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE) if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE)
{ {
gBattlerControllerFuncs[0] = SetControllerToPokedude; gBattlerControllerFuncs[0] = SetControllerToPokeDude;
gBattlerPositions[0] = B_POSITION_PLAYER_LEFT; gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
gBattlerControllerFuncs[1] = SetControllerToPokedude; gBattlerControllerFuncs[1] = SetControllerToPokeDude;
gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT; gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
gBattlersCount = 2; gBattlersCount = 2;
} }
@@ -96,7 +96,7 @@ static void InitSinglePlayerBtlControllers(void)
if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
gBattlerControllerFuncs[0] = SetControllerToSafari; gBattlerControllerFuncs[0] = SetControllerToSafari;
else if (gBattleTypeFlags & (BATTLE_TYPE_OLDMAN_TUTORIAL | BATTLE_TYPE_FIRST_BATTLE)) else if (gBattleTypeFlags & (BATTLE_TYPE_OLDMAN_TUTORIAL | BATTLE_TYPE_FIRST_BATTLE))
gBattlerControllerFuncs[0] = SetControllerToOakOrOldman; gBattlerControllerFuncs[0] = SetControllerToOakOrOldMan;
else else
gBattlerControllerFuncs[0] = SetControllerToPlayer; gBattlerControllerFuncs[0] = SetControllerToPlayer;
gBattlerPositions[0] = B_POSITION_PLAYER_LEFT; gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
@@ -110,13 +110,13 @@ static void InitSinglePlayerBtlControllers(void)
gBattleMainFunc = BeginBattleIntro; gBattleMainFunc = BeginBattleIntro;
if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE) if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE)
{ {
gBattlerControllerFuncs[0] = SetControllerToPokedude; gBattlerControllerFuncs[0] = SetControllerToPokeDude;
gBattlerPositions[0] = B_POSITION_PLAYER_LEFT; gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
gBattlerControllerFuncs[1] = SetControllerToPokedude; gBattlerControllerFuncs[1] = SetControllerToPokeDude;
gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT; gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
gBattlerControllerFuncs[2] = SetControllerToPokedude; gBattlerControllerFuncs[2] = SetControllerToPokeDude;
gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT; gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
gBattlerControllerFuncs[3] = SetControllerToPokedude; gBattlerControllerFuncs[3] = SetControllerToPokeDude;
gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT; gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
gBattlersCount = MAX_BATTLERS_COUNT; gBattlersCount = MAX_BATTLERS_COUNT;
} }
src/battle_main.c
+1 -1
View File
@@ -3719,7 +3719,7 @@ static void HandleEndTurn_BattleLost(void)
} }
else else
{ {
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && sub_80803CC() == 9) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && GetTrainerBattleMode() == 9)
{ {
if (sub_80803D8() & 1) if (sub_80803D8() & 1)
gBattleCommunication[MULTISTRING_CHOOSER] = 1; gBattleCommunication[MULTISTRING_CHOOSER] = 1;
src/field_fadetransition.c
+9 -9
View File
@@ -323,14 +323,14 @@ static void sub_807DFBC(u8 taskId)
{ {
case 0: // Never reached case 0: // Never reached
sub_807DCB0(0); sub_807DCB0(0);
player_bitmagic(); FreezeEventObjects();
PlayerGetDestCoords(x, y); PlayerGetDestCoords(x, y);
FieldSetDoorOpened(*x, *y); FieldSetDoorOpened(*x, *y);
task->data[0] = 1; task->data[0] = 1;
break; break;
case 5: case 5:
sub_807DCB0(0); sub_807DCB0(0);
player_bitmagic(); FreezeEventObjects();
sub_807F114(); sub_807F114();
sub_807DBAC(); sub_807DBAC();
task->data[0] = 6; task->data[0] = 6;
@@ -408,7 +408,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
{ {
case 0: case 0:
sub_807DCB0(0); sub_807DCB0(0);
player_bitmagic(); FreezeEventObjects();
PlayerGetDestCoords(x, y); PlayerGetDestCoords(x, y);
task->data[0] = 1; task->data[0] = 1;
break; break;
@@ -439,7 +439,7 @@ static void task_map_chg_seq_0807E2CC(u8 taskId)
switch (gTasks[taskId].data[0]) switch (gTasks[taskId].data[0])
{ {
case 0: case 0:
player_bitmagic(); FreezeEventObjects();
ScriptContext2_Enable(); ScriptContext2_Enable();
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
@@ -459,7 +459,7 @@ static void sub_807E31C(u8 taskId)
switch (gTasks[taskId].data[0]) switch (gTasks[taskId].data[0])
{ {
case 0: case 0:
player_bitmagic(); FreezeEventObjects();
ScriptContext2_Enable(); ScriptContext2_Enable();
sub_805DC04(); sub_805DC04();
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
@@ -689,7 +689,7 @@ static void sub_807E718(u8 taskId)
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
player_bitmagic(); FreezeEventObjects();
ScriptContext2_Enable(); ScriptContext2_Enable();
task->data[0]++; task->data[0]++;
break; break;
@@ -711,7 +711,7 @@ static void sub_807E784(u8 taskId)
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
player_bitmagic(); FreezeEventObjects();
ScriptContext2_Enable(); ScriptContext2_Enable();
PlaySE(SE_TK_WARPIN); PlaySE(SE_TK_WARPIN);
sub_805DAB0(); sub_805DAB0();
@@ -744,7 +744,7 @@ static void sub_807E80C(u8 taskId)
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
player_bitmagic(); FreezeEventObjects();
PlayerGetDestCoords(xp, yp); PlayerGetDestCoords(xp, yp);
PlaySE(GetDoorSoundEffect(*xp, *yp - 1)); PlaySE(GetDoorSoundEffect(*xp, *yp - 1));
task->data[1] = FieldAnimateDoorOpen(*xp, *yp - 1); task->data[1] = FieldAnimateDoorOpen(*xp, *yp - 1);
@@ -798,7 +798,7 @@ static void sub_807E980(u8 taskId)
{ {
case 0: case 0:
ScriptContext2_Enable(); ScriptContext2_Enable();
player_bitmagic(); FreezeEventObjects();
CameraObjectReset2(); CameraObjectReset2();
data[0]++; data[0]++;
break; break;
src/item_use.c
+1 -1
View File
@@ -162,7 +162,7 @@ void sub_80A1184(void)
bool8 sub_80A1194(void) bool8 sub_80A1194(void)
{ {
player_bitmagic(); FreezeEventObjects();
ScriptContext2_Enable(); ScriptContext2_Enable();
sub_807DC00(); sub_807DC00();
CreateTask(sub_80A11C0, 10); CreateTask(sub_80A11C0, 10);
src/map_obj_lock.c
+1 -1
View File
@@ -38,7 +38,7 @@ bool8 sub_8069590(void)
void ScriptFreezeMapObjects(void) void ScriptFreezeMapObjects(void)
{ {
player_bitmagic(); FreezeEventObjects();
CreateTask(sub_8069570, 80); CreateTask(sub_8069570, 80);
} }
src/quest_log.c
+2 -2
View File
@@ -1513,7 +1513,7 @@ static void sub_8111F8C(u8 taskId)
if (ScriptContext2_IsEnabled() != TRUE) if (ScriptContext2_IsEnabled() != TRUE)
{ {
player_bitmagic(); FreezeEventObjects();
sub_805C270(); sub_805C270();
sub_805C780(); sub_805C780();
ScriptContext2_Enable(); ScriptContext2_Enable();
@@ -1536,7 +1536,7 @@ static void sub_8111FCC(u8 taskId)
task->data[0] = 0; task->data[0] = 0;
task->data[1] = 0; task->data[1] = 0;
task->func = sub_8112044; task->func = sub_8112044;
player_bitmagic(); FreezeEventObjects();
ScriptContext2_Enable(); ScriptContext2_Enable();
} }
} }
src/start_menu.c
+1 -1
View File
@@ -392,7 +392,7 @@ void ShowStartMenu(void)
{ {
if (!IsUpdateLinkStateCBActive()) if (!IsUpdateLinkStateCBActive())
{ {
player_bitmagic(); FreezeEventObjects();
sub_805C270(); sub_805C270();
sub_805C780(); sub_805C780();
} }
src/vs_seeker.c
+4 -4
View File
@@ -625,7 +625,7 @@ void sub_810C444(void)
mapObject = &gMapObjects[sp0]; mapObject = &gMapObjects[sp0];
if (sub_810CF04(sp0) == TRUE) if (sub_810CF04(sp0) == TRUE)
{ {
npc_set_running_behaviour_etc(mapObject, r6); SetTrainerMovementType(mapObject, r6);
} }
templates[i].movementType = r6; templates[i].movementType = r6;
} }
@@ -763,7 +763,7 @@ static void sub_810C594(void)
{ {
gSprites[mapObject->spriteId].pos2.x = 0; gSprites[mapObject->spriteId].pos2.x = 0;
gSprites[mapObject->spriteId].pos2.y = 0; gSprites[mapObject->spriteId].pos2.y = 0;
npc_set_running_behaviour_etc(mapObject, r3); SetTrainerMovementType(mapObject, r3);
} }
} }
} }
@@ -1324,7 +1324,7 @@ static bool8 HasRematchTrainerAlreadyBeenFought(const VsSeekerData *vsSeekerData
void sub_810CDE8(void) void sub_810CDE8(void)
{ {
gSaveBlock1Ptr->trainerRematches[gSpecialVar_LastTalked] = 0; gSaveBlock1Ptr->trainerRematches[gSpecialVar_LastTalked] = 0;
sub_80803FC(); SetBattledTrainerFlag();
} }
static s32 sub_810CE10(const VsSeekerData * a0, u16 a1) static s32 sub_810CE10(const VsSeekerData * a0, u16 a1)
@@ -1596,7 +1596,7 @@ static void StartAllRespondantIdleMovements(void)
struct MapObject *r4 = &gMapObjects[sVsSeeker->trainerInfo[j].fieldObjectId]; struct MapObject *r4 = &gMapObjects[sVsSeeker->trainerInfo[j].fieldObjectId];
if (sub_810CF04(sVsSeeker->trainerInfo[j].fieldObjectId) == 1) if (sub_810CF04(sVsSeeker->trainerInfo[j].fieldObjectId) == 1)
npc_set_running_behaviour_etc(r4, sVsSeeker->runningBehaviourEtcArray[i]); SetTrainerMovementType(r4, sVsSeeker->runningBehaviourEtcArray[i]);
sub_805FE7C(r4, sVsSeeker->runningBehaviourEtcArray[i]); sub_805FE7C(r4, sVsSeeker->runningBehaviourEtcArray[i]);
gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[j].localId] = GetNextAvailableRematchTrainer(sVsSeekerData, sVsSeeker->trainerInfo[j].trainerIdx, &dummy); gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[j].localId] = GetNextAvailableRematchTrainer(sVsSeekerData, sVsSeeker->trainerInfo[j].trainerIdx, &dummy);
} }
sym_ewram.txt
+8 -8
View File
@@ -327,31 +327,31 @@ gUnknown_20386A4: @ 20386A4
gUnknown_20386A8: @ 20386A8 gUnknown_20386A8: @ 20386A8
.space 0x4 .space 0x4
gUnknown_20386AC: @ 20386AC sTrainerBattleMode: @ 20386AC
.space 0x2 .space 0x2
gTrainerBattleOpponent_A: @ 20386AE gTrainerBattleOpponent_A: @ 20386AE
.space 0x2 .space 0x2
gUnknown_20386B0: @ 20386B0 sTrainerEventObjectLocalId: @ 20386B0
.space 0x4 .space 0x4
gUnknown_20386B4: @ 20386B4 sTrainerAIntroSpeech: @ 20386B4
.space 0x4 .space 0x4
gUnknown_20386B8: @ 20386B8 sTrainerADefeatSpeech: @ 20386B8
.space 0x4 .space 0x4
gUnknown_20386BC: @ 20386BC sTrainerBDefeatSpeech: @ 20386BC
.space 0x4 .space 0x4
gUnknown_20386C0: @ 20386C0 sTrainerCannotBattleSpeech: @ 20386C0
.space 0x4 .space 0x4
gUnknown_20386C4: @ 20386C4 sTrainerBattleEndScript: @ 20386C4
.space 0x4 .space 0x4
gUnknown_20386C8: @ 20386C8 sTrainerABattleScriptRetAddr: @ 20386C8
.space 0x4 .space 0x4
gUnknown_20386CC: @ 20386CC gUnknown_20386CC: @ 20386CC