dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

battle 4 up to a8

Browse Source
This commit is contained in:
DizzyEggg
2017-09-26 22:39:59 +02:00
parent 52a951276f
commit d769ec1374
52 changed files with 3497 additions and 8242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_2.s
+62 -62
View File
@@ -157,13 +157,13 @@ _080368BE:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E20
strh r1, [r0]
@@ -3925,19 +3925,19 @@ _08038A3A:
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
@@ -4371,13 +4371,13 @@ _08038E1A:
strh r4, [r0]
ldr r0, =gUnknown_02022E16
strh r4, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E20
strh r4, [r0]
@@ -4842,13 +4842,13 @@ sub_80392A8: @ 80392A8
strh r4, [r0]
ldr r0, =gUnknown_02022E16
strh r4, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E20
strh r4, [r0]
@@ -5215,7 +5215,7 @@ _08039678:
bl PlaySE
ldr r0, =gText_BattleRecordedOnPass
_08039686:
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
@@ -7806,7 +7806,7 @@ _0803ABD4:
movs r0, 0
movs r1, 0
movs r2, 0
bl EmitGetAttributes
bl EmitGetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
ldrb r0, [r5]
@@ -7849,7 +7849,7 @@ bc_load_battlefield: @ 803AC34
cmp r5, 0
bne _0803AC64
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r4, =gActiveBank
strb r0, [r4]
ldr r0, =gUnknown_02022FF0
@@ -8274,7 +8274,7 @@ _0803AFFA:
cmp r7, 0x5
ble _0803AFAA
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r4, =gActiveBank
strb r0, [r4]
movs r0, 0
@@ -8326,7 +8326,7 @@ _0803B072:
cmp r7, 0x5
ble _0803B026
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r4, =gActiveBank
strb r0, [r4]
movs r0, 0
@@ -8404,7 +8404,7 @@ bc_battle_begin_message: @ 803B120
cmp r0, 0
bne _0803B142
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gActiveBank
strb r0, [r1]
ldrb r1, [r1]
@@ -8468,7 +8468,7 @@ sub_803B180: @ 803B180
_0803B1B8:
movs r0, 0x1
_0803B1BA:
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -8738,7 +8738,7 @@ _0803B3F6:
cmp r0, 0
bne _0803B412
adds r0, r3, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -9241,7 +9241,7 @@ _0803B7EA:
ldr r1, =gBattleMainFunc
ldr r0, =sub_803BE74
str r0, [r1]
bl sub_803F988
bl ResetSentPokesToOpponentValue
ldr r1, =gBattleCommunication
movs r2, 0
adds r0, r1, 0x7
@@ -9588,8 +9588,8 @@ _0803BB78:
.pool
thumb_func_end BattleTurnPassed
thumb_func_start sub_803BB88
sub_803BB88: @ 803BB88
thumb_func_start IsRunningFromBattleImpossible
IsRunningFromBattleImpossible: @ 803BB88
push {r4-r7,lr}
sub sp, 0x4
ldr r1, =gBattleMons
@@ -9830,7 +9830,7 @@ _0803BD92:
pop {r1}
bx r1
.pool
thumb_func_end sub_803BB88
thumb_func_end IsRunningFromBattleImpossible
thumb_func_start sub_803BDA0
sub_803BDA0: @ 803BDA0
@@ -10013,7 +10013,7 @@ _0803BF0C:
beq _0803BF68
eors r5, r1
adds r0, r5, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, [r4]
adds r1, 0x91
ldrb r1, [r1]
@@ -10027,7 +10027,7 @@ _0803BF0C:
bne _0803BF68
ldr r4, =gBattleCommunication
adds r0, r5, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -10612,7 +10612,7 @@ _0803C4B4:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -10625,7 +10625,7 @@ _0803C4B4:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattleMons
lsls r0, 24
lsrs r0, 24
@@ -10645,7 +10645,7 @@ _0803C4B4:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
muls r0, r7
@@ -10670,7 +10670,7 @@ _0803C550:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -10682,7 +10682,7 @@ _0803C550:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
@@ -10695,7 +10695,7 @@ _0803C590:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -10712,7 +10712,7 @@ _0803C5B6:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -10725,7 +10725,7 @@ _0803C5B6:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 20
adds r0, r4
@@ -10739,7 +10739,7 @@ _0803C5B6:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -10771,7 +10771,7 @@ _0803C628:
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -10788,7 +10788,7 @@ _0803C628:
_0803C668:
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -10803,7 +10803,7 @@ _0803C690:
eors r0, r1
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
@@ -10873,7 +10873,7 @@ _0803C720:
b _0803CC20
.pool
_0803C760:
bl sub_803BB88
bl IsRunningFromBattleImpossible
lsls r0, 24
cmp r0, 0
beq _0803C7C4
@@ -11271,7 +11271,7 @@ _0803CAFA:
bne _0803CB3C
adds r0, r5, 0
eors r0, r1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattleStruct
ldr r1, [r1]
adds r1, 0x91
@@ -12870,7 +12870,7 @@ sub_803D8C0: @ 803D8C0
ldrb r0, [r4]
strb r0, [r1]
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankAttacker
strb r0, [r1]
ldr r1, =gBattlescriptCurrInstr
@@ -13075,7 +13075,7 @@ _0803DB44:
ldrb r0, [r4]
strb r0, [r1]
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankAttacker
strb r0, [r1]
ldr r1, =gBattlescriptCurrInstr
@@ -14124,7 +14124,7 @@ _0803E548:
_0803E558:
movs r0, 0x2
_0803E55A:
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankTarget
strb r0, [r1]
b _0803E578
@@ -14173,7 +14173,7 @@ _0803E5C4:
eors r0, r1
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r5]
ldrb r1, [r7]
ldrb r2, [r5]
@@ -14257,7 +14257,7 @@ _0803E684:
_0803E694:
movs r0, 0x2
_0803E696:
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankTarget
strb r0, [r1]
ldr r0, =gAbsentBankFlags
@@ -14323,7 +14323,7 @@ _0803E730:
eors r0, r1
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r5]
ldrb r1, [r6]
ldrb r2, [r5]
@@ -14341,7 +14341,7 @@ _0803E758:
eors r0, r1
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r5]
_0803E76A:
ldr r0, =gBattleTypeFlags
@@ -14823,8 +14823,8 @@ _0803EBF6:
.pool
thumb_func_end sub_803E90C
thumb_func_start sub_803EC20
sub_803EC20: @ 803EC20
thumb_func_start CanRunFromBattle
CanRunFromBattle: @ 803EC20
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -15069,7 +15069,7 @@ _0803EE24:
pop {r1}
bx r1
.pool
thumb_func_end sub_803EC20
thumb_func_end CanRunFromBattle
thumb_func_start sub_803EE48
sub_803EE48: @ 803EE48
@@ -15157,7 +15157,7 @@ _0803EF0C:
cmp r0, 0
bne _0803EF4C
ldrb r0, [r4]
bl sub_803EC20
bl CanRunFromBattle
lsls r0, 24
cmp r0, 0
bne _0803EF98
@@ -15690,7 +15690,7 @@ _0803F46C:
_0803F470:
movs r0, 0x3
_0803F472:
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
_0803F47A:
@@ -15786,7 +15786,7 @@ _0803F4DE:
movs r0, 0
movs r2, 0
movs r3, 0x1
bl EmitSetAttributes
bl EmitSetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
_0803F532:
@@ -15933,7 +15933,7 @@ _0803F5F0:
movs r0, 0
movs r2, 0
movs r3, 0x1
bl EmitSetAttributes
bl EmitSetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
_0803F658:
@@ -16065,7 +16065,7 @@ _0803F6FE:
movs r0, 0
movs r2, 0
movs r3, 0x1
bl EmitSetAttributes
bl EmitSetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
_0803F762:
@@ -16319,8 +16319,8 @@ PrepareStringBattle: @ 803F964
.pool
thumb_func_end PrepareStringBattle
thumb_func_start sub_803F988
sub_803F988: @ 803F988
thumb_func_start ResetSentPokesToOpponentValue
ResetSentPokesToOpponentValue: @ 803F988
push {r4-r6,lr}
movs r3, 0
ldr r0, =gSentPokesToOpponent
@@ -16368,7 +16368,7 @@ _0803F9D6:
pop {r0}
bx r0
.pool
thumb_func_end sub_803F988
thumb_func_end ResetSentPokesToOpponentValue
thumb_func_start sub_803F9EC
sub_803F9EC: @ 803F9EC