ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

name b message functions, split battle2

Browse Source
This commit is contained in:
DizzyEggg 2017-09-07 16:35:25 +02:00
parent d7d1b97bb8
commit 8bfdc42d0e
21 changed files with 16600 additions and 16589 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16487
asm/battle_2.s Normal file
View File

File diff suppressed because it is too large Load Diff

4
asm/battle_4.s
View File

@ -17922,8 +17922,8 @@ _0804FC38:
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0x16 movs r1, 0x16
bl battle_show_message_maybe bl battle_show_message_maybe
b _0804FD70 b _0804FD70

2
asm/battle_controller_linkopponent.s
View File

@ -5043,7 +5043,7 @@ sub_8066FF4: @ 8066FF4
adds r4, r0 adds r4, r0
ldrh r0, [r4] ldrh r0, [r4]
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc

2
asm/battle_controller_linkpartner.s
View File

@ -4352,7 +4352,7 @@ sub_814D590: @ 814D590
adds r4, r0 adds r4, r0
ldrh r0, [r4] ldrh r0, [r4]
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc

2
asm/battle_controller_opponent.s
View File

@ -5183,7 +5183,7 @@ sub_8061F34: @ 8061F34
adds r4, r0 adds r4, r0
ldrh r0, [r4] ldrh r0, [r4]
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc

14
asm/battle_controller_player.s
View File

@ -4337,7 +4337,7 @@ sub_8059AAC: @ 8059AAC
movs r0, 0 movs r0, 0
strb r0, [r2] strb r0, [r2]
movs r5, 0 movs r5, 0
ldr r7, =gUnknown_02022E2C ldr r7, =gDisplayedStringBattle
adds r4, r1, r3 adds r4, r1, r3
adds r6, r2, 0 adds r6, r2, 0
_08059AC4: _08059AC4:
@ -4376,7 +4376,7 @@ _08059AF4:
thumb_func_start sub_8059B18 thumb_func_start sub_8059B18
sub_8059B18: @ 8059B18 sub_8059B18: @ 8059B18
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_02022E2C ldr r4, =gDisplayedStringBattle
ldr r1, =gUnknown_085CCA6F ldr r1, =gUnknown_085CCA6F
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
@ -4406,7 +4406,7 @@ sub_8059B3C: @ 8059B3C
lsls r4, r1, 9 lsls r4, r1, 9
adds r0, r5, 0x4 adds r0, r5, 0x4
adds r4, r0 adds r4, r0
ldr r6, =gUnknown_02022E2C ldr r6, =gDisplayedStringBattle
ldr r5, =gUnknown_020244B0 ldr r5, =gUnknown_020244B0
adds r1, r5 adds r1, r5
adds r0, r4, 0 adds r0, r4, 0
@ -4448,7 +4448,7 @@ sub_8059BB0: @ 8059BB0
lsls r4, 9 lsls r4, 9
ldr r0, =gBattleBufferA + 4 ldr r0, =gBattleBufferA + 4
adds r4, r0 adds r4, r0
ldr r6, =gUnknown_02022E2C ldr r6, =gDisplayedStringBattle
ldr r1, =gUnknown_085CCA73 ldr r1, =gUnknown_085CCA73
adds r0, r6, 0 adds r0, r6, 0
bl StringCopy bl StringCopy
@ -8456,7 +8456,7 @@ sub_805BF80: @ 805BF80
adds r4, r0 adds r4, r0
ldrh r0, [r4] ldrh r0, [r4]
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
@ -8551,8 +8551,8 @@ _0805C062:
movs r1, 0 movs r1, 0
bl sub_8059CB4 bl sub_8059CB4
ldr r0, =gUnknown_085CC9F3 ldr r0, =gUnknown_085CC9F3
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0x1 movs r1, 0x1
bl battle_show_message_maybe bl battle_show_message_maybe
pop {r4} pop {r4}

2
asm/battle_controller_player_partner.s
View File

@ -4964,7 +4964,7 @@ sub_81BDA4C: @ 81BDA4C
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc

2
asm/battle_controller_recorded_opponent.s
View File

@ -4720,7 +4720,7 @@ sub_8188E90: @ 8188E90
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc

2
asm/battle_controller_recorded_player.s
View File

@ -4820,7 +4820,7 @@ sub_818C43C: @ 818C43C
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc

6
asm/battle_controller_safari.s
View File

@ -790,7 +790,7 @@ dp01t_10_6_message: @ 81599DC
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
@ -879,8 +879,8 @@ _08159AAE:
movs r1, 0 movs r1, 0
bl sub_8059CB4 bl sub_8059CB4
ldr r0, =gUnknown_085CCA04 ldr r0, =gUnknown_085CCA04
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0x1 movs r1, 0x1
bl battle_show_message_maybe bl battle_show_message_maybe
pop {r4} pop {r4}

6
asm/battle_controller_wally.s
View File

@ -3604,7 +3604,7 @@ sub_816A3B8: @ 816A3B8
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
@ -3693,8 +3693,8 @@ _0816A48A:
movs r1, 0 movs r1, 0
bl sub_8059CB4 bl sub_8059CB4
ldr r0, =gUnknown_085CCA15 ldr r0, =gUnknown_085CCA15
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0x1 movs r1, 0x1
bl battle_show_message_maybe bl battle_show_message_maybe
pop {r4} pop {r4}

36
asm/battle_message.s
View File

@ -673,7 +673,7 @@ _0814E6B8:
lsls r0, 1 lsls r0, 1
cmp r6, r0 cmp r6, r0
bls _0814E6CC bls _0814E6CC
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0xFF movs r0, 0xFF
strb r0, [r1] strb r0, [r1]
b _0814E6DE b _0814E6DE
@ -687,7 +687,7 @@ _0814E6CC:
ldr r7, [r0] ldr r7, [r0]
_0814E6D8: _0814E6D8:
adds r0, r7, 0 adds r0, r7, 0
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
_0814E6DE: _0814E6DE:
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
@ -699,18 +699,18 @@ _0814E6DE:
.pool .pool
thumb_func_end BufferStringBattle thumb_func_end BufferStringBattle
thumb_func_start get_battle_strings_ thumb_func_start StrCpyDecodeToDisplayedStringBattle
get_battle_strings_: @ 814E6F0 StrCpyDecodeToDisplayedStringBattle: @ 814E6F0
push {lr} push {lr}
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
bl get_battle_strings bl StrCpyDecodeBattle
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end get_battle_strings_ thumb_func_end StrCpyDecodeToDisplayedStringBattle
thumb_func_start sub_814E700 thumb_func_start AppendStatusString
sub_814E700: @ 814E700 AppendStatusString: @ 814E700
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x8 sub sp, 0x8
adds r4, r0, 0 adds r4, r0, 0
@ -761,10 +761,10 @@ _0814E75A:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_814E700 thumb_func_end AppendStatusString
thumb_func_start get_battle_strings thumb_func_start StrCpyDecodeBattle
get_battle_strings: @ 814E764 StrCpyDecodeBattle: @ 814E764
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@ -878,7 +878,7 @@ _0814E8A0:
.pool .pool
_0814E8B8: _0814E8B8:
adds r0, r5, 0 adds r0, r5, 0
bl sub_814E700 bl AppendStatusString
adds r4, r0, 0 adds r4, r0, 0
cmp r4, 0 cmp r4, 0
beq _0814E8C8 beq _0814E8C8
@ -904,7 +904,7 @@ _0814E8EE:
adds r0, r1, 0 adds r0, r1, 0
_0814E8F0: _0814E8F0:
adds r1, r4, 0 adds r1, r4, 0
bl sub_814F648 bl StrCpyDecodeBattleTextBuff
bl _0814F5C0 bl _0814F5C0
.pool .pool
_0814E904: _0814E904:
@ -2335,10 +2335,10 @@ _0814F62A:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end get_battle_strings thumb_func_end StrCpyDecodeBattle
thumb_func_start sub_814F648 thumb_func_start StrCpyDecodeBattleTextBuff
sub_814F648: @ 814F648 StrCpyDecodeBattleTextBuff: @ 814F648
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@ -2652,7 +2652,7 @@ _0814F8EA:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_814F648 thumb_func_end StrCpyDecodeBattleTextBuff
thumb_func_start sub_814F8F8 thumb_func_start sub_814F8F8
sub_814F8F8: @ 814F8F8 sub_814F8F8: @ 814F8F8

18
asm/contest.s
View File

@ -1415,19 +1415,19 @@ sub_80D833C: @ 80D833C
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080D83CC bne _080D83CC
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D507 ldr r1, =gUnknown_0827D507
bl StringCopy bl StringCopy
b _080D83D4 b _080D83D4
.pool .pool
_080D83CC: _080D83CC:
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D531 ldr r1, =gUnknown_0827D531
bl StringCopy bl StringCopy
_080D83D4: _080D83D4:
bl sub_80DB89C bl sub_80DB89C
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
@ -1752,19 +1752,19 @@ _080D868E:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080D86DC bne _080D86DC
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D507 ldr r1, =gUnknown_0827D507
bl StringCopy bl StringCopy
b _080D86E4 b _080D86E4
.pool .pool
_080D86DC: _080D86DC:
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D531 ldr r1, =gUnknown_0827D531
bl StringCopy bl StringCopy
_080D86E4: _080D86E4:
bl sub_80DB89C bl sub_80DB89C
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
@ -6406,7 +6406,7 @@ sub_80DAED4: @ 80DAED4
adds r5, r0, 0 adds r5, r0, 0
lsls r4, r1, 24 lsls r4, r1, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_085ED1AB ldr r1, =gUnknown_085ED1AB
bl StringCopy bl StringCopy
adds r1, r0, 0 adds r1, r0, 0
@ -6458,7 +6458,7 @@ sub_80DAF1C: @ 80DAF1C
add r0, sp, 0x4 add r0, sp, 0x4
adds r1, r4, 0 adds r1, r4, 0
bl sub_80DAED4 bl sub_80DAED4
ldr r4, =gUnknown_02022E2C ldr r4, =gDisplayedStringBattle
movs r0, 0x7 movs r0, 0x7
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x60 movs r2, 0x60
@ -6514,7 +6514,7 @@ sub_80DAFA0: @ 80DAFA0
ldr r0, =gUnknown_02039F26 ldr r0, =gUnknown_02039F26
adds r4, r0 adds r4, r0
ldrb r0, [r4] ldrb r0, [r4]
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r2, 0x7 movs r2, 0x7
str r2, [sp] str r2, [sp]
movs r2, 0x5 movs r2, 0x5

4
asm/contest_link_80F57C4.s
View File

@ -278,7 +278,7 @@ sub_80F5A74: @ 80F5A74
lsls r1, r5, 6 lsls r1, r5, 6
ldr r0, =gUnknown_02039E00 ldr r0, =gUnknown_02039E00
adds r7, r1, r0 adds r7, r1, r0
ldr r6, =gUnknown_02022E2C ldr r6, =gDisplayedStringBattle
ldr r0, =gUnknown_02039F25 ldr r0, =gUnknown_02039F25
ldrb r0, [r0] ldrb r0, [r0]
cmp r5, r0 cmp r5, r0
@ -291,7 +291,7 @@ _080F5A96:
adds r1, r7, 0x2 adds r1, r7, 0x2
adds r0, r6, 0 adds r0, r6, 0
bl StringCopy bl StringCopy
ldr r4, =gUnknown_02022E2C ldr r4, =gDisplayedStringBattle
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0

88
asm/evolution_scene.s
View File

@ -1897,8 +1897,8 @@ _0813EC2A:
bl PlayFanfare bl PlayFanfare
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0xC] ldr r0, [r0, 0xC]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r0, =gTasks ldr r0, =gTasks
@ -1994,8 +1994,8 @@ _0813ED16:
bl sub_804F574 bl sub_804F574
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x10] ldr r0, [r0, 0x10]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r0, =gTasks ldr r0, =gTasks
@ -2023,8 +2023,8 @@ _0813ED56:
_0813ED62: _0813ED62:
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x14] ldr r0, [r0, 0x14]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r0, =gTasks ldr r0, =gTasks
@ -2048,8 +2048,8 @@ _0813ED90:
bne _0813EDCE bne _0813EDCE
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x18] ldr r0, [r0, 0x18]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r0, =gTasks ldr r0, =gTasks
@ -2289,8 +2289,8 @@ _0813EFC8:
ldr r3, =0x000004cc ldr r3, =0x000004cc
adds r0, r3 adds r0, r3
ldr r0, [r0] ldr r0, [r0]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gTasks ldr r1, =gTasks
@ -2338,8 +2338,8 @@ _0813F05C:
lsls r1, 2 lsls r1, 2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r0, =gTasks ldr r0, =gTasks
@ -2367,8 +2367,8 @@ _0813F09E:
_0813F0AA: _0813F0AA:
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x1C] ldr r0, [r0, 0x1C]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r0, =gTasks ldr r0, =gTasks
@ -2395,8 +2395,8 @@ _0813F0D8:
lsls r1, 2 lsls r1, 2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gTasks ldr r1, =gTasks
@ -2411,8 +2411,8 @@ _0813F0D8:
_0813F120: _0813F120:
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x20] ldr r0, [r0, 0x20]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gTasks ldr r1, =gTasks
@ -2431,8 +2431,8 @@ _0813F120:
_0813F154: _0813F154:
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x24] ldr r0, [r0, 0x24]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gTasks ldr r1, =gTasks
@ -3064,8 +3064,8 @@ _0813F762:
bl PlayFanfare bl PlayFanfare
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0xC] ldr r0, [r0, 0xC]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
bl sub_807F1A8 bl sub_807F1A8
@ -3163,8 +3163,8 @@ _0813F852:
bl sub_804F574 bl sub_804F574
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x10] ldr r0, [r0, 0x10]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
bl sub_807F1A8 bl sub_807F1A8
@ -3193,8 +3193,8 @@ _0813F892:
_0813F89E: _0813F89E:
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x14] ldr r0, [r0, 0x14]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
bl sub_807F1A8 bl sub_807F1A8
@ -3219,8 +3219,8 @@ _0813F8CC:
bne _0813F90C bne _0813F90C
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x18] ldr r0, [r0, 0x18]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
bl sub_807F1A8 bl sub_807F1A8
@ -3299,8 +3299,8 @@ _0813F98C:
lsls r1, 3 lsls r1, 3
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
bl sub_807F1A8 bl sub_807F1A8
@ -3336,8 +3336,8 @@ _0813F9E4:
lsls r1, 3 lsls r1, 3
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
bl sub_807F1A8 bl sub_807F1A8
@ -3441,8 +3441,8 @@ _0813FAEC:
ldr r1, =0x000004cc ldr r1, =0x000004cc
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
bl sub_807F1A8 bl sub_807F1A8
@ -3481,8 +3481,8 @@ _0813FB3C:
lsls r1, 2 lsls r1, 2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
bl sub_807F1A8 bl sub_807F1A8
@ -3511,8 +3511,8 @@ _0813FBB2:
_0813FBBE: _0813FBBE:
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x1C] ldr r0, [r0, 0x1C]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
bl sub_807F1A8 bl sub_807F1A8
@ -3540,8 +3540,8 @@ _0813FBEC:
lsls r1, 2 lsls r1, 2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
bl sub_807F1A8 bl sub_807F1A8
@ -3557,8 +3557,8 @@ _0813FBEC:
_0813FC38: _0813FC38:
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x20] ldr r0, [r0, 0x20]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
bl sub_807F1A8 bl sub_807F1A8
@ -3578,8 +3578,8 @@ _0813FC38:
_0813FC70: _0813FC70:
ldr r0, =gUnknown_085CC270 ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x24] ldr r0, [r0, 0x24]
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
bl sub_807F1A8 bl sub_807F1A8

10
asm/pokemon_3.s
View File

@ -260,7 +260,7 @@ sub_806CF24: @ 806CF24
ldr r1, =gUnknown_085CB38A ldr r1, =gUnknown_085CB38A
bl StringCopy bl StringCopy
ldr r0, =gUnknown_085CB3AA ldr r0, =gUnknown_085CB3AA
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@ -342,7 +342,7 @@ _0806D020:
mov r1, r8 mov r1, r8
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_085CA459 ldr r0, =gUnknown_085CA459
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
_0806D02E: _0806D02E:
adds r6, 0x2 adds r6, 0x2
adds r5, 0x1 adds r5, 0x1
@ -358,9 +358,9 @@ _0806D02E:
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_085CA424 ldr r0, =gUnknown_085CA424
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
_0806D04E: _0806D04E:
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
pop {r4-r7} pop {r4-r7}
@ -3698,7 +3698,7 @@ _0806E9F6:
strb r0, [r4, 0x4] strb r0, [r4, 0x4]
ldr r0, =gUnknown_085CB2A1 ldr r0, =gUnknown_085CB2A1
ldr r1, =gStringVar4 ldr r1, =gStringVar4
bl get_battle_strings bl StrCpyDecodeBattle
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0

16477
asm/rom_8034C54.s
View File

File diff suppressed because it is too large Load Diff

4
asm/rom_8072304.s
View File

@ -3759,7 +3759,7 @@ sub_80741E8: @ 80741E8
adds r4, r1, 0 adds r4, r1, 0
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r5, =gUnknown_02022E2C ldr r5, =gDisplayedStringBattle
ldr r1, =gUnknown_085ED228 ldr r1, =gUnknown_085ED228
adds r0, r5, 0 adds r0, r5, 0
bl StringCopy bl StringCopy
@ -3814,7 +3814,7 @@ _08074270:
_08074272: _08074272:
adds r0, r5, 0 adds r0, r5, 0
bl StringCopy bl StringCopy
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
add r1, sp, 0x10 add r1, sp, 0x10
str r1, [sp] str r1, [sp]
movs r1, 0 movs r1, 0

20
asm/rom_818E9AC.s
View File

@ -10664,7 +10664,7 @@ _0819456C:
ldrh r1, [r0] ldrh r1, [r0]
lsls r1, 22 lsls r1, 22
lsrs r1, 22 lsrs r1, 22
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
bl sub_8195898 bl sub_8195898
mov r2, r10 mov r2, r10
cmp r2, 0x1 cmp r2, 0x1
@ -10879,7 +10879,7 @@ _08194740:
bne _08194768 bne _08194768
ldrb r0, [r4, 0x5] ldrb r0, [r4, 0x5]
ldrb r3, [r4, 0xA] ldrb r3, [r4, 0xA]
ldr r1, =gUnknown_02022E2C ldr r1, =gDisplayedStringBattle
movs r2, 0x3D movs r2, 0x3D
bl GetStringWidthDifference bl GetStringWidthDifference
b _0819476A b _0819476A
@ -10888,7 +10888,7 @@ _08194768:
movs r0, 0x3 movs r0, 0x3
_0819476A: _0819476A:
strb r0, [r4, 0x8] strb r0, [r4, 0x8]
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
str r0, [sp, 0x4] str r0, [sp, 0x4]
ldr r0, =gUnknown_0860D3F1 ldr r0, =gUnknown_0860D3F1
ldr r1, [sp, 0x20] ldr r1, [sp, 0x20]
@ -11190,7 +11190,7 @@ _081949CE:
movs r0, 0xD0 movs r0, 0xD0
strb r0, [r1, 0xD] strb r0, [r1, 0xD]
movs r7, 0 movs r7, 0
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
mov r9, r0 mov r9, r0
ldr r1, =gSaveBlock2Ptr ldr r1, =gSaveBlock2Ptr
mov r8, r1 mov r8, r1
@ -43251,8 +43251,8 @@ _081A5328:
negs r0, r0 negs r0, r0
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
ldr r0, =gUnknown_085CCDB2 ldr r0, =gUnknown_085CCDB2
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r4, =gUnknown_02022E2C ldr r4, =gDisplayedStringBattle
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xF movs r1, 0xF
bl battle_show_message_maybe bl battle_show_message_maybe
@ -43260,7 +43260,7 @@ _081A5328:
movs r1, 0x10 movs r1, 0x10
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r0, =gUnknown_085CCDB8 ldr r0, =gUnknown_085CCDB8
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x11 movs r1, 0x11
bl battle_show_message_maybe bl battle_show_message_maybe
@ -43274,7 +43274,7 @@ _081A5328:
movs r1, 0x14 movs r1, 0x14
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r0, =gUnknown_085CCDCB ldr r0, =gUnknown_085CCDCB
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x15 movs r1, 0x15
bl battle_show_message_maybe bl battle_show_message_maybe
@ -43358,8 +43358,8 @@ _081A5464:
movs r3, 0x1 movs r3, 0x1
bl sub_81A5558 bl sub_81A5558
ldr r0, =gUnknown_085CCDCB ldr r0, =gUnknown_085CCDCB
bl get_battle_strings_ bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gUnknown_02022E2C ldr r0, =gDisplayedStringBattle
movs r1, 0x15 movs r1, 0x15
bl battle_show_message_maybe bl battle_show_message_maybe
ldrb r0, [r5] ldrb r0, [r5]

1
ld_script.txt
View File

@ -57,6 +57,7 @@ SECTIONS {
asm/rom3.o(.text); asm/rom3.o(.text);
src/decompress.o(.text); src/decompress.o(.text);
asm/rom_8034C54.o(.text); asm/rom_8034C54.o(.text);
asm/battle_2.o(.text);
asm/battle_3.o(.text); asm/battle_3.o(.text);
src/battle_4.o(.text); src/battle_4.o(.text);
asm/battle_4.o(.text); asm/battle_4.o(.text);

2
sym_ewram.txt
View File

@ -241,7 +241,7 @@ gUnknown_02022E28: @ 2022E28
gUnknown_02022E2A: @ 2022E2A gUnknown_02022E2A: @ 2022E2A
.space 0x2 .space 0x2
gUnknown_02022E2C: @ 2022E2C gDisplayedStringBattle: @ 2022E2C
.space 0x12C .space 0x12C
gBattleTextBuff1: @ 2022F58 gBattleTextBuff1: @ 2022F58