Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-06-02 22:04:27 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

partially decompile text

Browse Source
This commit is contained in:
sceptillion 2017-12-19 15:19:41 -08:00
parent d116b76608
commit bdbc89bcea
130 changed files with 3810 additions and 4364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -79,7 +79,7 @@ src/isagbprn.o: CFLAGS := -mthumb-interwork
$(C_OBJS): %.o : %.c
@$(CPP) $(CPPFLAGS) $< -o $*.i
@$(PREPROC) $*.i charmap.txt | $(CC1) $(CFLAGS) $*.i -o $*.s
@$(PREPROC) $*.i charmap.txt | $(CC1) $(CFLAGS) -o $*.s
@printf ".text\n\t.align\t2, 0\n" >> $*.s
$(AS) $(ASFLAGS) -o $@ $*.s

4
asm/bag.s
View File

@ -138,7 +138,7 @@ sub_810B958: @ 810B958
movs r0, 0x1
adds r1, r4, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r2, 0x48
subs r2, r0
lsrs r2, 1
@ -174,7 +174,7 @@ sub_810B994: @ 810B994
movs r0, 0
adds r1, r4, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r3, 0x40
subs r3, r0
lsrs r3, 1

2
asm/battle_1.s
View File

@ -1038,7 +1038,7 @@ _0800F9FC:
bl sub_800F5CC
_0800FA08:
movs r0, 0x71
bl sub_80722CC
bl PlaySE
adds r0, r7, 0
bl DestroyTask
ldr r4, _0800FAD0 @ =gUnknown_202063C

4
asm/battle_2.s
View File

@ -3267,7 +3267,7 @@ sub_801182C: @ 801182C
ldr r0, _08011848 @ =sub_80117BC
str r0, [r4, 0x1C]
movs r0, 0x61
bl sub_80722CC
bl PlaySE
pop {r4}
pop {r0}
bx r0
@ -13686,7 +13686,7 @@ HandleAction_SafriZoneRun: @ 8016C60
ldrb r0, [r0]
strb r0, [r2]
movs r0, 0x11
bl sub_80722CC
bl PlaySE
ldr r0, _08016C94 @ =gUnknown_2023BCC
ldrb r0, [r0]
strb r0, [r4]

2
asm/battle_anim.s
View File

@ -944,7 +944,7 @@ sub_8072C08: @ 8072C08
ldrb r1, [r1, 0x1]
lsls r1, 8
orrs r0, r1
bl sub_80722CC
bl PlaySE
ldr r0, [r4]
adds r0, 0x2
str r0, [r4]

2
asm/battle_anim_80A22E8.s
View File

@ -39516,7 +39516,7 @@ _080B538A:
cmp r0, 0
ble _080B5396
movs r0, 0xBD
bl sub_80722CC
bl PlaySE
_080B5396:
movs r1, 0x3A
ldrsh r0, [r4, r1]

20
asm/battle_anim_80EEC0C.s
View File

@ -1759,7 +1759,7 @@ sub_80EFA0C: @ 80EFA0C
cmp r0, 0xB
bne _080EFA3E
movs r0, 0x35
bl sub_80722CC
bl PlaySE
_080EFA3E:
movs r1, 0x8
ldrsh r0, [r5, r1]
@ -1992,19 +1992,19 @@ _080EFC00:
b _080EFC1E
_080EFC06:
movs r0, 0x31
bl sub_80722CC
bl PlaySE
b _080EFC52
_080EFC0E:
movs r0, 0x32
bl sub_80722CC
bl PlaySE
b _080EFC52
_080EFC16:
movs r0, 0x33
bl sub_80722CC
bl PlaySE
b _080EFC52
_080EFC1E:
movs r0, 0x34
bl sub_80722CC
bl PlaySE
b _080EFC52
_080EFC26:
movs r2, 0x38
@ -2097,7 +2097,7 @@ sub_80EFCA0: @ 80EFCA0
ldr r0, _080EFCE8 @ =sub_80EFCEC
str r0, [r4, 0x1C]
movs r0, 0x17
bl sub_80722CC
bl PlaySE
_080EFCDC:
pop {r4,r5}
pop {r0}
@ -2440,7 +2440,7 @@ _080EFF6C:
bl StartSpriteAffineAnim
_080EFF74:
movs r0, 0x17
bl sub_80722CC
bl PlaySE
_080EFF7A:
pop {r4-r6}
pop {r0}
@ -2506,7 +2506,7 @@ sub_80EFFC4: @ 80EFFC4
cmp r1, 0x28
bne _080F0008
movs r0, 0xF7
bl sub_80722CC
bl PlaySE
ldrb r1, [r6, 0x5]
lsrs r1, 4
movs r0, 0x80
@ -2545,7 +2545,7 @@ _080F0026:
bl UpdateOamPriorityInAllHealthboxes
bl m4aMPlayAllStop
ldr r0, _080F0048 @ =0x0000013f
bl sub_80722CC
bl PlaySE
b _080F0088
.align 2, 0
_080F0044: .4byte gUnknown_2024005
@ -3331,7 +3331,7 @@ LaunchBallStarsTask: @ 80F05EC
strh r1, [r0, 0x10]
strh r5, [r0, 0x26]
movs r0, 0xF
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
pop {r3-r5}
mov r8, r3

20
asm/battle_controller_oak.s
View File

@ -115,7 +115,7 @@ sub_80E763C: @ 80E763C
cmp r0, 0
beq _080E76D4
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _080E76A8 @ =gUnknown_2023FF8
ldrb r0, [r4]
adds r0, r1
@ -172,7 +172,7 @@ _080E76D4:
b _080E7838
_080E76EE:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -200,7 +200,7 @@ _080E770C:
b _080E7838
_080E7726:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -244,7 +244,7 @@ _080E7764:
bne _080E7838
_080E777C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -311,7 +311,7 @@ _080E77AC:
bl sub_809A084
_080E780A:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
movs r1, 0xC
_080E7814:
@ -380,7 +380,7 @@ _080E787C:
cmp r0, 0
bne _080E78D8
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0
bl ActionSelectionDestroyCursorAt
movs r0, 0x1
@ -406,7 +406,7 @@ _080E78B4:
cmp r0, 0
bne _080E78D8
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
movs r1, 0x1
movs r2, 0
@ -1303,7 +1303,7 @@ sub_80E7F7C: @ 80E7F7C
mov r0, r10
bl SetBattleBarStruct
movs r0, 0x1B
bl sub_80722CC
bl PlaySE
ldr r0, _080E8048 @ =sub_80E804C
mov r1, r8
str r0, [r1]
@ -6156,7 +6156,7 @@ _080EA83E:
cmp r0, 0
bne _080EA866
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r2, 0x80
lsls r2, 1
movs r0, 0x1
@ -6715,7 +6715,7 @@ sub_80EAC84: @ 80EAC84
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
bl sub_80722CC
bl PlaySE
bl WallyBufferExecCompleted
pop {r0}
bx r0

52
asm/battle_controller_player.s
View File

@ -188,7 +188,7 @@ sub_802E438: @ 802E438
cmp r0, 0
beq _0802E4D0
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0802E4A4 @ =gUnknown_2023FF8
ldrb r0, [r4]
adds r0, r1
@ -245,7 +245,7 @@ _0802E4D0:
b _0802E634
_0802E4EA:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -273,7 +273,7 @@ _0802E508:
b _0802E634
_0802E522:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -317,7 +317,7 @@ _0802E560:
bne _0802E634
_0802E578:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -384,7 +384,7 @@ _0802E5A8:
bl sub_809A084
_0802E606:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
movs r1, 0xC
_0802E610:
@ -478,7 +478,7 @@ _0802E6B6:
cmp r0, 0
beq _0802E72C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r2, _0802E718 @ =gUnknown_202063C
ldr r1, _0802E71C @ =gUnknown_2023D44
ldr r4, _0802E70C @ =gUnknown_3004FF4
@ -524,7 +524,7 @@ _0802E72C:
cmp r0, 0
beq _0802E7A0
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r2, _0802E784 @ =gUnknown_202063C
ldr r1, _0802E788 @ =gUnknown_2023D44
ldr r5, _0802E78C @ =gUnknown_3004FF4
@ -575,7 +575,7 @@ _0802E7A0:
b _0802E8C4
_0802E7AA:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r2, _0802E7DC @ =gUnknown_202063C
ldr r1, _0802E7E0 @ =gUnknown_2023D44
ldr r3, _0802E7E4 @ =gUnknown_3004FF4
@ -716,7 +716,7 @@ _0802E8C4:
b _0802E9DC
_0802E8CE:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r2, _0802E900 @ =gUnknown_202063C
ldr r1, _0802E904 @ =gUnknown_2023D44
ldr r3, _0802E908 @ =gUnknown_3004FF4
@ -895,7 +895,7 @@ sub_802EA10: @ 802EA10
b _0802EC10
_0802EA3A:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0802EA78 @ =gUnknown_2023FFC
ldrb r0, [r6]
adds r0, r1
@ -1119,7 +1119,7 @@ _0802EC10:
cmp r0, 0
beq _0802EC38
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r2, _0802EC34 @ =0x0000ffff
movs r0, 0x1
movs r1, 0xA
@ -1242,7 +1242,7 @@ _0802ECDC:
_0802ED10:
strb r0, [r1]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r6]
adds r0, r4
ldrb r0, [r0]
@ -1344,7 +1344,7 @@ sub_802EDDC: @ 802EDDC
cmp r0, 0
beq _0802EDF6
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r7, 0x1
_0802EDF6:
ldrh r1, [r4, 0x2E]
@ -1353,7 +1353,7 @@ _0802EDF6:
cmp r0, 0
beq _0802EE18
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0802EF44 @ =gUnknown_2022974
movs r0, 0
strh r0, [r1]
@ -1387,7 +1387,7 @@ _0802EE18:
eors r0, r2
strb r0, [r1]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -1424,7 +1424,7 @@ _0802EE58:
eors r0, r6
strb r0, [r1]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -1455,7 +1455,7 @@ _0802EEA6:
eors r0, r2
strb r0, [r1]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -1492,7 +1492,7 @@ _0802EEE8:
eors r0, r6
strb r0, [r1]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -1529,7 +1529,7 @@ sub_802EF58: @ 802EF58
b _0802F34C
_0802EF72:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0802F2E8 @ =gUnknown_2023FFC
mov r10, r0
ldr r1, _0802F2EC @ =gUnknown_2023BC4
@ -2017,7 +2017,7 @@ _0802F34C:
cmp r0, 0
beq _0802F3C8
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0802F3A0 @ =gUnknown_3004FF4
ldrb r0, [r0]
bl MoveSelectionDestroyCursorAt
@ -2101,7 +2101,7 @@ _0802F416:
eors r0, r1
strb r0, [r4]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0802F444 @ =gUnknown_2023FFC
ldr r0, _0802F448 @ =gUnknown_2023BC4
ldrb r0, [r0]
@ -2168,7 +2168,7 @@ _0802F4AA:
eors r0, r1
strb r0, [r4]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0802F4D8 @ =gUnknown_2023FFC
ldr r0, _0802F4DC @ =gUnknown_2023BC4
ldrb r0, [r0]
@ -2228,7 +2228,7 @@ _0802F52E:
eors r0, r1
strb r0, [r4]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0802F55C @ =gUnknown_2023FFC
ldr r0, _0802F560 @ =gUnknown_2023BC4
ldrb r0, [r0]
@ -2295,7 +2295,7 @@ _0802F5C2:
eors r0, r1
strb r0, [r4]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0802F5F0 @ =gUnknown_2023FFC
ldr r0, _0802F5F4 @ =gUnknown_2023BC4
ldrb r0, [r0]
@ -3632,7 +3632,7 @@ sub_8030024: @ 8030024
mov r0, r10
bl SetBattleBarStruct
movs r0, 0x1B
bl sub_80722CC
bl PlaySE
ldr r0, _080300F0 @ =sub_80300F4
mov r1, r8
str r0, [r1]
@ -4090,7 +4090,7 @@ _0803047C:
b _080304E0
_08030486:
movs r0, 0x58
bl sub_80722CC
bl PlaySE
bl IsMonGettingExpSentOut
cmp r0, 0
beq _080304E0

16
asm/battle_controller_pokedude.s
View File

@ -1279,7 +1279,7 @@ sub_8156A54: @ 8156A54
mov r0, r10
bl SetBattleBarStruct
movs r0, 0x1B
bl sub_80722CC
bl PlaySE
ldr r0, _08156B20 @ =sub_8156B24
mov r1, r8
str r0, [r1]
@ -6010,7 +6010,7 @@ sub_815920C: @ 815920C
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
bl sub_80722CC
bl PlaySE
bl PlayerPartnerBufferExecCompleted
pop {r0}
bx r0
@ -6791,7 +6791,7 @@ _0815985C:
cmp r0, 0
bne _08159888
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_08159888:
ldrb r0, [r4]
lsls r0, 2
@ -6886,7 +6886,7 @@ _0815992C:
cmp r0, r1
bne _08159972
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -6961,7 +6961,7 @@ sub_8159998: @ 8159998
cmp r0, 0
bne _081599DE
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_081599DE:
ldrb r0, [r6]
lsls r0, 2
@ -7023,7 +7023,7 @@ _08159A48:
cmp r0, r4
bne _08159A8E
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r6]
adds r0, r5
ldrb r0, [r0]
@ -7288,7 +7288,7 @@ _08159C64:
cmp r0, 0
beq _08159CEE
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x81
negs r0, r0
str r4, [sp]
@ -7488,7 +7488,7 @@ _08159E0C:
cmp r0, 0
beq _08159EDE
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r2, _08159E5C @ =gUnknown_825E45C
ldr r0, _08159E60 @ =gUnknown_2023FE8
ldr r0, [r0]

10
asm/battle_controller_safari.s
View File

@ -77,7 +77,7 @@ HandleInputChooseAction_0: @ 80DD5A4
cmp r0, 0
beq _080DD612
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _080DD5D8 @ =gUnknown_2023FF8
ldr r0, _080DD5DC @ =gUnknown_2023BC4
ldrb r0, [r0]
@ -138,7 +138,7 @@ _080DD612:
cmp r0, 0
beq _080DD71A
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -166,7 +166,7 @@ _080DD650:
cmp r0, 0
bne _080DD71A
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -194,7 +194,7 @@ _080DD68C:
cmp r0, 0
beq _080DD71A
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -230,7 +230,7 @@ _080DD6D8:
cmp r0, 0
bne _080DD71A
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]

2
asm/battle_gfx_sfx_util.s
View File

@ -2581,7 +2581,7 @@ HandleLowHpMusicChange: @ 8035244
cmp r0, 0
bne _080352AA
movs r0, 0x53
bl sub_80722CC
bl PlaySE
_080352AA:
ldr r0, [r7]
ldr r1, [r0]

10
asm/battle_interface.s
View File

@ -1379,7 +1379,7 @@ _0804858A:
str r1, [sp, 0xC]
adds r2, r5, 0
movs r3, 0
bl sub_8006124
bl RenderTextFont9
movs r5, 0
ldr r1, _0804860C @ =gUnknown_202063C
mov r2, r9
@ -1505,7 +1505,7 @@ _08048698:
str r1, [sp, 0xC]
add r2, sp, 0x10
movs r3, 0
bl sub_8006124
bl RenderTextFont9
adds r4, r6, 0
adds r0, r4, 0x3
cmp r4, r0
@ -1716,7 +1716,7 @@ sub_80487F8: @ 80487F8
movs r1, 0
add r2, sp, 0x10
movs r3, 0
bl sub_8006124
bl RenderTextFont9
movs r7, 0x6
movs r5, 0
mov r2, sp
@ -1878,7 +1878,7 @@ _08048966:
str r1, [sp, 0xC]
add r2, sp, 0x10
movs r3, 0
bl sub_8006124
bl RenderTextFont9
movs r7, 0
lsls r0, r4, 4
adds r0, r4
@ -4315,7 +4315,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10
movs r0, 0
mov r1, sp
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r1, 0x2F
subs r1, r0
add r3, sp, 0x10

56
asm/battle_message.s
View File

@ -863,12 +863,12 @@ _080D7974:
ldrb r0, [r5]
cmp r0, 0xFD
bne _080D798C
ldr r4, _080D7988 @ =gUnknown_2021CD0
ldr r4, _080D7988 @ =gStringVar1
adds r0, r5, 0
b _080D79C4
.align 2, 0
_080D7984: .4byte gUnknown_2022AB8
_080D7988: .4byte gUnknown_2021CD0
_080D7988: .4byte gStringVar1
_080D798C:
adds r0, r5, 0
bl TryGetStatusString
@ -884,17 +884,17 @@ _080D79A2:
ldrb r0, [r1]
cmp r0, 0xFD
bne _080D79D8
ldr r4, _080D79B4 @ =gUnknown_2021CF0
ldr r4, _080D79B4 @ =gStringVar2
b _080D79C2
.align 2, 0
_080D79B0: .4byte gUnknown_2022AC8
_080D79B4: .4byte gUnknown_2021CF0
_080D79B4: .4byte gStringVar2
_080D79B8:
ldr r1, _080D79D0 @ =gUnknown_2022AD8
ldrb r0, [r1]
cmp r0, 0xFD
bne _080D79D8
ldr r4, _080D79D4 @ =gUnknown_2021D04
ldr r4, _080D79D4 @ =gStringVar3
_080D79C2:
adds r0, r1, 0
_080D79C4:
@ -903,25 +903,25 @@ _080D79C4:
bl _080D8382
.align 2, 0
_080D79D0: .4byte gUnknown_2022AD8
_080D79D4: .4byte gUnknown_2021D04
_080D79D4: .4byte gStringVar3
_080D79D8:
adds r4, r1, 0
bl _080D8382
_080D79DE:
ldr r4, _080D79E4 @ =gUnknown_2021CD0
ldr r4, _080D79E4 @ =gStringVar1
bl _080D8382
.align 2, 0
_080D79E4: .4byte gUnknown_2021CD0
_080D79E4: .4byte gStringVar1
_080D79E8:
ldr r4, _080D79F0 @ =gUnknown_2021CF0
ldr r4, _080D79F0 @ =gStringVar2
bl _080D8382
.align 2, 0
_080D79F0: .4byte gUnknown_2021CF0
_080D79F0: .4byte gStringVar2
_080D79F4:
ldr r4, _080D79FC @ =gUnknown_2021D04
ldr r4, _080D79FC @ =gStringVar3
bl _080D8382
.align 2, 0
_080D79FC: .4byte gUnknown_2021D04
_080D79FC: .4byte gStringVar3
_080D7A00:
movs r0, 0
bl GetBankByIdentity
@ -1908,14 +1908,14 @@ _080D81E8:
ands r0, r1
cmp r0, 0
beq _080D820C
ldr r4, _080D8208 @ =gUnknown_2021D18
ldr r4, _080D8208 @ =gStringVar4
adds r0, r4, 0
movs r1, 0
bl sub_815DC40
b _080D8382
.align 2, 0
_080D8204: .4byte gUnknown_2022B4C
_080D8208: .4byte gUnknown_2021D18
_080D8208: .4byte gStringVar4
_080D820C:
bl sub_80806EC
adds r4, r0, 0
@ -1928,34 +1928,34 @@ _080D8214:
ands r0, r1
cmp r0, 0
beq _080D8238
ldr r4, _080D8234 @ =gUnknown_2021D18
ldr r4, _080D8234 @ =gStringVar4
adds r0, r4, 0
movs r1, 0
bl sub_815DBF4
b _080D8382
.align 2, 0
_080D8230: .4byte gUnknown_2022B4C
_080D8234: .4byte gUnknown_2021D18
_080D8234: .4byte gStringVar4
_080D8238:
bl sub_8080710
adds r4, r0, 0
b _080D8382
_080D8240:
ldr r4, _080D824C @ =gUnknown_2021D18
ldr r4, _080D824C @ =gStringVar4
adds r0, r4, 0
movs r1, 0x1
bl sub_815DC40
b _080D8382
.align 2, 0
_080D824C: .4byte gUnknown_2021D18
_080D824C: .4byte gStringVar4
_080D8250:
ldr r4, _080D825C @ =gUnknown_2021D18
ldr r4, _080D825C @ =gStringVar4
adds r0, r4, 0
movs r1, 0x1
bl sub_815DBF4
b _080D8382
.align 2, 0
_080D825C: .4byte gUnknown_2021D18
_080D825C: .4byte gStringVar4
_080D8260:
ldr r0, _080D82B4 @ =gUnknown_2023FC4
ldrb r0, [r0, 0x17]
@ -2718,7 +2718,7 @@ _080D882E:
ldrb r0, [r1, 0x1]
ldrb r2, [r1, 0x4]
adds r1, r4, 0
bl sub_8005ED4
bl GetStringWidth
movs r1, 0x30
b _080D8868
.align 2, 0
@ -2733,7 +2733,7 @@ _080D8850:
ldrb r0, [r1, 0x1]
ldrb r2, [r1, 0x4]
adds r1, r4, 0
bl sub_8005ED4
bl GetStringWidth
movs r1, 0x40
_080D8868:
subs r1, r0
@ -2804,7 +2804,7 @@ _080D8888:
mov r3, r12
cmp r7, 0x18
bne _080D8900
ldr r0, _080D88FC @ =gUnknown_3003E50
ldr r0, _080D88FC @ =gTextFlags
ldrb r2, [r0]
movs r1, 0x3
negs r1, r1
@ -2812,9 +2812,9 @@ _080D8888:
b _080D8908
.align 2, 0
_080D88F8: .4byte gUnknown_83FEB64
_080D88FC: .4byte gUnknown_3003E50
_080D88FC: .4byte gTextFlags
_080D8900:
ldr r0, _080D8930 @ =gUnknown_3003E50
ldr r0, _080D8930 @ =gTextFlags
ldrb r1, [r0]
movs r2, 0x2
orrs r1, r2
@ -2841,7 +2841,7 @@ _080D8928:
orrs r0, r1
b _080D8940
.align 2, 0
_080D8930: .4byte gUnknown_3003E50
_080D8930: .4byte gTextFlags
_080D8934: .4byte gUnknown_2022B4C
_080D8938:
ldrb r1, [r4]
@ -2867,14 +2867,14 @@ _080D8958:
lsls r0, 24
lsrs r3, r0, 24
_080D8960:
ldr r0, _080D896C @ =gUnknown_3003E50
ldr r0, _080D896C @ =gTextFlags
ldrb r1, [r0]
movs r2, 0x1
orrs r1, r2
strb r1, [r0]
b _080D8982
.align 2, 0
_080D896C: .4byte gUnknown_3003E50
_080D896C: .4byte gTextFlags
_080D8970:
adds r0, r6, r7
lsls r0, 2

36
asm/battle_records.s
View File

@ -233,7 +233,7 @@ sub_80CD3E8: @ 80CD3E8
beq _080CD416
_080CD40C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _080CD424 @ =sub_80CD428
str r0, [r4]
_080CD416:
@ -1028,24 +1028,24 @@ _080CDA1E:
bls _080CDA24
adds r6, r0, 0
_080CDA24:
ldr r0, _080CDAB4 @ =gUnknown_2021CD0
ldr r0, _080CDAB4 @ =gStringVar1
adds r1, r4, 0
movs r2, 0
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r0, _080CDAB8 @ =gUnknown_2021CF0
ldr r0, _080CDAB8 @ =gStringVar2
adds r1, r5, 0
movs r2, 0
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r0, _080CDABC @ =gUnknown_2021D04
ldr r0, _080CDABC @ =gStringVar3
adds r1, r6, 0
movs r2, 0
movs r3, 0x4
bl ConvertIntToDecimalStringN
movs r3, 0
ldr r6, _080CDAC0 @ =gUnknown_83F6C84
ldr r7, _080CDAC4 @ =gUnknown_2021D18
ldr r7, _080CDAC4 @ =gStringVar4
ldr r0, _080CDAC8 @ =gUnknown_8418188
mov r12, r0
movs r5, 0
@ -1099,11 +1099,11 @@ _080CDA72:
bx r0
.align 2, 0
_080CDAB0: .4byte 0x0000270f
_080CDAB4: .4byte gUnknown_2021CD0
_080CDAB8: .4byte gUnknown_2021CF0
_080CDABC: .4byte gUnknown_2021D04
_080CDAB4: .4byte gStringVar1
_080CDAB8: .4byte gStringVar2
_080CDABC: .4byte gStringVar3
_080CDAC0: .4byte gUnknown_83F6C84
_080CDAC4: .4byte gUnknown_2021D18
_080CDAC4: .4byte gStringVar4
_080CDAC8: .4byte gUnknown_8418188
_080CDACC: .4byte gUnknown_83F6C78
thumb_func_end sub_80CD9F4
@ -1174,7 +1174,7 @@ _080CDB48: .4byte gUnknown_84181B6
_080CDB4C: .4byte gUnknown_84181BE
_080CDB50:
movs r5, 0
ldr r7, _080CDB70 @ =gUnknown_2021CD0
ldr r7, _080CDB70 @ =gStringVar1
mov r9, r5
_080CDB56:
cmp r5, 0
@ -1189,7 +1189,7 @@ _080CDB56:
bl StringCopyN
b _080CDBA6
.align 2, 0
_080CDB70: .4byte gUnknown_2021CD0
_080CDB70: .4byte gStringVar1
_080CDB74:
cmp r5, 0x1
bne _080CDB7E
@ -1202,17 +1202,17 @@ _080CDB7E:
movs r4, 0x84
ldrh r1, [r6, 0xC]
_080CDB86:
ldr r0, _080CDB94 @ =gUnknown_2021CD0
ldr r0, _080CDB94 @ =gStringVar1
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
b _080CDBA6
.align 2, 0
_080CDB94: .4byte gUnknown_2021CD0
_080CDB94: .4byte gStringVar1
_080CDB98:
movs r4, 0xB4
ldrh r1, [r6, 0xE]
ldr r0, _080CDBDC @ =gUnknown_2021CD0
ldr r0, _080CDBDC @ =gStringVar1
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
@ -1245,7 +1245,7 @@ _080CDBCE:
pop {r0}
bx r0
.align 2, 0
_080CDBDC: .4byte gUnknown_2021CD0
_080CDBDC: .4byte gStringVar1
_080CDBE0: .4byte gUnknown_83F6C78
thumb_func_end sub_80CDAD0
@ -1265,7 +1265,7 @@ sub_80CDBE4: @ 80CDBE4
movs r2, 0
movs r3, 0
bl FillWindowPixelRect
ldr r5, _080CDC9C @ =gUnknown_2021D18
ldr r5, _080CDC9C @ =gStringVar4
ldr r1, _080CDCA0 @ =gUnknown_8418174
adds r0, r5, 0
bl StringExpandPlaceholders
@ -1273,7 +1273,7 @@ sub_80CDBE4: @ 80CDBE4
negs r2, r2
movs r0, 0x2
adds r1, r5, 0
bl sub_8005ED4
bl GetStringWidth
movs r2, 0xD0
subs r2, r0
lsrs r2, 1
@ -1337,7 +1337,7 @@ _080CDC70:
pop {r0}
bx r0
.align 2, 0
_080CDC9C: .4byte gUnknown_2021D18
_080CDC9C: .4byte gStringVar4
_080CDCA0: .4byte gUnknown_8418174
_080CDCA4: .4byte gUnknown_83F6C78
_080CDCA8: .4byte gSaveBlock2Ptr

58
asm/battle_script_commands.s
View File

@ -15584,7 +15584,7 @@ _080253FC:
cmp r0, 0
beq _08025422
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_802DCF8
movs r0, 0
strb r0, [r4, 0x1]
@ -15601,7 +15601,7 @@ _08025422:
cmp r0, 0
bne _08025448
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_802DCF8
movs r0, 0x1
strb r0, [r4, 0x1]
@ -15615,7 +15615,7 @@ _08025448:
cmp r0, 0
beq _0802548C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _08025488 @ =gUnknown_2023E82
ldrb r4, [r0, 0x1]
cmp r4, 0
@ -15645,7 +15645,7 @@ _0802548C:
b _080256D0
_08025496:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0802549C:
ldr r1, _080254A4 @ =gUnknown_2023FC4
movs r0, 0x4
@ -15959,7 +15959,7 @@ _08025728:
cmp r0, 0
beq _0802574E
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_802DCF8
movs r0, 0
strb r0, [r4, 0x1]
@ -15976,7 +15976,7 @@ _0802574E:
cmp r0, 0
bne _08025774
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_802DCF8
movs r0, 0x1
strb r0, [r4, 0x1]
@ -15990,7 +15990,7 @@ _08025774:
cmp r0, 0
beq _080257D8
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _080257B0 @ =gUnknown_2023E82
ldrb r0, [r0, 0x1]
cmp r0, 0
@ -16035,7 +16035,7 @@ _080257D8:
cmp r0, 0
beq _0802580E
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r3, _08025818 @ =gUnknown_2023D74
ldr r2, [r3]
ldrb r1, [r2, 0x1]
@ -16952,7 +16952,7 @@ _08025F0C:
cmp r0, 0
beq _08025F30
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_802DCF8
movs r0, 0
strb r0, [r5, 0x1]
@ -16969,7 +16969,7 @@ _08025F30:
cmp r0, 0
bne _08025F56
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_802DCF8
movs r0, 0x1
strb r0, [r4, 0x1]
@ -16996,7 +16996,7 @@ _08025F74:
beq _08025F9A
_08025F7E:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
str r4, [sp]
movs r0, 0x17
movs r1, 0x8
@ -17449,7 +17449,7 @@ _08026330:
cmp r0, 0
beq _080263F6
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_8026448
movs r0, 0xC
movs r1, 0x2
@ -17463,7 +17463,7 @@ _08026350:
cmp r0, 0
beq _080263F6
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x81
str r0, [sp]
movs r0, 0x12
@ -17712,7 +17712,7 @@ PutLevelAndGenderOnLvlUpBox: @ 8026524
ldrb r0, [r0, 0x10]
muls r0, r5
adds r0, r4
ldr r6, _08026600 @ =gUnknown_2021D18
ldr r6, _08026600 @ =gStringVar4
adds r1, r6, 0
bl GetMonNickname
str r6, [sp]
@ -17784,7 +17784,7 @@ PutLevelAndGenderOnLvlUpBox: @ 8026524
.align 2, 0
_080265F8: .4byte gUnknown_2023FE8
_080265FC: .4byte gUnknown_2024284
_08026600: .4byte gUnknown_2021D18
_08026600: .4byte gStringVar4
_08026604:
adds r0, r6, 0
movs r1, 0
@ -32219,7 +32219,7 @@ sub_802D800: @ 802D800
bne _0802D88C
ldr r0, _0802D87C @ =gUnknown_2023E82
strb r1, [r0, 0x5]
ldr r4, _0802D880 @ =gUnknown_2021CD0
ldr r4, _0802D880 @ =gStringVar1
ldr r0, _0802D884 @ =0x00004037
bl VarGet
lsls r0, 24
@ -32235,7 +32235,7 @@ sub_802D800: @ 802D800
ldrh r0, [r0]
muls r0, r7
add r0, r8
ldr r2, _0802D888 @ =gUnknown_2021CF0
ldr r2, _0802D888 @ =gStringVar2
movs r1, 0x2
bl GetMonData
b _0802D8D6
@ -32244,11 +32244,11 @@ _0802D870: .4byte gUnknown_2023BCE
_0802D874: .4byte gUnknown_2023D6B
_0802D878: .4byte gUnknown_202402C
_0802D87C: .4byte gUnknown_2023E82
_0802D880: .4byte gUnknown_2021CD0
_0802D880: .4byte gStringVar1
_0802D884: .4byte 0x00004037
_0802D888: .4byte gUnknown_2021CF0
_0802D888: .4byte gStringVar2
_0802D88C:
ldr r4, _0802D92C @ =gUnknown_2021CD0
ldr r4, _0802D92C @ =gStringVar1
ldr r0, _0802D930 @ =0x00004037
bl VarGet
lsls r0, 24
@ -32264,10 +32264,10 @@ _0802D88C:
ldrh r0, [r0]
muls r0, r7
add r0, r8
ldr r2, _0802D934 @ =gUnknown_2021CF0
ldr r2, _0802D934 @ =gStringVar2
movs r1, 0x2
bl GetMonData
ldr r4, _0802D938 @ =gUnknown_2021D04
ldr r4, _0802D938 @ =gStringVar3
bl get_unknown_box_id
lsls r0, 24
lsrs r0, 24
@ -32322,10 +32322,10 @@ _0802D8EA:
pop {r0}
bx r0
.align 2, 0
_0802D92C: .4byte gUnknown_2021CD0
_0802D92C: .4byte gStringVar1
_0802D930: .4byte 0x00004037
_0802D934: .4byte gUnknown_2021CF0
_0802D938: .4byte gUnknown_2021D04
_0802D934: .4byte gStringVar2
_0802D938: .4byte gStringVar3
_0802D93C: .4byte gUnknown_2023E82
_0802D940: .4byte 0x00000834
_0802D944: .4byte gUnknown_3004F90
@ -32885,7 +32885,7 @@ _0802DDA8:
cmp r0, 0
beq _0802DDCC
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_802DCF8
movs r0, 0
strb r0, [r4, 0x1]
@ -32902,7 +32902,7 @@ _0802DDCC:
cmp r0, 0
bne _0802DDF2
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_802DCF8
movs r0, 0x1
strb r0, [r4, 0x1]
@ -32915,7 +32915,7 @@ _0802DDF2:
cmp r0, 0
beq _0802DE24
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0802DE20 @ =gUnknown_2023E82
ldrb r0, [r1, 0x1]
cmp r0, 0
@ -32937,7 +32937,7 @@ _0802DE24:
b _0802DFA6
_0802DE2E:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0802DE3C @ =gUnknown_2023E82
_0802DE36:
movs r0, 0x4

8
asm/battle_setup.s
View File

@ -2132,7 +2132,7 @@ sub_80806EC: @ 80806EC
push {r4,lr}
ldr r0, _08080708 @ =gUnknown_20386B8
ldr r0, [r0]
ldr r4, _0808070C @ =gUnknown_2021D18
ldr r4, _0808070C @ =gStringVar4
bl sub_80806C8
adds r1, r0, 0
adds r0, r4, 0
@ -2143,13 +2143,13 @@ sub_80806EC: @ 80806EC
bx r1
.align 2, 0
_08080708: .4byte gUnknown_20386B8
_0808070C: .4byte gUnknown_2021D18
_0808070C: .4byte gStringVar4
thumb_func_end sub_80806EC
thumb_func_start sub_8080710
sub_8080710: @ 8080710
push {r4,lr}
ldr r4, _0808072C @ =gUnknown_2021D18
ldr r4, _0808072C @ =gStringVar4
ldr r0, _08080730 @ =gUnknown_20386BC
ldr r0, [r0]
bl sub_80806C8
@ -2161,7 +2161,7 @@ sub_8080710: @ 8080710
pop {r1}
bx r1
.align 2, 0
_0808072C: .4byte gUnknown_2021D18
_0808072C: .4byte gStringVar4
_08080730: .4byte gUnknown_20386BC
thumb_func_end sub_8080710

42
asm/battle_tower.s
View File

@ -1512,14 +1512,14 @@ sub_80E64C0: @ 80E64C0
beq _080E6554
cmp r4, 0
bne _080E64EC
ldr r0, _080E6514 @ =gUnknown_2021CD0
ldr r0, _080E6514 @ =gStringVar1
ldr r1, _080E6518 @ =gUnknown_83FE859
bl StringAppend
_080E64EC:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
ldr r6, _080E6514 @ =gUnknown_2021CD0
ldr r6, _080E6514 @ =gStringVar1
movs r0, 0xB
adds r1, r5, 0
muls r1, r0
@ -1535,7 +1535,7 @@ _080E64EC:
beq _080E652A
b _080E654C
.align 2, 0
_080E6514: .4byte gUnknown_2021CD0
_080E6514: .4byte gStringVar1
_080E6518: .4byte gUnknown_83FE859
_080E651C: .4byte gUnknown_8245EE0
_080E6520:
@ -1552,15 +1552,15 @@ _080E652A:
.align 2, 0
_080E6534: .4byte gUnknown_83FE85E
_080E6538:
ldr r0, _080E6544 @ =gUnknown_2021CD0
ldr r0, _080E6544 @ =gStringVar1
ldr r1, _080E6548 @ =gUnknown_83FE85C
bl StringAppend
b _080E6554
.align 2, 0
_080E6544: .4byte gUnknown_2021CD0
_080E6544: .4byte gStringVar1
_080E6548: .4byte gUnknown_83FE85C
_080E654C:
ldr r0, _080E655C @ =gUnknown_2021CD0
ldr r0, _080E655C @ =gStringVar1
ldr r1, _080E6560 @ =gUnknown_83FE859
bl StringAppend
_080E6554:
@ -1569,7 +1569,7 @@ _080E6554:
pop {r1}
bx r1
.align 2, 0
_080E655C: .4byte gUnknown_2021CD0
_080E655C: .4byte gStringVar1
_080E6560: .4byte gUnknown_83FE859
thumb_func_end sub_80E64C0
@ -1766,7 +1766,7 @@ _080E6662:
ldrb r0, [r1]
cmp r0, 0x2
bhi _080E6750
ldr r1, _080E672C @ =gUnknown_2021CD0
ldr r1, _080E672C @ =gStringVar1
movs r0, 0xFF
strb r0, [r1]
ldr r1, _080E6730 @ =gUnknown_20370C0
@ -1793,7 +1793,7 @@ _080E66F2:
cmp r0, r6
bne _080E66F2
_080E6704:
ldr r4, _080E672C @ =gUnknown_2021CD0
ldr r4, _080E672C @ =gStringVar1
adds r0, r4, 0
bl StringLength
lsls r0, 16
@ -1811,7 +1811,7 @@ _080E6704:
.align 2, 0
_080E6724: .4byte gUnknown_2024284
_080E6728: .4byte gUnknown_20370D0
_080E672C: .4byte gUnknown_2021CD0
_080E672C: .4byte gStringVar1
_080E6730: .4byte gUnknown_20370C0
_080E6734: .4byte gUnknown_84020C4
_080E6738: .4byte 0x0000ffff
@ -1867,7 +1867,7 @@ sub_80E678C: @ 80E678C
lsls r0, 24
cmp r0, 0
beq _080E67E4
ldr r5, _080E67E0 @ =gUnknown_2021D18
ldr r5, _080E67E0 @ =gStringVar4
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x2
@ -1885,7 +1885,7 @@ _080E67B8:
cmp r0, 0xFE
bne _080E67B8
_080E67C2:
ldr r2, _080E67E0 @ =gUnknown_2021D18
ldr r2, _080E67E0 @ =gStringVar4
adds r0, r1, r2
ldrb r0, [r0]
adds r3, r2, 0
@ -1903,9 +1903,9 @@ _080E67D8:
strb r0, [r1]
b _080E67F0
.align 2, 0
_080E67E0: .4byte gUnknown_2021D18
_080E67E0: .4byte gStringVar4
_080E67E4:
ldr r0, _080E67F8 @ =gUnknown_2021D18
ldr r0, _080E67F8 @ =gStringVar4
adds r1, r4, 0
movs r2, 0x3
movs r3, 0x2
@ -1915,7 +1915,7 @@ _080E67F0:
pop {r0}
bx r0
.align 2, 0
_080E67F8: .4byte gUnknown_2021D18
_080E67F8: .4byte gStringVar4
thumb_func_end sub_80E678C
thumb_func_start sub_80E67FC
@ -2345,7 +2345,7 @@ _080E6B66:
adds r0, r5
ldrh r0, [r0]
strh r0, [r1]
ldr r1, _080E6BA0 @ =gUnknown_2021CD0
ldr r1, _080E6BA0 @ =gStringVar1
adds r0, 0xA1
strb r0, [r1]
movs r0, 0xFF
@ -2355,7 +2355,7 @@ _080E6B66:
_080E6B94: .4byte 0x0000056c
_080E6B98: .4byte 0x0000270e
_080E6B9C: .4byte gUnknown_20370D0
_080E6BA0: .4byte gUnknown_2021CD0
_080E6BA0: .4byte gStringVar1
_080E6BA4:
ldr r0, [r6]
lsls r5, 1
@ -3228,7 +3228,7 @@ sub_80E724C: @ 80E724C
lsls r1, 3
adds r0, r1
ldrh r0, [r0]
ldr r1, _080E7290 @ =gUnknown_2021CD0
ldr r1, _080E7290 @ =gStringVar1
bl sub_8099E90
ldr r0, _080E7294 @ =gUnknown_20370D0
strh r4, [r0]
@ -3236,7 +3236,7 @@ sub_80E724C: @ 80E724C
.align 2, 0
_080E7288: .4byte gSaveBlock2Ptr
_080E728C: .4byte 0x0000055c
_080E7290: .4byte gUnknown_2021CD0
_080E7290: .4byte gStringVar1
_080E7294: .4byte gUnknown_20370D0
_080E7298:
ldr r1, _080E72B0 @ =gUnknown_20370D0
@ -3616,13 +3616,13 @@ sub_80E7550: @ 80E7550
ldrb r0, [r0]
cmp r0, 0x3
bne _080E756C
ldr r1, _080E7568 @ =gUnknown_2021D18
ldr r1, _080E7568 @ =gStringVar4
movs r0, 0xFF
strb r0, [r1]
b _080E7590
.align 2, 0
_080E7564: .4byte gUnknown_2023E8A
_080E7568: .4byte gUnknown_2021D18
_080E7568: .4byte gStringVar4
_080E756C:
cmp r0, 0x1
bne _080E7584

2
asm/battle_transition.s
View File

@ -4413,7 +4413,7 @@ _080D2A68:
ldrsh r0, [r4, r1]
bl sub_80D3138
movs r0, 0x61
bl sub_80722CC
bl PlaySE
ldr r1, [r5]
ldrb r0, [r1]
adds r0, 0x1

146
asm/berry_pouch.s
View File

@ -51,7 +51,7 @@ _0813CD98:
movs r0, 0xFF
strb r0, [r1, 0x6]
movs r2, 0
ldr r6, _0813CDF0 @ =gUnknown_3003E50
ldr r6, _0813CDF0 @ =gTextFlags
ldr r0, _0813CDF4 @ =gUnknown_203AD30
mov r12, r0
ldr r1, _0813CDF8 @ =sub_813CE30
@ -88,7 +88,7 @@ _0813CDE2:
bx r0
.align 2, 0
_0813CDEC: .4byte gUnknown_203F370
_0813CDF0: .4byte gUnknown_3003E50
_0813CDF0: .4byte gTextFlags
_0813CDF4: .4byte gUnknown_203AD30
_0813CDF8: .4byte sub_813CE30
_0813CDFC: .4byte 0x0000080c
@ -714,14 +714,14 @@ sub_813D31C: @ 813D31C
mov r8, r0
lsls r5, r1, 16
lsrs r5, 16
ldr r4, _0813D384 @ =gUnknown_2021D18
ldr r4, _0813D384 @ =gStringVar4
ldr r1, _0813D388 @ =gUnknown_84166FF
adds r0, r4, 0
bl StringCopy
ldr r1, _0813D38C @ =gUnknown_8416226
adds r0, r4, 0
bl StringAppend
ldr r6, _0813D390 @ =gUnknown_2021CD0
ldr r6, _0813D390 @ =gStringVar1
adds r1, r5, 0
subs r1, 0x84
adds r0, r6, 0
@ -752,10 +752,10 @@ sub_813D31C: @ 813D31C
pop {r0}
bx r0
.align 2, 0
_0813D384: .4byte gUnknown_2021D18
_0813D384: .4byte gStringVar4
_0813D388: .4byte gUnknown_84166FF
_0813D38C: .4byte gUnknown_8416226
_0813D390: .4byte gUnknown_2021CD0
_0813D390: .4byte gStringVar1
_0813D394: .4byte gUnknown_84643B4
_0813D398: .4byte gUnknown_8416703
thumb_func_end sub_813D31C
@ -790,7 +790,7 @@ sub_813D3C0: @ 813D3C0
cmp r1, 0x1
beq _0813D3D6
movs r0, 0xF5
bl sub_80722CC
bl PlaySE
bl sub_813EC28
_0813D3D6:
ldr r4, _0813D404 @ =gUnknown_203F36C
@ -864,11 +864,11 @@ sub_813D430: @ 813D430
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
ldr r0, _0813D4A4 @ =gUnknown_2021CD0
ldr r0, _0813D4A4 @ =gStringVar1
movs r2, 0x1
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, _0813D4A8 @ =gUnknown_2021D18
ldr r4, _0813D4A8 @ =gStringVar4
ldr r1, _0813D4AC @ =gUnknown_84162B9
adds r0, r4, 0
bl StringExpandPlaceholders
@ -892,8 +892,8 @@ _0813D498:
bx r0
.align 2, 0
_0813D4A0: .4byte gUnknown_203F36C
_0813D4A4: .4byte gUnknown_2021CD0
_0813D4A8: .4byte gUnknown_2021D18
_0813D4A4: .4byte gStringVar1
_0813D4A8: .4byte gStringVar4
_0813D4AC: .4byte gUnknown_84162B9
thumb_func_end sub_813D430
@ -1171,7 +1171,7 @@ sub_813D6A4: @ 813D6A4
movs r0, 0x1
adds r1, r4, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r3, 0x48
subs r3, r0
lsrs r3, 1
@ -1543,10 +1543,10 @@ sub_813D940: @ 813D940
lsrs r5, 24
movs r1, 0x2
ldrsh r0, [r4, r1]
ldr r1, _0813D9EC @ =gUnknown_2021CD0
ldr r1, _0813D9EC @ =gStringVar1
mov r10, r1
bl sub_813D39C
ldr r0, _0813D9F0 @ =gUnknown_2021D18
ldr r0, _0813D9F0 @ =gStringVar4
mov r9, r0
adds r1, r6, 0
bl StringExpandPlaceholders
@ -1599,8 +1599,8 @@ sub_813D940: @ 813D940
bx r0
.align 2, 0
_0813D9E8: .4byte gUnknown_3005098
_0813D9EC: .4byte gUnknown_2021CD0
_0813D9F0: .4byte gUnknown_2021D18
_0813D9EC: .4byte gStringVar1
_0813D9F0: .4byte gStringVar4
_0813D9F4: .4byte gUnknown_84162B9
thumb_func_end sub_813D940
@ -1623,14 +1623,14 @@ sub_813D9F8: @ 813D9F8
adds r0, r6, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r0, _0813DA5C @ =gUnknown_2021CD0
ldr r0, _0813DA5C @ =gStringVar1
lsls r4, 16
asrs r4, 16
adds r1, r4, 0
movs r2, 0x2
adds r3, r5, 0
bl ConvertIntToDecimalStringN
ldr r4, _0813DA60 @ =gUnknown_2021D18
ldr r4, _0813DA60 @ =gStringVar4
ldr r1, _0813DA64 @ =gUnknown_84162B9
adds r0, r4, 0
bl StringExpandPlaceholders
@ -1652,8 +1652,8 @@ sub_813D9F8: @ 813D9F8
pop {r0}
bx r0
.align 2, 0
_0813DA5C: .4byte gUnknown_2021CD0
_0813DA60: .4byte gUnknown_2021D18
_0813DA5C: .4byte gStringVar1
_0813DA60: .4byte gStringVar4
_0813DA64: .4byte gUnknown_84162B9
thumb_func_end sub_813D9F8
@ -1707,7 +1707,7 @@ _0813DA9E:
cmp r0, 0x1
bne _0813DAEC
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0813DAE8 @ =gUnknown_203AD30
mov r1, r8
strh r1, [r0]
@ -1733,13 +1733,13 @@ _0813DAFC:
cmp r0, 0x5
beq _0813DB9E
movs r0, 0x5
bl sub_80722CC
bl PlaySE
b _0813DB42
.align 2, 0
_0813DB0C: .4byte gUnknown_203F370
_0813DB10:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r3, _0813DB30 @ =gUnknown_203F370
mov r8, r3
ldrb r0, [r3, 0x4]
@ -1982,9 +1982,9 @@ _0813DC86:
lsrs r4, 24
movs r1, 0x2
ldrsh r0, [r7, r1]
ldr r1, _0813DD68 @ =gUnknown_2021CD0
ldr r1, _0813DD68 @ =gStringVar1
bl sub_813D39C
ldr r5, _0813DD6C @ =gUnknown_2021D18
ldr r5, _0813DD6C @ =gStringVar4
ldr r1, _0813DD70 @ =gUnknown_84162FF
adds r0, r5, 0
bl StringExpandPlaceholders
@ -2012,8 +2012,8 @@ _0813DD58: .4byte gUnknown_203F384
_0813DD5C: .4byte gUnknown_84643A4
_0813DD60: .4byte gUnknown_203F388
_0813DD64: .4byte gUnknown_846437C
_0813DD68: .4byte gUnknown_2021CD0
_0813DD6C: .4byte gUnknown_2021D18
_0813DD68: .4byte gStringVar1
_0813DD6C: .4byte gStringVar4
_0813DD70: .4byte gUnknown_84162FF
thumb_func_end sub_813DBE4
@ -2062,7 +2062,7 @@ sub_813DDA0: @ 813DDA0
cmp r4, r0
bne _0813DDE0
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0813DDDC @ =gUnknown_846437C
ldr r1, [r0, 0x1C]
adds r0, r5, 0
@ -2072,7 +2072,7 @@ sub_813DDA0: @ 813DDA0
_0813DDDC: .4byte gUnknown_846437C
_0813DDE0:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0813DE04 @ =gUnknown_846437C
ldr r0, _0813DE08 @ =gUnknown_203F384
ldr r0, [r0]
@ -2250,13 +2250,13 @@ sub_813DF54: @ 813DF54
lsls r1, 3
ldr r0, _0813DFB4 @ =gUnknown_3005098
adds r1, r0
ldr r0, _0813DFB8 @ =gUnknown_2021CF0
ldr r0, _0813DFB8 @ =gStringVar2
movs r2, 0x10
ldrsh r1, [r1, r2]
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r5, _0813DFBC @ =gUnknown_2021D18
ldr r5, _0813DFBC @ =gStringVar4
ldr r1, _0813DFC0 @ =gUnknown_8416409
adds r0, r5, 0
bl StringExpandPlaceholders
@ -2285,8 +2285,8 @@ sub_813DF54: @ 813DF54
bx r0
.align 2, 0
_0813DFB4: .4byte gUnknown_3005098
_0813DFB8: .4byte gUnknown_2021CF0
_0813DFBC: .4byte gUnknown_2021D18
_0813DFB8: .4byte gStringVar2
_0813DFBC: .4byte gStringVar4
_0813DFC0: .4byte gUnknown_8416409
_0813DFC4: .4byte gUnknown_846436C
thumb_func_end sub_813DF54
@ -2359,7 +2359,7 @@ _0813E048:
cmp r0, 0
beq _0813E090
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x8
bl sub_813EB10
lsls r0, 24
@ -2385,7 +2385,7 @@ _0813E090:
cmp r0, 0
beq _0813E0D4
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x8
bl sub_813EA98
movs r0, 0
@ -2425,15 +2425,15 @@ sub_813E0DC: @ 813E0DC
bl sub_813EA98
movs r1, 0x2
ldrsh r0, [r5, r1]
ldr r1, _0813E150 @ =gUnknown_2021CD0
ldr r1, _0813E150 @ =gStringVar1
bl sub_813D39C
ldr r0, _0813E154 @ =gUnknown_2021CF0
ldr r0, _0813E154 @ =gStringVar2
movs r2, 0x10
ldrsh r1, [r5, r2]
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r5, _0813E158 @ =gUnknown_2021D18
ldr r5, _0813E158 @ =gStringVar4
ldr r1, _0813E15C @ =gUnknown_84163F4
adds r0, r5, 0
bl StringExpandPlaceholders
@ -2463,9 +2463,9 @@ sub_813E0DC: @ 813E0DC
bx r0
.align 2, 0
_0813E14C: .4byte gUnknown_3005098
_0813E150: .4byte gUnknown_2021CD0
_0813E154: .4byte gUnknown_2021CF0
_0813E158: .4byte gUnknown_2021D18
_0813E150: .4byte gStringVar1
_0813E154: .4byte gStringVar2
_0813E158: .4byte gStringVar4
_0813E15C: .4byte gUnknown_84163F4
_0813E160: .4byte sub_813E164
thumb_func_end sub_813E0DC
@ -2493,7 +2493,7 @@ sub_813E164: @ 813E164
beq _0813E1E4
_0813E18A:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0813E1F4 @ =gUnknown_203AD30
ldrh r0, [r0]
ldrh r1, [r5, 0x10]
@ -2618,7 +2618,7 @@ sub_813E290: @ 813E290
cmp r0, 0
beq _0813E2AE
movs r0, 0x5
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl sub_813E2B8
_0813E2AE:
@ -2734,10 +2734,10 @@ sub_813E37C: @ 813E37C
lsls r0, 24
cmp r0, 0
bne _0813E3D8
ldr r1, _0813E3C8 @ =gUnknown_2021CD0
ldr r1, _0813E3C8 @ =gStringVar1
adds r0, r4, 0
bl sub_8099E90
ldr r4, _0813E3CC @ =gUnknown_2021D18
ldr r4, _0813E3CC @ =gStringVar4
ldr r1, _0813E3D0 @ =gUnknown_8416374
adds r0, r4, 0
bl StringExpandPlaceholders
@ -2749,8 +2749,8 @@ sub_813E37C: @ 813E37C
b _0813E3EA
.align 2, 0
_0813E3C4: .4byte gUnknown_3005098
_0813E3C8: .4byte gUnknown_2021CD0
_0813E3CC: .4byte gUnknown_2021D18
_0813E3C8: .4byte gStringVar1
_0813E3CC: .4byte gStringVar4
_0813E3D0: .4byte gUnknown_8416374
_0813E3D4: .4byte sub_813E290
_0813E3D8:
@ -2814,9 +2814,9 @@ sub_813E428: @ 813E428
cmp r0, 0
bne _0813E488
ldrh r0, [r6]
ldr r1, _0813E478 @ =gUnknown_2021CD0
ldr r1, _0813E478 @ =gStringVar1
bl sub_8099E90
ldr r4, _0813E47C @ =gUnknown_2021D18
ldr r4, _0813E47C @ =gStringVar4
ldr r1, _0813E480 @ =gUnknown_84168F1
adds r0, r4, 0
bl StringExpandPlaceholders
@ -2832,8 +2832,8 @@ sub_813E428: @ 813E428
.align 2, 0
_0813E470: .4byte gUnknown_3005098
_0813E474: .4byte gUnknown_203AD30
_0813E478: .4byte gUnknown_2021CD0
_0813E47C: .4byte gUnknown_2021D18
_0813E478: .4byte gStringVar1
_0813E47C: .4byte gStringVar4
_0813E480: .4byte gUnknown_84168F1
_0813E484: .4byte sub_813E2B8
_0813E488:
@ -2854,9 +2854,9 @@ _0813E4A0:
strh r0, [r4, 0x4]
_0813E4A8:
ldrh r0, [r6]
ldr r1, _0813E4D4 @ =gUnknown_2021CD0
ldr r1, _0813E4D4 @ =gStringVar1
bl sub_8099E90
ldr r4, _0813E4D8 @ =gUnknown_2021D18
ldr r4, _0813E4D8 @ =gStringVar4
ldr r1, _0813E4DC @ =gUnknown_8416911
adds r0, r4, 0
bl StringExpandPlaceholders
@ -2873,8 +2873,8 @@ _0813E4CE:
pop {r0}
bx r0
.align 2, 0
_0813E4D4: .4byte gUnknown_2021CD0
_0813E4D8: .4byte gUnknown_2021D18
_0813E4D4: .4byte gStringVar1
_0813E4D8: .4byte gStringVar4
_0813E4DC: .4byte gUnknown_8416911
_0813E4E0: .4byte sub_813E5B8
thumb_func_end sub_813E428
@ -2890,7 +2890,7 @@ sub_813E4E4: @ 813E4E4
lsls r4, 3
ldr r0, _0813E540 @ =gUnknown_3005098
adds r4, r0
ldr r6, _0813E544 @ =gUnknown_2021D04
ldr r6, _0813E544 @ =gStringVar3
ldrh r1, [r4, 0x2]
movs r0, 0x5
bl sub_809A798
@ -2906,7 +2906,7 @@ sub_813E4E4: @ 813E4E4
movs r2, 0
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r4, _0813E548 @ =gUnknown_2021D18
ldr r4, _0813E548 @ =gStringVar4
ldr r1, _0813E54C @ =gUnknown_8416936
adds r0, r4, 0
bl StringExpandPlaceholders
@ -2923,8 +2923,8 @@ sub_813E4E4: @ 813E4E4
bx r0
.align 2, 0
_0813E540: .4byte gUnknown_3005098
_0813E544: .4byte gUnknown_2021D04
_0813E548: .4byte gUnknown_2021D18
_0813E544: .4byte gStringVar3
_0813E548: .4byte gStringVar4
_0813E54C: .4byte gUnknown_8416936
_0813E550: .4byte sub_813E554
thumb_func_end sub_813E4E4
@ -2997,12 +2997,12 @@ sub_813E5B8: @ 813E5B8
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _0813E658 @ =gUnknown_2021CD0
ldr r0, _0813E658 @ =gStringVar1
movs r1, 0x1
movs r2, 0x2
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r2, _0813E65C @ =gUnknown_2021D18
ldr r2, _0813E65C @ =gStringVar4
mov r8, r2
ldr r1, _0813E660 @ =gUnknown_84162B9
mov r0, r8
@ -3050,8 +3050,8 @@ sub_813E5B8: @ 813E5B8
bx r0
.align 2, 0
_0813E654: .4byte gUnknown_3005098
_0813E658: .4byte gUnknown_2021CD0
_0813E65C: .4byte gUnknown_2021D18
_0813E658: .4byte gStringVar1
_0813E65C: .4byte gStringVar4
_0813E660: .4byte gUnknown_84162B9
_0813E664: .4byte sub_813E690
thumb_func_end sub_813E5B8
@ -3124,7 +3124,7 @@ _0813E6E4:
cmp r0, 0
beq _0813E718
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
bl sub_813EA98
movs r0, 0
@ -3143,7 +3143,7 @@ _0813E718:
cmp r0, 0
beq _0813E762
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
bl sub_813EA98
movs r0, 0x2
@ -3187,9 +3187,9 @@ sub_813E768: @ 813E768
bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0813E7D8 @ =gUnknown_203AD30
ldrh r0, [r0]
ldr r1, _0813E7DC @ =gUnknown_2021CD0
ldr r1, _0813E7DC @ =gStringVar1
bl sub_8099E90
ldr r6, _0813E7E0 @ =gUnknown_2021D04
ldr r6, _0813E7E0 @ =gStringVar3
ldrh r1, [r4, 0x2]
movs r0, 0x5
bl sub_809A798
@ -3205,7 +3205,7 @@ sub_813E768: @ 813E768
movs r2, 0
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r4, _0813E7E4 @ =gUnknown_2021D18
ldr r4, _0813E7E4 @ =gStringVar4
ldr r1, _0813E7E8 @ =gUnknown_8416959
adds r0, r4, 0
bl StringExpandPlaceholders
@ -3220,9 +3220,9 @@ sub_813E768: @ 813E768
.align 2, 0
_0813E7D4: .4byte gUnknown_3005098
_0813E7D8: .4byte gUnknown_203AD30
_0813E7DC: .4byte gUnknown_2021CD0
_0813E7E0: .4byte gUnknown_2021D04
_0813E7E4: .4byte gUnknown_2021D18
_0813E7DC: .4byte gStringVar1
_0813E7E0: .4byte gStringVar3
_0813E7E4: .4byte gStringVar4
_0813E7E8: .4byte gUnknown_8416959
_0813E7EC: .4byte sub_813E7F0
thumb_func_end sub_813E768
@ -3245,7 +3245,7 @@ sub_813E7F0: @ 813E7F0
add r1, r9
mov r8, r1
movs r0, 0xF8
bl sub_80722CC
bl PlaySE
ldr r5, _0813E8C0 @ =gUnknown_203AD30
ldrh r0, [r5]
mov r2, r8
@ -3343,7 +3343,7 @@ sub_813E8D4: @ 813E8D4
beq _0813E906
_0813E8EE:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x2
bl sub_813EA98
movs r0, 0x2

18
asm/braille_text.s
View File

@ -55,7 +55,7 @@ _0814F8DA:
beq _0814F91C
subs r0, r1, 0x1
strb r0, [r6, 0x1E]
ldr r0, _0814F918 @ =gUnknown_3003E50
ldr r0, _0814F918 @ =gTextFlags
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
@ -79,9 +79,9 @@ _0814F904:
b _0814FB42
.align 2, 0
_0814F914: .4byte gMain
_0814F918: .4byte gUnknown_3003E50
_0814F918: .4byte gTextFlags
_0814F91C:
ldr r2, _0814F92C @ =gUnknown_3003E50
ldr r2, _0814F92C @ =gTextFlags
ldrb r1, [r2]
movs r0, 0x4
ands r0, r1
@ -90,7 +90,7 @@ _0814F91C:
movs r0, 0x1
b _0814F932
.align 2, 0
_0814F92C: .4byte gUnknown_3003E50
_0814F92C: .4byte gTextFlags
_0814F930:
ldrb r0, [r6, 0x1D]
_0814F932:
@ -385,7 +385,7 @@ _0814FB62:
bl DecompressGlyphFont6
adds r0, r6, 0
bl CopyGlyphToWindow
ldr r0, _0814FB84 @ =gGlyphBuffer1
ldr r0, _0814FB84 @ =gGlyphInfo
adds r0, 0x80
ldrb r1, [r6, 0xA]
ldrb r0, [r0]
@ -396,7 +396,7 @@ _0814FB62:
movs r0, 0
b _0814FC96
.align 2, 0
_0814FB84: .4byte gGlyphBuffer1
_0814FB84: .4byte gGlyphInfo
_0814FB88:
adds r0, r6, 0
bl TextPrinterWait
@ -433,7 +433,7 @@ _0814FBC4:
cmp r0, 0
beq _0814FB42
adds r0, r6, 0
bl sub_80055D4
bl TextPrinterClearDownArrow
ldrb r1, [r6, 0x5]
ldr r0, _0814FBF8 @ =gFonts
ldr r2, [r0]
@ -551,7 +551,7 @@ DecompressGlyphFont6: @ 814FC9C
ldr r0, _0814FCF8 @ =gUnknown_846FB0C
adds r1, r0
adds r5, r2, r1
ldr r4, _0814FCFC @ =gGlyphBuffer1
ldr r4, _0814FCFC @ =gGlyphInfo
adds r0, r5, 0
adds r1, r4, 0
bl DecompressGlyphTile
@ -583,7 +583,7 @@ DecompressGlyphFont6: @ 814FC9C
bx r0
.align 2, 0
_0814FCF8: .4byte gUnknown_846FB0C
_0814FCFC: .4byte gGlyphBuffer1
_0814FCFC: .4byte gGlyphInfo
thumb_func_end DecompressGlyphFont6
thumb_func_start GetGlyphWidthFont6

30
asm/cable_club.s
View File

@ -47,7 +47,7 @@ sub_808078C: @ 808078C
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r0, _080807DC @ =gUnknown_2021CD0
ldr r0, _080807DC @ =gStringVar1
movs r2, 0
movs r3, 0x1
bl ConvertIntToDecimalStringN
@ -56,7 +56,7 @@ sub_808078C: @ 808078C
adds r0, r4, 0
movs r1, 0
bl sub_80F7750
ldr r5, _080807E0 @ =gUnknown_2021D18
ldr r5, _080807E0 @ =gStringVar4
ldr r1, _080807E4 @ =gUnknown_841DF82
adds r0, r5, 0
bl StringExpandPlaceholders
@ -78,8 +78,8 @@ sub_808078C: @ 808078C
pop {r0}
bx r0
.align 2, 0
_080807DC: .4byte gUnknown_2021CD0
_080807E0: .4byte gUnknown_2021D18
_080807DC: .4byte gStringVar1
_080807E0: .4byte gStringVar4
_080807E4: .4byte gUnknown_841DF82
thumb_func_end sub_808078C
@ -176,7 +176,7 @@ _08080890:
movs r0, 0x9
b _080808B6
_08080894:
ldr r4, _080808B0 @ =gUnknown_2021CD0
ldr r4, _080808B0 @ =gStringVar1
bl GetLinkPlayerCount_2
adds r1, r0, 0
lsls r1, 24
@ -188,7 +188,7 @@ _08080894:
movs r0, 0x4
b _080808B6
.align 2, 0
_080808B0: .4byte gUnknown_2021CD0
_080808B0: .4byte gStringVar1
_080808B4:
movs r0, 0
_080808B6:
@ -445,7 +445,7 @@ sub_8080A4C: @ 8080A4C
cmp r0, 0x1
bne _08080AB0
movs r0, 0x15
bl sub_80722CC
bl PlaySE
ldr r0, _08080AA8 @ =gUnknown_81BC4CE
bl ShowFieldAutoScrollMessage
ldr r0, _08080AAC @ =sub_8080AD0
@ -456,7 +456,7 @@ _08080AA8: .4byte gUnknown_81BC4CE
_08080AAC: .4byte sub_8080AD0
_08080AB0:
movs r0, 0x16
bl sub_80722CC
bl PlaySE
ldr r0, _08080AC8 @ =gUnknown_81BC54C
bl ShowFieldAutoScrollMessage
ldr r0, _08080ACC @ =sub_8080CDC
@ -559,7 +559,7 @@ sub_8080B20: @ 8080B20
bl sub_800A900
ldrh r0, [r7, 0xA]
bl sub_80807E8
ldr r0, _08080BBC @ =gUnknown_2021CD0
ldr r0, _08080BBC @ =gStringVar1
adds r1, r5, 0
movs r2, 0
movs r3, 0x1
@ -581,7 +581,7 @@ _08080BA8:
.align 2, 0
_08080BB4: .4byte gUnknown_3005098
_08080BB8: .4byte gMain
_08080BBC: .4byte gUnknown_2021CD0
_08080BBC: .4byte gStringVar1
_08080BC0: .4byte gUnknown_81BC50D
_08080BC4: .4byte sub_8080BC8
thumb_func_end sub_8080B20
@ -643,7 +643,7 @@ _08080C3C:
cmp r0, 0
beq _08080C5C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_800A5BC
ldr r0, _08080C64 @ =gUnknown_3005090
lsls r1, r6, 2
@ -2404,7 +2404,7 @@ sub_8081A34: @ 8081A34
lsrs r4, 24
ldr r0, _08081A74 @ =gUnknown_20370C4
strh r4, [r0]
ldr r0, _08081A78 @ =gUnknown_2021CD0
ldr r0, _08081A78 @ =gStringVar1
lsls r1, r4, 3
subs r1, r4
lsls r1, 2
@ -2417,7 +2417,7 @@ sub_8081A34: @ 8081A34
lsrs r1, r0, 24
cmp r1, 0
beq _08081A88
ldr r0, _08081A80 @ =gUnknown_2021CF0
ldr r0, _08081A80 @ =gStringVar2
ldr r2, _08081A84 @ =gUnknown_83C6AB8
subs r1, 0x1
lsls r1, 2
@ -2428,9 +2428,9 @@ sub_8081A34: @ 8081A34
b _08081A8A
.align 2, 0
_08081A74: .4byte gUnknown_20370C4
_08081A78: .4byte gUnknown_2021CD0
_08081A78: .4byte gStringVar1
_08081A7C: .4byte gUnknown_2022744
_08081A80: .4byte gUnknown_2021CF0
_08081A80: .4byte gStringVar2
_08081A84: .4byte gUnknown_83C6AB8
_08081A88:
movs r0, 0

4
asm/clear_save_data_screen.s
View File

@ -219,13 +219,13 @@ sub_80F5708: @ 80F5708
bne _080F5792
_080F5736:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
b _080F577A
.align 2, 0
_080F5740: .4byte gUnknown_203AB54
_080F5744:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
movs r1, 0x11
bl FillWindowPixelBuffer

18
asm/coins.s
View File

@ -134,11 +134,11 @@ sub_80D060C: @ 80D060C
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
ldr r0, _080D0668 @ =gUnknown_2021CD0
ldr r0, _080D0668 @ =gStringVar1
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r0, _080D066C @ =gUnknown_2021D18
ldr r0, _080D066C @ =gStringVar4
mov r9, r0
ldr r1, _080D0670 @ =gUnknown_84162C4
bl StringExpandPlaceholders
@ -159,8 +159,8 @@ sub_80D060C: @ 80D060C
pop {r0}
bx r0
.align 2, 0
_080D0668: .4byte gUnknown_2021CD0
_080D066C: .4byte gUnknown_2021D18
_080D0668: .4byte gStringVar1
_080D066C: .4byte gStringVar4
_080D0670: .4byte gUnknown_84162C4
thumb_func_end sub_80D060C
@ -216,18 +216,18 @@ sub_80D06D0: @ 80D06D0
push {r4,lr}
sub sp, 0xC
adds r1, r0, 0
ldr r0, _080D071C @ =gUnknown_2021CD0
ldr r0, _080D071C @ =gStringVar1
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r4, _080D0720 @ =gUnknown_2021D18
ldr r4, _080D0720 @ =gStringVar4
ldr r1, _080D0724 @ =gUnknown_84162C4
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
adds r1, r4, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
ldr r1, _080D0728 @ =gUnknown_2039A28
ldrb r1, [r1]
movs r3, 0x40
@ -248,8 +248,8 @@ sub_80D06D0: @ 80D06D0
pop {r0}
bx r0
.align 2, 0
_080D071C: .4byte gUnknown_2021CD0
_080D0720: .4byte gUnknown_2021D18
_080D071C: .4byte gStringVar1
_080D0720: .4byte gStringVar4
_080D0724: .4byte gUnknown_84162C4
_080D0728: .4byte gUnknown_2039A28
thumb_func_end sub_80D06D0

46
asm/daycare.s
View File

@ -360,7 +360,7 @@ TakeSelectedPokemonFromDaycare: @ 804565C
push {r4-r7,lr}
sub sp, 0x68
adds r5, r0, 0
ldr r1, _080456F8 @ =gUnknown_2021CD0
ldr r1, _080456F8 @ =gStringVar1
bl GetBoxMonNick
adds r0, r5, 0
movs r1, 0xB
@ -425,7 +425,7 @@ _080456D8:
pop {r1}
bx r1
.align 2, 0
_080456F8: .4byte gUnknown_2021CD0
_080456F8: .4byte gStringVar1
_080456FC: .4byte gUnknown_2024284
thumb_func_end TakeSelectedPokemonFromDaycare
@ -530,12 +530,12 @@ GetNumLevelsGainedForDaycareMon: @ 80457B4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080457E0 @ =gUnknown_2021CF0
ldr r0, _080457E0 @ =gStringVar2
adds r1, r4, 0
movs r2, 0
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r1, _080457E4 @ =gUnknown_2021CD0
ldr r1, _080457E4 @ =gStringVar1
adds r0, r5, 0
bl GetBoxMonNick
adds r0, r4, 0
@ -543,8 +543,8 @@ GetNumLevelsGainedForDaycareMon: @ 80457B4
pop {r1}
bx r1
.align 2, 0
_080457E0: .4byte gUnknown_2021CF0
_080457E4: .4byte gUnknown_2021CD0
_080457E0: .4byte gStringVar2
_080457E4: .4byte gStringVar1
thumb_func_end GetNumLevelsGainedForDaycareMon
thumb_func_start GetDaycareCostForSelectedMon
@ -555,13 +555,13 @@ GetDaycareCostForSelectedMon: @ 80457E8
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, _08045818 @ =gUnknown_2021CD0
ldr r1, _08045818 @ =gStringVar1
adds r0, r5, 0
bl GetBoxMonNick
movs r0, 0x64
muls r4, r0
adds r4, 0x64
ldr r0, _0804581C @ =gUnknown_2021CF0
ldr r0, _0804581C @ =gStringVar2
adds r1, r4, 0
movs r2, 0
movs r3, 0x5
@ -571,8 +571,8 @@ GetDaycareCostForSelectedMon: @ 80457E8
pop {r1}
bx r1
.align 2, 0
_08045818: .4byte gUnknown_2021CD0
_0804581C: .4byte gUnknown_2021CF0
_08045818: .4byte gStringVar1
_0804581C: .4byte gStringVar2
thumb_func_end GetDaycareCostForSelectedMon
thumb_func_start GetDaycareCostForMon
@ -2163,14 +2163,14 @@ _GetDaycareMonNicknames: @ 804640C
bl GetBoxMonData
cmp r0, 0
beq _08046436
ldr r1, _08046454 @ =gUnknown_2021CD0
ldr r1, _08046454 @ =gStringVar1
adds r0, r4, 0
bl GetBoxMonNick
adds r0, r4, 0
movs r1, 0x7
mov r2, sp
bl GetBoxMonData
ldr r0, _08046458 @ =gUnknown_2021D04
ldr r0, _08046458 @ =gStringVar3
mov r1, sp
bl StringCopy
_08046436:
@ -2180,7 +2180,7 @@ _08046436:
bl GetBoxMonData
cmp r0, 0
beq _0804644C
ldr r1, _0804645C @ =gUnknown_2021CF0
ldr r1, _0804645C @ =gStringVar2
adds r0, r4, 0
bl GetBoxMonNick
_0804644C:
@ -2189,9 +2189,9 @@ _0804644C:
pop {r0}
bx r0
.align 2, 0
_08046454: .4byte gUnknown_2021CD0
_08046458: .4byte gUnknown_2021D04
_0804645C: .4byte gUnknown_2021CF0
_08046454: .4byte gStringVar1
_08046458: .4byte gStringVar3
_0804645C: .4byte gStringVar2
thumb_func_end _GetDaycareMonNicknames
thumb_func_start GetSelectedMonNickAndSpecies
@ -2204,7 +2204,7 @@ GetSelectedMonNickAndSpecies: @ 8046460
muls r0, r5
ldr r4, _08046494 @ =gUnknown_2024284
adds r0, r4
ldr r1, _08046498 @ =gUnknown_2021CD0
ldr r1, _08046498 @ =gStringVar1
bl GetBoxMonNick
bl GetCursorSelectionMonId
lsls r0, 24
@ -2220,7 +2220,7 @@ GetSelectedMonNickAndSpecies: @ 8046460
bx r1
.align 2, 0
_08046494: .4byte gUnknown_2024284
_08046498: .4byte gUnknown_2021CD0
_08046498: .4byte gStringVar1
thumb_func_end GetSelectedMonNickAndSpecies
thumb_func_start GetDaycareMonNicknames
@ -2522,7 +2522,7 @@ _080466A8:
bne _080466AE
movs r1, 0
_080466AE:
ldr r0, _080466C0 @ =gUnknown_2021D18
ldr r0, _080466C0 @ =gStringVar4
ldr r2, _080466C4 @ =gUnknown_825F82C
lsls r1, 2
adds r1, r2
@ -2531,7 +2531,7 @@ _080466AE:
pop {r0}
bx r0
.align 2, 0
_080466C0: .4byte gUnknown_2021D18
_080466C0: .4byte gStringVar4
_080466C4: .4byte gUnknown_825F82C
thumb_func_end SetDaycareCompatibilityString
@ -2799,7 +2799,7 @@ DaycareAddTextPrinter: @ 8046898
adds r0, r2, 0
ands r0, r1
strb r0, [r3, 0xC]
ldr r3, _08046908 @ =gUnknown_3003E50
ldr r3, _08046908 @ =gTextFlags
ldrb r1, [r3]
movs r0, 0x3
negs r0, r0
@ -2836,7 +2836,7 @@ DaycareAddTextPrinter: @ 8046898
pop {r0}
bx r0
.align 2, 0
_08046908: .4byte gUnknown_3003E50
_08046908: .4byte gTextFlags
thumb_func_end DaycareAddTextPrinter
thumb_func_start DaycarePrintMonNick
@ -2905,7 +2905,7 @@ DaycarePrintMonLvl: @ 8046944
movs r0, 0x3
mov r1, sp
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r2, 0x84
subs r2, r0
adds r0, r5, 0

4
asm/diploma.s
View File

@ -545,7 +545,7 @@ _080F5050:
movs r0, 0x2
add r1, sp, 0xC
adds r2, r5, 0
bl sub_8005ED4
bl GetStringWidth
lsrs r2, r0, 1
movs r4, 0x78
subs r2, r4, r2
@ -566,7 +566,7 @@ _080F5050:
movs r0, 0x2
add r1, sp, 0xC
adds r2, r5, 0
bl sub_8005ED4
bl GetStringWidth
lsrs r0, 1
subs r4, r0
lsls r4, 24

8
asm/easy_chat.s
View File

@ -560,7 +560,7 @@ _080BDAF4:
_080BDAF6:
movs r3, 0x2
_080BDAF8:
ldr r4, _080BDB18 @ =gUnknown_2021D18
ldr r4, _080BDB18 @ =gStringVar4
adds r0, r4, 0
adds r1, r5, 0
bl ConvertEasyChatWordsToString
@ -573,7 +573,7 @@ _080BDB08:
.align 2, 0
_080BDB10: .4byte gSaveBlock1Ptr
_080BDB14: .4byte 0x00002cc4
_080BDB18: .4byte gUnknown_2021D18
_080BDB18: .4byte gStringVar4
thumb_func_end sub_80BDA7C
thumb_func_start sub_80BDB1C
@ -591,12 +591,12 @@ _080BDB2E:
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
ldr r0, _080BDB44 @ =gUnknown_2021CF0
ldr r0, _080BDB44 @ =gStringVar2
bl CopyEasyChatWord
pop {r0}
bx r0
.align 2, 0
_080BDB44: .4byte gUnknown_2021CF0
_080BDB44: .4byte gStringVar2
thumb_func_end sub_80BDB1C
thumb_func_start sub_80BDB48

50
asm/egg_hatch.s
View File

@ -218,7 +218,7 @@ AddHatchedMonToParty: @ 8046D60
adds r0, r4, 0
movs r1, 0x3
bl sub_8088E74
ldr r1, _08046E1C @ =gUnknown_2021CD0
ldr r1, _08046E1C @ =gStringVar1
adds r0, r5, 0
bl GetMonNick
mov r2, sp
@ -252,7 +252,7 @@ AddHatchedMonToParty: @ 8046D60
.align 2, 0
_08046E14: .4byte gUnknown_2024284
_08046E18: .4byte gUnknown_202402C
_08046E1C: .4byte gUnknown_2021CD0
_08046E1C: .4byte gStringVar1
thumb_func_end AddHatchedMonToParty
thumb_func_start ScriptHatchMon
@ -299,22 +299,22 @@ sub_8046E34: @ 8046E34
cmp r0, 0
beq _08046EA0
_08046E74:
ldr r0, _08046E94 @ =gUnknown_2021CD0
ldr r0, _08046E94 @ =gStringVar1
mov r1, sp
bl StringCopy
ldr r0, _08046E98 @ =gUnknown_2021CF0
ldr r0, _08046E98 @ =gStringVar2
adds r1, r4, 0
bl StringCopy
ldr r0, _08046E9C @ =gUnknown_2021D04
ldr r0, _08046E9C @ =gStringVar3
adds r1, r5, 0
bl StringCopy
movs r0, 0x1
b _08046EA2
.align 2, 0
_08046E90: .4byte gSaveBlock2Ptr
_08046E94: .4byte gUnknown_2021CD0
_08046E98: .4byte gUnknown_2021CF0
_08046E9C: .4byte gUnknown_2021D04
_08046E94: .4byte gStringVar1
_08046E98: .4byte gStringVar2
_08046E9C: .4byte gStringVar3
_08046EA0:
movs r0, 0
_08046EA2:
@ -776,7 +776,7 @@ EggHatchSetMonNickname: @ 80472A0
muls r0, r1
ldr r1, _080472D4 @ =gUnknown_2024284
adds r0, r1
ldr r2, _080472D8 @ =gUnknown_2021D04
ldr r2, _080472D8 @ =gStringVar3
movs r1, 0x2
bl sub_804037C
bl FreeMonSpritesGfx
@ -791,7 +791,7 @@ EggHatchSetMonNickname: @ 80472A0
.align 2, 0
_080472D0: .4byte gUnknown_20370C0
_080472D4: .4byte gUnknown_2024284
_080472D8: .4byte gUnknown_2021D04
_080472D8: .4byte gStringVar3
_080472DC: .4byte gUnknown_3000E74
_080472E0: .4byte c2_exit_to_overworld_2_switch
thumb_func_end EggHatchSetMonNickname
@ -999,9 +999,9 @@ _08047482:
muls r0, r1
ldr r1, _080474D4 @ =gUnknown_2024284
adds r0, r1
ldr r1, _080474D8 @ =gUnknown_2021CD0
ldr r1, _080474D8 @ =gStringVar1
bl GetMonNick
ldr r4, _080474DC @ =gUnknown_2021D18
ldr r4, _080474DC @ =gStringVar4
ldr r1, _080474E0 @ =gUnknown_841B6FD
adds r0, r4, 0
bl StringExpandPlaceholders
@ -1029,8 +1029,8 @@ _08047482:
b _08047684
.align 2, 0
_080474D4: .4byte gUnknown_2024284
_080474D8: .4byte gUnknown_2021CD0
_080474DC: .4byte gUnknown_2021D18
_080474D8: .4byte gStringVar1
_080474DC: .4byte gStringVar4
_080474E0: .4byte gUnknown_841B6FD
_080474E4: .4byte 0x00000103
_080474E8:
@ -1056,9 +1056,9 @@ _08047504:
muls r0, r1
ldr r1, _08047538 @ =gUnknown_2024284
adds r0, r1
ldr r1, _0804753C @ =gUnknown_2021CD0
ldr r1, _0804753C @ =gStringVar1
bl GetMonNick
ldr r4, _08047540 @ =gUnknown_2021D18
ldr r4, _08047540 @ =gStringVar4
ldr r1, _08047544 @ =gUnknown_841B716
adds r0, r4, 0
bl StringExpandPlaceholders
@ -1074,8 +1074,8 @@ _08047504:
b _08047648
.align 2, 0
_08047538: .4byte gUnknown_2024284
_0804753C: .4byte gUnknown_2021CD0
_08047540: .4byte gUnknown_2021D18
_0804753C: .4byte gStringVar1
_08047540: .4byte gStringVar4
_08047544: .4byte gUnknown_841B716
_08047548:
ldr r0, [r5]
@ -1136,7 +1136,7 @@ _080475A8:
adds r0, r1, 0
ldr r6, _08047628 @ =gUnknown_2024284
adds r0, r6
ldr r1, _0804762C @ =gUnknown_2021D04
ldr r1, _0804762C @ =gStringVar3
mov r10, r1
bl GetMonNick
mov r1, r9
@ -1184,7 +1184,7 @@ _080475A8:
.align 2, 0
_08047624: .4byte gUnknown_3000E74
_08047628: .4byte gUnknown_2024284
_0804762C: .4byte gUnknown_2021D04
_0804762C: .4byte gStringVar3
_08047630: .4byte EggHatchSetMonNickname
_08047634:
movs r0, 0x1
@ -1276,7 +1276,7 @@ _080476D0:
cmp r0, 0xF
bne _08047700
movs r0, 0x17
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
movs r1, 0x1
bl StartSpriteAnim
@ -1329,7 +1329,7 @@ _08047738:
cmp r0, 0xF
bne _08047764
movs r0, 0x17
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
movs r1, 0x2
bl StartSpriteAnim
@ -1412,7 +1412,7 @@ _080477E4:
cmp r0, 0xF
bne _08047818
movs r0, 0x17
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
movs r1, 0x2
bl StartSpriteAnim
@ -1424,7 +1424,7 @@ _08047818:
cmp r0, 0x1E
bne _08047826
movs r0, 0x17
bl sub_80722CC
bl PlaySE
_08047826:
pop {r4-r6}
pop {r0}
@ -1498,7 +1498,7 @@ _0804788C:
cmp r4, 0
bne _080478BA
movs r0, 0x6A
bl sub_80722CC
bl PlaySE
adds r2, r5, 0
adds r2, 0x3E
ldrb r0, [r2]

10
asm/evolution_graphics.s
View File

@ -636,7 +636,7 @@ sub_80F5DD0: @ 80F5DD0
ldr r0, _080F5E1C @ =EvoTask_CreatePreEvoSparkleSet1
str r0, [r5]
movs r0, 0x85
bl sub_80722CC
bl PlaySE
add sp, 0x4
pop {r4,r5}
pop {r0}
@ -768,7 +768,7 @@ sub_80F5ED8: @ 80F5ED8
ldr r1, _080F5F08 @ =EvoTask_CreatePreEvoSparklesSet2
str r1, [r0]
movs r0, 0xB0
bl sub_80722CC
bl PlaySE
pop {r4}
pop {r0}
bx r0
@ -867,7 +867,7 @@ sub_80F5F8C: @ 80F5F8C
ldr r1, _080F5FBC @ =EvoTask_CreatePostEvoSparklesSet1
str r1, [r0]
movs r0, 0x5F
bl sub_80722CC
bl PlaySE
pop {r4}
pop {r0}
bx r0
@ -1011,7 +1011,7 @@ sub_80F6080: @ 80F6080
ldr r0, _080F60E0 @ =sub_80F60E4
str r0, [r5]
movs r0, 0xC3
bl sub_80722CC
bl PlaySE
add sp, 0x4
pop {r4,r5}
pop {r0}
@ -1173,7 +1173,7 @@ sub_80F61C0: @ 80F61C0
ldr r0, _080F6220 @ =sub_80F6224
str r0, [r5]
movs r0, 0xC3
bl sub_80722CC
bl PlaySE
add sp, 0x4
pop {r4,r5}
pop {r0}

70
asm/evolution_scene.s
View File

@ -213,10 +213,10 @@ EvolutionScene: @ 80CDDF4
movs r1, 0x2
mov r2, sp
bl GetMonData
ldr r0, _080CE0AC @ =gUnknown_2021CD0
ldr r0, _080CE0AC @ =gStringVar1
mov r1, sp
bl StringCopy10
ldr r0, _080CE0B0 @ =gUnknown_2021CF0
ldr r0, _080CE0B0 @ =gStringVar2
movs r1, 0xB
mov r2, r10
muls r2, r1
@ -412,8 +412,8 @@ _080CE09C: .4byte gUnknown_2022982
_080CE0A0: .4byte gUnknown_2022B50
_080CE0A4: .4byte gUnknown_3003E58
_080CE0A8: .4byte gUnknown_2039A20
_080CE0AC: .4byte gUnknown_2021CD0
_080CE0B0: .4byte gUnknown_2021CF0
_080CE0AC: .4byte gStringVar1
_080CE0B0: .4byte gStringVar2
_080CE0B4: .4byte gUnknown_8245EE0
_080CE0B8: .4byte gUnknown_82350AC
_080CE0BC: .4byte gUnknown_202401C
@ -915,10 +915,10 @@ TradeEvolutionScene: @ 80CE540
movs r1, 0x2
mov r2, sp
bl GetMonData
ldr r0, _080CE6B0 @ =gUnknown_2021CD0
ldr r0, _080CE6B0 @ =gStringVar1
mov r1, sp
bl StringCopy10
ldr r0, _080CE6B4 @ =gUnknown_2021CF0
ldr r0, _080CE6B4 @ =gStringVar2
movs r1, 0xB
muls r1, r5
ldr r2, _080CE6B8 @ =gUnknown_8245EE0
@ -1046,7 +1046,7 @@ TradeEvolutionScene: @ 80CE540
strh r0, [r1]
ldr r0, _080CE700 @ =gUnknown_2022982
strh r4, [r0]
ldr r2, _080CE704 @ =gUnknown_3003E50
ldr r2, _080CE704 @ =gTextFlags
ldrb r0, [r2]
movs r1, 0x2
orrs r0, r1
@ -1064,8 +1064,8 @@ TradeEvolutionScene: @ 80CE540
pop {r0}
bx r0
.align 2, 0
_080CE6B0: .4byte gUnknown_2021CD0
_080CE6B4: .4byte gUnknown_2021CF0
_080CE6B0: .4byte gStringVar1
_080CE6B4: .4byte gStringVar2
_080CE6B8: .4byte gUnknown_8245EE0
_080CE6BC: .4byte gUnknown_2021CCC
_080CE6C0: .4byte gUnknown_2039A20
@ -1085,7 +1085,7 @@ _080CE6F4: .4byte gUnknown_202297C
_080CE6F8: .4byte gUnknown_202297E
_080CE6FC: .4byte gUnknown_2022980
_080CE700: .4byte gUnknown_2022982
_080CE704: .4byte gUnknown_3003E50
_080CE704: .4byte gTextFlags
_080CE708: .4byte sub_80D00D8
_080CE70C: .4byte sub_80CE72C
thumb_func_end TradeEvolutionScene
@ -1491,7 +1491,7 @@ _080CEA90:
beq _080CEAA0
bl _080CF528
_080CEAA0:
ldr r4, _080CEAC4 @ =gUnknown_2021D18
ldr r4, _080CEAC4 @ =gStringVar4
ldr r1, _080CEAC8 @ =gUnknown_83FE672
adds r0, r4, 0
bl StringExpandPlaceholders
@ -1506,7 +1506,7 @@ _080CEAA0:
b _080CEFDE
.align 2, 0
_080CEAC0: .4byte gUnknown_2037AB8
_080CEAC4: .4byte gUnknown_2021D18
_080CEAC4: .4byte gStringVar4
_080CEAC8: .4byte gUnknown_83FE672
_080CEACC: .4byte gUnknown_3005090
_080CEAD0:
@ -1533,7 +1533,7 @@ _080CEAF0:
bl _080CF528
_080CEAFE:
ldr r0, _080CEB10 @ =0x00000107
bl sub_80722CC
bl PlaySE
ldr r0, _080CEB14 @ =gUnknown_3005090
mov r2, r8
adds r1, r2, r7
@ -1732,7 +1732,7 @@ _080CEC94:
bl _080CF528
_080CECAA:
movs r0, 0x1B
bl sub_80722CC
bl PlaySE
mov r2, r8
adds r1, r2, r7
lsls r1, 3
@ -1796,7 +1796,7 @@ _080CED2C:
bne _080CED3A
bl _080CF528
_080CED3A:
ldr r4, _080CEDA8 @ =gUnknown_2021D18
ldr r4, _080CEDA8 @ =gStringVar4
ldr r1, _080CEDAC @ =gUnknown_83FE688
adds r0, r4, 0
bl StringExpandPlaceholders
@ -1840,7 +1840,7 @@ _080CED3A:
bl IncrementGameStat
b _080CF528
.align 2, 0
_080CEDA8: .4byte gUnknown_2021D18
_080CEDA8: .4byte gStringVar4
_080CEDAC: .4byte gUnknown_83FE688
_080CEDB0: .4byte 0x00000103
_080CEDB4: .4byte gUnknown_3005090
@ -2040,20 +2040,20 @@ _080CEF48:
ldrsh r0, [r1, r3]
cmp r0, 0
beq _080CEF70
ldr r0, _080CEF68 @ =gUnknown_2021D18
ldr r0, _080CEF68 @ =gStringVar4
ldr r1, _080CEF6C @ =gUnknown_83FE6D0
bl StringExpandPlaceholders
b _080CEF78
.align 2, 0
_080CEF64: .4byte gUnknown_3005090
_080CEF68: .4byte gUnknown_2021D18
_080CEF68: .4byte gStringVar4
_080CEF6C: .4byte gUnknown_83FE6D0
_080CEF70:
ldr r0, _080CEF90 @ =gUnknown_2021D18
ldr r0, _080CEF90 @ =gStringVar4
ldr r1, _080CEF94 @ =gUnknown_83FE6B5
bl StringExpandPlaceholders
_080CEF78:
ldr r0, _080CEF90 @ =gUnknown_2021D18
ldr r0, _080CEF90 @ =gStringVar4
movs r1, 0
bl sub_80D87BC
ldr r1, _080CEF98 @ =gUnknown_3005090
@ -2065,7 +2065,7 @@ _080CEF78:
strh r1, [r0, 0x1A]
b _080CF4F2
.align 2, 0
_080CEF90: .4byte gUnknown_2021D18
_080CEF90: .4byte gStringVar4
_080CEF94: .4byte gUnknown_83FE6B5
_080CEF98: .4byte gUnknown_3005090
_080CEF9C:
@ -2321,7 +2321,7 @@ _080CF1BC:
cmp r0, 0
beq _080CF1E2
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_802DCF8
movs r0, 0
strb r0, [r4, 0x1]
@ -2338,7 +2338,7 @@ _080CF1E2:
cmp r0, 0
bne _080CF208
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_802DCF8
movs r0, 0x1
strb r0, [r4, 0x1]
@ -2358,7 +2358,7 @@ _080CF208:
movs r3, 0xD
bl sub_802DB7C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _080CF248 @ =gUnknown_2023E82
ldrb r2, [r0, 0x1]
cmp r2, 0
@ -2411,7 +2411,7 @@ _080CF284:
movs r3, 0xD
bl sub_802DB7C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _080CF2AC @ =gUnknown_3005090
mov r2, r8
adds r0, r2, r7
@ -2810,7 +2810,7 @@ _080CF5CC:
.4byte _080CFB34
.4byte _080CFB70
_080CF620:
ldr r4, _080CF640 @ =gUnknown_2021D18
ldr r4, _080CF640 @ =gStringVar4
ldr r1, _080CF644 @ =gUnknown_83FE672
adds r0, r4, 0
bl StringExpandPlaceholders
@ -2824,7 +2824,7 @@ _080CF620:
adds r1, r0
b _080CFB1A
.align 2, 0
_080CF640: .4byte gUnknown_2021D18
_080CF640: .4byte gStringVar4
_080CF644: .4byte gUnknown_83FE672
_080CF648: .4byte gUnknown_3005090
_080CF64C:
@ -2853,7 +2853,7 @@ _080CF67A:
lsls r0, 1
bl m4aSongNumStop
ldr r0, _080CF694 @ =0x00000107
bl sub_80722CC
bl PlaySE
ldr r0, _080CF698 @ =gUnknown_3005090
adds r1, r7, r6
lsls r1, 3
@ -3064,7 +3064,7 @@ _080CF838:
bl _080D003A
_080CF84E:
movs r0, 0x1B
bl sub_80722CC
bl PlaySE
adds r1, r7, r6
lsls r1, 3
adds r1, r5
@ -3103,7 +3103,7 @@ _080CF89C:
bne _080CF8A8
b _080D003A
_080CF8A8:
ldr r4, _080CF914 @ =gUnknown_2021D18
ldr r4, _080CF914 @ =gStringVar4
ldr r1, _080CF918 @ =gUnknown_83FE688
adds r0, r4, 0
bl StringExpandPlaceholders
@ -3147,7 +3147,7 @@ _080CF8A8:
bl IncrementGameStat
b _080D003A
.align 2, 0
_080CF914: .4byte gUnknown_2021D18
_080CF914: .4byte gStringVar4
_080CF918: .4byte gUnknown_83FE688
_080CF91C: .4byte 0x00000103
_080CF920: .4byte gUnknown_3005090
@ -3246,7 +3246,7 @@ _080CF9E0:
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r2, _080CFA0C @ =gUnknown_3003E50
ldr r2, _080CFA0C @ =gTextFlags
ldrb r1, [r2]
movs r0, 0x3
negs r0, r0
@ -3258,7 +3258,7 @@ _080CF9E0:
b _080D003A
.align 2, 0
_080CFA08: .4byte gUnknown_2039A20
_080CFA0C: .4byte gUnknown_3003E50
_080CFA0C: .4byte gTextFlags
_080CFA10: .4byte gUnknown_300537C
_080CFA14:
ldr r0, _080CFA60 @ =gUnknown_2023E82
@ -3334,7 +3334,7 @@ _080CFA9C:
bne _080CFAA8
b _080D003A
_080CFAA8:
ldr r4, _080CFACC @ =gUnknown_2021D18
ldr r4, _080CFACC @ =gStringVar4
ldr r1, _080CFAD0 @ =gUnknown_83FE6D0
adds r0, r4, 0
bl StringExpandPlaceholders
@ -3350,7 +3350,7 @@ _080CFAA8:
strh r1, [r0, 0x1A]
b _080D0006
.align 2, 0
_080CFACC: .4byte gUnknown_2021D18
_080CFACC: .4byte gStringVar4
_080CFAD0: .4byte gUnknown_83FE6D0
_080CFAD4: .4byte gUnknown_3005090
_080CFAD8:

34
asm/fame_checker.s
View File

@ -51,7 +51,7 @@ sub_812C3AC: @ 812C3AC
ands r0, r2
strb r0, [r1]
movs r0, 0xC7
bl sub_80722CC
bl PlaySE
ldr r0, _0812C3F4 @ =sub_812C3F8
bl SetMainCallback2
pop {r4,r5}
@ -404,7 +404,7 @@ _0812C6E8:
cmp r0, 0x1
bne _0812C728
movs r0, 0xCB
bl sub_80722CC
bl PlaySE
b _0812C8EA
.align 2, 0
_0812C714: .4byte gUnknown_3005090
@ -423,7 +423,7 @@ _0812C728:
b _0812C8EA
_0812C738:
movs r0, 0xCB
bl sub_80722CC
bl PlaySE
movs r0, 0x58
str r0, [sp]
movs r0, 0x20
@ -534,7 +534,7 @@ _0812C828:
cmp r0, 0
beq _0812C8EA
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r1, 0xA
ldrsh r0, [r7, r1]
bl sub_812D724
@ -917,7 +917,7 @@ _0812CB2E:
cmp r0, 0
beq _0812CBB8
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r4, 0
ldr r6, _0812CBA4 @ =gUnknown_203B0FC
_0812CB44:
@ -1079,7 +1079,7 @@ sub_812CC68: @ 812CC68
ldr r1, _0812CD18 @ =gUnknown_3005098
adds r6, r0, r1
movs r0, 0xBB
bl sub_80722CC
bl PlaySE
ldr r2, _0812CD1C @ =gUnknown_202063C
movs r0, 0
ldrsh r1, [r6, r0]
@ -1217,7 +1217,7 @@ _0812CD88:
movs r0, 0x10
mov r8, r0
_0812CDAC:
ldr r4, _0812CDFC @ =gUnknown_2021D18
ldr r4, _0812CDFC @ =gStringVar4
ldr r1, _0812CE00 @ =gUnknown_845F63C
ldr r0, [r7]
adds r0, 0xC
@ -1254,7 +1254,7 @@ _0812CDEE:
pop {r0}
bx r0
.align 2, 0
_0812CDFC: .4byte gUnknown_2021D18
_0812CDFC: .4byte gStringVar4
_0812CE00: .4byte gUnknown_845F63C
thumb_func_end sub_812CD3C
@ -1282,7 +1282,7 @@ sub_812CE04: @ 812CE04
movs r2, 0
movs r3, 0
bl FillWindowPixelRect
ldr r6, _0812CE90 @ =gUnknown_2021D18
ldr r6, _0812CE90 @ =gStringVar4
ldr r2, _0812CE94 @ =gUnknown_845F6BC
ldr r0, _0812CE98 @ =gUnknown_203B0FC
ldr r0, [r0]
@ -1324,7 +1324,7 @@ sub_812CE04: @ 812CE04
bx r0
.align 2, 0
_0812CE8C: .4byte gUnknown_3005098
_0812CE90: .4byte gUnknown_2021D18
_0812CE90: .4byte gStringVar4
_0812CE94: .4byte gUnknown_845F6BC
_0812CE98: .4byte gUnknown_203B0FC
thumb_func_end sub_812CE04
@ -1426,7 +1426,7 @@ sub_812CF3C: @ 812CF3C
lsls r4, 24
lsrs r4, 24
movs r0, 0xC7
bl sub_80722CC
bl PlaySE
movs r0, 0x1
negs r0, r0
movs r1, 0
@ -1635,7 +1635,7 @@ _0812D10A:
movs r0, 0
adds r1, r5, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
adds r4, r0, 0
movs r0, 0xC0
str r0, [sp]
@ -2831,7 +2831,7 @@ sub_812DA14: @ 812DA14
movs r0, 0
adds r1, r6, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r4, 0x54
subs r0, r4, r0
lsrs r1, r0, 31
@ -2856,7 +2856,7 @@ sub_812DA14: @ 812DA14
movs r1, 0
movs r3, 0
bl AddTextPrinterParametrized2
ldr r6, _0812DB08 @ =gUnknown_2021CD0
ldr r6, _0812DB08 @ =gStringVar1
ldr r0, _0812DB0C @ =gUnknown_845FA1C
adds r5, r0
ldr r1, [r5]
@ -2865,7 +2865,7 @@ sub_812DA14: @ 812DA14
movs r0, 0
adds r1, r6, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
subs r4, r0
lsrs r0, r4, 31
adds r4, r0
@ -2899,7 +2899,7 @@ _0812DAF8: .4byte gUnknown_203B0FC
_0812DAFC: .4byte gUnknown_3005EC8
_0812DB00: .4byte gUnknown_845F89C
_0812DB04: .4byte gUnknown_845F5E3
_0812DB08: .4byte gUnknown_2021CD0
_0812DB08: .4byte gStringVar1
_0812DB0C: .4byte gUnknown_845FA1C
thumb_func_end sub_812DA14
@ -3032,7 +3032,7 @@ _0812DBFE:
ldr r1, _0812DC74 @ =gUnknown_3005090
adds r5, r0, r1
movs r0, 0x5
bl sub_80722CC
bl PlaySE
mov r0, r8
strh r0, [r5, 0xA]
ldr r0, [r6]

10
asm/field_control_avatar.s
View File

@ -566,7 +566,7 @@ _0806CCCC:
ldr r0, _0806CCF8 @ =0x0000083e
bl FlagSet
movs r0, 0x6
bl sub_80722CC
bl PlaySE
bl sub_806F258
b _0806CB6C
.align 2, 0
@ -707,7 +707,7 @@ sub_806CDF8: @ 806CDF8
cmp r0, 0
bne _0806CE18
movs r0, 0x6
bl sub_80722CC
bl PlaySE
bl sub_806F258
adds r0, r4, 0
bl DestroyTask
@ -805,7 +805,7 @@ _0806CEB8:
cmp r4, r0
beq _0806CECA
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0806CECA:
adds r0, r4, 0
bl ScriptContext1_SetupScript
@ -2803,7 +2803,7 @@ sub_806DE28: @ 806DE28
cmp r0, 0x66
bne _0806DE64
movs r0, 0x25
bl sub_80722CC
bl PlaySE
ldrb r0, [r5, 0x8]
ldr r4, _0806DE6C @ =gSaveBlock1Ptr
ldr r2, [r4]
@ -2992,7 +2992,7 @@ _0806DF98:
bl sub_8055A08
bl sp13E_warp_to_last_warp
movs r0, 0xE2
bl sub_80722CC
bl PlaySE
movs r0, 0x1
b _0806DFB2
_0806DFB0:

32
asm/field_effect.s
View File

@ -1464,7 +1464,7 @@ _08083EA4:
subs r0, 0x1
strh r0, [r4, 0x3A]
movs r0, 0x17
bl sub_80722CC
bl PlaySE
_08083F00:
movs r1, 0x3A
ldrsh r0, [r4, r1]
@ -2343,7 +2343,7 @@ sub_8084580: @ 8084580
ands r0, r2
strb r0, [r1, 0x1]
movs r0, 0x25
bl sub_80722CC
bl PlaySE
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@ -2431,7 +2431,7 @@ _08084674:
cmp r0, 0
blt _08084698
movs r0, 0xCF
bl sub_80722CC
bl PlaySE
ldrb r0, [r6]
movs r1, 0x8
orrs r0, r1
@ -2685,7 +2685,7 @@ _0808484A:
strh r0, [r5, 0x8]
_08084878:
movs r0, 0x49
bl sub_80722CC
bl PlaySE
_0808487E:
movs r0, 0
pop {r4,r5}
@ -3710,7 +3710,7 @@ sub_808500C: @ 808500C
movs r0, 0x32
bl FieldEffectStart
movs r0, 0xAB
bl sub_80722CC
bl PlaySE
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@ -4063,7 +4063,7 @@ sub_80852C0: @ 80852C0
strb r0, [r4, 0x1]
bl CameraObjectReset1
movs r0, 0xA8
bl sub_80722CC
bl PlaySE
movs r0, 0x4
bl sub_8064194
adds r1, r0, 0
@ -4313,7 +4313,7 @@ _080854C4:
adds r0, r4, 0
bl sub_8063CA4
movs r0, 0x21
bl sub_80722CC
bl PlaySE
_080854E4:
movs r0, 0
pop {r4-r6}
@ -4568,7 +4568,7 @@ sub_8085690: @ 8085690
cmp r0, 0x14
bne _08085702
movs r0, 0x27
bl sub_80722CC
bl PlaySE
b _08085702
.align 2, 0
_080856D4: .4byte gUnknown_2037078
@ -4942,7 +4942,7 @@ _0808599C:
cmp r0, 0
blt _080859C2
movs r0, 0x1E
bl sub_80722CC
bl PlaySE
bl CameraObjectReset1
ldrh r0, [r5]
adds r0, 0x1
@ -5030,7 +5030,7 @@ sub_8085A54: @ 8085A54
cmp r0, 0
beq _08085A78
movs r0, 0x28
bl sub_80722CC
bl PlaySE
bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
@ -5273,7 +5273,7 @@ _08085C1C:
movs r0, 0x1
strh r0, [r4, 0xE]
movs r0, 0x27
bl sub_80722CC
bl PlaySE
_08085C4A:
add sp, 0x8
pop {r4,r5}
@ -5545,7 +5545,7 @@ sub_8085E0C: @ 8085E0C
lsrs r0, 24
strh r0, [r6, 0x26]
movs r0, 0x27
bl sub_80722CC
bl PlaySE
_08085E82:
pop {r4-r6}
pop {r0}
@ -7460,7 +7460,7 @@ sub_8086D38: @ 8086D38
ldr r0, [r0]
strh r0, [r2, 0x30]
movs r0, 0x97
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
pop {r4}
pop {r1}
@ -7773,7 +7773,7 @@ _08086FCE:
adds r0, 0x1
strh r0, [r4, 0x8]
movs r0, 0x97
bl sub_80722CC
bl PlaySE
ldrb r0, [r4, 0xA]
bl sub_80871C8
_08086FEC:
@ -9357,7 +9357,7 @@ sub_8087C00: @ 8087C00
lsls r4, 24
lsrs r4, 24
movs r0, 0x51
bl sub_80722CC
bl PlaySE
strh r4, [r5, 0xA]
ldrh r0, [r5, 0x2]
adds r0, 0x1
@ -9413,7 +9413,7 @@ sub_8087C2C: @ 8087C2C
adds r0, r4, 0
bl sub_8087CFC
movs r0, 0x50
bl sub_80722CC
bl PlaySE
ldrb r0, [r7, 0xA]
bl sub_8087BA8
movs r0, 0

4
asm/field_effect_helpers.s
View File

@ -1892,7 +1892,7 @@ FldEff_Splash: @ 80DBB88
subs r0, 0x4
strh r0, [r3, 0x26]
movs r0, 0x3F
bl sub_80722CC
bl PlaySE
_080DBC12:
movs r0, 0
pop {r4-r6}
@ -2250,7 +2250,7 @@ _080DBE98:
cmp r0, 0
bne _080DBEE2
movs r0, 0x3F
bl sub_80722CC
bl PlaySE
_080DBEE2:
add sp, 0x4
pop {r4,r5}

16
asm/field_fadetransition.s
View File

@ -591,7 +591,7 @@ sub_807DF94: @ 807DF94
bl pal_fill_for_maplights
bl sub_8111CF0
movs r0, 0x28
bl sub_80722CC
bl PlaySE
ldr r0, _0807DFB8 @ =sub_807E31C
movs r1, 0xA
bl CreateTask
@ -694,7 +694,7 @@ _0807E074:
bl sub_805B364
lsls r0, 16
lsrs r0, 16
bl sub_80722CC
bl PlaySE
movs r1, 0
ldrsh r0, [r6, r1]
movs r2, 0
@ -1161,7 +1161,7 @@ sub_807E438: @ 807E438
bl sub_807DC18
bl play_some_sound
movs r0, 0x9
bl sub_80722CC
bl PlaySE
ldr r0, _0807E464 @ =gUnknown_3005020
ldr r1, _0807E468 @ =sub_807DF64
str r1, [r0]
@ -1431,7 +1431,7 @@ sub_807E654: @ 807E654
bl sub_8055F88
bl sub_807DC18
movs r0, 0x9
bl sub_80722CC
bl PlaySE
ldr r0, _0807E674 @ =sub_807E5EC
movs r1, 0xA
bl CreateTask
@ -1473,7 +1473,7 @@ _0807E6A6:
bl fade_screen
bl sub_8055F88
movs r0, 0x9
bl sub_80722CC
bl PlaySE
b _0807E6D4
_0807E6BE:
bl sub_807E40C
@ -1607,7 +1607,7 @@ _0807E7B6:
bl player_bitmagic
bl ScriptContext2_Enable
movs r0, 0x27
bl sub_80722CC
bl PlaySE
bl sub_805DAB0
b _0807E7EA
_0807E7CA:
@ -1693,7 +1693,7 @@ _0807E85C:
bl sub_805B364
lsls r0, 16
lsrs r0, 16
bl sub_80722CC
bl PlaySE
movs r1, 0
ldrsh r0, [r4, r1]
movs r2, 0
@ -1904,7 +1904,7 @@ _0807EA10:
adds r2, r5, 0x6
bl sub_807EB64
movs r0, 0x9
bl sub_80722CC
bl PlaySE
b _0807EA92
_0807EA38:
movs r1, 0x4

12
asm/field_message_box.s
View File

@ -10,7 +10,7 @@ sub_8069348: @ 8069348
ldr r1, _08069368 @ =gUnknown_203709C
movs r0, 0
strb r0, [r1]
ldr r2, _0806936C @ =gUnknown_3003E50
ldr r2, _0806936C @ =gTextFlags
ldrb r1, [r2]
movs r0, 0x2
negs r0, r0
@ -24,7 +24,7 @@ sub_8069348: @ 8069348
bx lr
.align 2, 0
_08069368: .4byte gUnknown_203709C
_0806936C: .4byte gUnknown_3003E50
_0806936C: .4byte gTextFlags
thumb_func_end sub_8069348
thumb_func_start sub_8069370
@ -57,7 +57,7 @@ _0806939E:
ldrb r0, [r0]
cmp r0, 0x2
bne _080693C4
ldr r2, _080693C0 @ =gUnknown_3003E50
ldr r2, _080693C0 @ =gTextFlags
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
@ -69,7 +69,7 @@ _0806939E:
b _080693E2
.align 2, 0
_080693BC: .4byte gUnknown_203ADFA
_080693C0: .4byte gUnknown_3003E50
_080693C0: .4byte gTextFlags
_080693C4:
bl sub_8069A38
lsls r0, 24
@ -223,7 +223,7 @@ _080694C2:
textbox_fdecode_auto_and_task_add: @ 80694C8
push {lr}
adds r1, r0, 0
ldr r0, _080694E0 @ =gUnknown_2021D18
ldr r0, _080694E0 @ =gStringVar4
bl StringExpandPlaceholders
movs r0, 0x1
bl sub_80F6D5C
@ -231,7 +231,7 @@ textbox_fdecode_auto_and_task_add: @ 80694C8
pop {r0}
bx r0
.align 2, 0
_080694E0: .4byte gUnknown_2021D18
_080694E0: .4byte gStringVar4
thumb_func_end textbox_fdecode_auto_and_task_add
thumb_func_start textbox_auto_and_task_add

22
asm/field_player_avatar.s
View File

@ -612,7 +612,7 @@ _0805B81C: .4byte sub_805C2B4
sub_805B820: @ 805B820
push {lr}
movs r0, 0x99
bl sub_80722CC
bl PlaySE
pop {r0}
bx r0
thumb_func_end sub_805B820
@ -2020,7 +2020,7 @@ sub_805C23C: @ 805C23C
lsls r4, 24
lsrs r4, 24
movs r0, 0xA
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl GetJumpLedgeAnimId
lsls r0, 24
@ -2178,7 +2178,7 @@ sub_805C354: @ 805C354
lsls r4, 24
lsrs r4, 24
movs r0, 0x1C
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl sub_8064378
lsls r0, 24
@ -2197,7 +2197,7 @@ sub_805C378: @ 805C378
lsls r4, 24
lsrs r4, 24
movs r0, 0x1C
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl sub_80643A4
lsls r0, 24
@ -2216,7 +2216,7 @@ sub_805C39C: @ 805C39C
lsls r4, 24
lsrs r4, 24
movs r0, 0x1C
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl sub_80643D0
lsls r0, 24
@ -2235,7 +2235,7 @@ sub_805C3C0: @ 805C3C0
lsls r4, 24
lsrs r4, 24
movs r0, 0x1C
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl sub_8064168
lsls r0, 24
@ -2254,7 +2254,7 @@ sub_805C3E4: @ 805C3E4
lsls r4, 24
lsrs r4, 24
movs r0, 0x7
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl sub_80643FC
lsls r0, 24
@ -2371,7 +2371,7 @@ _0805C4A0:
bne _0805C4DE
_0805C4D8:
movs r0, 0x7
bl sub_80722CC
bl PlaySE
_0805C4DE:
add sp, 0x4
pop {r4-r6}
@ -3582,7 +3582,7 @@ sub_805CD84: @ 805CD84
movs r0, 0xA
bl FieldEffectStart
movs r0, 0xCF
bl sub_80722CC
bl PlaySE
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@ -3709,7 +3709,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC
cmp r0, 0
beq _0805CF48
movs r0, 0xA
bl sub_80722CC
bl PlaySE
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@ -3817,7 +3817,7 @@ sub_805CFC4: @ 805CFC4
strb r0, [r1, 0x6]
bl ScriptContext2_Enable
movs r0, 0x27
bl sub_80722CC
bl PlaySE
movs r0, 0x1
pop {r1}
bx r1

4
asm/field_poison.s
View File

@ -79,7 +79,7 @@ MonFaintFromPoisonOnField: @ 80A04B8
movs r1, 0x37
mov r2, sp
bl sub_804037C
ldr r5, _080A0500 @ =gUnknown_2021CD0
ldr r5, _080A0500 @ =gStringVar1
adds r0, r4, 0
movs r1, 0x2
adds r2, r5, 0
@ -92,7 +92,7 @@ MonFaintFromPoisonOnField: @ 80A04B8
bx r0
.align 2, 0
_080A04FC: .4byte gUnknown_2024284
_080A0500: .4byte gUnknown_2021CD0
_080A0500: .4byte gStringVar1
thumb_func_end MonFaintFromPoisonOnField
thumb_func_start CheckMonFaintedFromPoison

8
asm/field_screen_effect.s
View File

@ -768,7 +768,7 @@ _0807F3E0:
adds r0, r7, 0
movs r1, 0
bl FillWindowPixelBuffer
ldr r5, _0807F424 @ =gUnknown_2021D18
ldr r5, _0807F424 @ =gStringVar4
adds r0, r5, 0
mov r1, r8
bl StringExpandPlaceholders
@ -786,7 +786,7 @@ _0807F3E0:
mov r2, r10
mov r3, r9
bl AddTextPrinterParametrized2
ldr r2, _0807F42C @ =gUnknown_3003E50
ldr r2, _0807F42C @ =gTextFlags
ldrb r1, [r2]
movs r0, 0x2
negs r0, r0
@ -796,9 +796,9 @@ _0807F3E0:
strh r0, [r4, 0xC]
b _0807F448
.align 2, 0
_0807F424: .4byte gUnknown_2021D18
_0807F424: .4byte gStringVar4
_0807F428: .4byte gUnknown_83C68EC
_0807F42C: .4byte gUnknown_3003E50
_0807F42C: .4byte gTextFlags
_0807F430:
bl RunTextPrinters
adds r0, r7, 0

114
asm/field_specials.s
View File

@ -76,12 +76,12 @@ _080CA688:
thumb_func_start sub_80CA68C
sub_80CA68C: @ 80CA68C
push {lr}
ldr r0, _080CA698 @ =gUnknown_2021D18
ldr r0, _080CA698 @ =gStringVar4
bl ShowFieldMessage
pop {r0}
bx r0
.align 2, 0
_080CA698: .4byte gUnknown_2021D18
_080CA698: .4byte gStringVar4
thumb_func_end sub_80CA68C
thumb_func_start sub_80CA69C
@ -128,23 +128,23 @@ sub_80CA6DC: @ 80CA6DC
ldrb r0, [r0, 0x8]
cmp r0, 0
bne _080CA700
ldr r0, _080CA6F8 @ =gUnknown_2021CD0
ldr r0, _080CA6F8 @ =gStringVar1
ldr r1, _080CA6FC @ =gUnknown_8417FBB
bl StringCopy
b _080CA708
.align 2, 0
_080CA6F4: .4byte gSaveBlock2Ptr
_080CA6F8: .4byte gUnknown_2021CD0
_080CA6F8: .4byte gStringVar1
_080CA6FC: .4byte gUnknown_8417FBB
_080CA700:
ldr r0, _080CA70C @ =gUnknown_2021CD0
ldr r0, _080CA70C @ =gStringVar1
ldr r1, _080CA710 @ =gUnknown_8417FC3
bl StringCopy
_080CA708:
pop {r0}
bx r0
.align 2, 0
_080CA70C: .4byte gUnknown_2021CD0
_080CA70C: .4byte gStringVar1
_080CA710: .4byte gUnknown_8417FC3
thumb_func_end sub_80CA6DC
@ -156,23 +156,23 @@ sub_80CA714: @ 80CA714
ldrb r0, [r0, 0x8]
cmp r0, 0
bne _080CA738
ldr r0, _080CA730 @ =gUnknown_2021CD0
ldr r0, _080CA730 @ =gStringVar1
ldr r1, _080CA734 @ =gUnknown_8417FD0
bl StringCopy
b _080CA740
.align 2, 0
_080CA72C: .4byte gSaveBlock2Ptr
_080CA730: .4byte gUnknown_2021CD0
_080CA730: .4byte gStringVar1
_080CA734: .4byte gUnknown_8417FD0
_080CA738:
ldr r0, _080CA744 @ =gUnknown_2021CD0
ldr r0, _080CA744 @ =gStringVar1
ldr r1, _080CA748 @ =gUnknown_8417FCC
bl StringCopy
_080CA740:
pop {r0}
bx r0
.align 2, 0
_080CA744: .4byte gUnknown_2021CD0
_080CA744: .4byte gStringVar1
_080CA748: .4byte gUnknown_8417FCC
thumb_func_end sub_80CA714
@ -645,12 +645,12 @@ _080CAAA8: .4byte gSaveBlock1Ptr
thumb_func_start sub_80CAAAC
sub_80CAAAC: @ 80CAAAC
push {lr}
ldr r0, _080CAAB8 @ =gUnknown_2021CD0
ldr r0, _080CAAB8 @ =gStringVar1
bl sub_80E7460
pop {r0}
bx r0
.align 2, 0
_080CAAB8: .4byte gUnknown_2021CD0
_080CAAB8: .4byte gStringVar1
thumb_func_end sub_80CAAAC
thumb_func_start sub_80CAABC
@ -879,7 +879,7 @@ sub_80CAC28: @ 80CAC28
movs r0, 0
bl SetCameraPanningCallback
movs r0, 0xCF
bl sub_80722CC
bl PlaySE
pop {r0}
bx r0
.align 2, 0
@ -1029,7 +1029,7 @@ sub_80CAD7C: @ 80CAD7C
muls r0, r1
ldr r1, _080CADAC @ =gUnknown_2024284
adds r0, r1
ldr r4, _080CADB0 @ =gUnknown_2021CD0
ldr r4, _080CADB0 @ =gStringVar1
movs r1, 0x7
adds r2, r4, 0
bl GetMonData
@ -1044,7 +1044,7 @@ sub_80CAD7C: @ 80CAD7C
.align 2, 0
_080CADA8: .4byte gUnknown_20370C0
_080CADAC: .4byte gUnknown_2024284
_080CADB0: .4byte gUnknown_2021CD0
_080CADB0: .4byte gStringVar1
_080CADB4: .4byte gSaveBlock2Ptr
_080CADB8:
movs r0, 0
@ -1450,7 +1450,7 @@ _080CB0C0:
movs r1, 0
bl VarSet
_080CB0EA:
ldr r4, _080CB11C @ =gUnknown_2021CD0
ldr r4, _080CB11C @ =gStringVar1
ldr r0, _080CB10C @ =0x00004036
bl VarGet
lsls r0, 16
@ -1469,7 +1469,7 @@ _080CB10C: .4byte 0x00004036
_080CB110: .4byte 0x0000ffff
_080CB114: .4byte 0x0000403b
_080CB118: .4byte 0x00004035
_080CB11C: .4byte gUnknown_2021CD0
_080CB11C: .4byte gStringVar1
_080CB120: .4byte gUnknown_8245EE0
thumb_func_end sub_80CB0A8
@ -1991,7 +1991,7 @@ _080CB4EE:
adds r0, r5, 0
bl sub_80CB658
movs r0, 0x52
bl sub_80722CC
bl PlaySE
pop {r4-r6}
pop {r0}
bx r0
@ -2038,7 +2038,7 @@ sub_80CB514: @ 80CB514
cmp r1, r0
bne _080CB574
movs r0, 0x42
bl sub_80722CC
bl PlaySE
adds r0, r5, 0
bl DestroyTask
bl EnableBothScriptContexts
@ -2098,7 +2098,7 @@ sub_80CB580: @ 80CB580
movs r0, 0x2
adds r1, r5, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
ldrb r1, [r4]
movs r3, 0x38
subs r3, r0
@ -2575,7 +2575,7 @@ _080CB974:
str r4, [r3, 0x4]
movs r0, 0x2
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
cmp r0, r6
ble _080CB9A0
adds r6, r0, 0
@ -2735,7 +2735,7 @@ _080CBAD8: .4byte sub_80CBADC
sub_80CBADC: @ 80CBADC
push {r4,lr}
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _080CBB18 @ =sub_80CBB28
bl FindTaskIdByFunc
lsls r0, 24
@ -2798,7 +2798,7 @@ _080CBB58:
movs r0, 0x7F
strh r0, [r1]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
b _080CBB88
.align 2, 0
_080CBB68: .4byte gUnknown_20370D0
@ -2806,7 +2806,7 @@ _080CBB6C:
ldr r0, _080CBB90 @ =gUnknown_20370D0
strh r4, [r0]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r1, 0x14
ldrsh r0, [r6, r1]
cmp r0, 0
@ -3204,7 +3204,7 @@ sub_80CBE50: @ 80CBE50
muls r1, r0
ldr r0, _080CBEA4 @ =gUnknown_2024284
adds r5, r1, r0
ldr r6, _080CBEA8 @ =gUnknown_2021CD0
ldr r6, _080CBEA8 @ =gStringVar1
adds r0, r5, 0
movs r1, 0x2
adds r2, r6, 0
@ -3235,7 +3235,7 @@ sub_80CBE50: @ 80CBE50
b _080CBEB2
.align 2, 0
_080CBEA4: .4byte gUnknown_2024284
_080CBEA8: .4byte gUnknown_2021CD0
_080CBEA8: .4byte gStringVar1
_080CBEAC: .4byte gUnknown_8245EE0
_080CBEB0:
movs r0, 0x1
@ -3377,11 +3377,11 @@ sub_80CBFA0: @ 80CBFA0
muls r0, r1
ldr r1, _080CBFCC @ =gUnknown_2024284
adds r0, r1
ldr r4, _080CBFD0 @ =gUnknown_2021CD0
ldr r4, _080CBFD0 @ =gStringVar1
movs r1, 0x2
adds r2, r4, 0
bl GetMonData
ldr r0, _080CBFD4 @ =gUnknown_2021D04
ldr r0, _080CBFD4 @ =gStringVar3
adds r1, r4, 0
bl StringCompare
cmp r0, 0
@ -3391,8 +3391,8 @@ sub_80CBFA0: @ 80CBFA0
.align 2, 0
_080CBFC8: .4byte gUnknown_20370C0
_080CBFCC: .4byte gUnknown_2024284
_080CBFD0: .4byte gUnknown_2021CD0
_080CBFD4: .4byte gUnknown_2021D04
_080CBFD0: .4byte gStringVar1
_080CBFD4: .4byte gStringVar3
_080CBFD8:
movs r0, 0
_080CBFDA:
@ -3413,10 +3413,10 @@ ChangeBoxPokemonNickname: @ 80CBFE0
ldrb r1, [r1]
bl GetBoxedMonPtr
adds r6, r0, 0
ldr r2, _080CC058 @ =gUnknown_2021D04
ldr r2, _080CC058 @ =gStringVar3
movs r1, 0x2
bl GetBoxMonData
ldr r0, _080CC05C @ =gUnknown_2021CF0
ldr r0, _080CC05C @ =gStringVar2
mov r8, r0
adds r0, r6, 0
movs r1, 0x2
@ -3455,8 +3455,8 @@ ChangeBoxPokemonNickname: @ 80CBFE0
.align 2, 0
_080CC050: .4byte gUnknown_20370D6
_080CC054: .4byte gUnknown_20370D8
_080CC058: .4byte gUnknown_2021D04
_080CC05C: .4byte gUnknown_2021CF0
_080CC058: .4byte gStringVar3
_080CC05C: .4byte gStringVar2
_080CC060: .4byte ChangeBoxPokemonNickname_CB
thumb_func_end ChangeBoxPokemonNickname
@ -3467,7 +3467,7 @@ ChangeBoxPokemonNickname_CB: @ 80CC064
ldrb r0, [r0]
ldr r1, _080CC080 @ =gUnknown_20370D8
ldrb r1, [r1]
ldr r2, _080CC084 @ =gUnknown_2021CF0
ldr r2, _080CC084 @ =gStringVar2
bl SetBoxMonNickFromAnyBox
bl c2_exit_to_overworld_1_continue_scripts_restart_music
pop {r0}
@ -3475,7 +3475,7 @@ ChangeBoxPokemonNickname_CB: @ 80CC064
.align 2, 0
_080CC07C: .4byte gUnknown_20370D6
_080CC080: .4byte gUnknown_20370D8
_080CC084: .4byte gUnknown_2021CF0
_080CC084: .4byte gStringVar2
thumb_func_end ChangeBoxPokemonNickname_CB
thumb_func_start ChangePokemonNickname
@ -3496,7 +3496,7 @@ ChangePokemonNickname: @ 80CC088
adds r0, r1, 0
ldr r6, _080CC134 @ =gUnknown_2024284
adds r0, r6
ldr r2, _080CC138 @ =gUnknown_2021D04
ldr r2, _080CC138 @ =gStringVar3
movs r1, 0x2
bl GetMonData
mov r1, r9
@ -3505,7 +3505,7 @@ ChangePokemonNickname: @ 80CC088
muls r1, r0
adds r0, r1, 0
adds r0, r6
ldr r1, _080CC13C @ =gUnknown_2021CF0
ldr r1, _080CC13C @ =gStringVar2
mov r10, r1
movs r1, 0x2
mov r2, r10
@ -3560,8 +3560,8 @@ ChangePokemonNickname: @ 80CC088
.align 2, 0
_080CC130: .4byte gUnknown_20370C0
_080CC134: .4byte gUnknown_2024284
_080CC138: .4byte gUnknown_2021D04
_080CC13C: .4byte gUnknown_2021CF0
_080CC138: .4byte gStringVar3
_080CC13C: .4byte gStringVar2
_080CC140: .4byte ChangePokemonNickname_CB
thumb_func_end ChangePokemonNickname
@ -3574,7 +3574,7 @@ ChangePokemonNickname_CB: @ 80CC144
muls r0, r1
ldr r1, _080CC168 @ =gUnknown_2024284
adds r0, r1
ldr r2, _080CC16C @ =gUnknown_2021CF0
ldr r2, _080CC16C @ =gStringVar2
movs r1, 0x2
bl sub_804037C
bl c2_exit_to_overworld_1_continue_scripts_restart_music
@ -3583,7 +3583,7 @@ ChangePokemonNickname_CB: @ 80CC144
.align 2, 0
_080CC164: .4byte gUnknown_20370C0
_080CC168: .4byte gUnknown_2024284
_080CC16C: .4byte gUnknown_2021CF0
_080CC16C: .4byte gStringVar2
thumb_func_end ChangePokemonNickname_CB
thumb_func_start TV_CopyNicknameToStringVar1AndEnsureTerminated
@ -3595,7 +3595,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170
muls r0, r1
ldr r1, _080CC198 @ =gUnknown_2024284
adds r0, r1
ldr r4, _080CC19C @ =gUnknown_2021CD0
ldr r4, _080CC19C @ =gStringVar1
movs r1, 0x2
adds r2, r4, 0
bl GetMonData
@ -3607,7 +3607,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170
.align 2, 0
_080CC194: .4byte gUnknown_20370C0
_080CC198: .4byte gUnknown_2024284
_080CC19C: .4byte gUnknown_2021CD0
_080CC19C: .4byte gStringVar1
thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated
thumb_func_start TV_CheckMonOTIDEqualsPlayerID
@ -4563,7 +4563,7 @@ sub_80CC8CC: @ 80CC8CC
_080CC8E4: .4byte gUnknown_20370C0
_080CC8E8: .4byte 0xfffffedf
_080CC8EC:
ldr r4, _080CC910 @ =gUnknown_2021CD0
ldr r4, _080CC910 @ =gStringVar1
ldrh r0, [r1]
bl ItemIdToBattleMoveId
lsls r0, 16
@ -4580,7 +4580,7 @@ _080CC908:
pop {r1}
bx r1
.align 2, 0
_080CC910: .4byte gUnknown_2021CD0
_080CC910: .4byte gStringVar1
_080CC914: .4byte gUnknown_8247094
thumb_func_end sub_80CC8CC
@ -4950,7 +4950,7 @@ _080CCBEA:
bne _080CCC7A
cmp r7, 0
bne _080CCC34
ldr r0, _080CCC24 @ =gUnknown_2021CF0
ldr r0, _080CCC24 @ =gStringVar2
ldr r1, _080CCC28 @ =gUnknown_82481BE
bl StringCopy
ldr r1, _080CCC2C @ =gUnknown_20370C2
@ -4961,14 +4961,14 @@ _080CCBEA:
.align 2, 0
_080CCC1C: .4byte gUnknown_83F6203
_080CCC20: .4byte gUnknown_2024284
_080CCC24: .4byte gUnknown_2021CF0
_080CCC24: .4byte gStringVar2
_080CCC28: .4byte gUnknown_82481BE
_080CCC2C: .4byte gUnknown_20370C2
_080CCC30: .4byte 0x000002de
_080CCC34:
cmp r7, 0x1
bne _080CCC5C
ldr r0, _080CCC4C @ =gUnknown_2021CF0
ldr r0, _080CCC4C @ =gStringVar2
ldr r1, _080CCC50 @ =gUnknown_824802B
bl StringCopy
ldr r1, _080CCC54 @ =gUnknown_20370C2
@ -4977,12 +4977,12 @@ _080CCC34:
ldr r0, _080CCC58 @ =0x000002df
b _080CCC6E
.align 2, 0
_080CCC4C: .4byte gUnknown_2021CF0
_080CCC4C: .4byte gStringVar2
_080CCC50: .4byte gUnknown_824802B
_080CCC54: .4byte gUnknown_20370C2
_080CCC58: .4byte 0x000002df
_080CCC5C:
ldr r0, _080CCC80 @ =gUnknown_2021CF0
ldr r0, _080CCC80 @ =gStringVar2
ldr r1, _080CCC84 @ =gUnknown_8248038
bl StringCopy
ldr r1, _080CCC88 @ =gUnknown_20370C2
@ -5000,7 +5000,7 @@ _080CCC7A:
movs r0, 0
b _080CCCE4
.align 2, 0
_080CCC80: .4byte gUnknown_2021CF0
_080CCC80: .4byte gStringVar2
_080CCC84: .4byte gUnknown_8248038
_080CCC88: .4byte gUnknown_20370C2
_080CCC8C:
@ -5181,7 +5181,7 @@ sub_80CCDD0: @ 80CCDD0
bl MapGridSetMetatileIdAt
bl DrawWholeMapView
movs r0, 0x14
bl sub_80722CC
bl PlaySE
ldr r0, _080CCDF8 @ =0x000002e3
bl FlagSet
bl ScriptContext2_Disable
@ -5326,14 +5326,14 @@ sub_80CCEE8: @ 80CCEE8
cmp r4, 0
bne _080CCF2C
movs r0, 0xBD
bl sub_80722CC
bl PlaySE
b _080CCF32
.align 2, 0
_080CCF24: .4byte gUnknown_83F6206
_080CCF28: .4byte gSaveBlock1Ptr
_080CCF2C:
movs r0, 0xFD
bl sub_80722CC
bl PlaySE
_080CCF32:
ldr r0, _080CCF64 @ =sub_80CCF98
movs r1, 0x8
@ -5671,7 +5671,7 @@ sub_80CD1B4: @ 80CD1B4
movs r1, 0x8
bl CreateTask
movs r0, 0x96
bl sub_80722CC
bl PlaySE
pop {r0}
bx r0
.align 2, 0
@ -5704,7 +5704,7 @@ sub_80CD1CC: @ 80CD1CC
movs r0, 0
strh r0, [r4, 0x2]
movs r0, 0x96
bl sub_80722CC
bl PlaySE
_080CD200:
movs r0, 0
ldrsh r1, [r4, r0]

4
asm/field_tasks.s
View File

@ -373,7 +373,7 @@ _0806EAB0:
ldrh r0, [r5, 0xA]
strh r0, [r4]
movs r0, 0x24
bl sub_80722CC
bl PlaySE
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@ -409,7 +409,7 @@ _0806EB04:
ldrh r0, [r5, 0xA]
strh r0, [r4]
movs r0, 0x23
bl sub_80722CC
bl PlaySE
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]

8
asm/field_weather.s
View File

@ -2617,7 +2617,7 @@ _0807AFEC:
_0807AFF2:
strb r0, [r1]
adds r0, r2, 0
bl sub_80722CC
bl PlaySE
_0807AFFA:
pop {r0}
bx r0
@ -2643,18 +2643,18 @@ play_some_sound: @ 807B004
cmp r0, 0
bne _0807B03C
movs r0, 0x4F
bl sub_80722CC
bl PlaySE
b _0807B042
.align 2, 0
_0807B02C: .4byte gUnknown_2037F34
_0807B030: .4byte 0x000006dd
_0807B034:
movs r0, 0x4D
bl sub_80722CC
bl PlaySE
b _0807B042
_0807B03C:
movs r0, 0x4B
bl sub_80722CC
bl PlaySE
_0807B042:
pop {r0}
bx r0

4
asm/field_weather_effects.s
View File

@ -2835,14 +2835,14 @@ UpdateThunderSound: @ 807C898
cmp r4, 0
beq _0807C8D8
movs r0, 0x50
bl sub_80722CC
bl PlaySE
b _0807C8DE
.align 2, 0
_0807C8D0: .4byte gUnknown_83C2BBC
_0807C8D4: .4byte 0x000006ed
_0807C8D8:
movs r0, 0x51
bl sub_80722CC
bl PlaySE
_0807C8DE:
ldr r0, _0807C8EC @ =gUnknown_83C2BBC
ldr r0, [r0]

4
asm/fldeff_cut.s
View File

@ -252,7 +252,7 @@ sub_8097A48: @ 8097A48
push {r6,r7}
movs r7, 0
movs r0, 0x79
bl sub_80722CC
bl PlaySE
ldr r4, _08097B38 @ =gUnknown_2039A04
adds r1, r4, 0x2
adds r0, r4, 0
@ -524,7 +524,7 @@ _08097C68: .4byte gUnknown_202063C
sub_8097C6C: @ 8097C6C
push {lr}
movs r0, 0x79
bl sub_80722CC
bl PlaySE
movs r0, 0x2
bl FieldEffectActiveListRemove
bl EnableBothScriptContexts

2
asm/fldeff_flash.s
View File

@ -73,7 +73,7 @@ _080C9BAC: .4byte sub_80C9BB0
sub_80C9BB0: @ 80C9BB0
push {lr}
movs r0, 0xC8
bl sub_80722CC
bl PlaySE
ldr r0, _080C9BC8 @ =0x00000806
bl FlagSet
ldr r0, _080C9BCC @ =gUnknown_81BFB5F

2
asm/fldeff_poison.s
View File

@ -72,7 +72,7 @@ _080A0E42:
overworld_poison_effect: @ 80A0E48
push {lr}
movs r0, 0x48
bl sub_80722CC
bl PlaySE
ldr r0, _080A0E5C @ =task50_overworld_poison_effect
movs r1, 0x50
bl CreateTask

14
asm/fldeff_softboiled.s
View File

@ -146,7 +146,7 @@ _080E5796:
_080E57A0: .4byte gUnknown_2024284
_080E57A4:
movs r0, 0x1
bl sub_80722CC
bl PlaySE
mov r1, r10
mov r0, r8
muls r0, r1
@ -186,7 +186,7 @@ sub_80E57E8: @ 80E57E8
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
bl sub_80722CC
bl PlaySE
ldr r5, _080E5830 @ =gUnknown_203B0A0
movs r1, 0x9
ldrsb r1, [r5, r1]
@ -230,9 +230,9 @@ sub_80E583C: @ 80E583C
muls r0, r1
ldr r1, _080E5888 @ =gUnknown_2024284
adds r0, r1
ldr r1, _080E588C @ =gUnknown_2021CD0
ldr r1, _080E588C @ =gStringVar1
bl GetMonNickname
ldr r4, _080E5890 @ =gUnknown_2021D18
ldr r4, _080E5890 @ =gStringVar4
ldr r1, _080E5894 @ =gUnknown_8416F27
adds r0, r4, 0
bl StringExpandPlaceholders
@ -254,8 +254,8 @@ sub_80E583C: @ 80E583C
.align 2, 0
_080E5884: .4byte gUnknown_203B0A0
_080E5888: .4byte gUnknown_2024284
_080E588C: .4byte gUnknown_2021CD0
_080E5890: .4byte gUnknown_2021D18
_080E588C: .4byte gStringVar1
_080E5890: .4byte gStringVar4
_080E5894: .4byte gUnknown_8416F27
_080E5898: .4byte gUnknown_3005090
_080E589C: .4byte sub_80E58A0
@ -341,7 +341,7 @@ sub_80E5934: @ 80E5934
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _080E5964 @ =gUnknown_84169F8
movs r1, 0
bl sub_81202F8

4
asm/fldeff_strength.s
View File

@ -85,7 +85,7 @@ sub_80D0860: @ 80D0860
muls r0, r1
ldr r1, _080D08A0 @ =gUnknown_2024284
adds r0, r1
ldr r1, _080D08A4 @ =gUnknown_2021CD0
ldr r1, _080D08A4 @ =gStringVar1
bl GetMonNickname
movs r0, 0
pop {r1}
@ -95,7 +95,7 @@ _080D0894: .4byte gUnknown_3005090
_080D0898: .4byte sub_80D08A8
_080D089C: .4byte gUnknown_20386E0
_080D08A0: .4byte gUnknown_2024284
_080D08A4: .4byte gUnknown_2021CD0
_080D08A4: .4byte gStringVar1
thumb_func_end sub_80D0860
thumb_func_start sub_80D08A8

2
asm/fldeff_sweetscent.s
View File

@ -80,7 +80,7 @@ sub_80DE134: @ 80DE134
push {r4,r5,lr}
sub sp, 0x4
movs r0, 0xE5
bl sub_80722CC
bl PlaySE
ldr r4, _080DE1B8 @ =gUnknown_203AAB0
movs r0, 0x80
lsls r0, 3

18
asm/hall_of_fame.s
View File

@ -560,7 +560,7 @@ sub_80F2220: @ 80F2220
movs r0, 0x3
bl TrySavingData
movs r0, 0x30
bl sub_80722CC
bl PlaySE
ldr r1, _080F225C @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@ -979,7 +979,7 @@ _080F2564:
movs r1, 0xF
bl HallOfFame_PrintWelcomeText
movs r0, 0x62
bl sub_80722CC
bl PlaySE
ldr r1, _080F25A8 @ =gUnknown_3005090
mov r2, r8
adds r0, r2, r4
@ -1869,7 +1869,7 @@ _080F2CB4:
ldr r2, _080F2D0C @ =0x00007716
movs r1, 0xC
bl BlendPalettes
ldr r0, _080F2D10 @ =gUnknown_2021CD0
ldr r0, _080F2D10 @ =gStringVar1
ldr r1, _080F2D14 @ =gUnknown_3005090
ldr r4, [sp, 0x14]
add r4, r9
@ -1880,7 +1880,7 @@ _080F2CB4:
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r5, _080F2D18 @ =gUnknown_2021D18
ldr r5, _080F2D18 @ =gStringVar4
ldr r1, _080F2D1C @ =gUnknown_84160B4
adds r0, r5, 0
bl StringExpandPlaceholders
@ -1899,9 +1899,9 @@ _080F2CB4:
.align 2, 0
_080F2D08: .4byte 0xffff0000
_080F2D0C: .4byte 0x00007716
_080F2D10: .4byte gUnknown_2021CD0
_080F2D10: .4byte gStringVar1
_080F2D14: .4byte gUnknown_3005090
_080F2D18: .4byte gUnknown_2021D18
_080F2D18: .4byte gStringVar4
_080F2D1C: .4byte gUnknown_84160B4
_080F2D20: .4byte gUnknown_8415D78
_080F2D24:
@ -2415,7 +2415,7 @@ HallOfFame_PrintWelcomeText: @ 80F313C
movs r0, 0x2
adds r1, r5, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r4, 0xD0
subs r4, r0
lsrs r0, r4, 31
@ -2573,7 +2573,7 @@ _080F327C:
lsrs r2, 24
movs r0, 0x2
add r1, sp, 0xC
bl sub_8005ED4
bl GetStringWidth
adds r2, r0, 0
ldrh r1, [r7, 0x8]
ldr r0, _080F32BC @ =0x000001ff
@ -2770,7 +2770,7 @@ sub_80F33DC: @ 80F33DC
ldr r1, [r0]
movs r0, 0x2
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
adds r2, r0, 0
ldr r1, [sp, 0x28]
subs r2, r1, r2

42
asm/help_system.s
View File

@ -72,7 +72,7 @@ _0813B8E8:
bne _0813B918
_0813B8FA:
movs r0, 0xFC
bl sub_80722CC
bl PlaySE
_0813B900:
movs r0, 0
b _0813BB28
@ -88,7 +88,7 @@ _0813B918:
ldr r0, _0813B950 @ =gMPlay_SE2
bl m4aMPlayStop
movs r0, 0xFA
bl sub_80722CC
bl PlaySE
ldr r0, _0813B954 @ =gUnknown_203F174
ldrb r0, [r0]
cmp r0, 0
@ -228,7 +228,7 @@ _0813BA78:
cmp r0, 0
bne _0813BB24
movs r0, 0xFB
bl sub_80722CC
bl PlaySE
ldr r1, _0813BA9C @ =gUnknown_203F178
movs r0, 0x6
b _0813BB22
@ -1100,7 +1100,7 @@ _0813C0EC:
ldrb r1, [r1]
cmp r1, 0xFF
beq _0813C0AC
ldr r5, _0813C150 @ =gUnknown_3003E20
ldr r5, _0813C150 @ =gGlyphInfo + 0x80
_0813C106:
ldr r0, [r0]
adds r0, r4
@ -1137,15 +1137,15 @@ _0813C106:
b _0813C0AC
.align 2, 0
_0813C14C: .4byte gSaveBlock2Ptr
_0813C150: .4byte gUnknown_3003E20
_0813C150: .4byte gGlyphInfo + 0x80
_0813C154:
cmp r1, 0x2
bne _0813C0AC
movs r4, 0
ldr r5, _0813C160 @ =gUnknown_3003E20
ldr r5, _0813C160 @ =gGlyphInfo + 0x80
b _0813C1BC
.align 2, 0
_0813C160: .4byte gUnknown_3003E20
_0813C160: .4byte gGlyphInfo + 0x80
_0813C164:
ldrb r1, [r1]
ldr r2, [sp, 0x28]
@ -1210,7 +1210,7 @@ _0813C1DC: .4byte 0x00000834
_0813C1E0: .4byte gUnknown_841CB3C
_0813C1E4:
ldr r7, [sp, 0x34]
ldr r1, _0813C1FC @ =gGlyphBuffer1
ldr r1, _0813C1FC @ =gGlyphInfo
adds r1, 0x81
mov r0, r10
adds r0, 0x1
@ -1221,7 +1221,7 @@ _0813C1E4:
mov r10, r0
b _0813C0AC
.align 2, 0
_0813C1FC: .4byte gGlyphBuffer1
_0813C1FC: .4byte gGlyphInfo
_0813C200:
mov r2, r9
ldrb r1, [r2]
@ -1401,7 +1401,7 @@ _0813C36A:
add r2, sp, 0x14
bl sub_813C3AC
ldr r1, [sp, 0x24]
ldr r0, _0813C398 @ =gGlyphBuffer1
ldr r0, _0813C398 @ =gGlyphInfo
adds r0, 0x80
ldrb r0, [r0]
_0813C38E:
@ -1411,7 +1411,7 @@ _0813C390:
lsrs r7, r0, 24
b _0813C0AC
.align 2, 0
_0813C398: .4byte gGlyphBuffer1
_0813C398: .4byte gGlyphInfo
_0813C39C:
add sp, 0x38
pop {r3-r5}
@ -1455,20 +1455,20 @@ sub_813C3AC: @ 813C3AC
cmp r6, 0
bne _0813C3EE
movs r1, 0
bl sub_8006448
bl DecompressGlyphFont0
b _0813C402
_0813C3EE:
cmp r6, 0x5
bne _0813C3FA
movs r1, 0
bl sub_8006958
bl DecompressGlyphFont5
b _0813C402
_0813C3FA:
adds r0, r1, 0
movs r1, 0
bl sub_80065B8
bl DecompressGlyphFont2
_0813C402:
ldr r1, _0813C450 @ =gGlyphBuffer1
ldr r1, _0813C450 @ =gGlyphInfo
str r1, [r7]
movs r2, 0
movs r0, 0x10
@ -1506,7 +1506,7 @@ _0813C402:
pop {r0}
bx r0
.align 2, 0
_0813C450: .4byte gGlyphBuffer1
_0813C450: .4byte gGlyphInfo
thumb_func_end sub_813C3AC
thumb_func_start sub_813C454
@ -1544,7 +1544,7 @@ sub_813C488: @ 813C488
movs r0, 0
adds r1, r5, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r4, 0x7C
subs r4, r0
movs r0, 0x1
@ -1822,7 +1822,7 @@ _0813C6A4:
cmp r0, 0
beq _0813C6D0
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0813C6CC @ =gUnknown_203F190
ldrb r0, [r1, 0xC]
ldrb r2, [r1, 0xD]
@ -1841,7 +1841,7 @@ _0813C6D0:
cmp r0, 0
beq _0813C6E4
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x2
negs r0, r0
b _0813C756
@ -1882,7 +1882,7 @@ _0813C718:
cmp r0, 0
bne _0813C72A
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0813C72A:
movs r0, 0x4
negs r0, r0
@ -1900,7 +1900,7 @@ _0813C73A:
cmp r0, 0
bne _0813C74C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0813C74C:
movs r0, 0x5
negs r0, r0

4
asm/help_system_812B1E0.s
View File

@ -1319,7 +1319,7 @@ sub_812BC80: @ 812BC80
cmp r0, 0
beq _0812BC9A
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0xA
strb r0, [r4, 0xE]
_0812BC9A:
@ -1658,7 +1658,7 @@ sub_812BF18: @ 812BF18
beq _0812BF44
_0812BF30:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x5
strb r0, [r4, 0xE]
movs r0, 0x1

2
asm/intro.s
View File

@ -809,7 +809,7 @@ _080ECC50:
b _080ECC9C
_080ECC56:
ldr r0, _080ECC64 @ =0x00000141
bl sub_80722CC
bl PlaySE
bl sub_80EDC40
strh r5, [r4, 0x12]
b _080ECC7E

202
asm/item_menu.s
View File

@ -93,7 +93,7 @@ _08107E50:
_08107E5A:
strb r0, [r2, 0x5]
movs r1, 0
ldr r4, _08107EA4 @ =gUnknown_3003E50
ldr r4, _08107EA4 @ =gTextFlags
ldr r5, _08107EA8 @ =gUnknown_203AD30
ldr r6, _08107EAC @ =sub_8107F10
ldr r3, _08107EB0 @ =gUnknown_203AD10
@ -131,7 +131,7 @@ _08107E9A:
pop {r0}
bx r0
.align 2, 0
_08107EA4: .4byte gUnknown_3003E50
_08107EA4: .4byte gTextFlags
_08107EA8: .4byte gUnknown_203AD30
_08107EAC: .4byte sub_8107F10
_08107EB0: .4byte gUnknown_203AD10
@ -1001,7 +1001,7 @@ sub_81085A4: @ 81085A4
cmp r1, 0x1
beq _081085BA
movs r0, 0xF5
bl sub_80722CC
bl PlaySE
bl sub_8098580
_081085BA:
ldr r4, _08108604 @ =gUnknown_203AD10
@ -1149,12 +1149,12 @@ _08108690:
lsrs r5, r0, 24
cmp r5, 0
bne _0810872C
ldr r0, _08108720 @ =gUnknown_2021CD0
ldr r0, _08108720 @ =gStringVar1
adds r1, r4, 0
movs r2, 0x1
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, _08108724 @ =gUnknown_2021D18
ldr r4, _08108724 @ =gStringVar4
ldr r1, _08108728 @ =gUnknown_84162B9
adds r0, r4, 0
bl StringExpandPlaceholders
@ -1174,8 +1174,8 @@ _08108690:
.align 2, 0
_08108718: .4byte gUnknown_203AD10
_0810871C: .4byte gUnknown_203ACFC
_08108720: .4byte gUnknown_2021CD0
_08108724: .4byte gUnknown_2021D18
_08108720: .4byte gStringVar1
_08108724: .4byte gStringVar4
_08108728: .4byte gUnknown_84162B9
_0810872C:
ldr r0, _08108760 @ =gSaveBlock1Ptr
@ -2327,7 +2327,7 @@ _08108FA0:
cmp r1, r0
beq _08108FE4
movs r0, 0x5
bl sub_80722CC
bl PlaySE
mov r0, sp
ldrh r1, [r4]
ldrh r0, [r0]
@ -2366,7 +2366,7 @@ _08108FE4:
_08109014: .4byte gUnknown_203ACFC
_08109018:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _08109038 @ =gUnknown_203AD30
movs r0, 0
strh r0, [r1]
@ -2384,7 +2384,7 @@ _0810903C: .4byte gUnknown_3005090
_08109040: .4byte sub_8108B50
_08109044:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _08109074 @ =gUnknown_203AD10
ldr r0, [r0]
adds r0, 0xA
@ -2549,7 +2549,7 @@ _08109194:
cmp r4, 0
beq _081091C6
movs r0, 0xF6
bl sub_80722CC
bl PlaySE
movs r0, 0x1
b _081091C8
.align 2, 0
@ -2566,7 +2566,7 @@ _081091B8:
cmp r4, 0x1
bhi _081091C6
movs r0, 0xF6
bl sub_80722CC
bl PlaySE
movs r0, 0x2
b _081091C8
_081091C6:
@ -2842,7 +2842,7 @@ sub_81093B8: @ 81093B8
ldr r0, [r0]
movs r6, 0
strb r4, [r0, 0x4]
ldr r4, _0810949C @ =gUnknown_2021CD0
ldr r4, _0810949C @ =gStringVar1
ldr r0, _081094A0 @ =gUnknown_203ACFC
ldrb r0, [r0, 0x6]
adds r0, 0x1
@ -2857,7 +2857,7 @@ sub_81093B8: @ 81093B8
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
ldr r4, _081094A4 @ =gUnknown_2021D18
ldr r4, _081094A4 @ =gStringVar4
ldr r1, _081094A8 @ =gUnknown_841633F
adds r0, r4, 0
bl StringExpandPlaceholders
@ -2907,9 +2907,9 @@ sub_81093B8: @ 81093B8
.align 2, 0
_08109494: .4byte gUnknown_3005098
_08109498: .4byte gUnknown_203AD10
_0810949C: .4byte gUnknown_2021CD0
_0810949C: .4byte gStringVar1
_081094A0: .4byte gUnknown_203ACFC
_081094A4: .4byte gUnknown_2021D18
_081094A4: .4byte gStringVar4
_081094A8: .4byte gUnknown_841633F
_081094AC: .4byte sub_81094B0
thumb_func_end sub_81093B8
@ -2957,7 +2957,7 @@ sub_81094B0: @ 81094B0
cmp r0, 0
beq _08109548
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _08109544 @ =gUnknown_203AD10
ldr r1, [r0]
movs r0, 0xFF
@ -2991,7 +2991,7 @@ _08109548:
b _0810959E
_08109558:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _08109584 @ =gUnknown_203AD10
ldr r1, [r0]
movs r0, 0xFF
@ -3013,7 +3013,7 @@ _08109558:
_08109584: .4byte gUnknown_203AD10
_08109588:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _081095A8 @ =gUnknown_203AD10
ldr r1, [r0]
movs r0, 0xFF
@ -3235,10 +3235,10 @@ sub_810971C: @ 810971C
bl sub_809A798
lsls r0, 16
lsrs r0, 16
ldr r1, _081097D8 @ =gUnknown_2021CD0
ldr r1, _081097D8 @ =gStringVar1
mov r10, r1
bl sub_8099E90
ldr r0, _081097DC @ =gUnknown_2021D18
ldr r0, _081097DC @ =gStringVar4
mov r9, r0
adds r1, r6, 0
bl StringExpandPlaceholders
@ -3293,8 +3293,8 @@ sub_810971C: @ 810971C
bx r0
.align 2, 0
_081097D4: .4byte gUnknown_203ACFC
_081097D8: .4byte gUnknown_2021CD0
_081097DC: .4byte gUnknown_2021D18
_081097D8: .4byte gStringVar1
_081097DC: .4byte gStringVar4
_081097E0: .4byte gUnknown_84162B9
thumb_func_end sub_810971C
@ -3316,14 +3316,14 @@ sub_81097E4: @ 81097E4
adds r0, r6, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r0, _08109848 @ =gUnknown_2021CD0
ldr r0, _08109848 @ =gStringVar1
lsls r4, 16
asrs r4, 16
adds r1, r4, 0
movs r2, 0x2
adds r3, r5, 0
bl ConvertIntToDecimalStringN
ldr r4, _0810984C @ =gUnknown_2021D18
ldr r4, _0810984C @ =gStringVar4
ldr r1, _08109850 @ =gUnknown_84162B9
adds r0, r4, 0
bl StringExpandPlaceholders
@ -3345,8 +3345,8 @@ sub_81097E4: @ 81097E4
pop {r0}
bx r0
.align 2, 0
_08109848: .4byte gUnknown_2021CD0
_0810984C: .4byte gUnknown_2021D18
_08109848: .4byte gStringVar1
_0810984C: .4byte gStringVar4
_08109850: .4byte gUnknown_84162B9
thumb_func_end sub_81097E4
@ -3724,9 +3724,9 @@ _08109AD4:
lsrs r4, 24
ldr r0, _08109BA8 @ =gUnknown_203AD30
ldrh r0, [r0]
ldr r1, _08109BAC @ =gUnknown_2021CD0
ldr r1, _08109BAC @ =gStringVar1
bl sub_8099E90
ldr r6, _08109BB0 @ =gUnknown_2021D18
ldr r6, _08109BB0 @ =gStringVar4
ldr r1, _08109BB4 @ =gUnknown_84162FF
adds r0, r6, 0
bl StringExpandPlaceholders
@ -3752,8 +3752,8 @@ _08109B9C: .4byte gUnknown_8452F18
_08109BA0: .4byte gUnknown_203AD28
_08109BA4: .4byte gUnknown_8452EB8
_08109BA8: .4byte gUnknown_203AD30
_08109BAC: .4byte gUnknown_2021CD0
_08109BB0: .4byte gUnknown_2021D18
_08109BAC: .4byte gStringVar1
_08109BB0: .4byte gStringVar4
_08109BB4: .4byte gUnknown_84162FF
thumb_func_end sub_8109890
@ -3802,7 +3802,7 @@ sub_8109BE4: @ 8109BE4
cmp r4, r0
bne _08109C24
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _08109C20 @ =gUnknown_8452EB8
ldr r1, [r0, 0x24]
adds r0, r5, 0
@ -3812,7 +3812,7 @@ sub_8109BE4: @ 8109BE4
_08109C20: .4byte gUnknown_8452EB8
_08109C24:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _08109C48 @ =gUnknown_8452EB8
ldr r0, _08109C4C @ =gUnknown_203AD24
ldr r0, [r0]
@ -3950,13 +3950,13 @@ sub_8109D38: @ 8109D38
lsls r1, 3
ldr r0, _08109D9C @ =gUnknown_3005098
adds r1, r0
ldr r0, _08109DA0 @ =gUnknown_2021CF0
ldr r0, _08109DA0 @ =gStringVar2
movs r2, 0x10
ldrsh r1, [r1, r2]
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r5, _08109DA4 @ =gUnknown_2021D18
ldr r5, _08109DA4 @ =gStringVar4
ldr r1, _08109DA8 @ =gUnknown_8416409
adds r0, r5, 0
bl StringExpandPlaceholders
@ -3986,8 +3986,8 @@ sub_8109D38: @ 8109D38
bx r0
.align 2, 0
_08109D9C: .4byte gUnknown_3005098
_08109DA0: .4byte gUnknown_2021CF0
_08109DA4: .4byte gUnknown_2021D18
_08109DA0: .4byte gStringVar2
_08109DA4: .4byte gStringVar4
_08109DA8: .4byte gUnknown_8416409
_08109DAC: .4byte gUnknown_8452F50
thumb_func_end sub_8109D38
@ -4055,7 +4055,7 @@ _08109E20:
cmp r0, 0
beq _08109E64
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x6
bl sub_810BAD8
lsls r0, 24
@ -4079,7 +4079,7 @@ _08109E64:
cmp r0, 0
beq _08109EA2
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
@ -4124,15 +4124,15 @@ sub_8109EA8: @ 8109EA8
bl sub_809A798
lsls r0, 16
lsrs r0, 16
ldr r1, _08109F30 @ =gUnknown_2021CD0
ldr r1, _08109F30 @ =gStringVar1
bl sub_8099E90
ldr r0, _08109F34 @ =gUnknown_2021CF0
ldr r0, _08109F34 @ =gStringVar2
movs r2, 0x10
ldrsh r1, [r6, r2]
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r6, _08109F38 @ =gUnknown_2021D18
ldr r6, _08109F38 @ =gStringVar4
ldr r1, _08109F3C @ =gUnknown_84163F4
adds r0, r6, 0
bl StringExpandPlaceholders
@ -4164,9 +4164,9 @@ sub_8109EA8: @ 8109EA8
.align 2, 0
_08109F28: .4byte gUnknown_3005098
_08109F2C: .4byte gUnknown_203ACFC
_08109F30: .4byte gUnknown_2021CD0
_08109F34: .4byte gUnknown_2021CF0
_08109F38: .4byte gUnknown_2021D18
_08109F30: .4byte gStringVar1
_08109F34: .4byte gStringVar2
_08109F38: .4byte gStringVar4
_08109F3C: .4byte gUnknown_84163F4
_08109F40: .4byte sub_8109F44
thumb_func_end sub_8109EA8
@ -4196,7 +4196,7 @@ sub_8109F44: @ 8109F44
beq _08109FE0
_08109F6E:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _08109FF4 @ =gUnknown_203AD30
ldrh r0, [r0]
ldrh r1, [r7, 0x10]
@ -4446,9 +4446,9 @@ sub_810A18C: @ 810A18C
lsrs r4, 24
ldr r0, _0810A1BC @ =gUnknown_203AD30
ldrh r0, [r0]
ldr r1, _0810A1C0 @ =gUnknown_2021CD0
ldr r1, _0810A1C0 @ =gStringVar1
bl sub_8099E90
ldr r5, _0810A1C4 @ =gUnknown_2021D18
ldr r5, _0810A1C4 @ =gStringVar4
ldr r1, _0810A1C8 @ =gUnknown_841635E
adds r0, r5, 0
bl StringExpandPlaceholders
@ -4462,8 +4462,8 @@ sub_810A18C: @ 810A18C
bx r0
.align 2, 0
_0810A1BC: .4byte gUnknown_203AD30
_0810A1C0: .4byte gUnknown_2021CD0
_0810A1C4: .4byte gUnknown_2021D18
_0810A1C0: .4byte gStringVar1
_0810A1C4: .4byte gStringVar4
_0810A1C8: .4byte gUnknown_841635E
_0810A1CC: .4byte sub_810A1D0
thumb_func_end sub_810A18C
@ -4480,7 +4480,7 @@ sub_810A1D0: @ 810A1D0
cmp r0, 0
beq _0810A1EE
movs r0, 0x5
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl sub_810A1F8
_0810A1EE:
@ -4968,9 +4968,9 @@ _0810A5B4:
cmp r0, 0
bne _0810A5F8
ldrh r0, [r6]
ldr r1, _0810A5E8 @ =gUnknown_2021CD0
ldr r1, _0810A5E8 @ =gStringVar1
bl sub_8099E90
ldr r4, _0810A5EC @ =gUnknown_2021D18
ldr r4, _0810A5EC @ =gStringVar4
ldr r1, _0810A5F0 @ =gUnknown_84168F1
adds r0, r4, 0
bl StringExpandPlaceholders
@ -4984,8 +4984,8 @@ _0810A5B4:
bl sub_8108E70
b _0810A63E
.align 2, 0
_0810A5E8: .4byte gUnknown_2021CD0
_0810A5EC: .4byte gUnknown_2021D18
_0810A5E8: .4byte gStringVar1
_0810A5EC: .4byte gStringVar4
_0810A5F0: .4byte gUnknown_84168F1
_0810A5F4: .4byte sub_810A1F8
_0810A5F8:
@ -5006,9 +5006,9 @@ _0810A610:
strh r0, [r4, 0x4]
_0810A618:
ldrh r0, [r6]
ldr r1, _0810A644 @ =gUnknown_2021CD0
ldr r1, _0810A644 @ =gStringVar1
bl sub_8099E90
ldr r4, _0810A648 @ =gUnknown_2021D18
ldr r4, _0810A648 @ =gStringVar4
ldr r1, _0810A64C @ =gUnknown_8416911
adds r0, r4, 0
bl StringExpandPlaceholders
@ -5025,8 +5025,8 @@ _0810A63E:
pop {r0}
bx r0
.align 2, 0
_0810A644: .4byte gUnknown_2021CD0
_0810A648: .4byte gUnknown_2021D18
_0810A644: .4byte gStringVar1
_0810A648: .4byte gStringVar4
_0810A64C: .4byte gUnknown_8416911
_0810A650: .4byte sub_810A770
thumb_func_end sub_810A568
@ -5081,7 +5081,7 @@ sub_810A690: @ 810A690
lsls r4, 3
ldr r0, _0810A6F4 @ =gUnknown_3005098
adds r4, r0
ldr r6, _0810A6F8 @ =gUnknown_2021D04
ldr r6, _0810A6F8 @ =gStringVar3
ldr r0, _0810A6FC @ =gUnknown_203ACFC
ldrb r0, [r0, 0x6]
adds r0, 0x1
@ -5101,7 +5101,7 @@ sub_810A690: @ 810A690
movs r2, 0
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r4, _0810A700 @ =gUnknown_2021D18
ldr r4, _0810A700 @ =gStringVar4
ldr r1, _0810A704 @ =gUnknown_8416936
adds r0, r4, 0
bl StringExpandPlaceholders
@ -5118,9 +5118,9 @@ sub_810A690: @ 810A690
bx r0
.align 2, 0
_0810A6F4: .4byte gUnknown_3005098
_0810A6F8: .4byte gUnknown_2021D04
_0810A6F8: .4byte gStringVar3
_0810A6FC: .4byte gUnknown_203ACFC
_0810A700: .4byte gUnknown_2021D18
_0810A700: .4byte gStringVar4
_0810A704: .4byte gUnknown_8416936
_0810A708: .4byte sub_810A70C
thumb_func_end sub_810A690
@ -5196,12 +5196,12 @@ sub_810A770: @ 810A770
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _0810A820 @ =gUnknown_2021CD0
ldr r0, _0810A820 @ =gStringVar1
movs r1, 0x1
movs r2, 0x2
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r6, _0810A824 @ =gUnknown_2021D18
ldr r6, _0810A824 @ =gStringVar4
ldr r1, _0810A828 @ =gUnknown_84162B9
adds r0, r6, 0
bl StringExpandPlaceholders
@ -5254,8 +5254,8 @@ sub_810A770: @ 810A770
bx r0
.align 2, 0
_0810A81C: .4byte gUnknown_3005098
_0810A820: .4byte gUnknown_2021CD0
_0810A824: .4byte gUnknown_2021D18
_0810A820: .4byte gStringVar1
_0810A824: .4byte gStringVar4
_0810A828: .4byte gUnknown_84162B9
_0810A82C: .4byte gUnknown_203ACFC
_0810A830: .4byte sub_810A85C
@ -5333,7 +5333,7 @@ _0810A8BC:
cmp r0, 0
beq _0810A8F0
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0
bl sub_810BA3C
movs r0, 0
@ -5352,7 +5352,7 @@ _0810A8F0:
cmp r0, 0
beq _0810A93A
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0
bl sub_810BA3C
movs r0, 0x2
@ -5396,9 +5396,9 @@ sub_810A940: @ 810A940
bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0810A9B8 @ =gUnknown_203AD30
ldrh r0, [r0]
ldr r1, _0810A9BC @ =gUnknown_2021CD0
ldr r1, _0810A9BC @ =gStringVar1
bl sub_8099E90
ldr r6, _0810A9C0 @ =gUnknown_2021D04
ldr r6, _0810A9C0 @ =gStringVar3
ldr r0, _0810A9C4 @ =gUnknown_203ACFC
ldrb r0, [r0, 0x6]
adds r0, 0x1
@ -5418,7 +5418,7 @@ sub_810A940: @ 810A940
movs r2, 0
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r4, _0810A9C8 @ =gUnknown_2021D18
ldr r4, _0810A9C8 @ =gStringVar4
ldr r1, _0810A9CC @ =gUnknown_8416959
adds r0, r4, 0
bl StringExpandPlaceholders
@ -5433,10 +5433,10 @@ sub_810A940: @ 810A940
.align 2, 0
_0810A9B4: .4byte gUnknown_3005098
_0810A9B8: .4byte gUnknown_203AD30
_0810A9BC: .4byte gUnknown_2021CD0
_0810A9C0: .4byte gUnknown_2021D04
_0810A9BC: .4byte gStringVar1
_0810A9C0: .4byte gStringVar3
_0810A9C4: .4byte gUnknown_203ACFC
_0810A9C8: .4byte gUnknown_2021D18
_0810A9C8: .4byte gStringVar4
_0810A9CC: .4byte gUnknown_8416959
_0810A9D0: .4byte sub_810A9D4
thumb_func_end sub_810A940
@ -5459,7 +5459,7 @@ sub_810A9D4: @ 810A9D4
add r1, r10
mov r8, r1
movs r0, 0xF8
bl sub_80722CC
bl PlaySE
ldr r5, _0810AADC @ =gUnknown_203AD30
ldrh r0, [r5]
mov r2, r8
@ -5584,7 +5584,7 @@ sub_810AAF4: @ 810AAF4
beq _0810AB32
_0810AB0E:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x2
bl sub_810BA3C
movs r0, 0x2
@ -5679,7 +5679,7 @@ _0810ABBC:
cmp r0, 0
beq _0810AC00
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x6
bl sub_810BAD8
lsls r0, 24
@ -5703,7 +5703,7 @@ _0810AC00:
cmp r0, 0
beq _0810AC38
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
@ -5755,15 +5755,15 @@ sub_810AC40: @ 810AC40
movs r1, 0
bl sub_80A2294
ldrh r0, [r5]
ldr r1, _0810ACD8 @ =gUnknown_2021CD0
ldr r1, _0810ACD8 @ =gStringVar1
bl sub_8099E90
ldr r0, _0810ACDC @ =gUnknown_2021CF0
ldr r0, _0810ACDC @ =gStringVar2
movs r2, 0x10
ldrsh r1, [r7, r2]
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, _0810ACE0 @ =gUnknown_2021D18
ldr r4, _0810ACE0 @ =gStringVar4
ldr r1, _0810ACE4 @ =gUnknown_84163A7
adds r0, r4, 0
bl StringExpandPlaceholders
@ -5793,9 +5793,9 @@ sub_810AC40: @ 810AC40
_0810ACCC: .4byte gUnknown_3005098
_0810ACD0: .4byte gUnknown_203AD30
_0810ACD4: .4byte 0x0000ffff
_0810ACD8: .4byte gUnknown_2021CD0
_0810ACDC: .4byte gUnknown_2021CF0
_0810ACE0: .4byte gUnknown_2021D18
_0810ACD8: .4byte gStringVar1
_0810ACDC: .4byte gStringVar2
_0810ACE0: .4byte gStringVar4
_0810ACE4: .4byte gUnknown_84163A7
_0810ACE8: .4byte sub_8109F44
_0810ACEC:
@ -6173,7 +6173,7 @@ _0810AFD4:
b _0810B064
_0810AFE4:
movs r0, 0xF6
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
movs r1, 0x1
movs r2, 0
@ -6181,7 +6181,7 @@ _0810AFE4:
b _0810B064
_0810AFF6:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r5]
movs r1, 0x2
bl bag_menu_print_cursor_
@ -6197,7 +6197,7 @@ _0810AFF6:
_0810B018: .4byte gUnknown_203AD30
_0810B01C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0xA
bl sub_810BA3C
movs r0, 0x6
@ -6479,7 +6479,7 @@ _0810B24E:
_0810B250: .4byte 0x000002ca
_0810B254:
movs r0, 0xF6
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
movs r1, 0x1
movs r2, 0
@ -6487,7 +6487,7 @@ _0810B254:
b _0810B36C
_0810B266:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r7]
movs r1, 0x2
bl bag_menu_print_cursor_
@ -6505,13 +6505,13 @@ _0810B266:
_0810B28C: .4byte gUnknown_203AD30
_0810B290:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
bl MoveMenuCursorNoWrapAround
b _0810B36C
_0810B29E:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0810B318 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _0810B31C @ =gUnknown_203AD30
@ -6579,7 +6579,7 @@ _0810B32C:
_0810B340: .4byte gMain
_0810B344:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r7]
movs r1, 0
movs r2, 0
@ -6679,7 +6679,7 @@ _0810B3F4:
_0810B404: .4byte 0x000002ca
_0810B408:
movs r0, 0xF6
bl sub_80722CC
bl PlaySE
adds r0, r5, 0
movs r1, 0x1
movs r2, 0
@ -6707,7 +6707,7 @@ _0810B430:
_0810B43C: .4byte gMain
_0810B440:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4]
movs r1, 0x2
bl bag_menu_print_cursor_
@ -6723,7 +6723,7 @@ _0810B440:
_0810B464: .4byte gUnknown_203AD30
_0810B468:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0xA
bl sub_810BA3C
movs r0, 0x6
@ -6823,7 +6823,7 @@ _0810B528:
_0810B538: .4byte gMain
_0810B53C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r5]
movs r1, 0x2
bl bag_menu_print_cursor_
@ -6839,7 +6839,7 @@ _0810B53C:
_0810B560: .4byte gUnknown_203AD30
_0810B564:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0xA
bl sub_810BA3C
movs r0, 0x6
@ -6939,7 +6939,7 @@ _0810B62C:
b _0810B6E0
_0810B63C:
movs r0, 0xF6
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
movs r1, 0x1
movs r2, 0
@ -6956,7 +6956,7 @@ _0810B64E:
_0810B65C: .4byte gMain
_0810B660:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r6]
movs r1, 0x2
bl bag_menu_print_cursor_
@ -6974,7 +6974,7 @@ _0810B660:
_0810B688: .4byte gUnknown_203AD30
_0810B68C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0xA
bl sub_810BA3C
movs r0, 0x6

82
asm/item_pc.s
View File

@ -295,7 +295,7 @@ _0810D650:
movs r0, 0x1
bl sub_810DE94
movs r0, 0x2
bl sub_80722CC
bl PlaySE
b _0810D674
_0810D668:
bl sub_80BF72C
@ -673,7 +673,7 @@ sub_810D954: @ 810D954
cmp r1, 0x1
beq _0810D968
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0810D968:
ldr r5, _0810D9BC @ =gUnknown_203ADBC
ldr r1, [r5]
@ -799,11 +799,11 @@ _0810DA58:
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
ldr r0, _0810DAA8 @ =gUnknown_2021CD0
ldr r0, _0810DAA8 @ =gStringVar1
movs r2, 0x1
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, _0810DAAC @ =gUnknown_2021D18
ldr r4, _0810DAAC @ =gStringVar4
ldr r1, _0810DAB0 @ =gUnknown_84162B9
adds r0, r4, 0
bl StringExpandPlaceholders
@ -826,8 +826,8 @@ _0810DA9E:
pop {r0}
bx r0
.align 2, 0
_0810DAA8: .4byte gUnknown_2021CD0
_0810DAAC: .4byte gUnknown_2021D18
_0810DAA8: .4byte gStringVar1
_0810DAAC: .4byte gStringVar4
_0810DAB0: .4byte gUnknown_84162B9
thumb_func_end sub_810DA20
@ -1112,7 +1112,7 @@ _0810DCB4:
movs r2, 0
bl sub_80A0A70
movs r0, 0x3
bl sub_80722CC
bl PlaySE
_0810DCC4:
ldr r0, _0810DCDC @ =gUnknown_3005090
lsls r1, r4, 2
@ -1414,7 +1414,7 @@ sub_810DEA0: @ 810DEA0
cmp r1, r0
beq _0810DF20
movs r0, 0x5
bl sub_80722CC
bl PlaySE
mov r0, sp
ldrh r1, [r4]
ldrh r0, [r0]
@ -1449,7 +1449,7 @@ _0810DF20:
_0810DF44: .4byte gUnknown_203ADD0
_0810DF48:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0
bl sub_810DE94
ldr r0, _0810DF64 @ =gUnknown_3005090
@ -1465,7 +1465,7 @@ _0810DF64: .4byte gUnknown_3005090
_0810DF68: .4byte sub_810DC8C
_0810DF6C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
bl sub_810DE6C
bl sub_810DBD0
@ -1546,7 +1546,7 @@ sub_810DFE0: @ 810DFE0
movs r1, 0
mov r9, r1
strb r4, [r0, 0x4]
ldr r4, _0810E0A4 @ =gUnknown_2021CD0
ldr r4, _0810E0A4 @ =gStringVar1
ldrh r0, [r6, 0x2]
bl sub_810DD68
lsls r0, 16
@ -1555,7 +1555,7 @@ sub_810DFE0: @ 810DFE0
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
ldr r4, _0810E0A8 @ =gUnknown_2021D18
ldr r4, _0810E0A8 @ =gStringVar4
ldr r1, _0810E0AC @ =gUnknown_841633F
adds r0, r4, 0
bl StringExpandPlaceholders
@ -1605,8 +1605,8 @@ sub_810DFE0: @ 810DFE0
.align 2, 0
_0810E09C: .4byte gUnknown_3005098
_0810E0A0: .4byte gUnknown_203ADBC
_0810E0A4: .4byte gUnknown_2021CD0
_0810E0A8: .4byte gUnknown_2021D18
_0810E0A4: .4byte gStringVar1
_0810E0A8: .4byte gStringVar4
_0810E0AC: .4byte gUnknown_841633F
_0810E0B0: .4byte sub_810E0B4
thumb_func_end sub_810DFE0
@ -1647,7 +1647,7 @@ sub_810E0B4: @ 810E0B4
cmp r0, 0
beq _0810E12C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0810E128 @ =gUnknown_203ADBC
ldr r1, [r0]
movs r0, 0xFF
@ -1670,7 +1670,7 @@ _0810E12C:
cmp r0, 0
beq _0810E150
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0810E15C @ =gUnknown_203ADBC
ldr r1, [r0]
movs r0, 0xFF
@ -1885,9 +1885,9 @@ sub_810E274: @ 810E274
bl sub_810DD68
lsls r0, 16
lsrs r0, 16
ldr r1, _0810E348 @ =gUnknown_2021CD0
ldr r1, _0810E348 @ =gStringVar1
bl sub_8099E90
ldr r6, _0810E34C @ =gUnknown_2021D18
ldr r6, _0810E34C @ =gStringVar4
ldr r1, _0810E350 @ =gUnknown_84162FF
adds r0, r6, 0
bl StringExpandPlaceholders
@ -1921,8 +1921,8 @@ sub_810E274: @ 810E274
.align 2, 0
_0810E340: .4byte gUnknown_3005098
_0810E344: .4byte gUnknown_8453F74
_0810E348: .4byte gUnknown_2021CD0
_0810E34C: .4byte gUnknown_2021D18
_0810E348: .4byte gStringVar1
_0810E34C: .4byte gStringVar4
_0810E350: .4byte gUnknown_84162FF
_0810E354: .4byte sub_810E358
thumb_func_end sub_810E274
@ -1944,13 +1944,13 @@ sub_810E358: @ 810E358
cmp r4, r0
bne _0810E384
movs r0, 0x5
bl sub_80722CC
bl PlaySE
adds r0, r5, 0
bl sub_810E8A0
b _0810E39A
_0810E384:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0810E3A0 @ =gUnknown_8453F74
lsls r1, r4, 3
adds r0, 0x4
@ -2046,16 +2046,16 @@ sub_810E418: @ 810E418
movs r1, 0
adds r2, r4, 0
bl sub_80A2294
ldr r1, _0810E4A4 @ =gUnknown_2021CD0
ldr r1, _0810E4A4 @ =gStringVar1
adds r0, r4, 0
bl sub_8099E90
ldr r0, _0810E4A8 @ =gUnknown_2021CF0
ldr r0, _0810E4A8 @ =gStringVar2
movs r2, 0x10
ldrsh r1, [r5, r2]
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, _0810E4AC @ =gUnknown_2021D18
ldr r4, _0810E4AC @ =gStringVar4
ldr r1, _0810E4B0 @ =gUnknown_84177C5
adds r0, r4, 0
bl StringExpandPlaceholders
@ -2081,9 +2081,9 @@ sub_810E418: @ 810E418
.align 2, 0
_0810E49C: .4byte gUnknown_3005098
_0810E4A0: .4byte 0x0000ffff
_0810E4A4: .4byte gUnknown_2021CD0
_0810E4A8: .4byte gUnknown_2021CF0
_0810E4AC: .4byte gUnknown_2021D18
_0810E4A4: .4byte gStringVar1
_0810E4A8: .4byte gStringVar2
_0810E4AC: .4byte gStringVar4
_0810E4B0: .4byte gUnknown_84177C5
_0810E4B4: .4byte sub_810E4F4
_0810E4B8:
@ -2139,7 +2139,7 @@ sub_810E4F4: @ 810E4F4
beq _0810E53A
_0810E51A:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrh r0, [r5, 0x2]
bl sub_810DD68
lsls r0, 16
@ -2175,7 +2175,7 @@ sub_810E548: @ 810E548
beq _0810E56E
_0810E562:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl sub_810E578
_0810E56E:
@ -2239,10 +2239,10 @@ sub_810E5E0: @ 810E5E0
bl sub_810DD68
lsls r0, 16
lsrs r0, 16
ldr r6, _0810E660 @ =gUnknown_2021CD0
ldr r6, _0810E660 @ =gStringVar1
adds r1, r6, 0
bl sub_8099E90
ldr r5, _0810E664 @ =gUnknown_2021D18
ldr r5, _0810E664 @ =gStringVar4
ldr r1, _0810E668 @ =gUnknown_84177AC
adds r0, r5, 0
bl StringExpandPlaceholders
@ -2287,8 +2287,8 @@ sub_810E5E0: @ 810E5E0
pop {r0}
bx r0
.align 2, 0
_0810E660: .4byte gUnknown_2021CD0
_0810E664: .4byte gUnknown_2021D18
_0810E660: .4byte gStringVar1
_0810E664: .4byte gStringVar4
_0810E668: .4byte gUnknown_84177AC
_0810E66C: .4byte gUnknown_84162B9
thumb_func_end sub_810E5E0
@ -2309,14 +2309,14 @@ sub_810E670: @ 810E670
movs r2, 0xA
movs r3, 0xA
bl FillWindowPixelRect
ldr r0, _0810E6CC @ =gUnknown_2021CD0
ldr r0, _0810E6CC @ =gStringVar1
lsls r4, 16
asrs r4, 16
adds r1, r4, 0
movs r2, 0x2
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, _0810E6D0 @ =gUnknown_2021D18
ldr r4, _0810E6D0 @ =gStringVar4
ldr r1, _0810E6D4 @ =gUnknown_84162B9
adds r0, r4, 0
bl StringExpandPlaceholders
@ -2338,8 +2338,8 @@ sub_810E670: @ 810E670
pop {r0}
bx r0
.align 2, 0
_0810E6CC: .4byte gUnknown_2021CD0
_0810E6D0: .4byte gUnknown_2021D18
_0810E6CC: .4byte gStringVar1
_0810E6D0: .4byte gStringVar4
_0810E6D4: .4byte gUnknown_84162B9
thumb_func_end sub_810E670
@ -2376,7 +2376,7 @@ _0810E70C:
cmp r0, 0
beq _0810E750
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
bl sub_810EAF0
movs r0, 0x3
@ -2400,7 +2400,7 @@ _0810E750:
cmp r0, 0
beq _0810E796
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x3
movs r1, 0
bl sub_810F4D8
@ -2525,7 +2525,7 @@ sub_810E848: @ 810E848
cmp r0, 0
beq _0810E892
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x5
movs r1, 0
bl sub_810F260

72
asm/item_use.s
View File

@ -151,7 +151,7 @@ sub_80A10C4: @ 80A10C4
lsrs r4, 24
lsls r2, 24
lsrs r6, r2, 24
ldr r5, _080A10F0 @ =gUnknown_2021D18
ldr r5, _080A10F0 @ =gStringVar4
adds r0, r5, 0
bl StringExpandPlaceholders
cmp r4, 0
@ -163,7 +163,7 @@ sub_80A10C4: @ 80A10C4
bl sub_8108E70
b _080A1104
.align 2, 0
_080A10F0: .4byte gUnknown_2021D18
_080A10F0: .4byte gStringVar4
_080A10F4: .4byte sub_810A1F8
_080A10F8:
ldr r3, _080A110C @ =sub_80A112C
@ -443,7 +443,7 @@ sub_80A1304: @ 80A1304
cmp r0, 0
bne _080A131C
movs r0, 0xB
bl sub_80722CC
bl PlaySE
_080A131C:
movs r0, 0x6
bl sub_80BD5C8
@ -612,7 +612,7 @@ sub_80A1460: @ 80A1460
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _080A14B4 @ =gUnknown_2021CD0
ldr r4, _080A14B4 @ =gStringVar1
bl sub_80D0554
adds r1, r0, 0
lsls r1, 16
@ -621,7 +621,7 @@ sub_80A1460: @ 80A1460
movs r2, 0
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r4, _080A14B8 @ =gUnknown_2021D18
ldr r4, _080A14B8 @ =gStringVar4
ldr r1, _080A14BC @ =gUnknown_8416537
adds r0, r4, 0
bl StringExpandPlaceholders
@ -647,8 +647,8 @@ sub_80A1460: @ 80A1460
bl sub_8108E70
b _080A14DC
.align 2, 0
_080A14B4: .4byte gUnknown_2021CD0
_080A14B8: .4byte gUnknown_2021D18
_080A14B4: .4byte gStringVar1
_080A14B8: .4byte gStringVar4
_080A14BC: .4byte gUnknown_8416537
_080A14C0: .4byte gUnknown_203AD30
_080A14C4: .4byte 0x0000ffff
@ -673,14 +673,14 @@ sub_80A14E8: @ 80A14E8
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _080A1538 @ =gUnknown_2021CD0
ldr r4, _080A1538 @ =gStringVar1
bl sub_815EFA0
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
movs r3, 0x5
bl ConvertIntToDecimalStringN
ldr r4, _080A153C @ =gUnknown_2021D18
ldr r4, _080A153C @ =gStringVar4
ldr r1, _080A1540 @ =gUnknown_8416644
adds r0, r4, 0
bl StringExpandPlaceholders
@ -706,8 +706,8 @@ sub_80A14E8: @ 80A14E8
bl sub_8108E70
b _080A1560
.align 2, 0
_080A1538: .4byte gUnknown_2021CD0
_080A153C: .4byte gUnknown_2021D18
_080A1538: .4byte gStringVar1
_080A153C: .4byte gStringVar4
_080A1540: .4byte gUnknown_8416644
_080A1544: .4byte gUnknown_203AD30
_080A1548: .4byte 0x0000ffff
@ -1286,7 +1286,7 @@ sub_80A1998: @ 80A1998
cmp r0, 0
bne _080A19CC
movs r0, 0x29
bl sub_80722CC
bl PlaySE
ldr r0, _080A19C4 @ =gUnknown_3005090
lsls r1, r4, 2
adds r1, r4
@ -1338,7 +1338,7 @@ sub_80A19E8: @ 80A19E8
adds r0, r5, 0
bl VarSet
bl sub_80A1A44
ldr r2, _080A1A3C @ =gUnknown_2021D18
ldr r2, _080A1A3C @ =gStringVar4
ldr r3, _080A1A40 @ =sub_810A1F8
adds r0, r6, 0
movs r1, 0x2
@ -1351,7 +1351,7 @@ _080A1A2A:
_080A1A30: .4byte gUnknown_203AD30
_080A1A34: .4byte 0x0000ffff
_080A1A38: .4byte 0x00004020
_080A1A3C: .4byte gUnknown_2021D18
_080A1A3C: .4byte gStringVar4
_080A1A40: .4byte sub_810A1F8
thumb_func_end sub_80A19E8
@ -1373,9 +1373,9 @@ sub_80A1A44: @ 80A1A44
lsrs r0, 24
bl sub_81089F4
ldrh r0, [r4]
ldr r1, _080A1A88 @ =gUnknown_2021CF0
ldr r1, _080A1A88 @ =gStringVar2
bl sub_8099E90
ldr r0, _080A1A8C @ =gUnknown_2021D18
ldr r0, _080A1A8C @ =gStringVar4
ldr r1, _080A1A90 @ =gUnknown_841658C
bl StringExpandPlaceholders
pop {r4}
@ -1383,8 +1383,8 @@ sub_80A1A44: @ 80A1A44
bx r0
.align 2, 0
_080A1A84: .4byte gUnknown_203AD30
_080A1A88: .4byte gUnknown_2021CF0
_080A1A8C: .4byte gUnknown_2021D18
_080A1A88: .4byte gStringVar2
_080A1A8C: .4byte gStringVar4
_080A1A90: .4byte gUnknown_841658C
thumb_func_end sub_80A1A44
@ -1408,9 +1408,9 @@ sub_80A1A94: @ 80A1A94
ldr r0, _080A1AE0 @ =0x00000804
bl FlagClear
ldrh r0, [r5]
ldr r1, _080A1AE4 @ =gUnknown_2021CF0
ldr r1, _080A1AE4 @ =gStringVar2
bl sub_8099E90
ldr r0, _080A1AE8 @ =gUnknown_2021D18
ldr r0, _080A1AE8 @ =gStringVar4
ldr r1, _080A1AEC @ =gUnknown_84165D2
bl StringExpandPlaceholders
ldr r1, _080A1AF0 @ =gUnknown_3005090
@ -1422,8 +1422,8 @@ _080A1AD4: .4byte gUnknown_203AD30
_080A1AD8: .4byte 0x0000ffff
_080A1ADC: .4byte 0x00000803
_080A1AE0: .4byte 0x00000804
_080A1AE4: .4byte gUnknown_2021CF0
_080A1AE8: .4byte gUnknown_2021D18
_080A1AE4: .4byte gStringVar2
_080A1AE8: .4byte gStringVar4
_080A1AEC: .4byte gUnknown_84165D2
_080A1AF0: .4byte gUnknown_3005090
_080A1AF4:
@ -1434,9 +1434,9 @@ _080A1AF4:
ldr r0, _080A1B30 @ =0x00000803
bl FlagClear
ldrh r0, [r5]
ldr r1, _080A1B34 @ =gUnknown_2021CF0
ldr r1, _080A1B34 @ =gStringVar2
bl sub_8099E90
ldr r0, _080A1B38 @ =gUnknown_2021D18
ldr r0, _080A1B38 @ =gStringVar4
ldr r1, _080A1B3C @ =gUnknown_8416600
bl StringExpandPlaceholders
ldr r1, _080A1B40 @ =gUnknown_3005090
@ -1456,8 +1456,8 @@ _080A1B26:
.align 2, 0
_080A1B2C: .4byte 0x00000804
_080A1B30: .4byte 0x00000803
_080A1B34: .4byte gUnknown_2021CF0
_080A1B38: .4byte gUnknown_2021D18
_080A1B34: .4byte gStringVar2
_080A1B38: .4byte gStringVar4
_080A1B3C: .4byte gUnknown_8416600
_080A1B40: .4byte gUnknown_3005090
_080A1B44: .4byte sub_80A1B48
@ -1481,8 +1481,8 @@ sub_80A1B48: @ 80A1B48
cmp r0, 0x7
ble _080A1B78
movs r0, 0x6E
bl sub_80722CC
ldr r2, _080A1B84 @ =gUnknown_2021D18
bl PlaySE
ldr r2, _080A1B84 @ =gStringVar4
ldr r3, _080A1B88 @ =sub_810A1F8
adds r0, r4, 0
movs r1, 0x2
@ -1493,7 +1493,7 @@ _080A1B78:
bx r0
.align 2, 0
_080A1B80: .4byte gUnknown_3005090
_080A1B84: .4byte gUnknown_2021D18
_080A1B84: .4byte gStringVar4
_080A1B88: .4byte sub_810A1F8
thumb_func_end sub_80A1B48
@ -1577,7 +1577,7 @@ sub_80A1C08: @ 80A1C08
adds r0, r1
movs r1, 0
strh r1, [r0, 0x8]
ldr r2, _080A1C3C @ =gUnknown_2021D18
ldr r2, _080A1C3C @ =gStringVar4
ldr r3, _080A1C40 @ =sub_80A1C44
adds r0, r4, 0
movs r1, 0x2
@ -1587,7 +1587,7 @@ sub_80A1C08: @ 80A1C08
bx r0
.align 2, 0
_080A1C38: .4byte gUnknown_3005090
_080A1C3C: .4byte gUnknown_2021D18
_080A1C3C: .4byte gStringVar4
_080A1C40: .4byte sub_80A1C44
thumb_func_end sub_80A1C08
@ -1956,7 +1956,7 @@ sub_80A1EF4: @ 80A1EF4
ldr r0, _080A1F40 @ =gUnknown_203AD30
ldrh r4, [r0]
movs r0, 0x1
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
movs r1, 0x1
bl sub_809A1D8
@ -2103,7 +2103,7 @@ sub_80A2010: @ 80A2010
movs r0, 0x4
movs r1, 0
bl sub_80A2294
ldr r2, _080A2050 @ =gUnknown_2021D18
ldr r2, _080A2050 @ =gStringVar4
ldr r3, _080A2054 @ =sub_8108B50
adds r0, r4, 0
movs r1, 0x2
@ -2113,7 +2113,7 @@ sub_80A2010: @ 80A2010
_080A2044: .4byte gUnknown_2022B4C
_080A2048: .4byte gUnknown_203AD30
_080A204C: .4byte 0x0000ffff
_080A2050: .4byte gUnknown_2021D18
_080A2050: .4byte gStringVar4
_080A2054: .4byte sub_8108B50
_080A2058:
adds r0, r4, 0
@ -2331,7 +2331,7 @@ sub_80A2238: @ 80A2238
lsrs r0, 24
cmp r0, 0x5
bne _080A2278
ldr r4, _080A226C @ =gUnknown_2021D18
ldr r4, _080A226C @ =gStringVar4
ldr r1, _080A2270 @ =gUnknown_8416425
adds r0, r4, 0
bl StringExpandPlaceholders
@ -2343,7 +2343,7 @@ sub_80A2238: @ 80A2238
b _080A228A
.align 2, 0
_080A2268: .4byte gUnknown_203AD30
_080A226C: .4byte gUnknown_2021D18
_080A226C: .4byte gStringVar4
_080A2270: .4byte gUnknown_8416425
_080A2274: .4byte sub_813E2B8
_080A2278:

4
asm/itemfinder.s
View File

@ -130,7 +130,7 @@ _0813ED80: .4byte gUnknown_3005098
_0813ED84: .4byte sub_813F364
_0813ED88:
movs r0, 0x41
bl sub_80722CC
bl PlaySE
ldrb r0, [r4, 0xA]
adds r1, r5, 0
bl sub_813F40C
@ -182,7 +182,7 @@ _0813EDE4: .4byte gUnknown_3005098
_0813EDE8: .4byte sub_813F3A8
_0813EDEC:
movs r0, 0x41
bl sub_80722CC
bl PlaySE
bl sub_813F5AC
lsls r0, 24
lsrs r0, 24

32
asm/learn_move.s
View File

@ -293,7 +293,7 @@ sub_80E48C0: @ 80E48C0
push {r4,lr}
sub sp, 0x8
adds r1, r0, 0
ldr r4, _080E48F0 @ =gUnknown_2021D18
ldr r4, _080E48F0 @ =gStringVar4
adds r0, r4, 0
bl StringExpandPlaceholders
bl sub_80F78A8
@ -312,7 +312,7 @@ sub_80E48C0: @ 80E48C0
pop {r0}
bx r0
.align 2, 0
_080E48F0: .4byte gUnknown_2021D18
_080E48F0: .4byte gStringVar4
thumb_func_end sub_80E48C0
thumb_func_start sub_80E48F4
@ -877,7 +877,7 @@ _080E4DB4:
bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r2, _080E4E54 @ =gUnknown_2021D04
ldr r2, _080E4E54 @ =gStringVar3
movs r1, 0xD
mov r9, r1
mov r1, r9
@ -913,7 +913,7 @@ _080E4DB4:
adds r3, r6
ldrb r2, [r3]
bl SetMonMoveSlot
ldr r0, _080E4E64 @ =gUnknown_2021CF0
ldr r0, _080E4E64 @ =gStringVar2
ldr r2, [r7]
adds r4, r2, r4
ldrb r1, [r4]
@ -937,11 +937,11 @@ _080E4DB4:
b _080E4EDA
.align 2, 0
_080E4E50: .4byte gUnknown_2024284
_080E4E54: .4byte gUnknown_2021D04
_080E4E54: .4byte gStringVar3
_080E4E58: .4byte gUnknown_8247094
_080E4E5C: .4byte 0x00000261
_080E4E60: .4byte 0x00000a67
_080E4E64: .4byte gUnknown_2021CF0
_080E4E64: .4byte gStringVar2
_080E4E68: .4byte gUnknown_841E493
_080E4E6C: .4byte gUnknown_20370C0
_080E4E70:
@ -986,7 +986,7 @@ _080E4EC0:
cmp r0, 0
beq _080E4EDA
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_080E4ED2:
ldr r0, _080E4EEC @ =gUnknown_203AAB4
ldr r1, [r0]
@ -1033,7 +1033,7 @@ sub_80E4F0C: @ 80E4F0C
lsrs r5, r0, 24
cmp r5, 0
bne _080E4F42
ldr r4, _080E4F4C @ =gUnknown_2021D18
ldr r4, _080E4F4C @ =gStringVar4
ldr r1, _080E4F50 @ =gUnknown_841E3E3
adds r0, r4, 0
bl StringExpandPlaceholders
@ -1056,7 +1056,7 @@ _080E4F42:
pop {r0}
bx r0
.align 2, 0
_080E4F4C: .4byte gUnknown_2021D18
_080E4F4C: .4byte gStringVar4
_080E4F50: .4byte gUnknown_841E3E3
thumb_func_end sub_80E4F0C
@ -1320,7 +1320,7 @@ _080E513C:
movs r1, 0x2
mov r2, sp
bl GetMonData
ldr r0, _080E51F4 @ =gUnknown_2021CD0
ldr r0, _080E51F4 @ =gStringVar1
mov r1, sp
bl StringCopy10
ldr r0, [r4]
@ -1395,7 +1395,7 @@ _080E51AA:
_080E51E8: .4byte gUnknown_203AAB4
_080E51EC: .4byte gUnknown_2024284
_080E51F0: .4byte gUnknown_8247094
_080E51F4: .4byte gUnknown_2021CD0
_080E51F4: .4byte gStringVar1
_080E51F8: .4byte gUnknown_84161C1
_080E51FC: .4byte gUnknown_3005E70
_080E5200: .4byte gUnknown_83FFA94
@ -1417,7 +1417,7 @@ sub_80E5204: @ 80E5204
cmp r0, 0
beq _080E5284
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, [r4]
ldr r2, _080E5264 @ =0x00000a67
adds r0, r1, r2
@ -1426,7 +1426,7 @@ sub_80E5204: @ 80E5204
beq _080E5270
movs r0, 0x8
strb r0, [r1]
ldr r0, _080E5268 @ =gUnknown_2021CF0
ldr r0, _080E5268 @ =gStringVar2
ldr r1, [r4]
adds r2, r1, r2
ldrb r3, [r2]
@ -1445,7 +1445,7 @@ _080E5258: .4byte gUnknown_203AAB4
_080E525C: .4byte 0x00000263
_080E5260: .4byte gMain
_080E5264: .4byte 0x00000a67
_080E5268: .4byte gUnknown_2021CF0
_080E5268: .4byte gStringVar2
_080E526C: .4byte gUnknown_841E3FB
_080E5270:
ldr r0, _080E5280 @ =gUnknown_841E4E2
@ -1462,7 +1462,7 @@ _080E5284:
cmp r0, 0
beq _080E529E
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, [r4]
movs r1, 0xC
strb r1, [r0]
@ -1790,7 +1790,7 @@ sub_80E553C: @ 80E553C
cmp r1, 0
bne _080E5560
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r2, _080E5568 @ =gUnknown_203AAB4
ldr r0, [r2]
ldr r1, _080E556C @ =0x0000025f

4
asm/link.s
View File

@ -3505,7 +3505,7 @@ _0800AF6C:
b _0800AFC4
_0800AF72:
movs r0, 0x16
bl sub_80722CC
bl PlaySE
b _0800AFC4
_0800AF7A:
ldr r0, _0800AF9C @ =gUnknown_3003F3C
@ -3560,7 +3560,7 @@ _0800AFC4:
beq _0800B02E
bl sub_812B484
movs r0, 0x15
bl sub_80722CC
bl PlaySE
movs r0, 0
strb r0, [r4]
ldr r1, _0800B00C @ =gUnknown_2022854

8
asm/link_rfu.s
View File

@ -3355,7 +3355,7 @@ _080FED10:
cmp r4, 0
beq _080FED6E
movs r0, 0x5
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl sub_8100134
_080FED20:
@ -6401,7 +6401,7 @@ _081002EE:
movs r0, 0x1
ldr r1, _0810030C @ =gUnknown_843F8D8
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
lsls r1, r0, 3
subs r0, r1, r0
b _08100322
@ -6416,7 +6416,7 @@ _08100310:
movs r0, 0x1
mov r1, sp
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
_08100322:
adds r0, 0x11
lsls r1, r6, 16
@ -7702,7 +7702,7 @@ sub_8100D24: @ 8100D24
movs r0, 0x1
adds r1, r5, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r4, 0x80
subs r4, r0
lsrs r4, 1

364
asm/link_rfu_3.s
View File

File diff suppressed because it is too large Load Diff

60
asm/link_rfu_4.s
View File

@ -144,7 +144,7 @@ sub_8142504: @ 8142504
push {r4,lr}
sub sp, 0x14
adds r1, r0, 0
ldr r4, _08142558 @ =gUnknown_2021D18
ldr r4, _08142558 @ =gStringVar4
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -177,7 +177,7 @@ sub_8142504: @ 8142504
pop {r0}
bx r0
.align 2, 0
_08142558: .4byte gUnknown_2021D18
_08142558: .4byte gStringVar4
_0814255C: .4byte gUnknown_8466EF0
thumb_func_end sub_8142504
@ -432,7 +432,7 @@ _08142718:
lsls r2, 29
lsrs r2, 29
movs r0, 0x2
bl sub_8005ED4
bl GetStringWidth
cmp r0, r6
bls _08142732
adds r6, r0, 0
@ -517,14 +517,14 @@ _081427BE:
_081427C8:
b _081428E6
_081427CA:
ldr r0, _081427D8 @ =gUnknown_2021D18
ldr r0, _081427D8 @ =gStringVar4
bl StringExpandPlaceholders
cmp r6, 0
bne _081427E0
ldr r0, _081427DC @ =gUnknown_8466D90
b _081427E2
.align 2, 0
_081427D8: .4byte gUnknown_2021D18
_081427D8: .4byte gStringVar4
_081427DC: .4byte gUnknown_8466D90
_081427E0:
ldr r0, _08142828 @ =gUnknown_8466D98
@ -542,7 +542,7 @@ _081427E2:
ldr r1, _0814282C @ =gUnknown_8466EF0
str r1, [sp, 0x8]
str r2, [sp, 0xC]
ldr r1, _08142830 @ =gUnknown_2021D18
ldr r1, _08142830 @ =gStringVar4
str r1, [sp, 0x10]
movs r1, 0x2
movs r3, 0x2
@ -560,7 +560,7 @@ _081427E2:
.align 2, 0
_08142828: .4byte gUnknown_8466D98
_0814282C: .4byte gUnknown_8466EF0
_08142830: .4byte gUnknown_2021D18
_08142830: .4byte gStringVar4
_08142834:
ldr r0, _08142850 @ =gUnknown_8466DB0
ldr r1, [r0, 0x4]
@ -676,15 +676,15 @@ _08142912:
_08142914:
cmp r2, 0
bne _0814292C
ldr r0, _08142924 @ =gUnknown_2021D18
ldr r0, _08142924 @ =gStringVar4
ldr r1, _08142928 @ =gUnknown_841EA86
bl StringExpandPlaceholders
b _08142934
.align 2, 0
_08142924: .4byte gUnknown_2021D18
_08142924: .4byte gStringVar4
_08142928: .4byte gUnknown_841EA86
_0814292C:
ldr r0, _08142984 @ =gUnknown_2021D18
ldr r0, _08142984 @ =gStringVar4
ldr r1, _08142988 @ =gUnknown_841EAB7
bl StringExpandPlaceholders
_08142934:
@ -703,7 +703,7 @@ _08142934:
ldr r1, _08142990 @ =gUnknown_8466EF0
str r1, [sp, 0x8]
str r2, [sp, 0xC]
ldr r1, _08142984 @ =gUnknown_2021D18
ldr r1, _08142984 @ =gStringVar4
str r1, [sp, 0x10]
movs r1, 0x2
movs r3, 0x2
@ -722,7 +722,7 @@ _08142934:
strb r0, [r6]
b _08142A38
.align 2, 0
_08142984: .4byte gUnknown_2021D18
_08142984: .4byte gStringVar4
_08142988: .4byte gUnknown_841EAB7
_0814298C: .4byte gUnknown_8466DA0
_08142990: .4byte gUnknown_8466EF0
@ -1602,12 +1602,12 @@ _08143052:
movs r0, 0
b _0814359E
_08143058:
ldr r0, _08143074 @ =gUnknown_2021CD0
ldr r0, _08143074 @ =gStringVar1
movs r1, 0xFF
strb r1, [r0]
ldr r0, _08143078 @ =gUnknown_2021CF0
ldr r0, _08143078 @ =gStringVar2
strb r1, [r0]
ldr r0, _0814307C @ =gUnknown_2021D04
ldr r0, _0814307C @ =gStringVar3
strb r1, [r0]
ldrb r0, [r5, 0xC]
cmp r0, 0
@ -1616,9 +1616,9 @@ _08143058:
beq _0814309A
b _081430B2
.align 2, 0
_08143074: .4byte gUnknown_2021CD0
_08143078: .4byte gUnknown_2021CF0
_0814307C: .4byte gUnknown_2021D04
_08143074: .4byte gStringVar1
_08143078: .4byte gStringVar2
_0814307C: .4byte gStringVar3
_08143080:
ldrb r0, [r5, 0xD]
cmp r0, 0x1
@ -1730,12 +1730,12 @@ _08143156:
_0814315C:
movs r0, 0xB
strb r0, [r5, 0x8]
ldr r0, _0814316C @ =gUnknown_2021CD0
ldr r0, _0814316C @ =gStringVar1
ldr r1, _08143170 @ =gUnknown_2022744
bl StringCopy
b _081435C6
.align 2, 0
_0814316C: .4byte gUnknown_2021CD0
_0814316C: .4byte gStringVar1
_08143170: .4byte gUnknown_2022744
_08143174:
adds r4, r5, 0
@ -1846,7 +1846,7 @@ _08143242:
ldrb r0, [r5, 0xD]
cmp r0, 0x1
bne _08143250
ldr r0, _0814325C @ =gUnknown_2021CD0
ldr r0, _0814325C @ =gStringVar1
ldr r1, _08143260 @ =gUnknown_2022744
bl StringCopy
_08143250:
@ -1855,7 +1855,7 @@ _08143250:
b _081435C6
.align 2, 0
_08143258: .4byte gUnknown_841E7A3
_0814325C: .4byte gUnknown_2021CD0
_0814325C: .4byte gStringVar1
_08143260: .4byte gUnknown_2022744
_08143264:
ldrb r1, [r5, 0xC]
@ -2187,12 +2187,12 @@ _081434C4:
.align 2, 0
_081434CC: .4byte gUnknown_20370D0
_081434D0:
ldr r0, _081434F0 @ =gUnknown_2021CD0
ldr r0, _081434F0 @ =gStringVar1
movs r1, 0xFF
strb r1, [r0]
ldr r0, _081434F4 @ =gUnknown_2021CF0
ldr r0, _081434F4 @ =gStringVar2
strb r1, [r0]
ldr r0, _081434F8 @ =gUnknown_2021D04
ldr r0, _081434F8 @ =gStringVar3
strb r1, [r0]
ldrb r0, [r5, 0xC]
cmp r0, 0
@ -2202,9 +2202,9 @@ _081434D0:
bl sub_8144F40
b _0814350A
.align 2, 0
_081434F0: .4byte gUnknown_2021CD0
_081434F4: .4byte gUnknown_2021CF0
_081434F8: .4byte gUnknown_2021D04
_081434F0: .4byte gStringVar1
_081434F4: .4byte gStringVar2
_081434F8: .4byte gStringVar3
_081434FC: .4byte gUnknown_841EAE7
_08143500:
ldr r0, _08143510 @ =gUnknown_841EB01
@ -2228,14 +2228,14 @@ _08143514:
b _081435C6
_08143528:
bl task_add_05_task_del_08FA224_when_no_RfuFunc
ldr r0, _0814353C @ =gUnknown_2021CD0
ldr r0, _0814353C @ =gStringVar1
ldr r1, _08143540 @ =gUnknown_2022760
bl StringCopy
movs r0, 0x22
strb r0, [r5, 0x8]
b _081435C6
.align 2, 0
_0814353C: .4byte gUnknown_2021CD0
_0814353C: .4byte gStringVar1
_08143540: .4byte gUnknown_2022760
_08143544:
bl sub_80FA4F8

2
asm/list_menu.s
View File

@ -1642,7 +1642,7 @@ sub_8107AEC: @ 8107AEC
cmp r1, 0
bne _08107AFA
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_08107AFA:
pop {r0}
bx r0

2
asm/mail.s
View File

@ -838,7 +838,7 @@ _080BF2CE:
movs r0, 0x1
adds r1, r4, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
mov r9, r0
ldr r5, _080BF348 @ =gUnknown_20399C4
ldr r0, [r5]

2
asm/mailbox_pc.s
View File

@ -278,7 +278,7 @@ sub_810ED6C: @ 810ED6C
cmp r1, 0x1
beq _0810ED7C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0810ED7C:
pop {r0}
bx r0

6
asm/main_menu.s
View File

@ -1110,7 +1110,7 @@ _0800CC34:
cmp r1, 0
beq _0800CC58
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
negs r0, r0
movs r1, 0
@ -1226,7 +1226,7 @@ sub_800CCF8: @ 800CCF8
cmp r5, 0
beq _0800CD44
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_8009480
movs r0, 0x1
negs r0, r0
@ -1253,7 +1253,7 @@ _0800CD44:
cmp r0, 0
beq _0800CD8C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
negs r0, r0
str r5, [sp]

2
asm/map_name_popup.s
View File

@ -408,7 +408,7 @@ _08098434:
negs r2, r2
movs r0, 0x2
add r1, sp, 0xC
bl sub_8005ED4
bl GetStringWidth
adds r4, r0, 0
subs r4, r5, r4
lsrs r4, 1

6
asm/map_preview_screen.s
View File

@ -319,7 +319,7 @@ sub_80F8318: @ 80F8318
strb r0, [r1, 0x1]
movs r0, 0x3
strb r0, [r1, 0x2]
ldr r5, _080F83AC @ =gUnknown_2021D18
ldr r5, _080F83AC @ =gStringVar4
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0
@ -327,7 +327,7 @@ sub_80F8318: @ 80F8318
movs r0, 0x2
adds r1, r5, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r2, 0x68
subs r2, r0
lsrs r2, 1
@ -356,7 +356,7 @@ sub_80F8318: @ 80F8318
bx r1
.align 2, 0
_080F83A8: .4byte gUnknown_843EBA8
_080F83AC: .4byte gUnknown_2021D18
_080F83AC: .4byte gStringVar4
thumb_func_end sub_80F8318
thumb_func_start sub_80F83B0

52
asm/menu.s
View File

@ -1025,7 +1025,7 @@ sub_810F5E8: @ 810F5E8
movs r0, 0
adds r1, r5, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
ldrb r1, [r4]
movs r3, 0x14
negs r3, r3
@ -1102,7 +1102,7 @@ _0810F684:
movs r0, 0
adds r1, r5, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
ldrb r1, [r4]
movs r3, 0x14
negs r3, r3
@ -1519,7 +1519,7 @@ ProcessMenuInput: @ 810F998
cmp r0, 0
bne _0810F9B4
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0810F9B4:
movs r0, 0x2
ldrsb r0, [r4, r0]
@ -1541,7 +1541,7 @@ _0810F9D2:
cmp r0, 0
beq _0810F9E6
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
negs r0, r0
b _0810F9F6
@ -1551,7 +1551,7 @@ _0810F9E6:
cmp r0, 0
beq _0810F9FA
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
_0810F9F6:
bl MoveMenuCursor
@ -1580,7 +1580,7 @@ ProcessMenuInputNoWrapAround: @ 810FA04
cmp r0, 0
bne _0810FA24
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0810FA24:
movs r0, 0x2
ldrsb r0, [r4, r0]
@ -1622,7 +1622,7 @@ _0810FA5C:
beq _0810FA78
_0810FA72:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0810FA78:
movs r0, 0x2
negs r0, r0
@ -1646,7 +1646,7 @@ ProcessMenuInput_other: @ 810FA84
cmp r0, 0
bne _0810FAA0
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0810FAA0:
movs r0, 0x2
ldrsb r0, [r4, r0]
@ -1669,7 +1669,7 @@ _0810FABE:
cmp r1, 0x40
bne _0810FAD4
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
negs r0, r0
b _0810FAE0
@ -1677,7 +1677,7 @@ _0810FAD4:
cmp r1, 0x80
bne _0810FAE4
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
_0810FAE0:
bl MoveMenuCursor
@ -1706,7 +1706,7 @@ ProcessMenuInputNoWrapAround_other: @ 810FAF0
cmp r0, 0
bne _0810FB10
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0810FB10:
movs r0, 0x2
ldrsb r0, [r4, r0]
@ -1747,7 +1747,7 @@ _0810FB4A:
beq _0810FB62
_0810FB5C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0810FB62:
movs r0, 0x2
negs r0, r0
@ -3102,7 +3102,7 @@ sub_81105A0: @ 81105A0
cmp r0, 0
beq _081105C8
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _081105C4 @ =gUnknown_203ADE4
ldrb r0, [r0, 0x2]
lsls r0, 24
@ -3125,7 +3125,7 @@ _081105D6:
cmp r0, 0
beq _081105EC
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r1, 0x1
negs r1, r1
movs r0, 0
@ -3136,7 +3136,7 @@ _081105EC:
cmp r0, 0
beq _08110600
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0
movs r1, 0x1
b _08110640
@ -3152,7 +3152,7 @@ _08110600:
bne _08110620
_08110614:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
negs r0, r0
b _0811063E
@ -3169,7 +3169,7 @@ _08110620:
bne _08110644
_08110636:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
_0811063E:
movs r1, 0
@ -3196,7 +3196,7 @@ sub_8110650: @ 8110650
cmp r0, 0
beq _08110678
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x2
ldrsb r0, [r5, r0]
b _081106EE
@ -3264,7 +3264,7 @@ _081106D8:
cmp r4, r0
beq _081106EA
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_081106EA:
movs r0, 0x2
negs r0, r0
@ -3284,7 +3284,7 @@ sub_81106F4: @ 81106F4
cmp r0, 0
beq _0811071C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _08110718 @ =gUnknown_203ADE4
ldrb r0, [r0, 0x2]
lsls r0, 24
@ -3309,7 +3309,7 @@ _0811072A:
cmp r1, 0x40
bne _08110744
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r1, 0x1
negs r1, r1
movs r0, 0
@ -3318,7 +3318,7 @@ _08110744:
cmp r1, 0x80
bne _08110754
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0
movs r1, 0x1
b _08110790
@ -3332,7 +3332,7 @@ _08110754:
bne _08110770
_08110764:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
negs r0, r0
b _0811078E
@ -3349,7 +3349,7 @@ _08110770:
bne _08110794
_08110786:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
_0811078E:
movs r1, 0
@ -3376,7 +3376,7 @@ sub_81107A0: @ 81107A0
cmp r0, 0
beq _081107C8
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x2
ldrsb r0, [r6, r0]
b _0811083A
@ -3442,7 +3442,7 @@ _08110824:
cmp r4, r0
beq _08110836
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_08110836:
movs r0, 0x2
negs r0, r0

4
asm/menu2.s
View File

@ -249,7 +249,7 @@ sub_812E6DC: @ 812E6DC
ldr r0, _0812E734 @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r0, [r2]
ldr r7, _0812E738 @ =gUnknown_2021D18
ldr r7, _0812E738 @ =gStringVar4
cmp r0, 0xFF
beq _0812E70A
_0812E700:
@ -279,7 +279,7 @@ _0812E70A:
b _0812E75C
.align 2, 0
_0812E734: .4byte gSaveBlock2Ptr
_0812E738: .4byte gUnknown_2021D18
_0812E738: .4byte gStringVar4
_0812E73C:
lsls r3, r5, 24
lsrs r3, 24

14
asm/menu_helpers.s
View File

@ -32,7 +32,7 @@ DisplayMessageAndContinueTask: @ 80BF474
adds r0, r6, 0
movs r1, 0x1
bl sub_810EDC4
ldr r4, _080BF504 @ =gUnknown_2021D18
ldr r4, _080BF504 @ =gStringVar4
ldr r0, [sp, 0x30]
cmp r0, r4
beq _080BF4B8
@ -40,7 +40,7 @@ DisplayMessageAndContinueTask: @ 80BF474
ldr r1, [sp, 0x30]
bl StringExpandPlaceholders
_080BF4B8:
ldr r2, _080BF508 @ =gUnknown_3003E50
ldr r2, _080BF508 @ =gTextFlags
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1
@ -77,8 +77,8 @@ _080BF4B8:
bx r0
.align 2, 0
_080BF500: .4byte gUnknown_20399D0
_080BF504: .4byte gUnknown_2021D18
_080BF508: .4byte gUnknown_3003E50
_080BF504: .4byte gStringVar4
_080BF508: .4byte gTextFlags
_080BF50C: .4byte gUnknown_20399CC
_080BF510: .4byte gUnknown_3005090
_080BF514: .4byte Task_ContinueTaskAfterMessagePrints
@ -147,7 +147,7 @@ _080BF580:
b _080BF5C0
_080BF586:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _080BF5A0 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@ -162,7 +162,7 @@ _080BF5A0: .4byte gUnknown_3005090
_080BF5A4: .4byte gUnknown_20399C8
_080BF5A8:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _080BF5C8 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@ -598,7 +598,7 @@ _080BF8CA:
cmp r1, r0
beq _080BF8DA
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
b _080BF8DC
_080BF8DA:

10
asm/mevent.s
View File

@ -286,7 +286,7 @@ _081437F8:
cmp r0, 0x2
bne _08143814
movs r0, 0x42
bl sub_80722CC
bl PlaySE
bl sub_800A5BC
movs r0, 0
strh r0, [r5]
@ -566,7 +566,7 @@ _08143A48:
adds r0, r4, 0
bl sub_81438E8
movs r0, 0x5
bl sub_80722CC
bl PlaySE
b _08143BE6
.align 2, 0
_08143A58: .4byte gMain
@ -578,7 +578,7 @@ _08143A5C:
cmp r0, 0
beq _08143A80
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_80098B8
adds r0, r4, 0
bl sub_81438E8
@ -602,7 +602,7 @@ _08143A9C:
cmp r0, 0
beq _08143ABA
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_80098B8
adds r0, r4, 0
bl sub_81438E8
@ -744,7 +744,7 @@ _08143BCC:
_08143BD8: .4byte gUnknown_841DE95
_08143BDC:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_80098B8
_08143BE6:
movs r0, 0x17

8
asm/mevent_8145654.s
View File

@ -934,7 +934,7 @@ _08145D70:
lsrs r2, 24
movs r0, 0x3
adds r1, r4, 0
bl sub_8005ED4
bl GetStringWidth
movs r1, 0xA0
subs r1, r0
cmp r1, 0
@ -1187,7 +1187,7 @@ _08145F6E:
adds r1, 0x1
movs r0, 0x3
mov r2, r10
bl sub_8005ED4
bl GetStringWidth
add r8, r0
mov r0, r8
lsls r2, r0, 24
@ -1219,7 +1219,7 @@ _08145F6E:
adds r1, 0x2A
movs r0, 0x3
mov r2, r10
bl sub_8005ED4
bl GetStringWidth
ldr r1, [r7]
adds r1, r5
movs r2, 0xB7
@ -2517,7 +2517,7 @@ sub_8146A30: @ 8146A30
lsrs r2, 24
movs r0, 0x3
adds r1, r4, 0
bl sub_8005ED4
bl GetStringWidth
movs r1, 0xE0
subs r1, r0
lsrs r0, r1, 31

8
asm/mon_markings.s
View File

@ -350,7 +350,7 @@ sub_80BE6F0: @ 80BE6F0
cmp r5, 0
beq _080BE728
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r2, _080BE724 @ =gUnknown_20399C0
ldr r1, [r2]
ldrb r0, [r1, 0x5]
@ -374,7 +374,7 @@ _080BE728:
cmp r4, 0
beq _080BE758
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r2, _080BE754 @ =gUnknown_20399C0
ldr r1, [r2]
ldrb r0, [r1, 0x5]
@ -395,7 +395,7 @@ _080BE758:
cmp r0, 0
beq _080BE7B4
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r2, _080BE788 @ =gUnknown_20399C0
ldr r0, [r2]
movs r1, 0x5
@ -444,7 +444,7 @@ _080BE7B4:
cmp r0, 0
beq _080BE7B0
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_080BE7C2:
movs r0, 0
_080BE7C4:

22
asm/money.s
View File

@ -148,7 +148,7 @@ sub_809FE40: @ 809FE40
lsrs r6, r0, 24
lsls r2, 24
lsrs r5, r2, 24
ldr r4, _0809FEB8 @ =gUnknown_2021CD0
ldr r4, _0809FEB8 @ =gStringVar1
adds r0, r4, 0
movs r2, 0
movs r3, 0x6
@ -159,7 +159,7 @@ sub_809FE40: @ 809FE40
lsrs r0, 16
movs r1, 0x6
subs r1, r0
ldr r2, _0809FEBC @ =gUnknown_2021D18
ldr r2, _0809FEBC @ =gStringVar4
adds r0, r1, 0
subs r1, 0x1
cmp r0, 0
@ -176,11 +176,11 @@ _0809FE7E:
ldr r1, _0809FEC0 @ =gUnknown_841697A
adds r0, r2, 0
bl StringExpandPlaceholders
ldr r4, _0809FEBC @ =gUnknown_2021D18
ldr r4, _0809FEBC @ =gStringVar4
movs r0, 0
adds r1, r4, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r3, 0x40
subs r3, r0
lsls r3, 24
@ -199,8 +199,8 @@ _0809FE7E:
pop {r0}
bx r0
.align 2, 0
_0809FEB8: .4byte gUnknown_2021CD0
_0809FEBC: .4byte gUnknown_2021D18
_0809FEB8: .4byte gStringVar1
_0809FEBC: .4byte gStringVar4
_0809FEC0: .4byte gUnknown_841697A
thumb_func_end sub_809FE40
@ -220,7 +220,7 @@ sub_809FEC4: @ 809FEC4
lsrs r6, r2, 24
lsls r4, 24
lsrs r5, r4, 24
ldr r4, _0809FF3C @ =gUnknown_2021CD0
ldr r4, _0809FF3C @ =gStringVar1
adds r0, r4, 0
adds r1, r3, 0
movs r2, 0
@ -232,7 +232,7 @@ sub_809FEC4: @ 809FEC4
lsrs r0, 16
movs r1, 0x6
subs r1, r0
ldr r2, _0809FF40 @ =gUnknown_2021D18
ldr r2, _0809FF40 @ =gStringVar4
adds r0, r1, 0
subs r1, 0x1
cmp r0, 0
@ -249,7 +249,7 @@ _0809FF14:
ldr r1, _0809FF44 @ =gUnknown_841697A
adds r0, r2, 0
bl StringExpandPlaceholders
ldr r2, _0809FF40 @ =gUnknown_2021D18
ldr r2, _0809FF40 @ =gStringVar4
str r6, [sp]
str r5, [sp, 0x4]
movs r0, 0
@ -265,8 +265,8 @@ _0809FF14:
pop {r0}
bx r0
.align 2, 0
_0809FF3C: .4byte gUnknown_2021CD0
_0809FF40: .4byte gUnknown_2021D18
_0809FF3C: .4byte gStringVar1
_0809FF40: .4byte gStringVar4
_0809FF44: .4byte gUnknown_841697A
thumb_func_end sub_809FEC4

60
asm/mystery_event_script.s
View File

@ -38,7 +38,7 @@ _080DA82A:
thumb_func_start SetIncompatible
SetIncompatible: @ 80DA830
push {lr}
ldr r0, _080DA844 @ =gUnknown_2021D18
ldr r0, _080DA844 @ =gStringVar4
ldr r1, _080DA848 @ =gUnknown_8488DFD
bl StringExpandPlaceholders
movs r0, 0x3
@ -46,7 +46,7 @@ SetIncompatible: @ 80DA830
pop {r0}
bx r0
.align 2, 0
_080DA844: .4byte gUnknown_2021D18
_080DA844: .4byte gStringVar4
_080DA848: .4byte gUnknown_8488DFD
thumb_func_end SetIncompatible
@ -233,7 +233,7 @@ MEScrCmd_setmsg: @ 80DA964
cmp r5, r0
bne _080DA98E
_080DA988:
ldr r0, _080DA998 @ =gUnknown_2021D18
ldr r0, _080DA998 @ =gStringVar4
bl StringExpandPlaceholders
_080DA98E:
movs r0, 0
@ -241,7 +241,7 @@ _080DA98E:
pop {r1}
bx r1
.align 2, 0
_080DA998: .4byte gUnknown_2021D18
_080DA998: .4byte gStringVar4
thumb_func_end MEScrCmd_setmsg
thumb_func_start MEScrCmd_runscript
@ -276,7 +276,7 @@ MEScrCmd_setenigmaberry: @ 80DA9B8
subs r4, r0
ldr r0, [r7, 0x64]
adds r4, r0
ldr r0, _080DAA0C @ =gUnknown_2021CD0
ldr r0, _080DAA0C @ =gStringVar1
mov r9, r0
ldr r6, _080DAA10 @ =gSaveBlock1Ptr
ldr r1, [r6]
@ -286,7 +286,7 @@ MEScrCmd_setenigmaberry: @ 80DA9B8
bl StringCopyN
adds r0, r4, 0
bl sub_809C7C4
ldr r4, _080DAA18 @ =gUnknown_2021CF0
ldr r4, _080DAA18 @ =gStringVar2
ldr r1, [r6]
adds r1, r5
adds r0, r4, 0
@ -295,15 +295,15 @@ MEScrCmd_setenigmaberry: @ 80DA9B8
mov r0, r8
cmp r0, 0
bne _080DAA24
ldr r0, _080DAA1C @ =gUnknown_2021D18
ldr r0, _080DAA1C @ =gStringVar4
ldr r1, _080DAA20 @ =gUnknown_8488C70
b _080DAA44
.align 2, 0
_080DAA0C: .4byte gUnknown_2021CD0
_080DAA0C: .4byte gStringVar1
_080DAA10: .4byte gSaveBlock1Ptr
_080DAA14: .4byte 0x000030ec
_080DAA18: .4byte gUnknown_2021CF0
_080DAA1C: .4byte gUnknown_2021D18
_080DAA18: .4byte gStringVar2
_080DAA1C: .4byte gStringVar4
_080DAA20: .4byte gUnknown_8488C70
_080DAA24:
mov r0, r9
@ -311,14 +311,14 @@ _080DAA24:
bl StringCompare
cmp r0, 0
beq _080DAA40
ldr r0, _080DAA38 @ =gUnknown_2021D18
ldr r0, _080DAA38 @ =gStringVar4
ldr r1, _080DAA3C @ =gUnknown_8488CA2
b _080DAA44
.align 2, 0
_080DAA38: .4byte gUnknown_2021D18
_080DAA38: .4byte gStringVar4
_080DAA3C: .4byte gUnknown_8488CA2
_080DAA40:
ldr r0, _080DAA60 @ =gUnknown_2021D18
ldr r0, _080DAA60 @ =gStringVar4
ldr r1, _080DAA64 @ =gUnknown_8488CCE
_080DAA44:
bl StringExpandPlaceholders
@ -332,7 +332,7 @@ _080DAA44:
bl VarSet
b _080DAA70
.align 2, 0
_080DAA60: .4byte gUnknown_2021D18
_080DAA60: .4byte gStringVar4
_080DAA64: .4byte gUnknown_8488CCE
_080DAA68: .4byte 0x00004033
_080DAA6C:
@ -360,7 +360,7 @@ MEScrCmd_giveribbon: @ 80DAA80
adds r2, 0x1
str r2, [r4, 0x8]
bl GiveGiftRibbonToParty
ldr r0, _080DAAAC @ =gUnknown_2021D18
ldr r0, _080DAAAC @ =gStringVar4
ldr r1, _080DAAB0 @ =gUnknown_8488CF6
bl StringExpandPlaceholders
movs r0, 0x2
@ -370,7 +370,7 @@ MEScrCmd_giveribbon: @ 80DAA80
pop {r1}
bx r1
.align 2, 0
_080DAAAC: .4byte gUnknown_2021D18
_080DAAAC: .4byte gStringVar4
_080DAAB0: .4byte gUnknown_8488CF6
thumb_func_end MEScrCmd_giveribbon
@ -431,7 +431,7 @@ sub_80DAB1C: @ 80DAB1C
push {r4,lr}
adds r4, r0, 0
bl sub_806E22C
ldr r0, _080DAB38 @ =gUnknown_2021D18
ldr r0, _080DAB38 @ =gStringVar4
ldr r1, _080DAB3C @ =gUnknown_8488D2A
bl StringExpandPlaceholders
movs r0, 0x2
@ -441,7 +441,7 @@ sub_80DAB1C: @ 80DAB1C
pop {r1}
bx r1
.align 2, 0
_080DAB38: .4byte gUnknown_2021D18
_080DAB38: .4byte gStringVar4
_080DAB3C: .4byte gUnknown_8488D2A
thumb_func_end sub_80DAB1C
@ -454,7 +454,7 @@ MEScrCmd_addrareword: @ 80DAB40
adds r1, 0x1
str r1, [r4, 0x8]
bl sub_80BDB70
ldr r0, _080DAB64 @ =gUnknown_2021D18
ldr r0, _080DAB64 @ =gStringVar4
ldr r1, _080DAB68 @ =gUnknown_8488D60
bl StringExpandPlaceholders
movs r0, 0x2
@ -464,7 +464,7 @@ MEScrCmd_addrareword: @ 80DAB40
pop {r1}
bx r1
.align 2, 0
_080DAB64: .4byte gUnknown_2021D18
_080DAB64: .4byte gStringVar4
_080DAB68: .4byte gUnknown_8488D60
thumb_func_end MEScrCmd_addrareword
@ -510,16 +510,16 @@ sub_80DAB80: @ 80DAB80
lsls r0, 1
cmp r4, r0
bne _080DABD0
ldr r0, _080DABC8 @ =gUnknown_2021CD0
ldr r0, _080DABC8 @ =gStringVar1
ldr r1, _080DABCC @ =gUnknown_8415A62
movs r2, 0xB
bl StringCopyN
b _080DABDA
.align 2, 0
_080DABC8: .4byte gUnknown_2021CD0
_080DABC8: .4byte gStringVar1
_080DABCC: .4byte gUnknown_8415A62
_080DABD0:
ldr r0, _080DABF0 @ =gUnknown_2021CD0
ldr r0, _080DABF0 @ =gStringVar1
ldr r1, _080DABF4 @ =gUnknown_8415A66
movs r2, 0xB
bl StringCopyN
@ -528,16 +528,16 @@ _080DABDA:
ldrb r0, [r0]
cmp r0, 0x6
bne _080DAC04
ldr r0, _080DABFC @ =gUnknown_2021D18
ldr r0, _080DABFC @ =gStringVar4
ldr r1, _080DAC00 @ =gUnknown_8488D8E
bl StringExpandPlaceholders
movs r0, 0x3
b _080DAC6E
.align 2, 0
_080DABF0: .4byte gUnknown_2021CD0
_080DABF0: .4byte gStringVar1
_080DABF4: .4byte gUnknown_8415A66
_080DABF8: .4byte gUnknown_2024029
_080DABFC: .4byte gUnknown_2021D18
_080DABFC: .4byte gStringVar4
_080DAC00: .4byte gUnknown_8488D8E
_080DAC04:
ldr r7, _080DAC80 @ =gUnknown_2024478
@ -580,7 +580,7 @@ _080DAC3E:
_080DAC5C:
bl CompactPartySlots
bl CalculatePlayerPartyCount
ldr r0, _080DAC84 @ =gUnknown_2021D18
ldr r0, _080DAC84 @ =gStringVar4
ldr r1, _080DAC88 @ =gUnknown_8488D7C
bl StringExpandPlaceholders
movs r0, 0x2
@ -595,7 +595,7 @@ _080DAC6E:
bx r1
.align 2, 0
_080DAC80: .4byte gUnknown_2024478
_080DAC84: .4byte gUnknown_2021D18
_080DAC84: .4byte gStringVar4
_080DAC88: .4byte gUnknown_8488D7C
thumb_func_end sub_80DAB80
@ -617,7 +617,7 @@ sub_80DAC8C: @ 80DAC8C
movs r2, 0xBC
bl memcpy
bl sub_80E7490
ldr r0, _080DACCC @ =gUnknown_2021D18
ldr r0, _080DACCC @ =gStringVar4
ldr r1, _080DACD0 @ =gUnknown_8488DBD
bl StringExpandPlaceholders
movs r0, 0x2
@ -628,7 +628,7 @@ sub_80DAC8C: @ 80DAC8C
bx r1
.align 2, 0
_080DACC8: .4byte gSaveBlock2Ptr
_080DACCC: .4byte gUnknown_2021D18
_080DACCC: .4byte gStringVar4
_080DACD0: .4byte gUnknown_8488DBD
thumb_func_end sub_80DAC8C

2
asm/mystery_gift_menu.s
View File

@ -346,7 +346,7 @@ _08142362:
movs r0, 0
adds r1, r6, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r2, 0xDE
subs r2, r0
lsls r2, 24

38
asm/naming_screen.s
View File

@ -891,7 +891,7 @@ pokemon_transfer_to_pc_with_message: @ 809E0B4
lsls r0, 24
cmp r0, 0
bne _0809E104
ldr r4, _0809E0F0 @ =gUnknown_2021CD0
ldr r4, _0809E0F0 @ =gStringVar1
ldr r0, _0809E0F4 @ =0x00004037
bl VarGet
lsls r0, 24
@ -900,7 +900,7 @@ pokemon_transfer_to_pc_with_message: @ 809E0B4
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
ldr r0, _0809E0F8 @ =gUnknown_2021CF0
ldr r0, _0809E0F8 @ =gStringVar2
ldr r1, _0809E0FC @ =gUnknown_203998C
ldr r1, [r1]
ldr r2, _0809E100 @ =0x00001e30
@ -909,13 +909,13 @@ pokemon_transfer_to_pc_with_message: @ 809E0B4
bl StringCopy
b _0809E144
.align 2, 0
_0809E0F0: .4byte gUnknown_2021CD0
_0809E0F0: .4byte gStringVar1
_0809E0F4: .4byte 0x00004037
_0809E0F8: .4byte gUnknown_2021CF0
_0809E0F8: .4byte gStringVar2
_0809E0FC: .4byte gUnknown_203998C
_0809E100: .4byte 0x00001e30
_0809E104:
ldr r4, _0809E1AC @ =gUnknown_2021CD0
ldr r4, _0809E1AC @ =gStringVar1
ldr r0, _0809E1B0 @ =0x00004037
bl VarGet
lsls r0, 24
@ -924,14 +924,14 @@ _0809E104:
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
ldr r0, _0809E1B4 @ =gUnknown_2021CF0
ldr r0, _0809E1B4 @ =gStringVar2
ldr r1, _0809E1B8 @ =gUnknown_203998C
ldr r1, [r1]
ldr r2, _0809E1BC @ =0x00001e30
adds r1, r2
ldr r1, [r1]
bl StringCopy
ldr r4, _0809E1C0 @ =gUnknown_2021D04
ldr r4, _0809E1C0 @ =gStringVar3
bl get_unknown_box_id
lsls r0, 24
lsrs r0, 24
@ -950,7 +950,7 @@ _0809E144:
lsls r0, 24
lsrs r5, r0, 24
_0809E156:
ldr r4, _0809E1C8 @ =gUnknown_2021D18
ldr r4, _0809E1C8 @ =gStringVar4
ldr r1, _0809E1CC @ =gUnknown_83E2280
lsls r0, r5, 2
adds r0, r1
@ -960,7 +960,7 @@ _0809E156:
movs r0, 0
movs r1, 0
bl sub_80F6EE4
ldr r2, _0809E1D0 @ =gUnknown_3003E50
ldr r2, _0809E1D0 @ =gTextFlags
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1
@ -989,16 +989,16 @@ _0809E156:
pop {r0}
bx r0
.align 2, 0
_0809E1AC: .4byte gUnknown_2021CD0
_0809E1AC: .4byte gStringVar1
_0809E1B0: .4byte 0x00004037
_0809E1B4: .4byte gUnknown_2021CF0
_0809E1B4: .4byte gStringVar2
_0809E1B8: .4byte gUnknown_203998C
_0809E1BC: .4byte 0x00001e30
_0809E1C0: .4byte gUnknown_2021D04
_0809E1C0: .4byte gStringVar3
_0809E1C4: .4byte 0x00000834
_0809E1C8: .4byte gUnknown_2021D18
_0809E1C8: .4byte gStringVar4
_0809E1CC: .4byte gUnknown_83E2280
_0809E1D0: .4byte gUnknown_3003E50
_0809E1D0: .4byte gTextFlags
thumb_func_end pokemon_transfer_to_pc_with_message
thumb_func_start sub_809E1D4
@ -1046,7 +1046,7 @@ sub_809E210: @ 809E210
movs r2, 0x1
bl sub_809E518
movs r0, 0x6
bl sub_80722CC
bl PlaySE
ldr r0, _0809E248 @ =gUnknown_203998C
ldr r0, [r0]
ldr r1, _0809E24C @ =0x00001e10
@ -3089,7 +3089,7 @@ KeyboardKeyHandler_OK: @ 809F1B4
b _0809F1E2
_0809F1CE:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0809F1E8 @ =gUnknown_203998C
ldr r0, [r0]
ldr r1, _0809F1EC @ =0x00001e10
@ -3825,7 +3825,7 @@ _0809F740:
bl sub_809E518
_0809F74A:
movs r0, 0x17
bl sub_80722CC
bl PlaySE
pop {r4-r6}
pop {r0}
bx r0
@ -3855,7 +3855,7 @@ sub_809F75C: @ 809F75C
movs r0, 0x3
bl CopyBgTilemapBufferToVram
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_809F6BC
lsls r0, 24
lsrs r0, 24
@ -4291,7 +4291,7 @@ sub_809FAE4: @ 809FAE4
movs r0, 0
mov r1, r8
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
adds r6, r0, 0
ldr r5, _0809FB68 @ =gUnknown_203998C
ldr r0, [r5]

44
asm/new_menu_helpers.s
View File

@ -776,7 +776,7 @@ AddTextPrinterParametrized: @ 80F6CD0
ands r1, r4
orrs r1, r6
strb r1, [r0, 0xD]
ldr r2, _080F6D58 @ =gUnknown_3003E50
ldr r2, _080F6D58 @ =gTextFlags
ldrb r1, [r2]
movs r0, 0x3
negs r0, r0
@ -795,7 +795,7 @@ AddTextPrinterParametrized: @ 80F6CD0
pop {r1}
bx r1
.align 2, 0
_080F6D58: .4byte gUnknown_3003E50
_080F6D58: .4byte gTextFlags
thumb_func_end AddTextPrinterParametrized
thumb_func_start sub_80F6D5C
@ -805,7 +805,7 @@ sub_80F6D5C: @ 80F6D5C
lsls r0, 24
lsrs r0, 24
movs r5, 0
ldr r3, _080F6DA8 @ =gUnknown_3003E50
ldr r3, _080F6DA8 @ =gTextFlags
movs r4, 0x1
ands r0, r4
ldrb r2, [r3]
@ -823,7 +823,7 @@ sub_80F6D5C: @ 80F6D5C
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
ldr r2, _080F6DAC @ =gUnknown_2021D18
ldr r2, _080F6DAC @ =gStringVar4
str r5, [sp]
movs r0, 0x8
str r0, [sp, 0x4]
@ -835,8 +835,8 @@ sub_80F6D5C: @ 80F6D5C
bl AddTextPrinterParametrized
b _080F6DFC
.align 2, 0
_080F6DA8: .4byte gUnknown_3003E50
_080F6DAC: .4byte gUnknown_2021D18
_080F6DA8: .4byte gTextFlags
_080F6DAC: .4byte gStringVar4
_080F6DB0:
cmp r0, 0x1
bne _080F6DDC
@ -844,7 +844,7 @@ _080F6DB0:
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
ldr r2, _080F6DD8 @ =gUnknown_2021D18
ldr r2, _080F6DD8 @ =gStringVar4
str r5, [sp]
movs r0, 0x4
str r0, [sp, 0x4]
@ -856,13 +856,13 @@ _080F6DB0:
bl AddTextPrinterParametrized
b _080F6DFC
.align 2, 0
_080F6DD8: .4byte gUnknown_2021D18
_080F6DD8: .4byte gStringVar4
_080F6DDC:
bl sub_80F78A8
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
ldr r2, _080F6E04 @ =gUnknown_2021D18
ldr r2, _080F6E04 @ =gStringVar4
str r5, [sp]
movs r0, 0x2
str r0, [sp, 0x4]
@ -878,7 +878,7 @@ _080F6DFC:
pop {r0}
bx r0
.align 2, 0
_080F6E04: .4byte gUnknown_2021D18
_080F6E04: .4byte gStringVar4
thumb_func_end sub_80F6D5C
thumb_func_start sub_80F6E08
@ -887,7 +887,7 @@ sub_80F6E08: @ 80F6E08
sub sp, 0x10
lsls r0, 24
lsrs r0, 24
ldr r3, _080F6E4C @ =gUnknown_3003E50
ldr r3, _080F6E4C @ =gTextFlags
movs r4, 0x1
ands r0, r4
ldrb r2, [r3]
@ -900,7 +900,7 @@ sub_80F6E08: @ 80F6E08
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
ldr r2, _080F6E50 @ =gUnknown_2021D18
ldr r2, _080F6E50 @ =gStringVar4
movs r0, 0
str r0, [sp]
movs r0, 0x2
@ -916,8 +916,8 @@ sub_80F6E08: @ 80F6E08
pop {r0}
bx r0
.align 2, 0
_080F6E4C: .4byte gUnknown_3003E50
_080F6E50: .4byte gUnknown_2021D18
_080F6E4C: .4byte gTextFlags
_080F6E50: .4byte gStringVar4
thumb_func_end sub_80F6E08
thumb_func_start sub_80F6E54
@ -929,7 +929,7 @@ sub_80F6E54: @ 80F6E54
lsrs r0, 24
lsls r3, 24
lsrs r3, 24
ldr r4, _080F6E94 @ =gUnknown_3003E50
ldr r4, _080F6E94 @ =gTextFlags
movs r5, 0x1
ands r0, r5
ldrb r2, [r4]
@ -938,7 +938,7 @@ sub_80F6E54: @ 80F6E54
ands r1, r2
orrs r1, r0
strb r1, [r4]
ldr r2, _080F6E98 @ =gUnknown_2021D18
ldr r2, _080F6E98 @ =gStringVar4
movs r0, 0
str r0, [sp]
movs r0, 0x2
@ -954,8 +954,8 @@ sub_80F6E54: @ 80F6E54
pop {r0}
bx r0
.align 2, 0
_080F6E94: .4byte gUnknown_3003E50
_080F6E98: .4byte gUnknown_2021D18
_080F6E94: .4byte gTextFlags
_080F6E98: .4byte gStringVar4
thumb_func_end sub_80F6E54
thumb_func_start sub_80F6E9C
@ -965,7 +965,7 @@ sub_80F6E9C: @ 80F6E9C
ldrb r0, [r0]
cmp r0, 0x2
bne _080F6EC4
ldr r2, _080F6EC0 @ =gUnknown_3003E50
ldr r2, _080F6EC0 @ =gTextFlags
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
@ -977,7 +977,7 @@ sub_80F6E9C: @ 80F6E9C
b _080F6ED4
.align 2, 0
_080F6EBC: .4byte gUnknown_203ADFA
_080F6EC0: .4byte gUnknown_3003E50
_080F6EC0: .4byte gTextFlags
_080F6EC4:
bl sub_80F77B8
movs r1, 0x80
@ -2015,7 +2015,7 @@ sub_80F7768: @ 80F7768
ldrb r0, [r0]
cmp r0, 0x2
bne _080F7798
ldr r2, _080F7794 @ =gUnknown_3003E50
ldr r2, _080F7794 @ =gTextFlags
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
@ -2027,7 +2027,7 @@ sub_80F7768: @ 80F7768
b _080F77A4
.align 2, 0
_080F7790: .4byte gUnknown_203ADFA
_080F7794: .4byte gUnknown_3003E50
_080F7794: .4byte gTextFlags
_080F7798:
movs r1, 0x80
lsls r1, 2

84
asm/oak_speech.s
View File

@ -491,7 +491,7 @@ _0812ED3C:
ldr r1, [r1]
movs r3, 0
strb r0, [r1, 0x1F]
ldr r2, _0812ED64 @ =gUnknown_3003E50
ldr r2, _0812ED64 @ =gTextFlags
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1
@ -504,7 +504,7 @@ _0812ED3C:
b _0812EE94
.align 2, 0
_0812ED60: .4byte gUnknown_203B108
_0812ED64: .4byte gUnknown_3003E50
_0812ED64: .4byte gTextFlags
_0812ED68: .4byte gUnknown_84605E8
_0812ED6C:
bl free_temp_tile_data_buffers_if_possible
@ -961,7 +961,7 @@ _0812F120:
bl BeginNormalPaletteFade
_0812F150:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0812F170 @ =gUnknown_3005090
adds r1, r4, r5
lsls r1, 3
@ -1461,7 +1461,7 @@ _0812F568:
_0812F56A:
strh r0, [r1, 0x12]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0812F58C @ =gUnknown_203B108
ldr r0, [r0]
ldrh r0, [r0, 0x12]
@ -1856,7 +1856,7 @@ _0812F8B8:
movs r1, 0
bl sub_80F6EE4
ldr r2, _0812F8F0 @ =gUnknown_81C5C78
ldr r5, _0812F8F4 @ =gUnknown_2021D18
ldr r5, _0812F8F4 @ =gStringVar4
cmp r2, r5
beq _0812F8FC
adds r0, r5, 0
@ -1879,7 +1879,7 @@ _0812F8B8:
b _0812F918
.align 2, 0
_0812F8F0: .4byte gUnknown_81C5C78
_0812F8F4: .4byte gUnknown_2021D18
_0812F8F4: .4byte gStringVar4
_0812F8F8: .4byte gUnknown_203B108
_0812F8FC:
ldr r0, _0812F938 @ =gUnknown_203B108
@ -1933,7 +1933,7 @@ sub_812F944: @ 812F944
movs r1, 0
bl sub_80F6EE4
ldr r2, _0812F994 @ =gUnknown_81C5D06
ldr r5, _0812F998 @ =gUnknown_2021D18
ldr r5, _0812F998 @ =gStringVar4
cmp r2, r5
beq _0812F9A0
adds r0, r5, 0
@ -1956,7 +1956,7 @@ sub_812F944: @ 812F944
b _0812F9BC
.align 2, 0
_0812F994: .4byte gUnknown_81C5D06
_0812F998: .4byte gUnknown_2021D18
_0812F998: .4byte gStringVar4
_0812F99C: .4byte gUnknown_203B108
_0812F9A0:
ldr r0, _0812F9E0 @ =gUnknown_203B108
@ -2110,7 +2110,7 @@ _0812FAA0:
movs r1, 0
bl sub_80F6EE4
ldr r2, _0812FB08 @ =gUnknown_81C5D12
ldr r4, _0812FB0C @ =gUnknown_2021D18
ldr r4, _0812FB0C @ =gStringVar4
cmp r2, r4
beq _0812FB14
adds r0, r4, 0
@ -2136,7 +2136,7 @@ _0812FAFC: .4byte gUnknown_3005090
_0812FB00: .4byte sub_812FB4C
_0812FB04: .4byte 0x00003fff
_0812FB08: .4byte gUnknown_81C5D12
_0812FB0C: .4byte gUnknown_2021D18
_0812FB0C: .4byte gStringVar4
_0812FB10: .4byte gUnknown_203B108
_0812FB14:
ldr r0, _0812FB48 @ =gUnknown_203B108
@ -2184,7 +2184,7 @@ sub_812FB4C: @ 812FB4C
movs r1, 0
bl sub_80F6EE4
ldr r2, _0812FB9C @ =gUnknown_81C5D4B
ldr r5, _0812FBA0 @ =gUnknown_2021D18
ldr r5, _0812FBA0 @ =gStringVar4
cmp r2, r5
beq _0812FBA8
adds r0, r5, 0
@ -2207,7 +2207,7 @@ sub_812FB4C: @ 812FB4C
b _0812FBC4
.align 2, 0
_0812FB9C: .4byte gUnknown_81C5D4B
_0812FBA0: .4byte gUnknown_2021D18
_0812FBA0: .4byte gStringVar4
_0812FBA4: .4byte gUnknown_203B108
_0812FBA8:
ldr r0, _0812FBE4 @ =gUnknown_203B108
@ -2374,7 +2374,7 @@ _0812FCEC:
movs r1, 0
bl sub_80F6EE4
ldr r2, _0812FD24 @ =gUnknown_81C5DBD
ldr r5, _0812FD28 @ =gUnknown_2021D18
ldr r5, _0812FD28 @ =gStringVar4
cmp r2, r5
beq _0812FD30
adds r0, r5, 0
@ -2397,7 +2397,7 @@ _0812FCEC:
b _0812FD4C
.align 2, 0
_0812FD24: .4byte gUnknown_81C5DBD
_0812FD28: .4byte gUnknown_2021D18
_0812FD28: .4byte gStringVar4
_0812FD2C: .4byte gUnknown_203B108
_0812FD30:
ldr r0, _0812FD6C @ =gUnknown_203B108
@ -2507,7 +2507,7 @@ _0812FDF0:
movs r1, 0
bl sub_80F6EE4
ldr r2, _0812FE34 @ =gUnknown_81C59D5
ldr r5, _0812FE38 @ =gUnknown_2021D18
ldr r5, _0812FE38 @ =gStringVar4
cmp r2, r5
beq _0812FE40
adds r0, r5, 0
@ -2530,7 +2530,7 @@ _0812FDF0:
b _0812FE5C
.align 2, 0
_0812FE34: .4byte gUnknown_81C59D5
_0812FE38: .4byte gUnknown_2021D18
_0812FE38: .4byte gStringVar4
_0812FE3C: .4byte gUnknown_203B108
_0812FE40:
ldr r0, _0812FE7C @ =gUnknown_203B108
@ -2858,7 +2858,7 @@ _081300D0:
movs r1, 0
bl sub_80F6EE4
ldr r2, _0813010C @ =gUnknown_81C5DEA
ldr r5, _08130110 @ =gUnknown_2021D18
ldr r5, _08130110 @ =gStringVar4
cmp r2, r5
beq _08130118
adds r0, r5, 0
@ -2881,7 +2881,7 @@ _081300D0:
b _08130134
.align 2, 0
_0813010C: .4byte gUnknown_81C5DEA
_08130110: .4byte gUnknown_2021D18
_08130110: .4byte gStringVar4
_08130114: .4byte gUnknown_203B108
_08130118:
ldr r0, _08130154 @ =gUnknown_203B108
@ -3037,7 +3037,7 @@ sub_8130228: @ 8130228
movs r1, 0
bl sub_80F6EE4
ldr r2, _0813027C @ =gUnknown_81C5DEA
ldr r5, _08130280 @ =gUnknown_2021D18
ldr r5, _08130280 @ =gStringVar4
cmp r2, r5
beq _08130284
adds r0, r5, 0
@ -3059,7 +3059,7 @@ sub_8130228: @ 8130228
.align 2, 0
_08130278: .4byte gUnknown_203B108
_0813027C: .4byte gUnknown_81C5DEA
_08130280: .4byte gUnknown_2021D18
_08130280: .4byte gStringVar4
_08130284:
str r4, [sp]
movs r0, 0x2
@ -3082,7 +3082,7 @@ _081302A6:
movs r1, 0
bl sub_80F6EE4
ldr r2, _081302DC @ =gUnknown_81C5E91
ldr r4, _081302E0 @ =gUnknown_2021D18
ldr r4, _081302E0 @ =gStringVar4
cmp r2, r4
beq _081302E4
adds r0, r4, 0
@ -3104,7 +3104,7 @@ _081302A6:
b _081302FE
.align 2, 0
_081302DC: .4byte gUnknown_81C5E91
_081302E0: .4byte gUnknown_2021D18
_081302E0: .4byte gStringVar4
_081302E4:
movs r0, 0
str r0, [sp]
@ -3160,7 +3160,7 @@ sub_8130324: @ 8130324
cmp r4, 0x4
bgt _081303A8
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r5, 0x1A]
movs r1, 0x1
bl sub_810F4D8
@ -3186,7 +3186,7 @@ _08130380: .4byte gUnknown_203B108
_08130384: .4byte sub_8130464
_08130388:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
negs r0, r0
str r4, [sp]
@ -3316,7 +3316,7 @@ sub_8130464: @ 8130464
ldrh r0, [r0, 0x10]
cmp r0, 0
bne _081304B4
ldr r0, _081304AC @ =gUnknown_2021D18
ldr r0, _081304AC @ =gStringVar4
ldr r1, _081304B0 @ =gUnknown_81C5E13
bl StringExpandPlaceholders
b _081304BC
@ -3324,17 +3324,17 @@ sub_8130464: @ 8130464
_081304A0: .4byte gUnknown_3005098
_081304A4: .4byte gUnknown_2037AB8
_081304A8: .4byte gUnknown_203B108
_081304AC: .4byte gUnknown_2021D18
_081304AC: .4byte gStringVar4
_081304B0: .4byte gUnknown_81C5E13
_081304B4:
ldr r0, _081304F4 @ =gUnknown_2021D18
ldr r0, _081304F4 @ =gStringVar4
ldr r1, _081304F8 @ =gUnknown_81C5EB5
bl StringExpandPlaceholders
_081304BC:
movs r0, 0
movs r1, 0
bl sub_80F6EE4
ldr r2, _081304F4 @ =gUnknown_2021D18
ldr r2, _081304F4 @ =gStringVar4
ldr r0, _081304FC @ =gUnknown_203B108
ldr r0, [r0]
ldrb r3, [r0, 0x1F]
@ -3357,7 +3357,7 @@ _081304BC:
strh r0, [r5, 0x6]
b _08130544
.align 2, 0
_081304F4: .4byte gUnknown_2021D18
_081304F4: .4byte gStringVar4
_081304F8: .4byte gUnknown_81C5EB5
_081304FC: .4byte gUnknown_203B108
_08130500:
@ -3427,7 +3427,7 @@ _08130576:
b _0813063E
_0813057C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _081305B0 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@ -3454,7 +3454,7 @@ _081305B0: .4byte gUnknown_3005090
_081305B4: .4byte gUnknown_203B108
_081305B8: .4byte sub_8130650
_081305BC:
ldr r4, _081305F8 @ =gUnknown_2021D18
ldr r4, _081305F8 @ =gStringVar4
ldr r1, _081305FC @ =gUnknown_81C5EC5
adds r0, r4, 0
bl StringExpandPlaceholders
@ -3481,12 +3481,12 @@ _081305BC:
str r0, [r6]
b _0813063E
.align 2, 0
_081305F8: .4byte gUnknown_2021D18
_081305F8: .4byte gStringVar4
_081305FC: .4byte gUnknown_81C5EC5
_08130600: .4byte sub_8130694
_08130604:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _08130624 @ =gUnknown_203B108
ldr r0, [r0]
ldrh r0, [r0, 0x10]
@ -3647,7 +3647,7 @@ sub_813071C: @ 813071C
movs r1, 0
bl sub_80F6EE4
ldr r2, _08130774 @ =gUnknown_81C5E2E
ldr r4, _08130778 @ =gUnknown_2021D18
ldr r4, _08130778 @ =gStringVar4
cmp r2, r4
beq _08130780
adds r0, r4, 0
@ -3672,7 +3672,7 @@ sub_813071C: @ 813071C
.align 2, 0
_08130770: .4byte gUnknown_3005098
_08130774: .4byte gUnknown_81C5E2E
_08130778: .4byte gUnknown_2021D18
_08130778: .4byte gStringVar4
_0813077C: .4byte gUnknown_203B108
_08130780:
ldr r0, _081307C4 @ =gUnknown_203B108
@ -3799,7 +3799,7 @@ sub_8130858: @ 8130858
ldrsh r0, [r5, r1]
cmp r0, 0
beq _081308B4
ldr r4, _081308C0 @ =gUnknown_2021D18
ldr r4, _081308C0 @ =gStringVar4
ldr r1, _081308C4 @ =gUnknown_81C5EF4
adds r0, r4, 0
bl StringExpandPlaceholders
@ -3835,7 +3835,7 @@ _081308B4:
bx r0
.align 2, 0
_081308BC: .4byte gUnknown_3005090
_081308C0: .4byte gUnknown_2021D18
_081308C0: .4byte gStringVar4
_081308C4: .4byte gUnknown_81C5EF4
_081308C8: .4byte gUnknown_203B108
_081308CC: .4byte sub_81308D0
@ -3966,7 +3966,7 @@ sub_8130980: @ 8130980
cmp r4, 0x28
bne _081309BE
movs r0, 0x27
bl sub_80722CC
bl PlaySE
_081309BE:
ldrh r0, [r5, 0x4]
adds r1, r0, 0
@ -4295,7 +4295,7 @@ sub_8130C20: @ 8130C20
bl Free
movs r0, 0
str r0, [r5]
ldr r2, _08130C5C @ =gUnknown_3003E50
ldr r2, _08130C5C @ =gTextFlags
ldrb r1, [r2]
subs r0, 0x2
ands r0, r1
@ -4309,7 +4309,7 @@ sub_8130C20: @ 8130C20
bx r0
.align 2, 0
_08130C58: .4byte gUnknown_203B108
_08130C5C: .4byte gUnknown_3003E50
_08130C5C: .4byte gTextFlags
_08130C60: .4byte CB2_NewGame
thumb_func_end sub_8130C20
@ -4590,7 +4590,7 @@ _08130EB8:
bl EnableInterrupts
ldr r0, _08130F04 @ =sub_812EAFC
bl SetVBlankCallback
ldr r2, _08130F08 @ =gUnknown_3003E50
ldr r2, _08130F08 @ =gTextFlags
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1
@ -4600,7 +4600,7 @@ _08130EB8:
b _08130F1E
.align 2, 0
_08130F04: .4byte sub_812EAFC
_08130F08: .4byte gUnknown_3003E50
_08130F08: .4byte gTextFlags
_08130F0C: .4byte sub_812EB10
_08130F10:
ldr r1, _08130F28 @ =gMain

2
asm/option_menu.s
View File

@ -392,7 +392,7 @@ sub_8088680: @ 8088680
movs r0, 0
adds r1, r5, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r4, 0xE4
subs r4, r0
movs r0, 0x2

12
asm/overworld.s
View File

@ -71,7 +71,7 @@ sub_8054C48: @ 8054C48
push {r4,r5,lr}
bl sub_8054C04
adds r4, r0, 0
ldr r5, _08054C6C @ =gUnknown_2021CD0
ldr r5, _08054C6C @ =gStringVar1
bl sub_80CBF04
adds r3, r0, 0
lsls r3, 24
@ -84,7 +84,7 @@ sub_8054C48: @ 8054C48
pop {r0}
bx r0
.align 2, 0
_08054C6C: .4byte gUnknown_2021CD0
_08054C6C: .4byte gStringVar1
thumb_func_end sub_8054C48
thumb_func_start sub_8054C70
@ -6912,7 +6912,7 @@ sub_80581BC: @ 80581BC
sub_80581C8: @ 80581C8
push {lr}
movs r0, 0x6
bl sub_80722CC
bl PlaySE
bl sub_806F258
bl ScriptContext2_Enable
pop {r0}
@ -6924,7 +6924,7 @@ sub_80581DC: @ 80581DC
push {r4,lr}
adds r4, r0, 0
movs r0, 0x5
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable
@ -6937,7 +6937,7 @@ sub_80581DC: @ 80581DC
sub_80581F8: @ 80581F8
push {lr}
movs r0, 0x6
bl sub_80722CC
bl PlaySE
ldr r0, _08058210 @ =gUnknown_81BB9D4
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable
@ -6952,7 +6952,7 @@ sub_8058214: @ 8058214
push {r4,lr}
adds r4, r0, 0
movs r0, 0x5
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable

584
asm/party_menu.s
View File

File diff suppressed because it is too large Load Diff

30
asm/player_pc.s
View File

@ -234,7 +234,7 @@ sub_80EB81C: @ 80EB81C
cmp r5, r0
bne _080EB878
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r0, [r4, 0x14]
movs r1, 0
bl sub_810F4D8
@ -546,7 +546,7 @@ sub_80EBAB8: @ 80EBAB8
cmp r0, 0
beq _080EBB64
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
negs r0, r0
b _080EBB04
@ -563,7 +563,7 @@ _080EBAE8:
cmp r0, 0x2
beq _080EBB64
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
_080EBB04:
bl MoveMenuCursor
@ -584,7 +584,7 @@ _080EBB20:
cmp r0, 0
beq _080EBB4C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r4, _080EBB48 @ =gUnknown_8402208
bl GetMenuCursorPos
lsls r0, 24
@ -603,7 +603,7 @@ _080EBB4C:
cmp r0, 0
beq _080EBB64
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _080EBB6C @ =gUnknown_8402208
ldr r1, [r0, 0x14]
adds r0, r4, 0
@ -1063,7 +1063,7 @@ sub_80EBEB0: @ 80EBEB0
movs r0, 0x2
mov r1, r8
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
adds r5, r0, 0
movs r0, 0x1
bl sub_810EBAC
@ -1157,7 +1157,7 @@ _080EBF98: .4byte gUnknown_2037AB8
_080EBF9C: .4byte gUnknown_203AAC6
_080EBFA0:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
mov r1, r8
ldrb r0, [r1, 0xA]
bl RemoveScrollIndicatorArrowPair
@ -1166,7 +1166,7 @@ _080EBFA0:
b _080EBFEA
_080EBFB6:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0
bl sub_810EBE0
movs r0, 0x1
@ -1202,7 +1202,7 @@ sub_80EBFFC: @ 80EBFFC
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _080EC054 @ =gUnknown_2021CD0
ldr r4, _080EC054 @ =gStringVar1
ldr r2, _080EC058 @ =gSaveBlock1Ptr
ldr r1, _080EC05C @ =gUnknown_203AAC4
ldrh r0, [r1]
@ -1243,7 +1243,7 @@ _080EC044:
beq _080EC044
b _080EC06C
.align 2, 0
_080EC054: .4byte gUnknown_2021CD0
_080EC054: .4byte gStringVar1
_080EC058: .4byte gSaveBlock1Ptr
_080EC05C: .4byte gUnknown_203AAC4
_080EC060: .4byte 0x00002ce2
@ -1252,7 +1252,7 @@ _080EC064:
movs r1, 0x1
bl ConvertInternationalString
_080EC06C:
ldr r4, _080EC088 @ =gUnknown_2021D18
ldr r4, _080EC088 @ =gStringVar4
ldr r1, _080EC08C @ =gUnknown_8417806
adds r0, r4, 0
bl StringExpandPlaceholders
@ -1265,7 +1265,7 @@ _080EC06C:
pop {r0}
bx r0
.align 2, 0
_080EC088: .4byte gUnknown_2021D18
_080EC088: .4byte gStringVar4
_080EC08C: .4byte gUnknown_8417806
_080EC090: .4byte sub_80EC0D8
thumb_func_end sub_80EBFFC
@ -1380,13 +1380,13 @@ sub_80EC15C: @ 80EC15C
cmp r4, r0
bne _080EC188
movs r0, 0x5
bl sub_80722CC
bl PlaySE
adds r0, r5, 0
bl sub_80EC574
b _080EC19E
_080EC188:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _080EC1A4 @ =gUnknown_8402228
lsls r1, r4, 3
adds r0, 0x4
@ -1619,7 +1619,7 @@ _080EC348:
b _080EC35C
_080EC350:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_080EC356:
adds r0, r4, 0
bl sub_80EC3F8

20
asm/pokeball.s
View File

@ -305,7 +305,7 @@ _0804AB6C:
ldr r1, _0804ABD0 @ =nullsub_43
str r1, [r0]
movs r0, 0x36
bl sub_80722CC
bl PlaySE
_0804ABB8:
add sp, 0x8
pop {r3-r5}
@ -484,7 +484,7 @@ sub_804AD00: @ 804AD00
cmp r0, 0xB
bne _0804AD18
movs r0, 0x35
bl sub_80722CC
bl PlaySE
_0804AD18:
ldr r6, _0804AD64 @ =gUnknown_202063C
ldr r5, _0804AD68 @ =gUnknown_2023D44
@ -653,19 +653,19 @@ _0804AE50:
b _0804AE6E
_0804AE56:
movs r0, 0x31
bl sub_80722CC
bl PlaySE
b _0804AEA2
_0804AE5E:
movs r0, 0x32
bl sub_80722CC
bl PlaySE
b _0804AEA2
_0804AE66:
movs r0, 0x33
bl sub_80722CC
bl PlaySE
b _0804AEA2
_0804AE6E:
movs r0, 0x34
bl sub_80722CC
bl PlaySE
b _0804AEA2
_0804AE76:
movs r2, 0x38
@ -750,7 +750,7 @@ sub_804AEE4: @ 804AEE4
ldr r0, _0804AF20 @ =sub_804AF24
str r0, [r4, 0x1C]
movs r0, 0x17
bl sub_80722CC
bl PlaySE
_0804AF18:
pop {r4}
pop {r0}
@ -924,7 +924,7 @@ _0804B05C:
bl StartSpriteAffineAnim
_0804B064:
movs r0, 0x17
bl sub_80722CC
bl PlaySE
_0804B06A:
pop {r4}
pop {r0}
@ -1597,7 +1597,7 @@ sub_804B5C8: @ 804B5C8
strb r1, [r0]
bl m4aMPlayAllStop
ldr r0, _0804B5FC @ =0x0000013f
bl sub_80722CC
bl PlaySE
b _0804B666
.align 2, 0
_0804B5F8: .4byte gUnknown_2024005
@ -2513,7 +2513,7 @@ sub_804BCF8: @ 804BCF8
cmp r0, 0xB
bne _0804BD10
movs r0, 0x35
bl sub_80722CC
bl PlaySE
_0804BD10:
ldrh r1, [r5, 0x2E]
lsls r1, 24

24
asm/pokedex_screen.s
View File

@ -1164,7 +1164,7 @@ sub_8102EC0: @ 8102EC0
cmp r1, 0
bne _08102ED0
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_08102ED0:
movs r0, 0x2
negs r0, r0
@ -2898,7 +2898,7 @@ _08103D32:
strb r0, [r2]
_08103D60:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
b _08104228
.align 2, 0
_08103D68: .4byte gUnknown_203ACF0
@ -3138,7 +3138,7 @@ _08103F20:
adds r0, 0x5A
strh r1, [r0]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, [r5]
movs r0, 0xE
b _08104226
@ -4775,7 +4775,7 @@ sub_8104C2C: @ 8104C2C
movs r0, 0
adds r1, r4, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r1, 0x14
negs r1, r1
adds r3, r1, 0
@ -5825,7 +5825,7 @@ _081054DC:
adds r0, 0x1
strb r0, [r1, 0x2]
movs r0, 0x6B
bl sub_80722CC
bl PlaySE
b _0810557C
.align 2, 0
_081054EC: .4byte gUnknown_203ACF0
@ -6290,7 +6290,7 @@ _08105878:
movs r0, 0
add r1, sp, 0x8
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
adds r0, r6, r0
lsls r0, 24
lsrs r6, r0, 24
@ -6861,7 +6861,7 @@ sub_8105CB0: @ 8105CB0
strb r0, [r2, 0xD]
movs r0, 0x2
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
lsls r0, 16
lsrs r0, 16
movs r1, 0xF0
@ -7590,7 +7590,7 @@ _081062B4:
movs r0, 0
adds r1, r4, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
ldr r1, [r7]
adds r1, 0x53
ldrb r1, [r1]
@ -7627,7 +7627,7 @@ _081062B4:
movs r0, 0
adds r1, r4, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
ldr r1, [r7]
adds r1, 0x54
ldrb r1, [r1]
@ -8029,7 +8029,7 @@ _081066E2:
movs r0, 0
adds r1, r4, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
ldr r1, [r5]
adds r1, 0x4A
ldrb r1, [r1]
@ -8983,7 +8983,7 @@ _08106E8E:
movs r0, 0x2
adds r1, r4, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r1, 0xF0
subs r1, r0
lsrs r1, 1
@ -8992,7 +8992,7 @@ _08106EA0:
movs r0, 0x2
adds r1, r4, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
movs r1, 0xE8
subs r1, r0
_08106EAE:

8
asm/pokemon_3.s
View File

@ -2364,7 +2364,7 @@ EvolutionRenameMon: @ 804356C
lsls r2, 16
lsrs r2, 16
mov r8, r2
ldr r0, _080435D8 @ =gUnknown_2021CD0
ldr r0, _080435D8 @ =gStringVar1
mov r9, r0
adds r0, r5, 0
movs r1, 0x2
@ -2404,7 +2404,7 @@ _080435C8:
pop {r0}
bx r0
.align 2, 0
_080435D8: .4byte gUnknown_2021CD0
_080435D8: .4byte gStringVar1
_080435DC: .4byte gUnknown_8245EE0
thumb_func_end EvolutionRenameMon
@ -4323,7 +4323,7 @@ _080443AA:
movs r0, 0xFF
strb r0, [r4, 0x4]
ldr r0, _080443EC @ =gUnknown_83FCA2C
ldr r1, _080443F0 @ =gUnknown_2021D18
ldr r1, _080443F0 @ =gStringVar4
bl sub_80D7868
pop {r4,r5}
pop {r0}
@ -4333,7 +4333,7 @@ _080443E0: .4byte gUnknown_2023BCE
_080443E4: .4byte gUnknown_2022AC8
_080443E8: .4byte gUnknown_2024004
_080443EC: .4byte gUnknown_83FCA2C
_080443F0: .4byte gUnknown_2021D18
_080443F0: .4byte gStringVar4
thumb_func_end sub_8044348
thumb_func_start SetWildMonHeldItem

16
asm/pokemon_size_record.s
View File

@ -254,10 +254,10 @@ _080A0874:
adds r0, r6, 0
bl GetMonSize
adds r4, r0, 0
ldr r0, _080A08AC @ =gUnknown_2021D04
ldr r0, _080A08AC @ =gStringVar3
adds r1, r4, 0
bl sub_80A07E4
ldr r0, _080A08B0 @ =gUnknown_2021CF0
ldr r0, _080A08B0 @ =gStringVar2
adds r1, r5, 0
bl sub_80A07E4
cmp r5, r4
@ -265,8 +265,8 @@ _080A0874:
movs r0, 0x4
b _080A08C4
.align 2, 0
_080A08AC: .4byte gUnknown_2021D04
_080A08B0: .4byte gUnknown_2021CF0
_080A08AC: .4byte gStringVar3
_080A08B0: .4byte gStringVar2
_080A08B4:
cmp r5, r4
bcc _080A08C2
@ -294,9 +294,9 @@ sub_80A08CC: @ 80A08CC
adds r0, r4, 0
bl GetMonSize
adds r1, r0, 0
ldr r0, _080A08F8 @ =gUnknown_2021D04
ldr r0, _080A08F8 @ =gStringVar3
bl sub_80A07E4
ldr r0, _080A08FC @ =gUnknown_2021CD0
ldr r0, _080A08FC @ =gStringVar1
movs r1, 0xB
muls r1, r4
ldr r2, _080A0900 @ =gUnknown_8245EE0
@ -306,8 +306,8 @@ sub_80A08CC: @ 80A08CC
pop {r0}
bx r0
.align 2, 0
_080A08F8: .4byte gUnknown_2021D04
_080A08FC: .4byte gUnknown_2021CD0
_080A08F8: .4byte gStringVar3
_080A08FC: .4byte gStringVar1
_080A0900: .4byte gUnknown_8245EE0
thumb_func_end sub_80A08CC

20
asm/pokemon_special_anim.s
View File

@ -763,7 +763,7 @@ _0811CB5A:
cmp r0, 0x1E
bls _0811CBD6
movs r0, 0xE1
bl sub_80722CC
bl PlaySE
movs r0, 0x4
bl sub_811D2EC
bl sub_811D4FC
@ -1834,7 +1834,7 @@ _0811D404:
movs r2, 0x1
negs r2, r2
movs r0, 0x2
bl sub_8005ED4
bl GetStringWidth
add r0, r8
lsls r0, 16
lsrs r0, 16
@ -1844,7 +1844,7 @@ _0811D418:
movs r2, 0x1
negs r2, r2
movs r0, 0x2
bl sub_8005ED4
bl GetStringWidth
add r0, r8
lsls r0, 16
lsrs r0, 16
@ -2127,7 +2127,7 @@ _0811D63E:
movs r0, 0
strh r0, [r4, 0x4]
movs r0, 0x85
bl sub_80722CC
bl PlaySE
ldr r0, _0811D66C @ =0x00007da8
str r0, [sp]
movs r0, 0x1
@ -2186,7 +2186,7 @@ _0811D6BA:
b _0811D6D6
_0811D6CA:
movs r0, 0x54
bl sub_80722CC
bl PlaySE
ldr r0, [r4, 0x10]
bl DestroySprite
_0811D6D6:
@ -2230,7 +2230,7 @@ sub_811D6FC: @ 811D6FC
_0811D710:
bl sub_811E10C
movs r0, 0x1D
bl sub_80722CC
bl PlaySE
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
@ -2635,7 +2635,7 @@ _0811DA26:
cmp r7, 0
bne _0811DA90
movs r0, 0x6D
bl sub_80722CC
bl PlaySE
ldrb r1, [r4, 0x2]
adds r0, r5, 0
bl sub_811DB14
@ -3155,7 +3155,7 @@ _0811DE00:
movs r0, 0
strh r0, [r4, 0x2]
movs r0, 0xBB
bl sub_80722CC
bl PlaySE
adds r2, r5, 0
adds r2, 0x3E
ldrb r1, [r2]
@ -3205,7 +3205,7 @@ _0811DE2A:
movs r0, 0x2
strh r0, [r4]
movs r0, 0xDA
bl sub_80722CC
bl PlaySE
b _0811DF0C
.align 2, 0
_0811DE78: .4byte gUnknown_8459AA8
@ -3254,7 +3254,7 @@ _0811DEC8:
cmp r0, 0
bne _0811DED6
movs r0, 0xD2
bl sub_80722CC
bl PlaySE
_0811DED6:
ldrh r0, [r4, 0xE]
adds r0, 0x1

120
asm/pokemon_storage_system.s
View File

@ -2102,7 +2102,7 @@ sub_808C95C: @ 808C95C
cmp r0, 0
beq _0808C978
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0xC9
b _0808C9C0
.align 2, 0
@ -2113,7 +2113,7 @@ _0808C978:
cmp r0, 0
beq _0808C998
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808C994 @ =gUnknown_20397AC
ldr r0, [r0]
movs r1, 0x91
@ -2129,7 +2129,7 @@ _0808C998:
cmp r0, 0
beq _0808C9AC
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_808CC44
b _0808C9BE
_0808C9AC:
@ -2138,7 +2138,7 @@ _0808C9AC:
cmp r0, 0
beq _0808C9BE
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_808CC10
_0808C9BE:
movs r0, 0xC8
@ -3185,7 +3185,7 @@ sub_808D220: @ 808D220
_0808D234: .4byte gUnknown_20397B0
_0808D238:
movs r0, 0x2
bl sub_80722CC
bl PlaySE
movs r0, 0x14
movs r1, 0
movs r2, 0x1
@ -3331,7 +3331,7 @@ _0808D32C:
.4byte _0808D608
_0808D394:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808D3A4 @ =gUnknown_20397B0
ldr r1, [r0]
movs r0, 0x1
@ -3411,7 +3411,7 @@ _0808D430:
_0808D438: .4byte sub_808ECE4
_0808D43C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808D44C @ =box_related
bl add_to_c3_somehow
b _0808D7B2
@ -3425,7 +3425,7 @@ _0808D450:
_0808D458: .4byte sub_808D878
_0808D45C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl StorageGetCurrentBox
ldr r4, _0808D48C @ =gUnknown_20397B0
ldr r1, [r4]
@ -3451,7 +3451,7 @@ _0808D48C: .4byte gUnknown_20397B0
_0808D490: .4byte 0x000002ca
_0808D494:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl StorageGetCurrentBox
ldr r4, _0808D4C4 @ =gUnknown_20397B0
ldr r1, [r4]
@ -3505,7 +3505,7 @@ _0808D500: .4byte gUnknown_20397B0
_0808D504: .4byte 0x00000ce2
_0808D508:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808D518 @ =sub_808DD88
bl add_to_c3_somehow
b _0808D7B2
@ -3517,7 +3517,7 @@ _0808D51C:
cmp r0, 0
bne _0808D538
movs r0, 0x5
bl sub_80722CC
bl PlaySE
b _0808D740
_0808D52E:
bl sub_809393C
@ -3534,7 +3534,7 @@ _0808D538:
_0808D544: .4byte gUnknown_20397B0
_0808D548:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808D558 @ =sub_808DC50
bl add_to_c3_somehow
b _0808D7B2
@ -3542,7 +3542,7 @@ _0808D548:
_0808D558: .4byte sub_808DC50
_0808D55C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808D56C @ =sub_808DC9C
bl add_to_c3_somehow
b _0808D7B2
@ -3550,7 +3550,7 @@ _0808D55C:
_0808D56C: .4byte sub_808DC9C
_0808D570:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808D580 @ =sub_808DBF0
bl add_to_c3_somehow
b _0808D7B2
@ -3558,7 +3558,7 @@ _0808D570:
_0808D580: .4byte sub_808DBF0
_0808D584:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808D594 @ =sub_808E140
bl add_to_c3_somehow
b _0808D7B2
@ -3566,7 +3566,7 @@ _0808D584:
_0808D594: .4byte sub_808E140
_0808D598:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808D5A8 @ =sub_808E1F4
bl add_to_c3_somehow
b _0808D7B2
@ -3574,7 +3574,7 @@ _0808D598:
_0808D5A8: .4byte sub_808E1F4
_0808D5AC:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808D5BC @ =sub_808E3C8
bl add_to_c3_somehow
b _0808D7B2
@ -3582,7 +3582,7 @@ _0808D5AC:
_0808D5BC: .4byte sub_808E3C8
_0808D5C0:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0
b _0808D616
_0808D5CA:
@ -3597,7 +3597,7 @@ _0808D5CA:
_0808D5DC: .4byte gUnknown_20397B0
_0808D5E0:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x2
b _0808D5F6
_0808D5EA:
@ -3605,7 +3605,7 @@ _0808D5EA:
b _0808D616
_0808D5EE:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x4
_0808D5F6:
bl sub_80950BC
@ -3618,7 +3618,7 @@ _0808D5F6:
_0808D604: .4byte gUnknown_20397B0
_0808D608:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x3
bl sub_808FE54
movs r0, 0x5
@ -3633,7 +3633,7 @@ _0808D616:
_0808D624: .4byte gUnknown_20397B0
_0808D628:
movs r0, 0x1A
bl sub_80722CC
bl PlaySE
b _0808D7B2
_0808D630:
bl sub_80924A8
@ -3722,12 +3722,12 @@ _0808D6E4: .4byte gMain
_0808D6E8: .4byte gUnknown_20397B0
_0808D6EC:
movs r0, 0x1A
bl sub_80722CC
bl PlaySE
movs r0, 0xD
b _0808D6FE
_0808D6F6:
movs r0, 0x1A
bl sub_80722CC
bl PlaySE
movs r0, 0x16
_0808D6FE:
bl sub_808FBA4
@ -3880,7 +3880,7 @@ _0808D818:
b _0808D86A
_0808D81E:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_808F810
b _0808D840
_0808D82A:
@ -3957,7 +3957,7 @@ _0808D8B4:
b _0808DB86
_0808D8C0:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r4, _0808D8D8 @ =gUnknown_20397B0
ldr r0, [r4]
ldrb r0, [r0, 0x1]
@ -4061,7 +4061,7 @@ _0808D9B0:
cmp r0, 0
bne _0808DA66
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_808FD20
ldr r0, _0808D9CC @ =sub_808DB94
bl add_to_c3_somehow
@ -4070,7 +4070,7 @@ _0808D9B0:
_0808D9CC: .4byte sub_808DB94
_0808D9D0:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_808FD20
ldr r0, _0808D9E4 @ =sub_808DBF0
bl add_to_c3_somehow
@ -4083,7 +4083,7 @@ _0808D9E8:
cmp r0, 0
beq _0808DA66
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_808FD20
ldr r0, _0808DA04 @ =sub_808DC50
bl add_to_c3_somehow
@ -4092,7 +4092,7 @@ _0808D9E8:
_0808DA04: .4byte sub_808DC50
_0808DA08:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_808FD20
ldr r0, _0808DA1C @ =sub_808DC9C
bl add_to_c3_somehow
@ -4114,7 +4114,7 @@ _0808DA20:
cmp r0, 0
bne _0808DAA0
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_808FD20
ldr r0, _0808DA58 @ =sub_808DD88
bl add_to_c3_somehow
@ -4167,7 +4167,7 @@ _0808DAA0:
_0808DAA8: .4byte 0x00000ce2
_0808DAAC:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808DABC @ =sub_808DECC
bl add_to_c3_somehow
b _0808DB86
@ -4175,7 +4175,7 @@ _0808DAAC:
_0808DABC: .4byte sub_808DECC
_0808DAC0:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808DAD0 @ =sub_808EAF0
bl add_to_c3_somehow
b _0808DB86
@ -4183,7 +4183,7 @@ _0808DAC0:
_0808DAD0: .4byte sub_808EAF0
_0808DAD4:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808DAE4 @ =sub_808E0BC
bl add_to_c3_somehow
b _0808DB86
@ -4191,7 +4191,7 @@ _0808DAD4:
_0808DAE4: .4byte sub_808E0BC
_0808DAE8:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808DAF8 @ =sub_808E140
bl add_to_c3_somehow
b _0808DB86
@ -4199,7 +4199,7 @@ _0808DAE8:
_0808DAF8: .4byte sub_808E140
_0808DAFC:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808DB0C @ =sub_808E1F4
bl add_to_c3_somehow
b _0808DB86
@ -4231,17 +4231,17 @@ _0808DB34:
_0808DB3C: .4byte sub_808E4B0
_0808DB40:
movs r0, 0x1A
bl sub_80722CC
bl PlaySE
movs r0, 0xD
b _0808DB5C
_0808DB4A:
movs r0, 0x1A
bl sub_80722CC
bl PlaySE
movs r0, 0x11
b _0808DB5C
_0808DB54:
movs r0, 0x1A
bl sub_80722CC
bl PlaySE
movs r0, 0x16
_0808DB5C:
bl sub_808FBA4
@ -5156,7 +5156,7 @@ _0808E2E8:
cmp r0, 0
bne _0808E314
movs r0, 0x1A
bl sub_80722CC
bl PlaySE
movs r0, 0x1A
bl sub_808FBA4
ldr r1, [r5]
@ -5167,7 +5167,7 @@ _0808E2E8:
_0808E310: .4byte 0x00000ce2
_0808E314:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808E33C @ =gUnknown_20397B4
ldrb r0, [r0]
negs r4, r0
@ -5387,7 +5387,7 @@ _0808E4F2:
cmp r0, 0
bne _0808E55C
movs r0, 0x6
bl sub_80722CC
bl PlaySE
bl sub_8096694
bl sub_80966F4
b _0808E53A
@ -5405,7 +5405,7 @@ _0808E518:
cmp r0, 0
beq _0808E55C
movs r0, 0x6
bl sub_80722CC
bl PlaySE
b _0808E53A
.align 2, 0
_0808E52C: .4byte gMain
@ -5466,7 +5466,7 @@ _0808E584:
.4byte _0808E66C
_0808E59C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1B
bl sub_808FBA4
movs r0, 0
@ -5753,7 +5753,7 @@ _0808E7DC:
_0808E7F0: .4byte sub_808D2BC
_0808E7F4:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _0808E804 @ =sub_808EA90
bl add_to_c3_somehow
b _0808E830
@ -5761,7 +5761,7 @@ _0808E7F4:
_0808E804: .4byte sub_808EA90
_0808E808:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_808FD20
ldr r0, _0808E81C @ =sub_808E83C
bl add_to_c3_somehow
@ -5770,7 +5770,7 @@ _0808E808:
_0808E81C: .4byte sub_808E83C
_0808E820:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_808FD20
ldr r0, _0808E838 @ =sub_808E9A0
bl add_to_c3_somehow
@ -5860,7 +5860,7 @@ _0808E8D8:
cmp r0, 0x12
blt _0808E994
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_8095024
ldr r1, [r5]
adds r2, r1, r4
@ -5911,7 +5911,7 @@ _0808E924:
_0808E954: .4byte gUnknown_20397B0
_0808E958:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_808FD20
ldr r1, [r4]
adds r1, r5
@ -6239,7 +6239,7 @@ _0808EBE4:
cmp r0, 0
beq _0808EC08
movs r0, 0x1A
bl sub_80722CC
bl PlaySE
movs r0, 0xF
bl sub_808FBA4
ldr r0, _0808EC04 @ =gUnknown_20397B0
@ -6261,7 +6261,7 @@ _0808EC08:
_0808EC1C: .4byte sub_808E564
_0808EC20:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0
bl sub_808FBA4
movs r0, 0
@ -6308,7 +6308,7 @@ _0808EC72:
_0808EC80: .4byte sub_808D2BC
_0808EC84:
movs r0, 0x3
bl sub_80722CC
bl PlaySE
bl sub_808FD20
b _0808EC9A
_0808EC90:
@ -6381,7 +6381,7 @@ _0808ED18:
cmp r0, 0
beq _0808ED3C
movs r0, 0x1A
bl sub_80722CC
bl PlaySE
movs r0, 0xF
bl sub_808FBA4
ldr r0, _0808ED38 @ =gUnknown_20397B0
@ -6403,7 +6403,7 @@ _0808ED3C:
_0808ED50: .4byte sub_808E564
_0808ED54:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x12
bl sub_808FBA4
movs r0, 0
@ -6451,7 +6451,7 @@ _0808EDA8:
_0808EDB4: .4byte sub_808D2BC
_0808EDB8:
movs r0, 0x3
bl sub_80722CC
bl PlaySE
bl sub_808FD20
b _0808EDCE
_0808EDC4:
@ -8084,7 +8084,7 @@ sub_808FAD4: @ 808FAD4
movs r1, 0
strb r1, [r0]
movs r0, 0x6
bl sub_80722CC
bl PlaySE
bl sub_808F75C
pop {r0}
bx r0
@ -12822,7 +12822,7 @@ sub_8091F60: @ 8091F60
adds r1, r0, 0
movs r0, 0x1
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
adds r1, r0, 0
lsrs r0, r1, 31
adds r1, r0
@ -19011,7 +19011,7 @@ sub_8094F94: @ 8094F94
cmp r0, 0
beq _08094FB6
movs r0, 0x5
bl sub_80722CC
bl PlaySE
adds r5, 0x1
_08094FB6:
ldrh r1, [r4, 0x2E]
@ -19020,7 +19020,7 @@ _08094FB6:
cmp r0, 0
beq _08094FD4
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@ -19033,7 +19033,7 @@ _08094FD4:
cmp r0, 0
beq _08094FF2
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
b _08094FF2

32
asm/pokemon_summary_screen.s
View File

@ -547,7 +547,7 @@ _08134950:
b _08134B9A
_0813495C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0
bl HideBg
ldr r0, [r5]
@ -595,7 +595,7 @@ _081349B4:
b _08134B9A
_081349C0:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
movs r0, 0
bl HideBg
ldr r0, [r5]
@ -668,7 +668,7 @@ _08134A4A:
cmp r0, 0
bne _08134A7C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, [r4]
ldr r2, _08134A78 @ =0x00003270
adds r0, r2
@ -683,7 +683,7 @@ _08134A7C:
b _08134B9A
_08134A82:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, [r4]
ldr r1, _08134AB4 @ =0x00003224
adds r0, r1
@ -4837,7 +4837,7 @@ sub_8136DF0: @ 8136DF0
movs r0, 0
adds r1, r6, 0
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
ldr r1, [r5]
adds r1, r4
ldrb r1, [r1]
@ -8717,7 +8717,7 @@ _08138D2A:
movs r1, 0x2
strb r1, [r0]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r4, [r4]
cmp r4, 0
bne _08138D5A
@ -8752,7 +8752,7 @@ _08138D84:
movs r1, 0x2
strb r1, [r0]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, [r6]
ldr r3, _08138DC8 @ =0x00003268
adds r0, r1, r3
@ -8852,7 +8852,7 @@ _08138E3C:
b _08139024
_08138E4A:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _08138E64 @ =gUnknown_203B16D
movs r0, 0
strb r0, [r1]
@ -8874,7 +8874,7 @@ _08138E6E:
strb r1, [r0]
_08138E78:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
b _08139094
_08138E80:
movs r0, 0x1
@ -8884,7 +8884,7 @@ _08138E80:
cmp r5, 0
beq _08138F6C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r3, _08138EB8 @ =gUnknown_203B16D
ldrb r5, [r3]
cmp r5, 0x4
@ -9073,7 +9073,7 @@ _08139010:
b _08139092
_08139024:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _08139030 @ =gUnknown_203B16D
strb r4, [r0]
b _08139094
@ -9603,7 +9603,7 @@ _0813946C:
movs r1, 0x3
strb r1, [r0]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldrb r4, [r4]
cmp r4, 0
bne _0813949C
@ -9709,7 +9709,7 @@ _08139556:
movs r1, 0x3
strb r1, [r0]
movs r0, 0x5
bl sub_80722CC
bl PlaySE
b _0813975A
.align 2, 0
_08139564: .4byte 0x00003288
@ -9729,7 +9729,7 @@ _08139568:
bne _081395B8
_08139584:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r2, _081395A8 @ =gUnknown_203B16E
ldr r0, _081395A4 @ =gUnknown_203B16D
ldrb r0, [r0]
@ -9750,7 +9750,7 @@ _081395B0: .4byte gUnknown_203B140
_081395B4: .4byte 0x00003288
_081395B8:
movs r0, 0x1A
bl sub_80722CC
bl PlaySE
ldr r0, _081395CC @ =gUnknown_203B140
ldr r0, [r0]
ldr r4, _081395D0 @ =0x00003288
@ -9919,7 +9919,7 @@ _08139730: .4byte gUnknown_203B140
_08139734: .4byte 0x00003288
_08139738:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r0, _08139744 @ =gUnknown_203B16D
strb r4, [r0]
b _0813975A

514
asm/quest_log.s
View File

File diff suppressed because it is too large Load Diff

28
asm/region_map.s
View File

@ -788,7 +788,7 @@ _080C0474:
beq _080C0494
_080C048E:
movs r0, 0x65
bl sub_80722CC
bl PlaySE
_080C0494:
bl sub_80C3508
lsls r0, 16
@ -807,7 +807,7 @@ _080C0494:
cmp r0, 0x1
bne _080C04C2
movs r0, 0xE1
bl sub_80722CC
bl PlaySE
b _080C04E0
_080C04C2:
bl sub_80C3508
@ -821,7 +821,7 @@ _080C04C2:
cmp r0, 0xD
bne _080C04E0
movs r0, 0xE1
bl sub_80722CC
bl PlaySE
_080C04E0:
pop {r0}
bx r0
@ -2777,7 +2777,7 @@ sub_80C1478: @ 80C1478
cmp r0, 0
beq _080C150E
movs r0, 0xF5
bl sub_80722CC
bl PlaySE
mov r2, r8
ldr r1, [r2]
adds r1, r7
@ -2803,7 +2803,7 @@ _080C150E:
cmp r1, r0
bcs _080C1542
movs r0, 0xF5
bl sub_80722CC
bl PlaySE
ldr r1, [r4]
ldr r3, _080C1584 @ =0x00001cca
adds r1, r3
@ -2826,7 +2826,7 @@ _080C1542:
cmp r0, 0x6
bne _080C15A8
movs r0, 0xC7
bl sub_80722CC
bl PlaySE
ldr r0, [r4]
ldr r2, _080C1584 @ =0x00001cca
adds r1, r0, r2
@ -5034,7 +5034,7 @@ _080C2796:
adds r0, 0x1
strb r0, [r1]
movs r0, 0xF4
bl sub_80722CC
bl PlaySE
b _080C299A
.align 2, 0
_080C27AC: .4byte gUnknown_2037AB8
@ -5189,7 +5189,7 @@ _080C28A4:
movs r0, 0xF4
bl m4aSongNumStop
movs r0, 0x2A
bl sub_80722CC
bl PlaySE
ldr r0, _080C2920 @ =gUnknown_20399E0
ldr r1, [r0]
ldr r0, _080C2924 @ =0x00000ccc
@ -5768,7 +5768,7 @@ _080C2DB8:
bl sub_80C2B9C
bl sub_80C2B48
movs r0, 0xF3
bl sub_80722CC
bl PlaySE
ldr r0, _080C2DD0 @ =gUnknown_20399E0
ldr r1, [r0]
ldr r0, _080C2DD4 @ =0x00000ccf
@ -6365,7 +6365,7 @@ _080C3236:
cmp r1, r0
bne _080C3254
movs r0, 0xF0
bl sub_80722CC
bl PlaySE
movs r5, 0x6
_080C3254:
ldr r0, [r6]
@ -6380,7 +6380,7 @@ _080C3254:
cmp r0, 0x1
bne _080C331A
movs r0, 0xF0
bl sub_80722CC
bl PlaySE
movs r5, 0x5
b _080C331A
.align 2, 0
@ -10063,7 +10063,7 @@ _080C5070:
cmp r0, 0x2
bne _080C5086
movs r0, 0x66
bl sub_80722CC
bl PlaySE
b _080C508A
_080C5086:
bl sub_80C0450
@ -10083,7 +10083,7 @@ _080C508A:
cmp r0, 0xD
bne _080C50C4
movs r0, 0xE1
bl sub_80722CC
bl PlaySE
ldr r0, _080C50C0 @ =gUnknown_8418E95
bl sub_80C4E74
b _080C51DC
@ -10160,7 +10160,7 @@ _080C514C: .4byte gSaveBlock1Ptr
_080C5150: .4byte gUnknown_20399FC
_080C5154:
movs r0, 0x1
bl sub_80722CC
bl PlaySE
ldr r1, _080C5164 @ =gUnknown_20399FC
ldr r0, [r1]
strb r4, [r0, 0x2]

2
asm/rom6.s
View File

@ -354,7 +354,7 @@ _080C9A5C: .4byte sub_80C9A60
sub_80C9A60: @ 80C9A60
push {lr}
movs r0, 0x7C
bl sub_80722CC
bl PlaySE
movs r0, 0x25
bl FieldEffectActiveListRemove
bl EnableBothScriptContexts

10
asm/scrcmd.s
View File

@ -2363,7 +2363,7 @@ ScrCmd_playse: @ 806B068
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_80722CC
bl PlaySE
movs r0, 0
pop {r1}
bx r1
@ -3978,7 +3978,7 @@ _0806BC50:
movs r2, 0x1
negs r2, r2
movs r0, 0x6
bl sub_8005ED4
bl GetStringWidth
strh r0, [r4]
movs r0, 0
pop {r4}
@ -4351,14 +4351,14 @@ ScrCmd_vloadword: @ 806BF3C
ldr r0, _0806BF58 @ =gUnknown_20370A8
ldr r0, [r0]
subs r1, r0
ldr r0, _0806BF5C @ =gUnknown_2021D18
ldr r0, _0806BF5C @ =gStringVar4
bl StringExpandPlaceholders
movs r0, 0
pop {r1}
bx r1
.align 2, 0
_0806BF58: .4byte gUnknown_20370A8
_0806BF5C: .4byte gUnknown_2021D18
_0806BF5C: .4byte gStringVar4
thumb_func_end ScrCmd_vloadword
thumb_func_start ScrCmd_vbufferstring
@ -5273,7 +5273,7 @@ ScrCmd_opendoor: @ 806C5D4
bl sub_805B364
lsls r0, 16
lsrs r0, 16
bl sub_80722CC
bl PlaySE
adds r0, r5, 0
adds r1, r4, 0
bl sub_805B310

14
asm/script_menu.s
View File

@ -11,7 +11,7 @@ sub_809C954: @ 809C954
adds r1, r0, 0
movs r0, 0x1
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
adds r1, r0, 0
adds r0, r1, 0x7
cmp r0, 0
@ -206,7 +206,7 @@ _0809CAC6:
ldr r1, [r5]
movs r0, 0x2
movs r2, 0
bl sub_8005ED4
bl GetStringWidth
cmp r0, r6
ble _0809CAD6
adds r6, r0, 0
@ -505,7 +505,7 @@ _0809CCF8:
cmp r0, 0
bne _0809CD3C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0809CD24 @ =gUnknown_20370D0
movs r0, 0x7F
strh r0, [r1]
@ -710,7 +710,7 @@ _0809CE94:
bne _0809CEB2
_0809CE9C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0809CEA8 @ =gUnknown_20370D0
movs r0, 0
b _0809CEB0
@ -889,7 +889,7 @@ sub_809CFDC: @ 809CFDC
cmp r0, 0
bne _0809D034
movs r0, 0x5
bl sub_80722CC
bl PlaySE
ldr r1, _0809D01C @ =gUnknown_20370D0
movs r0, 0x7F
strh r0, [r1]
@ -1119,7 +1119,7 @@ _0809D1E4:
adds r3, r7, 0
bl PrintTextOnWindow
_0809D1FA:
ldr r4, _0809D24C @ =gUnknown_2021D18
ldr r4, _0809D24C @ =gStringVar4
ldr r1, _0809D250 @ =gUnknown_8417BB6
adds r0, r4, 0
bl StringExpandPlaceholders
@ -1155,7 +1155,7 @@ _0809D1FA:
bx r0
.align 2, 0
_0809D248: .4byte gUnknown_8417B9F
_0809D24C: .4byte gUnknown_2021D18
_0809D24C: .4byte gStringVar4
_0809D250: .4byte gUnknown_8417BB6
thumb_func_end sub_809D070

4
asm/script_pokemon_util_80A0058.s
View File

@ -287,7 +287,7 @@ GetNameOfEnigmaBerryInPlayerParty: @ 80A026C
bl ItemIdToBerryType
lsls r0, 24
lsrs r0, 24
ldr r1, _080A0298 @ =gUnknown_2021CD0
ldr r1, _080A0298 @ =gStringVar1
bl GetBerryNameByBerryType
_080A028E:
adds r0, r4, 0
@ -295,7 +295,7 @@ _080A028E:
pop {r1}
bx r1
.align 2, 0
_080A0298: .4byte gUnknown_2021CD0
_080A0298: .4byte gStringVar1
thumb_func_end GetNameOfEnigmaBerryInPlayerParty
thumb_func_start CreateScriptedWildMon

8
asm/script_pokemon_util_80BF8FC.s
View File

@ -190,10 +190,10 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r1, _080BFA9C @ =gUnknown_2021CD0
ldr r1, _080BFA9C @ =gStringVar1
adds r0, r5, 0
bl GetMonNickname
ldr r0, _080BFAA0 @ =gUnknown_2021CF0
ldr r0, _080BFAA0 @ =gStringVar2
movs r1, 0xD
muls r1, r4
ldr r2, _080BFAA4 @ =gUnknown_8247094
@ -206,8 +206,8 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50
_080BFA90: .4byte gUnknown_20370C0
_080BFA94: .4byte gUnknown_2024284
_080BFA98: .4byte gUnknown_20370C2
_080BFA9C: .4byte gUnknown_2021CD0
_080BFAA0: .4byte gUnknown_2021CF0
_080BFA9C: .4byte gStringVar1
_080BFAA0: .4byte gStringVar2
_080BFAA4: .4byte gUnknown_8247094
thumb_func_end ScrSpecial_GetPokemonNicknameAndMoveName

4
asm/seagallop.s
View File

@ -170,7 +170,7 @@ _08146FE4:
ldr r0, _08147044 @ =sub_8147058
bl SetVBlankCallback
movs r0, 0x13
bl sub_80722CC
bl PlaySE
bl sub_81473C4
movs r1, 0x80
lsls r1, 6
@ -364,7 +364,7 @@ _08147150:
bl Overworld_SetWarpDestination
bl play_some_sound
movs r0, 0x9
bl sub_80722CC
bl PlaySE
ldr r1, _081471B4 @ =gUnknown_3005020
ldr r0, _081471B8 @ =sub_807DF64
str r0, [r1]

66
asm/shop.s
View File

@ -205,7 +205,7 @@ sub_809AC10: @ 809AC10
cmp r1, r0
bne _0809AC3C
movs r0, 0x5
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl sub_809ACF8
b _0809AC52
@ -1041,7 +1041,7 @@ sub_809B320: @ 809B320
cmp r1, 0x1
beq _0809B334
movs r0, 0x5
bl sub_80722CC
bl PlaySE
_0809B334:
movs r0, 0x2
negs r0, r0
@ -1158,7 +1158,7 @@ sub_809B408: @ 809B408
negs r0, r0
cmp r1, r0
beq _0809B480
ldr r4, _0809B488 @ =gUnknown_2021CD0
ldr r4, _0809B488 @ =gStringVar1
lsls r0, r1, 16
lsrs r0, 16
bl itemid_get_market_price
@ -1175,7 +1175,7 @@ sub_809B408: @ 809B408
lsrs r0, 16
movs r1, 0x4
subs r1, r0
ldr r2, _0809B48C @ =gUnknown_2021D18
ldr r2, _0809B48C @ =gStringVar4
adds r0, r1, 0
subs r1, 0x1
cmp r0, 0
@ -1192,7 +1192,7 @@ _0809B45C:
ldr r1, _0809B490 @ =gUnknown_841697A
adds r0, r2, 0
bl StringExpandPlaceholders
ldr r2, _0809B48C @ =gUnknown_2021D18
ldr r2, _0809B48C @ =gStringVar4
str r5, [sp]
movs r0, 0
str r0, [sp, 0x4]
@ -1211,8 +1211,8 @@ _0809B480:
pop {r0}
bx r0
.align 2, 0
_0809B488: .4byte gUnknown_2021CD0
_0809B48C: .4byte gUnknown_2021D18
_0809B488: .4byte gStringVar1
_0809B48C: .4byte gStringVar4
_0809B490: .4byte gUnknown_841697A
thumb_func_end sub_809B408
@ -1225,14 +1225,14 @@ sub_809B494: @ 809B494
negs r0, r0
cmp r7, r0
beq _0809B528
ldr r4, _0809B514 @ =gUnknown_2021CD0
ldr r4, _0809B514 @ =gStringVar1
ldr r0, _0809B518 @ =0xfffffee0
adds r1, r7, r0
adds r0, r4, 0
movs r2, 0x2
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r5, _0809B51C @ =gUnknown_2021D18
ldr r5, _0809B51C @ =gStringVar4
ldr r1, _0809B520 @ =gUnknown_8416226
adds r0, r5, 0
bl StringCopy
@ -1276,9 +1276,9 @@ sub_809B494: @ 809B494
bl sub_813F6F4
b _0809B55C
.align 2, 0
_0809B514: .4byte gUnknown_2021CD0
_0809B514: .4byte gStringVar1
_0809B518: .4byte 0xfffffee0
_0809B51C: .4byte gUnknown_2021D18
_0809B51C: .4byte gStringVar4
_0809B520: .4byte gUnknown_8416226
_0809B524: .4byte gUnknown_8247094
_0809B528:
@ -2112,13 +2112,13 @@ sub_809BB44: @ 809BB44
movs r1, 0x36
movs r2, 0xA
bl sub_809FEC4
ldr r0, _0809BBB4 @ =gUnknown_2021CD0
ldr r0, _0809BBB4 @ =gStringVar1
movs r2, 0x2
ldrsh r1, [r4, r2]
movs r2, 0x2
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r4, _0809BBB8 @ =gUnknown_2021D18
ldr r4, _0809BBB8 @ =gStringVar4
ldr r1, _0809BBBC @ =gUnknown_84162B9
adds r0, r4, 0
bl StringExpandPlaceholders
@ -2142,8 +2142,8 @@ sub_809BB44: @ 809BB44
.align 2, 0
_0809BBAC: .4byte gUnknown_3005098
_0809BBB0: .4byte gUnknown_2039934
_0809BBB4: .4byte gUnknown_2021CD0
_0809BBB8: .4byte gUnknown_2021D18
_0809BBB4: .4byte gStringVar1
_0809BBB8: .4byte gStringVar4
_0809BBBC: .4byte gUnknown_84162B9
thumb_func_end sub_809BB44
@ -2185,13 +2185,13 @@ _0809BC04: .4byte gUnknown_2037AB8
_0809BC08: .4byte gUnknown_2039942
_0809BC0C:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
adds r0, r6, 0
bl sub_809C004
b _0809BC8E
_0809BC1A:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
strh r4, [r5, 0xA]
movs r0, 0x5
bl ClearWindowTilemap
@ -2230,7 +2230,7 @@ _0809BC70: .4byte gSaveBlock1Ptr
_0809BC74: .4byte gUnknown_8416842
_0809BC78: .4byte sub_809BF98
_0809BC7C:
ldr r1, _0809BC94 @ =gUnknown_2021CD0
ldr r1, _0809BC94 @ =gStringVar1
adds r0, r4, 0
bl sub_8099E90
ldr r1, _0809BC98 @ =gUnknown_8416766
@ -2242,7 +2242,7 @@ _0809BC8E:
pop {r0}
bx r0
.align 2, 0
_0809BC94: .4byte gUnknown_2021CD0
_0809BC94: .4byte gStringVar1
_0809BC98: .4byte gUnknown_8416766
_0809BC9C: .4byte sub_809BCA0
thumb_func_end sub_809BBC0
@ -2266,12 +2266,12 @@ sub_809BCA0: @ 809BCA0
movs r0, 0x1
movs r1, 0
bl sub_813F7C0
ldr r0, _0809BD44 @ =gUnknown_2021CD0
ldr r0, _0809BD44 @ =gStringVar1
adds r1, r4, 0
movs r2, 0x1
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r6, _0809BD48 @ =gUnknown_2021D18
ldr r6, _0809BD48 @ =gStringVar4
ldr r1, _0809BD4C @ =gUnknown_8416749
adds r0, r6, 0
bl StringExpandPlaceholders
@ -2319,8 +2319,8 @@ sub_809BCA0: @ 809BCA0
b _0809BD5E
.align 2, 0
_0809BD40: .4byte gUnknown_3005098
_0809BD44: .4byte gUnknown_2021CD0
_0809BD48: .4byte gUnknown_2021D18
_0809BD44: .4byte gStringVar1
_0809BD48: .4byte gStringVar4
_0809BD4C: .4byte gUnknown_8416749
_0809BD50: .4byte gSaveBlock1Ptr
_0809BD54: .4byte gUnknown_2039934
@ -2392,7 +2392,7 @@ _0809BDD4:
cmp r0, 0
beq _0809BE54
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_809B73C
movs r0, 0x3
movs r1, 0
@ -2407,15 +2407,15 @@ _0809BDD4:
movs r0, 0x4
bl PutWindowTilemap
ldrh r0, [r4, 0xA]
ldr r1, _0809BE40 @ =gUnknown_2021CD0
ldr r1, _0809BE40 @ =gStringVar1
bl sub_8099E90
ldr r0, _0809BE44 @ =gUnknown_2021CF0
ldr r0, _0809BE44 @ =gStringVar2
movs r2, 0x2
ldrsh r1, [r4, r2]
movs r2, 0
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r0, _0809BE48 @ =gUnknown_2021D04
ldr r0, _0809BE48 @ =gStringVar3
ldr r1, [r6, 0x8]
movs r2, 0
movs r3, 0x8
@ -2427,9 +2427,9 @@ _0809BDD4:
b _0809BE88
.align 2, 0
_0809BE3C: .4byte gMain
_0809BE40: .4byte gUnknown_2021CD0
_0809BE44: .4byte gUnknown_2021CF0
_0809BE48: .4byte gUnknown_2021D04
_0809BE40: .4byte gStringVar1
_0809BE44: .4byte gStringVar2
_0809BE48: .4byte gStringVar3
_0809BE4C: .4byte gUnknown_841678E
_0809BE50: .4byte sub_809BE90
_0809BE54:
@ -2438,7 +2438,7 @@ _0809BE54:
cmp r0, 0
beq _0809BE88
movs r0, 0x5
bl sub_80722CC
bl PlaySE
bl sub_809B73C
movs r0, 0x3
movs r1, 0
@ -2536,7 +2536,7 @@ sub_809BF0C: @ 809BF0C
ldr r1, [r1, 0x8]
bl RemoveMoney
movs r0, 0xF8
bl sub_80722CC
bl PlaySE
ldr r0, [r6]
adds r0, r5
bl sub_809FD58
@ -2578,7 +2578,7 @@ sub_809BF68: @ 809BF68
beq _0809BF8E
_0809BF82:
movs r0, 0x5
bl sub_80722CC
bl PlaySE
adds r0, r4, 0
bl sub_809BF98
_0809BF8E:

Some files were not shown because too many files have changed in this diff Show More