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

battle message huge take off

Browse Source
This commit is contained in:
DizzyEggg
2017-10-07 15:15:47 +02:00
parent 07e29b70bc
commit db63fc1a09
12 changed files with 1857 additions and 2829 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_2.s
+2 -2
View File
@@ -20577,7 +20577,7 @@ _081A5328:
movs r0, 0x1
negs r0, r0
strb r0, [r1, 0x1]
ldr r0, =gText_JapaneseHonorific
ldr r0, =gText_PlayerMon1Name
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r4, =gDisplayedStringBattle
adds r0, r4, 0
@@ -20586,7 +20586,7 @@ _081A5328:
ldr r0, =gText_Vs
movs r1, 0x10
bl sub_814F9EC
ldr r0, =gText_RivalBuffer
ldr r0, =gText_OpponentMon1Name
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x11
asm/battle_link_817C95C.s
+7 -7
View File
@@ -665,7 +665,7 @@ _0817D16C:
bl _0817DFAC
.pool
_0817D1B8:
ldr r1, =gUnknown_02022F5C
ldr r1, =gBattleTextBuff1 + 4
ldrb r0, [r1]
cmp r0, 0
beq _0817D1C4
@@ -917,7 +917,7 @@ _0817D3C0:
bne _0817D3CC
bl _0817E0A6
_0817D3CC:
ldr r1, =gUnknown_02022F6A
ldr r1, =gBattleTextBuff2 + 2
ldrh r0, [r1]
cmp r0, 0xD1
bne _0817D3E8
@@ -946,7 +946,7 @@ _0817D3FE:
ldrb r1, [r1]
cmp r0, r1
bne _0817D436
ldr r1, =gUnknown_02022F6A
ldr r1, =gBattleTextBuff2 + 2
ldrh r0, [r1]
cmp r0, 0xD1
bne _0817D42C
@@ -988,7 +988,7 @@ _0817D45C:
bne _0817D468
bl _0817E0A6
_0817D468:
ldr r1, =gUnknown_02022F6A
ldr r1, =gBattleTextBuff2 + 2
ldrh r0, [r1]
cmp r0, 0xD3
bne _0817D484
@@ -2182,7 +2182,7 @@ _0817DE10:
b _0817DFAA
.pool
_0817DE58:
ldr r1, =gUnknown_02022F5A
ldr r1, =gBattleTextBuff1 + 2
ldrh r0, [r1]
cmp r0, 0x73
bne _0817DE82
@@ -2204,7 +2204,7 @@ _0817DE58:
ands r0, r2
strb r0, [r1]
_0817DE82:
ldr r2, =gUnknown_02022F5A
ldr r2, =gBattleTextBuff1 + 2
ldrh r0, [r2]
cmp r0, 0x71
bne _0817DEAA
@@ -2225,7 +2225,7 @@ _0817DE82:
ands r0, r2
strb r0, [r1]
_0817DEAA:
ldr r1, =gUnknown_02022F5A
ldr r1, =gBattleTextBuff1 + 2
ldrh r0, [r1]
cmp r0, 0x36
beq _0817DEB4
asm/battle_message.s
-694
View File
@@ -5,700 +5,6 @@
.text
thumb_func_start BufferStringBattle
BufferStringBattle: @ 814E0C4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
lsls r0, 16
lsrs r6, r0, 16
movs r7, 0
ldr r4, =gStringInfo
ldr r0, =gActiveBank
mov r8, r0
ldrb r1, [r0]
lsls r1, 9
ldr r0, =gBattleBufferA + 4
adds r1, r0
str r1, [r4]
ldr r2, =gLastUsedItem
ldrh r0, [r1, 0x4]
strh r0, [r2]
ldr r2, =gLastUsedAbility
ldrb r0, [r1, 0x6]
strb r0, [r2]
ldr r5, =gBattleScripting
ldrb r0, [r1, 0x7]
strb r0, [r5, 0x17]
ldr r3, =gBattleStruct
ldr r0, [r3]
adds r0, 0x52
ldrb r1, [r1, 0x8]
strb r1, [r0]
ldr r0, [r3]
adds r0, 0xB1
ldr r1, [r4]
ldrb r1, [r1, 0x9]
strb r1, [r0]
ldr r1, =gStringBank
ldr r2, [r4]
ldrb r0, [r2, 0xA]
strb r0, [r1]
ldr r0, [r3]
adds r0, 0x8E
ldrb r1, [r2, 0xB]
strb r1, [r0]
movs r2, 0
mov r12, r8
mov r9, r5
ldr r1, =gBattleTextBuff1
mov r10, r1
ldr r3, =gAbilitiesPerBank
_0814E126:
adds r0, r2, r3
ldr r1, [r4]
adds r1, 0xC
adds r1, r2
ldrb r1, [r1]
strb r1, [r0]
adds r2, 0x1
cmp r2, 0x3
ble _0814E126
movs r2, 0
ldr r0, =gBattleTextBuff1
mov r8, r0
ldr r3, =gStringInfo
ldr r5, =gBattleTextBuff2
ldr r4, =gBattleTextBuff3
_0814E144:
mov r0, r8
adds r1, r2, r0
ldr r0, [r3]
adds r0, 0x10
adds r0, r2
ldrb r0, [r0]
strb r0, [r1]
adds r1, r2, r5
ldr r0, [r3]
adds r0, 0x20
adds r0, r2
ldrb r0, [r0]
strb r0, [r1]
adds r1, r2, r4
ldr r0, [r3]
adds r0, 0x30
adds r0, r2
ldrb r0, [r0]
strb r0, [r1]
adds r2, 0x1
cmp r2, 0xF
ble _0814E144
cmp r6, 0x5
bls _0814E176
b _0814E6B8
_0814E176:
lsls r0, r6, 2
ldr r1, =_0814E1B4
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_0814E1B4:
.4byte _0814E1CC
.4byte _0814E2AC
.4byte _0814E394
.4byte _0814E430
.4byte _0814E4F8
.4byte _0814E55C
_0814E1CC:
ldr r0, =gBattleTypeFlags
ldr r2, [r0]
movs r0, 0x8
ands r0, r2
cmp r0, 0
beq _0814E26C
ldr r0, =0x02000002
ands r0, r2
cmp r0, 0
beq _0814E248
movs r0, 0x80
lsls r0, 16
ands r0, r2
cmp r0, 0
bne _0814E260
movs r0, 0x40
ands r0, r2
cmp r0, 0
beq _0814E214
movs r0, 0x80
lsls r0, 17
ands r2, r0
ldr r7, =gText_TwoTrainersWantToBattle
cmp r2, 0
bne _0814E200
b _0814E6D8
_0814E200:
ldr r7, =gText_TwoTrainersWantToBattle3
b _0814E6D8
.pool
_0814E214:
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0xC0
lsls r0, 4
cmp r1, r0
bne _0814E22C
ldr r7, =gText_TrainerXYWantsToBattle
b _0814E6D8
.pool
_0814E22C:
movs r0, 0x80
lsls r0, 17
ands r2, r0
ldr r7, =gText_TrainerXWantsToBattle
cmp r2, 0
bne _0814E23A
b _0814E6D8
_0814E23A:
ldr r7, =gText_TrainerWantsToBattle
b _0814E6D8
.pool
_0814E248:
movs r0, 0x80
lsls r0, 15
ands r0, r2
cmp r0, 0
bne _0814E260
movs r0, 0x80
lsls r0, 8
ands r2, r0
ldr r7, =gText_TrainerXYWantsToBattle
cmp r2, 0
bne _0814E260
b _0814E6D8
_0814E260:
ldr r7, =gText_TwoTrainersWantToBattle2
b _0814E6D8
.pool
_0814E26C:
movs r0, 0x80
lsls r0, 6
ands r0, r2
cmp r0, 0
beq _0814E280
ldr r7, =gText_WildPkmnAppeared2
b _0814E6D8
.pool
_0814E280:
movs r0, 0x1
ands r0, r2
cmp r0, 0
beq _0814E290
ldr r7, =gText_TwoWildPkmnAppeared
b _0814E6D8
.pool
_0814E290:
movs r0, 0x80
lsls r0, 2
ands r2, r0
ldr r7, =gText_WildPkmnAppeared
cmp r2, 0
bne _0814E29E
b _0814E6D8
_0814E29E:
ldr r7, =gText_WildPkmnAppearedPause
b _0814E6D8
.pool
_0814E2AC:
mov r1, r12
ldrb r0, [r1]
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0814E310
ldr r0, =gBattleTypeFlags
ldr r1, [r0]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _0814E308
movs r0, 0x80
lsls r0, 15
ands r0, r1
cmp r0, 0
beq _0814E2DC
ldr r7, =gText_TrainerXYSentOutZGoN
b _0814E6D8
.pool
_0814E2DC:
movs r0, 0x80
lsls r0, 8
ands r0, r1
cmp r0, 0
beq _0814E2F0
ldr r7, =gText_GoTwoPkmn
b _0814E6D8
.pool
_0814E2F0:
movs r0, 0x40
ands r1, r0
ldr r7, =gText_GoTwoPkmn
cmp r1, 0
bne _0814E2FC
b _0814E6D8
_0814E2FC:
ldr r7, =gText_EnemySentOutPkmnGoPkmn
b _0814E6D8
.pool
_0814E308:
ldr r7, =gText_GoPkmn
b _0814E6D8
.pool
_0814E310:
ldr r0, =gBattleTypeFlags
ldr r1, [r0]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _0814E368
movs r0, 0x80
lsls r0, 8
ands r0, r1
cmp r0, 0
bne _0814E330
movs r0, 0x80
lsls r0, 16
ands r0, r1
cmp r0, 0
beq _0814E33C
_0814E330:
ldr r7, =gText_TwoTrainersSentPkmn
b _0814E6D8
.pool
_0814E33C:
movs r0, 0x40
ands r0, r1
cmp r0, 0
beq _0814E34C
ldr r7, =gText_TwoTrainersSentOutPkmn
b _0814E6D8
.pool
_0814E34C:
ldr r0, =0x02000002
ands r1, r0
ldr r7, =gText_TrainerXYSentOutTwoPkmn
cmp r1, 0
bne _0814E358
b _0814E6D8
_0814E358:
ldr r7, =gText_TrainerXSentOutTwoPkmn
b _0814E6D8
.pool
_0814E368:
ldr r0, =0x02000002
ands r1, r0
cmp r1, 0
beq _0814E380
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0xC0
lsls r0, 4
ldr r7, =gText_TrainerXSentOutPkmn
cmp r1, r0
beq _0814E380
b _0814E6D8
_0814E380:
ldr r7, =gText_TrainerXYSentOutPkmn
b _0814E6D8
.pool
_0814E394:
mov r1, r12
ldrb r0, [r1]
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0814E3EC
ldr r0, =gBattleStruct
ldr r0, [r0]
adds r0, 0xB1
ldrb r2, [r0]
cmp r2, 0
bne _0814E3BC
ldr r7, =gText_PkmnThatsEnough
b _0814E6D8
.pool
_0814E3BC:
cmp r2, 0x1
beq _0814E3CC
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq _0814E3D8
_0814E3CC:
ldr r7, =gText_PkmnComeBack
b _0814E6D8
.pool
_0814E3D8:
ldr r7, =gText_PkmnGoodComeBack
cmp r2, 0x2
beq _0814E3E0
b _0814E6D8
_0814E3E0:
ldr r7, =gText_PkmnOkComeBack
b _0814E6D8
.pool
_0814E3EC:
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 4
ldr r2, =gBattleTypeFlags
cmp r1, r0
beq _0814E406
ldr r0, [r2]
movs r1, 0x80
lsls r1, 18
ands r0, r1
cmp r0, 0
beq _0814E428
_0814E406:
ldr r0, [r2]
movs r1, 0x40
ands r0, r1
ldr r7, =gText_TrainerXWithdrewPkmn
cmp r0, 0
bne _0814E414
b _0814E6D8
_0814E414:
ldr r7, =gText_TrainerXWithdrewPkmn2
b _0814E6D8
.pool
_0814E428:
ldr r7, =gText_TrainerXYWithdrewPkmn
b _0814E6D8
.pool
_0814E430:
mov r4, r9
ldrb r0, [r4, 0x17]
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0814E488
ldr r0, =gBattleStruct
ldr r0, [r0]
adds r0, 0xB1
ldrb r2, [r0]
cmp r2, 0
beq _0814E456
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq _0814E468
_0814E456:
ldr r7, =gText_GoPkmn2
b _0814E6D8
.pool
_0814E468:
cmp r2, 0x1
bne _0814E474
ldr r7, =gText_DoItPkmn
b _0814E6D8
.pool
_0814E474:
ldr r7, =gText_YourFoesWeakGetEmPkmn
cmp r2, 0x2
beq _0814E47C
b _0814E6D8
_0814E47C:
ldr r7, =gText_GoForItPkmn
b _0814E6D8
.pool
_0814E488:
ldr r0, =gBattleTypeFlags
ldr r1, [r0]
ldr r0, =0x02000002
ands r0, r1
cmp r0, 0
beq _0814E4DC
movs r0, 0x80
lsls r0, 16
ands r0, r1
cmp r0, 0
beq _0814E4AC
ldrb r0, [r4, 0x17]
b _0814E4EA
.pool
_0814E4AC:
movs r0, 0x40
ands r1, r0
cmp r1, 0
beq _0814E4BC
ldr r7, =gText_TrainerXSentOutPkmn3
b _0814E6D8
.pool
_0814E4BC:
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0xC0
lsls r0, 4
ldr r7, =gText_TrainerXSentOutPkmn2
cmp r1, r0
beq _0814E4CC
b _0814E6D8
_0814E4CC:
ldr r7, =gText_TrainerXYSentOutPkmn2
b _0814E6D8
.pool
_0814E4DC:
movs r0, 0x80
lsls r0, 8
ands r1, r0
cmp r1, 0
beq _0814E4CC
mov r1, r9
ldrb r0, [r1, 0x17]
_0814E4EA:
ldr r7, =gText_TrainerXYSentOutPkmn3
cmp r0, 0x1
beq _0814E4F2
b _0814E6D8
_0814E4F2:
b _0814E4CC
.pool
_0814E4F8:
mov r0, r10
bl sub_814F8F8
ldr r0, =gStringInfo
ldr r2, [r0]
ldrh r1, [r2]
movs r0, 0xB1
lsls r0, 1
cmp r1, r0
bls _0814E534
ldr r0, =gBattleTextBuff2
ldr r1, =gBattleStruct
ldr r1, [r1]
adds r1, 0x8E
ldrb r2, [r1]
lsls r1, r2, 4
adds r1, r2
ldr r2, =gText_UnknownMoveTypes
adds r1, r2
bl StringCopy
b _0814E544
.pool
_0814E534:
ldr r0, =gBattleTextBuff2
ldrh r2, [r2]
movs r1, 0xD
muls r1, r2
ldr r2, =gMoveNames
adds r1, r2
bl StringCopy
_0814E544:
ldr r0, =gBattleTextBuff2
bl sub_814F950
ldr r7, =gText_XUsedY2
b _0814E6D8
.pool
_0814E55C:
ldr r4, =gBattleTextBuff1
ldrb r1, [r4]
movs r0, 0x80
ands r0, r1
cmp r0, 0
beq _0814E5C4
movs r0, 0x7F
ands r0, r1
strb r0, [r4]
mov r1, r12
ldrb r0, [r1]
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0814E58A
ldrb r1, [r4]
cmp r1, 0x3
beq _0814E58A
movs r0, 0x3
eors r0, r1
strb r0, [r4]
_0814E58A:
ldr r0, =gBattleTextBuff1
ldrb r0, [r0]
subs r0, 0x2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bhi _0814E5A4
ldr r7, =gText_GotAwaySafely
b _0814E6D8
.pool
_0814E5A4:
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
ldr r7, =gText_WildFled
cmp r0, 0
bne _0814E5B4
b _0814E6D8
_0814E5B4:
ldr r7, =gText_TwoWildFled
b _0814E6D8
.pool
_0814E5C4:
mov r1, r12
ldrb r0, [r1]
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0814E5E0
ldrb r1, [r4]
cmp r1, 0x3
beq _0814E5E0
movs r0, 0x3
eors r0, r1
strb r0, [r4]
_0814E5E0:
ldr r0, =gBattleTypeFlags
ldr r1, [r0]
movs r0, 0x40
ands r0, r1
cmp r0, 0
beq _0814E638
ldr r0, =gBattleTextBuff1
ldrb r0, [r0]
cmp r0, 0x2
beq _0814E628
cmp r0, 0x2
bgt _0814E608
cmp r0, 0x1
beq _0814E60E
b _0814E6D8
.pool
_0814E608:
cmp r0, 0x3
beq _0814E630
b _0814E6D8
_0814E60E:
movs r0, 0x80
lsls r0, 16
ands r1, r0
ldr r7, =gText_PlayerBeatTwo
cmp r1, 0
beq _0814E6D8
ldr r7, =gText_TwoEnemiesDefeated
b _0814E6D8
.pool
_0814E628:
ldr r7, =gText_PlayerLostToTwo
b _0814E6D8
.pool
_0814E630:
ldr r7, =gText_PlayerBattledToDrawVsTwo
b _0814E6D8
.pool
_0814E638:
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0xC0
lsls r0, 4
cmp r1, r0
bne _0814E680
ldr r0, =gBattleTextBuff1
ldrb r0, [r0]
cmp r0, 0x2
beq _0814E670
cmp r0, 0x2
bgt _0814E660
cmp r0, 0x1
beq _0814E666
b _0814E6D8
.pool
_0814E660:
cmp r0, 0x3
beq _0814E678
b _0814E6D8
_0814E666:
ldr r7, =gText_PlayerDefeatedXY
b _0814E6D8
.pool
_0814E670:
ldr r7, =gText_PlayerLostAgainst2
b _0814E6D8
.pool
_0814E678:
ldr r7, =gText_PlayerBattledToDraw2
b _0814E6D8
.pool
_0814E680:
ldr r0, =gBattleTextBuff1
ldrb r0, [r0]
cmp r0, 0x2
beq _0814E6A8
cmp r0, 0x2
bgt _0814E698
cmp r0, 0x1
beq _0814E69E
b _0814E6D8
.pool
_0814E698:
cmp r0, 0x3
beq _0814E6B0
b _0814E6D8
_0814E69E:
ldr r7, =gText_PlayerDefeated
b _0814E6D8
.pool
_0814E6A8:
ldr r7, =gText_PlayerLostAgainst
b _0814E6D8
.pool
_0814E6B0:
ldr r7, =gText_PlayerBattledToDraw
b _0814E6D8
.pool
_0814E6B8:
movs r0, 0xBE
lsls r0, 1
cmp r6, r0
bls _0814E6CC
ldr r1, =gDisplayedStringBattle
movs r0, 0xFF
strb r0, [r1]
b _0814E6DE
.pool
_0814E6CC:
ldr r1, =gBattleStringsTable
adds r0, r6, 0
subs r0, 0xC
lsls r0, 2
adds r0, r1
ldr r7, [r0]
_0814E6D8:
adds r0, r7, 0
bl BattleStringExpandPlaceholdersToDisplayedString
_0814E6DE:
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end BufferStringBattle
thumb_func_start BattleStringExpandPlaceholdersToDisplayedString
BattleStringExpandPlaceholdersToDisplayedString: @ 814E6F0
push {lr}