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

Extract baseroms from battle_message and rename strings

Browse Source
This commit is contained in:
Diegoisawesome
2017-09-19 19:31:53 -05:00
parent 3d32be86fc
commit fcc94f9722
15 changed files with 525 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
asm/battle_1.s
View File

@@ -1886,7 +1886,7 @@ sub_8035C4C: @ 8035C4C
ldrb r2, [r0]
cmp r2, 0x3
bne _08035C68
ldr r0, =gUnknown_085CCBAD
ldr r0, =gText_Draw
movs r1, 0x15
bl battle_show_message_maybe
b _08035D68
@@ -1962,10 +1962,10 @@ _08035CE2:
cmp r0, 0
beq _08035D36
_08035CFC:
ldr r0, =gUnknown_085CCB9E
ldr r0, =gText_Win
movs r1, 0x17
bl battle_show_message_maybe
ldr r0, =gUnknown_085CCBA5
ldr r0, =gText_Loss
movs r1, 0x16
bl battle_show_message_maybe
b _08035D68
@@ -1983,19 +1983,19 @@ _08035D20:
cmp r0, 0
beq _08035D58
_08035D36:
ldr r0, =gUnknown_085CCB9E
ldr r0, =gText_Win
movs r1, 0x16
bl battle_show_message_maybe
ldr r0, =gUnknown_085CCBA5
ldr r0, =gText_Loss
movs r1, 0x17
bl battle_show_message_maybe
b _08035D68
.pool
_08035D58:
ldr r0, =gUnknown_085CCB9E
ldr r0, =gText_Win
movs r1, 0x17
bl battle_show_message_maybe
ldr r0, =gUnknown_085CCBA5
ldr r0, =gText_Loss
movs r1, 0x16
bl battle_show_message_maybe
_08035D68:

6
asm/battle_2.s
View File

@@ -4995,7 +4995,7 @@ _08039470:
beq _0803947E
b _0803975E
_0803947E:
ldr r0, =gUnknown_085CD28F
ldr r0, =gText_RecordBattleToPass
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gBattleCommunication
@@ -5018,7 +5018,7 @@ _080394AC:
movs r2, 0x1D
movs r3, 0xD
bl sub_8056A3C
ldr r0, =gUnknown_085CCABB
ldr r0, =gText_BattleYesNoChoice
movs r1, 0xC
bl battle_show_message_maybe
ldr r4, =gBattleCommunication
@@ -5213,7 +5213,7 @@ _08039678:
bne _080396A0
movs r0, 0x37
bl PlaySE
ldr r0, =gUnknown_085CD2CB
ldr r0, =gText_BattleRecordedOnPass
_08039686:
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle

10
asm/battle_4.s
View File

@@ -14790,7 +14790,7 @@ _0804E084:
movs r2, 0x1D
movs r3, 0xD
bl sub_8056A3C
ldr r0, =gUnknown_085CCABB
ldr r0, =gText_BattleYesNoChoice
movs r1, 0xC
bl battle_show_message_maybe
ldr r1, =gBattleScripting
@@ -15154,7 +15154,7 @@ _0804E3E0:
movs r2, 0x1D
movs r3, 0xD
bl sub_8056A3C
ldr r0, =gUnknown_085CCABB
ldr r0, =gText_BattleYesNoChoice
movs r1, 0xC
bl battle_show_message_maybe
ldrb r0, [r5, 0x1F]
@@ -16078,7 +16078,7 @@ _0804EBD8:
movs r2, 0x1D
movs r3, 0xD
bl sub_8056A3C
ldr r0, =gUnknown_085CCABB
ldr r0, =gText_BattleYesNoChoice
movs r1, 0xC
bl battle_show_message_maybe
ldrb r0, [r5]
@@ -17915,7 +17915,7 @@ _0804FC32:
bl sub_81A5D44
b _0804FD70
_0804FC38:
ldr r1, =gUnknown_085CD1C8
ldr r1, =gRefereeStringsTable
ldr r0, =gBattlescriptCurrInstr
ldr r0, [r0]
ldrb r0, [r0, 0x1]
@@ -30831,7 +30831,7 @@ _08056C2C:
movs r2, 0x1D
movs r3, 0xD
bl sub_8056A3C
ldr r0, =gUnknown_085CCABB
ldr r0, =gText_BattleYesNoChoice
movs r1, 0xC
bl battle_show_message_maybe
ldr r1, =gBattleCommunication

14
asm/battle_controller_player.s
View File

@@ -1245,7 +1245,7 @@ _08057F80:
ldrb r0, [r0]
movs r1, 0x1B
bl battle_menu_cursor_related_2
ldr r0, =gUnknown_085CCACA
ldr r0, =gText_BattleSwitchWhich
movs r1, 0xB
bl battle_show_message_maybe
ldr r1, =gBattleBankFunc
@@ -4377,7 +4377,7 @@ _08059AF4:
sub_8059B18: @ 8059B18
push {r4,lr}
ldr r4, =gDisplayedStringBattle
ldr r1, =gUnknown_085CCA6F
ldr r1, =gText_MoveInterfacePP
adds r0, r4, 0
bl StringCopy
adds r0, r4, 0
@@ -4449,7 +4449,7 @@ sub_8059BB0: @ 8059BB0
ldr r0, =gBattleBufferA + 4
adds r4, r0
ldr r6, =gDisplayedStringBattle
ldr r1, =gUnknown_085CCA73
ldr r1, =gText_MoveInterfaceType
adds r0, r6, 0
bl StringCopy
movs r1, 0xFC
@@ -4716,7 +4716,7 @@ b_link_standby_message: @ 8059DC0
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_085CCA29
ldr r0, =gText_LinkStandby
movs r1, 0
bl battle_show_message_maybe
_08059DE0:
@@ -8532,7 +8532,7 @@ dp01t_12_6_battle_menu: @ 805C044
ldr r1, =sub_805C004
str r1, [r0]
bl sub_817F2A8
ldr r0, =gUnknown_085CCA3A
ldr r0, =gText_BattleMenu
movs r1, 0x2
bl battle_show_message_maybe
movs r4, 0
@@ -8550,7 +8550,7 @@ _0805C062:
ldrb r0, [r0]
movs r1, 0
bl sub_8059CB4
ldr r0, =gUnknown_085CC9F3
ldr r0, =gText_WhatWillPkmnDo
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0x1
@@ -8578,7 +8578,7 @@ sub_805C0B0: @ 805C0B0
movs r2, 0x1D
movs r3, 0xD
bl sub_8056A3C
ldr r0, =gUnknown_085CCABB
ldr r0, =gText_BattleYesNoChoice
movs r1, 0xC
bl battle_show_message_maybe
ldr r1, =gUnknown_03005D74

4
asm/battle_controller_safari.s
View File

@@ -860,7 +860,7 @@ sub_8159A94: @ 8159A94
adds r0, r1
ldr r1, =sub_8159A54
str r1, [r0]
ldr r0, =gUnknown_085CCA54
ldr r0, =gText_SafariZoneMenu
movs r1, 0x2
bl battle_show_message_maybe
movs r4, 0
@@ -878,7 +878,7 @@ _08159AAE:
ldrb r0, [r0]
movs r1, 0
bl sub_8059CB4
ldr r0, =gUnknown_085CCA04
ldr r0, =gText_WhatWillPkmnDo2
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0x1

4
asm/battle_controller_wally.s
View File

@@ -3674,7 +3674,7 @@ dp01t_12_1_battle_menu: @ 816A470
adds r0, r1
ldr r1, =sub_816A430
str r1, [r0]
ldr r0, =gUnknown_085CCA3A
ldr r0, =gText_BattleMenu
movs r1, 0x2
bl battle_show_message_maybe
movs r4, 0
@@ -3692,7 +3692,7 @@ _0816A48A:
ldrb r0, [r0]
movs r1, 0
bl sub_8059CB4
ldr r0, =gUnknown_085CCA15
ldr r0, =gText_WhatWillWallyDo
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0x1

6
asm/battle_frontier_1.s
View File

@@ -1802,7 +1802,7 @@ _0818F974:
sub_818F9B0: @ 818F9B0
push {lr}
ldr r0, =gStringVar1
ldr r2, =gUnknown_085CCD20
ldr r2, =gRoundsStringTable
ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
ldr r3, =0x00000cb2
@@ -1821,7 +1821,7 @@ sub_818F9B0: @ 818F9B0
sub_818F9E0: @ 818F9E0
push {lr}
ldr r0, =gStringVar1
ldr r2, =gUnknown_085CCD20
ldr r2, =gRoundsStringTable
ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
ldr r3, =0x00000cb2
@@ -10605,7 +10605,7 @@ _081944FC:
movs r2, 0
movs r1, 0x2
strb r1, [r0, 0x5]
ldr r0, =gUnknown_085CCCEE
ldr r0, =gText_BattleTourney
str r0, [sp, 0x4]
add r0, sp, 0x4
strb r1, [r0, 0x4]

42
asm/battle_frontier_2.s
View File

@@ -18104,7 +18104,7 @@ _081A3E38:
cmp r5, r4
bne _081A3E50
ldr r0, =gStringVar1
ldr r1, =gUnknown_085CCB79
ldr r1, =gText_SpaceAndSpace
bl StringAppend
b _081A3EC8
.pool
@@ -18112,7 +18112,7 @@ _081A3E50:
cmp r5, r4
ble _081A3EC8
ldr r0, =gStringVar1
ldr r1, =gUnknown_085CCB7F
ldr r1, =gText_CommaSpace
bl StringAppend
b _081A3EC8
.pool
@@ -18120,17 +18120,17 @@ _081A3E68:
cmp r4, r5
bne _081A3E80
ldr r0, =gStringVar1
ldr r1, =gUnknown_085CCB79
ldr r1, =gText_SpaceAndSpace
bl StringAppend
b _081A3E88
.pool
_081A3E80:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085CCB7F
ldr r1, =gText_CommaSpace
bl StringAppend
_081A3E88:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085CCB86
ldr r1, =gText_NewLine
bl StringAppend
b _081A3EC8
.pool
@@ -18138,17 +18138,17 @@ _081A3EA0:
cmp r4, r5
bne _081A3EB8
ldr r0, =gStringVar1
ldr r1, =gUnknown_085CCB79
ldr r1, =gText_SpaceAndSpace
bl StringAppend
b _081A3EC0
.pool
_081A3EB8:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085CCB7F
ldr r1, =gText_CommaSpace
bl StringAppend
_081A3EC0:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085CCB84
ldr r1, =gText_ScrollTextUp
bl StringAppend
_081A3EC8:
ldr r0, =gStringVar1
@@ -18495,10 +18495,10 @@ _081A416A:
cmp r4, 0
bne _081A41A4
ldr r4, =gStringVar1
ldr r1, =gUnknown_085CCB82
ldr r1, =gText_Space2
adds r0, r4, 0
bl StringAppend
ldr r1, =gUnknown_085CCB88
ldr r1, =gText_Are
adds r0, r4, 0
bl StringAppend
b _081A4202
@@ -18509,17 +18509,17 @@ _081A41A4:
cmp r0, 0
beq _081A41C0
ldr r0, =gStringVar1
ldr r1, =gUnknown_085CCB84
ldr r1, =gText_ScrollTextUp
bl StringAppend
b _081A41C8
.pool
_081A41C0:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085CCB82
ldr r1, =gText_Space2
bl StringAppend
_081A41C8:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085CCB8C
ldr r1, =gText_Are2
bl StringAppend
b _081A4202
.pool
@@ -20577,30 +20577,30 @@ _081A5328:
movs r0, 0x1
negs r0, r0
strb r0, [r1, 0x1]
ldr r0, =gUnknown_085CCDB2
ldr r0, =gText_JapaneseHonorific
bl StrCpyDecodeToDisplayedStringBattle
ldr r4, =gDisplayedStringBattle
adds r0, r4, 0
movs r1, 0xF
bl battle_show_message_maybe
ldr r0, =gUnknown_085CCDB5
ldr r0, =gText_Vs
movs r1, 0x10
bl battle_show_message_maybe
ldr r0, =gUnknown_085CCDB8
ldr r0, =gText_RivalBuffer
bl StrCpyDecodeToDisplayedStringBattle
adds r0, r4, 0
movs r1, 0x11
bl battle_show_message_maybe
ldr r0, =gUnknown_085CCDBB
ldr r0, =gText_Mind
movs r1, 0x12
bl battle_show_message_maybe
ldr r0, =gUnknown_085CCDC0
ldr r0, =gText_Skill
movs r1, 0x13
bl battle_show_message_maybe
ldr r0, =gUnknown_085CCDC6
ldr r0, =gText_Body
movs r1, 0x14
bl battle_show_message_maybe
ldr r0, =gUnknown_085CCDCB
ldr r0, =gText_Judgement
bl StrCpyDecodeToDisplayedStringBattle
adds r0, r4, 0
movs r1, 0x15
@@ -20684,7 +20684,7 @@ _081A544C:
_081A5464:
movs r3, 0x1
bl sub_81A5558
ldr r0, =gUnknown_085CCDCB
ldr r0, =gText_Judgement
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0x15

4
asm/battle_interface.s
View File

@@ -4375,7 +4375,7 @@ sub_8074770: @ 8074770
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_085CCB2C
ldr r0, =gText_SafariBalls
add r1, sp, 0x4
str r1, [sp]
movs r1, 0
@@ -4419,7 +4419,7 @@ sub_80747D8: @ 80747D8
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gUnknown_085CCB3C
ldr r1, =gText_SafariBallLeft
add r0, sp, 0x4
bl StringCopy
ldr r1, =gNumSafariBalls

178
asm/battle_message.s
View File

@@ -136,12 +136,12 @@ _0814E1CC:
movs r0, 0x80
lsls r0, 17
ands r2, r0
ldr r7, =gUnknown_085CBBCD
ldr r7, =gText_TwoTrainersWantToBattle
cmp r2, 0
bne _0814E200
b _0814E6D8
_0814E200:
ldr r7, =gUnknown_085CD318
ldr r7, =gText_TwoTrainersWantToBattle3
b _0814E6D8
.pool
_0814E214:
@@ -151,19 +151,19 @@ _0814E214:
lsls r0, 4
cmp r1, r0
bne _0814E22C
ldr r7, =gUnknown_085CBB9C
ldr r7, =gText_TrainerXYWantsToBattle
b _0814E6D8
.pool
_0814E22C:
movs r0, 0x80
lsls r0, 17
ands r2, r0
ldr r7, =gUnknown_085CBBB9
ldr r7, =gText_TrainerXWantsToBattle
cmp r2, 0
bne _0814E23A
b _0814E6D8
_0814E23A:
ldr r7, =gUnknown_085CD301
ldr r7, =gText_TrainerWantsToBattle
b _0814E6D8
.pool
_0814E248:
@@ -175,12 +175,12 @@ _0814E248:
movs r0, 0x80
lsls r0, 8
ands r2, r0
ldr r7, =gUnknown_085CBB9C
ldr r7, =gText_TrainerXYWantsToBattle
cmp r2, 0
bne _0814E260
b _0814E6D8
_0814E260:
ldr r7, =gUnknown_085CCE17
ldr r7, =gText_TwoTrainersWantToBattle2
b _0814E6D8
.pool
_0814E26C:
@@ -189,7 +189,7 @@ _0814E26C:
ands r0, r2
cmp r0, 0
beq _0814E280
ldr r7, =gUnknown_085CBB5A
ldr r7, =gText_WildPkmnAppeared2
b _0814E6D8
.pool
_0814E280:
@@ -197,19 +197,19 @@ _0814E280:
ands r0, r2
cmp r0, 0
beq _0814E290
ldr r7, =gUnknown_085CBB82
ldr r7, =gText_TwoWildPkmnAppeared
b _0814E6D8
.pool
_0814E290:
movs r0, 0x80
lsls r0, 2
ands r2, r0
ldr r7, =gUnknown_085CBB47
ldr r7, =gText_WildPkmnAppeared
cmp r2, 0
bne _0814E29E
b _0814E6D8
_0814E29E:
ldr r7, =gUnknown_085CBB6D
ldr r7, =gText_WildPkmnAppearedPause
b _0814E6D8
.pool
_0814E2AC:
@@ -230,7 +230,7 @@ _0814E2AC:
ands r0, r1
cmp r0, 0
beq _0814E2DC
ldr r7, =gUnknown_085CCE38
ldr r7, =gText_TrainerXYSentOutZGoN
b _0814E6D8
.pool
_0814E2DC:
@@ -239,22 +239,22 @@ _0814E2DC:
ands r0, r1
cmp r0, 0
beq _0814E2F0
ldr r7, =gUnknown_085CBC96
ldr r7, =gText_GoTwoPkmn
b _0814E6D8
.pool
_0814E2F0:
movs r0, 0x40
ands r1, r0
ldr r7, =gUnknown_085CBC96
ldr r7, =gText_GoTwoPkmn
cmp r1, 0
bne _0814E2FC
b _0814E6D8
_0814E2FC:
ldr r7, =gUnknown_085CBCE5
ldr r7, =gText_EnemySentOutPkmnGoPkmn
b _0814E6D8
.pool
_0814E308:
ldr r7, =gUnknown_085CBC8E
ldr r7, =gText_GoPkmn
b _0814E6D8
.pool
_0814E310:
@@ -275,7 +275,7 @@ _0814E310:
cmp r0, 0
beq _0814E33C
_0814E330:
ldr r7, =gUnknown_085CCDDE
ldr r7, =gText_TwoTrainersSentPkmn
b _0814E6D8
.pool
_0814E33C:
@@ -283,18 +283,18 @@ _0814E33C:
ands r0, r1
cmp r0, 0
beq _0814E34C
ldr r7, =gUnknown_085CBC4E
ldr r7, =gText_TwoTrainersSentOutPkmn
b _0814E6D8
.pool
_0814E34C:
ldr r0, =0x02000002
ands r1, r0
ldr r7, =gUnknown_085CBBFA
ldr r7, =gText_TrainerXYSentOutTwoPkmn
cmp r1, 0
bne _0814E358
b _0814E6D8
_0814E358:
ldr r7, =gUnknown_085CBC37
ldr r7, =gText_TrainerXSentOutTwoPkmn
b _0814E6D8
.pool
_0814E368:
@@ -306,12 +306,12 @@ _0814E368:
ldrh r1, [r0]
movs r0, 0xC0
lsls r0, 4
ldr r7, =gUnknown_085CBC27
ldr r7, =gText_TrainerXSentOutPkmn
cmp r1, r0
beq _0814E380
b _0814E6D8
_0814E380:
ldr r7, =gUnknown_085CBBE7
ldr r7, =gText_TrainerXYSentOutPkmn
b _0814E6D8
.pool
_0814E394:
@@ -327,7 +327,7 @@ _0814E394:
ldrb r2, [r0]
cmp r2, 0
bne _0814E3BC
ldr r7, =gUnknown_085CBCFD
ldr r7, =gText_PkmnThatsEnough
b _0814E6D8
.pool
_0814E3BC:
@@ -340,16 +340,16 @@ _0814E3BC:
cmp r0, 0
beq _0814E3D8
_0814E3CC:
ldr r7, =gUnknown_085CBD1B
ldr r7, =gText_PkmnComeBack
b _0814E6D8
.pool
_0814E3D8:
ldr r7, =gUnknown_085CBD3D
ldr r7, =gText_PkmnGoodComeBack
cmp r2, 0x2
beq _0814E3E0
b _0814E6D8
_0814E3E0:
ldr r7, =gUnknown_085CBD2A
ldr r7, =gText_PkmnOkComeBack
b _0814E6D8
.pool
_0814E3EC:
@@ -370,16 +370,16 @@ _0814E406:
ldr r0, [r2]
movs r1, 0x40
ands r0, r1
ldr r7, =gUnknown_085CBD65
ldr r7, =gText_TrainerXWithdrewPkmn
cmp r0, 0
bne _0814E414
b _0814E6D8
_0814E414:
ldr r7, =gUnknown_085CBD75
ldr r7, =gText_TrainerXWithdrewPkmn2
b _0814E6D8
.pool
_0814E428:
ldr r7, =gUnknown_085CBD52
ldr r7, =gText_TrainerXYWithdrewPkmn
b _0814E6D8
.pool
_0814E430:
@@ -402,22 +402,22 @@ _0814E430:
cmp r0, 0
beq _0814E468
_0814E456:
ldr r7, =gUnknown_085CBCA5
ldr r7, =gText_GoPkmn2
b _0814E6D8
.pool
_0814E468:
cmp r2, 0x1
bne _0814E474
ldr r7, =gUnknown_085CBCAD
ldr r7, =gText_DoItPkmn
b _0814E6D8
.pool
_0814E474:
ldr r7, =gUnknown_085CBCC7
ldr r7, =gText_YourFoesWeakGetEmPkmn
cmp r2, 0x2
beq _0814E47C
b _0814E6D8
_0814E47C:
ldr r7, =gUnknown_085CBCB8
ldr r7, =gText_GoForItPkmn
b _0814E6D8
.pool
_0814E488:
@@ -440,7 +440,7 @@ _0814E4AC:
ands r1, r0
cmp r1, 0
beq _0814E4BC
ldr r7, =gUnknown_085CBC7E
ldr r7, =gText_TrainerXSentOutPkmn3
b _0814E6D8
.pool
_0814E4BC:
@@ -448,12 +448,12 @@ _0814E4BC:
ldrh r1, [r0]
movs r0, 0xC0
lsls r0, 4
ldr r7, =gUnknown_085CBC6E
ldr r7, =gText_TrainerXSentOutPkmn2
cmp r1, r0
beq _0814E4CC
b _0814E6D8
_0814E4CC:
ldr r7, =gUnknown_085CBC14
ldr r7, =gText_TrainerXYSentOutPkmn2
b _0814E6D8
.pool
_0814E4DC:
@@ -465,7 +465,7 @@ _0814E4DC:
mov r1, r9
ldrb r0, [r1, 0x17]
_0814E4EA:
ldr r7, =gUnknown_085CCE04
ldr r7, =gText_TrainerXYSentOutPkmn3
cmp r0, 0x1
beq _0814E4F2
b _0814E6D8
@@ -489,7 +489,7 @@ _0814E4F8:
ldrb r2, [r1]
lsls r1, r2, 4
adds r1, r2
ldr r2, =gUnknown_085CCBBC
ldr r2, =gText_UnknownMoveTypes
adds r1, r2
bl StringCopy
b _0814E544
@@ -505,7 +505,7 @@ _0814E534:
_0814E544:
ldr r0, =gBattleTextBuff2
bl sub_814F950
ldr r7, =gUnknown_085CBDAC
ldr r7, =gText_XUsedY2
b _0814E6D8
.pool
_0814E55C:
@@ -547,12 +547,12 @@ _0814E5A4:
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
ldr r7, =gUnknown_085CB5D2
ldr r7, =gText_WildFled
cmp r0, 0
bne _0814E5B4
b _0814E6D8
_0814E5B4:
ldr r7, =gUnknown_085CB5DF
ldr r7, =gText_TwoWildFled
b _0814E6D8
.pool
_0814E5C4:
@@ -594,18 +594,18 @@ _0814E60E:
movs r0, 0x80
lsls r0, 16
ands r1, r0
ldr r7, =gUnknown_085CB538
ldr r7, =gText_PlayerBeatTwo
cmp r1, 0
beq _0814E6D8
ldr r7, =gText_TwoEnemiesDefeated
b _0814E6D8
.pool
_0814E628:
ldr r7, =gUnknown_085CB567
ldr r7, =gText_PlayerLostToTwo
b _0814E6D8
.pool
_0814E630:
ldr r7, =gUnknown_085CB5A6
ldr r7, =gText_PlayerBattledToDrawVsTwo
b _0814E6D8
.pool
_0814E638:
@@ -634,11 +634,11 @@ _0814E666:
b _0814E6D8
.pool
_0814E670:
ldr r7, =gUnknown_085CD24C
ldr r7, =gText_PlayerLostAgainst2
b _0814E6D8
.pool
_0814E678:
ldr r7, =gUnknown_085CD267
ldr r7, =gText_PlayerBattledToDraw2
b _0814E6D8
.pool
_0814E680:
@@ -657,15 +657,15 @@ _0814E698:
beq _0814E6B0
b _0814E6D8
_0814E69E:
ldr r7, =gUnknown_085CB524
ldr r7, =gText_PlayerDefeated
b _0814E6D8
.pool
_0814E6A8:
ldr r7, =gUnknown_085CB54F
ldr r7, =gText_PlayerLostAgainst
b _0814E6D8
.pool
_0814E6B0:
ldr r7, =gUnknown_085CB581
ldr r7, =gText_PlayerBattledToDraw
b _0814E6D8
.pool
_0814E6B8:
@@ -679,7 +679,7 @@ _0814E6B8:
b _0814E6DE
.pool
_0814E6CC:
ldr r1, =gUnknown_085CC270
ldr r1, =gBattleStringsTable
adds r0, r6, 0
subs r0, 0xC
lsls r0, 2
@@ -1104,10 +1104,10 @@ _0814EAF8:
ldr r1, [r0]
movs r0, 0x8
ands r1, r0
ldr r4, =gUnknown_085CBD85
ldr r4, =gText_WildPkmnPrefix
cmp r1, 0
beq _0814EB36
ldr r4, =gUnknown_085CBD8B
ldr r4, =gText_FoePkmnPrefix
b _0814EB36
.pool
_0814EB2C:
@@ -1229,10 +1229,10 @@ _0814EC38:
ldr r1, [r0]
movs r0, 0x8
ands r1, r0
ldr r4, =gUnknown_085CBD85
ldr r4, =gText_WildPkmnPrefix
cmp r1, 0
beq _0814EC56
ldr r4, =gUnknown_085CBD8B
ldr r4, =gText_FoePkmnPrefix
_0814EC56:
ldrb r1, [r4]
adds r0, r1, 0
@@ -1294,10 +1294,10 @@ _0814ECD4:
ldr r1, [r0]
movs r0, 0x8
ands r1, r0
ldr r4, =gUnknown_085CBD85
ldr r4, =gText_WildPkmnPrefix
cmp r1, 0
beq _0814ECF2
ldr r4, =gUnknown_085CBD8B
ldr r4, =gText_FoePkmnPrefix
_0814ECF2:
ldrb r1, [r4]
adds r0, r1, 0
@@ -1359,10 +1359,10 @@ _0814ED70:
ldr r1, [r0]
movs r0, 0x8
ands r1, r0
ldr r4, =gUnknown_085CBD85
ldr r4, =gText_WildPkmnPrefix
cmp r1, 0
beq _0814ED8E
ldr r4, =gUnknown_085CBD8B
ldr r4, =gText_FoePkmnPrefix
_0814ED8E:
ldrb r1, [r4]
adds r0, r1, 0
@@ -1424,10 +1424,10 @@ _0814EE0C:
ldr r1, [r0]
movs r0, 0x8
ands r1, r0
ldr r4, =gUnknown_085CBD85
ldr r4, =gText_WildPkmnPrefix
cmp r1, 0
beq _0814EE2A
ldr r4, =gUnknown_085CBD8B
ldr r4, =gText_FoePkmnPrefix
_0814EE2A:
ldrb r1, [r4]
adds r0, r1, 0
@@ -1489,10 +1489,10 @@ _0814EEA8:
ldr r1, [r0]
movs r0, 0x8
ands r1, r0
ldr r4, =gUnknown_085CBD85
ldr r4, =gText_WildPkmnPrefix
cmp r1, 0
beq _0814EEC6
ldr r4, =gUnknown_085CBD8B
ldr r4, =gText_FoePkmnPrefix
_0814EEC6:
ldrb r1, [r4]
adds r0, r1, 0
@@ -1569,7 +1569,7 @@ _0814EF6A:
ldrb r1, [r0]
lsls r0, r1, 4
adds r0, r1
ldr r1, =gUnknown_085CCBBC
ldr r1, =gText_UnknownMoveTypes
adds r4, r0, r1
b _0814F5C0
.pool
@@ -1626,7 +1626,7 @@ _0814EFEC:
adds r1, r0
mov r0, sp
bl StringCopy
ldr r1, =gUnknown_085CC0AD
ldr r1, =gText_BerrySuffix
mov r0, sp
bl StringAppend
b _0814F5BE
@@ -1652,13 +1652,13 @@ _0814F014:
adds r1, r0
mov r0, sp
bl StringCopy
ldr r1, =gUnknown_085CC0AD
ldr r1, =gText_BerrySuffix
mov r0, sp
bl StringAppend
b _0814F5BE
.pool
_0814F05C:
ldr r4, =gUnknown_085CC0A0
ldr r4, =gText_EnigmaBerry
b _0814F5C0
.pool
_0814F064:
@@ -1996,10 +1996,10 @@ _0814F330:
ldr r1, [r0]
movs r0, 0x8
ands r1, r0
ldr r4, =gUnknown_085CBD85
ldr r4, =gText_WildPkmnPrefix
cmp r1, 0
beq _0814F34E
ldr r4, =gUnknown_085CBD8B
ldr r4, =gText_FoePkmnPrefix
_0814F34E:
ldrb r1, [r4]
adds r0, r1, 0
@@ -2051,12 +2051,12 @@ _0814F3C4:
ldr r0, =0x000008ab
bl FlagGet
lsls r0, 24
ldr r4, =gUnknown_085CC015
ldr r4, =gText_SomeonesPC
cmp r0, 0
bne _0814F3D4
b _0814F5C0
_0814F3D4:
ldr r4, =gUnknown_085CC01F
ldr r4, =gText_LanettesPC
b _0814F5C0
.pool
_0814F3E4:
@@ -2069,12 +2069,12 @@ _0814F3EE:
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
ldr r4, =gUnknown_085CBD9A
ldr r4, =gText_FoePkmnPrefix3
cmp r0, 0
beq _0814F3FE
b _0814F5C0
_0814F3FE:
ldr r4, =gUnknown_085CBD9E
ldr r4, =gText_AllyPkmnPrefix2
b _0814F5C0
.pool
_0814F410:
@@ -2087,12 +2087,12 @@ _0814F41A:
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
ldr r4, =gUnknown_085CBD91
ldr r4, =gText_FoePkmnPrefix2
cmp r0, 0
beq _0814F42A
b _0814F5C0
_0814F42A:
ldr r4, =gUnknown_085CBD95
ldr r4, =gText_AllyPkmnPrefix
b _0814F5C0
.pool
_0814F43C:
@@ -2105,12 +2105,12 @@ _0814F446:
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
ldr r4, =gUnknown_085CBDA3
ldr r4, =gText_FoePkmnPrefix4
cmp r0, 0
beq _0814F456
b _0814F5C0
_0814F456:
ldr r4, =gUnknown_085CBDA7
ldr r4, =gText_AllyPkmnPrefix3
b _0814F5C0
.pool
_0814F468:
@@ -2387,7 +2387,7 @@ _0814F6AC:
ldrb r0, [r0, 0x2]
lsls r0, 8
orrs r1, r0
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
subs r1, 0xC
lsls r1, 2
adds r1, r0
@@ -2485,13 +2485,13 @@ _0814F768:
ands r0, r1
cmp r0, 0
beq _0814F788
ldr r1, =gUnknown_085CBD8B
ldr r1, =gText_FoePkmnPrefix
adds r0, r6, 0
bl StringAppend
b _0814F790
.pool
_0814F788:
ldr r1, =gUnknown_085CBD85
ldr r1, =gText_WildPkmnPrefix
adds r0, r6, 0
bl StringAppend
_0814F790:
@@ -2562,7 +2562,7 @@ _0814F81A:
b _0814F8DE
.pool
_0814F828:
ldr r1, =gUnknown_085CBE6C
ldr r1, =gPokeblockWasTooXStringTable
adds r0, r5, r7
ldrb r0, [r0, 0x1]
lsls r0, 2
@@ -2618,11 +2618,11 @@ _0814F858:
adds r1, r0
adds r0, r6, 0
bl StringCopy
ldr r1, =gUnknown_085CC0AD
ldr r1, =gText_BerrySuffix
b _0814F8BE
.pool
_0814F8BC:
ldr r1, =gUnknown_085CC0A0
ldr r1, =gText_EnigmaBerry
_0814F8BE:
adds r0, r6, 0
bl StringAppend
@@ -2679,7 +2679,7 @@ _0814F918:
blt _0814F944
cmp r2, 0x2
bgt _0814F938
ldr r1, =gUnknown_085CCBB5
ldr r1, =gText_SpaceIs
adds r0, r4, 0
bl StringCopy
b _0814F944
@@ -2687,7 +2687,7 @@ _0814F918:
_0814F938:
cmp r2, 0x4
bgt _0814F944
ldr r1, =gUnknown_085CCBB9
ldr r1, =gText_ApostropheS
adds r0, r4, 0
bl StringCopy
_0814F944:
@@ -2744,26 +2744,26 @@ _0814F99C:
.4byte _0814F9C8
.4byte _0814F9D8
_0814F9B0:
ldr r1, =gUnknown_085CBDB7
ldr r1, =gText_ExclamationMark
b _0814F9CA
.pool
_0814F9B8:
ldr r1, =gUnknown_085CBDB9
ldr r1, =gText_ExclamationMark2
b _0814F9CA
.pool
_0814F9C0:
ldr r1, =gUnknown_085CBDBB
ldr r1, =gText_ExclamationMark3
b _0814F9CA
.pool
_0814F9C8:
ldr r1, =gUnknown_085CBDBD
ldr r1, =gText_ExclamationMark4
_0814F9CA:
adds r0, r3, 0
bl StringCopy
b _0814F9E0
.pool
_0814F9D8:
ldr r1, =gUnknown_085CBDBF
ldr r1, =gText_ExclamationMark5
adds r0, r3, 0
bl StringCopy
_0814F9E0:

60
asm/evolution_scene.s
View File

@@ -1333,7 +1333,7 @@ _0813E6D4:
bl _0813F1A4
_0813E6E4:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085CC990
ldr r1, =gText_PkmnIsEvolving
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@@ -1621,7 +1621,7 @@ _0813E990:
bl _0813F1A4
_0813E99E:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085CC9A6
ldr r1, =gText_CongratsPkmnEvolved
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@@ -1857,13 +1857,13 @@ _0813EBB8:
cmp r0, 0
beq _0813EBE4
ldr r0, =gStringVar4
ldr r1, =gUnknown_085CC9EE
ldr r1, =gText_EllipsisQuestionMark
bl StringExpandPlaceholders
b _0813EBEC
.pool
_0813EBE4:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085CC9D3
ldr r1, =gText_PkmnStoppedEvolving
bl StringExpandPlaceholders
_0813EBEC:
ldr r0, =gStringVar4
@@ -1895,7 +1895,7 @@ _0813EC2A:
bl sub_804F574
ldr r0, =0x0000016f
bl PlayFanfare
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0xC]
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
@@ -1992,7 +1992,7 @@ _0813ED0A:
b _0813F1A4
_0813ED16:
bl sub_804F574
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x10]
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
@@ -2021,7 +2021,7 @@ _0813ED56:
beq _0813ED62
b _0813F1A4
_0813ED62:
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x14]
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
@@ -2046,7 +2046,7 @@ _0813ED90:
lsls r0, 24
cmp r0, 0
bne _0813EDCE
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x18]
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
@@ -2085,7 +2085,7 @@ _0813EDEA:
movs r2, 0x1D
movs r3, 0xD
bl sub_8056A3C
ldr r0, =gUnknown_085CCABB
ldr r0, =gText_BattleYesNoChoice
movs r1, 0xC
bl battle_show_message_maybe
ldr r0, =gTasks
@@ -2285,7 +2285,7 @@ _0813EFC8:
bl IsHMMove2
cmp r0, 0
beq _0813F014
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r3, =0x000004cc
adds r0, r3
ldr r0, [r0]
@@ -2333,7 +2333,7 @@ _0813F014:
b _0813F1A2
.pool
_0813F05C:
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
movs r1, 0xCF
lsls r1, 2
adds r0, r1
@@ -2365,7 +2365,7 @@ _0813F09E:
beq _0813F0AA
b _0813F1A4
_0813F0AA:
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x1C]
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
@@ -2390,7 +2390,7 @@ _0813F0D8:
lsls r0, 24
cmp r0, 0
bne _0813F1A4
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
movs r1, 0xD0
lsls r1, 2
adds r0, r1
@@ -2409,7 +2409,7 @@ _0813F0D8:
b _0813F1A4
.pool
_0813F120:
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x20]
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
@@ -2429,7 +2429,7 @@ _0813F120:
b _0813F1A4
.pool
_0813F154:
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x24]
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
@@ -2533,7 +2533,7 @@ _0813F204:
.4byte _0813F7E4
_0813F258:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085CC990
ldr r1, =gText_PkmnIsEvolving
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@@ -2804,7 +2804,7 @@ _0813F4E4:
bl _0813FCC4
_0813F4F2:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085CC9A6
ldr r1, =gText_CongratsPkmnEvolved
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@@ -3029,7 +3029,7 @@ _0813F704:
b _0813FCC4
_0813F714:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085CC9EE
ldr r1, =gText_EllipsisQuestionMark
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@@ -3062,7 +3062,7 @@ _0813F762:
bl sub_804F574
ldr r0, =0x0000016f
bl PlayFanfare
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0xC]
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
@@ -3161,7 +3161,7 @@ _0813F846:
b _0813FCC4
_0813F852:
bl sub_804F574
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x10]
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
@@ -3191,7 +3191,7 @@ _0813F892:
beq _0813F89E
b _0813FCC4
_0813F89E:
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x14]
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
@@ -3217,7 +3217,7 @@ _0813F8CC:
lsls r0, 24
cmp r0, 0
bne _0813F90C
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x18]
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
@@ -3294,7 +3294,7 @@ _0813F986:
_0813F98C:
ldr r0, =gBattleCommunication
strb r6, [r0, 0x1]
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
movs r1, 0x92
lsls r1, 3
adds r0, r1
@@ -3331,7 +3331,7 @@ _0813F9E4:
ldr r1, =gBattleCommunication
movs r0, 0x1
strb r0, [r1, 0x1]
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
movs r1, 0x92
lsls r1, 3
adds r0, r1
@@ -3437,7 +3437,7 @@ _0813FAEC:
bl IsHMMove2
cmp r0, 0
beq _0813FB3C
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r1, =0x000004cc
adds r0, r1
ldr r0, [r0]
@@ -3476,7 +3476,7 @@ _0813FB3C:
mov r0, r9
adds r2, r4, 0
bl SetMonMoveSlot
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
movs r1, 0xCF
lsls r1, 2
adds r0, r1
@@ -3509,7 +3509,7 @@ _0813FBB2:
beq _0813FBBE
b _0813FCC4
_0813FBBE:
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x1C]
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
@@ -3535,7 +3535,7 @@ _0813FBEC:
lsls r0, 24
cmp r0, 0
bne _0813FCC4
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
movs r1, 0xD0
lsls r1, 2
adds r0, r1
@@ -3555,7 +3555,7 @@ _0813FBEC:
b _0813FCC4
.pool
_0813FC38:
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x20]
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
@@ -3576,7 +3576,7 @@ _0813FC38:
b _0813FCC4
.pool
_0813FC70:
ldr r0, =gUnknown_085CC270
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x24]
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle