decompile string_util

This commit is contained in:
YamaArashi
2017-01-14 11:53:20 -08:00
parent 2f76de380c
commit 1268134668
110 changed files with 5405 additions and 5737 deletions
+5 -1
View File
@@ -93,7 +93,11 @@ $(C_OBJS): %.o : %.c
@echo -e ".text\n\t.align\t2, 0\n" >> $*.s @echo -e ".text\n\t.align\t2, 0\n" >> $*.s
$(AS) $(ASFLAGS) -o $@ $*.s $(AS) $(ASFLAGS) -o $@ $*.s
%.o : dep = $(shell $(SCANINC) $*.s) ifeq ($(NODEP),)
%.o: dep = $(shell $(SCANINC) $*.s)
else
%.o: dep :=
endif
$(ASM_OBJS): %.o: %.s $$(dep) $(ASM_OBJS): %.o: %.s $$(dep)
$(AS) $(ASFLAGS) -o $@ $< $(AS) $(ASFLAGS) -o $@ $<
+2 -2
View File
@@ -1436,7 +1436,7 @@ _0814BA08:
bl pokemon_getattr bl pokemon_getattr
ldr r0, [sp, 0x84] ldr r0, [sp, 0x84]
ldr r1, [sp, 0x8C] ldr r1, [sp, 0x8C]
bl CopyString_Limit10 bl StringCopy10
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x7 movs r1, 0x7
ldr r2, [sp, 0x88] ldr r2, [sp, 0x88]
@@ -5604,7 +5604,7 @@ sub_814E040: @ 814E040
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r2] strb r0, [r2]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r3, [r0] ldr r3, [r0]
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 9 lsls r0, 9
+45 -45
View File
@@ -491,7 +491,7 @@ _0814E4F8:
adds r1, r2 adds r1, r2
ldr r2, =gUnknown_085CCBBC ldr r2, =gUnknown_085CCBBC
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
b _0814E544 b _0814E544
.pool .pool
_0814E534: _0814E534:
@@ -501,7 +501,7 @@ _0814E534:
muls r1, r2 muls r1, r2
ldr r2, =gMoveNames ldr r2, =gMoveNames
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
_0814E544: _0814E544:
ldr r0, =gUnknown_02022F68 ldr r0, =gUnknown_02022F68
bl sub_814F950 bl sub_814F950
@@ -872,7 +872,7 @@ _0814E8A0:
ldrb r0, [r5] ldrb r0, [r5]
cmp r0, 0xFD cmp r0, 0xFD
bne _0814E8B8 bne _0814E8B8
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
adds r0, r5, 0 adds r0, r5, 0
b _0814E8F0 b _0814E8F0
.pool .pool
@@ -891,7 +891,7 @@ _0814E8CE:
ldrb r0, [r1] ldrb r0, [r1]
cmp r0, 0xFD cmp r0, 0xFD
bne _0814E904 bne _0814E904
ldr r4, =gUnknown_02021DC4 ldr r4, =gStringVar2
b _0814E8EE b _0814E8EE
.pool .pool
_0814E8E4: _0814E8E4:
@@ -899,7 +899,7 @@ _0814E8E4:
ldrb r0, [r1] ldrb r0, [r1]
cmp r0, 0xFD cmp r0, 0xFD
bne _0814E904 bne _0814E904
ldr r4, =gUnknown_02021EC4 ldr r4, =gStringVar3
_0814E8EE: _0814E8EE:
adds r0, r1, 0 adds r0, r1, 0
_0814E8F0: _0814E8F0:
@@ -911,15 +911,15 @@ _0814E904:
adds r4, r1, 0 adds r4, r1, 0
bl _0814F5C0 bl _0814F5C0
_0814E90A: _0814E90A:
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
bl _0814F5C0 bl _0814F5C0
.pool .pool
_0814E914: _0814E914:
ldr r4, =gUnknown_02021DC4 ldr r4, =gStringVar2
bl _0814F5C0 bl _0814F5C0
.pool .pool
_0814E920: _0814E920:
ldr r4, =gUnknown_02021EC4 ldr r4, =gStringVar3
bl _0814F5C0 bl _0814F5C0
.pool .pool
_0814E92C: _0814E92C:
@@ -938,7 +938,7 @@ _0814E92C:
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814E960: _0814E960:
@@ -957,7 +957,7 @@ _0814E960:
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814E994: _0814E994:
@@ -976,7 +976,7 @@ _0814E994:
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814E9C8: _0814E9C8:
@@ -995,7 +995,7 @@ _0814E9C8:
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814E9FC: _0814E9FC:
@@ -1017,7 +1017,7 @@ _0814E9FC:
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814EA38: _0814EA38:
@@ -1041,7 +1041,7 @@ _0814EA38:
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814EA78: _0814EA78:
@@ -1065,7 +1065,7 @@ _0814EA78:
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814EAB8: _0814EAB8:
@@ -1089,7 +1089,7 @@ _0814EAB8:
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814EAF8: _0814EAF8:
@@ -1162,7 +1162,7 @@ _0814EB74:
bl pokemon_getattr bl pokemon_getattr
_0814EB9E: _0814EB9E:
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814EBB0: _0814EBB0:
@@ -1215,7 +1215,7 @@ _0814EBF8:
bl pokemon_getattr bl pokemon_getattr
_0814EC24: _0814EC24:
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814EC38: _0814EC38:
@@ -1280,7 +1280,7 @@ _0814ECA8:
bl pokemon_getattr bl pokemon_getattr
_0814ECC2: _0814ECC2:
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814ECD4: _0814ECD4:
@@ -1345,7 +1345,7 @@ _0814ED44:
bl pokemon_getattr bl pokemon_getattr
_0814ED5E: _0814ED5E:
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814ED70: _0814ED70:
@@ -1410,7 +1410,7 @@ _0814EDE0:
bl pokemon_getattr bl pokemon_getattr
_0814EDFA: _0814EDFA:
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
bl _0814F5BE bl _0814F5BE
.pool .pool
_0814EE0C: _0814EE0C:
@@ -1475,7 +1475,7 @@ _0814EE7C:
bl pokemon_getattr bl pokemon_getattr
_0814EE96: _0814EE96:
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
b _0814F5BE b _0814F5BE
.pool .pool
_0814EEA8: _0814EEA8:
@@ -1540,7 +1540,7 @@ _0814EF18:
bl pokemon_getattr bl pokemon_getattr
_0814EF32: _0814EF32:
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
b _0814F5BE b _0814F5BE
.pool .pool
_0814EF44: _0814EF44:
@@ -1625,10 +1625,10 @@ _0814EFEC:
ldr r0, =gUnknown_02024404 ldr r0, =gUnknown_02024404
adds r1, r0 adds r1, r0
mov r0, sp mov r0, sp
bl CopyString bl StringCopy
ldr r1, =gUnknown_085CC0AD ldr r1, =gUnknown_085CC0AD
mov r0, sp mov r0, sp
bl AppendString bl StringAppend
b _0814F5BE b _0814F5BE
.pool .pool
_0814F014: _0814F014:
@@ -1651,10 +1651,10 @@ _0814F014:
ldr r0, =gUnknown_02024404 ldr r0, =gUnknown_02024404
adds r1, r0 adds r1, r0
mov r0, sp mov r0, sp
bl CopyString bl StringCopy
ldr r1, =gUnknown_085CC0AD ldr r1, =gUnknown_085CC0AD
mov r0, sp mov r0, sp
bl AppendString bl StringAppend
b _0814F5BE b _0814F5BE
.pool .pool
_0814F05C: _0814F05C:
@@ -1804,7 +1804,7 @@ _0814F178:
ldr r0, [r0] ldr r0, [r0]
ldrb r1, [r0, 0xD] ldrb r1, [r0, 0xD]
mov r0, sp mov r0, sp
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
b _0814F5BE b _0814F5BE
.pool .pool
_0814F1AC: _0814F1AC:
@@ -1933,7 +1933,7 @@ _0814F298:
b _0814F5C0 b _0814F5C0
.pool .pool
_0814F2B4: _0814F2B4:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r4, [r0] ldr r4, [r0]
b _0814F5C0 b _0814F5C0
.pool .pool
@@ -2044,7 +2044,7 @@ _0814F39C:
bl pokemon_getattr bl pokemon_getattr
_0814F3B4: _0814F3B4:
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
b _0814F5BE b _0814F5BE
.pool .pool
_0814F3C4: _0814F3C4:
@@ -2218,7 +2218,7 @@ _0814F556:
movs r0, 0x1 movs r0, 0x1
_0814F55A: _0814F55A:
bl sub_81A36D0 bl sub_81A36D0
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
b _0814F5C0 b _0814F5C0
.pool .pool
_0814F574: _0814F574:
@@ -2233,7 +2233,7 @@ _0814F580:
movs r0, 0x3 movs r0, 0x3
_0814F584: _0814F584:
bl sub_81D572C bl sub_81D572C
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
b _0814F5C0 b _0814F5C0
.pool .pool
_0814F594: _0814F594:
@@ -2437,7 +2437,7 @@ _0814F706:
adds r0, r6, 0 adds r0, r6, 0
mov r1, r8 mov r1, r8
movs r2, 0 movs r2, 0
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r0, r5, 0x3 adds r0, r5, 0x3
ldrb r4, [r4, 0x1] ldrb r4, [r4, 0x1]
adds r5, r0, r4 adds r5, r0, r4
@@ -2487,13 +2487,13 @@ _0814F768:
beq _0814F788 beq _0814F788
ldr r1, =gUnknown_085CBD8B ldr r1, =gUnknown_085CBD8B
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
b _0814F790 b _0814F790
.pool .pool
_0814F788: _0814F788:
ldr r1, =gUnknown_085CBD85 ldr r1, =gUnknown_085CBD85
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
_0814F790: _0814F790:
adds r0, r5, r7 adds r0, r5, r7
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
@@ -2506,10 +2506,10 @@ _0814F790:
bl pokemon_getattr bl pokemon_getattr
_0814F7A4: _0814F7A4:
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
adds r0, r6, 0 adds r0, r6, 0
mov r1, sp mov r1, sp
bl AppendString bl StringAppend
b _0814F8DE b _0814F8DE
.pool .pool
_0814F7BC: _0814F7BC:
@@ -2558,7 +2558,7 @@ _0814F808:
bl pokemon_getattr bl pokemon_getattr
_0814F81A: _0814F81A:
adds r0, r6, 0 adds r0, r6, 0
bl GetStringEnd_Limit7 bl StringGetEnd10
b _0814F8DE b _0814F8DE
.pool .pool
_0814F828: _0814F828:
@@ -2580,7 +2580,7 @@ _0814F846:
adds r1, r0 adds r1, r0
_0814F848: _0814F848:
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
adds r5, 0x2 adds r5, 0x2
b _0814F8E0 b _0814F8E0
.pool .pool
@@ -2617,7 +2617,7 @@ _0814F858:
ldr r0, =gUnknown_02024404 ldr r0, =gUnknown_02024404
adds r1, r0 adds r1, r0
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
ldr r1, =gUnknown_085CC0AD ldr r1, =gUnknown_085CC0AD
b _0814F8BE b _0814F8BE
.pool .pool
@@ -2625,7 +2625,7 @@ _0814F8BC:
ldr r1, =gUnknown_085CC0A0 ldr r1, =gUnknown_085CC0A0
_0814F8BE: _0814F8BE:
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
b _0814F8DE b _0814F8DE
.pool .pool
_0814F8CC: _0814F8CC:
@@ -2681,7 +2681,7 @@ _0814F918:
bgt _0814F938 bgt _0814F938
ldr r1, =gUnknown_085CCBB5 ldr r1, =gUnknown_085CCBB5
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
b _0814F944 b _0814F944
.pool .pool
_0814F938: _0814F938:
@@ -2689,7 +2689,7 @@ _0814F938:
bgt _0814F944 bgt _0814F944
ldr r1, =gUnknown_085CCBB9 ldr r1, =gUnknown_085CCBB9
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
_0814F944: _0814F944:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -2759,13 +2759,13 @@ _0814F9C8:
ldr r1, =gUnknown_085CBDBD ldr r1, =gUnknown_085CBDBD
_0814F9CA: _0814F9CA:
adds r0, r3, 0 adds r0, r3, 0
bl CopyString bl StringCopy
b _0814F9E0 b _0814F9E0
.pool .pool
_0814F9D8: _0814F9D8:
ldr r1, =gUnknown_085CBDBF ldr r1, =gUnknown_085CBDBF
adds r0, r3, 0 adds r0, r3, 0
bl CopyString bl StringCopy
_0814F9E0: _0814F9E0:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
+32 -32
View File
@@ -80,7 +80,7 @@ _0813C014:
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
movs r2, 0x7 movs r2, 0x7
bl CompareString_LimitN bl StringCompareN
cmp r0, 0 cmp r0, 0
bne _0813C02C bne _0813C02C
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
@@ -307,7 +307,7 @@ sub_813C170: @ 813C170
adds r0, r4, 0 adds r0, r4, 0
mov r1, r8 mov r1, r8
movs r2, 0x7 movs r2, 0x7
bl CopyString_LimitN bl StringCopyN
strh r7, [r4, 0x8] strh r7, [r4, 0x8]
adds r2, r6, 0 adds r2, r6, 0
adds r2, 0x54 adds r2, 0x54
@@ -339,7 +339,7 @@ _0813C1D4:
thumb_func_start sub_813C1F8 thumb_func_start sub_813C1F8
sub_813C1F8: @ 813C1F8 sub_813C1F8: @ 813C1F8
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003150 ldr r1, =0x00003150
adds r0, r1 adds r0, r1
@@ -433,7 +433,7 @@ sub_813C2A0: @ 813C2A0
beq _0813C2DA beq _0813C2DA
adds r0, r4, 0 adds r0, r4, 0
bl sub_813C264 bl sub_813C264
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003150 ldr r1, =0x00003150
adds r0, r1 adds r0, r1
@@ -463,34 +463,34 @@ _0813C2DA:
sub_813C2F4: @ 813C2F4 sub_813C2F4: @ 813C2F4
push {r4,lr} push {r4,lr}
sub sp, 0xC sub sp, 0xC
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
movs r0, 0x17 movs r0, 0x17
bl sub_80847F8 bl sub_80847F8
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021DC4 ldr r4, =gStringVar2
movs r0, 0x18 movs r0, 0x18
bl sub_80847F8 bl sub_80847F8
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021EC4 ldr r4, =gStringVar3
movs r0, 0x19 movs r0, 0x19
bl sub_80847F8 bl sub_80847F8
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EF6A1 ldr r1, =gUnknown_085EF6A1
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xD0 movs r2, 0xD0
@@ -576,17 +576,17 @@ sub_813C384: @ 813C384
b _0813C4A8 b _0813C4A8
.pool .pool
_0813C40C: _0813C40C:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r1, 0x8 movs r1, 0x8
bl RepeatStringTerminator bl StringFillWithTerminator
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
adds r1, r6, 0 adds r1, r6, 0
movs r2, 0x7 movs r2, 0x7
bl CopyString_LimitN bl StringCopyN
lsls r1, r5, 24 lsls r1, r5, 24
lsrs r1, 24 lsrs r1, 24
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
ldr r0, =gUnknown_0203AB74 ldr r0, =gUnknown_0203AB74
mov r8, r0 mov r8, r0
ldrb r0, [r0] ldrb r0, [r0]
@@ -599,49 +599,49 @@ _0813C40C:
str r5, [sp, 0x4] str r5, [sp, 0x4]
str r5, [sp, 0x8] str r5, [sp, 0x8]
movs r1, 0x1 movs r1, 0x1
ldr r2, =gUnknown_02021CC4 ldr r2, =gStringVar1
movs r3, 0x8 movs r3, 0x8
bl Print bl Print
ldrh r1, [r6, 0xA] ldrh r1, [r6, 0xA]
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r2, 0x1 movs r2, 0x1
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
mov r1, r8 mov r1, r8
ldrb r0, [r1] ldrb r0, [r1]
str r4, [sp] str r4, [sp]
str r5, [sp, 0x4] str r5, [sp, 0x4]
str r5, [sp, 0x8] str r5, [sp, 0x8]
movs r1, 0x1 movs r1, 0x1
ldr r2, =gUnknown_02021CC4 ldr r2, =gStringVar1
movs r3, 0x50 movs r3, 0x50
bl Print bl Print
ldrh r1, [r6, 0xC] ldrh r1, [r6, 0xC]
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r2, 0x1 movs r2, 0x1
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
mov r1, r8 mov r1, r8
ldrb r0, [r1] ldrb r0, [r1]
str r4, [sp] str r4, [sp]
str r5, [sp, 0x4] str r5, [sp, 0x4]
str r5, [sp, 0x8] str r5, [sp, 0x8]
movs r1, 0x1 movs r1, 0x1
ldr r2, =gUnknown_02021CC4 ldr r2, =gStringVar1
movs r3, 0x80 movs r3, 0x80
bl Print bl Print
ldrh r1, [r6, 0xE] ldrh r1, [r6, 0xE]
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r2, 0x1 movs r2, 0x1
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
mov r1, r8 mov r1, r8
ldrb r0, [r1] ldrb r0, [r1]
str r4, [sp] str r4, [sp]
str r5, [sp, 0x4] str r5, [sp, 0x4]
str r5, [sp, 0x8] str r5, [sp, 0x8]
movs r1, 0x1 movs r1, 0x1
ldr r2, =gUnknown_02021CC4 ldr r2, =gStringVar1
movs r3, 0xB0 movs r3, 0xB0
bl Print bl Print
_0813C4A8: _0813C4A8:
@@ -671,10 +671,10 @@ sub_813C4BC: @ 813C4BC
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0x11 movs r1, 0x11
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085EF68D ldr r1, =gUnknown_085EF68D
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0xD0 movs r2, 0xD0
@@ -690,7 +690,7 @@ sub_813C4BC: @ 813C4BC
str r4, [sp, 0x8] str r4, [sp, 0x8]
adds r2, r5, 0 adds r2, r5, 0
bl Print bl Print
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r8, r0 mov r8, r0
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003150 ldr r1, =0x00003150
@@ -699,7 +699,7 @@ sub_813C4BC: @ 813C4BC
bl sub_813C2F4 bl sub_813C2F4
ldr r1, =gUnknown_085EF6BD ldr r1, =gUnknown_085EF6BD
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0x29 movs r1, 0x29
str r1, [sp] str r1, [sp]
+16 -16
View File
@@ -775,7 +775,7 @@ _080B0CF2:
movs r0, 0x4 movs r0, 0x4
b _080B0D1A b _080B0D1A
_080B0CF6: _080B0CF6:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrh r1, [r0, 0x4] ldrh r1, [r0, 0x4]
movs r0, 0xE0 movs r0, 0xE0
@@ -1290,7 +1290,7 @@ _080B10C8:
b _080B1112 b _080B1112
.pool .pool
_080B10EC: _080B10EC:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r2, =0x00000cb2 ldr r2, =0x00000cb2
adds r0, r1, r2 adds r0, r1, r2
@@ -1673,7 +1673,7 @@ battle_80801F0: @ 80B13F8
strh r1, [r0] strh r1, [r0]
lsls r0, r1, 24 lsls r0, r1, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -2633,11 +2633,11 @@ _080B1CBC:
ldr r0, =gUnknown_02038BDC ldr r0, =gUnknown_02038BDC
ldr r0, [r0] ldr r0, [r0]
_080B1CC0: _080B1CC0:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
bl ReturnEmptyStringIfNull bl ReturnEmptyStringIfNull
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -2648,13 +2648,13 @@ _080B1CC0:
thumb_func_start sub_80B1CE0 thumb_func_start sub_80B1CE0
sub_80B1CE0: @ 80B1CE0 sub_80B1CE0: @ 80B1CE0
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r0, =gUnknown_02038BE0 ldr r0, =gUnknown_02038BE0
ldr r0, [r0] ldr r0, [r0]
bl ReturnEmptyStringIfNull bl ReturnEmptyStringIfNull
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -2801,7 +2801,7 @@ _080B1DCE:
cmp r0, 0 cmp r0, 0
bne _080B1DCA bne _080B1DCA
_080B1DE2: _080B1DE2:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x000009ca ldr r1, =0x000009ca
adds r0, r1 adds r0, r1
@@ -2841,7 +2841,7 @@ _080B1E1A:
bl sub_80B1D94 bl sub_80B1D94
cmp r0, 0 cmp r0, 0
bne _080B1E74 bne _080B1E74
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x000009ca ldr r1, =0x000009ca
adds r0, r1 adds r0, r1
@@ -2920,7 +2920,7 @@ sub_80B1EC0: @ 80B1EC0
movs r1, 0 movs r1, 0
adds r3, r0, 0 adds r3, r0, 0
adds r3, 0xA adds r3, 0xA
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
_080B1ED2: _080B1ED2:
ldrh r0, [r3] ldrh r0, [r3]
cmp r0, r4 cmp r0, r4
@@ -2994,7 +2994,7 @@ sub_80B1F38: @ 80B1F38
beq _080B1F6C beq _080B1F6C
cmp r1, 0x63 cmp r1, 0x63
bgt _080B1F6C bgt _080B1F6C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x000009ca ldr r2, =0x000009ca
adds r0, r2 adds r0, r2
@@ -3025,7 +3025,7 @@ sub_80B1F74: @ 80B1F74
beq _080B1FA8 beq _080B1FA8
cmp r1, 0x63 cmp r1, 0x63
bgt _080B1FA8 bgt _080B1FA8
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x000009ca ldr r2, =0x000009ca
adds r0, r2 adds r0, r2
@@ -3153,7 +3153,7 @@ sub_80B205C: @ 80B205C
negs r0, r0 negs r0, r0
cmp r1, r0 cmp r1, r0
beq _080B207E beq _080B207E
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x000009ca ldr r2, =0x000009ca
adds r0, r2 adds r0, r2
@@ -3284,7 +3284,7 @@ sub_80B215C: @ 80B215C
bl sub_80B2128 bl sub_80B2128
cmp r0, 0 cmp r0, 0
beq _080B2184 beq _080B2184
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x000009c8 ldr r2, =0x000009c8
adds r1, r0, r2 adds r1, r0, r2
@@ -3309,7 +3309,7 @@ sub_80B2188: @ 80B2188
bl sub_80B2128 bl sub_80B2128
cmp r0, 0 cmp r0, 0
beq _080B21AC beq _080B21AC
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x000009c8 ldr r1, =0x000009c8
adds r0, r1 adds r0, r1
@@ -3342,7 +3342,7 @@ sub_80B21B4: @ 80B21B4
bl sub_80B1DFC bl sub_80B1DFC
cmp r0, 0x1 cmp r0, 0x1
bne _080B21E0 bne _080B21E0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x000009c8 ldr r1, =0x000009c8
adds r0, r1 adds r0, r1
+2 -2
View File
@@ -3575,7 +3575,7 @@ sub_8147C24: @ 8147C24
movs r2, 0x20 movs r2, 0x20
bl gpu_pal_apply bl gpu_pal_apply
ldr r1, =gUnknown_085C8FF0 ldr r1, =gUnknown_085C8FF0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
lsls r0, 2 lsls r0, 2
@@ -4293,7 +4293,7 @@ sub_8148218: @ 8148218
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
bl sub_806F000 bl sub_806F000
+16 -16
View File
@@ -12,7 +12,7 @@ sub_80E15B8: @ 80E15B8
mov r1, sp mov r1, sp
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x000031f8 ldr r0, =0x000031f8
adds r1, r0 adds r1, r0
@@ -29,7 +29,7 @@ sub_80E15B8: @ 80E15B8
sub_80E15E4: @ 80E15E4 sub_80E15E4: @ 80E15E4
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x000031f8 ldr r1, =0x000031f8
adds r3, r0, r1 adds r3, r0, r1
@@ -69,7 +69,7 @@ _080E1618:
thumb_func_start sub_80E162C thumb_func_start sub_80E162C
sub_80E162C: @ 80E162C sub_80E162C: @ 80E162C
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r1, [r4] ldr r1, [r4]
ldr r2, =0x0000320c ldr r2, =0x0000320c
adds r0, r1, r2 adds r0, r1, r2
@@ -112,7 +112,7 @@ GetBerryInfo: @ 80E167C
bl sub_80E162C bl sub_80E162C
cmp r0, 0 cmp r0, 0
beq _080E16A0 beq _080E16A0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x000031f8 ldr r1, =0x000031f8
b _080E16B4 b _080E16B4
@@ -141,7 +141,7 @@ _080E16B4:
@ struct BerryTreeInfo *GetBerryTreeInfo(u8 berryTreeId) @ struct BerryTreeInfo *GetBerryTreeInfo(u8 berryTreeId)
GetBerryTreeInfo: @ 80E16C0 GetBerryTreeInfo: @ 80E16C0
lsls r0, 24 lsls r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
lsrs r0, 21 lsrs r0, 21
ldr r2, =0x0000169c ldr r2, =0x0000169c
adds r0, r2 adds r0, r2
@@ -261,7 +261,7 @@ _080E178E:
RemoveAllBerryTrees: @ 80E1794 RemoveAllBerryTrees: @ 80E1794
push {r4-r6,lr} push {r4-r6,lr}
movs r2, 0 movs r2, 0
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
ldr r5, =0x0000169c ldr r5, =0x0000169c
ldr r0, =gUnknown_0858ABD0 ldr r0, =gUnknown_0858ABD0
ldr r3, [r0] ldr r3, [r0]
@@ -378,7 +378,7 @@ BerryTreeTimeUpdate: @ 80E1870
adds r6, r0, 0 adds r6, r0, 0
movs r2, 0 movs r2, 0
_080E1876: _080E1876:
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
lsls r0, r2, 3 lsls r0, r2, 3
ldr r3, =0x0000169c ldr r3, =0x0000169c
adds r0, r3 adds r0, r3
@@ -518,7 +518,7 @@ _080E197A:
@ void RemoveBerryTree(u8 berryTreeId) @ void RemoveBerryTree(u8 berryTreeId)
RemoveBerryTree: @ 80E1984 RemoveBerryTree: @ 80E1984
lsls r0, 24 lsls r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
lsrs r0, 21 lsrs r0, 21
adds r2, r0 adds r2, r0
@@ -537,7 +537,7 @@ RemoveBerryTree: @ 80E1984
@ u8 GetBerryTypeByBerryTreeId(u8 berryTreeId) @ u8 GetBerryTypeByBerryTreeId(u8 berryTreeId)
GetBerryTypeByBerryTreeId: @ 80E19AC GetBerryTypeByBerryTreeId: @ 80E19AC
lsls r0, 24 lsls r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
lsrs r0, 21 lsrs r0, 21
adds r1, r0 adds r1, r0
@@ -552,7 +552,7 @@ GetBerryTypeByBerryTreeId: @ 80E19AC
@ u8 GetStageByBerryTreeId(u8 berryTreeId) @ u8 GetStageByBerryTreeId(u8 berryTreeId)
GetStageByBerryTreeId: @ 80E19C8 GetStageByBerryTreeId: @ 80E19C8
lsls r0, 24 lsls r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
lsrs r0, 21 lsrs r0, 21
adds r1, r0 adds r1, r0
@@ -793,7 +793,7 @@ CalcBerryYield: @ 80E1B38
@ u8 GetBerryCountByBerryTreeId(u8 berryTreeId) @ u8 GetBerryCountByBerryTreeId(u8 berryTreeId)
GetBerryCountByBerryTreeId: @ 80E1B64 GetBerryCountByBerryTreeId: @ 80E1B64
lsls r0, 24 lsls r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
lsrs r0, 21 lsrs r0, 21
adds r1, r0 adds r1, r0
@@ -838,7 +838,7 @@ FieldObjectInteractionGetBerryTreeData: @ 80E1B94
bl ResetBerryTreeSparkleFlag bl ResetBerryTreeSparkleFlag
ldr r0, =gUnknown_020375F2 ldr r0, =gUnknown_020375F2
ldrb r0, [r0] ldrb r0, [r0]
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -871,7 +871,7 @@ _080E1BEE:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4] strh r0, [r4]
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
ldrh r2, [r4] ldrh r2, [r4]
adds r0, r6, 0 adds r0, r6, 0
bl GetBerryCountStringByBerryType bl GetBerryCountStringByBerryType
@@ -893,7 +893,7 @@ FieldObjectInteractionGetBerryName: @ 80E1C2C
bl GetBerryTypeByBerryTreeId bl GetBerryTypeByBerryTreeId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl GetBerryNameByBerryType bl GetBerryNameByBerryType
pop {r0} pop {r0}
bx r0 bx r0
@@ -920,7 +920,7 @@ FieldObjectInteractionGetBerryCountString: @ 80E1C54
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 24 lsls r2, 24
lsrs r2, 24 lsrs r2, 24
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
adds r0, r5, 0 adds r0, r5, 0
bl GetBerryCountStringByBerryType bl GetBerryCountStringByBerryType
pop {r4,r5} pop {r4,r5}
@@ -1013,7 +1013,7 @@ FieldObjectInteractionRemoveBerryTree: @ 80E1D28
bl RemoveBerryTree bl RemoveBerryTree
ldr r0, =gUnknown_020375F2 ldr r0, =gUnknown_020375F2
ldrb r0, [r0] ldrb r0, [r0]
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
+70 -70
View File
@@ -771,7 +771,7 @@ sub_807FE14: @ 807FE14
strh r5, [r6] strh r5, [r6]
adds r0, r6, 0x2 adds r0, r6, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl CopyString bl StringCopy
ldrb r0, [r4, 0x15] ldrb r0, [r4, 0x15]
strb r0, [r6, 0x9] strb r0, [r6, 0x9]
ldrb r0, [r4, 0x16] ldrb r0, [r4, 0x16]
@@ -821,10 +821,10 @@ _0807FE7C:
movs r1, 0x2 movs r1, 0x2
strb r1, [r0] strb r1, [r0]
ldr r4, =gUnknown_020229F0 ldr r4, =gUnknown_020229F0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
movs r0, 0xD0 movs r0, 0xD0
lsls r0, 2 lsls r0, 2
bl FlagGet bl FlagGet
@@ -835,7 +835,7 @@ _0807FE7C:
adds r0, 0x1C adds r0, 0x1C
ldr r1, =gUnknown_083397D0 ldr r1, =gUnknown_083397D0
ldr r1, [r1, 0xC] ldr r1, [r1, 0xC]
bl CopyString bl StringCopy
b _0807FED4 b _0807FED4
.pool .pool
_0807FEC8: _0807FEC8:
@@ -843,7 +843,7 @@ _0807FEC8:
adds r0, 0x1C adds r0, 0x1C
ldr r1, =gUnknown_083397D0 ldr r1, =gUnknown_083397D0
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
_0807FED4: _0807FED4:
ldr r1, =gUnknown_020229E8 ldr r1, =gUnknown_020229E8
movs r0, 0x2 movs r0, 0x2
@@ -860,19 +860,19 @@ _0807FEE8:
movs r1, 0x3 movs r1, 0x3
strb r1, [r0] strb r1, [r0]
ldr r6, =gUnknown_020229F0 ldr r6, =gUnknown_020229F0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x1C adds r0, 0x1C
ldr r4, =gUnknown_083397D0 ldr r4, =gUnknown_083397D0
ldr r1, [r4, 0x10] ldr r1, [r4, 0x10]
bl CopyString bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x38 adds r0, 0x38
ldr r1, [r4, 0x8] ldr r1, [r4, 0x8]
bl CopyString bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
subs r0, 0x8 subs r0, 0x8
strh r5, [r0, 0x1A] strh r5, [r0, 0x1A]
@@ -890,23 +890,23 @@ _0807FF3C:
movs r1, 0x4 movs r1, 0x4
strb r1, [r0] strb r1, [r0]
ldr r5, =gUnknown_020229F0 ldr r5, =gUnknown_020229F0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r0, r5, 0 adds r0, r5, 0
bl CopyString bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x1C adds r0, 0x1C
ldr r4, =gUnknown_083397D0 ldr r4, =gUnknown_083397D0
ldr r1, [r4, 0x14] ldr r1, [r4, 0x14]
bl CopyString bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x38 adds r0, 0x38
ldr r1, [r4, 0x4] ldr r1, [r4, 0x4]
bl CopyString bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x54 adds r0, 0x54
ldr r1, [r4, 0x8] ldr r1, [r4, 0x8]
bl CopyString bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
subs r0, 0x8 subs r0, 0x8
movs r1, 0x2 movs r1, 0x2
@@ -1938,7 +1938,7 @@ _080807E4:
ldr r0, =gUnknown_020229F0 ldr r0, =gUnknown_020229F0
adds r1, r0 adds r1, r0
add r0, sp, 0x8 add r0, sp, 0x8
bl CopyString bl StringCopy
movs r0, 0x1 movs r0, 0x1
add r1, sp, 0x8 add r1, sp, 0x8
movs r2, 0x38 movs r2, 0x38
@@ -3652,7 +3652,7 @@ _0808175A:
ldrb r0, [r1] ldrb r0, [r1]
cmp r0, 0 cmp r0, 0
bne _0808182C bne _0808182C
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x2 cmp r0, 0x2
@@ -3883,7 +3883,7 @@ help_system_is_not_first_time: @ 8081964
bne _080819A2 bne _080819A2
adds r0, r4, 0x2 adds r0, r4, 0x2
adds r1, r5, 0x2 adds r1, r5, 0x2
bl CompareString bl StringCompare
cmp r0, 0 cmp r0, 0
bne _080819B0 bne _080819B0
ldr r0, [r4, 0x8] ldr r0, [r4, 0x8]
@@ -5544,7 +5544,7 @@ _080826EC:
adds r0, 0x63 adds r0, 0x63
movs r1, 0x3 movs r1, 0x3
strb r1, [r0] strb r1, [r0]
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x6E adds r0, 0x6E
ldrh r0, [r0] ldrh r0, [r0]
@@ -5554,7 +5554,7 @@ _080826EC:
ldr r0, =gUnknown_020229F0 ldr r0, =gUnknown_020229F0
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
ldr r1, =gUnknown_083398DD ldr r1, =gUnknown_083398DD
b _08082740 b _08082740
.pool .pool
@@ -5564,7 +5564,7 @@ _0808271C:
ldrb r0, [r1] ldrb r0, [r1]
adds r0, 0x1 adds r0, 0x1
strb r0, [r1] strb r0, [r1]
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x6E adds r0, 0x6E
ldrh r0, [r0] ldrh r0, [r0]
@@ -5574,18 +5574,18 @@ _0808271C:
ldr r0, =gUnknown_020229F0 ldr r0, =gUnknown_020229F0
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
ldr r1, =gUnknown_083398B0 ldr r1, =gUnknown_083398B0
_08082740: _08082740:
adds r0, r4, 0 adds r0, r4, 0
bl AppendString bl StringAppend
b _080828DC b _080828DC
.pool .pool
_08082754: _08082754:
ldr r4, [r6] ldr r4, [r6]
ldr r0, =0x000011b8 ldr r0, =0x000011b8
adds r4, r0 adds r4, r0
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
bl sav2_get_text_speed bl sav2_get_text_speed
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 24 lsls r2, 24
@@ -5855,9 +5855,9 @@ _080829AA:
ldr r1, =0x000011b8 ldr r1, =0x000011b8
adds r0, r1 adds r0, r1
strh r2, [r0] strh r2, [r0]
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08339896 ldr r1, =gUnknown_08339896
bl CopyString bl StringCopy
b _08082A92 b _08082A92
.pool .pool
_080829D4: _080829D4:
@@ -5871,16 +5871,16 @@ _080829D4:
ldr r1, =0x000011b8 ldr r1, =0x000011b8
adds r0, r1 adds r0, r1
strh r2, [r0] strh r2, [r0]
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08339858 ldr r1, =gUnknown_08339858
bl CopyString bl StringCopy
b _08082A92 b _08082A92
.pool .pool
_08082A00: _08082A00:
ldr r4, [r6] ldr r4, [r6]
ldr r2, =0x000011b8 ldr r2, =0x000011b8
adds r4, r2 adds r4, r2
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
bl sav2_get_text_speed bl sav2_get_text_speed
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 24 lsls r2, 24
@@ -7155,7 +7155,7 @@ sub_80833F8: @ 80833F8
@ void UpdateBerryBlenderRecord() @ void UpdateBerryBlenderRecord()
UpdateBerryBlenderRecord: @ 8083418 UpdateBerryBlenderRecord: @ 8083418
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldr r0, =gUnknown_020322A4 ldr r0, =gUnknown_020322A4
ldr r1, [r0] ldr r1, [r0]
@@ -7326,15 +7326,15 @@ _08083564:
mov r1, r8 mov r1, r8
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339941 ldr r1, =gUnknown_08339941
bl AppendString bl StringAppend
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_085E8D5E ldr r1, =gUnknown_085E8D5E
bl AppendString bl StringAppend
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
lsls r4, r5, 3 lsls r4, r5, 3
@@ -7342,7 +7342,7 @@ _08083564:
lsls r4, 2 lsls r4, 2
ldr r3, =gUnknown_020229F0 ldr r3, =gUnknown_020229F0
adds r1, r4, r3 adds r1, r4, r3
bl AppendString bl StringAppend
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x9F adds r1, 0x9F
mov r0, r9 mov r0, r9
@@ -7365,17 +7365,17 @@ _08083564:
lsls r1, 1 lsls r1, 1
adds r5, r1 adds r5, r1
adds r1, r5, 0 adds r1, r5, 0
bl CopyString bl StringCopy
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r2, =gUnknown_020229E8 ldr r2, =gUnknown_020229E8
adds r4, r2 adds r4, r2
ldrb r1, [r4, 0x1A] ldrb r1, [r4, 0x1A]
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339914 ldr r1, =gUnknown_08339914
bl AppendString bl StringAppend
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x9F adds r1, 0x9F
movs r3, 0xFF movs r3, 0xFF
@@ -7422,11 +7422,11 @@ _0808361A:
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339941 ldr r1, =gUnknown_08339941
bl AppendString bl StringAppend
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x4E adds r0, 0x4E
ldrh r0, [r0] ldrh r0, [r0]
@@ -7438,15 +7438,15 @@ _0808361A:
ldr r0, [sp, 0x48] ldr r0, [sp, 0x48]
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, [sp, 0x48] ldr r1, [sp, 0x48]
bl AppendString bl StringAppend
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_0833993C ldr r1, =gUnknown_0833993C
bl AppendString bl StringAppend
ldr r1, [r6] ldr r1, [r6]
adds r1, 0x9F adds r1, 0x9F
movs r0, 0x1 movs r0, 0x1
@@ -7496,19 +7496,19 @@ _0808361A:
adds r0, r5, 0 adds r0, r5, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339921 ldr r1, =gUnknown_08339921
bl AppendString bl StringAppend
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339928 ldr r1, =gUnknown_08339928
bl AppendString bl StringAppend
ldr r1, [r6] ldr r1, [r6]
adds r1, 0x9F adds r1, 0x9F
movs r0, 0x1 movs r0, 0x1
@@ -7681,13 +7681,13 @@ sub_80838AC: @ 80838AC
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
ldr r1, =gUnknown_0833979D ldr r1, =gUnknown_0833979D
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
ldr r1, =gUnknown_08339943 ldr r1, =gUnknown_08339943
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
adds r0, r5, 0 adds r0, r5, 0
bl sub_8136EA4 bl sub_8136EA4
adds r4, r0, 0 adds r4, r0, 0
@@ -7700,32 +7700,32 @@ sub_80838AC: @ 80838AC
lsrs r5, 24 lsrs r5, 24
ldr r1, =gUnknown_0833994F ldr r1, =gUnknown_0833994F
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
mov r0, sp mov r0, sp
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r0, r6, 0 adds r0, r6, 0
mov r1, sp mov r1, sp
bl AppendString bl StringAppend
ldr r1, =gUnknown_0833995D ldr r1, =gUnknown_0833995D
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
mov r0, sp mov r0, sp
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r0, r6, 0 adds r0, r6, 0
mov r1, sp mov r1, sp
bl AppendString bl StringAppend
ldr r1, =gUnknown_08339970 ldr r1, =gUnknown_08339970
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
ldr r1, =gUnknown_0833979B ldr r1, =gUnknown_0833979B
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
add sp, 0xC add sp, 0xC
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -8158,15 +8158,15 @@ _08083C84:
mov r1, r8 mov r1, r8
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339941 ldr r1, =gUnknown_08339941
bl AppendString bl StringAppend
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_085E8D5E ldr r1, =gUnknown_085E8D5E
bl AppendString bl StringAppend
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
lsls r1, r5, 3 lsls r1, r5, 3
@@ -8174,7 +8174,7 @@ _08083C84:
lsls r1, 2 lsls r1, 2
ldr r2, =gUnknown_020229F0 ldr r2, =gUnknown_020229F0
adds r1, r2 adds r1, r2
bl AppendString bl StringAppend
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x9F adds r1, 0x9F
ldr r0, [sp, 0x8] ldr r0, [sp, 0x8]
@@ -8201,7 +8201,7 @@ _08083C84:
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x9F adds r1, 0x9F
mov r3, r10 mov r3, r10
@@ -8222,7 +8222,7 @@ _08083C84:
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x9F adds r1, 0x9F
mov r3, r10 mov r3, r10
@@ -8243,7 +8243,7 @@ _08083C84:
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x9F adds r1, 0x9F
mov r3, r10 mov r3, r10
@@ -8379,7 +8379,7 @@ ShowBerryBlenderRecordWindow: @ 8083E24
movs r7, 0xA4 movs r7, 0xA4
lsls r7, 22 lsls r7, 22
_08083E8A: _08083E8A:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
lsls r1, r6, 1 lsls r1, r6, 1
ldr r2, =0x000009bc ldr r2, =0x000009bc
@@ -8393,10 +8393,10 @@ _08083E8A:
add r0, sp, 0xC add r0, sp, 0xC
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r5, r0, 0 adds r5, r0, 0
ldr r1, =gUnknown_08339941 ldr r1, =gUnknown_08339941
bl AppendString bl StringAppend
adds r5, r0, 0 adds r5, r0, 0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x64 movs r1, 0x64
@@ -8405,10 +8405,10 @@ _08083E8A:
adds r0, r5, 0 adds r0, r5, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r5, r0, 0 adds r5, r0, 0
ldr r1, =gUnknown_0833993C ldr r1, =gUnknown_0833993C
bl AppendString bl StringAppend
movs r0, 0x1 movs r0, 0x1
add r1, sp, 0xC add r1, sp, 0xC
movs r2, 0x8C movs r2, 0x8C
@@ -8545,7 +8545,7 @@ sub_8083F94: @ 8083F94
ldr r5, =gUnknown_020229F0 ldr r5, =gUnknown_020229F0
adds r1, r5 adds r1, r5
adds r0, r7, 0 adds r0, r7, 0
bl CopyString bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
bl sub_81370B4 bl sub_81370B4
strb r0, [r7, 0xB] strb r0, [r7, 0xB]
@@ -8599,7 +8599,7 @@ _08084058:
ldr r5, =gUnknown_020229F0 ldr r5, =gUnknown_020229F0
adds r1, r5 adds r1, r5
adds r0, r7, 0 adds r0, r7, 0
bl CopyString bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
bl sub_81370B4 bl sub_81370B4
strb r0, [r7, 0xB] strb r0, [r7, 0xB]
+13 -13
View File
@@ -343,7 +343,7 @@ _08177F1C:
b _08177FD6 b _08177FD6
.pool .pool
_08177F3C: _08177F3C:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
cmp r0, 0 cmp r0, 0
@@ -562,20 +562,20 @@ sub_8178110: @ 8178110
ldrb r0, [r0] ldrb r0, [r0]
bl GetBerryInfo bl GetBerryInfo
adds r6, r0, 0 adds r6, r0, 0
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r1, [r5] ldr r1, [r5]
adds r1, r4 adds r1, r4
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
adds r1, r6, 0 adds r1, r6, 0
bl CopyString bl StringCopy
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9263 ldr r1, =gUnknown_085E9263
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
str r0, [sp, 0x4] str r0, [sp, 0x4]
@@ -641,20 +641,20 @@ _081781C8:
movs r1, 0x64 movs r1, 0x64
bl __udivsi3 bl __udivsi3
adds r5, r0, 0 adds r5, r0, 0
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9233 ldr r1, =gUnknown_085E9233
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
str r7, [sp] str r7, [sp]
str r6, [sp, 0x4] str r6, [sp, 0x4]
str r6, [sp, 0x8] str r6, [sp, 0x8]
+13 -13
View File
@@ -194,10 +194,10 @@ _080F992C:
adds r0, r5, 0 adds r0, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0x8 movs r3, 0x8
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r5, r0, 0 adds r5, r0, 0
ldr r1, _080F9980 ldr r1, _080F9980
bl AppendString bl StringAppend
adds r5, r0, 0 adds r5, r0, 0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xA movs r1, 0xA
@@ -206,7 +206,7 @@ _080F992C:
adds r0, r5, 0 adds r0, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -266,7 +266,7 @@ _080F99CC:
adds r0, r6, 0 adds r0, r6, 0
bl sub_80F989C bl sub_80F989C
adds r4, r0, 0 adds r4, r0, 0
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
adds r1, r5, 0 adds r1, r5, 0
bl sub_80F9910 bl sub_80F9910
cmp r5, r4 cmp r5, r4
@@ -297,29 +297,29 @@ sub_80F9A14: @ 80F9A14
adds r0, r4, 0 adds r0, r4, 0
bl sub_80F989C bl sub_80F989C
adds r1, r0, 0 adds r1, r0, 0
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
bl sub_80F9910 bl sub_80F9910
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r1, 0xB movs r1, 0xB
muls r1, r4 muls r1, r4
ldr r2, =gSpeciesNames ldr r2, =gSpeciesNames
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldrh r1, [r5] ldrh r1, [r5]
movs r0, 0x80 movs r0, 0x80
lsls r0, 8 lsls r0, 8
cmp r1, r0 cmp r1, r0
bne _080F9A64 bne _080F9A64
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECF6B ldr r1, =gUnknown_085ECF6B
bl CopyString bl StringCopy
b _080F9A6E b _080F9A6E
.pool .pool
_080F9A64: _080F9A64:
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
_080F9A6E: _080F9A6E:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -438,7 +438,7 @@ sub_80F9B30: @ 80F9B30
bhi _080F9BAC bhi _080F9BAC
cmp r5, 0x40 cmp r5, 0x40
bhi _080F9BAC bhi _080F9BAC
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x000031a8 ldr r1, =0x000031a8
adds r0, r1 adds r0, r1
+2 -2
View File
@@ -1945,7 +1945,7 @@ sub_8150D28: @ 8150D28
cmp r0, 0x1 cmp r0, 0x1
beq _08150E68 beq _08150E68
_08150D86: _08150D86:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
add r0, sp add r0, sp
@@ -2051,7 +2051,7 @@ _08150E68:
movs r2, 0x18 movs r2, 0x18
movs r3, 0x1A movs r3, 0x1A
bl CopyToBgTilemapBufferRect_ChangePalette bl CopyToBgTilemapBufferRect_ChangePalette
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
add r0, sp add r0, sp
+20 -20
View File
@@ -45,19 +45,19 @@ sub_80B23B0: @ 80B23B0
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 16 lsls r4, 16
lsrs r4, 16 lsrs r4, 16
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl SetStandardWindowBorderStyle bl SetStandardWindowBorderStyle
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085EE667 ldr r1, =gUnknown_085EE667
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x58 movs r2, 0x58
@@ -177,7 +177,7 @@ _080B24C8:
movs r0, 0x9 movs r0, 0x9
b _080B24F2 b _080B24F2
_080B24CC: _080B24CC:
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
bl sub_800ABAC bl sub_800ABAC
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
@@ -185,7 +185,7 @@ _080B24CC:
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r0, 0x4 movs r0, 0x4
b _080B24F2 b _080B24F2
.pool .pool
@@ -539,11 +539,11 @@ sub_80B275C: @ 80B275C
bl sub_800AA04 bl sub_800AA04
ldrh r0, [r7, 0xA] ldrh r0, [r7, 0xA]
bl sub_80B241C bl sub_80B241C
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_082780F2 ldr r0, =gUnknown_082780F2
bl box_related_two__3 bl box_related_two__3
mov r0, r9 mov r0, r9
@@ -888,10 +888,10 @@ sub_80B2AF4: @ 80B2AF4
str r1, [sp, 0x4] str r1, [sp, 0x4]
movs r2, 0 movs r2, 0
movs r7, 0 movs r7, 0
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
movs r0, 0xFF movs r0, 0xFF
strb r0, [r1] strb r0, [r1]
ldr r1, =gUnknown_02021DC4 ldr r1, =gStringVar2
movs r0, 0x1 movs r0, 0x1
negs r0, r0 negs r0, r0
strb r0, [r1] strb r0, [r1]
@@ -918,8 +918,8 @@ _080B2B2E:
mov r1, r10 mov r1, r10
muls r1, r0 muls r1, r0
add r1, r9 add r1, r9
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
bl CopyString bl StringCopy
movs r2, 0x1 movs r2, 0x1
_080B2B48: _080B2B48:
cmp r7, 0x1 cmp r7, 0x1
@@ -928,8 +928,8 @@ _080B2B48:
mov r1, r10 mov r1, r10
muls r1, r0 muls r1, r0
add r1, r9 add r1, r9
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
bl CopyString bl StringCopy
movs r2, 0x1 movs r2, 0x1
_080B2B5C: _080B2B5C:
adds r7, 0x1 adds r7, 0x1
@@ -1234,7 +1234,7 @@ _080B2DEC:
.pool .pool
_080B2E00: _080B2E00:
movs r3, 0x2 movs r3, 0x2
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00000ca9 ldr r1, =0x00000ca9
adds r0, r1 adds r0, r1
@@ -1555,7 +1555,7 @@ _080B30C8:
b _080B3124 b _080B3124
.pool .pool
_080B30D8: _080B30D8:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00000ca9 ldr r1, =0x00000ca9
adds r0, r1 adds r0, r1
@@ -2601,26 +2601,26 @@ sub_80B39D4: @ 80B39D4
lsrs r4, 24 lsrs r4, 24
ldr r0, =gUnknown_020375E4 ldr r0, =gUnknown_020375E4
strh r4, [r0] strh r4, [r0]
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
lsls r1, r4, 3 lsls r1, r4, 3
subs r1, r4 subs r1, r4
lsls r1, 2 lsls r1, 2
ldr r2, =gUnknown_020229F0 ldr r2, =gUnknown_020229F0
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
adds r0, r4, 0 adds r0, r4, 0
bl sub_80C4904 bl sub_80C4904
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
beq _080B3A28 beq _080B3A28
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r2, =gUnknown_0855059C ldr r2, =gUnknown_0855059C
subs r1, 0x1 subs r1, 0x1
lsls r1, 2 lsls r1, 2
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
movs r0, 0x1 movs r0, 0x1
b _080B3A2A b _080B3A2A
.pool .pool
+8 -8
View File
@@ -11,14 +11,14 @@ PrintCoinsString: @ 8145B54
push {r4,lr} push {r4,lr}
sub sp, 0xC sub sp, 0xC
adds r1, r0, 0 adds r1, r0, 0
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r2, 0x1 movs r2, 0x1
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DAB ldr r1, =gUnknown_085E8DAB
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x40 movs r2, 0x40
@@ -110,11 +110,11 @@ HideCoinsWindow: @ 8145C14
thumb_func_start GetCoins thumb_func_start GetCoins
@ u16 GetCoins() @ u16 GetCoins()
GetCoins: @ 8145C30 GetCoins: @ 8145C30
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00000494 ldr r0, =0x00000494
adds r1, r0 adds r1, r0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xAC adds r0, 0xAC
ldr r0, [r0] ldr r0, [r0]
@@ -131,9 +131,9 @@ GetCoins: @ 8145C30
SetCoins: @ 8145C58 SetCoins: @ 8145C58
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r1, [r1] ldr r1, [r1]
adds r1, 0xAC adds r1, 0xAC
ldr r1, [r1] ldr r1, [r1]
+120 -120
View File
@@ -1400,7 +1400,7 @@ sub_80D833C: @ 80D833C
ldr r1, =0x84000100 ldr r1, =0x84000100
str r1, [r0, 0x8] str r1, [r0, 0x8]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r1, =gUnknown_02039F34 ldr r1, =gUnknown_02039F34
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1] ldr r1, [r1]
@@ -1408,7 +1408,7 @@ sub_80D833C: @ 80D833C
adds r1, 0x1 adds r1, 0x1
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_02039F25 ldr r0, =gUnknown_02039F25
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80DBCA8 bl sub_80DBCA8
@@ -1417,19 +1417,19 @@ sub_80D833C: @ 80D833C
bne _080D83CC bne _080D83CC
ldr r0, =gUnknown_02022E2C ldr r0, =gUnknown_02022E2C
ldr r1, =gUnknown_0827D507 ldr r1, =gUnknown_0827D507
bl CopyString bl StringCopy
b _080D83D4 b _080D83D4
.pool .pool
_080D83CC: _080D83CC:
ldr r0, =gUnknown_02022E2C ldr r0, =gUnknown_02022E2C
ldr r1, =gUnknown_0827D531 ldr r1, =gUnknown_0827D531
bl CopyString bl StringCopy
_080D83D4: _080D83D4:
bl sub_80DB89C bl sub_80DB89C
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_02022E2C ldr r1, =gUnknown_02022E2C
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
@@ -1605,7 +1605,7 @@ _080D853C:
add r0, sp, 0x4 add r0, sp, 0x4
ldr r1, =gUnknown_085ED1A7 ldr r1, =gUnknown_085ED1A7
_080D8566: _080D8566:
bl CopyString bl StringCopy
adds r5, r0, 0 adds r5, r0, 0
_080D856C: _080D856C:
movs r0, 0xD movs r0, 0xD
@@ -1614,7 +1614,7 @@ _080D856C:
ldr r0, =gMoveNames ldr r0, =gMoveNames
adds r1, r0 adds r1, r0
adds r0, r5, 0 adds r0, r5, 0
bl CopyString bl StringCopy
adds r4, r6, 0x5 adds r4, r6, 0x5
lsls r0, r4, 24 lsls r0, r4, 24
lsrs r0, 24 lsrs r0, 24
@@ -1737,7 +1737,7 @@ _080D868E:
bl audio_play bl audio_play
movs r0, 0 movs r0, 0
bl sub_80DC490 bl sub_80DC490
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r1, =gUnknown_02039F34 ldr r1, =gUnknown_02039F34
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1] ldr r1, [r1]
@@ -1745,7 +1745,7 @@ _080D868E:
adds r1, 0x1 adds r1, 0x1
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_02039F25 ldr r0, =gUnknown_02039F25
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80DBCA8 bl sub_80DBCA8
@@ -1754,19 +1754,19 @@ _080D868E:
bne _080D86DC bne _080D86DC
ldr r0, =gUnknown_02022E2C ldr r0, =gUnknown_02022E2C
ldr r1, =gUnknown_0827D507 ldr r1, =gUnknown_0827D507
bl CopyString bl StringCopy
b _080D86E4 b _080D86E4
.pool .pool
_080D86DC: _080D86DC:
ldr r0, =gUnknown_02022E2C ldr r0, =gUnknown_02022E2C
ldr r1, =gUnknown_0827D531 ldr r1, =gUnknown_0827D531
bl CopyString bl StringCopy
_080D86E4: _080D86E4:
bl sub_80DB89C bl sub_80DB89C
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_02022E2C ldr r1, =gUnknown_02022E2C
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_80DEC30 bl sub_80DEC30
@@ -2622,11 +2622,11 @@ _080D8EC8:
bl _080DA100 bl _080DA100
_080D8EF2: _080D8EF2:
bl sub_80DB89C bl sub_80DB89C
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
lsls r1, r6, 6 lsls r1, r6, 6
ldr r2, =gUnknown_02039E02 ldr r2, =gUnknown_02039E02
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
mov r2, r9 mov r2, r9
ldr r0, [r2] ldr r0, [r2]
ldr r0, [r0, 0x4] ldr r0, [r0, 0x4]
@@ -2636,28 +2636,28 @@ _080D8EF2:
lsls r0, 1 lsls r0, 1
cmp r1, r0 cmp r1, r0
bhi _080D8F38 bhi _080D8F38
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
adds r2, r1, 0 adds r2, r1, 0
movs r1, 0xD movs r1, 0xD
muls r1, r2 muls r1, r2
ldr r2, =gMoveNames ldr r2, =gMoveNames
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
b _080D8F48 b _080D8F48
.pool .pool
_080D8F38: _080D8F38:
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r2, =gUnknown_08587F1C ldr r2, =gUnknown_08587F1C
ldrb r1, [r3, 0xA] ldrb r1, [r3, 0xA]
lsls r1, 2 lsls r1, 2
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
_080D8F48: _080D8F48:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827D55A ldr r1, =gUnknown_0827D55A
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
@@ -3560,15 +3560,15 @@ _080D96AE:
beq _080D96F6 beq _080D96F6
_080D96D4: _080D96D4:
bl sub_80DB89C bl sub_80DB89C
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
lsls r1, r6, 6 lsls r1, r6, 6
ldr r2, =gUnknown_02039E02 ldr r2, =gUnknown_02039E02
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827E793 ldr r1, =gUnknown_0827E793
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
@@ -3669,15 +3669,15 @@ _080D97BC:
.pool .pool
_080D97DC: _080D97DC:
bl sub_80DB89C bl sub_80DB89C
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
lsls r1, r6, 6 lsls r1, r6, 6
ldr r2, =gUnknown_02039E02 ldr r2, =gUnknown_02039E02
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827E2FE ldr r1, =gUnknown_0827E2FE
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
@@ -3807,15 +3807,15 @@ _080D9904:
cmp r0, 0 cmp r0, 0
beq _080D996C beq _080D996C
bl sub_80DB89C bl sub_80DB89C
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
lsls r1, r6, 6 lsls r1, r6, 6
ldr r2, =gUnknown_02039E02 ldr r2, =gUnknown_02039E02
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827E6E3 ldr r1, =gUnknown_0827E6E3
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
@@ -3965,17 +3965,17 @@ _080D9A56:
beq _080D9A94 beq _080D9A94
movs r4, 0x1 movs r4, 0x1
str r4, [sp] str r4, [sp]
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldrh r2, [r5, 0x6] ldrh r2, [r5, 0x6]
movs r1, 0xD movs r1, 0xD
muls r1, r2 muls r1, r2
ldr r2, =gMoveNames ldr r2, =gMoveNames
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
b _080D9AAE b _080D9AAE
.pool .pool
_080D9A94: _080D9A94:
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldr r3, =gUnknown_08587F08 ldr r3, =gUnknown_08587F08
ldr r2, =gContestMoves ldr r2, =gContestMoves
ldrh r1, [r5, 0x6] ldrh r1, [r5, 0x6]
@@ -3986,7 +3986,7 @@ _080D9A94:
lsrs r1, 27 lsrs r1, 27
adds r1, r3 adds r1, r3
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
_080D9AAE: _080D9AAE:
ldr r5, [sp] ldr r5, [sp]
lsls r0, r5, 24 lsls r0, r5, 24
@@ -4008,11 +4008,11 @@ _080D9AAE:
str r3, [sp] str r3, [sp]
_080D9AD2: _080D9AD2:
bl sub_80DB89C bl sub_80DB89C
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
lsls r1, r6, 6 lsls r1, r6, 6
ldr r2, =gUnknown_02039E02 ldr r2, =gUnknown_02039E02
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r4, =gUnknown_02039F34 ldr r4, =gUnknown_02039F34
ldr r0, [r4] ldr r0, [r4]
ldr r1, [r0] ldr r1, [r0]
@@ -4042,9 +4042,9 @@ _080D9B06:
_080D9B30: _080D9B30:
cmp r3, 0 cmp r3, 0
bge _080D9B48 bge _080D9B48
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_0827E73C ldr r1, =gUnknown_0827E73C
bl ExpandStringRefs bl StringExpandPlaceholders
b _080D9B74 b _080D9B74
.pool .pool
_080D9B48: _080D9B48:
@@ -4057,17 +4057,17 @@ _080D9B48:
asrs r0, 24 asrs r0, 24
cmp r0, 0x4 cmp r0, 0x4
bgt _080D9B6C bgt _080D9B6C
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_0827E717 ldr r1, =gUnknown_0827E717
bl ExpandStringRefs bl StringExpandPlaceholders
b _080D9B74 b _080D9B74
.pool .pool
_080D9B6C: _080D9B6C:
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_0827E76A ldr r1, =gUnknown_0827E76A
bl ExpandStringRefs bl StringExpandPlaceholders
_080D9B74: _080D9B74:
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
ldr r1, =gTasks ldr r1, =gTasks
@@ -4373,7 +4373,7 @@ _080D9DC2:
.pool .pool
_080D9DD4: _080D9DD4:
bl sub_80DB89C bl sub_80DB89C
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldr r5, =gUnknown_02039F34 ldr r5, =gUnknown_02039F34
ldr r1, [r5] ldr r1, [r5]
ldr r1, [r1, 0x10] ldr r1, [r1, 0x10]
@@ -4383,12 +4383,12 @@ _080D9DD4:
lsls r1, 6 lsls r1, 6
ldr r4, =gUnknown_02039E02 ldr r4, =gUnknown_02039E02
adds r1, r4 adds r1, r4
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
lsls r1, r6, 6 lsls r1, r6, 6
adds r1, r4 adds r1, r4
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r1, [r5] ldr r1, [r5]
ldr r2, [r1, 0x4] ldr r2, [r1, 0x4]
lsls r1, r6, 3 lsls r1, r6, 3
@@ -4400,11 +4400,11 @@ _080D9DD4:
muls r1, r2 muls r1, r2
ldr r2, =gMoveNames ldr r2, =gMoveNames
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827E7EA ldr r1, =gUnknown_0827E7EA
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
@@ -4425,10 +4425,10 @@ _080D9E60:
b _080DA100 b _080DA100
_080D9E6A: _080D9E6A:
bl sub_80DB89C bl sub_80DB89C
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827E817 ldr r1, =gUnknown_0827E817
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
@@ -4474,12 +4474,12 @@ _080D9EBC:
_080D9EDC: _080D9EDC:
adds r0, r6, 0 adds r0, r6, 0
bl sub_80DC9B4 bl sub_80DC9B4
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
lsls r1, r6, 6 lsls r1, r6, 6
ldr r2, =gUnknown_02039E02 ldr r2, =gUnknown_02039E02
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
mov r2, r9 mov r2, r9
ldr r1, [r2] ldr r1, [r2]
ldr r1, [r1, 0x4] ldr r1, [r1, 0x4]
@@ -4489,11 +4489,11 @@ _080D9EDC:
muls r1, r2 muls r1, r2
ldr r2, =gMoveNames ldr r2, =gMoveNames
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827E58A ldr r1, =gUnknown_0827E58A
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
@@ -4624,15 +4624,15 @@ _080DA024:
b _080DA100 b _080DA100
_080DA038: _080DA038:
bl sub_80DB89C bl sub_80DB89C
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
lsls r1, r6, 6 lsls r1, r6, 6
ldr r2, =gUnknown_02039E02 ldr r2, =gUnknown_02039E02
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827D56F ldr r1, =gUnknown_0827D56F
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
@@ -5093,19 +5093,19 @@ sub_80DA3CC: @ 80DA3CC
adds r0, r2 adds r0, r2
ldrb r4, [r0, 0x1A] ldrb r4, [r0, 0x1A]
bl sub_80DB89C bl sub_80DB89C
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldrb r1, [r5] ldrb r1, [r5]
lsls r1, 6 lsls r1, 6
ldr r2, =gUnknown_02039E02 ldr r2, =gUnknown_02039E02
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r0, =gUnknown_08587D90 ldr r0, =gUnknown_08587D90
lsls r4, 2 lsls r4, 2
adds r4, r0 adds r4, r0
ldr r1, [r4] ldr r1, [r4]
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
@@ -5372,10 +5372,10 @@ _080DA668:
ldr r0, =gUnknown_03005D80 ldr r0, =gUnknown_03005D80
ldr r0, [r0] ldr r0, [r0]
str r0, [r1] str r0, [r1]
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827D597 ldr r1, =gUnknown_0827D597
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
@@ -5651,10 +5651,10 @@ sub_80DA8C8: @ 80DA8C8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
ldr r6, =gUnknown_03005D90 ldr r6, =gSaveBlock2Ptr
ldr r1, [r6] ldr r1, [r6]
mov r0, sp mov r0, sp
bl CopyString bl StringCopy
ldr r0, =gUnknown_02039F2A ldr r0, =gUnknown_02039F2A
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x1 movs r0, 0x1
@@ -5720,7 +5720,7 @@ _080DA930:
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
mov r0, sp mov r0, sp
bl GetStringEnd_Limit7 bl StringGetEnd10
ldr r0, =gUnknown_02039F2A ldr r0, =gUnknown_02039F2A
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x1 movs r0, 0x1
@@ -5745,7 +5745,7 @@ _080DA994:
lsls r0, 6 lsls r0, 6
adds r0, r4 adds r0, r4
mov r1, sp mov r1, sp
bl CopyString bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x16 movs r1, 0x16
bl pokemon_getattr bl pokemon_getattr
@@ -6408,13 +6408,13 @@ sub_80DAED4: @ 80DAED4
lsrs r4, 24 lsrs r4, 24
ldr r0, =gUnknown_02022E2C ldr r0, =gUnknown_02022E2C
ldr r1, =gUnknown_085ED1AB ldr r1, =gUnknown_085ED1AB
bl CopyString bl StringCopy
adds r1, r0, 0 adds r1, r0, 0
subs r0, r1, 0x1 subs r0, r1, 0x1
strb r4, [r0] strb r4, [r0]
adds r0, r1, 0 adds r0, r1, 0
adds r1, r5, 0 adds r1, r5, 0
bl CopyString bl StringCopy
adds r1, r0, 0 adds r1, r0, 0
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
@@ -6449,12 +6449,12 @@ sub_80DAF1C: @ 80DAF1C
lsrs r4, 24 lsrs r4, 24
ldr r1, =gUnknown_085E8D3E ldr r1, =gUnknown_085E8D3E
add r0, sp, 0x4 add r0, sp, 0x4
bl CopyString bl StringCopy
lsls r1, r5, 6 lsls r1, r5, 6
ldr r0, =gUnknown_02039E0D ldr r0, =gUnknown_02039E0D
adds r1, r0 adds r1, r0
add r0, sp, 0x4 add r0, sp, 0x4
bl AppendString bl StringAppend
add r0, sp, 0x4 add r0, sp, 0x4
adds r1, r4, 0 adds r1, r4, 0
bl sub_80DAED4 bl sub_80DAED4
@@ -8448,7 +8448,7 @@ sub_80DBED4: @ 80DBED4
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080DBF0E beq _080DBF0E
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, [r0] ldr r2, [r0]
ldr r1, =gUnknown_02039F20 ldr r1, =gUnknown_02039F20
ldr r0, =gUnknown_02039F25 ldr r0, =gUnknown_02039F25
@@ -10297,7 +10297,7 @@ _080DCD92:
lsrs r4, r0, 16 lsrs r4, r0, 16
adds r0, r2, 0 adds r0, r2, 0
ldr r1, =gUnknown_085E8D40 ldr r1, =gUnknown_085E8D40
bl CopyString bl StringCopy
adds r2, r0, 0 adds r2, r0, 0
_080DCDBC: _080DCDBC:
lsls r1, r4, 16 lsls r1, r4, 16
@@ -10305,7 +10305,7 @@ _080DCDBC:
adds r0, r2, 0 adds r0, r2, 0
movs r2, 0 movs r2, 0
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_02039F26 ldr r0, =gUnknown_02039F26
adds r0, r5, r0 adds r0, r5, r0
ldrb r0, [r0] ldrb r0, [r0]
@@ -10340,7 +10340,7 @@ _080DCDEA:
lsrs r4, r0, 16 lsrs r4, r0, 16
adds r0, r2, 0 adds r0, r2, 0
ldr r1, =gUnknown_085E8D40 ldr r1, =gUnknown_085E8D40
bl CopyString bl StringCopy
adds r2, r0, 0 adds r2, r0, 0
_080DCE14: _080DCE14:
lsls r1, r4, 16 lsls r1, r4, 16
@@ -10348,7 +10348,7 @@ _080DCE14:
adds r0, r2, 0 adds r0, r2, 0
movs r2, 0 movs r2, 0
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_02039F26 ldr r0, =gUnknown_02039F26
adds r0, r5, r0 adds r0, r5, r0
ldrb r0, [r0] ldrb r0, [r0]
@@ -11171,12 +11171,12 @@ sub_80DD45C: @ 80DD45C
lsrs r4, 24 lsrs r4, 24
lsls r1, 24 lsls r1, 24
lsrs r6, r1, 24 lsrs r6, r1, 24
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
lsls r1, r4, 6 lsls r1, r4, 6
ldr r2, =gUnknown_02039E02 ldr r2, =gUnknown_02039E02
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r5, =gUnknown_02039F34 ldr r5, =gUnknown_02039F34
ldr r1, [r5] ldr r1, [r5]
ldr r2, [r1, 0x4] ldr r2, [r1, 0x4]
@@ -11189,7 +11189,7 @@ sub_80DD45C: @ 80DD45C
muls r1, r2 muls r1, r2
ldr r2, =gMoveNames ldr r2, =gMoveNames
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r3, =gContestMoves ldr r3, =gContestMoves
ldr r1, [r5] ldr r1, [r5]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
@@ -11206,50 +11206,50 @@ sub_80DD45C: @ 80DD45C
lsls r1, r0, 29 lsls r1, r0, 29
cmp r1, 0 cmp r1, 0
bne _080DD4DC bne _080DD4DC
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldr r1, =gUnknown_0827E837 ldr r1, =gUnknown_0827E837
bl CopyString bl StringCopy
b _080DD52C b _080DD52C
.pool .pool
_080DD4DC: _080DD4DC:
lsrs r0, r1, 29 lsrs r0, r1, 29
cmp r0, 0x1 cmp r0, 0x1
bne _080DD4F4 bne _080DD4F4
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldr r1, =gUnknown_0827E83F ldr r1, =gUnknown_0827E83F
bl CopyString bl StringCopy
b _080DD52C b _080DD52C
.pool .pool
_080DD4F4: _080DD4F4:
lsrs r0, r1, 29 lsrs r0, r1, 29
cmp r0, 0x2 cmp r0, 0x2
bne _080DD50C bne _080DD50C
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldr r1, =gUnknown_0827E847 ldr r1, =gUnknown_0827E847
bl CopyString bl StringCopy
b _080DD52C b _080DD52C
.pool .pool
_080DD50C: _080DD50C:
lsrs r0, r1, 29 lsrs r0, r1, 29
cmp r0, 0x3 cmp r0, 0x3
bne _080DD524 bne _080DD524
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldr r1, =gUnknown_0827E850 ldr r1, =gUnknown_0827E850
bl CopyString bl StringCopy
b _080DD52C b _080DD52C
.pool .pool
_080DD524: _080DD524:
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldr r1, =gUnknown_0827E85A ldr r1, =gUnknown_0827E85A
bl CopyString bl StringCopy
_080DD52C: _080DD52C:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_08587E10 ldr r1, =gUnknown_08587E10
lsls r0, r6, 2 lsls r0, r6, 2
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
bl sub_80DB89C bl sub_80DB89C
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
@@ -14191,7 +14191,7 @@ sub_80DED60: @ 80DED60
sub_80DED74: @ 80DED74 sub_80DED74: @ 80DED74
push {r4-r6,lr} push {r4-r6,lr}
movs r0, 0 movs r0, 0
ldr r6, =gUnknown_03005D90 ldr r6, =gSaveBlock2Ptr
ldr r5, =0x00000624 ldr r5, =0x00000624
movs r4, 0 movs r4, 0
_080DED7E: _080DED7E:
@@ -14308,7 +14308,7 @@ _080DEE54:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r9, r0 mov r9, r0
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
mov r10, r2 mov r10, r2
ldr r0, [r2] ldr r0, [r2]
mov r3, r9 mov r3, r9
@@ -14342,7 +14342,7 @@ _080DEE54:
adds r0, 0xB adds r0, 0xB
adds r1, r4, 0x2 adds r1, r4, 0x2
adds r1, r5, r1 adds r1, r5, r1
bl CopyString bl StringCopy
mov r2, r10 mov r2, r10
ldr r0, [r2] ldr r0, [r2]
adds r0, r6 adds r0, r6
@@ -14350,7 +14350,7 @@ _080DEE54:
adds r4, 0xD adds r4, 0xD
adds r5, r4 adds r5, r4
adds r1, r5, 0 adds r1, r5, 0
bl CopyString bl StringCopy
ldr r0, =gUnknown_02039F2A ldr r0, =gUnknown_02039F2A
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x1 movs r0, 0x1
@@ -14378,7 +14378,7 @@ _080DEF02:
ldr r0, [sp] ldr r0, [sp]
cmp r0, 0xFF cmp r0, 0xFF
beq _080DEF34 beq _080DEF34
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
mov r2, r9 mov r2, r9
lsls r1, r2, 5 lsls r1, r2, 5
@@ -14391,7 +14391,7 @@ _080DEF02:
b _080DEF8E b _080DEF8E
.pool .pool
_080DEF34: _080DEF34:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
mov r2, r9 mov r2, r9
lsls r1, r2, 5 lsls r1, r2, 5
@@ -14423,13 +14423,13 @@ _080DEF50:
adds r0, 0xB adds r0, 0xB
adds r1, r4, 0x2 adds r1, r4, 0x2
adds r1, r5, r1 adds r1, r5, r1
bl CopyString bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x16 adds r0, 0x16
adds r4, 0xD adds r4, 0xD
adds r5, r4 adds r5, r4
adds r1, r5, 0 adds r1, r5, 0
bl CopyString bl StringCopy
mov r2, r8 mov r2, r8
strb r2, [r6, 0xA] strb r2, [r6, 0xA]
_080DEF8E: _080DEF8E:
@@ -14460,7 +14460,7 @@ sub_80DEFA8: @ 80DEFA8
cmp r1, 0 cmp r1, 0
beq _080DEFE6 beq _080DEFE6
movs r2, 0x5 movs r2, 0x5
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r12, r0 mov r12, r0
ldr r4, =0x00002e90 ldr r4, =0x00002e90
ldr r3, =0x00002e70 ldr r3, =0x00002e70
@@ -14526,7 +14526,7 @@ _080DF03A:
sub_80DF040: @ 80DF040 sub_80DF040: @ 80DF040
push {r4-r7,lr} push {r4-r7,lr}
movs r2, 0 movs r2, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r12, r0 mov r12, r0
ldr r4, =0x00002e90 ldr r4, =0x00002e90
ldr r3, =gUnknown_08587FA4 ldr r3, =gUnknown_08587FA4
@@ -15508,7 +15508,7 @@ _080DF784:
_080DF7AE: _080DF7AE:
add r0, sp, 0x4 add r0, sp, 0x4
ldr r1, =gUnknown_085ED1B2 ldr r1, =gUnknown_085ED1B2
bl CopyString bl StringCopy
adds r5, r0, 0 adds r5, r0, 0
ldr r0, =gUnknown_02039F26 ldr r0, =gUnknown_02039F26
adds r0, r7, r0 adds r0, r7, r0
@@ -15534,7 +15534,7 @@ _080DF7DE:
adds r0, r5, 0 adds r0, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r5, r0, 0 adds r5, r0, 0
lsrs r4, 1 lsrs r4, 1
lsls r0, r6, 24 lsls r0, r6, 24
@@ -15605,7 +15605,7 @@ _080DF874:
_080DF884: _080DF884:
add r0, sp, 0x4 add r0, sp, 0x4
ldr r1, =gUnknown_085ED1B5 ldr r1, =gUnknown_085ED1B5
bl CopyString bl StringCopy
ldr r0, =gUnknown_02039F34 ldr r0, =gUnknown_02039F34
ldr r0, [r0] ldr r0, [r0]
ldr r1, [r0, 0x1C] ldr r1, [r0, 0x1C]
@@ -15622,7 +15622,7 @@ _080DF8A0:
adds r0, r5, 0 adds r0, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r5, r0, 0 adds r5, r0, 0
lsrs r4, 1 lsrs r4, 1
lsls r0, r6, 24 lsls r0, r6, 24
@@ -15708,7 +15708,7 @@ sub_80DF940: @ 80DF940
b _080DF9CC b _080DF9CC
_080DF956: _080DF956:
adds r0, r4, 0 adds r0, r4, 0
bl GetStringLength bl StringLength
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
cmp r0, 0x5 cmp r0, 0x5
@@ -15789,7 +15789,7 @@ sub_80DF9E0: @ 80DF9E0
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r4, r1, 0 adds r4, r1, 0
bl StripExtendedControlCodes bl StripExtCtrlCodes
cmp r4, 0x1 cmp r4, 0x1
bne _080DF9F8 bne _080DF9F8
movs r0, 0xFF movs r0, 0xFF
@@ -15822,7 +15822,7 @@ sub_80DFA08: @ 80DFA08
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
adds r0, r4, 0 adds r0, r4, 0
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
b _080DFA3E b _080DFA3E
_080DFA28: _080DFA28:
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
@@ -15830,7 +15830,7 @@ _080DFA28:
bne _080DFA38 bne _080DFA38
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
b _080DFA3E b _080DFA3E
_080DFA38: _080DFA38:
strb r0, [r4, 0x5] strb r0, [r4, 0x5]
+19 -19
View File
@@ -285,12 +285,12 @@ sub_80F5A74: @ 80F5A74
bne _080F5A96 bne _080F5A96
ldr r1, =gUnknown_085ED21E ldr r1, =gUnknown_085ED21E
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
adds r6, r0, 0 adds r6, r0, 0
_080F5A96: _080F5A96:
adds r1, r7, 0x2 adds r1, r7, 0x2
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
ldr r4, =gUnknown_02022E2C ldr r4, =gUnknown_02022E2C
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -298,11 +298,11 @@ _080F5A96:
bl sub_80F7ED0 bl sub_80F7ED0
ldr r1, =gUnknown_085E8D3E ldr r1, =gUnknown_085E8D3E
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
adds r1, r7, 0 adds r1, r7, 0
adds r1, 0xD adds r1, 0xD
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x32 movs r2, 0x32
@@ -1238,7 +1238,7 @@ _080F6334:
movs r4, 0 movs r4, 0
ldr r1, =gUnknown_02039F20 ldr r1, =gUnknown_02039F20
ldrb r0, [r1] ldrb r0, [r1]
ldr r7, =gUnknown_02021CC4 ldr r7, =gStringVar1
ldr r2, =gUnknown_02039E0D ldr r2, =gUnknown_02039E0D
mov r8, r2 mov r8, r2
cmp r0, 0 cmp r0, 0
@@ -1256,18 +1256,18 @@ _080F636E:
mov r0, r8 mov r0, r8
adds r1, r4, r0 adds r1, r4, r0
adds r0, r7, 0 adds r0, r7, 0
bl CopyString bl StringCopy
adds r0, r7, 0 adds r0, r7, 0
bl sub_81DB5AC bl sub_81DB5AC
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
mov r1, r8 mov r1, r8
subs r1, 0xB subs r1, 0xB
adds r4, r1 adds r4, r1
adds r1, r4, 0 adds r1, r4, 0
bl CopyString bl StringCopy
ldr r1, =gUnknown_085ED1FA ldr r1, =gUnknown_085ED1FA
mov r0, sp mov r0, sp
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r0, =gUnknown_0203A034 ldr r0, =gUnknown_0203A034
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0] ldr r0, [r0]
@@ -4990,14 +4990,14 @@ _080F8250:
thumb_func_start sub_80F8264 thumb_func_start sub_80F8264
sub_80F8264: @ 80F8264 sub_80F8264: @ 80F8264
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
ldr r0, =gUnknown_020375E4 ldr r0, =gUnknown_020375E4
ldrh r1, [r0] ldrh r1, [r0]
lsls r1, 6 lsls r1, 6
ldr r0, =gUnknown_02039E0D ldr r0, =gUnknown_02039E0D
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
adds r0, r4, 0 adds r0, r4, 0
bl sub_81DB5AC bl sub_81DB5AC
pop {r4} pop {r4}
@@ -5009,13 +5009,13 @@ sub_80F8264: @ 80F8264
thumb_func_start sub_80F8290 thumb_func_start sub_80F8290
sub_80F8290: @ 80F8290 sub_80F8290: @ 80F8290
push {lr} push {lr}
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldr r1, =gUnknown_020375E4 ldr r1, =gUnknown_020375E4
ldrh r1, [r1] ldrh r1, [r1]
lsls r1, 6 lsls r1, 6
ldr r2, =gUnknown_02039E02 ldr r2, =gUnknown_02039E02
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -5103,7 +5103,7 @@ sub_80F834C: @ 80F834C
movs r1, 0 movs r1, 0
ldr r2, =gUnknown_02039F20 ldr r2, =gUnknown_02039F20
ldrb r0, [r2] ldrb r0, [r2]
ldr r4, =gUnknown_02021EC4 ldr r4, =gStringVar3
ldr r3, =gUnknown_02039E0D ldr r3, =gUnknown_02039E0D
cmp r0, 0 cmp r0, 0
beq _080F836E beq _080F836E
@@ -5121,7 +5121,7 @@ _080F836E:
lsls r1, 6 lsls r1, 6
adds r1, r3 adds r1, r3
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
adds r0, r4, 0 adds r0, r4, 0
bl sub_81DB5AC bl sub_81DB5AC
pop {r4} pop {r4}
@@ -5136,7 +5136,7 @@ sub_80F8390: @ 80F8390
movs r1, 0 movs r1, 0
ldr r2, =gUnknown_02039F20 ldr r2, =gUnknown_02039F20
ldrb r0, [r2] ldrb r0, [r2]
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
ldr r3, =gUnknown_02039E02 ldr r3, =gUnknown_02039E02
cmp r0, 0 cmp r0, 0
beq _080F83B2 beq _080F83B2
@@ -5154,7 +5154,7 @@ _080F83B2:
lsls r1, 6 lsls r1, 6
adds r1, r3 adds r1, r3
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -5582,14 +5582,14 @@ _080F8748:
movs r4, 0x3 movs r4, 0x3
_080F874C: _080F874C:
adds r0, r5, 0 adds r0, r5, 0
bl GetStringEnd_Limit7 bl StringGetEnd10
adds r5, 0x40 adds r5, 0x40
subs r4, 0x1 subs r4, 0x1
cmp r4, 0 cmp r4, 0
bge _080F874C bge _080F874C
adds r0, r6, 0 adds r0, r6, 0
bl DestroyTask bl DestroyTask
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x4 movs r1, 0x4
ldrsb r1, [r0, r1] ldrsb r1, [r0, r1]
+15 -15
View File
@@ -10,7 +10,7 @@ sub_812FDA8: @ 812FDA8
push {r4-r7,lr} push {r4-r7,lr}
ldr r3, =gUnknown_02039F5D ldr r3, =gUnknown_02039F5D
ldr r4, =gUnknown_02039F5C ldr r4, =gUnknown_02039F5C
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
subs r0, 0x1 subs r0, 0x1
lsls r1, r0, 5 lsls r1, r0, 5
@@ -379,13 +379,13 @@ sub_813010C: @ 813010C
ldrb r5, [r1, 0xA] ldrb r5, [r1, 0xA]
cmp r0, 0x7 cmp r0, 0x7
bhi _08130190 bhi _08130190
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_818E868 bl sub_818E868
ldr r1, =gUnknown_085E8D5E ldr r1, =gUnknown_085E8D5E
adds r0, r4, 0 adds r0, r4, 0
bl AppendString bl StringAppend
ldr r1, =gUnknown_085B07D4 ldr r1, =gUnknown_085B07D4
ldr r0, [r6] ldr r0, [r6]
ldrb r0, [r0, 0x1E] ldrb r0, [r0, 0x1E]
@@ -393,35 +393,35 @@ sub_813010C: @ 813010C
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl AppendString bl StringAppend
ldr r4, =gUnknown_02021DC4 ldr r4, =gStringVar2
ldr r1, [r6] ldr r1, [r6]
adds r1, 0x16 adds r1, 0x16
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
adds r0, r4, 0 adds r0, r4, 0
bl sub_81DB5AC bl sub_81DB5AC
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldr r1, [r6] ldr r1, [r6]
adds r1, 0xB adds r1, 0xB
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_0827EA0C ldr r1, =gUnknown_0827EA0C
bl ExpandStringRefs bl StringExpandPlaceholders
b _081301A6 b _081301A6
.pool .pool
_08130190: _08130190:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
adds r1, 0xB adds r1, 0xB
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r2, =gUnknown_085B07F4 ldr r2, =gUnknown_085B07F4
lsls r1, r5, 2 lsls r1, r5, 2
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl ExpandStringRefs bl StringExpandPlaceholders
_081301A6: _081301A6:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
movs r0, 0x1 movs r0, 0x1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xD0 movs r2, 0xD0
+48 -48
View File
@@ -15,7 +15,7 @@ pokemon_get_nick: @ 806FA2C
bl pokemon_getattr bl pokemon_getattr
adds r0, r4, 0 adds r0, r4, 0
mov r1, sp mov r1, sp
bl CopyString_Limit10 bl StringCopy10
add sp, 0x14 add sp, 0x14
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -32,7 +32,7 @@ pokemon_get_nick_: @ 806FA4C
bl pokemon_getattr_encrypted bl pokemon_getattr_encrypted
adds r0, r4, 0 adds r0, r4, 0
mov r1, sp mov r1, sp
bl CopyString_Limit10 bl StringCopy10
add sp, 0x14 add sp, 0x14
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -170,16 +170,16 @@ sub_806FB38: @ 806FB38
beq _0806FBBC beq _0806FBBC
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x74 adds r0, 0x74
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
adds r4, r5, 0 adds r4, r5, 0
adds r4, 0x7C adds r4, 0x7C
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
bl pokemon_get_nick bl pokemon_get_nick
adds r0, r4, 0 adds r0, r4, 0
bl StripExtendedControlCodes bl StripExtCtrlCodes
adds r4, 0xB adds r4, 0xB
ldrb r1, [r4] ldrb r1, [r4]
movs r0, 0x10 movs r0, 0x10
@@ -202,7 +202,7 @@ sub_806FB38: @ 806FB38
bl pokemon_getattr bl pokemon_getattr
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
lsls r2, r0, 3 lsls r2, r0, 3
adds r2, r0 adds r2, r0
@@ -272,7 +272,7 @@ daycare_send_selected_pokemon: @ 806FC18
muls r0, r1 muls r0, r1
ldr r1, =gUnknown_020244EC ldr r1, =gUnknown_020244EC
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
ldr r2, =0x00003030 ldr r2, =0x00003030
adds r1, r2 adds r1, r2
@@ -375,7 +375,7 @@ sub_806FCF8: @ 806FCF8
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x68 sub sp, 0x68
adds r5, r0, 0 adds r5, r0, 0
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl pokemon_get_nick_ bl pokemon_get_nick_
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0xB movs r1, 0xB
@@ -466,7 +466,7 @@ sub_806FD9C: @ 806FD9C
thumb_func_start sub_806FDC4 thumb_func_start sub_806FDC4
sub_806FDC4: @ 806FDC4 sub_806FDC4: @ 806FDC4
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003030 ldr r1, =0x00003030
adds r0, r1 adds r0, r1
@@ -540,12 +540,12 @@ sub_806FE54: @ 806FE54
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
adds r0, r5, 0 adds r0, r5, 0
bl pokemon_get_nick_ bl pokemon_get_nick_
adds r0, r4, 0 adds r0, r4, 0
@@ -563,17 +563,17 @@ sub_806FE88: @ 806FE88
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
adds r0, r5, 0 adds r0, r5, 0
bl pokemon_get_nick_ bl pokemon_get_nick_
movs r0, 0x64 movs r0, 0x64
muls r4, r0 muls r4, r0
adds r4, 0x64 adds r4, 0x64
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r0, r4, 0 adds r0, r4, 0
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
@@ -599,7 +599,7 @@ sub_806FEC0: @ 806FEC0
thumb_func_start sub_806FED8 thumb_func_start sub_806FED8
sub_806FED8: @ 806FED8 sub_806FED8: @ 806FED8
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003030 ldr r1, =0x00003030
adds r0, r1 adds r0, r1
@@ -617,7 +617,7 @@ sub_806FED8: @ 806FED8
sub_806FF04: @ 806FF04 sub_806FF04: @ 806FF04
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldr r1, =0x000030b8 ldr r1, =0x000030b8
adds r3, r2, r1 adds r3, r2, r1
@@ -636,7 +636,7 @@ sub_806FF04: @ 806FF04
thumb_func_start sub_806FF30 thumb_func_start sub_806FF30
sub_806FF30: @ 806FF30 sub_806FF30: @ 806FF30
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
ldr r5, =gUnknown_020375E0 ldr r5, =gUnknown_020375E0
ldrh r0, [r5] ldrh r0, [r5]
movs r4, 0x8C movs r4, 0x8C
@@ -995,7 +995,7 @@ sub_80701B8: @ 80701B8
thumb_func_start sub_80701E0 thumb_func_start sub_80701E0
sub_80701E0: @ 80701E0 sub_80701E0: @ 80701E0
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003030 ldr r1, =0x00003030
adds r0, r1 adds r0, r1
@@ -1008,7 +1008,7 @@ sub_80701E0: @ 80701E0
thumb_func_start sub_80701FC thumb_func_start sub_80701FC
sub_80701FC: @ 80701FC sub_80701FC: @ 80701FC
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003030 ldr r1, =0x00003030
adds r0, r1 adds r0, r1
@@ -1662,7 +1662,7 @@ sub_8070710: @ 8070710
thumb_func_start sub_8070728 thumb_func_start sub_8070728
sub_8070728: @ 8070728 sub_8070728: @ 8070728
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003030 ldr r1, =0x00003030
adds r0, r1 adds r0, r1
@@ -2099,7 +2099,7 @@ sub_8070A0C: @ 8070A0C
thumb_func_start sp0B8_daycare thumb_func_start sp0B8_daycare
sp0B8_daycare: @ 8070AA8 sp0B8_daycare: @ 8070AA8
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003030 ldr r1, =0x00003030
adds r0, r1 adds r0, r1
@@ -2242,7 +2242,7 @@ _08070BC2:
thumb_func_start sub_8070BD0 thumb_func_start sub_8070BD0
sub_8070BD0: @ 8070BD0 sub_8070BD0: @ 8070BD0
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003030 ldr r1, =0x00003030
adds r0, r1 adds r0, r1
@@ -2278,16 +2278,16 @@ sub_8070C04: @ 8070C04
bl pokemon_getattr_encrypted bl pokemon_getattr_encrypted
cmp r0, 0 cmp r0, 0
beq _08070C2E beq _08070C2E
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
adds r0, r4, 0 adds r0, r4, 0
bl pokemon_get_nick_ bl pokemon_get_nick_
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x7 movs r1, 0x7
mov r2, sp mov r2, sp
bl pokemon_getattr_encrypted bl pokemon_getattr_encrypted
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
mov r1, sp mov r1, sp
bl CopyString bl StringCopy
_08070C2E: _08070C2E:
adds r4, 0x8C adds r4, 0x8C
adds r0, r4, 0 adds r0, r4, 0
@@ -2295,7 +2295,7 @@ _08070C2E:
bl pokemon_getattr_encrypted bl pokemon_getattr_encrypted
cmp r0, 0 cmp r0, 0
beq _08070C44 beq _08070C44
ldr r1, =gUnknown_02021DC4 ldr r1, =gStringVar2
adds r0, r4, 0 adds r0, r4, 0
bl pokemon_get_nick_ bl pokemon_get_nick_
_08070C44: _08070C44:
@@ -2316,7 +2316,7 @@ sub_8070C58: @ 8070C58
muls r0, r5 muls r0, r5
ldr r4, =gUnknown_020244EC ldr r4, =gUnknown_020244EC
adds r0, r4 adds r0, r4
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl pokemon_get_nick_ bl pokemon_get_nick_
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
lsls r0, 24 lsls r0, 24
@@ -2336,7 +2336,7 @@ sub_8070C58: @ 8070C58
thumb_func_start sp0B5_daycare thumb_func_start sp0B5_daycare
sp0B5_daycare: @ 8070C94 sp0B5_daycare: @ 8070C94
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003030 ldr r1, =0x00003030
adds r0, r1 adds r0, r1
@@ -2349,7 +2349,7 @@ sp0B5_daycare: @ 8070C94
thumb_func_start sp0B6_daycare thumb_func_start sp0B6_daycare
sp0B6_daycare: @ 8070CB0 sp0B6_daycare: @ 8070CB0
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00003030 ldr r1, =0x00003030
adds r0, r1 adds r0, r1
@@ -2385,7 +2385,7 @@ _08070CF2:
thumb_func_start sub_8070CF8 thumb_func_start sub_8070CF8
sub_8070CF8: @ 8070CF8 sub_8070CF8: @ 8070CF8
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003030 ldr r1, =0x00003030
adds r0, r1 adds r0, r1
@@ -2587,7 +2587,7 @@ _08070E5C:
thumb_func_start daycare_relationship_score_from_savegame thumb_func_start daycare_relationship_score_from_savegame
daycare_relationship_score_from_savegame: @ 8070E6C daycare_relationship_score_from_savegame: @ 8070E6C
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003030 ldr r1, =0x00003030
adds r0, r1 adds r0, r1
@@ -2623,12 +2623,12 @@ _08070EAC:
bne _08070EB2 bne _08070EB2
movs r1, 0 movs r1, 0
_08070EB2: _08070EB2:
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r2, =gUnknown_0832B6F8 ldr r2, =gUnknown_0832B6F8
lsls r1, 2 lsls r1, 2
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -2739,7 +2739,7 @@ _08070F84:
ldr r1, =gUnknown_0832DACB ldr r1, =gUnknown_0832DACB
_08070F86: _08070F86:
adds r0, r4, 0 adds r0, r4, 0
bl AppendString bl StringAppend
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
@@ -2799,20 +2799,20 @@ _08070FCC:
bls _08070FCC bls _08070FCC
adds r0, r7, 0 adds r0, r7, 0
mov r1, sp mov r1, sp
bl CopyString bl StringCopy
ldr r4, =gUnknown_085EF881 ldr r4, =gUnknown_085EF881
adds r0, r7, 0 adds r0, r7, 0
adds r1, r4, 0 adds r1, r4, 0
bl AppendString bl StringAppend
adds r0, r7, 0 adds r0, r7, 0
mov r1, r9 mov r1, r9
bl AppendString bl StringAppend
adds r0, r7, 0 adds r0, r7, 0
adds r1, r4, 0 adds r1, r4, 0
bl AppendString bl StringAppend
ldr r1, =gUnknown_085EF883 ldr r1, =gUnknown_085EF883
adds r0, r7, 0 adds r0, r7, 0
bl AppendString bl StringAppend
add sp, 0x28 add sp, 0x28
pop {r3,r4} pop {r3,r4}
mov r8, r3 mov r8, r3
@@ -2835,7 +2835,7 @@ sub_8071038: @ 8071038
_08071046: _08071046:
adds r0, r4, 0 adds r0, r4, 0
ldr r1, =gUnknown_085EF888 ldr r1, =gUnknown_085EF888
bl AppendString bl StringAppend
movs r0, 0x8C movs r0, 0x8C
adds r2, r5, 0 adds r2, r5, 0
muls r2, r0 muls r2, r0
@@ -2851,13 +2851,13 @@ _08071046:
mov r0, sp mov r0, sp
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r0, r4, 0 adds r0, r4, 0
mov r1, sp mov r1, sp
bl AppendString bl StringAppend
adds r0, r4, 0 adds r0, r4, 0
ldr r1, =gUnknown_085EF881 ldr r1, =gUnknown_085EF881
bl AppendString bl StringAppend
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -2973,7 +2973,7 @@ sub_8071148: @ 8071148
lsrs r5, 24 lsrs r5, 24
ldr r1, =gUnknown_085EF888 ldr r1, =gUnknown_085EF888
mov r0, sp mov r0, sp
bl CopyString bl StringCopy
movs r0, 0x8C movs r0, 0x8C
adds r1, r6, 0 adds r1, r6, 0
muls r1, r0 muls r1, r0
@@ -2989,10 +2989,10 @@ sub_8071148: @ 8071148
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
mov r0, sp mov r0, sp
adds r1, r4, 0 adds r1, r4, 0
bl AppendString bl StringAppend
movs r0, 0x1 movs r0, 0x1
mov r1, sp mov r1, sp
movs r2, 0x70 movs r2, 0x70
@@ -3023,7 +3023,7 @@ sub_80711B8: @ 80711B8
lsrs r5, r2, 24 lsrs r5, r2, 24
cmp r6, 0x1 cmp r6, 0x1
bhi _080711F0 bhi _080711F0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r8, r0 mov r8, r0
ldr r0, [r0] ldr r0, [r0]
ldr r4, =0x00003030 ldr r4, =0x00003030
+70 -70
View File
@@ -23,7 +23,7 @@ _0812697E:
ldrb r0, [r2, 0x9] ldrb r0, [r2, 0x9]
cmp r0, 0 cmp r0, 0
bne _08126996 bne _08126996
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r3, =0x00001aae ldr r3, =0x00001aae
adds r1, r0, r3 adds r1, r0, r3
@@ -35,7 +35,7 @@ _08126996:
ldrb r0, [r2, 0x9] ldrb r0, [r2, 0x9]
cmp r0, 0x1 cmp r0, 0x1
bne _081269AC bne _081269AC
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r3, =0x0000271c ldr r3, =0x0000271c
adds r1, r0, r3 adds r1, r0, r3
@@ -177,7 +177,7 @@ sub_8126AD8: @ 8126AD8
lsrs r4, 24 lsrs r4, 24
bl sub_8126ABC bl sub_8126ABC
ldr r2, =gUnknown_0203A17C ldr r2, =gUnknown_0203A17C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r3, =0x00001aae ldr r3, =0x00001aae
adds r1, r0, r3 adds r1, r0, r3
@@ -210,7 +210,7 @@ sub_8126B2C: @ 8126B2C
lsrs r4, 24 lsrs r4, 24
bl sub_8126ABC bl sub_8126ABC
ldr r2, =gUnknown_0203A17C ldr r2, =gUnknown_0203A17C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r3, =0x0000271c ldr r3, =0x0000271c
adds r1, r0, r3 adds r1, r0, r3
@@ -335,10 +335,10 @@ sub_8126C48: @ 8126C48
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08126C7C bne _08126C7C
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA83D ldr r1, =gUnknown_085EA83D
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_8126DA4 ldr r2, =sub_8126DA4
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -375,10 +375,10 @@ sub_8126CA4: @ 8126CA4
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08126CD8 bne _08126CD8
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAAEC ldr r1, =gUnknown_085EAAEC
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_8126DA4 ldr r2, =sub_8126DA4
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -419,10 +419,10 @@ sub_8126D10: @ 8126D10
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08126D44 bne _08126D44
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA83D ldr r1, =gUnknown_085EA83D
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_8126DA4 ldr r2, =sub_8126DA4
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -717,11 +717,11 @@ _08126FA2:
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
adds r0, r4, 0 adds r0, r4, 0
bl sub_8127058 bl sub_8127058
adds r0, r4, 0 adds r0, r4, 0
bl GetStringLength bl StringLength
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
adds r6, r0, r4 adds r6, r0, r4
@@ -731,7 +731,7 @@ _08126FA2:
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
str r5, [sp] str r5, [sp]
mov r0, r9 mov r0, r9
str r0, [sp, 0x4] str r0, [sp, 0x4]
@@ -751,7 +751,7 @@ _08126FA2:
adds r0, r6, 0 adds r0, r6, 0
movs r2, 0x1 movs r2, 0x1
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r6, r0, 0 adds r6, r0, 0
movs r0, 0xBA movs r0, 0xBA
strb r0, [r6] strb r0, [r6]
@@ -764,7 +764,7 @@ _08126FA2:
adds r0, r6, 0 adds r0, r6, 0
movs r2, 0x1 movs r2, 0x1
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r0, 0x1 movs r0, 0x1
adds r1, r4, 0 adds r1, r4, 0
ldr r2, [sp, 0x14] ldr r2, [sp, 0x14]
@@ -799,7 +799,7 @@ sub_8127058: @ 8127058
lsls r4, r1, 24 lsls r4, r1, 24
lsrs r4, 24 lsrs r4, 24
ldr r1, =gUnknown_085EA7C8 ldr r1, =gUnknown_085EA7C8
bl CopyString bl StringCopy
cmp r4, 0x1 cmp r4, 0x1
bne _08127078 bne _08127078
movs r0, 0x4 movs r0, 0x4
@@ -908,10 +908,10 @@ sub_81270E8: @ 81270E8
_08127154: _08127154:
movs r0, 0x1 movs r0, 0x1
bl sub_8126A58 bl sub_8126A58
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA83D ldr r1, =gUnknown_085EA83D
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_8127180 ldr r2, =sub_8127180
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -1030,7 +1030,7 @@ sub_8127250: @ 8127250
lsrs r1, 22 lsrs r1, 22
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -1153,13 +1153,13 @@ sub_8127330: @ 8127330
ldrsh r0, [r1, r2] ldrsh r0, [r1, r2]
cmp r0, 0 cmp r0, 0
bne _08127378 bne _08127378
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r1, 0x1 movs r1, 0x1
bl sub_8127058 bl sub_8127058
b _08127380 b _08127380
.pool .pool
_08127378: _08127378:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r1, 0 movs r1, 0
bl sub_8127058 bl sub_8127058
_08127380: _08127380:
@@ -1217,7 +1217,7 @@ _081273D6:
ldr r0, [r5] ldr r0, [r5]
adds r0, r4 adds r0, r4
ldr r1, =gUnknown_085E8CF0 ldr r1, =gUnknown_085E8CF0
bl CopyString bl StringCopy
ldr r0, [r5] ldr r0, [r5]
lsls r2, r6, 3 lsls r2, r6, 3
adds r1, r0, r2 adds r1, r0, r2
@@ -1261,14 +1261,14 @@ sub_8127454: @ 8127454
adds r5, r0, 0 adds r5, r0, 0
lsls r4, r1, 16 lsls r4, r1, 16
lsrs r4, 16 lsrs r4, 16
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl CopyString bl StringCopy
lsls r4, 5 lsls r4, 5
ldr r0, =gUnknown_085A5C09 ldr r0, =gUnknown_085A5C09
adds r4, r0 adds r4, r0
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl AppendString bl StringAppend
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1722,7 +1722,7 @@ sub_8127814: @ 8127814
movs r2, 0xC movs r2, 0xC
bl memset bl memset
movs r6, 0 movs r6, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r10, r0 mov r10, r0
ldr r1, =0x00001aae ldr r1, =0x00001aae
mov r9, r1 mov r9, r1
@@ -1810,7 +1810,7 @@ _081278E2:
ldr r3, =gUnknown_0203BC40 ldr r3, =gUnknown_0203BC40
mov r8, r3 mov r8, r3
_081278F4: _081278F4:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x0000271c ldr r1, =0x0000271c
adds r0, r1 adds r0, r1
@@ -1826,7 +1826,7 @@ _08127918:
ldr r0, =gUnknown_0203A14C ldr r0, =gUnknown_0203A14C
ldr r1, [r0] ldr r1, [r0]
adds r1, r2 adds r1, r2
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r3, =0x0000271c ldr r3, =0x0000271c
adds r0, r3 adds r0, r3
@@ -2049,7 +2049,7 @@ sub_8127ACC: @ 8127ACC
adds r2, r0 adds r2, r0
lsls r2, 3 lsls r2, 3
adds r4, r2, r3 adds r4, r2, r3
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldrh r0, [r1] ldrh r0, [r1]
strh r0, [r4, 0xE] strh r0, [r4, 0xE]
@@ -2074,7 +2074,7 @@ sub_8127B04: @ 8127B04
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
bl DrawWholeMapView bl DrawWholeMapView
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x4 movs r0, 0x4
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
@@ -2477,7 +2477,7 @@ sub_8127E18: @ 8127E18
mov r8, r0 mov r8, r0
ldr r1, =gUnknown_020375E4 ldr r1, =gUnknown_020375E4
mov r10, r1 mov r10, r1
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
mov r9, r2 mov r9, r2
_08127E34: _08127E34:
adds r5, r6, 0 adds r5, r6, 0
@@ -2636,10 +2636,10 @@ sub_8127F68: @ 8127F68
beq _08127FAC beq _08127FAC
cmp r0, 0x7 cmp r0, 0x7
beq _08127FAC beq _08127FAC
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA9AE ldr r1, =gUnknown_085EA9AE
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_8127A5C ldr r2, =sub_8127A5C
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -2672,36 +2672,36 @@ _08127FAC:
b _0812804C b _0812804C
.pool .pool
_08127FE8: _08127FE8:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r4, =gUnknown_0203A17C ldr r4, =gUnknown_0203A17C
ldrb r1, [r4, 0x8] ldrb r1, [r4, 0x8]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldrb r0, [r4, 0x9] ldrb r0, [r4, 0x9]
cmp r0, 0 cmp r0, 0
bne _08128018 bne _08128018
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA8EA ldr r1, =gUnknown_085EA8EA
bl ExpandStringRefs bl StringExpandPlaceholders
b _08128020 b _08128020
.pool .pool
_08128018: _08128018:
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA931 ldr r1, =gUnknown_085EA931
bl ExpandStringRefs bl StringExpandPlaceholders
_08128020: _08128020:
ldr r1, =gUnknown_02021FC4 ldr r1, =gStringVar4
ldr r2, =sub_8127A5C ldr r2, =sub_8127A5C
adds r0, r5, 0 adds r0, r5, 0
bl DisplayItemMessageOnField bl DisplayItemMessageOnField
b _0812804C b _0812804C
.pool .pool
_08128038: _08128038:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA8D2 ldr r1, =gUnknown_085EA8D2
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_8127A5C ldr r2, =sub_8127A5C
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -2898,7 +2898,7 @@ _081281E2:
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
_081281EA: _081281EA:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
cmp r0, 0 cmp r0, 0
@@ -3168,10 +3168,10 @@ sub_8128414: @ 8128414
adds r0, r3 adds r0, r3
strh r2, [r0, 0x3C] strh r2, [r0, 0x3C]
bl sub_8128DE0 bl sub_8128DE0
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085EA8BF ldr r1, =gUnknown_085EA8BF
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_8128B80 ldr r2, =sub_8128B80
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
@@ -3834,10 +3834,10 @@ sub_8128950: @ 8128950
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _081289A4 bne _081289A4
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA897 ldr r1, =gUnknown_085EA897
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_81289D0 ldr r2, =sub_81289D0
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -3847,10 +3847,10 @@ sub_8128950: @ 8128950
_081289A4: _081289A4:
movs r0, 0x20 movs r0, 0x20
bl audio_play bl audio_play
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA8A6 ldr r1, =gUnknown_085EA8A6
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_8129020 ldr r2, =sub_8129020
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -5809,10 +5809,10 @@ _08129968:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _08129994 bne _08129994
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAAC5 ldr r1, =gUnknown_085EAAC5
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_8129D64 ldr r2, =sub_8129D64
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -5885,7 +5885,7 @@ SetUpPuttingAwayDecorationPlayerAvatar: @ 81299DC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r4, 0x4] str r0, [r4, 0x4]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
cmp r0, 0 cmp r0, 0
@@ -6136,10 +6136,10 @@ sub_8129BF8: @ 8129BF8
adds r0, r3 adds r0, r3
ldr r1, =DummyObjectCallback ldr r1, =DummyObjectCallback
str r1, [r0] str r1, [r0]
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085EAA62 ldr r1, =gUnknown_085EAA62
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_812A1F0 ldr r2, =sub_812A1F0
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
@@ -6161,10 +6161,10 @@ sub_8129C74: @ 8129C74
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _08129CA8 beq _08129CA8
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAAA3 ldr r1, =gUnknown_085EAAA3
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_812A1A0 ldr r2, =sub_812A1A0
b _08129D14 b _08129D14
.pool .pool
@@ -6215,10 +6215,10 @@ _08129CDE:
adds r0, r3 adds r0, r3
ldr r1, =DummyObjectCallback ldr r1, =DummyObjectCallback
str r1, [r0] str r1, [r0]
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAA62 ldr r1, =gUnknown_085EAA62
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_812A1F0 ldr r2, =sub_812A1F0
_08129D14: _08129D14:
adds r0, r5, 0 adds r0, r5, 0
@@ -6227,10 +6227,10 @@ _08129D14:
b _08129D50 b _08129D50
.pool .pool
_08129D3C: _08129D3C:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAA81 ldr r1, =gUnknown_085EAA81
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_8129D64 ldr r2, =sub_8129D64
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -6501,7 +6501,7 @@ sub_8129F20: @ 8129F20
movs r6, 0xF movs r6, 0xF
ands r6, r0 ands r6, r0
movs r4, 0 movs r4, 0
ldr r7, =gUnknown_03005D8C ldr r7, =gSaveBlock1Ptr
mov r9, r3 mov r9, r3
_08129F4A: _08129F4A:
ldr r1, [r7] ldr r1, [r7]
@@ -7038,7 +7038,7 @@ _0812A398:
thumb_func_start sub_812A39C thumb_func_start sub_812A39C
sub_812A39C: @ 812A39C sub_812A39C: @ 812A39C
push {lr} push {lr}
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
cmp r0, 0 cmp r0, 0
@@ -7075,7 +7075,7 @@ sub_812A3D4: @ 812A3D4
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _0812A430 bne _0812A430
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r1, =gUnknown_0203A172 ldr r1, =gUnknown_0203A172
ldrb r2, [r1] ldrb r2, [r1]
ldr r1, =gUnknown_0203A14C ldr r1, =gUnknown_0203A14C
@@ -7085,11 +7085,11 @@ sub_812A3D4: @ 812A3D4
lsls r1, 5 lsls r1, 5
ldr r2, =gUnknown_085A5C09 ldr r2, =gUnknown_085A5C09
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAA14 ldr r1, =gUnknown_085EAA14
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_812A458 ldr r2, =sub_812A458
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -7097,10 +7097,10 @@ sub_812A3D4: @ 812A3D4
b _0812A444 b _0812A444
.pool .pool
_0812A430: _0812A430:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA9E0 ldr r1, =gUnknown_085EA9E0
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_8127A5C ldr r2, =sub_8127A5C
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -7150,10 +7150,10 @@ sub_812A478: @ 812A478
bl sub_8161A38 bl sub_8161A38
adds r0, r4, 0 adds r0, r4, 0
bl sub_8127814 bl sub_8127814
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085EAA3D ldr r1, =gUnknown_085EAA3D
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_8127A5C ldr r2, =sub_8127A5C
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
+12 -12
View File
@@ -9,7 +9,7 @@
sub_81224D4: @ 81224D4 sub_81224D4: @ 81224D4
push {r4-r7,lr} push {r4-r7,lr}
movs r6, 0 movs r6, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
_081224DA: _081224DA:
movs r0, 0xA movs r0, 0xA
bl sub_811EE38 bl sub_811EE38
@@ -66,7 +66,7 @@ _08122522:
lsrs r6, r0, 16 lsrs r6, r0, 16
cmp r6, 0x4 cmp r6, 0x4
bls _081224DA bls _081224DA
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002e68 ldr r1, =0x00002e68
adds r0, r1 adds r0, r1
@@ -109,7 +109,7 @@ _081225AA:
lsls r0, r3, 3 lsls r0, r3, 3
ldr r4, =0x00002e68 ldr r4, =0x00002e68
adds r0, r4 adds r0, r4
ldr r3, =gUnknown_03005D8C ldr r3, =gSaveBlock1Ptr
ldr r1, [r3] ldr r1, [r3]
adds r5, r1, r0 adds r5, r1, r0
ldrb r6, [r5, 0x1] ldrb r6, [r5, 0x1]
@@ -236,7 +236,7 @@ _0812269E:
bhi _081226AE bhi _081226AE
b _081225AA b _081225AA
_081226AE: _081226AE:
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00002e68 ldr r1, =0x00002e68
adds r0, r1 adds r0, r1
@@ -286,7 +286,7 @@ _081226F8:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08122744 bne _08122744
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
mov r0, r8 mov r0, r8
ldrh r2, [r0] ldrh r2, [r0]
@@ -317,7 +317,7 @@ _08122744:
bl sub_8122B28 bl sub_8122B28
movs r5, 0 movs r5, 0
_08122762: _08122762:
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
lsls r4, r5, 3 lsls r4, r5, 3
ldr r1, =0x00002e68 ldr r1, =0x00002e68
adds r0, r4, r1 adds r0, r4, r1
@@ -576,7 +576,7 @@ _08122946:
movs r2, 0x2 movs r2, 0x2
bl sub_8122804 bl sub_8122804
adds r4, r7, 0 adds r4, r7, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002e68 ldr r1, =0x00002e68
adds r1, r0 adds r1, r0
@@ -613,13 +613,13 @@ _08122980:
thumb_func_start sub_8122998 thumb_func_start sub_8122998
sub_8122998: @ 8122998 sub_8122998: @ 8122998
push {lr} push {lr}
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E0 ldr r0, =gUnknown_020375E0
ldrh r1, [r0] ldrh r1, [r0]
lsls r1, 3 lsls r1, 3
ldr r0, [r2] ldr r0, [r2]
adds r1, r0 adds r1, r0
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r2, =0x00002e6c ldr r2, =0x00002e6c
adds r1, r2 adds r1, r2
movs r2, 0x2 movs r2, 0x2
@@ -634,7 +634,7 @@ sub_8122998: @ 8122998
sub_81229C8: @ 81229C8 sub_81229C8: @ 81229C8
push {r4,lr} push {r4,lr}
movs r4, 0 movs r4, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r3, [r0] ldr r3, [r0]
ldr r1, =0x00002e68 ldr r1, =0x00002e68
adds r0, r3, r1 adds r0, r3, r1
@@ -678,7 +678,7 @@ _08122A0C:
thumb_func_start sub_8122A30 thumb_func_start sub_8122A30
sub_8122A30: @ 8122A30 sub_8122A30: @ 8122A30
ldr r2, =gUnknown_020375F0 ldr r2, =gUnknown_020375F0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r3, =0x00002e6c ldr r3, =0x00002e6c
adds r1, r0, r3 adds r1, r0, r3
@@ -877,7 +877,7 @@ sub_8122BB0: @ 8122BB0
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r0, 0 adds r5, r0, 0
movs r4, 0 movs r4, 0
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
_08122BB8: _08122BB8:
lsls r1, r4, 3 lsls r1, r4, 3
ldr r0, [r6] ldr r0, [r6]
+6 -6
View File
@@ -261,23 +261,23 @@ pokedex_diploma_something: @ 8177AD4
lsls r1, 1 lsls r1, 1
movs r0, 0x14 movs r0, 0x14
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r1, =gUnknown_085EE855 ldr r1, =gUnknown_085EE855
bl CopyString bl StringCopy
b _08177B0C b _08177B0C
.pool .pool
_08177AFC: _08177AFC:
movs r0, 0x14 movs r0, 0x14
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r1, =gUnknown_085EE84F ldr r1, =gUnknown_085EE84F
bl CopyString bl StringCopy
_08177B0C: _08177B0C:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE85E ldr r1, =gUnknown_085EE85E
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
movs r2, 0x1 movs r2, 0x1
+50 -50
View File
@@ -396,35 +396,35 @@ _0811A510:
.4byte _0811A7AC .4byte _0811A7AC
.4byte _0811A7BC .4byte _0811A7BC
_0811A564: _0811A564:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002bb0 ldr r1, =0x00002bb0
adds r4, r0, r1 adds r4, r0, r1
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A578: _0811A578:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00002bbc ldr r2, =0x00002bbc
adds r4, r0, r2 adds r4, r0, r2
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A58C: _0811A58C:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r3, =0x00002bc8 ldr r3, =0x00002bc8
adds r4, r0, r3 adds r4, r0, r3
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A5A0: _0811A5A0:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002bd4 ldr r1, =0x00002bd4
adds r4, r0, r1 adds r4, r0, r1
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A5B4: _0811A5B4:
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2 ldr r0, =gUnknown_020375E2
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
@@ -437,7 +437,7 @@ _0811A5B4:
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A5D8: _0811A5D8:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00002e36 ldr r2, =0x00002e36
adds r1, r0, r2 adds r1, r0, r2
@@ -455,7 +455,7 @@ _0811A5E6:
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A604: _0811A604:
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2 ldr r0, =gUnknown_020375E2
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
@@ -470,7 +470,7 @@ _0811A604:
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A630: _0811A630:
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2 ldr r0, =gUnknown_020375E2
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
@@ -489,7 +489,7 @@ _0811A630:
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A664: _0811A664:
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2 ldr r0, =gUnknown_020375E2
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
@@ -503,8 +503,8 @@ _0811A664:
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A688: _0811A688:
ldr r4, =gUnknown_02021EC4 ldr r4, =gStringVar3
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r0, [r1] ldr r0, [r1]
ldr r2, =0x00002e6c ldr r2, =0x00002e6c
adds r0, r2 adds r0, r2
@@ -518,7 +518,7 @@ _0811A688:
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A6B4: _0811A6B4:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002baa ldr r1, =0x00002baa
adds r4, r0, r1 adds r4, r0, r1
@@ -529,7 +529,7 @@ _0811A6B4:
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A6D4: _0811A6D4:
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2 ldr r0, =gUnknown_020375E2
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
@@ -548,7 +548,7 @@ _0811A6D4:
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A708: _0811A708:
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2 ldr r0, =gUnknown_020375E2
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
@@ -562,14 +562,14 @@ _0811A708:
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A72C: _0811A72C:
ldr r4, =gUnknown_02021EC4 ldr r4, =gStringVar3
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x2 movs r1, 0x2
bl sub_811F88C bl sub_811F88C
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A73C: _0811A73C:
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_020375E2 ldr r0, =gUnknown_020375E2
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
@@ -588,28 +588,28 @@ _0811A73C:
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A770: _0811A770:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r3, =0x00003b6e ldr r3, =0x00003b6e
adds r4, r0, r3 adds r4, r0, r3
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A784: _0811A784:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003b5a ldr r1, =0x00003b5a
adds r4, r0, r1 adds r4, r0, r1
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A798: _0811A798:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00003b6c ldr r2, =0x00003b6c
adds r4, r0, r2 adds r4, r0, r2
b _0811A7C2 b _0811A7C2
.pool .pool
_0811A7AC: _0811A7AC:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
movs r3, 0x82 movs r3, 0x82
lsls r3, 1 lsls r3, 1
@@ -661,7 +661,7 @@ _0811A80E:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _0811A84E bne _0811A84E
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003b58 ldr r1, =0x00003b58
adds r0, r1 adds r0, r1
@@ -756,7 +756,7 @@ sub_811A8A4: @ 811A8A4
thumb_func_start sub_811A8CC thumb_func_start sub_811A8CC
sub_811A8CC: @ 811A8CC sub_811A8CC: @ 811A8CC
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00003b6e ldr r0, =0x00003b6e
adds r1, r0 adds r1, r0
@@ -772,7 +772,7 @@ sub_811A8CC: @ 811A8CC
thumb_func_start sub_811A8F0 thumb_func_start sub_811A8F0
sub_811A8F0: @ 811A8F0 sub_811A8F0: @ 811A8F0
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00003b5a ldr r0, =0x00003b5a
adds r1, r0 adds r1, r0
@@ -788,7 +788,7 @@ sub_811A8F0: @ 811A8F0
thumb_func_start sub_811A914 thumb_func_start sub_811A914
sub_811A914: @ 811A914 sub_811A914: @ 811A914
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00003b6c ldr r0, =0x00003b6c
adds r1, r0 adds r1, r0
@@ -804,7 +804,7 @@ sub_811A914: @ 811A914
thumb_func_start sub_811A938 thumb_func_start sub_811A938
sub_811A938: @ 811A938 sub_811A938: @ 811A938
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00003b5a ldr r0, =0x00003b5a
adds r1, r0 adds r1, r0
@@ -3632,7 +3632,7 @@ _0811BD7C:
movs r0, 0 movs r0, 0
b _0811BD9C b _0811BD9C
_0811BD80: _0811BD80:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r2, 0 movs r2, 0
ldr r3, =0x0000ffff ldr r3, =0x0000ffff
@@ -3666,7 +3666,7 @@ sub_811BDB0: @ 811BDB0
b _0811BDDE b _0811BDDE
.pool .pool
_0811BDC8: _0811BDC8:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003b58 ldr r1, =0x00003b58
adds r0, r1 adds r0, r1
@@ -3689,13 +3689,13 @@ sub_811BDF0: @ 811BDF0
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x20 sub sp, 0x20
adds r6, r0, 0 adds r6, r0, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r4, [r0] ldr r4, [r0]
bl sub_81AFBF0 bl sub_81AFBF0
ldr r0, =0x00003b70 ldr r0, =0x00003b70
adds r5, r4, r0 adds r5, r4, r0
adds r0, r5, 0 adds r0, r5, 0
bl GetStringLength bl StringLength
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _0811BE34 beq _0811BE34
@@ -3732,7 +3732,7 @@ sub_811BE54: @ 811BE54
ldr r0, [r0] ldr r0, [r0]
adds r4, r0, 0 adds r4, r0, 0
adds r4, 0x3C adds r4, 0x3C
ldr r2, =gUnknown_02021DC4 ldr r2, =gStringVar2
movs r5, 0 movs r5, 0
b _0811BE86 b _0811BE86
.pool .pool
@@ -6261,7 +6261,7 @@ _0811D32C:
strb r0, [r1, 0xB] strb r0, [r1, 0xB]
adds r0, r2, 0 adds r0, r2, 0
add r1, sp, 0xC add r1, sp, 0xC
bl AppendString bl StringAppend
adds r2, r0, 0 adds r2, r0, 0
movs r5, 0 movs r5, 0
lsls r0, r7, 4 lsls r0, r7, 4
@@ -6316,7 +6316,7 @@ _0811D3A8:
_0811D3AE: _0811D3AE:
adds r0, r2, 0 adds r0, r2, 0
add r1, sp, 0xC add r1, sp, 0xC
bl AppendString bl StringAppend
adds r2, r0, 0 adds r2, r0, 0
cmp r6, 0x2 cmp r6, 0x2
beq _0811D3C4 beq _0811D3C4
@@ -9006,7 +9006,7 @@ _0811E852:
movs r1, 0x2 movs r1, 0x2
bl StartObjectImageAnim bl StartObjectImageAnim
_0811E892: _0811E892:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
movs r1, 0x69 movs r1, 0x69
@@ -9456,7 +9456,7 @@ _0811EBD8:
adds r1, r0, 0 adds r1, r0, 0
_0811EBEA: _0811EBEA:
adds r0, r5, 0 adds r0, r5, 0
bl CopyString bl StringCopy
b _0811EC02 b _0811EC02
.pool .pool
_0811EBFC: _0811EBFC:
@@ -9695,7 +9695,7 @@ _0811ED94:
_0811EDB0: _0811EDB0:
ldr r0, =gUnknown_085EEA42 ldr r0, =gUnknown_085EEA42
_0811EDB2: _0811EDB2:
bl GetStringLength bl StringLength
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
_0811EDBA: _0811EDBA:
@@ -9868,7 +9868,7 @@ _0811EEE4:
beq _0811EF3C beq _0811EF3C
b _0811EF58 b _0811EF58
_0811EEEE: _0811EEEE:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002bb0 ldr r1, =0x00002bb0
adds r5, r0, r1 adds r5, r0, r1
@@ -9876,7 +9876,7 @@ _0811EEEE:
b _0811EF46 b _0811EF46
.pool .pool
_0811EF04: _0811EF04:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002bbc ldr r1, =0x00002bbc
adds r5, r0, r1 adds r5, r0, r1
@@ -9893,13 +9893,13 @@ _0811EF04:
b _0811EF48 b _0811EF48
.pool .pool
_0811EF2C: _0811EF2C:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002bc8 ldr r1, =0x00002bc8
b _0811EF42 b _0811EF42
.pool .pool
_0811EF3C: _0811EF3C:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002bd4 ldr r1, =0x00002bd4
_0811EF42: _0811EF42:
@@ -9909,7 +9909,7 @@ _0811EF44:
_0811EF46: _0811EF46:
movs r3, 0x2 movs r3, 0x2
_0811EF48: _0811EF48:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl ConvertEasyChatWordsToString bl ConvertEasyChatWordsToString
@@ -9937,7 +9937,7 @@ _0811EF7E:
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
bl CopyEasyChatWord bl CopyEasyChatWord
pop {r0} pop {r0}
bx r0 bx r0
@@ -9952,7 +9952,7 @@ sub_811EF98: @ 811EF98
lsls r1, 19 lsls r1, 19
ands r1, r0 ands r1, r0
lsrs r1, 24 lsrs r1, 24
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r3, =0x00002e20 ldr r3, =0x00002e20
adds r0, r3 adds r0, r3
@@ -9975,7 +9975,7 @@ sub_811EFC0: @ 811EFC0
lsrs r3, r0, 27 lsrs r3, r0, 27
movs r2, 0x7 movs r2, 0x7
ands r2, r1 ands r2, r1
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00002e20 ldr r0, =0x00002e20
adds r1, r0 adds r1, r0
@@ -10206,7 +10206,7 @@ _0811F174:
sub_811F184: @ 811F184 sub_811F184: @ 811F184
push {r4-r7,lr} push {r4-r7,lr}
movs r2, 0 movs r2, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r4, =0x00002bb0 ldr r4, =0x00002bb0
ldr r3, =gUnknown_0859E62C ldr r3, =gUnknown_0859E62C
_0811F18E: _0811F18E:
@@ -10223,7 +10223,7 @@ _0811F18E:
cmp r2, 0x3 cmp r2, 0x3
bls _0811F18E bls _0811F18E
movs r2, 0 movs r2, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r4, =0x00002bbc ldr r4, =0x00002bbc
ldr r3, =gUnknown_0859E634 ldr r3, =gUnknown_0859E634
_0811F1AE: _0811F1AE:
@@ -10240,7 +10240,7 @@ _0811F1AE:
cmp r2, 0x5 cmp r2, 0x5
bls _0811F1AE bls _0811F1AE
movs r2, 0 movs r2, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r4, =0x00002bc8 ldr r4, =0x00002bc8
ldr r3, =gUnknown_0859E640 ldr r3, =gUnknown_0859E640
_0811F1CE: _0811F1CE:
@@ -10257,7 +10257,7 @@ _0811F1CE:
cmp r2, 0x5 cmp r2, 0x5
bls _0811F1CE bls _0811F1CE
movs r2, 0 movs r2, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r4, =0x00002bd4 ldr r4, =0x00002bd4
ldr r3, =gUnknown_0859E64C ldr r3, =gUnknown_0859E64C
_0811F1EE: _0811F1EE:
@@ -10274,7 +10274,7 @@ _0811F1EE:
cmp r2, 0x5 cmp r2, 0x5
bls _0811F1EE bls _0811F1EE
movs r2, 0 movs r2, 0
ldr r7, =gUnknown_03005D8C ldr r7, =gSaveBlock1Ptr
ldr r6, =0x00002be0 ldr r6, =0x00002be0
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
adds r5, r0, 0 adds r5, r0, 0
@@ -10303,7 +10303,7 @@ _0811F218:
cmp r2, 0xF cmp r2, 0xF
bls _0811F210 bls _0811F210
movs r2, 0 movs r2, 0
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r3, =0x00002e20 ldr r3, =0x00002e20
movs r1, 0 movs r1, 0
_0811F244: _0811F244:
@@ -10512,7 +10512,7 @@ sub_811F3E0: @ 811F3E0
adds r1, r0 adds r1, r0
ldr r1, [r1] ldr r1, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
adds r1, r0, 0 adds r1, r0, 0
subs r4, r1, r4 subs r4, r1, r4
lsls r4, 16 lsls r4, 16
+17 -17
View File
@@ -222,7 +222,7 @@ sub_80714B8: @ 80714B8
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x3 movs r1, 0x3
bl pokedex_flag_operation bl pokedex_flag_operation
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
adds r0, r5, 0 adds r0, r5, 0
bl pokemon_get_nick bl pokemon_get_nick
mov r2, sp mov r2, sp
@@ -288,29 +288,29 @@ sub_807158C: @ 807158C
adds r6, 0x7C adds r6, 0x7C
mov r0, sp mov r0, sp
adds r1, r6, 0 adds r1, r6, 0
bl CompareStringWithoutExtendedControlCodes bl StringCompareWithoutExtCtrlCodes
adds r5, r4, 0 adds r5, r4, 0
adds r5, 0x74 adds r5, 0x74
cmp r0, 0 cmp r0, 0
bne _080715CE bne _080715CE
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
adds r1, r5, 0 adds r1, r5, 0
bl CompareStringWithoutExtendedControlCodes bl StringCompareWithoutExtCtrlCodes
cmp r0, 0 cmp r0, 0
beq _08071608 beq _08071608
_080715CE: _080715CE:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
mov r1, sp mov r1, sp
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
adds r4, 0x87 adds r4, 0x87
ldrb r2, [r4] ldrb r2, [r4]
lsls r2, 28 lsls r2, 28
lsrs r2, 28 lsrs r2, 28
adds r1, r5, 0 adds r1, r5, 0
bl sub_81DB5E8 bl sub_81DB5E8
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldrb r2, [r4] ldrb r2, [r4]
lsrs r2, 4 lsrs r2, 4
adds r1, r6, 0 adds r1, r6, 0
@@ -330,7 +330,7 @@ _0807160A:
thumb_func_start sub_8071614 thumb_func_start sub_8071614
sub_8071614: @ 8071614 sub_8071614: @ 8071614
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003030 ldr r1, =0x00003030
adds r0, r1 adds r0, r1
@@ -734,7 +734,7 @@ sub_80719FC: @ 80719FC
muls r0, r1 muls r0, r1
ldr r1, =gUnknown_020244EC ldr r1, =gUnknown_020244EC
adds r0, r1 adds r0, r1
ldr r2, =gUnknown_02021EC4 ldr r2, =gStringVar3
movs r1, 0x2 movs r1, 0x2
bl pokemon_setattr bl pokemon_setattr
bl sub_805F094 bl sub_805F094
@@ -968,12 +968,12 @@ _08071C24:
muls r0, r1 muls r0, r1
ldr r1, =gUnknown_020244EC ldr r1, =gUnknown_020244EC
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl pokemon_get_nick bl pokemon_get_nick
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085ED5A5 ldr r1, =gUnknown_085ED5A5
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r0, [r5] ldr r0, [r5]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
movs r1, 0xFF movs r1, 0xFF
@@ -1020,12 +1020,12 @@ _08071CA4:
muls r0, r1 muls r0, r1
ldr r1, =gUnknown_020244EC ldr r1, =gUnknown_020244EC
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl pokemon_get_nick bl pokemon_get_nick
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085ED5BE ldr r1, =gUnknown_085ED5BE
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r0, [r5] ldr r0, [r5]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
movs r1, 0x1 movs r1, 0x1
@@ -1087,7 +1087,7 @@ _08071D3C:
muls r0, r6 muls r0, r6
ldr r5, =gUnknown_020244EC ldr r5, =gUnknown_020244EC
adds r0, r5 adds r0, r5
ldr r1, =gUnknown_02021EC4 ldr r1, =gStringVar3
mov r9, r1 mov r9, r1
bl pokemon_get_nick bl pokemon_get_nick
mov r1, r8 mov r1, r8
+25 -25
View File
@@ -207,17 +207,17 @@ evolution_cutscene: @ 813DA8C
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
mov r1, sp mov r1, sp
bl CopyString_Limit10 bl StringCopy10
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
movs r1, 0xB movs r1, 0xB
mov r2, r10 mov r2, r10
muls r2, r1 muls r2, r1
adds r1, r2, 0 adds r1, r2, 0
ldr r2, =gSpeciesNames ldr r2, =gSpeciesNames
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
bl pokemon_getattr bl pokemon_getattr
@@ -829,15 +829,15 @@ sub_813E1D4: @ 813E1D4
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
mov r1, sp mov r1, sp
bl CopyString_Limit10 bl StringCopy10
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
movs r1, 0xB movs r1, 0xB
muls r1, r5 muls r1, r5
ldr r2, =gSpeciesNames ldr r2, =gSpeciesNames
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r1, =gUnknown_02021CC0 ldr r1, =gUnknown_02021CC0
movs r0, 0x1 movs r0, 0x1
strb r0, [r1] strb r0, [r1]
@@ -1332,10 +1332,10 @@ _0813E6D4:
beq _0813E6E4 beq _0813E6E4
bl _0813F1A4 bl _0813F1A4
_0813E6E4: _0813E6E4:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085CC990 ldr r1, =gUnknown_085CC990
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
@@ -1620,10 +1620,10 @@ _0813E990:
bne _0813E99E bne _0813E99E
bl _0813F1A4 bl _0813F1A4
_0813E99E: _0813E99E:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085CC9A6 ldr r1, =gUnknown_085CC9A6
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
@@ -1708,7 +1708,7 @@ _0813EA5E:
bl pokemon_getattr bl pokemon_getattr
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
add r1, sp, 0x4 add r1, sp, 0x4
bl CopyString_Limit10 bl StringCopy10
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
cmp r6, r0 cmp r6, r0
bne _0813EA94 bne _0813EA94
@@ -1856,17 +1856,17 @@ _0813EBB8:
ldrsh r0, [r1, r3] ldrsh r0, [r1, r3]
cmp r0, 0 cmp r0, 0
beq _0813EBE4 beq _0813EBE4
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085CC9EE ldr r1, =gUnknown_085CC9EE
bl ExpandStringRefs bl StringExpandPlaceholders
b _0813EBEC b _0813EBEC
.pool .pool
_0813EBE4: _0813EBE4:
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085CC9D3 ldr r1, =gUnknown_085CC9D3
bl ExpandStringRefs bl StringExpandPlaceholders
_0813EBEC: _0813EBEC:
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
movs r1, 0 movs r1, 0
bl battle_show_message_maybe bl battle_show_message_maybe
ldr r1, =gTasks ldr r1, =gTasks
@@ -2532,10 +2532,10 @@ _0813F204:
.4byte _0813F7A4 .4byte _0813F7A4
.4byte _0813F7E4 .4byte _0813F7E4
_0813F258: _0813F258:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085CC990 ldr r1, =gUnknown_085CC990
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x1 movs r2, 0x1
@@ -2803,10 +2803,10 @@ _0813F4E4:
bne _0813F4F2 bne _0813F4F2
bl _0813FCC4 bl _0813FCC4
_0813F4F2: _0813F4F2:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085CC9A6 ldr r1, =gUnknown_085CC9A6
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x1 movs r2, 0x1
@@ -2892,7 +2892,7 @@ _0813F58C:
bl pokemon_getattr bl pokemon_getattr
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
add r1, sp, 0x4 add r1, sp, 0x4
bl CopyString_Limit10 bl StringCopy10
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
cmp r6, r0 cmp r6, r0
bne _0813F5E8 bne _0813F5E8
@@ -3028,10 +3028,10 @@ _0813F704:
bne _0813F714 bne _0813F714
b _0813FCC4 b _0813FCC4
_0813F714: _0813F714:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085CC9EE ldr r1, =gUnknown_085CC9EE
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x1 movs r2, 0x1
+6 -6
View File
@@ -129,7 +129,7 @@ sub_8089C08: @ 8089C08
@ void DrawWholeMapView() @ void DrawWholeMapView()
DrawWholeMapView: @ 8089C34 DrawWholeMapView: @ 8089C34
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r2, 0 movs r2, 0
ldrsh r0, [r1, r2] ldrsh r0, [r1, r2]
@@ -291,7 +291,7 @@ _08089D5E:
adds r1, r6, r0 adds r1, r6, r0
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r3, [r0] ldr r3, [r0]
movs r0, 0 movs r0, 0
ldrsh r2, [r3, r0] ldrsh r2, [r3, r0]
@@ -334,7 +334,7 @@ _08089D9C:
lsrs r0, 24 lsrs r0, 24
_08089DAE: _08089DAE:
adds r1, r6, r0 adds r1, r6, r0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r3, [r0] ldr r3, [r0]
movs r0, 0 movs r0, 0
ldrsh r2, [r3, r0] ldrsh r2, [r3, r0]
@@ -380,7 +380,7 @@ _08089DFC:
adds r1, r6 adds r1, r6
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r3, 0 movs r3, 0
ldrsh r2, [r0, r3] ldrsh r2, [r0, r3]
@@ -438,7 +438,7 @@ _08089E66:
adds r1, r5 adds r1, r5
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r3, 0 movs r3, 0
ldrsh r2, [r0, r3] ldrsh r2, [r0, r3]
@@ -724,7 +724,7 @@ _0808A082:
MapPosToBgTilemapOffset: @ 808A0AC MapPosToBgTilemapOffset: @ 808A0AC
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r3, [r0] ldr r3, [r0]
movs r5, 0 movs r5, 0
ldrsh r0, [r3, r5] ldrsh r0, [r3, r5]
+1 -1
View File
@@ -735,7 +735,7 @@ sub_808A964: @ 808A964
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0808A990 beq _0808A990
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrh r1, [r0, 0x4] ldrh r1, [r0, 0x4]
ldr r0, =0x0000101a ldr r0, =0x0000101a
+2 -2
View File
@@ -833,7 +833,7 @@ unc_grass_normal: @ 8154550
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0815459C beq _0815459C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
movs r0, 0x5 movs r0, 0x5
ldrsb r0, [r2, r0] ldrsb r0, [r2, r0]
@@ -1172,7 +1172,7 @@ unc_grass_tall: @ 8154800
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0815484C beq _0815484C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
movs r0, 0x5 movs r0, 0x5
ldrsb r0, [r2, r0] ldrsb r0, [r2, r0]
+4 -4
View File
@@ -1185,7 +1185,7 @@ GroundEffect_SpawnOnTallGrass: @ 8096E90
str r1, [r3, 0x10] str r1, [r3, 0x10]
ldrb r0, [r0, 0xA] ldrb r0, [r0, 0xA]
str r0, [r3, 0x14] str r0, [r3, 0x14]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldrb r0, [r1, 0x5] ldrb r0, [r1, 0x5]
lsls r0, 8 lsls r0, 8
@@ -1224,7 +1224,7 @@ GroundEffect_StepOnTallGrass: @ 8096EDC
str r1, [r3, 0x10] str r1, [r3, 0x10]
ldrb r0, [r0, 0xA] ldrb r0, [r0, 0xA]
str r0, [r3, 0x14] str r0, [r3, 0x14]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldrb r0, [r1, 0x5] ldrb r0, [r1, 0x5]
lsls r0, 8 lsls r0, 8
@@ -1263,7 +1263,7 @@ GroundEffect_SpawnOnLongGrass: @ 8096F28
str r1, [r3, 0x10] str r1, [r3, 0x10]
ldrb r0, [r0, 0xA] ldrb r0, [r0, 0xA]
str r0, [r3, 0x14] str r0, [r3, 0x14]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldrb r0, [r1, 0x5] ldrb r0, [r1, 0x5]
lsls r0, 8 lsls r0, 8
@@ -1302,7 +1302,7 @@ GroundEffect_StepOnLongGrass: @ 8096F74
str r1, [r3, 0x10] str r1, [r3, 0x10]
ldrb r0, [r0, 0xA] ldrb r0, [r0, 0xA]
str r0, [r3, 0x14] str r0, [r3, 0x14]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldrb r0, [r1, 0x5] ldrb r0, [r1, 0x5]
lsls r0, 8 lsls r0, 8
+10 -10
View File
@@ -535,7 +535,7 @@ _0808D7CA:
movs r5, 0 movs r5, 0
cmp r5, r6 cmp r5, r6
bcs _0808D7FE bcs _0808D7FE
ldr r7, =gUnknown_03005D8C ldr r7, =gSaveBlock1Ptr
_0808D7D2: _0808D7D2:
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r5 adds r0, r5
@@ -1099,7 +1099,7 @@ SpawnSpecialFieldObject: @ 808DC08
add r0, sp, 0x4 add r0, sp, 0x4
adds r1, r4, 0 adds r1, r4, 0
bl GetFieldObjectMovingCameraOffset bl GetFieldObjectMovingCameraOffset
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r1, [r0, 0x5] ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4] ldrb r2, [r0, 0x4]
@@ -1557,7 +1557,7 @@ SpawnFieldObjectsInView: @ 808DF80
ldr r0, [r5, 0x4] ldr r0, [r5, 0x4]
cmp r0, 0 cmp r0, 0
beq _0808E078 beq _0808E078
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldrh r1, [r2] ldrh r1, [r2]
subs r0, r1, 0x2 subs r0, r1, 0x2
@@ -1610,7 +1610,7 @@ _0808E004:
movs r2, 0xC7 movs r2, 0xC7
lsls r2, 4 lsls r2, 4
adds r0, r2 adds r0, r2
ldr r3, =gUnknown_03005D8C ldr r3, =gSaveBlock1Ptr
ldr r1, [r3] ldr r1, [r3]
adds r4, r1, r0 adds r4, r1, r0
ldrh r0, [r4, 0x4] ldrh r0, [r4, 0x4]
@@ -1642,7 +1642,7 @@ _0808E004:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0808E06E bne _0808E06E
ldr r3, =gUnknown_03005D8C ldr r3, =gSaveBlock1Ptr
ldr r0, [r3] ldr r0, [r3]
ldrb r1, [r0, 0x5] ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4] ldrb r2, [r0, 0x4]
@@ -1729,7 +1729,7 @@ _0808E0D2:
RemoveFieldObjectIfOutsideView: @ 808E0EC RemoveFieldObjectIfOutsideView: @ 808E0EC
push {r4-r7,lr} push {r4-r7,lr}
adds r3, r0, 0 adds r3, r0, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldrh r0, [r2] ldrh r0, [r2]
subs r1, r0, 0x2 subs r1, r0, 0x2
@@ -3952,7 +3952,7 @@ GetFieldObjectTemplateByLocalIdAndMap: @ 808F128
lsrs r3, r1, 24 lsrs r3, r1, 24
lsls r2, 24 lsls r2, 24
lsrs r2, 24 lsrs r2, 24
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x5 movs r0, 0x5
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
@@ -4026,7 +4026,7 @@ sub_808F1B4: @ 808F1B4
push {r4,r5,lr} push {r4,r5,lr}
adds r3, r0, 0 adds r3, r0, 0
ldrb r0, [r3, 0x9] ldrb r0, [r3, 0x9]
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
movs r1, 0x5 movs r1, 0x5
ldrsb r1, [r2, r1] ldrsb r1, [r2, r1]
@@ -12477,7 +12477,7 @@ _08092FE4:
thumb_func_start sub_8092FF0 thumb_func_start sub_8092FF0
sub_8092FF0: @ 8092FF0 sub_8092FF0: @ 8092FF0
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r4, [r5] ldr r4, [r5]
ldrh r4, [r4] ldrh r4, [r4]
lsls r0, 16 lsls r0, 16
@@ -12562,7 +12562,7 @@ _0809308C:
adds r0, r1 adds r0, r1
lsrs r4, r0, 16 lsrs r4, r0, 16
_08093098: _08093098:
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r0, [r2] ldr r0, [r2]
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r5, 16 lsls r0, r5, 16
+4 -4
View File
@@ -160,9 +160,9 @@ sub_8098238: @ 8098238
ldrb r0, [r5] ldrb r0, [r5]
cmp r0, 0 cmp r0, 0
bne _08098270 bne _08098270
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
adds r1, r4, 0 adds r1, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r0, =sub_8098214 ldr r0, =sub_8098214
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
@@ -243,9 +243,9 @@ textbox_fdecode_auto_and_task_add: @ 80982DC
push {r4,lr} push {r4,lr}
adds r2, r0, 0 adds r2, r0, 0
adds r4, r1, 0 adds r4, r1, 0
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
adds r1, r2, 0 adds r1, r2, 0
bl ExpandStringRefs bl StringExpandPlaceholders
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
adds r0, r4, 0 adds r0, r4, 0
+2 -2
View File
@@ -78,13 +78,13 @@ sub_80F95C0: @ 80F95C0
movs r1, 0x37 movs r1, 0x37
mov r2, sp mov r2, sp
bl pokemon_setattr bl pokemon_setattr
ldr r5, =gUnknown_02021CC4 ldr r5, =gStringVar1
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x2 movs r1, 0x2
adds r2, r5, 0 adds r2, r5, 0
bl pokemon_getattr bl pokemon_getattr
adds r0, r5, 0 adds r0, r5, 0
bl GetStringEnd_Limit7 bl StringGetEnd10
add sp, 0x4 add sp, 0x4
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
+18 -18
View File
@@ -876,7 +876,7 @@ save_serialize_map: @ 80883C4
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
push {r6,r7} push {r6,r7}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
adds r4, r1, 0 adds r4, r1, 0
adds r4, 0x34 adds r4, 0x34
@@ -936,7 +936,7 @@ sub_8088438: @ 8088438
push {r4,lr} push {r4,lr}
movs r2, 0 movs r2, 0
movs r1, 0 movs r1, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r3, r0, 0 adds r3, r0, 0
adds r3, 0x34 adds r3, 0x34
@@ -971,7 +971,7 @@ sav2_mapdata_clear: @ 8088474
mov r1, sp mov r1, sp
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
adds r1, 0x34 adds r1, 0x34
ldr r2, =0x01000100 ldr r2, =0x01000100
@@ -991,7 +991,7 @@ mapdata_from_sav2: @ 808849C
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
sub sp, 0x10 sub sp, 0x10
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
adds r7, r0, 0 adds r7, r0, 0
adds r7, 0x34 adds r7, 0x34
@@ -1147,7 +1147,7 @@ sub_80885C4: @ 80885C4
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
adds r2, r3, 0 adds r2, r3, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
adds r0, r1, 0 adds r0, r1, 0
adds r0, 0x34 adds r0, 0x34
@@ -1373,7 +1373,7 @@ _08088782:
GetPostCameraMoveMapBorderId: @ 8088788 GetPostCameraMoveMapBorderId: @ 8088788
push {r4,lr} push {r4,lr}
adds r3, r1, 0 adds r3, r1, 0
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
movs r4, 0 movs r4, 0
ldrsh r2, [r1, r4] ldrsh r2, [r1, r4]
@@ -1395,7 +1395,7 @@ GetPostCameraMoveMapBorderId: @ 8088788
@ bool32 CanCameraMoveInDirection(u8 direction) @ bool32 CanCameraMoveInDirection(u8 direction)
CanCameraMoveInDirection: @ 80887B0 CanCameraMoveInDirection: @ 80887B0
push {r4,r5,lr} push {r4,r5,lr}
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r4, [r1] ldr r4, [r1]
movs r1, 0 movs r1, 0
ldrsh r3, [r4, r1] ldrsh r3, [r4, r1]
@@ -1450,7 +1450,7 @@ _08088816:
beq _08088834 beq _08088834
cmp r4, 0x4 cmp r4, 0x4
bne _08088872 bne _08088872
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
negs r0, r6 negs r0, r6
strh r0, [r1] strh r0, [r1]
@@ -1460,7 +1460,7 @@ _08088816:
b _08088870 b _08088870
.pool .pool
_08088834: _08088834:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, [r3] ldr r0, [r3]
ldr r0, [r0] ldr r0, [r0]
@@ -1471,7 +1471,7 @@ _08088834:
b _08088870 b _08088870
.pool .pool
_0808884C: _0808884C:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r2, [r5, 0x4] ldr r2, [r5, 0x4]
ldrh r0, [r1] ldrh r0, [r1]
@@ -1481,7 +1481,7 @@ _0808884C:
b _08088870 b _08088870
.pool .pool
_08088860: _08088860:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r2, [r5, 0x4] ldr r2, [r5, 0x4]
ldrh r0, [r1] ldrh r0, [r1]
@@ -1522,7 +1522,7 @@ CameraMove: @ 808887C
adds r0, r7, 0x1 adds r0, r7, 0x1
cmp r0, 0x1 cmp r0, 0x1
bhi _080888C4 bhi _080888C4
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldrh r0, [r1] ldrh r0, [r1]
add r0, r10 add r0, r10
@@ -1535,7 +1535,7 @@ CameraMove: @ 808887C
_080888C4: _080888C4:
bl save_serialize_map bl save_serialize_map
bl sub_81BE72C bl sub_81BE72C
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r0, [r1] ldr r0, [r1]
movs r2, 0 movs r2, 0
ldrsh r5, [r0, r2] ldrsh r5, [r0, r2]
@@ -1562,7 +1562,7 @@ _080888C4:
orrs r0, r1 orrs r0, r1
ldr r2, =gUnknown_02037334 ldr r2, =gUnknown_02037334
strb r0, [r2] strb r0, [r2]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r2, 0 movs r2, 0
ldrsh r0, [r1, r2] ldrsh r0, [r1, r2]
@@ -1884,7 +1884,7 @@ sub_8088B3C: @ 8088B3C
lsrs r0, 16 lsrs r0, 16
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r2, [r2] ldr r2, [r2]
subs r0, 0x7 subs r0, 0x7
strh r0, [r2] strh r0, [r2]
@@ -1896,7 +1896,7 @@ sub_8088B3C: @ 8088B3C
thumb_func_start sav1_camera_get_focus_coords thumb_func_start sav1_camera_get_focus_coords
sav1_camera_get_focus_coords: @ 8088B58 sav1_camera_get_focus_coords: @ 8088B58
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r3, [r2] ldr r3, [r2]
ldrh r2, [r3] ldrh r2, [r3]
adds r2, 0x7 adds r2, 0x7
@@ -1911,7 +1911,7 @@ sav1_camera_get_focus_coords: @ 8088B58
thumb_func_start SetCameraCoords thumb_func_start SetCameraCoords
@ void SetCameraCoords(u16 x, u16 y) @ void SetCameraCoords(u16 x, u16 y)
SetCameraCoords: @ 8088B70 SetCameraCoords: @ 8088B70
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r2, [r2] ldr r2, [r2]
strh r0, [r2] strh r0, [r2]
strh r1, [r2, 0x2] strh r1, [r2, 0x2]
@@ -1922,7 +1922,7 @@ SetCameraCoords: @ 8088B70
thumb_func_start GetCameraCoords thumb_func_start GetCameraCoords
@ void GetCameraCoords(u16 *x, u16 *y) @ void GetCameraCoords(u16 *x, u16 *y)
GetCameraCoords: @ 8088B80 GetCameraCoords: @ 8088B80
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r3, [r2] ldr r3, [r2]
ldrh r2, [r3] ldrh r2, [r3]
strh r2, [r0] strh r2, [r0]
+1 -1
View File
@@ -20,7 +20,7 @@ _0809D6FC:
ldr r0, =0x00003fff ldr r0, =0x00003fff
cmp r2, r0 cmp r2, r0
bhi _0809D71C bhi _0809D71C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
lsrs r1, 19 lsrs r1, 19
ldr r2, =0x00001270 ldr r2, =0x00001270
adds r1, r2 adds r1, r2
+8 -8
View File
@@ -2055,14 +2055,14 @@ _080FACB4:
beq _080FACC2 beq _080FACC2
b _080FADCE b _080FADCE
_080FACC2: _080FACC2:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r1, 0x64 movs r1, 0x64
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r1, =gUnknown_085EA88B ldr r1, =gUnknown_085EA88B
bl CopyString bl StringCopy
ldr r1, =gUnknown_020375F0 ldr r1, =gUnknown_020375F0
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -2079,14 +2079,14 @@ _080FACC2:
b _080FAD8A b _080FAD8A
.pool .pool
_080FAD14: _080FAD14:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r1, 0x32 movs r1, 0x32
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r1, =gUnknown_085EA890 ldr r1, =gUnknown_085EA890
bl CopyString bl StringCopy
ldr r1, =gUnknown_020375F0 ldr r1, =gUnknown_020375F0
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
+2 -2
View File
@@ -287,7 +287,7 @@ sub_80B4808: @ 80B4808
strb r0, [r3] strb r0, [r3]
movs r0, 0xFE movs r0, 0xFE
strb r0, [r3, 0x1] strb r0, [r3, 0x1]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r1, [r0, 0x5] ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4] ldrb r2, [r0, 0x4]
@@ -311,7 +311,7 @@ _080B4870:
strb r0, [r3] strb r0, [r3]
movs r0, 0xFE movs r0, 0xFE
strb r0, [r3, 0x1] strb r0, [r3, 0x1]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r1, [r0, 0x5] ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4] ldrb r2, [r0, 0x4]
+1 -1
View File
@@ -72,7 +72,7 @@ sub_8145E2C: @ 8145E2C
muls r0, r1 muls r0, r1
ldr r1, =gUnknown_020244EC ldr r1, =gUnknown_020244EC
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl GetMonNickname bl GetMonNickname
movs r0, 0 movs r0, 0
pop {r1} pop {r1}
+1 -1
View File
@@ -321,7 +321,7 @@ c2_copyright_1: @ 816CEAC
_0816CEDE: _0816CEDE:
bl init_sav2 bl init_sav2
_0816CEE2: _0816CEE2:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x15] ldrb r0, [r0, 0x15]
lsls r0, 31 lsls r0, 31
+20 -20
View File
@@ -8,7 +8,7 @@
thumb_func_start decrypt_bag_item_quantity thumb_func_start decrypt_bag_item_quantity
decrypt_bag_item_quantity: @ 80D6554 decrypt_bag_item_quantity: @ 80D6554
adds r1, r0, 0 adds r1, r0, 0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xAC adds r0, 0xAC
ldr r0, [r0] ldr r0, [r0]
@@ -24,7 +24,7 @@ decrypt_bag_item_quantity: @ 80D6554
encrypt_bag_item_quantity: @ 80D656C encrypt_bag_item_quantity: @ 80D656C
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
ldr r2, =gUnknown_03005D90 ldr r2, =gSaveBlock2Ptr
ldr r2, [r2] ldr r2, [r2]
adds r2, 0xAC adds r2, 0xAC
ldr r2, [r2] ldr r2, [r2]
@@ -108,7 +108,7 @@ call_encrypt_decrypt_all_item_quantities: @ 80D65E4
init_bag_pockets: @ 80D65F0 init_bag_pockets: @ 80D65F0
push {r4,lr} push {r4,lr}
ldr r1, =gUnknown_02039DD8 ldr r1, =gUnknown_02039DD8
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
movs r3, 0xAC movs r3, 0xAC
lsls r3, 3 lsls r3, 3
@@ -156,7 +156,7 @@ itemid_get_name: @ 80D6644
bl itemid_get_item bl itemid_get_item
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -181,7 +181,7 @@ _080D667C:
ldr r1, =gUnknown_085EFCD4 ldr r1, =gUnknown_085EFCD4
_080D667E: _080D667E:
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
b _080D66BE b _080D66BE
.pool .pool
_080D668C: _080D668C:
@@ -205,7 +205,7 @@ _080D66B0:
bl itemid_get_item bl itemid_get_item
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
_080D66BE: _080D66BE:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -221,12 +221,12 @@ GetBerryCountString: @ 80D66C4
bhi _080D66CE bhi _080D66CE
ldr r4, =gUnknown_085EFCDF ldr r4, =gUnknown_085EFCDF
_080D66CE: _080D66CE:
bl CopyString bl StringCopy
movs r1, 0 movs r1, 0
strb r1, [r0] strb r1, [r0]
adds r0, 0x1 adds r0, 0x1
adds r1, r4, 0 adds r1, r4, 0
bl CopyString bl StringCopy
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -992,7 +992,7 @@ _080D6CA6:
sub_80D6CAC: @ 80D6CAC sub_80D6CAC: @ 80D6CAC
push {lr} push {lr}
movs r1, 0 movs r1, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
movs r3, 0x93 movs r3, 0x93
lsls r3, 3 lsls r3, 3
@@ -1027,7 +1027,7 @@ sub_80D6CE4: @ 80D6CE4
push {r4,lr} push {r4,lr}
movs r2, 0 movs r2, 0
movs r1, 0 movs r1, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r3, [r0] ldr r3, [r0]
movs r4, 0x93 movs r4, 0x93
lsls r4, 3 lsls r4, 3
@@ -1063,7 +1063,7 @@ sub_80D6D1C: @ 80D6D1C
lsrs r5, r1, 16 lsrs r5, r1, 16
movs r4, 0 movs r4, 0
_080D6D28: _080D6D28:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
lsls r1, r4, 2 lsls r1, r4, 2
adds r0, r2, r1 adds r0, r2, r1
@@ -1110,7 +1110,7 @@ sub_80D6D70: @ 80D6D70
movs r0, 0xC8 movs r0, 0xC8
bl AllocZeroed bl AllocZeroed
adds r7, r0, 0 adds r7, r0, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x93 movs r0, 0x93
lsls r0, 3 lsls r0, 3
@@ -1179,7 +1179,7 @@ _080D6E10:
adds r1, r5, 0 adds r1, r5, 0
bl sub_80D6588 bl sub_80D6588
_080D6E20: _080D6E20:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x93 movs r1, 0x93
lsls r1, 3 lsls r1, 3
@@ -1205,7 +1205,7 @@ sub_80D6E48: @ 80D6E48
lsls r0, 24 lsls r0, 24
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r2, [r2] ldr r2, [r2]
lsrs r0, 22 lsrs r0, 22
adds r3, r2, r0 adds r3, r2, r0
@@ -1240,7 +1240,7 @@ _080D6E88:
adds r6, r1, 0 adds r6, r1, 0
cmp r4, 0x31 cmp r4, 0x31
bhi _080D6ECA bhi _080D6ECA
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r12, r0 mov r12, r0
lsls r5, r2, 2 lsls r5, r2, 2
movs r7, 0x93 movs r7, 0x93
@@ -1283,7 +1283,7 @@ _080D6ECA:
thumb_func_start sub_80D6EDC thumb_func_start sub_80D6EDC
sub_80D6EDC: @ 80D6EDC sub_80D6EDC: @ 80D6EDC
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00000496 ldr r2, =0x00000496
adds r1, r0, r2 adds r1, r0, r2
@@ -1604,7 +1604,7 @@ sub_80D710C: @ 80D710C
lsrs r5, r0, 16 lsrs r5, r0, 16
lsls r1, 16 lsls r1, 16
lsrs r4, r1, 16 lsrs r4, r1, 16
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r3, [r0] ldr r3, [r0]
ldr r1, =0x00000ca9 ldr r1, =0x00000ca9
adds r0, r3, r1 adds r0, r3, r1
@@ -1664,7 +1664,7 @@ sub_80D7184: @ 80D7184
lsrs r5, r0, 16 lsrs r5, r0, 16
lsls r1, 16 lsls r1, 16
lsrs r4, r1, 16 lsrs r4, r1, 16
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r3, [r0] ldr r3, [r0]
ldr r1, =0x00000ca9 ldr r1, =0x00000ca9
adds r0, r3, r1 adds r0, r3, r1
@@ -1731,7 +1731,7 @@ sub_80D7204: @ 80D7204
lsrs r7, r0, 16 lsrs r7, r0, 16
lsls r1, 16 lsls r1, 16
lsrs r4, r1, 16 lsrs r4, r1, 16
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r3, [r0] ldr r3, [r0]
ldr r1, =0x00000ca9 ldr r1, =0x00000ca9
adds r0, r3, r1 adds r0, r3, r1
@@ -1879,7 +1879,7 @@ sub_80D7334: @ 80D7334
mov r9, r0 mov r9, r0
lsls r1, 16 lsls r1, 16
lsrs r4, r1, 16 lsrs r4, r1, 16
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r3, [r0] ldr r3, [r0]
ldr r1, =0x00000ca9 ldr r1, =0x00000ca9
adds r0, r3, r1 adds r0, r3, r1
+29 -29
View File
@@ -140,9 +140,9 @@ DisplayCannotUseItemMessage: @ 80FD164
lsrs r5, r0, 24 lsrs r5, r0, 24
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r6, =gUnknown_02021FC4 ldr r6, =gStringVar4
adds r0, r6, 0 adds r0, r6, 0
bl ExpandStringRefs bl StringExpandPlaceholders
cmp r4, 0 cmp r4, 0
bne _080FD1B4 bne _080FD1B4
bl InBattlePyramid bl InBattlePyramid
@@ -1532,7 +1532,7 @@ ItemUseOutOfBattle_CoinCase: @ 80FDC34
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
bl GetCoins bl GetCoins
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
@@ -1540,11 +1540,11 @@ ItemUseOutOfBattle_CoinCase: @ 80FDC34
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9026 ldr r1, =gUnknown_085E9026
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r1, =gTasks ldr r1, =gTasks
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r5 adds r0, r5
@@ -1578,17 +1578,17 @@ ItemUseOutOfBattle_PowderJar: @ 80FDCA4
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
bl sub_80247BC bl sub_80247BC
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9138 ldr r1, =gUnknown_085E9138
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r1, =gTasks ldr r1, =gTasks
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r5 adds r0, r5
@@ -1944,7 +1944,7 @@ task08_0809AD8C: @ 80FDFBC
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080FE000 beq _080FE000
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
ldr r0, =gUnknown_0203CE7C ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0] ldrh r0, [r0]
bl ItemIdToBattleMoveId bl ItemIdToBattleMoveId
@@ -1955,11 +1955,11 @@ task08_0809AD8C: @ 80FDFBC
ldr r0, =gMoveNames ldr r0, =gMoveNames
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9058 ldr r1, =gUnknown_085E9058
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r3, =sub_80FE024 ldr r3, =sub_80FE024
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
@@ -2007,11 +2007,11 @@ sub_80FE058: @ 80FE058
movs r1, 0x1 movs r1, 0x1
bl remove_item bl remove_item
ldrh r0, [r4] ldrh r0, [r4]
ldr r1, =gUnknown_02021DC4 ldr r1, =gStringVar2
bl itemid_get_name bl itemid_get_name
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9080 ldr r1, =gUnknown_085E9080
bl ExpandStringRefs bl StringExpandPlaceholders
bl InBattlePyramid bl InBattlePyramid
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
@@ -2138,7 +2138,7 @@ sub_80FE164: @ 80FE164
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FE1B8 bne _080FE1B8
ldr r2, =gUnknown_02021FC4 ldr r2, =gStringVar4
ldr r3, =bag_menu_inits_lists_menu ldr r3, =bag_menu_inits_lists_menu
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
@@ -2146,7 +2146,7 @@ sub_80FE164: @ 80FE164
b _080FE1C2 b _080FE1C2
.pool .pool
_080FE1B8: _080FE1B8:
ldr r1, =gUnknown_02021FC4 ldr r1, =gStringVar4
ldr r2, =sub_81C6714 ldr r2, =sub_81C6714
adds r0, r6, 0 adds r0, r6, 0
bl DisplayItemMessageInBattlePyramid bl DisplayItemMessageInBattlePyramid
@@ -2181,7 +2181,7 @@ sub_80FE1D0: @ 80FE1D0
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FE21C bne _080FE21C
ldr r2, =gUnknown_02021FC4 ldr r2, =gStringVar4
ldr r3, =bag_menu_inits_lists_menu ldr r3, =bag_menu_inits_lists_menu
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
@@ -2189,7 +2189,7 @@ sub_80FE1D0: @ 80FE1D0
b _080FE226 b _080FE226
.pool .pool
_080FE21C: _080FE21C:
ldr r1, =gUnknown_02021FC4 ldr r1, =gStringVar4
ldr r2, =sub_81C6714 ldr r2, =sub_81C6714
adds r0, r5, 0 adds r0, r5, 0
bl DisplayItemMessageInBattlePyramid bl DisplayItemMessageInBattlePyramid
@@ -2207,7 +2207,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r4, =gUnknown_0203CE7C ldr r4, =gUnknown_0203CE7C
ldrh r0, [r4] ldrh r0, [r4]
ldr r1, =gUnknown_02021DC4 ldr r1, =gStringVar2
bl itemid_get_name bl itemid_get_name
ldrh r0, [r4] ldrh r0, [r4]
cmp r0, 0x2B cmp r0, 0x2B
@@ -2216,9 +2216,9 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
bl FlagSet bl FlagSet
ldr r0, =0x000008ae ldr r0, =0x000008ae
bl FlagReset bl FlagReset
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E90C6 ldr r1, =gUnknown_085E90C6
bl ExpandStringRefs bl StringExpandPlaceholders
b _080FE28C b _080FE28C
.pool .pool
_080FE278: _080FE278:
@@ -2226,9 +2226,9 @@ _080FE278:
bl FlagSet bl FlagSet
ldr r0, =0x000008ad ldr r0, =0x000008ad
bl FlagReset bl FlagReset
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E90F4 ldr r1, =gUnknown_085E90F4
bl ExpandStringRefs bl StringExpandPlaceholders
_080FE28C: _080FE28C:
ldr r1, =gTasks ldr r1, =gTasks
lsls r0, r5, 2 lsls r0, r5, 2
@@ -2275,7 +2275,7 @@ re_escape_rope: @ 80FE2D8
adds r0, r1 adds r0, r1
movs r1, 0 movs r1, 0
strh r1, [r0, 0x8] strh r1, [r0, 0x8]
ldr r1, =gUnknown_02021FC4 ldr r1, =gStringVar4
ldr r2, =task08_080A1C44 ldr r2, =task08_080A1C44
adds r0, r4, 0 adds r0, r4, 0
bl DisplayItemMessageOnField bl DisplayItemMessageOnField
@@ -2629,7 +2629,7 @@ ItemUseInBattle_Escape: @ 80FE5E4
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FE620 bne _080FE620
ldr r2, =gUnknown_02021FC4 ldr r2, =gStringVar4
ldr r3, =unknown_ItemMenu_Confirm ldr r3, =unknown_ItemMenu_Confirm
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
@@ -2637,7 +2637,7 @@ ItemUseInBattle_Escape: @ 80FE5E4
b _080FE646 b _080FE646
.pool .pool
_080FE620: _080FE620:
ldr r1, =gUnknown_02021FC4 ldr r1, =gStringVar4
ldr r2, =sub_81C5B14 ldr r2, =sub_81C5B14
adds r0, r4, 0 adds r0, r4, 0
bl DisplayItemMessageInBattlePyramid bl DisplayItemMessageInBattlePyramid
+401 -401
View File
File diff suppressed because it is too large Load Diff
+34 -34
View File
@@ -70,12 +70,12 @@ InitSaveBlockPointersWithRandomOffset: @ 8076BDC
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 16 lsls r4, 16
lsrs r4, 16 lsrs r4, 16
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
bl GenerateRandomNumber bl GenerateRandomNumber
adds r4, r0 adds r4, r0
movs r0, 0x7C movs r0, 0x7C
ands r4, r0 ands r4, r0
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r0, =gUnknown_02024A54 ldr r0, =gUnknown_02024A54
adds r0, r4, r0 adds r0, r4, r0
str r0, [r1] str r0, [r1]
@@ -113,13 +113,13 @@ saveblock_randomize_and_relocate: @ 8076C2C
ldr r1, =gUnknown_0203CF5C ldr r1, =gUnknown_0203CF5C
str r0, [r1] str r0, [r1]
ldr r4, =0x02000000 ldr r4, =0x02000000
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r6, =0x00000f2c ldr r6, =0x00000f2c
adds r0, r4, 0 adds r0, r4, 0
adds r2, r6, 0 adds r2, r6, 0
bl memcpy bl memcpy
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
mov r10, r1 mov r10, r1
ldr r1, [r1] ldr r1, [r1]
ldr r7, =0x00003d88 ldr r7, =0x00003d88
@@ -142,7 +142,7 @@ saveblock_randomize_and_relocate: @ 8076C2C
ldrb r0, [r4, 0xD] ldrb r0, [r4, 0xD]
adds r0, r1 adds r0, r1
bl InitSaveBlockPointersWithRandomOffset bl InitSaveBlockPointersWithRandomOffset
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r0, [r1] ldr r0, [r1]
adds r1, r4, 0 adds r1, r4, 0
adds r2, r6, 0 adds r2, r6, 0
@@ -174,7 +174,7 @@ saveblock_randomize_and_relocate: @ 8076C2C
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
bl saveblock_apply_crypto bl saveblock_apply_crypto
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r0, [r1] ldr r0, [r1]
adds r0, 0xAC adds r0, 0xAC
str r4, [r0] str r4, [r0]
@@ -191,7 +191,7 @@ saveblock_randomize_and_relocate: @ 8076C2C
thumb_func_start sav2_x1_query_bit1 thumb_func_start sav2_x1_query_bit1
sav2_x1_query_bit1: @ 8076D24 sav2_x1_query_bit1: @ 8076D24
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r1, [r0, 0x9] ldrb r1, [r0, 0x9]
movs r0, 0x1 movs r0, 0x1
@@ -202,7 +202,7 @@ sav2_x1_query_bit1: @ 8076D24
thumb_func_start sav2_x9_clear_bit1 thumb_func_start sav2_x9_clear_bit1
sav2_x9_clear_bit1: @ 8076D34 sav2_x9_clear_bit1: @ 8076D34
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, [r0] ldr r2, [r0]
ldrb r1, [r2, 0x9] ldrb r1, [r2, 0x9]
movs r0, 0xFE movs r0, 0xFE
@@ -214,7 +214,7 @@ sav2_x9_clear_bit1: @ 8076D34
thumb_func_start sub_8076D48 thumb_func_start sub_8076D48
sub_8076D48: @ 8076D48 sub_8076D48: @ 8076D48
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, [r0] ldr r2, [r0]
ldrb r1, [r2, 0x9] ldrb r1, [r2, 0x9]
movs r0, 0x1 movs r0, 0x1
@@ -229,7 +229,7 @@ sub_8076D5C: @ 8076D5C
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl sub_8084FAC bl sub_8084FAC
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, [r0] ldr r2, [r0]
ldrb r1, [r2, 0x9] ldrb r1, [r2, 0x9]
movs r0, 0x1 movs r0, 0x1
@@ -242,7 +242,7 @@ sub_8076D5C: @ 8076D5C
thumb_func_start sav2_gender2_inplace_and_xFE thumb_func_start sav2_gender2_inplace_and_xFE
sav2_gender2_inplace_and_xFE: @ 8076D78 sav2_gender2_inplace_and_xFE: @ 8076D78
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, [r0] ldr r2, [r0]
ldrb r1, [r2, 0x9] ldrb r1, [r2, 0x9]
movs r0, 0xFE movs r0, 0xFE
@@ -256,7 +256,7 @@ sav2_gender2_inplace_and_xFE: @ 8076D78
@ void copy_player_party_to_sav1() @ void copy_player_party_to_sav1()
copy_player_party_to_sav1: @ 8076D8C copy_player_party_to_sav1: @ 8076D8C
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =gUnknown_020244E9 ldr r1, =gUnknown_020244E9
ldrb r1, [r1] ldrb r1, [r1]
@@ -266,7 +266,7 @@ copy_player_party_to_sav1: @ 8076D8C
strb r1, [r0] strb r1, [r0]
movs r4, 0 movs r4, 0
_08076DA0: _08076DA0:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x64 movs r1, 0x64
muls r1, r4 muls r1, r4
@@ -291,7 +291,7 @@ _08076DA0:
copy_player_party_from_sav1: @ 8076DD4 copy_player_party_from_sav1: @ 8076DD4
push {r4,r5,lr} push {r4,r5,lr}
ldr r1, =gUnknown_020244E9 ldr r1, =gUnknown_020244E9
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r2, 0x8D movs r2, 0x8D
lsls r2, 2 lsls r2, 2
@@ -305,7 +305,7 @@ _08076DEA:
adds r2, r4, 0 adds r2, r4, 0
muls r2, r0 muls r2, r0
adds r0, r2, r5 adds r0, r2, r5
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
adds r1, r2 adds r1, r2
movs r2, 0x8E movs r2, 0x8E
@@ -327,7 +327,7 @@ save_serialize_npcs: @ 8076E1C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r12, r0 mov r12, r0
movs r5, 0xA3 movs r5, 0xA3
lsls r5, 4 lsls r5, 4
@@ -365,7 +365,7 @@ save_deserialize_npcs: @ 8076E64
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r12, r0 mov r12, r0
movs r5, 0xA3 movs r5, 0xA3
lsls r5, 4 lsls r5, 4
@@ -426,9 +426,9 @@ copy_bags_and_unk_data_from_save_blocks: @ 8076ECC
movs r2, 0 movs r2, 0
ldr r0, =gUnknown_02032180 ldr r0, =gUnknown_02032180
mov r12, r0 mov r12, r0
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
mov r10, r1 mov r10, r1
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
movs r3, 0xAC movs r3, 0xAC
lsls r3, 3 lsls r3, 3
ldr r4, =gUnknown_02031C58 ldr r4, =gUnknown_02031C58
@@ -444,7 +444,7 @@ _08076EE8:
ble _08076EE8 ble _08076EE8
movs r2, 0 movs r2, 0
ldr r0, =gUnknown_02031C58 ldr r0, =gUnknown_02031C58
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
movs r3, 0xBB movs r3, 0xBB
lsls r3, 3 lsls r3, 3
adds r4, r0, 0 adds r4, r0, 0
@@ -461,7 +461,7 @@ _08076F08:
ble _08076F08 ble _08076F08
movs r2, 0 movs r2, 0
ldr r0, =gUnknown_02031C58 ldr r0, =gUnknown_02031C58
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
movs r3, 0xCA movs r3, 0xCA
lsls r3, 3 lsls r3, 3
adds r4, r0, 0 adds r4, r0, 0
@@ -478,7 +478,7 @@ _08076F28:
ble _08076F28 ble _08076F28
movs r2, 0 movs r2, 0
ldr r0, =gUnknown_02031C58 ldr r0, =gUnknown_02031C58
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
movs r6, 0x98 movs r6, 0x98
lsls r6, 1 lsls r6, 1
adds r4, r0, r6 adds r4, r0, r6
@@ -496,7 +496,7 @@ _08076F4A:
ble _08076F4A ble _08076F4A
movs r2, 0 movs r2, 0
ldr r0, =gUnknown_02031C58 ldr r0, =gUnknown_02031C58
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
movs r7, 0x8C movs r7, 0x8C
lsls r7, 2 lsls r7, 2
adds r4, r0, r7 adds r4, r0, r7
@@ -513,7 +513,7 @@ _08076F6C:
cmp r2, 0x2D cmp r2, 0x2D
ble _08076F6C ble _08076F6C
ldr r0, =gUnknown_02031C58 ldr r0, =gUnknown_02031C58
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
mov r8, r1 mov r8, r1
movs r5, 0xBA movs r5, 0xBA
lsls r5, 2 lsls r5, 2
@@ -563,11 +563,11 @@ copy_bags_and_unk_data_to_save_blocks: @ 8076FE0
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
movs r2, 0 movs r2, 0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
mov r8, r0 mov r8, r0
ldr r1, =gUnknown_02032180 ldr r1, =gUnknown_02032180
mov r12, r1 mov r12, r1
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
movs r3, 0xAC movs r3, 0xAC
lsls r3, 3 lsls r3, 3
ldr r4, =gUnknown_02031C58 ldr r4, =gUnknown_02031C58
@@ -582,7 +582,7 @@ _08076FFC:
cmp r2, 0x1D cmp r2, 0x1D
ble _08076FFC ble _08076FFC
movs r2, 0 movs r2, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
movs r4, 0xBB movs r4, 0xBB
lsls r4, 3 lsls r4, 3
ldr r0, =gUnknown_02031C58 ldr r0, =gUnknown_02031C58
@@ -599,7 +599,7 @@ _0807701C:
cmp r2, 0x1D cmp r2, 0x1D
ble _0807701C ble _0807701C
movs r2, 0 movs r2, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
movs r4, 0xCA movs r4, 0xCA
lsls r4, 3 lsls r4, 3
ldr r0, =gUnknown_02031C58 ldr r0, =gUnknown_02031C58
@@ -616,7 +616,7 @@ _0807703C:
cmp r2, 0xF cmp r2, 0xF
ble _0807703C ble _0807703C
movs r2, 0 movs r2, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
movs r4, 0xD2 movs r4, 0xD2
lsls r4, 3 lsls r4, 3
ldr r0, =gUnknown_02031C58 ldr r0, =gUnknown_02031C58
@@ -634,7 +634,7 @@ _0807705E:
cmp r2, 0x3F cmp r2, 0x3F
ble _0807705E ble _0807705E
movs r2, 0 movs r2, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
movs r4, 0xF2 movs r4, 0xF2
lsls r4, 3 lsls r4, 3
ldr r0, =gUnknown_02031C58 ldr r0, =gUnknown_02031C58
@@ -651,7 +651,7 @@ _08077080:
adds r2, 0x1 adds r2, 0x1
cmp r2, 0x2D cmp r2, 0x2D
ble _08077080 ble _08077080
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r9, r0 mov r9, r0
ldr r1, =0x00002be0 ldr r1, =0x00002be0
mov r10, r1 mov r10, r1
@@ -701,7 +701,7 @@ _080770A0:
thumb_func_start apply_u16_xor_crypto thumb_func_start apply_u16_xor_crypto
apply_u16_xor_crypto: @ 8077100 apply_u16_xor_crypto: @ 8077100
ldr r2, =gUnknown_03005D90 ldr r2, =gSaveBlock2Ptr
ldr r2, [r2] ldr r2, [r2]
adds r2, 0xAC adds r2, 0xAC
ldr r2, [r2] ldr r2, [r2]
@@ -715,7 +715,7 @@ apply_u16_xor_crypto: @ 8077100
thumb_func_start apply_u32_xor_crypto thumb_func_start apply_u32_xor_crypto
apply_u32_xor_crypto: @ 8077118 apply_u32_xor_crypto: @ 8077118
ldr r2, =gUnknown_03005D90 ldr r2, =gSaveBlock2Ptr
ldr r3, [r2] ldr r3, [r2]
adds r3, 0xAC adds r3, 0xAC
ldr r2, [r0] ldr r2, [r0]
@@ -736,7 +736,7 @@ saveblock_apply_crypto: @ 8077130
bl call_encrypt_decrypt_all_item_quantities bl call_encrypt_decrypt_all_item_quantities
adds r0, r4, 0 adds r0, r4, 0
bl sub_8024690 bl sub_8024690
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r0, [r5] ldr r0, [r5]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
+4 -4
View File
@@ -224,7 +224,7 @@ _081776D2:
muls r0, r1 muls r0, r1
ldr r1, =gUnknown_020244EC ldr r1, =gUnknown_020244EC
adds r0, r1 adds r0, r1
ldr r2, =gUnknown_02021CC4 ldr r2, =gStringVar1
movs r1, 0x2 movs r1, 0x2
bl pokemon_getattr bl pokemon_getattr
b _08177768 b _08177768
@@ -248,12 +248,12 @@ _0817773C:
adds r1, r2 adds r1, r2
lsls r1, 4 lsls r1, 4
adds r0, r1 adds r0, r1
ldr r2, =gUnknown_02021CC4 ldr r2, =gStringVar1
movs r1, 0x2 movs r1, 0x2
bl pokemon_getattr_encrypted bl pokemon_getattr_encrypted
_08177768: _08177768:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
bl GetStringEnd_Limit7 bl StringGetEnd10
_0817776E: _0817776E:
add sp, 0x8 add sp, 0x8
pop {r3-r5} pop {r3-r5}
+6 -6
View File
@@ -420,7 +420,7 @@ _081217EC:
movs r2, 0x20 movs r2, 0x20
bl gpu_pal_apply bl gpu_pal_apply
ldr r1, =gUnknown_0859F2B0 ldr r1, =gUnknown_0859F2B0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, [r0] ldr r2, [r0]
ldrb r0, [r2, 0x8] ldrb r0, [r2, 0x8]
lsls r0, 2 lsls r0, 2
@@ -683,7 +683,7 @@ _08121A8A:
adds r1, r3 adds r1, r3
ldr r1, [r1] ldr r1, [r1]
adds r1, 0x12 adds r1, 0x12
bl CopyString bl StringCopy
adds r2, r0, 0 adds r2, r0, 0
ldr r1, [r4] ldr r1, [r4]
ldr r3, =0x0000021e ldr r3, =0x0000021e
@@ -693,12 +693,12 @@ _08121A8A:
bne _08121AF0 bne _08121AF0
ldr r1, =gUnknown_085EEA78 ldr r1, =gUnknown_085EEA78
adds r0, r2, 0 adds r0, r2, 0
bl CopyString bl StringCopy
ldr r0, [r4] ldr r0, [r4]
movs r1, 0x80 movs r1, 0x80
lsls r1, 2 lsls r1, 2
adds r0, r1 adds r0, r1
bl GetStringLength bl StringLength
ldr r2, [r4] ldr r2, [r4]
movs r3, 0x8A movs r3, 0x8A
lsls r3, 2 lsls r3, 2
@@ -827,13 +827,13 @@ _08121BB8:
_08121BCC: _08121BCC:
ldr r1, =gUnknown_085EEA78 ldr r1, =gUnknown_085EEA78
add r0, sp, 0xC add r0, sp, 0xC
bl CopyString bl StringCopy
ldr r4, =gUnknown_0203A134 ldr r4, =gUnknown_0203A134
ldr r1, [r4] ldr r1, [r4]
movs r2, 0x80 movs r2, 0x80
lsls r2, 2 lsls r2, 2
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00000219 ldr r1, =0x00000219
adds r0, r1 adds r0, r1
+2 -2
View File
@@ -138,7 +138,7 @@ InitVariablesAndSetCopyrightScreenCallback: @ 80004D8
str r0, [r2] str r0, [r2]
ldr r0, =c2_copyright_1 ldr r0, =c2_copyright_1
bl SetMainCallback2 bl SetMainCallback2
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r0, =gUnknown_02024A54 ldr r0, =gUnknown_02024A54
str r0, [r1] str r0, [r1]
ldr r1, =gUnknown_03005D94 ldr r1, =gUnknown_03005D94
@@ -305,7 +305,7 @@ _08000632:
_08000636: _08000636:
strh r3, [r2, 0x28] strh r3, [r2, 0x28]
strh r3, [r2, 0x2C] strh r3, [r2, 0x2C]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x2 cmp r0, 0x2
+40 -40
View File
@@ -622,7 +622,7 @@ _0802FBCE:
movs r1, 0xFC movs r1, 0xFC
movs r2, 0x2 movs r2, 0x2
bl gpu_pal_apply bl gpu_pal_apply
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
cmp r0, 0 cmp r0, 0
@@ -2086,9 +2086,9 @@ _08030970:
bl CopyWindowToVram bl CopyWindowToVram
movs r0, 0 movs r0, 0
bl sub_8032318 bl sub_8032318
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_082C897B ldr r1, =gUnknown_082C897B
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
bl AddTextPrinterForMessage bl AddTextPrinterForMessage
ldr r0, =task_new_game_prof_birch_speech_4 ldr r0, =task_new_game_prof_birch_speech_4
@@ -2122,9 +2122,9 @@ task_new_game_prof_birch_speech_4: @ 80309CC
adds r0, r1 adds r0, r1
ldr r1, =task_new_game_prof_birch_speech_5 ldr r1, =task_new_game_prof_birch_speech_5
str r1, [r0] str r1, [r0]
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E8692 ldr r1, =gUnknown_085E8692
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r1, =sub_80323A0 ldr r1, =sub_80323A0
movs r0, 0x1 movs r0, 0x1
bl AddTextPrinterWithCallbackForMessage bl AddTextPrinterWithCallbackForMessage
@@ -2146,9 +2146,9 @@ task_new_game_prof_birch_speech_5: @ 8030A2C
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _08030A58 bne _08030A58
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_082C8A1F ldr r1, =gUnknown_082C8A1F
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
bl AddTextPrinterForMessage bl AddTextPrinterForMessage
ldr r1, =gTasks ldr r1, =gTasks
@@ -2341,9 +2341,9 @@ task_new_game_prof_birch_speech_6: @ 8030BCC
bne _08030BFE bne _08030BFE
ldr r0, =gUnknown_02022D04 ldr r0, =gUnknown_02022D04
strb r1, [r0] strb r1, [r0]
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_082C8BD0 ldr r1, =gUnknown_082C8BD0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
bl AddTextPrinterForMessage bl AddTextPrinterForMessage
ldr r1, =gTasks ldr r1, =gTasks
@@ -2580,9 +2580,9 @@ task_new_game_prof_birch_speech_11: @ 8030DC8
lsrs r4, 24 lsrs r4, 24
movs r0, 0 movs r0, 0
bl sub_8032318 bl sub_8032318
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_082C8BDD ldr r1, =gUnknown_082C8BDD
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
bl AddTextPrinterForMessage bl AddTextPrinterForMessage
ldr r1, =gTasks ldr r1, =gTasks
@@ -2639,7 +2639,7 @@ task_new_game_prof_birch_speech_13: @ 8030E38
_08030E52: _08030E52:
movs r0, 0x5 movs r0, 0x5
bl audio_play bl audio_play
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
strb r4, [r0, 0x8] strb r4, [r0, 0x8]
movs r0, 0x1 movs r0, 0x1
@@ -2831,9 +2831,9 @@ task_new_game_prof_birch_speech_14: @ 8030FD4
lsrs r4, 24 lsrs r4, 24
movs r0, 0 movs r0, 0
bl sub_8032318 bl sub_8032318
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_082C8BFF ldr r1, =gUnknown_082C8BFF
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
bl AddTextPrinterForMessage bl AddTextPrinterForMessage
ldr r1, =gTasks ldr r1, =gTasks
@@ -2943,7 +2943,7 @@ task_new_game_prof_birch_speech_17: @ 8031090
bl set_default_player_name bl set_default_player_name
adds r0, r4, 0 adds r0, r4, 0
bl DestroyTask bl DestroyTask
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldrb r2, [r1, 0x8] ldrb r2, [r1, 0x8]
str r5, [sp] str r5, [sp]
@@ -2968,9 +2968,9 @@ task_new_game_prof_birch_speech_part2_2: @ 8031104
lsrs r4, 24 lsrs r4, 24
movs r0, 0 movs r0, 0
bl sub_8032318 bl sub_8032318
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_082C8C1C ldr r1, =gUnknown_082C8C1C
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
bl AddTextPrinterForMessage bl AddTextPrinterForMessage
ldr r1, =gTasks ldr r1, =gTasks
@@ -3211,9 +3211,9 @@ task_new_game_prof_birch_speech_part2_6: @ 8031258
bl sub_8031D34 bl sub_8031D34
movs r0, 0 movs r0, 0
bl sub_8032318 bl sub_8032318
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_082C8C2A ldr r1, =gUnknown_082C8C2A
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
bl AddTextPrinterForMessage bl AddTextPrinterForMessage
ldr r0, =task_new_game_prof_birch_speech_part2_7 ldr r0, =task_new_game_prof_birch_speech_part2_7
@@ -3353,7 +3353,7 @@ task_new_game_prof_birch_speech_part2_8: @ 80313E4
b _080314B0 b _080314B0
.pool .pool
_08031444: _08031444:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
cmp r0, 0 cmp r0, 0
@@ -3396,9 +3396,9 @@ _0803145A:
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8031D34 bl sub_8031D34
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_082C8C7A ldr r1, =gUnknown_082C8C7A
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
bl AddTextPrinterForMessage bl AddTextPrinterForMessage
ldr r0, =task_new_game_prof_birch_speech_part2_9 ldr r0, =task_new_game_prof_birch_speech_part2_9
@@ -3714,7 +3714,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678
bl dp13_810BB8C bl dp13_810BB8C
adds r0, r5, 0 adds r0, r5, 0
bl AddBirchSpeechObjects bl AddBirchSpeechObjects
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
cmp r0, 0 cmp r0, 0
@@ -4453,7 +4453,7 @@ set_default_player_name: @ 8031DC4
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r0, [r1] ldr r0, [r1]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
adds r5, r1, 0 adds r5, r1, 0
@@ -4469,7 +4469,7 @@ _08031DE6:
adds r0, r1 adds r0, r1
ldr r3, [r0] ldr r3, [r0]
movs r2, 0 movs r2, 0
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
_08031DF0: _08031DF0:
ldr r1, [r4] ldr r1, [r4]
adds r1, r2 adds r1, r2
@@ -4546,10 +4546,10 @@ fmt_savegame: @ 8031E7C
fmt_time: @ 8031E94 fmt_time: @ 8031E94
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0xC sub sp, 0xC
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EDCC3 ldr r1, =gUnknown_085EDCC3
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r6, =gUnknown_082FF0E3 ldr r6, =gUnknown_082FF0E3
str r6, [sp] str r6, [sp]
movs r5, 0x1 movs r5, 0x1
@@ -4561,7 +4561,7 @@ fmt_time: @ 8031E94
movs r2, 0 movs r2, 0
movs r3, 0x11 movs r3, 0x11
bl box_print bl box_print
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
ldr r1, [r4] ldr r1, [r4]
movs r0, 0x1 movs r0, 0x1
movs r2, 0x64 movs r2, 0x64
@@ -4588,10 +4588,10 @@ fmt_time: @ 8031E94
fmt_player: @ 8031EF8 fmt_player: @ 8031EF8
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x2C sub sp, 0x2C
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EDCCA ldr r1, =gUnknown_085EDCCA
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r6, =gUnknown_082FF0E3 ldr r6, =gUnknown_082FF0E3
str r6, [sp] str r6, [sp]
movs r5, 0x1 movs r5, 0x1
@@ -4603,13 +4603,13 @@ fmt_player: @ 8031EF8
movs r2, 0x6C movs r2, 0x6C
movs r3, 0x11 movs r3, 0x11
bl box_print bl box_print
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
ldr r0, [r4] ldr r0, [r4]
ldrh r1, [r0, 0xE] ldrh r1, [r0, 0xE]
add r0, sp, 0xC add r0, sp, 0xC
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r1, 0xF0 movs r1, 0xF0
strb r1, [r0] strb r1, [r0]
adds r0, 0x1 adds r0, 0x1
@@ -4617,7 +4617,7 @@ fmt_player: @ 8031EF8
ldrb r1, [r1, 0x10] ldrb r1, [r1, 0x10]
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r0, 0x1 movs r0, 0x1
add r1, sp, 0xC add r1, sp, 0xC
movs r2, 0xD0 movs r2, 0xD0
@@ -4663,10 +4663,10 @@ _08031FA4:
_08031FAA: _08031FAA:
lsls r0, 16 lsls r0, 16
lsrs r7, r0, 16 lsrs r7, r0, 16
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EDCCF ldr r1, =gUnknown_085EDCCF
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r6, =gUnknown_082FF0E3 ldr r6, =gUnknown_082FF0E3
str r6, [sp] str r6, [sp]
movs r5, 0x1 movs r5, 0x1
@@ -4682,7 +4682,7 @@ _08031FAA:
adds r1, r7, 0 adds r1, r7, 0
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r0, 0x1 movs r0, 0x1
add r1, sp, 0xC add r1, sp, 0xC
movs r2, 0x64 movs r2, 0x64
@@ -4727,10 +4727,10 @@ _08032030:
ldr r0, =0x0000086e ldr r0, =0x0000086e
cmp r4, r0 cmp r4, r0
bls _0803201C bls _0803201C
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EDCD7 ldr r1, =gUnknown_085EDCD7
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r6, =gUnknown_082FF0E3 ldr r6, =gUnknown_082FF0E3
str r6, [sp] str r6, [sp]
movs r5, 0x1 movs r5, 0x1
@@ -4746,7 +4746,7 @@ _08032030:
adds r1, r7, 0 adds r1, r7, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r0, 0x1 movs r0, 0x1
add r1, sp, 0xC add r1, sp, 0xC
movs r2, 0xD0 movs r2, 0xD0
@@ -4779,7 +4779,7 @@ LoadMainMenuWindowFrameTiles: @ 80320A4
lsrs r4, 24 lsrs r4, 24
lsls r5, 16 lsls r5, 16
lsrs r5, 16 lsrs r5, 16
ldr r6, =gUnknown_03005D90 ldr r6, =gSaveBlock2Ptr
ldr r0, [r6] ldr r0, [r6]
ldrb r0, [r0, 0x14] ldrb r0, [r0, 0x14]
lsrs r0, 3 lsrs r0, 3
+51 -51
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_81200A0 thumb_func_start sub_81200A0
sub_81200A0: @ 81200A0 sub_81200A0: @ 81200A0
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldr r1, =0x00002e28 ldr r1, =0x00002e28
adds r0, r2, r1 adds r0, r2, r1
@@ -45,7 +45,7 @@ _081200C6:
thumb_func_start sub_81200F8 thumb_func_start sub_81200F8
sub_81200F8: @ 81200F8 sub_81200F8: @ 81200F8
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00002e28 ldr r0, =0x00002e28
adds r1, r0 adds r1, r0
@@ -70,7 +70,7 @@ sub_812011C: @ 812011C
thumb_func_start sub_8120128 thumb_func_start sub_8120128
sub_8120128: @ 8120128 sub_8120128: @ 8120128
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00002e28 ldr r0, =0x00002e28
adds r2, r1, r0 adds r2, r1, r0
@@ -98,7 +98,7 @@ sub_8120154: @ 8120154
thumb_func_start sub_8120160 thumb_func_start sub_8120160
sub_8120160: @ 8120160 sub_8120160: @ 8120160
push {lr} push {lr}
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r1, [r0, 0xB] ldrb r1, [r0, 0xB]
lsls r1, 8 lsls r1, 8
@@ -145,7 +145,7 @@ _081201C0:
thumb_func_start sub_81201C8 thumb_func_start sub_81201C8
sub_81201C8: @ 81201C8 sub_81201C8: @ 81201C8
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002e28 ldr r1, =0x00002e28
adds r0, r1 adds r0, r1
@@ -171,7 +171,7 @@ sub_81201DC: @ 81201DC
thumb_func_start sub_81201F4 thumb_func_start sub_81201F4
sub_81201F4: @ 81201F4 sub_81201F4: @ 81201F4
ldr r1, =gUnknown_020375F0 ldr r1, =gUnknown_020375F0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00002e51 ldr r2, =0x00002e51
adds r0, r2 adds r0, r2
@@ -184,15 +184,15 @@ sub_81201F4: @ 81201F4
thumb_func_start sub_8120210 thumb_func_start sub_8120210
sub_8120210: @ 8120210 sub_8120210: @ 8120210
push {r4-r6,lr} push {r4-r6,lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r4, [r0] ldr r4, [r0]
ldr r0, =0x00002e28 ldr r0, =0x00002e28
adds r6, r4, r0 adds r6, r4, r0
ldr r1, =0x00002e42 ldr r1, =0x00002e42
adds r0, r4, r1 adds r0, r4, r1
ldr r5, =gUnknown_03005D90 ldr r5, =gSaveBlock2Ptr
ldr r1, [r5] ldr r1, [r5]
bl CopyString bl StringCopy
movs r2, 0 movs r2, 0
ldr r0, =0x00002e4d ldr r0, =0x00002e4d
adds r4, r0 adds r4, r0
@@ -236,7 +236,7 @@ _0812024E:
thumb_func_start sub_8120280 thumb_func_start sub_8120280
sub_8120280: @ 8120280 sub_8120280: @ 8120280
push {r4-r7,lr} push {r4-r7,lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =gUnknown_020375E0 ldr r0, =gUnknown_020375E0
ldrh r0, [r0] ldrh r0, [r0]
@@ -247,7 +247,7 @@ sub_8120280: @ 8120280
ldr r0, =0x00002e2a ldr r0, =0x00002e2a
adds r5, r1, r0 adds r5, r1, r0
_08120296: _08120296:
ldr r2, =gUnknown_02021FC4 ldr r2, =gStringVar4
adds r4, r2, 0 adds r4, r2, 0
movs r6, 0 movs r6, 0
_0812029C: _0812029C:
@@ -348,7 +348,7 @@ sub_8120340: @ 8120340
thumb_func_start sub_8120358 thumb_func_start sub_8120358
sub_8120358: @ 8120358 sub_8120358: @ 8120358
ldr r1, =gUnknown_020375F0 ldr r1, =gUnknown_020375F0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00002e28 ldr r2, =0x00002e28
adds r0, r2 adds r0, r2
@@ -360,7 +360,7 @@ sub_8120358: @ 8120358
thumb_func_start sub_8120374 thumb_func_start sub_8120374
sub_8120374: @ 8120374 sub_8120374: @ 8120374
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002e28 ldr r1, =0x00002e28
adds r0, r1 adds r0, r1
@@ -384,7 +384,7 @@ sub_812038C: @ 812038C
b _081203B6 b _081203B6
.pool .pool
_081203AC: _081203AC:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
bl CopyEasyChatWord bl CopyEasyChatWord
ldr r1, =gUnknown_020375F0 ldr r1, =gUnknown_020375F0
movs r0, 0x1 movs r0, 0x1
@@ -398,7 +398,7 @@ _081203B6:
thumb_func_start sub_81203C4 thumb_func_start sub_81203C4
sub_81203C4: @ 81203C4 sub_81203C4: @ 81203C4
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002e28 ldr r1, =0x00002e28
adds r2, r0, r1 adds r2, r0, r1
@@ -424,7 +424,7 @@ _081203F2:
thumb_func_start sub_81203FC thumb_func_start sub_81203FC
sub_81203FC: @ 81203FC sub_81203FC: @ 81203FC
push {r4-r6,lr} push {r4-r6,lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r4, [r0] ldr r4, [r0]
ldr r0, =0x00002e28 ldr r0, =0x00002e28
adds r5, r4, r0 adds r5, r4, r0
@@ -448,7 +448,7 @@ _08120410:
lsrs r4, 16 lsrs r4, 16
movs r0, 0x7 movs r0, 0x7
ands r4, r0 ands r4, r0
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldrb r1, [r5, 0x1] ldrb r1, [r5, 0x1]
lsls r1, 1 lsls r1, 1
adds r1, r6, r1 adds r1, r6, r1
@@ -456,21 +456,21 @@ _08120410:
bl CopyEasyChatWord bl CopyEasyChatWord
adds r2, r0, 0 adds r2, r0, 0
ldr r1, =gUnknown_082942FD ldr r1, =gUnknown_082942FD
bl CopyString bl StringCopy
adds r2, r0, 0 adds r2, r0, 0
ldr r0, =gUnknown_0859EFF0 ldr r0, =gUnknown_0859EFF0
lsls r4, 2 lsls r4, 2
adds r4, r0 adds r4, r0
ldr r1, [r4] ldr r1, [r4]
adds r0, r2, 0 adds r0, r2, 0
bl CopyString bl StringCopy
adds r2, r0, 0 adds r2, r0, 0
ldr r1, =gUnknown_08294301 ldr r1, =gUnknown_08294301
bl CopyString bl StringCopy
b _081204A2 b _081204A2
.pool .pool
_08120480: _08120480:
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r3, =gUnknown_0859F010 ldr r3, =gUnknown_0859F010
ldrb r2, [r5, 0x2] ldrb r2, [r5, 0x2]
adds r1, r2, 0x1 adds r1, r2, 0x1
@@ -485,7 +485,7 @@ _08120480:
lsls r1, 2 lsls r1, 2
adds r1, r3 adds r1, r3
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
_081204A2: _081204A2:
bl GenerateRandomNumber bl GenerateRandomNumber
lsls r0, 16 lsls r0, 16
@@ -520,7 +520,7 @@ sub_81204DC: @ 81204DC
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
sub sp, 0x1C sub sp, 0x1C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r4, [r0] ldr r4, [r0]
ldr r0, =0x00002e28 ldr r0, =0x00002e28
adds r0, r4, r0 adds r0, r4, r0
@@ -676,7 +676,7 @@ _0812060E:
thumb_func_start sub_8120628 thumb_func_start sub_8120628
sub_8120628: @ 8120628 sub_8120628: @ 8120628
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002e51 ldr r1, =0x00002e51
adds r0, r1 adds r0, r1
@@ -688,7 +688,7 @@ sub_8120628: @ 8120628
thumb_func_start sub_8120640 thumb_func_start sub_8120640
sub_8120640: @ 8120640 sub_8120640: @ 8120640
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002e28 ldr r1, =0x00002e28
adds r0, r1 adds r0, r1
@@ -848,7 +848,7 @@ _08120764:
.4byte _081207F8 .4byte _081207F8
.4byte _08120938 .4byte _08120938
_0812077C: _0812077C:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldr r0, =gUnknown_020375E0 ldr r0, =gUnknown_020375E0
ldrh r0, [r0] ldrh r0, [r0]
@@ -1106,7 +1106,7 @@ _0812097C:
.4byte _08120A6E .4byte _08120A6E
_08120994: _08120994:
bl sub_8120280 bl sub_8120280
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
bl sub_8120708 bl sub_8120708
movs r0, 0 movs r0, 0
strh r0, [r5, 0xA] strh r0, [r5, 0xA]
@@ -1128,13 +1128,13 @@ _081209C4:
movs r0, 0x2 movs r0, 0x2
b _08120B4E b _08120B4E
_081209C8: _081209C8:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00002e28 ldr r2, =0x00002e28
adds r4, r0, r2 adds r4, r0, r2
movs r0, 0xE movs r0, 0xE
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
adds r1, r0 adds r1, r0
movs r3, 0 movs r3, 0
ldrb r0, [r1] ldrb r0, [r1]
@@ -1219,7 +1219,7 @@ _08120A6E:
strh r0, [r5, 0xC] strh r0, [r5, 0xC]
b _08120B50 b _08120B50
_08120A7E: _08120A7E:
ldr r1, =gUnknown_02021FC4 ldr r1, =gStringVar4
movs r2, 0xE movs r2, 0xE
ldrsh r0, [r5, r2] ldrsh r0, [r5, r2]
adds r0, r1 adds r0, r1
@@ -1367,7 +1367,7 @@ _08120B84:
adds r0, 0x5 adds r0, 0x5
adds r0, r5, r0 adds r0, r5, r0
movs r1, 0x1 movs r1, 0x1
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
_08120B9E: _08120B9E:
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x3 cmp r4, 0x3
@@ -1401,7 +1401,7 @@ _08120BB0:
bl memset bl memset
mov r0, sp mov r0, sp
ldr r1, =gUnknown_085EDFB0 ldr r1, =gUnknown_085EDFB0
bl CopyString bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
mov r1, sp mov r1, sp
movs r2, 0x7 movs r2, 0x7
@@ -1639,7 +1639,7 @@ _08120D78:
cmp r0, 0x15 cmp r0, 0x15
bne _08120D98 bne _08120D98
adds r0, r1, 0 adds r0, r1, 0
bl StripExtendedControlCodes bl StripExtCtrlCodes
movs r0, 0x1 movs r0, 0x1
strb r0, [r4] strb r0, [r4]
b _08120D9A b _08120D9A
@@ -1664,7 +1664,7 @@ _08120DAA:
muls r0, r5 muls r0, r5
adds r0, 0x5 adds r0, 0x5
adds r0, r7, r0 adds r0, r7, r0
bl StripExtendedControlCodes bl StripExtCtrlCodes
_08120DBE: _08120DBE:
adds r5, 0x1 adds r5, 0x1
cmp r5, 0x3 cmp r5, 0x3
@@ -1717,7 +1717,7 @@ _08120E02:
sub_8120E08: @ 8120E08 sub_8120E08: @ 8120E08
push {r4,r5,lr} push {r4,r5,lr}
ldr r2, =gUnknown_0203A12C ldr r2, =gUnknown_0203A12C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002e28 ldr r1, =0x00002e28
adds r0, r1 adds r0, r1
@@ -1752,7 +1752,7 @@ _08120E24:
thumb_func_start sub_8120E50 thumb_func_start sub_8120E50
sub_8120E50: @ 8120E50 sub_8120E50: @ 8120E50
ldr r3, =gUnknown_0203A12C ldr r3, =gUnknown_0203A12C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002e28 ldr r1, =0x00002e28
adds r0, r1 adds r0, r1
@@ -1987,7 +1987,7 @@ sub_8120FDC: @ 8120FDC
adds r0, 0x4 adds r0, 0x4
add r0, r8 add r0, r8
strb r6, [r0] strb r6, [r0]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
mov r0, r8 mov r0, r8
bl sub_8120FAC bl sub_8120FAC
@@ -1998,20 +1998,20 @@ sub_8120FDC: @ 8120FDC
adds r1, r0, 0 adds r1, r0, 0
mov r0, r8 mov r0, r8
bl sub_8120F2C bl sub_8120F2C
ldr r5, =gUnknown_02021CC4 ldr r5, =gStringVar1
adds r0, r4, 0 adds r0, r4, 0
bl sub_8120E74 bl sub_8120E74
adds r1, r0, 0 adds r1, r0, 0
adds r0, r5, 0 adds r0, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0xA movs r3, 0xA
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021DC4 ldr r4, =gStringVar2
adds r0, r6, 0 adds r0, r6, 0
bl sub_8120ECC bl sub_8120ECC
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
mov r1, r9 mov r1, r9
ldr r0, [r1] ldr r0, [r1]
adds r0, 0x34 adds r0, 0x34
@@ -2179,21 +2179,21 @@ sub_8121178: @ 8121178
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
mov r8, r0 mov r8, r0
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
adds r0, r5, 0 adds r0, r5, 0
bl sub_8120F08 bl sub_8120F08
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0xA movs r3, 0xA
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021DC4 ldr r4, =gStringVar2
mov r0, r8 mov r0, r8
bl sub_8120ECC bl sub_8120ECC
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
ldr r4, =gUnknown_02021EC4 ldr r4, =gStringVar3
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_8120F7C bl sub_8120F7C
@@ -2202,7 +2202,7 @@ sub_8121178: @ 8121178
adds r0, r5 adds r0, r5
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
mov r0, r8 mov r0, r8
bl sub_8120EC0 bl sub_8120EC0
bl box_related_two__2 bl box_related_two__2
@@ -2432,7 +2432,7 @@ sub_812139C: @ 812139C
sub_81213B0: @ 81213B0 sub_81213B0: @ 81213B0
push {lr} push {lr}
ldr r1, =gUnknown_0203A12C ldr r1, =gUnknown_0203A12C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00002e28 ldr r2, =0x00002e28
adds r0, r2 adds r0, r2
@@ -2449,7 +2449,7 @@ sub_81213B0: @ 81213B0
sub_81213D8: @ 81213D8 sub_81213D8: @ 81213D8
push {r4,r5,lr} push {r4,r5,lr}
ldr r2, =gUnknown_0203A12C ldr r2, =gUnknown_0203A12C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r3, =0x00002e28 ldr r3, =0x00002e28
adds r0, r1, r3 adds r0, r1, r3
@@ -2481,7 +2481,7 @@ _0812141E:
sub_8121424: @ 8121424 sub_8121424: @ 8121424
push {lr} push {lr}
ldr r1, =gUnknown_0203A12C ldr r1, =gUnknown_0203A12C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00002e28 ldr r2, =0x00002e28
adds r0, r2 adds r0, r2
@@ -2503,7 +2503,7 @@ _0812144A:
sub_8121450: @ 8121450 sub_8121450: @ 8121450
push {lr} push {lr}
ldr r1, =gUnknown_0203A12C ldr r1, =gUnknown_0203A12C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00002e28 ldr r2, =0x00002e28
adds r0, r2 adds r0, r2
+5 -5
View File
@@ -131,13 +131,13 @@ DisplayMessageAndContinueTask: @ 8121E7C
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8197B1C bl sub_8197B1C
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r0, [sp, 0x30] ldr r0, [sp, 0x30]
cmp r0, r4 cmp r0, r4
beq _08121EC0 beq _08121EC0
adds r0, r4, 0 adds r0, r4, 0
ldr r1, [sp, 0x30] ldr r1, [sp, 0x30]
bl ExpandStringRefs bl StringExpandPlaceholders
_08121EC0: _08121EC0:
ldr r2, =gUnknown_03003014 ldr r2, =gUnknown_03003014
ldrb r0, [r2] ldrb r0, [r2]
@@ -409,7 +409,7 @@ _081220C8:
thumb_func_start GetLRKeysState thumb_func_start GetLRKeysState
GetLRKeysState: @ 81220D0 GetLRKeysState: @ 81220D0
push {lr} push {lr}
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x1 cmp r0, 0x1
@@ -442,7 +442,7 @@ _08122108:
thumb_func_start sub_812210C thumb_func_start sub_812210C
sub_812210C: @ 812210C sub_812210C: @ 812210C
push {lr} push {lr}
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x1 cmp r0, 0x1
@@ -479,7 +479,7 @@ sub_8122148: @ 8122148
lsrs r0, 16 lsrs r0, 16
cmp r0, 0xAF cmp r0, 0xAF
bne _08122174 bne _08122174
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrh r1, [r0, 0x4] ldrh r1, [r0, 0x4]
ldr r0, =0x00001919 ldr r0, =0x00001919
+1 -1
View File
@@ -17,7 +17,7 @@ sub_811F90C: @ 811F90C
sub_811F918: @ 811F918 sub_811F918: @ 811F918
push {lr} push {lr}
sub sp, 0x4 sub sp, 0x4
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x14] ldrb r0, [r0, 0x14]
lsrs r0, 3 lsrs r0, 3
+10 -10
View File
@@ -8,7 +8,7 @@
thumb_func_start DecryptMoney thumb_func_start DecryptMoney
@ int DecryptMoney(u32 *moneyPointer) @ int DecryptMoney(u32 *moneyPointer)
DecryptMoney: @ 80E5114 DecryptMoney: @ 80E5114
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r1, [r1] ldr r1, [r1]
adds r1, 0xAC adds r1, 0xAC
ldr r0, [r0] ldr r0, [r0]
@@ -21,7 +21,7 @@ DecryptMoney: @ 80E5114
thumb_func_start EncryptMoney thumb_func_start EncryptMoney
@ void EncryptMoney(u32 *moneyPointer, u32 moneyAmount) @ void EncryptMoney(u32 *moneyPointer, u32 moneyAmount)
EncryptMoney: @ 80E5128 EncryptMoney: @ 80E5128
ldr r2, =gUnknown_03005D90 ldr r2, =gSaveBlock2Ptr
ldr r2, [r2] ldr r2, [r2]
adds r2, 0xAC adds r2, 0xAC
ldr r2, [r2] ldr r2, [r2]
@@ -103,7 +103,7 @@ _080E51A2:
thumb_func_start sub_80E51B0 thumb_func_start sub_80E51B0
sub_80E51B0: @ 80E51B0 sub_80E51B0: @ 80E51B0
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -121,7 +121,7 @@ sub_80E51B0: @ 80E51B0
thumb_func_start sub_80E51D4 thumb_func_start sub_80E51D4
sub_80E51D4: @ 80E51D4 sub_80E51D4: @ 80E51D4
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -170,19 +170,19 @@ PrintMoneyAmount: @ 80E5214
lsrs r6, r2, 24 lsrs r6, r2, 24
lsls r4, 24 lsls r4, 24
lsrs r5, r4, 24 lsrs r5, r4, 24
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
adds r0, r4, 0 adds r0, r4, 0
adds r1, r3, 0 adds r1, r3, 0
movs r2, 0 movs r2, 0
movs r3, 0x6 movs r3, 0x6
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r0, r4, 0 adds r0, r4, 0
bl GetStringLength bl StringLength
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
movs r1, 0x6 movs r1, 0x6
subs r1, r0 subs r1, r0
ldr r2, =gUnknown_02021FC4 ldr r2, =gStringVar4
adds r0, r1, 0 adds r0, r1, 0
subs r1, 0x1 subs r1, 0x1
cmp r0, 0 cmp r0, 0
@@ -198,8 +198,8 @@ _080E5258:
_080E5264: _080E5264:
ldr r1, =gUnknown_085E969C ldr r1, =gUnknown_085E969C
adds r0, r2, 0 adds r0, r2, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =gUnknown_02021FC4 ldr r2, =gStringVar4
str r6, [sp] str r6, [sp]
str r5, [sp, 0x4] str r5, [sp, 0x4]
movs r0, 0 movs r0, 0
+7 -7
View File
@@ -116,7 +116,7 @@ sub_8178A40: @ 8178A40
cmp r4, 0 cmp r4, 0
bne _08178A54 bne _08178A54
ldr r1, =gUnknown_085EE80A ldr r1, =gUnknown_085EE80A
bl CopyString bl StringCopy
movs r5, 0 movs r5, 0
_08178A54: _08178A54:
cmp r4, 0x2 cmp r4, 0x2
@@ -127,7 +127,7 @@ _08178A5A:
bne _08178A66 bne _08178A66
ldr r1, =gUnknown_085EE827 ldr r1, =gUnknown_085EE827
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
_08178A66: _08178A66:
adds r0, r5, 0 adds r0, r5, 0
pop {r4-r6} pop {r4-r6}
@@ -351,7 +351,7 @@ _08178C68:
cmp r0, 0x3 cmp r0, 0x3
bne _08178CAC bne _08178CAC
bl sub_800AC34 bl sub_800AC34
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8178A40 bl sub_8178A40
@@ -385,7 +385,7 @@ _08178CAC:
_08178CCC: _08178CCC:
bl sub_80097E8 bl sub_80097E8
_08178CD0: _08178CD0:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8178A40 bl sub_8178A40
@@ -477,7 +477,7 @@ _08178D74:
add r0, sp, 0x4 add r0, sp, 0x4
adds r1, r5, 0 adds r1, r5, 0
bl CpuSet bl CpuSet
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
adds r1, r4, 0 adds r1, r4, 0
bl sub_8178A40 bl sub_8178A40
lsls r0, 24 lsls r0, 24
@@ -488,7 +488,7 @@ _08178D74:
b _08178E34 b _08178E34
.pool .pool
_08178DBC: _08178DBC:
ldr r1, =gUnknown_02021FC4 ldr r1, =gStringVar4
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
movs r0, 0 movs r0, 0
@@ -571,7 +571,7 @@ _08178E58:
cmp r0, 0 cmp r0, 0
bne _08178E98 bne _08178E98
bl sub_80097E8 bl sub_80097E8
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8178A40 bl sub_8178A40
+38 -38
View File
@@ -42,9 +42,9 @@ _081537FE:
thumb_func_start sub_8153804 thumb_func_start sub_8153804
sub_8153804: @ 8153804 sub_8153804: @ 8153804
push {lr} push {lr}
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674C86 ldr r1, =gUnknown_08674C86
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x3 movs r0, 0x3
bl sub_81538C4 bl sub_81538C4
pop {r0} pop {r0}
@@ -152,7 +152,7 @@ sub_81538C4: @ 81538C4
sub_81538D0: @ 81538D0 sub_81538D0: @ 81538D0
push {lr} push {lr}
movs r2, 0 movs r2, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003b18 ldr r1, =0x00003b18
adds r3, r0, r1 adds r3, r0, r1
@@ -173,7 +173,7 @@ _081538DE:
thumb_func_start sub_81538F8 thumb_func_start sub_81538F8
sub_81538F8: @ 81538F8 sub_81538F8: @ 81538F8
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r0, [r5] ldr r0, [r5]
ldr r1, =0x00003b18 ldr r1, =0x00003b18
adds r4, r0, r1 adds r4, r0, r1
@@ -215,7 +215,7 @@ sub_8153944: @ 8153944
mov r1, sp mov r1, sp
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00003b14 ldr r0, =0x00003b14
adds r1, r0 adds r1, r0
@@ -250,7 +250,7 @@ _08153990:
bl sub_8153944 bl sub_8153944
b _081539BC b _081539BC
_08153996: _08153996:
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00003b18 ldr r1, =0x00003b18
adds r0, r1 adds r0, r1
@@ -278,7 +278,7 @@ _081539BC:
thumb_func_start sub_81539D4 thumb_func_start sub_81539D4
sub_81539D4: @ 81539D4 sub_81539D4: @ 81539D4
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
ldr r0, [r6] ldr r0, [r6]
ldr r1, =0x00003b18 ldr r1, =0x00003b18
adds r4, r0, r1 adds r4, r0, r1
@@ -399,8 +399,8 @@ sub_8153A94: @ 8153A94
cmp r5, r0 cmp r5, r0
bne _08153ABE bne _08153ABE
_08153AB8: _08153AB8:
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
bl ExpandStringRefs bl StringExpandPlaceholders
_08153ABE: _08153ABE:
movs r0, 0 movs r0, 0
pop {r4,r5} pop {r4,r5}
@@ -441,44 +441,44 @@ sub_8153AE8: @ 8153AE8
subs r4, r0 subs r4, r0
ldr r0, [r7, 0x64] ldr r0, [r7, 0x64]
adds r4, r0 adds r4, r0
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
mov r9, r0 mov r9, r0
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
ldr r1, [r6] ldr r1, [r6]
ldr r5, =0x000031f8 ldr r5, =0x000031f8
adds r1, r5 adds r1, r5
movs r2, 0x7 movs r2, 0x7
bl CopyString_LimitN bl StringCopyN
adds r0, r4, 0 adds r0, r4, 0
bl sub_80E15E4 bl sub_80E15E4
ldr r4, =gUnknown_02021DC4 ldr r4, =gStringVar2
ldr r1, [r6] ldr r1, [r6]
adds r1, r5 adds r1, r5
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x7 movs r2, 0x7
bl CopyString_LimitN bl StringCopyN
mov r0, r8 mov r0, r8
cmp r0, 0 cmp r0, 0
bne _08153B54 bne _08153B54
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674AE4 ldr r1, =gUnknown_08674AE4
b _08153B74 b _08153B74
.pool .pool
_08153B54: _08153B54:
mov r0, r9 mov r0, r9
adds r1, r4, 0 adds r1, r4, 0
bl CompareString bl StringCompare
cmp r0, 0 cmp r0, 0
beq _08153B70 beq _08153B70
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B16 ldr r1, =gUnknown_08674B16
b _08153B74 b _08153B74
.pool .pool
_08153B70: _08153B70:
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B42 ldr r1, =gUnknown_08674B42
_08153B74: _08153B74:
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r7, 0x6C] str r0, [r7, 0x6C]
bl sub_80E162C bl sub_80E162C
@@ -514,9 +514,9 @@ sub_8153BB0: @ 8153BB0
adds r2, 0x1 adds r2, 0x1
str r2, [r4, 0x8] str r2, [r4, 0x8]
bl sub_80F9B30 bl sub_80F9B30
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B6A ldr r1, =gUnknown_08674B6A
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]
movs r0, 0 movs r0, 0
@@ -583,9 +583,9 @@ sub_8153C4C: @ 8153C4C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_809D3E8 bl sub_809D3E8
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B9E ldr r1, =gUnknown_08674B9E
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]
movs r0, 0 movs r0, 0
@@ -604,9 +604,9 @@ sub_8153C70: @ 8153C70
adds r1, 0x1 adds r1, 0x1
str r1, [r4, 0x8] str r1, [r4, 0x8]
bl sub_811EFC0 bl sub_811EFC0
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674BD4 ldr r1, =gUnknown_08674BD4
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]
movs r0, 0 movs r0, 0
@@ -668,25 +668,25 @@ sub_8153CC8: @ 8153CC8
lsls r0, 1 lsls r0, 1
cmp r4, r0 cmp r4, r0
bne _08153D18 bne _08153D18
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r1, =gUnknown_085E8264 ldr r1, =gUnknown_085E8264
movs r2, 0xB movs r2, 0xB
bl CopyString_LimitN bl StringCopyN
b _08153D22 b _08153D22
.pool .pool
_08153D18: _08153D18:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r1, =gUnknown_085E8268 ldr r1, =gUnknown_085E8268
movs r2, 0xB movs r2, 0xB
bl CopyString_LimitN bl StringCopyN
_08153D22: _08153D22:
ldr r0, =gUnknown_020244E9 ldr r0, =gUnknown_020244E9
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x6 cmp r0, 0x6
bne _08153D4C bne _08153D4C
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674C02 ldr r1, =gUnknown_08674C02
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x3 movs r0, 0x3
b _08153DB6 b _08153DB6
.pool .pool
@@ -731,9 +731,9 @@ _08153D86:
_08153DA4: _08153DA4:
bl party_compaction bl party_compaction
bl calc_player_party_count bl calc_player_party_count
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674BF0 ldr r1, =gUnknown_08674BF0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
_08153DB6: _08153DB6:
str r0, [r6, 0x6C] str r0, [r6, 0x6C]
@@ -757,16 +757,16 @@ sub_8153DD4: @ 8153DD4
subs r1, r0 subs r1, r0
ldr r0, [r4, 0x64] ldr r0, [r4, 0x64]
adds r1, r0 adds r1, r0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00000bec ldr r2, =0x00000bec
adds r0, r2 adds r0, r2
movs r2, 0xBC movs r2, 0xBC
bl memcpy bl memcpy
bl sub_81652B4 bl sub_81652B4
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674C31 ldr r1, =gUnknown_08674C31
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]
movs r0, 0 movs r0, 0
@@ -781,9 +781,9 @@ sub_8153E1C: @ 8153E1C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_809D5F4 bl sub_809D5F4
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085ECAD8 ldr r1, =gUnknown_085ECAD8
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]
movs r0, 0 movs r0, 0
+22 -22
View File
@@ -233,7 +233,7 @@ _080E2F2C:
ldr r2, =0x00001e30 ldr r2, =0x00001e30
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
_080E2F64: _080E2F64:
movs r0, 0x10 movs r0, 0x10
strh r0, [r4] strh r0, [r4]
@@ -835,7 +835,7 @@ pokemon_transfer_to_pc_with_message: @ 80E34E4
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080E3534 bne _080E3534
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
ldr r0, =0x00004036 ldr r0, =0x00004036
bl VarGet bl VarGet
lsls r0, 24 lsls r0, 24
@@ -843,18 +843,18 @@ pokemon_transfer_to_pc_with_message: @ 80E34E4
bl sav3_get_box_name bl sav3_get_box_name
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r1, =gUnknown_02039F94 ldr r1, =gUnknown_02039F94
ldr r1, [r1] ldr r1, [r1]
ldr r2, =0x00001e30 ldr r2, =0x00001e30
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
b _080E3574 b _080E3574
.pool .pool
_080E3534: _080E3534:
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
ldr r0, =0x00004036 ldr r0, =0x00004036
bl VarGet bl VarGet
lsls r0, 24 lsls r0, 24
@@ -862,22 +862,22 @@ _080E3534:
bl sav3_get_box_name bl sav3_get_box_name
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r1, =gUnknown_02039F94 ldr r1, =gUnknown_02039F94
ldr r1, [r1] ldr r1, [r1]
ldr r2, =0x00001e30 ldr r2, =0x00001e30
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
ldr r4, =gUnknown_02021EC4 ldr r4, =gStringVar3
bl get_unknown_box_id bl get_unknown_box_id
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sav3_get_box_name bl sav3_get_box_name
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
movs r5, 0x2 movs r5, 0x2
_080E3574: _080E3574:
ldr r0, =0x000008ab ldr r0, =0x000008ab
@@ -889,13 +889,13 @@ _080E3574:
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
_080E3586: _080E3586:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0858BDB8 ldr r1, =gUnknown_0858BDB8
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_81973C4 bl sub_81973C4
@@ -3302,7 +3302,7 @@ sub_80E48E8: @ 80E48E8
ldr r0, =gSpeciesNames ldr r0, =gSpeciesNames
adds r1, r0 adds r1, r0
add r0, sp, 0xC add r0, sp, 0xC
bl CopyString bl StringCopy
ldr r0, [r5] ldr r0, [r5]
ldr r1, =0x00001e28 ldr r1, =0x00001e28
adds r0, r1 adds r0, r1
@@ -3310,7 +3310,7 @@ sub_80E48E8: @ 80E48E8
ldr r1, [r0, 0x8] ldr r1, [r0, 0x8]
add r0, sp, 0xC add r0, sp, 0xC
movs r2, 0xF movs r2, 0xF
bl AppendString_LimitN bl StringAppendN
ldr r0, [r5] ldr r0, [r5]
ldr r4, =0x00001e14 ldr r4, =0x00001e14
adds r0, r4 adds r0, r4
@@ -3389,7 +3389,7 @@ sub_80E49BC: @ 80E49BC
movs r4, 0 movs r4, 0
ldr r1, =gUnknown_085E8D49 ldr r1, =gUnknown_085E8D49
add r0, sp, 0xC add r0, sp, 0xC
bl CopyString bl StringCopy
ldr r5, =gUnknown_02039F94 ldr r5, =gUnknown_02039F94
ldr r0, [r5] ldr r0, [r5]
ldr r1, =0x00001e36 ldr r1, =0x00001e36
@@ -3401,7 +3401,7 @@ sub_80E49BC: @ 80E49BC
bne _080E49E6 bne _080E49E6
ldr r1, =gUnknown_085E8D4B ldr r1, =gUnknown_085E8D4B
add r0, sp, 0xC add r0, sp, 0xC
bl CopyString bl StringCopy
movs r4, 0x1 movs r4, 0x1
_080E49E6: _080E49E6:
ldr r0, [r5] ldr r0, [r5]
@@ -3686,7 +3686,7 @@ _080E4C00:
lsls r2, 24 lsls r2, 24
lsrs r2, 24 lsrs r2, 24
adds r1, r3, 0 adds r1, r3, 0
bl CopyString_LimitN bl StringCopyN
b _080E4C4A b _080E4C4A
.pool .pool
_080E4C34: _080E4C34:
@@ -4188,7 +4188,7 @@ _080E5066:
sub_80E5074: @ 80E5074 sub_80E5074: @ 80E5074
push {lr} push {lr}
sub sp, 0x8 sub sp, 0x8
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldrb r2, [r1, 0x8] ldrb r2, [r1, 0x8]
movs r0, 0 movs r0, 0
@@ -4208,7 +4208,7 @@ sub_80E5074: @ 80E5074
sub_80E509C: @ 80E509C sub_80E509C: @ 80E509C
push {lr} push {lr}
sub sp, 0x8 sub sp, 0x8
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldrb r2, [r1, 0x8] ldrb r2, [r1, 0x8]
movs r0, 0 movs r0, 0
@@ -4228,7 +4228,7 @@ sub_80E509C: @ 80E509C
sub_80E50C4: @ 80E50C4 sub_80E50C4: @ 80E50C4
push {lr} push {lr}
sub sp, 0x8 sub sp, 0x8
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldrb r2, [r1, 0x8] ldrb r2, [r1, 0x8]
movs r0, 0 movs r0, 0
@@ -4248,7 +4248,7 @@ sub_80E50C4: @ 80E50C4
sub_80E50EC: @ 80E50EC sub_80E50EC: @ 80E50EC
push {lr} push {lr}
sub sp, 0x8 sub sp, 0x8
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldrb r2, [r1, 0x8] ldrb r2, [r1, 0x8]
movs r0, 0 movs r0, 0
+8 -8
View File
@@ -63,7 +63,7 @@ set_player_trainer_id: @ 8084310
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
orrs r4, r0 orrs r4, r0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r1, 0xA adds r1, 0xA
adds r0, r4, 0 adds r0, r4, 0
@@ -76,7 +76,7 @@ set_player_trainer_id: @ 8084310
thumb_func_start init_options thumb_func_start init_options
init_options: @ 808433C init_options: @ 808433C
ldr r3, =gUnknown_03005D90 ldr r3, =gSaveBlock2Ptr
ldr r2, [r3] ldr r2, [r3]
ldrb r1, [r2, 0x14] ldrb r1, [r2, 0x14]
movs r0, 0x8 movs r0, 0x8
@@ -124,7 +124,7 @@ sub_8084390: @ 8084390
ldr r1, =gUnknown_030060B0 ldr r1, =gUnknown_030060B0
movs r0, 0 movs r0, 0
strb r0, [r1] strb r0, [r1]
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x28 adds r0, 0x28
movs r1, 0 movs r1, 0
@@ -146,7 +146,7 @@ sub_80843C0: @ 80843C0
push {r4-r7,lr} push {r4-r7,lr}
bl sub_80DF040 bl sub_80DF040
movs r2, 0x8 movs r2, 0x8
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r12, r0 mov r12, r0
ldr r4, =0x00002e90 ldr r4, =0x00002e90
ldr r3, =gUnknown_08339D1C ldr r3, =gUnknown_08339D1C
@@ -178,7 +178,7 @@ sub_8084400: @ 8084400
sub sp, 0x4 sub sp, 0x4
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
ldr r1, [r4] ldr r1, [r4]
ldr r0, =0x0000064c ldr r0, =0x0000064c
adds r1, r0 adds r1, r0
@@ -261,7 +261,7 @@ _080844B2:
ldr r1, =gUnknown_020322D4 ldr r1, =gUnknown_020322D4
movs r0, 0x1 movs r0, 0x1
strb r0, [r1] strb r0, [r1]
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
ldr r0, [r4] ldr r0, [r4]
adds r0, 0xAC adds r0, 0xAC
movs r5, 0 movs r5, 0
@@ -285,7 +285,7 @@ _080844B2:
bl GabbyAndTyNewGameInitData bl GabbyAndTyNewGameInitData
bl sub_80E8B28 bl sub_80E8B28
bl RemoveAllBerryTrees bl RemoveAllBerryTrees
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -345,7 +345,7 @@ sub_80845CC: @ 80845CC
mov r0, sp mov r0, sp
movs r5, 0 movs r5, 0
strh r5, [r0] strh r5, [r0]
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
ldr r1, [r4] ldr r1, [r4]
movs r0, 0xF6 movs r0, 0xF6
lsls r0, 1 lsls r0, 1
+4 -4
View File
@@ -220,7 +220,7 @@ _080BA69C:
b _080BA7F4 b _080BA7F4
.pool .pool
_080BA6BC: _080BA6BC:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x14] ldrb r0, [r0, 0x14]
lsrs r0, 3 lsrs r0, 3
@@ -239,7 +239,7 @@ _080BA6E0:
movs r1, 0 movs r1, 0
movs r2, 0x2 movs r2, 0x2
bl gpu_pal_apply bl gpu_pal_apply
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x14] ldrb r0, [r0, 0x14]
lsrs r0, 3 lsrs r0, 3
@@ -308,7 +308,7 @@ _080BA774:
adds r4, r1 adds r4, r1
movs r0, 0 movs r0, 0
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, [r0] ldr r2, [r0]
ldrb r0, [r2, 0x14] ldrb r0, [r2, 0x14]
lsls r0, 29 lsls r0, 29
@@ -654,7 +654,7 @@ sub_80BAA64: @ 80BAA64
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r6, =gUnknown_03005D90 ldr r6, =gSaveBlock2Ptr
ldr r3, [r6] ldr r3, [r6]
ldr r1, =gTasks ldr r1, =gTasks
lsls r4, r0, 2 lsls r4, r0, 2
+4 -4
View File
@@ -10,7 +10,7 @@ reset_playtime: @ 80841E4
ldr r1, =gUnknown_03000E08 ldr r1, =gUnknown_03000E08
movs r0, 0 movs r0, 0
strb r0, [r1] strb r0, [r1]
ldr r2, =gUnknown_03005D90 ldr r2, =gSaveBlock2Ptr
ldr r3, [r2] ldr r3, [r2]
movs r1, 0 movs r1, 0
movs r0, 0 movs r0, 0
@@ -30,7 +30,7 @@ set_max_playtime_if_appropriate: @ 8084208
ldr r1, =gUnknown_03000E08 ldr r1, =gUnknown_03000E08
movs r0, 0x1 movs r0, 0x1
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrh r1, [r0, 0xE] ldrh r1, [r0, 0xE]
ldr r0, =0x000003e7 ldr r0, =0x000003e7
@@ -59,7 +59,7 @@ gametime_increment: @ 808423C
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
bne _08084294 bne _08084294
ldr r2, =gUnknown_03005D90 ldr r2, =gSaveBlock2Ptr
ldr r0, [r2] ldr r0, [r2]
ldrb r1, [r0, 0x12] ldrb r1, [r0, 0x12]
adds r1, 0x1 adds r1, 0x1
@@ -108,7 +108,7 @@ set_max_playtime: @ 80842A4
ldr r1, =gUnknown_03000E08 ldr r1, =gUnknown_03000E08
movs r0, 0x2 movs r0, 0x2
strb r0, [r1] strb r0, [r1]
ldr r2, =gUnknown_03005D90 ldr r2, =gSaveBlock2Ptr
ldr r3, [r2] ldr r3, [r2]
ldr r0, =0x000003e7 ldr r0, =0x000003e7
strh r0, [r3, 0xE] strh r0, [r3, 0xE]
+45 -45
View File
@@ -9,7 +9,7 @@
sub_816ADF4: @ 816ADF4 sub_816ADF4: @ 816ADF4
push {r4-r6,lr} push {r4-r6,lr}
movs r4, 0 movs r4, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x93 movs r1, 0x93
lsls r1, 3 lsls r1, 3
@@ -374,7 +374,7 @@ sub_816B148: @ 816B148
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x4 cmp r0, 0x4
bne _0816B180 bne _0816B180
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
cmp r0, 0 cmp r0, 0
@@ -817,7 +817,7 @@ sub_816B510: @ 816B510
push {r4,lr} push {r4,lr}
movs r2, 0 movs r2, 0
movs r1, 0x6 movs r1, 0x6
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r3, [r0] ldr r3, [r0]
movs r4, 0xB0 movs r4, 0xB0
lsls r4, 6 lsls r4, 6
@@ -862,7 +862,7 @@ _0816B55A:
mov r8, r1 mov r8, r1
cmp r4, 0xF cmp r4, 0xF
bhi _0816B5D4 bhi _0816B5D4
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r10, r0 mov r10, r0
lsls r0, r2, 3 lsls r0, r2, 3
adds r0, r2 adds r0, r2
@@ -1078,8 +1078,8 @@ sub_816B730: @ 816B730
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r5, =gUnknown_02021CC4 ldr r5, =gStringVar1
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r1, =gUnknown_0203BCB8 ldr r1, =gUnknown_0203BCB8
ldrh r0, [r1] ldrh r0, [r1]
adds r0, 0x6 adds r0, 0x6
@@ -1093,14 +1093,14 @@ sub_816B730: @ 816B730
ldr r0, =0x00002bf2 ldr r0, =0x00002bf2
adds r1, r0 adds r1, r0
adds r0, r5, 0 adds r0, r5, 0
bl CopyString bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl sub_81DB554 bl sub_81DB554
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085EAC63 ldr r1, =gUnknown_085EAC63
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_816B7DC ldr r2, =sub_816B7DC
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
@@ -1248,7 +1248,7 @@ sub_816B8A4: @ 816B8A4
bne _0816B8E6 bne _0816B8E6
bl sub_81D1EC0 bl sub_81D1EC0
bl overworld_free_bg_tilemaps bl overworld_free_bg_tilemaps
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r1, =gUnknown_0203BCB8 ldr r1, =gUnknown_0203BCB8
ldrh r0, [r1] ldrh r0, [r1]
adds r0, 0x6 adds r0, 0x6
@@ -1413,7 +1413,7 @@ sub_816BA18: @ 816BA18
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r4, =gUnknown_0203BCB8 ldr r4, =gUnknown_0203BCB8
ldrh r1, [r4] ldrh r1, [r4]
adds r1, 0x6 adds r1, 0x6
@@ -1773,7 +1773,7 @@ _0816BD14:
adds r4, r0 adds r4, r0
ldr r0, [r5] ldr r0, [r5]
adds r0, r4 adds r0, r4
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
lsls r2, r6, 2 lsls r2, r6, 2
adds r1, r2 adds r1, r2
@@ -1809,7 +1809,7 @@ _0816BD58:
ldr r0, [r5] ldr r0, [r5]
adds r0, r4 adds r0, r4
ldr r1, =gUnknown_085E8CF7 ldr r1, =gUnknown_085E8CF7
bl CopyString bl StringCopy
ldr r0, [r5] ldr r0, [r5]
lsls r2, r6, 3 lsls r2, r6, 3
adds r1, r0, r2 adds r1, r0, r2
@@ -1878,7 +1878,7 @@ _0816BDEE:
negs r0, r0 negs r0, r0
cmp r4, r0 cmp r4, r0
beq _0816BE2C beq _0816BE2C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
lsls r1, r4, 2 lsls r1, r4, 2
adds r0, r1 adds r0, r1
@@ -1938,8 +1938,8 @@ _0816BE84:
movs r2, 0xFF movs r2, 0xFF
bl sub_816BFE0 bl sub_816BFE0
_0816BE8E: _0816BE8E:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
lsls r2, r4, 2 lsls r2, r4, 2
adds r1, r2 adds r1, r2
@@ -1948,11 +1948,11 @@ _0816BE8E:
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gUnknown_085E8DA0
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x7 movs r0, 0x7
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x68 movs r2, 0x68
@@ -1991,7 +1991,7 @@ sub_816BEF0: @ 816BEF0
negs r0, r0 negs r0, r0
cmp r1, r0 cmp r1, r0
beq _0816BF2C beq _0816BF2C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
lsls r1, 2 lsls r1, 2
adds r0, r1 adds r0, r1
@@ -2242,7 +2242,7 @@ sub_816C110: @ 816C110
push {lr} push {lr}
sub sp, 0x4 sub sp, 0x4
bl sub_80D6E84 bl sub_80D6E84
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x93 movs r1, 0x93
lsls r1, 3 lsls r1, 3
@@ -2435,10 +2435,10 @@ sub_816C2C0: @ 816C2C0
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x11 movs r1, 0x11
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
adds r0, r4, 0 adds r0, r4, 0
adds r1, r6, 0 adds r1, r6, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
movs r0, 0 movs r0, 0
@@ -2641,7 +2641,7 @@ sub_816C450: @ 816C450
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_816C690 bl sub_816C690
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, [r6] ldr r0, [r6]
adds r0, r5 adds r0, r5
@@ -2652,7 +2652,7 @@ sub_816C450: @ 816C450
lsls r0, 3 lsls r0, 3
adds r1, r0 adds r1, r0
ldrh r0, [r1] ldrh r0, [r1]
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl itemid_get_name bl itemid_get_name
ldr r0, =0x0000fff7 ldr r0, =0x0000fff7
bl sub_816C228 bl sub_816C228
@@ -2790,7 +2790,7 @@ sub_816C5A0: @ 816C5A0
subs r0, r6, 0x1 subs r0, r6, 0x1
cmp r2, r0 cmp r2, r0
beq _0816C60A beq _0816C60A
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x93 movs r1, 0x93
lsls r1, 3 lsls r1, 3
@@ -2889,12 +2889,12 @@ sub_816C6BC: @ 816C6BC
lsrs r5, 24 lsrs r5, 24
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gUnknown_085E8DA0
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x30 movs r2, 0x30
@@ -2941,7 +2941,7 @@ sub_816C71C: @ 816C71C
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
cmp r0, 0 cmp r0, 0
bne _0816C798 bne _0816C798
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
lsls r0, r4, 2 lsls r0, r4, 2
adds r1, r0 adds r1, r0
@@ -2959,7 +2959,7 @@ _0816C774:
lsls r2, 3 lsls r2, 3
adds r0, r1, r2 adds r0, r1, r2
ldrh r0, [r0] ldrh r0, [r0]
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl itemid_get_name bl itemid_get_name
ldr r0, =0x0000fffe ldr r0, =0x0000fffe
bl sub_816C228 bl sub_816C228
@@ -2967,7 +2967,7 @@ _0816C774:
b _0816C7D4 b _0816C7D4
.pool .pool
_0816C798: _0816C798:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
lsls r0, r4, 2 lsls r0, r4, 2
adds r1, r0 adds r1, r0
@@ -2985,7 +2985,7 @@ _0816C7BC:
lsls r2, 3 lsls r2, 3
adds r0, r1, r2 adds r0, r1, r2
ldrh r0, [r0] ldrh r0, [r0]
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl itemid_get_name bl itemid_get_name
ldr r0, =0x0000fffc ldr r0, =0x0000fffc
bl sub_816C228 bl sub_816C228
@@ -3039,7 +3039,7 @@ sub_816C818: @ 816C818
adds r2, r0 adds r2, r0
lsls r2, 16 lsls r2, 16
adds r0, r6, 0x4 adds r0, r6, 0x4
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
mov r8, r1 mov r8, r1
ldr r1, [r1] ldr r1, [r1]
lsrs r7, r2, 14 lsrs r7, r2, 14
@@ -3136,7 +3136,7 @@ sub_816C8FC: @ 816C8FC
ldrh r0, [r0] ldrh r0, [r0]
adds r1, r0 adds r1, r0
lsls r1, 16 lsls r1, 16
ldr r7, =gUnknown_03005D8C ldr r7, =gSaveBlock1Ptr
ldr r0, [r7] ldr r0, [r7]
lsrs r5, r1, 14 lsrs r5, r1, 14
adds r0, r5 adds r0, r5
@@ -3156,14 +3156,14 @@ sub_816C8FC: @ 816C8FC
lsls r2, 3 lsls r2, 3
adds r0, r2 adds r0, r2
ldrh r0, [r0] ldrh r0, [r0]
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl itemid_get_name bl itemid_get_name
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
movs r2, 0x4 movs r2, 0x4
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =0x0000fffd ldr r0, =0x0000fffd
bl sub_816C228 bl sub_816C228
bl sub_816C2C0 bl sub_816C2C0
@@ -3215,7 +3215,7 @@ sub_816C9B8: @ 816C9B8
ldrh r0, [r0] ldrh r0, [r0]
adds r1, r0 adds r1, r0
lsls r1, 16 lsls r1, 16
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
ldr r0, [r6] ldr r0, [r6]
lsrs r4, r1, 14 lsrs r4, r1, 14
adds r0, r4 adds r0, r4
@@ -3233,14 +3233,14 @@ sub_816C9B8: @ 816C9B8
lsls r2, 3 lsls r2, 3
adds r0, r2 adds r0, r2
ldrh r0, [r0] ldrh r0, [r0]
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl itemid_get_name bl itemid_get_name
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
movs r2, 0x4 movs r2, 0x4
ldrsh r1, [r7, r2] ldrsh r1, [r7, r2]
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =0x0000fff8 ldr r0, =0x0000fff8
bl sub_816C228 bl sub_816C228
bl sub_816C2C0 bl sub_816C2C0
@@ -3310,7 +3310,7 @@ sub_816CAC8: @ 816CAC8
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldr r1, =gUnknown_0203BCB8 ldr r1, =gUnknown_0203BCB8
ldrh r0, [r1, 0x2] ldrh r0, [r1, 0x2]
@@ -3390,7 +3390,7 @@ sub_816CB74: @ 816CB74
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0816CBAC beq _0816CBAC
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldr r1, =gUnknown_0203BCB8 ldr r1, =gUnknown_0203BCB8
ldrh r0, [r1, 0x2] ldrh r0, [r1, 0x2]
+26 -26
View File
@@ -16,7 +16,7 @@ sub_80BB2D0: @ 80BB2D0
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_030060B0 ldr r0, =gUnknown_030060B0
strb r2, [r0] strb r2, [r0]
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
ldr r0, [r4] ldr r0, [r4]
movs r1, 0 movs r1, 0
strb r2, [r0, 0x19] strb r2, [r0, 0x19]
@@ -33,7 +33,7 @@ sub_80BB2D0: @ 80BB2D0
bl sub_809D3C0 bl sub_809D3C0
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
ldr r3, =gUnknown_03005D8C ldr r3, =gSaveBlock1Ptr
ldr r6, =0x00000988 ldr r6, =0x00000988
ldr r5, =0x00003b24 ldr r5, =0x00003b24
_080BB30C: _080BB30C:
@@ -403,7 +403,7 @@ _080BB628:
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
ldr r1, [r4] ldr r1, [r4]
ldr r5, =gUnknown_03005D90 ldr r5, =gSaveBlock2Ptr
ldr r0, [r5] ldr r0, [r5]
ldrb r0, [r0, 0x19] ldrb r0, [r0, 0x19]
ldr r3, =0x00000612 ldr r3, =0x00000612
@@ -1219,7 +1219,7 @@ sub_80BBDE8: @ 80BBDE8
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _080BBE4A bne _080BBE4A
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
ldr r0, [r4] ldr r0, [r4]
ldr r5, =gUnknown_02039B4C ldr r5, =gUnknown_02039B4C
ldr r1, [r5] ldr r1, [r5]
@@ -3526,7 +3526,7 @@ _080BD266:
adds r3, r6, 0 adds r3, r6, 0
bl sub_80BCE2C bl sub_80BCE2C
adds r0, r4, 0 adds r0, r4, 0
bl GetStringLength bl StringLength
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
add sp, 0x4 add sp, 0x4
@@ -6845,7 +6845,7 @@ _080BEF28:
ands r0, r2 ands r0, r2
cmp r0, 0 cmp r0, 0
beq _080BEF78 beq _080BEF78
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x1 cmp r0, 0x1
@@ -6880,7 +6880,7 @@ _080BEF78:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080BEFBA beq _080BEFBA
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x1 cmp r0, 0x1
@@ -7621,7 +7621,7 @@ _080BF694:
ands r0, r2 ands r0, r2
cmp r0, 0 cmp r0, 0
beq _080BF700 beq _080BF700
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x1 cmp r0, 0x1
@@ -7664,7 +7664,7 @@ _080BF700:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080BF772 beq _080BF772
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x1 cmp r0, 0x1
@@ -7895,11 +7895,11 @@ _080BF910:
_080BF93C: _080BF93C:
ldr r1, =gUnknown_085E8723 ldr r1, =gUnknown_085E8723
add r0, sp, 0x4 add r0, sp, 0x4
bl CopyString bl StringCopy
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
add r0, sp, 0x4 add r0, sp, 0x4
bl AppendString bl StringAppend
movs r0, 0x1 movs r0, 0x1
add r1, sp, 0x4 add r1, sp, 0x4
movs r2, 0xF0 movs r2, 0xF0
@@ -7920,7 +7920,7 @@ _080BF97C:
bl sub_80A1A74 bl sub_80A1A74
b _080BFB4E b _080BFB4E
_080BF982: _080BF982:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
bl sub_806F000 bl sub_806F000
@@ -8198,7 +8198,7 @@ _080BFC10:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080BFC5C beq _080BFC5C
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x1 cmp r0, 0x1
@@ -8918,11 +8918,11 @@ _080C024C:
_080C0250: _080C0250:
ldr r1, =gUnknown_085E8D4F ldr r1, =gUnknown_085E8D4F
mov r0, sp mov r0, sp
bl CopyString bl StringCopy
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
mov r0, sp mov r0, sp
movs r1, 0x60 movs r1, 0x60
movs r2, 0x19 movs r2, 0x19
@@ -9448,7 +9448,7 @@ _080C06A2:
_080C06A8: _080C06A8:
b _080C07E8 b _080C07E8
_080C06AA: _080C06AA:
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r0, [r1] ldr r0, [r1]
adds r0, 0x5C adds r0, 0x5C
adds r0, r4 adds r0, r4
@@ -9459,7 +9459,7 @@ _080C06AA:
bne _080C06BE bne _080C06BE
b _080C07E8 b _080C07E8
_080C06BE: _080C06BE:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r3, [r0] ldr r3, [r0]
ldr r6, =0x00000988 ldr r6, =0x00000988
adds r1, r3, r6 adds r1, r3, r6
@@ -9484,7 +9484,7 @@ _080C06E0:
b _080C076A b _080C076A
.pool .pool
_080C06FC: _080C06FC:
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r3, [r1] ldr r3, [r1]
adds r0, r3, 0 adds r0, r3, 0
adds r0, 0x28 adds r0, 0x28
@@ -9499,7 +9499,7 @@ _080C06FC:
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
ands r0, r5 ands r0, r5
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
cmp r2, r0 cmp r2, r0
bne _080C0754 bne _080C0754
ldr r1, [r6] ldr r1, [r6]
@@ -9557,7 +9557,7 @@ _080C076A:
b _080C07E8 b _080C07E8
.pool .pool
_080C079C: _080C079C:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r1, 0x5C adds r1, 0x5C
adds r1, r4 adds r1, r4
@@ -9565,7 +9565,7 @@ _080C079C:
adds r0, r5, 0 adds r0, r5, 0
orrs r0, r2 orrs r0, r2
strb r0, [r1] strb r0, [r1]
ldr r3, =gUnknown_03005D8C ldr r3, =gSaveBlock1Ptr
ldr r1, [r3] ldr r1, [r3]
ldr r0, =0x00000988 ldr r0, =0x00000988
adds r1, r0 adds r1, r0
@@ -9580,7 +9580,7 @@ _080C079C:
b _080C07DE b _080C07DE
.pool .pool
_080C07D8: _080C07D8:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r1, 0x28 adds r1, 0x28
_080C07DE: _080C07DE:
@@ -10479,13 +10479,13 @@ sub_80C0E68: @ 80C0E68
lsls r0, 1 lsls r0, 1
cmp r1, r0 cmp r1, r0
bne _080C0E94 bne _080C0E94
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x20] ldr r0, [r0, 0x20]
b _080C0E96 b _080C0E96
.pool .pool
_080C0E88: _080C0E88:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x1C] ldr r0, [r0, 0x1C]
b _080C0E96 b _080C0E96
@@ -11591,7 +11591,7 @@ _080C178C:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x5 movs r1, 0x5
bl sub_80C2318 bl sub_80C2318
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0x19] strb r0, [r1, 0x19]
bl sub_809D42C bl sub_809D42C
+3 -3
View File
@@ -138,7 +138,7 @@ sub_813CB40: @ 813CB40
bls _0813CB70 bls _0813CB70
strh r4, [r1] strh r4, [r1]
_0813CB70: _0813CB70:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r3, =0x000031dc ldr r3, =0x000031dc
adds r0, r3 adds r0, r3
@@ -1310,7 +1310,7 @@ _0813D4A8:
adds r0, r1 adds r0, r1
movs r1, 0 movs r1, 0
movs r2, 0x10 movs r2, 0x10
bl RepeatChar bl StringFill
b _0813D584 b _0813D584
.pool .pool
_0813D4D4: _0813D4D4:
@@ -1473,7 +1473,7 @@ _0813D614:
ands r0, r2 ands r0, r2
cmp r0, 0 cmp r0, 0
beq _0813D6A8 beq _0813D6A8
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x1 cmp r0, 0x1
+7 -7
View File
@@ -263,7 +263,7 @@ _08067C64:
str r0, [sp, 0x18] str r0, [sp, 0x18]
b _08067C8A b _08067C8A
_08067C70: _08067C70:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, [r0] ldr r2, [r0]
ldrb r1, [r2, 0xA] ldrb r1, [r2, 0xA]
ldrb r0, [r2, 0xB] ldrb r0, [r2, 0xB]
@@ -301,7 +301,7 @@ _08067C8A:
adds r0, r7, 0 adds r0, r7, 0
movs r1, 0x3 movs r1, 0x3
bl pokemon_setattr_encrypted bl pokemon_setattr_encrypted
ldr r5, =gUnknown_03005D90 ldr r5, =gSaveBlock2Ptr
ldr r2, [r5] ldr r2, [r5]
adds r0, r7, 0 adds r0, r7, 0
movs r1, 0x7 movs r1, 0x7
@@ -936,7 +936,7 @@ _080681D2:
adds r1, r6, 0 adds r1, r6, 0
adds r1, 0x20 adds r1, 0x20
add r0, sp, 0x10 add r0, sp, 0x10
bl CopyString bl StringCopy
add r0, sp, 0x10 add r0, sp, 0x10
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0xFC cmp r0, 0xFC
@@ -949,7 +949,7 @@ _080681D2:
mov r1, r9 mov r1, r9
strb r0, [r1] strb r0, [r1]
add r0, sp, 0x10 add r0, sp, 0x10
bl StripExtendedControlCodes bl StripExtCtrlCodes
b _08068236 b _08068236
_08068230: _08068230:
movs r0, 0x2 movs r0, 0x2
@@ -1081,7 +1081,7 @@ sub_8068338: @ 8068338
adds r6, r1, 0 adds r6, r1, 0
lsls r2, 24 lsls r2, 24
lsrs r2, 24 lsrs r2, 24
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00000ca9 ldr r1, =0x00000ca9
adds r0, r1 adds r0, r1
@@ -1169,7 +1169,7 @@ _080683D2:
bl pokemon_setattr bl pokemon_setattr
add r0, sp, 0x10 add r0, sp, 0x10
ldr r1, [sp, 0x54] ldr r1, [sp, 0x54]
bl CopyString bl StringCopy
add r0, sp, 0x10 add r0, sp, 0x10
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0xFC cmp r0, 0xFC
@@ -1182,7 +1182,7 @@ _080683D2:
mov r1, r9 mov r1, r9
strb r0, [r1] strb r0, [r1]
add r0, sp, 0x10 add r0, sp, 0x10
bl StripExtendedControlCodes bl StripExtCtrlCodes
b _08068430 b _08068430
_0806842A: _0806842A:
movs r0, 0x2 movs r0, 0x2
+4 -4
View File
@@ -1340,9 +1340,9 @@ _0806A89C:
beq _0806A8BC beq _0806A8BC
ldr r1, =gUnknown_085E8264 ldr r1, =gUnknown_085E8264
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
bl GetStringLength bl StringLength
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
b _0806AC8C b _0806AC8C
@@ -2879,7 +2879,7 @@ memcpy_pokemon: @ 806B408
pokemon_catch: @ 806B414 pokemon_catch: @ 806B414
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
ldr r2, [r4] ldr r2, [r4]
movs r1, 0x7 movs r1, 0x7
bl pokemon_setattr bl pokemon_setattr
@@ -3937,7 +3937,7 @@ _0806BA4E:
adds r0, 0x24 adds r0, 0x24
adds r0, r5, r0 adds r0, r5, r0
mov r1, sp mov r1, sp
bl CopyString_Limit10 bl StringCopy10
mov r2, r10 mov r2, r10
adds r2, 0x30 adds r2, 0x30
adds r2, r5, r2 adds r2, r5, r2
+2 -2
View File
@@ -60,7 +60,7 @@ sub_80FB5E8: @ 80FB5E8
ldr r0, =0x000040b4 ldr r0, =0x000040b4
bl GetVarPointer bl GetVarPointer
adds r7, r0, 0 adds r7, r0, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r3, [r0] ldr r3, [r0]
adds r6, r3, 0x4 adds r6, r3, 0x4
movs r0, 0 movs r0, 0
@@ -262,7 +262,7 @@ sub_80FB7A4: @ 80FB7A4
movs r0, 0x80 movs r0, 0x80
lsls r0, 7 lsls r0, 7
bl FlagSet bl FlagSet
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x4 movs r1, 0x4
ldrsb r1, [r0, r1] ldrsb r1, [r0, r1]
+30 -30
View File
@@ -19,7 +19,7 @@ sub_80E6BE8: @ 80E6BE8
sub_80E6BF8: @ 80E6BF8 sub_80E6BF8: @ 80E6BF8
push {r4,lr} push {r4,lr}
ldr r2, =gUnknown_03001134 ldr r2, =gUnknown_03001134
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r3, =0x00001a9c ldr r3, =0x00001a9c
adds r0, r1, r3 adds r0, r1, r3
@@ -44,7 +44,7 @@ sub_80E6BF8: @ 80E6BF8
ldr r0, =gUnknown_02039F9C ldr r0, =gUnknown_02039F9C
str r0, [r2] str r0, [r2]
ldr r2, =gUnknown_0300114C ldr r2, =gUnknown_0300114C
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r4, =0x0000064c ldr r4, =0x0000064c
adds r3, r0, r4 adds r3, r0, r4
@@ -855,7 +855,7 @@ _080E7464:
bne _080E746E bne _080E746E
b _080E7566 b _080E7566
_080E746E: _080E746E:
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
bl sub_80E7810 bl sub_80E7810
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
@@ -863,7 +863,7 @@ _080E746E:
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r0, 0x5 movs r0, 0x5
b _080E7564 b _080E7564
.pool .pool
@@ -1528,7 +1528,7 @@ _080E79CE:
beq _080E79F2 beq _080E79F2
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
_080E79F2: _080E79F2:
adds r6, 0x1 adds r6, 0x1
cmp r6, 0x3 cmp r6, 0x3
@@ -1828,7 +1828,7 @@ _080E7C24:
adds r4, r5, 0 adds r4, r5, 0
adds r4, 0x24 adds r4, 0x24
adds r0, r4, 0 adds r0, r4, 0
bl GetStringLength bl StringLength
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
cmp r0, 0x5 cmp r0, 0x5
@@ -1838,7 +1838,7 @@ _080E7C24:
.pool .pool
_080E7C54: _080E7C54:
adds r0, r4, 0 adds r0, r4, 0
bl StripExtendedControlCodes bl StripExtCtrlCodes
mov r4, r9 mov r4, r9
_080E7C5C: _080E7C5C:
ldrh r1, [r5, 0x2C] ldrh r1, [r5, 0x2C]
@@ -1847,7 +1847,7 @@ _080E7C5C:
bne _080E7C74 bne _080E7C74
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x2C adds r0, 0x2C
bl StripExtendedControlCodes bl StripExtCtrlCodes
movs r1, 0x1 movs r1, 0x1
b _080E7C76 b _080E7C76
.pool .pool
@@ -2215,7 +2215,7 @@ _080E7F1C:
ldr r1, [sp, 0x2C] ldr r1, [sp, 0x2C]
ldr r2, [sp, 0x44] ldr r2, [sp, 0x44]
adds r7, r1, r2 adds r7, r1, r2
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
movs r3, 0xC2 movs r3, 0xC2
lsls r3, 6 lsls r3, 6
@@ -2279,9 +2279,9 @@ sub_80E7F68: @ 80E7F68
ldr r0, =0x00004001 ldr r0, =0x00004001
ldrh r1, [r4] ldrh r1, [r4]
bl VarSet bl VarSet
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r1, =gUnknown_020229F0 ldr r1, =gUnknown_020229F0
bl CopyString bl StringCopy
ldrh r1, [r4] ldrh r1, [r4]
ldr r0, =0x00000113 ldr r0, =0x00000113
cmp r1, r0 cmp r1, r0
@@ -2458,7 +2458,7 @@ sub_80E8110: @ 80E8110
str r2, [sp, 0x4] str r2, [sp, 0x4]
mov r8, r2 mov r8, r2
movs r7, 0 movs r7, 0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
mov r9, r0 mov r9, r0
_080E8150: _080E8150:
mov r1, r9 mov r1, r9
@@ -2543,7 +2543,7 @@ _080E81EC:
ldr r1, =0x33330000 ldr r1, =0x33330000
cmp r0, r1 cmp r0, r1
bls _080E8224 bls _080E8224
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xB2 adds r0, 0xB2
ldrb r0, [r0] ldrb r0, [r0]
@@ -2562,7 +2562,7 @@ _080E820E:
b _080E824C b _080E824C
.pool .pool
_080E8224: _080E8224:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xB2 adds r0, 0xB2
ldrb r0, [r0] ldrb r0, [r0]
@@ -2602,7 +2602,7 @@ sub_80E8260: @ 80E8260
sub sp, 0xC sub sp, 0xC
mov r8, r0 mov r8, r0
movs r6, 0 movs r6, 0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
mov r10, r0 mov r10, r0
_080E8274: _080E8274:
movs r7, 0 movs r7, 0
@@ -2625,7 +2625,7 @@ _080E8286:
mov r0, r10 mov r0, r10
ldr r1, [r0] ldr r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
adds r4, 0x10 adds r4, 0x10
adds r6, 0x10 adds r6, 0x10
adds r5, 0x10 adds r5, 0x10
@@ -2635,7 +2635,7 @@ _080E8286:
mov r6, r9 mov r6, r9
cmp r6, 0x8 cmp r6, 0x8
ble _080E8274 ble _080E8274
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
mov r10, r1 mov r10, r1
ldr r2, =0x00000ee1 ldr r2, =0x00000ee1
str r2, [sp, 0x4] str r2, [sp, 0x4]
@@ -2672,13 +2672,13 @@ _080E82DA:
mov r0, r10 mov r0, r10
ldr r1, [r0] ldr r1, [r0]
mov r0, r9 mov r0, r9
bl CopyString bl StringCopy
mov r2, r10 mov r2, r10
ldr r1, [r2] ldr r1, [r2]
ldr r0, [sp, 0x4] ldr r0, [sp, 0x4]
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
ldr r1, [sp, 0x4] ldr r1, [sp, 0x4]
adds r1, 0x8 adds r1, 0x8
str r1, [sp, 0x4] str r1, [sp, 0x4]
@@ -2694,7 +2694,7 @@ _080E82DA:
cmp r7, 0 cmp r7, 0
bge _080E82DA bge _080E82DA
movs r6, 0 movs r6, 0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r3, [r0] ldr r3, [r0]
mov r4, r8 mov r4, r8
movs r1, 0xC4 movs r1, 0xC4
@@ -2867,7 +2867,7 @@ _080E8496:
ldrb r0, [r6] ldrb r0, [r6]
cmp r0, 0xFF cmp r0, 0xFF
beq _080E84B4 beq _080E84B4
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r1, 0xDC adds r1, 0xDC
adds r0, r4, 0 adds r0, r4, 0
@@ -2891,7 +2891,7 @@ _080E84B4:
b _080E8566 b _080E8566
.pool .pool
_080E84CC: _080E84CC:
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
ldr r0, [r4] ldr r0, [r4]
adds r1, r0, 0 adds r1, r0, 0
adds r1, 0xB2 adds r1, 0xB2
@@ -2925,7 +2925,7 @@ _080E8508:
_080E850C: _080E850C:
movs r0, 0x1 movs r0, 0x1
eors r0, r5 eors r0, r5
ldr r7, =gUnknown_03005D90 ldr r7, =gSaveBlock2Ptr
ldr r4, [r7] ldr r4, [r7]
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0xB2 adds r1, 0xB2
@@ -3035,7 +3035,7 @@ _080E85BE:
_080E85DC: _080E85DC:
movs r6, 0 movs r6, 0
mov r8, r6 mov r8, r6
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r2, [sp, 0x10] ldr r2, [sp, 0x10]
lsls r0, r2, 5 lsls r0, r2, 5
@@ -3190,7 +3190,7 @@ _080E8702:
ldr r5, [sp, 0x8] ldr r5, [sp, 0x8]
adds r5, 0x1 adds r5, 0x1
str r5, [sp, 0x2C] str r5, [sp, 0x2C]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x54 movs r0, 0x54
ldr r6, [sp, 0x8] ldr r6, [sp, 0x8]
@@ -3486,7 +3486,7 @@ sub_80E8924: @ 80E8924
push {r5-r7} push {r5-r7}
mov r9, r0 mov r9, r0
movs r0, 0 movs r0, 0
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
mov r10, r1 mov r10, r1
_080E8936: _080E8936:
lsls r1, r0, 1 lsls r1, r0, 1
@@ -3518,7 +3518,7 @@ _080E8950:
cmp r0, 0x8 cmp r0, 0x8
ble _080E8936 ble _080E8936
movs r5, 0 movs r5, 0
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
_080E8972: _080E8972:
movs r0, 0x54 movs r0, 0x54
adds r1, r5, 0 adds r1, r5, 0
@@ -3588,7 +3588,7 @@ sub_80E89F8: @ 80E89F8
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
ldr r5, =gUnknown_02039F9C ldr r5, =gUnknown_02039F9C
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r1, [r4] ldr r1, [r4]
movs r0, 0xC2 movs r0, 0xC2
lsls r0, 6 lsls r0, 6
@@ -3655,7 +3655,7 @@ _080E8A90:
ldrb r1, [r7] ldrb r1, [r7]
lsrs r1, 4 lsrs r1, 4
adds r0, r4, 0 adds r0, r4, 0
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
_080E8A9A: _080E8A9A:
adds r4, 0x38 adds r4, 0x38
movs r0, 0x38 movs r0, 0x38
@@ -3696,7 +3696,7 @@ _080E8AC6:
beq _080E8ADC beq _080E8ADC
adds r0, r1, 0 adds r0, r1, 0
adds r0, 0x20 adds r0, 0x20
bl StripExtendedControlCodes bl StripExtCtrlCodes
_080E8ADC: _080E8ADC:
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x3 cmp r4, 0x3
+16 -16
View File
@@ -1522,7 +1522,7 @@ sub_81238AC: @ 81238AC
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
sub sp, 0xC sub sp, 0xC
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
movs r1, 0x4 movs r1, 0x4
ldrsb r1, [r2, r1] ldrsb r1, [r2, r1]
@@ -1581,7 +1581,7 @@ _08123928:
ldrh r2, [r0] ldrh r2, [r0]
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
mov r9, r0 mov r9, r0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrh r6, [r0] ldrh r6, [r0]
ldrh r3, [r0, 0x2] ldrh r3, [r0, 0x2]
@@ -1605,7 +1605,7 @@ _0812396C:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _081239C8 beq _081239C8
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r1, [r4] ldr r1, [r4]
adds r0, r1, 0 adds r0, r1, 0
adds r0, 0x24 adds r0, 0x24
@@ -1653,7 +1653,7 @@ _081239C8:
b _08123ABE b _08123ABE
.pool .pool
_081239E4: _081239E4:
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r1, [r4] ldr r1, [r4]
movs r0, 0x14 movs r0, 0x14
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
@@ -1690,7 +1690,7 @@ _08123A28:
strh r1, [r0] strh r1, [r0]
cmp r1, 0x57 cmp r1, 0x57
beq _08123A64 beq _08123A64
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r7, r0, 0 adds r7, r0, 0
adds r7, 0x24 adds r7, 0x24
@@ -1707,7 +1707,7 @@ _08123A28:
b _08123A8A b _08123A8A
.pool .pool
_08123A64: _08123A64:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r7, r0, 0 adds r7, r0, 0
adds r7, 0x14 adds r7, 0x14
@@ -1831,7 +1831,7 @@ _08123B56:
b _08123BC6 b _08123BC6
_08123B5E: _08123B5E:
movs r6, 0 movs r6, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r2, 0 movs r2, 0
ldrsh r0, [r1, r2] ldrsh r0, [r1, r2]
@@ -2822,7 +2822,7 @@ sub_8124288: @ 8124288
b _081243A4 b _081243A4
.pool .pool
_08124304: _08124304:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
cmp r0, 0x1 cmp r0, 0x1
@@ -3161,7 +3161,7 @@ _08124584:
adds r1, r0 adds r1, r0
ldr r1, [r1] ldr r1, [r1]
adds r0, r5, 0 adds r0, r5, 0
bl CopyString bl StringCopy
adds r1, r0, 0 adds r1, r0, 0
b _081245B2 b _081245B2
.pool .pool
@@ -3173,7 +3173,7 @@ _081245A6:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
adds r2, r4, 0 adds r2, r4, 0
bl RepeatChar bl StringFill
b _081245D6 b _081245D6
_081245B2: _081245B2:
cmp r4, 0 cmp r4, 0
@@ -3213,12 +3213,12 @@ sub_81245DC: @ 81245DC
cmp r1, 0x57 cmp r1, 0x57
bne _08124604 bne _08124604
ldr r1, =gUnknown_085EC9D2 ldr r1, =gUnknown_085EC9D2
bl CopyString bl StringCopy
b _0812460A b _0812460A
.pool .pool
_081245F8: _081245F8:
ldr r1, =gUnknown_085EC9D8 ldr r1, =gUnknown_085EC9D8
bl CopyString bl StringCopy
b _0812460A b _0812460A
.pool .pool
_08124604: _08124604:
@@ -3240,7 +3240,7 @@ sub_8124610: @ 8124610
b _08124626 b _08124626
_08124620: _08124620:
ldr r1, =gUnknown_085EC9E4 ldr r1, =gUnknown_085EC9E4
bl CopyString bl StringCopy
_08124626: _08124626:
pop {r1} pop {r1}
bx r1 bx r1
@@ -3423,7 +3423,7 @@ _0812479C:
adds r0, r1 adds r0, r1
movs r1, 0 movs r1, 0
movs r2, 0x10 movs r2, 0x10
bl RepeatChar bl StringFill
ldr r1, =gUnknown_03001180 ldr r1, =gUnknown_03001180
movs r0, 0x1 movs r0, 0x1
str r0, [r1] str r0, [r1]
@@ -3589,7 +3589,7 @@ _08124926:
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl GetStringLength bl StringLength
movs r7, 0x1 movs r7, 0x1
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
@@ -4207,7 +4207,7 @@ _08124E7C:
bl sub_8084CCC bl sub_8084CCC
b _08124EFA b _08124EFA
_08124E84: _08124E84:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
movs r1, 0xD movs r1, 0xD
+17 -17
View File
@@ -404,53 +404,53 @@ sub_809EBC4: @ 809EBC4
lsls r2, 24 lsls r2, 24
lsrs r2, 24 lsrs r2, 24
mov r8, r2 mov r8, r2
ldr r7, =gUnknown_02021FC4 ldr r7, =gStringVar4
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x1 movs r2, 0x1
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r0, r7, 0 adds r0, r7, 0
adds r1, r4, 0 adds r1, r4, 0
bl CopyString bl StringCopy
adds r7, r0, 0 adds r7, r0, 0
ldr r1, =gUnknown_085EE68A ldr r1, =gUnknown_085EE68A
bl CopyString bl StringCopy
adds r7, r0, 0 adds r7, r0, 0
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r0, r7, 0 adds r0, r7, 0
adds r1, r4, 0 adds r1, r4, 0
bl CopyString bl StringCopy
adds r7, r0, 0 adds r7, r0, 0
ldr r5, =gUnknown_085EE68E ldr r5, =gUnknown_085EE68E
adds r1, r5, 0 adds r1, r5, 0
bl CopyString bl StringCopy
adds r7, r0, 0 adds r7, r0, 0
adds r0, r4, 0 adds r0, r4, 0
adds r1, r6, 0 adds r1, r6, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r0, r7, 0 adds r0, r7, 0
adds r1, r4, 0 adds r1, r4, 0
bl CopyString bl StringCopy
adds r7, r0, 0 adds r7, r0, 0
adds r1, r5, 0 adds r1, r5, 0
bl CopyString bl StringCopy
adds r7, r0, 0 adds r7, r0, 0
adds r0, r4, 0 adds r0, r4, 0
mov r1, r8 mov r1, r8
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r0, r7, 0 adds r0, r7, 0
adds r1, r4, 0 adds r1, r4, 0
bl CopyString bl StringCopy
ldr r2, =gUnknown_02021FC4 ldr r2, =gStringVar4
mov r0, r9 mov r0, r9
str r0, [sp] str r0, [sp]
movs r0, 0xFF movs r0, 0xFF
@@ -1042,7 +1042,7 @@ _0809F11C:
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl Print bl Print
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r0, r1, 0 adds r0, r1, 0
adds r0, 0xA0 adds r0, 0xA0
@@ -1196,7 +1196,7 @@ _0809F2CA:
ldr r0, =gUnknown_085ECA38 ldr r0, =gUnknown_085ECA38
bl sub_809F0C0 bl sub_809F0C0
ldr r2, =gUnknown_03005CF8 ldr r2, =gUnknown_03005CF8
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xA0 adds r0, 0xA0
ldr r1, [r0, 0x4] ldr r1, [r0, 0x4]
@@ -1250,7 +1250,7 @@ _0809F340:
movs r3, 0x4 movs r3, 0x4
ldrsb r3, [r4, r3] ldrsb r3, [r4, r3]
bl GameFreakRTC_CalcRTCToLocalDelta bl GameFreakRTC_CalcRTCToLocalDelta
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, [r0] ldr r2, [r0]
adds r2, 0xA0 adds r2, 0xA0
ldr r0, [r4] ldr r0, [r4]
+1 -1
View File
@@ -3745,7 +3745,7 @@ dp01_build_cmdbuf_x37_a: @ 80344C8
movs r0, 0x37 movs r0, 0x37
strb r0, [r4] strb r0, [r4]
strb r1, [r4, 0x1] strb r1, [r4, 0x1]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00000ca9 ldr r0, =0x00000ca9
adds r1, r0 adds r1, r0
+48 -48
View File
@@ -10,7 +10,7 @@ sub_8084620: @ 8084620
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_08271857 ldr r0, =gUnknown_08271857
bl script_env_2_execute_new_script bl script_env_2_execute_new_script
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r4, [r0] ldr r4, [r0]
movs r0, 0x92 movs r0, 0x92
lsls r0, 3 lsls r0, 3
@@ -191,13 +191,13 @@ sub_80847F8: @ 80847F8
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x33 cmp r1, 0x33
bhi _08084828 bhi _08084828
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
lsls r0, r1, 2 lsls r0, r1, 2
ldr r1, =0x0000159c ldr r1, =0x0000159c
adds r2, r1 adds r2, r1
adds r2, r0 adds r2, r0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r1, 0xAC adds r1, 0xAC
ldr r0, [r2] ldr r0, [r2]
@@ -220,13 +220,13 @@ sav12_xor_set: @ 8084830
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0x33 cmp r2, 0x33
bhi _08084854 bhi _08084854
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
lsls r0, r2, 2 lsls r0, r2, 2
ldr r2, =0x0000159c ldr r2, =0x0000159c
adds r1, r2 adds r1, r2
adds r1, r0 adds r1, r0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xAC adds r0, 0xAC
ldr r0, [r0] ldr r0, [r0]
@@ -243,7 +243,7 @@ sub_8084864: @ 8084864
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r0, 0 adds r5, r0, 0
movs r4, 0 movs r4, 0
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
_0808486C: _0808486C:
lsls r1, r4, 2 lsls r1, r4, 2
ldr r0, =0x0000159c ldr r0, =0x0000159c
@@ -270,7 +270,7 @@ CopyFieldObjectTemplatesToSav1: @ 8084894
sub sp, 0x4 sub sp, 0x4
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r1, [r5] ldr r1, [r5]
movs r4, 0xC7 movs r4, 0xC7
lsls r4, 4 lsls r4, 4
@@ -304,7 +304,7 @@ CopyFieldObjectTemplateCoordsToSav1: @ 80848E0
push {lr} push {lr}
ldr r0, =gUnknown_02037318 ldr r0, =gUnknown_02037318
ldr r1, [r0, 0x4] ldr r1, [r0, 0x4]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, [r1, 0x4] ldr r2, [r1, 0x4]
movs r3, 0xC7 movs r3, 0xC7
@@ -333,7 +333,7 @@ update_saveblock1_field_object_coords: @ 8084910
lsrs r4, r1, 16 lsrs r4, r1, 16
lsls r2, 16 lsls r2, 16
lsrs r2, 16 lsrs r2, 16
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0 movs r1, 0
movs r6, 0xC7 movs r6, 0xC7
@@ -365,7 +365,7 @@ update_saveblock1_field_object_movement_behavior: @ 808494C
lsrs r4, r0, 24 lsrs r4, r0, 24
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r3, 0 movs r3, 0
movs r5, 0xC7 movs r5, 0xC7
@@ -410,7 +410,7 @@ mapdata_load_assets_to_gpu_and_full_redraw: @ 8084980
@ mapdata_header *get_mapdata_header() @ mapdata_header *get_mapdata_header()
get_mapdata_header: @ 80849A8 get_mapdata_header: @ 80849A8
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrh r1, [r0, 0x32] ldrh r1, [r0, 0x32]
cmp r1, 0 cmp r1, 0
@@ -434,7 +434,7 @@ _080849C6:
@ void warp_shift() @ void warp_shift()
warp_shift: @ 80849D0 warp_shift: @ 80849D0
ldr r3, =gUnknown_020322DC ldr r3, =gUnknown_020322DC
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldr r0, [r2, 0x4] ldr r0, [r2, 0x4]
ldr r1, [r2, 0x8] ldr r1, [r2, 0x8]
@@ -574,7 +574,7 @@ set_current_map_header_from_sav1_save_old_name: @ 8084ACC
ldr r4, =gUnknown_02037318 ldr r4, =gUnknown_02037318
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
strh r0, [r1] strh r0, [r1]
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r1, [r5] ldr r1, [r5]
movs r0, 0x4 movs r0, 0x4
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
@@ -608,7 +608,7 @@ set_current_map_header_from_sav1_save_old_name: @ 8084ACC
set_current_map_header_from_sav1: @ 8084B1C set_current_map_header_from_sav1: @ 8084B1C
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =gUnknown_02037318 ldr r4, =gUnknown_02037318
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x4 movs r0, 0x4
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
@@ -639,7 +639,7 @@ set_current_map_header_from_sav1: @ 8084B1C
@ void update_camera_pos_from_warpid() @ void update_camera_pos_from_warpid()
update_camera_pos_from_warpid: @ 8084B5C update_camera_pos_from_warpid: @ 8084B5C
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
movs r1, 0x6 movs r1, 0x6
ldrsb r1, [r2, r1] ldrsb r1, [r2, r1]
@@ -768,7 +768,7 @@ warp1_set_2: @ 8084C28
saved_warp2_set: @ 8084C48 saved_warp2_set: @ 8084C48
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x8 sub sp, 0x8
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r5, [r0] ldr r5, [r0]
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x14 adds r0, 0x14
@@ -798,7 +798,7 @@ saved_warp2_set_2: @ 8084C7C
sub sp, 0x8 sub sp, 0x8
ldr r4, [sp, 0x14] ldr r4, [sp, 0x14]
ldr r5, [sp, 0x18] ldr r5, [sp, 0x18]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x14 adds r0, 0x14
lsls r1, 24 lsls r1, 24
@@ -824,7 +824,7 @@ saved_warp2_set_2: @ 8084C7C
thumb_func_start copy_saved_warp2_bank_and_enter_x_to_warp1 thumb_func_start copy_saved_warp2_bank_and_enter_x_to_warp1
copy_saved_warp2_bank_and_enter_x_to_warp1: @ 8084CB4 copy_saved_warp2_bank_and_enter_x_to_warp1: @ 8084CB4
ldr r2, =gUnknown_020322E4 ldr r2, =gUnknown_020322E4
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, [r0, 0x18] ldr r1, [r0, 0x18]
ldr r0, [r0, 0x14] ldr r0, [r0, 0x14]
@@ -869,7 +869,7 @@ _08084CFA:
@ void copy_saved_warp3_bank_and_enter_x_to_warp1() @ void copy_saved_warp3_bank_and_enter_x_to_warp1()
copy_saved_warp3_bank_and_enter_x_to_warp1: @ 8084D04 copy_saved_warp3_bank_and_enter_x_to_warp1: @ 8084D04
ldr r2, =gUnknown_020322E4 ldr r2, =gUnknown_020322E4
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, [r0, 0x20] ldr r1, [r0, 0x20]
ldr r0, [r0, 0x1C] ldr r0, [r0, 0x1C]
@@ -889,7 +889,7 @@ sub_8084D1C: @ 8084D1C
adds r5, r0, 0 adds r5, r0, 0
cmp r5, 0 cmp r5, 0
beq _08084D50 beq _08084D50
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x1C adds r0, 0x1C
movs r1, 0 movs r1, 0
@@ -945,7 +945,7 @@ sub_8084D5C: @ 8084D5C
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _08084DC4 beq _08084DC4
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x4 movs r0, 0x4
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
@@ -978,7 +978,7 @@ sub_8084DD4: @ 8084DD4
adds r5, r1, 0 adds r5, r1, 0
adds r6, r2, 0 adds r6, r2, 0
ldr r1, [sp, 0x18] ldr r1, [sp, 0x18]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x24 adds r0, 0x24
lsls r4, 24 lsls r4, 24
@@ -1007,7 +1007,7 @@ sub_8084DD4: @ 8084DD4
thumb_func_start sub_8084E14 thumb_func_start sub_8084E14
sub_8084E14: @ 8084E14 sub_8084E14: @ 8084E14
ldr r2, =gUnknown_020322E4 ldr r2, =gUnknown_020322E4
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, [r0, 0x28] ldr r1, [r0, 0x28]
ldr r0, [r0, 0x24] ldr r0, [r0, 0x24]
@@ -1137,7 +1137,7 @@ _08084F0A:
thumb_func_start warp1_set_to_sav1w thumb_func_start warp1_set_to_sav1w
warp1_set_to_sav1w: @ 8084F14 warp1_set_to_sav1w: @ 8084F14
ldr r2, =gUnknown_020322E4 ldr r2, =gUnknown_020322E4
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, [r0, 0x10] ldr r1, [r0, 0x10]
ldr r0, [r0, 0xC] ldr r0, [r0, 0xC]
@@ -1155,7 +1155,7 @@ sub_8084F2C: @ 8084F2C
adds r5, r1, 0 adds r5, r1, 0
adds r6, r2, 0 adds r6, r2, 0
ldr r1, [sp, 0x18] ldr r1, [sp, 0x18]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xC adds r0, 0xC
lsls r4, 24 lsls r4, 24
@@ -1191,7 +1191,7 @@ sub_8084F6C: @ 8084F6C
adds r5, r0, 0 adds r5, r0, 0
cmp r5, 0 cmp r5, 0
beq _08084FA0 beq _08084FA0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xC adds r0, 0xC
movs r1, 0 movs r1, 0
@@ -1217,7 +1217,7 @@ _08084FA0:
thumb_func_start sub_8084FAC thumb_func_start sub_8084FAC
sub_8084FAC: @ 8084FAC sub_8084FAC: @ 8084FAC
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldr r0, [r2, 0x14] ldr r0, [r2, 0x14]
ldr r1, [r2, 0x18] ldr r1, [r2, 0x18]
@@ -1467,7 +1467,7 @@ _080851A2:
bl sub_809D344 bl sub_809D344
bl wild_pokemon_reroll bl wild_pokemon_reroll
bl prev_quest_postbuffer_cursor_backup_reset bl prev_quest_postbuffer_cursor_backup_reset
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x4 movs r0, 0x4
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
@@ -1783,7 +1783,7 @@ _08085448:
thumb_func_start cur_mapdata_block_role_at_screen_center_acc_to_sav1 thumb_func_start cur_mapdata_block_role_at_screen_center_acc_to_sav1
cur_mapdata_block_role_at_screen_center_acc_to_sav1: @ 8085450 cur_mapdata_block_role_at_screen_center_acc_to_sav1: @ 8085450
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r2, 0 movs r2, 0
ldrsh r0, [r1, r2] ldrsh r0, [r1, r2]
@@ -1825,7 +1825,7 @@ update_sav1_flash_used_on_map: @ 8085494
ldrb r1, [r0, 0x15] ldrb r1, [r0, 0x15]
cmp r1, 0 cmp r1, 0
bne _080854B0 bne _080854B0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x30 adds r0, 0x30
strb r1, [r0] strb r1, [r0]
@@ -1837,7 +1837,7 @@ _080854B0:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080854D0 beq _080854D0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x30 adds r0, 0x30
movs r1, 0x1 movs r1, 0x1
@@ -1845,7 +1845,7 @@ _080854B0:
b _080854DE b _080854DE
.pool .pool
_080854D0: _080854D0:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =gUnknown_0854FE78 ldr r0, =gUnknown_0854FE78
ldr r0, [r0] ldr r0, [r0]
@@ -1871,7 +1871,7 @@ sub_80854EC: @ 80854EC
_080854FC: _080854FC:
movs r1, 0 movs r1, 0
_080854FE: _080854FE:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x30 adds r0, 0x30
strb r1, [r0] strb r1, [r0]
@@ -1882,7 +1882,7 @@ _080854FE:
thumb_func_start sav1_get_flash_used_on_map thumb_func_start sav1_get_flash_used_on_map
sav1_get_flash_used_on_map: @ 8085514 sav1_get_flash_used_on_map: @ 8085514
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x30 adds r0, 0x30
ldrb r0, [r0] ldrb r0, [r0]
@@ -1893,7 +1893,7 @@ sav1_get_flash_used_on_map: @ 8085514
thumb_func_start sub_8085524 thumb_func_start sub_8085524
sub_8085524: @ 8085524 sub_8085524: @ 8085524
push {lr} push {lr}
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
strh r0, [r1, 0x32] strh r0, [r1, 0x32]
bl get_mapdata_header bl get_mapdata_header
@@ -2126,7 +2126,7 @@ _080856CE:
thumb_func_start sav1_map_get_music thumb_func_start sav1_map_get_music
sav1_map_get_music: @ 80856D4 sav1_map_get_music: @ 80856D4
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrh r1, [r0, 0x4] ldrh r1, [r0, 0x4]
movs r0, 0xD0 movs r0, 0xD0
@@ -2142,7 +2142,7 @@ sav1_map_get_music: @ 80856D4
b _08085730 b _08085730
.pool .pool
_080856FC: _080856FC:
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x4 adds r0, 0x4
bl warp_target_get_music bl warp_target_get_music
@@ -2186,7 +2186,7 @@ warp1_target_get_music: @ 8085738
b _08085774 b _08085774
.pool .pool
_08085758: _08085758:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrh r1, [r0, 0x4] ldrh r1, [r0, 0x4]
movs r0, 0x80 movs r0, 0x80
@@ -2224,7 +2224,7 @@ sub_8085784: @ 8085784
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
cmp r4, r0 cmp r4, r0
beq _080857D6 beq _080857D6
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldrh r0, [r1, 0x2C] ldrh r0, [r1, 0x2C]
cmp r0, 0 cmp r0, 0
@@ -2265,7 +2265,7 @@ _080857E8:
thumb_func_start sav1_set_battle_music_maybe thumb_func_start sav1_set_battle_music_maybe
sav1_set_battle_music_maybe: @ 80857F4 sav1_set_battle_music_maybe: @ 80857F4
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
strh r0, [r1, 0x2C] strh r0, [r1, 0x2C]
bx lr bx lr
@@ -2274,7 +2274,7 @@ sav1_set_battle_music_maybe: @ 80857F4
thumb_func_start sav1_reset_battle_music_maybe thumb_func_start sav1_reset_battle_music_maybe
sav1_reset_battle_music_maybe: @ 8085800 sav1_reset_battle_music_maybe: @ 8085800
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0 movs r0, 0
strh r0, [r1, 0x2C] strh r0, [r1, 0x2C]
@@ -2433,7 +2433,7 @@ music_something: @ 8085910
lsrs r0, 16 lsrs r0, 16
cmp r0, 0x2 cmp r0, 0x2
bne _08085972 bne _08085972
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x0000ffff ldr r1, =0x0000ffff
ldrh r2, [r0, 0x4] ldrh r2, [r0, 0x4]
@@ -2661,7 +2661,7 @@ _08085B20:
thumb_func_start sub_8085B2C thumb_func_start sub_8085B2C
sub_8085B2C: @ 8085B2C sub_8085B2C: @ 8085B2C
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrh r1, [r0, 0x4] ldrh r1, [r0, 0x4]
movs r0, 0xB4 movs r0, 0xB4
@@ -2724,7 +2724,7 @@ get_map_light_level_from_warp: @ 8085B8C
thumb_func_start sav1_map_get_light_level thumb_func_start sav1_map_get_light_level
sav1_map_get_light_level: @ 8085BA4 sav1_map_get_light_level: @ 8085BA4
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x4 adds r0, 0x4
bl get_map_light_level_from_warp bl get_map_light_level_from_warp
@@ -2817,7 +2817,7 @@ _08085C2A:
thumb_func_start sav1_saved_warp2_map_get_name thumb_func_start sav1_saved_warp2_map_get_name
sav1_saved_warp2_map_get_name: @ 8085C30 sav1_saved_warp2_map_get_name: @ 8085C30
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x14 movs r0, 0x14
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
@@ -2838,7 +2838,7 @@ sav1_saved_warp2_map_get_name: @ 8085C30
thumb_func_start sav1_map_get_name thumb_func_start sav1_map_get_name
sav1_map_get_name: @ 8085C58 sav1_map_get_name: @ 8085C58
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x4 movs r0, 0x4
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
@@ -2859,7 +2859,7 @@ sav1_map_get_name: @ 8085C58
thumb_func_start sav1_map_get_battletype thumb_func_start sav1_map_get_battletype
sav1_map_get_battletype: @ 8085C80 sav1_map_get_battletype: @ 8085C80
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x4 movs r0, 0x4
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
@@ -4362,7 +4362,7 @@ mli4_mapscripts_and_other: @ 8086A04
movs r2, 0 movs r2, 0
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
ldrb r2, [r5, 0x1] ldrb r2, [r5, 0x1]
ldr r3, =gUnknown_03005D90 ldr r3, =gSaveBlock2Ptr
ldr r3, [r3] ldr r3, [r3]
ldrb r3, [r3, 0x8] ldrb r3, [r3, 0x8]
bl InitPlayerAvatar bl InitPlayerAvatar
+2 -2
View File
@@ -384,7 +384,7 @@ _080A9676:
beq _080A9698 beq _080A9698
cmp r4, 0 cmp r4, 0
bne _080A9698 bne _080A9698
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
b _080A96AA b _080A96AA
@@ -607,7 +607,7 @@ _080A986C:
beq _080A98D0 beq _080A98D0
cmp r7, 0 cmp r7, 0
bne _080A98D0 bne _080A98D0
ldr r5, =gUnknown_03005D90 ldr r5, =gSaveBlock2Ptr
ldr r0, [r5] ldr r0, [r5]
ldrb r4, [r0, 0x8] ldrb r4, [r0, 0x8]
movs r0, 0 movs r0, 0
+151 -151
View File
File diff suppressed because it is too large Load Diff
+74 -74
View File
@@ -3315,7 +3315,7 @@ _080369E8:
movs r2, 0x2 movs r2, 0x2
orrs r0, r2 orrs r0, r2
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r5, =0x00000ca9 ldr r5, =0x00000ca9
adds r1, r5 adds r1, r5
@@ -3470,7 +3470,7 @@ sub_8036B44: @ 8036B44
cmp r0, 0x1 cmp r0, 0x1
bne _08036BC0 bne _08036BC0
movs r2, 0 movs r2, 0
ldr r7, =gUnknown_03005D8C ldr r7, =gSaveBlock1Ptr
movs r1, 0xC6 movs r1, 0xC6
lsls r1, 1 lsls r1, 1
adds r5, r1 adds r5, r1
@@ -3491,7 +3491,7 @@ _08036B66:
strb r0, [r1] strb r0, [r1]
movs r2, 0 movs r2, 0
adds r3, r5, 0 adds r3, r5, 0
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
ldr r5, =0x00003214 ldr r5, =0x00003214
_08036B86: _08036B86:
adds r0, r3, r2 adds r0, r3, r2
@@ -3574,7 +3574,7 @@ _08036C20:
bne _08036CDC bne _08036CDC
movs r5, 0 movs r5, 0
ldr r3, =gUnknown_02024404 ldr r3, =gUnknown_02024404
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r8, r0 mov r8, r0
adds r6, r3, 0 adds r6, r3, 0
mov r4, r8 mov r4, r8
@@ -3609,7 +3609,7 @@ _08036C3A:
movs r5, 0 movs r5, 0
adds r7, r3, 0 adds r7, r3, 0
adds r7, 0x8 adds r7, 0x8
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r2, =0x00003214 ldr r2, =0x00003214
adds r6, r3, 0 adds r6, r3, 0
adds r6, 0x40 adds r6, 0x40
@@ -5142,7 +5142,7 @@ _08037A12:
bl pokemon_get_gender bl pokemon_get_gender
strb r0, [r6, 0x1C] strb r0, [r6, 0x1C]
adds r0, r7, 0 adds r0, r7, 0
bl StripExtendedControlCodes bl StripExtCtrlCodes
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x3 movs r1, 0x3
bl pokemon_getattr bl pokemon_getattr
@@ -7591,7 +7591,7 @@ _08038FD0:
movs r3, 0x4 movs r3, 0x4
_08038FFC: _08038FFC:
movs r4, 0 movs r4, 0
ldr r6, =gUnknown_03005D90 ldr r6, =gSaveBlock2Ptr
cmp r4, r3 cmp r4, r3
bge _08039022 bge _08039022
ldr r1, =gUnknown_020229E8 ldr r1, =gUnknown_020229E8
@@ -8395,7 +8395,7 @@ shedinja_something: @ 803976C
bl pokemon_getattr bl pokemon_getattr
ldr r1, =gUnknown_0831ACA0 ldr r1, =gUnknown_0831ACA0
mov r0, sp mov r0, sp
bl CompareStringWithoutExtendedControlCodes bl StringCompareWithoutExtCtrlCodes
cmp r0, 0 cmp r0, 0
bne _080397B4 bne _080397B4
adds r0, r4, 0 adds r0, r4, 0
@@ -9513,7 +9513,7 @@ _0803A004:
ands r1, r0 ands r1, r0
cmp r1, 0 cmp r1, 0
bne _0803A0AE bne _0803A0AE
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r1, [r0, 0x15] ldrb r1, [r0, 0x15]
movs r0, 0x4 movs r0, 0x4
@@ -9541,7 +9541,7 @@ _0803A0AC:
str r0, [r2] str r0, [r2]
_0803A0AE: _0803A0AE:
ldr r3, =gUnknown_02024474 ldr r3, =gUnknown_02024474
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x15] ldrb r0, [r0, 0x15]
lsls r0, 30 lsls r0, 30
@@ -16106,7 +16106,7 @@ sub_803DAC0: @ 803DAC0
movs r0, 0x7F movs r0, 0x7F
ands r0, r2 ands r0, r2
strb r0, [r3] strb r0, [r3]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00000ca9 ldr r0, =0x00000ca9
adds r1, r0 adds r1, r0
@@ -16179,7 +16179,7 @@ sub_803DBA0: @ 803DBA0
ldr r1, =gUnknown_0202433A ldr r1, =gUnknown_0202433A
movs r0, 0x9 movs r0, 0x9
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00000ca9 ldr r0, =0x00000ca9
adds r1, r0 adds r1, r0
@@ -18197,7 +18197,7 @@ _0803EEE0:
movs r1, 0x80 movs r1, 0x80
orrs r0, r1 orrs r0, r1
strb r0, [r2] strb r0, [r2]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00000ca9 ldr r0, =0x00000ca9
adds r1, r0 adds r1, r0
@@ -25255,7 +25255,7 @@ _08042DCA:
beq _08042DDC beq _08042DDC
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC70 ldr r1, =gUnknown_0831BC70
bl CopyString bl StringCopy
_08042DDC: _08042DDC:
ldr r0, [r5] ldr r0, [r5]
movs r1, 0x7 movs r1, 0x7
@@ -25264,7 +25264,7 @@ _08042DDC:
beq _08042DEE beq _08042DEE
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC78 ldr r1, =gUnknown_0831BC78
bl CopyString bl StringCopy
_08042DEE: _08042DEE:
ldr r0, [r5] ldr r0, [r5]
movs r1, 0x40 movs r1, 0x40
@@ -25273,7 +25273,7 @@ _08042DEE:
beq _08042E00 beq _08042E00
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC80 ldr r1, =gUnknown_0831BC80
bl CopyString bl StringCopy
_08042E00: _08042E00:
ldr r0, [r5] ldr r0, [r5]
movs r1, 0x10 movs r1, 0x10
@@ -25282,7 +25282,7 @@ _08042E00:
beq _08042E12 beq _08042E12
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC88 ldr r1, =gUnknown_0831BC88
bl CopyString bl StringCopy
_08042E12: _08042E12:
ldr r0, [r5] ldr r0, [r5]
movs r1, 0x20 movs r1, 0x20
@@ -25291,7 +25291,7 @@ _08042E12:
beq _08042E24 beq _08042E24
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC90 ldr r1, =gUnknown_0831BC90
bl CopyString bl StringCopy
_08042E24: _08042E24:
str r4, [r5] str r4, [r5]
mov r1, r8 mov r1, r8
@@ -26526,7 +26526,7 @@ _08043A7C:
_08043A96: _08043A96:
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC98 ldr r1, =gUnknown_0831BC98
bl CopyString bl StringCopy
movs r2, 0x2 movs r2, 0x2
mov r9, r2 mov r9, r2
b _08043B9C b _08043B9C
@@ -26568,7 +26568,7 @@ _08043AD4:
str r0, [r2] str r0, [r2]
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC78 ldr r1, =gUnknown_0831BC78
bl CopyString bl StringCopy
movs r0, 0x1 movs r0, 0x1
mov r9, r0 mov r9, r0
b _08043B9C b _08043B9C
@@ -26588,7 +26588,7 @@ _08043B10:
beq _08043B96 beq _08043B96
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC88 ldr r1, =gUnknown_0831BC88
bl CopyString bl StringCopy
movs r2, 0x1 movs r2, 0x1
mov r9, r2 mov r9, r2
b _08043B9C b _08043B9C
@@ -26609,7 +26609,7 @@ _08043B40:
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC90 ldr r1, =gUnknown_0831BC90
_08043B5C: _08043B5C:
bl CopyString bl StringCopy
movs r5, 0x1 movs r5, 0x1
mov r9, r5 mov r9, r5
b _08043B9C b _08043B9C
@@ -26630,7 +26630,7 @@ _08043B70:
beq _08043B96 beq _08043B96
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BCA0 ldr r1, =gUnknown_0831BCA0
bl CopyString bl StringCopy
movs r2, 0x3 movs r2, 0x3
mov r9, r2 mov r9, r2
_08043B96: _08043B96:
@@ -29080,7 +29080,7 @@ _0804509A:
beq _080450B2 beq _080450B2
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC70 ldr r1, =gUnknown_0831BC70
bl CopyString bl StringCopy
movs r0, 0x1 movs r0, 0x1
mov r10, r0 mov r10, r0
_080450B2: _080450B2:
@@ -29099,7 +29099,7 @@ _080450B2:
str r0, [r2] str r0, [r2]
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC78 ldr r1, =gUnknown_0831BC78
bl CopyString bl StringCopy
movs r2, 0x1 movs r2, 0x1
add r10, r2 add r10, r2
_080450D8: _080450D8:
@@ -29110,7 +29110,7 @@ _080450D8:
beq _080450EE beq _080450EE
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC80 ldr r1, =gUnknown_0831BC80
bl CopyString bl StringCopy
movs r3, 0x1 movs r3, 0x1
add r10, r3 add r10, r3
_080450EE: _080450EE:
@@ -29121,7 +29121,7 @@ _080450EE:
beq _08045104 beq _08045104
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC88 ldr r1, =gUnknown_0831BC88
bl CopyString bl StringCopy
movs r0, 0x1 movs r0, 0x1
add r10, r0 add r10, r0
_08045104: _08045104:
@@ -29132,7 +29132,7 @@ _08045104:
beq _0804511A beq _0804511A
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC90 ldr r1, =gUnknown_0831BC90
bl CopyString bl StringCopy
movs r1, 0x1 movs r1, 0x1
add r10, r1 add r10, r1
_0804511A: _0804511A:
@@ -29144,7 +29144,7 @@ _0804511A:
beq _08045132 beq _08045132
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC98 ldr r1, =gUnknown_0831BC98
bl CopyString bl StringCopy
movs r3, 0x1 movs r3, 0x1
add r10, r3 add r10, r3
_08045132: _08045132:
@@ -29200,7 +29200,7 @@ _080451A0:
str r2, [r1] str r2, [r1]
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BCA0 ldr r1, =gUnknown_0831BCA0
bl CopyString bl StringCopy
ldr r0, =gUnknown_082DB794 ldr r0, =gUnknown_082DB794
bl b_call_bc_move_exec bl b_call_bc_move_exec
ldr r1, =gUnknown_02024332 ldr r1, =gUnknown_02024332
@@ -29523,7 +29523,7 @@ _080454E0:
str r1, [r2] str r1, [r2]
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BCA0 ldr r1, =gUnknown_0831BCA0
bl CopyString bl StringCopy
bl b_movescr_stack_push_cursor bl b_movescr_stack_push_cursor
ldr r1, =gUnknown_02024332 ldr r1, =gUnknown_02024332
movs r0, 0 movs r0, 0
@@ -29563,7 +29563,7 @@ _08045548:
beq _08045558 beq _08045558
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC70 ldr r1, =gUnknown_0831BC70
bl CopyString bl StringCopy
_08045558: _08045558:
ldr r0, [r6] ldr r0, [r6]
movs r2, 0x7 movs r2, 0x7
@@ -29579,7 +29579,7 @@ _08045558:
str r0, [r2] str r0, [r2]
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC78 ldr r1, =gUnknown_0831BC78
bl CopyString bl StringCopy
_08045578: _08045578:
ldr r0, [r6] ldr r0, [r6]
movs r1, 0x40 movs r1, 0x40
@@ -29588,7 +29588,7 @@ _08045578:
beq _0804558A beq _0804558A
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC80 ldr r1, =gUnknown_0831BC80
bl CopyString bl StringCopy
_0804558A: _0804558A:
ldr r0, [r6] ldr r0, [r6]
movs r1, 0x10 movs r1, 0x10
@@ -29597,7 +29597,7 @@ _0804558A:
beq _0804559C beq _0804559C
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC88 ldr r1, =gUnknown_0831BC88
bl CopyString bl StringCopy
_0804559C: _0804559C:
ldr r0, [r6] ldr r0, [r6]
movs r1, 0x20 movs r1, 0x20
@@ -29606,7 +29606,7 @@ _0804559C:
beq _080455AE beq _080455AE
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC90 ldr r1, =gUnknown_0831BC90
bl CopyString bl StringCopy
_080455AE: _080455AE:
adds r5, r4 adds r5, r4
ldr r0, [r5] ldr r0, [r5]
@@ -29616,7 +29616,7 @@ _080455AE:
beq _080455C2 beq _080455C2
ldr r0, =gUnknown_02022F58 ldr r0, =gUnknown_02022F58
ldr r1, =gUnknown_0831BC98 ldr r1, =gUnknown_0831BC98
bl CopyString bl StringCopy
_080455C2: _080455C2:
movs r4, 0 movs r4, 0
str r4, [r6] str r4, [r6]
@@ -38460,7 +38460,7 @@ _0804A44C:
lsrs r0, 16 lsrs r0, 16
cmp r0, 0xAF cmp r0, 0xAF
bne _0804A478 bne _0804A478
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00003226 ldr r2, =0x00003226
adds r0, r2 adds r0, r2
@@ -38572,7 +38572,7 @@ _0804A538:
lsrs r0, 16 lsrs r0, 16
cmp r0, 0xAF cmp r0, 0xAF
bne _0804A57C bne _0804A57C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003226 ldr r1, =0x00003226
adds r0, r1 adds r0, r1
@@ -46218,7 +46218,7 @@ sub_804E6D8: @ 804E6D8
bl sub_804E598 bl sub_804E598
adds r4, r0 adds r4, r0
_0804E6FC: _0804E6FC:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -47496,7 +47496,7 @@ sub_804F220: @ 804F220
ldrb r0, [r0, 0x10] ldrb r0, [r0, 0x10]
muls r0, r5 muls r0, r5
adds r0, r4 adds r0, r4
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
adds r1, r5, 0 adds r1, r5, 0
bl GetMonNickname bl GetMonNickname
str r5, [sp] str r5, [sp]
@@ -47541,7 +47541,7 @@ sub_804F220: @ 804F220
mov r1, r8 mov r1, r8
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r5, r0, 0 adds r5, r0, 0
subs r4, r5, r4 subs r4, r5, r4
movs r2, 0x4 movs r2, 0x4
@@ -47549,7 +47549,7 @@ sub_804F220: @ 804F220
lsls r2, 16 lsls r2, 16
lsrs r2, 16 lsrs r2, 16
movs r1, 0x77 movs r1, 0x77
bl RepeatChar bl StringFill
adds r5, r0, 0 adds r5, r0, 0
cmp r7, 0xFF cmp r7, 0xFF
beq _0804F320 beq _0804F320
@@ -51614,7 +51614,7 @@ atk91_givemoney: @ 80515C8
ldrb r0, [r0] ldrb r0, [r0]
adds r4, r1, 0 adds r4, r1, 0
muls r4, r0 muls r4, r0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -55008,7 +55008,7 @@ _08053304:
adds r1, r6, 0 adds r1, r6, 0
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
strb r5, [r4] strb r5, [r4]
movs r0, 0x1 movs r0, 0x1
strb r0, [r4, 0x1] strb r0, [r4, 0x1]
@@ -60919,7 +60919,7 @@ atkF0_catch_pokemon: @ 80566A8
bne _08056734 bne _08056734
ldr r0, =gUnknown_02024332 ldr r0, =gUnknown_02024332
strb r1, [r0, 0x5] strb r1, [r0, 0x5]
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
ldr r0, =0x00004036 ldr r0, =0x00004036
bl VarGet bl VarGet
lsls r0, 24 lsls r0, 24
@@ -60927,7 +60927,7 @@ atkF0_catch_pokemon: @ 80566A8
bl sav3_get_box_name bl sav3_get_box_name
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
ldrb r0, [r5] ldrb r0, [r5]
eors r0, r6 eors r0, r6
lsls r0, 1 lsls r0, 1
@@ -60935,13 +60935,13 @@ atkF0_catch_pokemon: @ 80566A8
ldrh r0, [r0] ldrh r0, [r0]
muls r0, r7 muls r0, r7
add r0, r8 add r0, r8
ldr r2, =gUnknown_02021DC4 ldr r2, =gStringVar2
movs r1, 0x2 movs r1, 0x2
bl pokemon_getattr bl pokemon_getattr
b _0805677E b _0805677E
.pool .pool
_08056734: _08056734:
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
ldr r0, =0x00004036 ldr r0, =0x00004036
bl VarGet bl VarGet
lsls r0, 24 lsls r0, 24
@@ -60949,7 +60949,7 @@ _08056734:
bl sav3_get_box_name bl sav3_get_box_name
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
ldrb r0, [r5] ldrb r0, [r5]
eors r0, r6 eors r0, r6
lsls r0, 1 lsls r0, 1
@@ -60957,17 +60957,17 @@ _08056734:
ldrh r0, [r0] ldrh r0, [r0]
muls r0, r7 muls r0, r7
add r0, r8 add r0, r8
ldr r2, =gUnknown_02021DC4 ldr r2, =gStringVar2
movs r1, 0x2 movs r1, 0x2
bl pokemon_getattr bl pokemon_getattr
ldr r4, =gUnknown_02021EC4 ldr r4, =gStringVar3
bl get_unknown_box_id bl get_unknown_box_id
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sav3_get_box_name bl sav3_get_box_name
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
ldr r1, =gUnknown_02024332 ldr r1, =gUnknown_02024332
movs r0, 0x2 movs r0, 0x2
strb r0, [r1, 0x5] strb r0, [r1, 0x5]
@@ -61927,7 +61927,7 @@ _08056F3E:
bl VarGet bl VarGet
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
lsls r1, 5 lsls r1, 5
@@ -62579,7 +62579,7 @@ sub_8057588: @ 8057588
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080575EC beq _080575EC
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x2 cmp r0, 0x2
@@ -62885,7 +62885,7 @@ _08057866:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0805789C beq _0805789C
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x2 cmp r0, 0x2
@@ -63277,7 +63277,7 @@ sub_8057BFC: @ 8057BFC
adds r7, r3, 0 adds r7, r3, 0
cmp r0, 0 cmp r0, 0
beq _08057C44 beq _08057C44
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x2 cmp r0, 0x2
@@ -64725,7 +64725,7 @@ bx_802F7A0: @ 80588B4
ldr r0, =DummyObjectCallback ldr r0, =DummyObjectCallback
cmp r1, r0 cmp r1, r0
bne _08058908 bne _08058908
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
bl nullsub_25 bl nullsub_25
@@ -66762,7 +66762,7 @@ _08059AC4:
ldr r0, =gMoveNames ldr r0, =gMoveNames
adds r1, r0 adds r1, r0
adds r0, r7, 0 adds r0, r7, 0
bl CopyString bl StringCopy
adds r1, r5, 0x3 adds r1, r5, 0x3
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@@ -66791,7 +66791,7 @@ sub_8059B18: @ 8059B18
ldr r4, =gUnknown_02022E2C ldr r4, =gUnknown_02022E2C
ldr r1, =gUnknown_085CCA6F ldr r1, =gUnknown_085CCA6F
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x7 movs r1, 0x7
bl battle_show_message_maybe bl battle_show_message_maybe
@@ -66829,7 +66829,7 @@ sub_8059B3C: @ 8059B3C
adds r0, r6, 0 adds r0, r6, 0
movs r2, 0x1 movs r2, 0x1
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r1, 0xBA movs r1, 0xBA
strb r1, [r0] strb r1, [r0]
adds r0, 0x1 adds r0, 0x1
@@ -66841,7 +66841,7 @@ sub_8059B3C: @ 8059B3C
ldrb r1, [r4] ldrb r1, [r4]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x9 movs r1, 0x9
bl battle_show_message_maybe bl battle_show_message_maybe
@@ -66863,7 +66863,7 @@ sub_8059BB0: @ 8059BB0
ldr r6, =gUnknown_02022E2C ldr r6, =gUnknown_02022E2C
ldr r1, =gUnknown_085CCA73 ldr r1, =gUnknown_085CCA73
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
movs r1, 0xFC movs r1, 0xFC
strb r1, [r0] strb r1, [r0]
adds r0, 0x1 adds r0, 0x1
@@ -66890,7 +66890,7 @@ sub_8059BB0: @ 8059BB0
subs r1, r2 subs r1, r2
ldr r2, =gTypeNames ldr r2, =gTypeNames
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0xA movs r1, 0xA
bl battle_show_message_maybe bl battle_show_message_maybe
@@ -67507,7 +67507,7 @@ _08059FE4:
bl pokemon_getattr bl pokemon_getattr
ldr r0, [sp, 0x84] ldr r0, [sp, 0x84]
ldr r1, [sp, 0x8C] ldr r1, [sp, 0x8C]
bl CopyString_Limit10 bl StringCopy10
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x7 movs r1, 0x7
ldr r2, [sp, 0x88] ldr r2, [sp, 0x88]
@@ -69747,7 +69747,7 @@ _0805B5A0:
ldrb r4, [r1, 0x13] ldrb r4, [r1, 0x13]
b _0805B5BA b _0805B5BA
_0805B5B4: _0805B5B4:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r4, [r0, 0x8] ldrb r4, [r0, 0x8]
_0805B5BA: _0805B5BA:
@@ -69832,7 +69832,7 @@ _0805B664:
bne _0805B670 bne _0805B670
b _0805B794 b _0805B794
_0805B670: _0805B670:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
bl sub_806F000 bl sub_806F000
@@ -70129,7 +70129,7 @@ _0805B90C:
ldrb r4, [r1, 0x13] ldrb r4, [r1, 0x13]
b _0805B926 b _0805B926
_0805B920: _0805B920:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r4, [r0, 0x8] ldrb r4, [r0, 0x8]
_0805B926: _0805B926:
@@ -72170,7 +72170,7 @@ dp01t_2F_1_pokemon_enter: @ 805CA80
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
ldr r1, =gTrainerBackPicPaletteTable ldr r1, =gTrainerBackPicPaletteTable
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
lsls r0, 3 lsls r0, 3
@@ -72788,7 +72788,7 @@ sub_805D094: @ 805D094
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r2] strb r0, [r2]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r3, [r0] ldr r3, [r0]
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 9 lsls r0, 9
@@ -78618,7 +78618,7 @@ _08060180:
bl pokemon_getattr bl pokemon_getattr
ldr r0, [sp, 0x84] ldr r0, [sp, 0x84]
ldr r1, [sp, 0x8C] ldr r1, [sp, 0x8C]
bl CopyString_Limit10 bl StringCopy10
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x7 movs r1, 0x7
ldr r2, [sp, 0x88] ldr r2, [sp, 0x88]
@@ -85675,7 +85675,7 @@ _08063FB6:
mov r0, r9 mov r0, r9
cmp r0, 0xAF cmp r0, 0xAF
bne _08063FE8 bne _08063FE8
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003214 ldr r1, =0x00003214
adds r5, r0, r1 adds r5, r0, r1
@@ -88029,7 +88029,7 @@ _080652D0:
bl pokemon_getattr bl pokemon_getattr
ldr r0, [sp, 0x84] ldr r0, [sp, 0x84]
ldr r1, [sp, 0x8C] ldr r1, [sp, 0x8C]
bl CopyString_Limit10 bl StringCopy10
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x7 movs r1, 0x7
ldr r2, [sp, 0x88] ldr r2, [sp, 0x88]
@@ -92354,7 +92354,7 @@ _08067A00:
eors r1, r2 eors r1, r2
strb r1, [r0] strb r1, [r0]
_08067A08: _08067A08:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r3, [r0] ldr r3, [r0]
ldr r1, =gUnknown_02023064 ldr r1, =gUnknown_02023064
ldr r4, =gUnknown_02024064 ldr r4, =gUnknown_02024064
+16 -16
View File
@@ -86,7 +86,7 @@ ExecuteTableBasedItemEffect: @ 806BD28
b _0806BDC4 b _0806BDC4
.pool .pool
_0806BDA8: _0806BDA8:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00003226 ldr r2, =0x00003226
adds r0, r2 adds r0, r2
@@ -209,7 +209,7 @@ _0806BE9A:
b _0806BEF6 b _0806BEF6
.pool .pool
_0806BECC: _0806BECC:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r3, =0x00003214 ldr r3, =0x00003214
adds r3, r0, r3 adds r3, r0, r3
@@ -2212,10 +2212,10 @@ sub_806CF24: @ 806CF24
adds r0, r2 adds r0, r2
ldr r1, [r0] ldr r1, [r0]
adds r0, r3, 0 adds r0, r3, 0
bl CopyString bl StringCopy
ldr r0, =gUnknown_02022F68 ldr r0, =gUnknown_02022F68
ldr r1, =gUnknown_085CB38A ldr r1, =gUnknown_085CB38A
bl CopyString bl StringCopy
ldr r0, =gUnknown_085CB3AA ldr r0, =gUnknown_085CB3AA
bl get_battle_strings_ bl get_battle_strings_
pop {r0} pop {r0}
@@ -2250,7 +2250,7 @@ sub_806CF78: @ 806CF78
b _0806CFD8 b _0806CFD8
.pool .pool
_0806CFB8: _0806CFB8:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003214 ldr r1, =0x00003214
adds r7, r0, r1 adds r7, r0, r1
@@ -2399,7 +2399,7 @@ GetEvolutionTargetSpecies: @ 806D098
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0xAF cmp r0, 0xAF
bne _0806D10C bne _0806D10C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003226 ldr r1, =0x00003226
adds r0, r1 adds r0, r1
@@ -3282,7 +3282,7 @@ sub_806D778: @ 806D778
lsls r2, 16 lsls r2, 16
lsrs r2, 16 lsrs r2, 16
mov r8, r2 mov r8, r2
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
mov r9, r0 mov r9, r0
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x2 movs r1, 0x2
@@ -3304,7 +3304,7 @@ sub_806D778: @ 806D778
ldr r4, =gSpeciesNames ldr r4, =gSpeciesNames
adds r0, r4 adds r0, r4
mov r1, r9 mov r1, r9
bl CompareString bl StringCompare
cmp r0, 0 cmp r0, 0
bne _0806D7D4 bne _0806D7D4
mov r2, r8 mov r2, r8
@@ -3554,7 +3554,7 @@ _0806D94A:
b _0806D9A8 b _0806D9A8
.pool .pool
_0806D98C: _0806D98C:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003226 ldr r1, =0x00003226
adds r0, r1 adds r0, r1
@@ -3860,7 +3860,7 @@ _0806DBC8:
b _0806DC1C b _0806DC1C
.pool .pool
_0806DC00: _0806DC00:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00003226 ldr r2, =0x00003226
adds r0, r2 adds r0, r2
@@ -5129,7 +5129,7 @@ _0806E604:
ldr r1, =gTrainers + 0x4 @ name offset ldr r1, =gTrainers + 0x4 @ name offset
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_085CCB98 ldr r1, =gUnknown_085CCB98
bl CompareString bl StringCompare
cmp r0, 0 cmp r0, 0
beq _0806E63C beq _0806E63C
b _0806E5F2 b _0806E5F2
@@ -5491,7 +5491,7 @@ sub_806E8A8: @ 806E8A8
sub_806E8D4: @ 806E8D4 sub_806E8D4: @ 806E8D4
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r1, 0 adds r5, r1, 0
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r3, [r1] ldr r3, [r1]
ldrb r2, [r3, 0xA] ldrb r2, [r3, 0xA]
ldrb r1, [r3, 0xB] ldrb r1, [r3, 0xB]
@@ -5654,7 +5654,7 @@ _0806E9F6:
movs r0, 0xFF movs r0, 0xFF
strb r0, [r4, 0x4] strb r0, [r4, 0x4]
ldr r0, =gUnknown_085CB2A1 ldr r0, =gUnknown_085CB2A1
ldr r1, =gUnknown_02021FC4 ldr r1, =gStringVar4
bl get_battle_strings bl get_battle_strings
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -5887,7 +5887,7 @@ sub_806EBF8: @ 806EBF8
b _0806EC64 b _0806EC64
.pool .pool
_0806EC28: _0806EC28:
ldr r4, =gUnknown_02021CC4 ldr r4, =gStringVar1
ldrh r1, [r2] ldrh r1, [r2]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8162E20 bl sub_8162E20
@@ -6423,7 +6423,7 @@ SetPokedexFlag: @ 806F01C
lsrs r0, 16 lsrs r0, 16
cmp r0, 0xC9 cmp r0, 0xC9
bne _0806F05C bne _0806F05C
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
str r7, [r0, 0x1C] str r7, [r0, 0x1C]
_0806F05C: _0806F05C:
@@ -6434,7 +6434,7 @@ _0806F05C:
lsls r1, 17 lsls r1, 17
cmp r0, r1 cmp r0, r1
bne _0806F072 bne _0806F072
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
str r7, [r0, 0x20] str r7, [r0, 0x20]
_0806F072: _0806F072:
+18 -18
View File
@@ -1101,7 +1101,7 @@ healthbar_draw_level: @ 8072B94
adds r0, 0x6 adds r0, 0x6
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r1, r0, 0 adds r1, r0, 0
subs r1, 0x2 subs r1, 0x2
add r0, sp, 0x4 add r0, sp, 0x4
@@ -1203,7 +1203,7 @@ heathbar_draw_hp: @ 8072C38
add r0, sp, 0x4 add r0, sp, 0x4
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
add r0, sp, 0x24 add r0, sp, 0x24
str r0, [sp] str r0, [sp]
add r0, sp, 0x4 add r0, sp, 0x4
@@ -1224,7 +1224,7 @@ _08072CB8:
add r0, sp, 0x4 add r0, sp, 0x4
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
add r1, sp, 0x4 add r1, sp, 0x4
movs r0, 0xBA movs r0, 0xBA
strb r0, [r1, 0x3] strb r0, [r1, 0x3]
@@ -1316,7 +1316,7 @@ _08072D86:
asrs r1, 16 asrs r1, 16
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_020244D4 ldr r0, =gUnknown_020244D4
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xBA movs r1, 0xBA
@@ -1431,7 +1431,7 @@ _08072E5E:
add r0, sp, 0x4 add r0, sp, 0x4
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
add r0, sp, 0x28 add r0, sp, 0x28
str r0, [sp] str r0, [sp]
add r0, sp, 0x4 add r0, sp, 0x4
@@ -1464,7 +1464,7 @@ _08072EDC:
add r0, sp, 0x4 add r0, sp, 0x4
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
add r1, sp, 0x4 add r1, sp, 0x4
movs r0, 0xBA movs r0, 0xBA
strb r0, [r1, 0x3] strb r0, [r1, 0x3]
@@ -1529,12 +1529,12 @@ _08072F52:
asrs r1, 16 asrs r1, 16
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
mov r3, r8 mov r3, r8
cmp r3, 0 cmp r3, 0
bne _08072F82 bne _08072F82
ldr r1, =gUnknown_085E8D3E ldr r1, =gUnknown_085E8D3E
bl CopyString bl StringCopy
_08072F82: _08072F82:
ldr r0, =gUnknown_020244D4 ldr r0, =gUnknown_020244D4
ldr r0, [r0] ldr r0, [r0]
@@ -1729,7 +1729,7 @@ sub_80730D4: @ 80730D4
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x9 movs r1, 0x9
mov r2, sp mov r2, sp
@@ -1864,14 +1864,14 @@ _08073236:
adds r0, 0x6 adds r0, 0x6
movs r2, 0x1 movs r2, 0x1
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x7B adds r0, 0x7B
ldrb r1, [r0] ldrb r1, [r0]
ldr r0, [sp, 0x1C] ldr r0, [sp, 0x1C]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
mov r1, sp mov r1, sp
movs r0, 0 movs r0, 0
strb r0, [r1, 0x5] strb r0, [r1, 0x5]
@@ -3762,16 +3762,16 @@ sub_80741E8: @ 80741E8
ldr r5, =gUnknown_02022E2C ldr r5, =gUnknown_02022E2C
ldr r1, =gUnknown_085ED228 ldr r1, =gUnknown_085ED228
adds r0, r5, 0 adds r0, r5, 0
bl CopyString bl StringCopy
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x2 movs r1, 0x2
add r2, sp, 0x4 add r2, sp, 0x4
bl pokemon_getattr bl pokemon_getattr
add r0, sp, 0x4 add r0, sp, 0x4
bl GetStringEnd_Limit7 bl StringGetEnd10
adds r0, r5, 0 adds r0, r5, 0
add r1, sp, 0x4 add r1, sp, 0x4
bl AppendString bl StringAppend
adds r5, r0, 0 adds r5, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl pokemon_get_gender bl pokemon_get_gender
@@ -3793,7 +3793,7 @@ _08074236:
ldr r0, =gSpeciesNames ldr r0, =gSpeciesNames
adds r1, r0 adds r1, r0
add r0, sp, 0x4 add r0, sp, 0x4
bl CompareString bl StringCompare
cmp r0, 0 cmp r0, 0
bne _0807424A bne _0807424A
movs r6, 0x64 movs r6, 0x64
@@ -3813,7 +3813,7 @@ _08074270:
ldr r1, =gUnknown_085ED233 ldr r1, =gUnknown_085ED233
_08074272: _08074272:
adds r0, r5, 0 adds r0, r5, 0
bl CopyString bl StringCopy
ldr r0, =gUnknown_02022E2C ldr r0, =gUnknown_02022E2C
add r1, sp, 0x10 add r1, sp, 0x10
str r1, [sp] str r1, [sp]
@@ -4421,12 +4421,12 @@ sub_80747D8: @ 80747D8
lsrs r4, 24 lsrs r4, 24
ldr r1, =gUnknown_085CCB3C ldr r1, =gUnknown_085CCB3C
add r0, sp, 0x4 add r0, sp, 0x4
bl CopyString bl StringCopy
ldr r1, =gUnknown_0203A04C ldr r1, =gUnknown_0203A04C
ldrb r1, [r1] ldrb r1, [r1]
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r0, 0 movs r0, 0
add r1, sp, 0x4 add r1, sp, 0x4
movs r2, 0x2F movs r2, 0x2F
+7 -7
View File
@@ -2019,7 +2019,7 @@ _0809CF20:
lsls r0, r3, 3 lsls r0, r3, 3
adds r0, r1 adds r0, r1
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
movs r1, 0x4 movs r1, 0x4
ldrsb r1, [r2, r1] ldrsb r1, [r2, r1]
@@ -2512,7 +2512,7 @@ sub_809D2BC: @ 809D2BC
thumb_func_start sub_809D300 thumb_func_start sub_809D300
sub_809D300: @ 809D300 sub_809D300: @ 809D300
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00001270 ldr r1, =0x00001270
adds r0, r1 adds r0, r1
@@ -2540,7 +2540,7 @@ sub_809D300: @ 809D300
thumb_func_start sub_809D344 thumb_func_start sub_809D344
sub_809D344: @ 809D344 sub_809D344: @ 809D344
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00001270 ldr r1, =0x00001270
adds r2, r0, r1 adds r2, r0, r1
@@ -2570,7 +2570,7 @@ sub_809D344: @ 809D344
thumb_func_start sub_809D3A0 thumb_func_start sub_809D3A0
sub_809D3A0: @ 809D3A0 sub_809D3A0: @ 809D3A0
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00001394 ldr r1, =0x00001394
adds r0, r1 adds r0, r1
@@ -2587,7 +2587,7 @@ sub_809D3C0: @ 809D3C0
push {lr} push {lr}
ldr r0, =0x00004046 ldr r0, =0x00004046
bl GetVarPointer bl GetVarPointer
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r2, [r1] ldr r2, [r1]
movs r1, 0 movs r1, 0
strb r1, [r2, 0x1A] strb r1, [r2, 0x1A]
@@ -2604,7 +2604,7 @@ sub_809D3E8: @ 809D3E8
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, =0x00004046 ldr r0, =0x00004046
bl GetVarPointer bl GetVarPointer
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
ldr r2, [r4] ldr r2, [r4]
movs r5, 0 movs r5, 0
movs r1, 0xDA movs r1, 0xDA
@@ -2629,7 +2629,7 @@ sub_809D3E8: @ 809D3E8
thumb_func_start sub_809D42C thumb_func_start sub_809D42C
sub_809D42C: @ 809D42C sub_809D42C: @ 809D42C
push {lr} push {lr}
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x1A] ldrb r0, [r0, 0x1A]
cmp r0, 0xDA cmp r0, 0xDA
+3 -3
View File
@@ -1918,7 +1918,7 @@ sub_809E638: @ 809E638
mov r0, sp mov r0, sp
adds r1, r5, 0 adds r1, r5, 0
bl PlayerGetDestCoords bl PlayerGetDestCoords
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x4 movs r1, 0x4
ldrsb r1, [r0, r1] ldrsb r1, [r0, r1]
@@ -2072,7 +2072,7 @@ sub_809E778: @ 809E778
ldr r0, =0x00000895 ldr r0, =0x00000895
bl FlagSet bl FlagSet
bl GameFreakRTC_CalcLocalDateTime bl GameFreakRTC_CalcLocalDateTime
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, [r0] ldr r2, [r0]
adds r2, 0xA0 adds r2, 0xA0
ldr r3, =gUnknown_03005CF8 ldr r3, =gUnknown_03005CF8
@@ -2167,7 +2167,7 @@ sub_809E858: @ 809E858
sub sp, 0x8 sub sp, 0x8
adds r5, r0, 0 adds r5, r0, 0
mov r4, sp mov r4, sp
ldr r6, =gUnknown_03005D90 ldr r6, =gSaveBlock2Ptr
ldr r1, [r6] ldr r1, [r6]
adds r1, 0xA0 adds r1, 0xA0
mov r0, sp mov r0, sp
+1 -1
View File
@@ -2130,7 +2130,7 @@ _080B0116:
door_upload_tiles: @ 80B0124 door_upload_tiles: @ 80B0124
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_02038C28 ldr r4, =gUnknown_02038C28
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00000e68 ldr r1, =0x00000e68
adds r0, r1 adds r0, r1
+56 -56
View File
@@ -202,7 +202,7 @@ sub_80C70FC: @ 80C70FC
adds r5, r0, 0 adds r5, r0, 0
lsls r4, r2, 16 lsls r4, r2, 16
lsrs r4, 16 lsrs r4, 16
bl CopyString bl StringCopy
adds r1, r0, 0 adds r1, r0, 0
adds r5, r4 adds r5, r4
cmp r1, r5 cmp r1, r5
@@ -1021,12 +1021,12 @@ _080C779E:
lsrs r0, 24 lsrs r0, 24
bl sav3_get_box_name bl sav3_get_box_name
ldr r1, =gUnknown_085EBCC1 ldr r1, =gUnknown_085EBCC1
bl CopyString bl StringCopy
adds r4, r5, 0x1 adds r4, r5, 0x1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
lsls r4, 16 lsls r4, 16
lsrs r5, r4, 16 lsrs r5, r4, 16
cmp r5, 0xD cmp r5, 0xD
@@ -1615,10 +1615,10 @@ sub_80C7BE4: @ 80C7BE4
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x1 movs r2, 0x1
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_08571737 ldr r1, =gUnknown_08571737
add r0, sp, 0xC add r0, sp, 0xC
bl AppendString bl StringAppend
movs r0, 0x1 movs r0, 0x1
add r1, sp, 0xC add r1, sp, 0xC
movs r2, 0x40 movs r2, 0x40
@@ -7015,7 +7015,7 @@ _080CACF4:
ldr r2, =0x00000d65 ldr r2, =0x00000d65
adds r1, r2 adds r1, r2
_080CAD00: _080CAD00:
bl CopyString bl StringCopy
adds r2, r0, 0 adds r2, r0, 0
b _080CAD16 b _080CAD16
.pool .pool
@@ -10836,7 +10836,7 @@ sub_80CCB50: @ 80CCB50
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x8 movs r3, 0x8
bl CopyStringPadded bl StringCopyPadded
mov r4, r10 mov r4, r10
ldr r1, [r4] ldr r1, [r4]
adds r5, r1, r5 adds r5, r1, r5
@@ -11002,7 +11002,7 @@ _080CCDB0:
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x8 movs r3, 0x8
bl CopyStringPadded bl StringCopyPadded
mov r7, r8 mov r7, r8
ldr r1, [r7] ldr r1, [r7]
adds r5, r1, r5 adds r5, r1, r5
@@ -13486,7 +13486,7 @@ _080CE274:
adds r0, r1, r2 adds r0, r1, r2
ldr r2, =0x00000cee ldr r2, =0x00000cee
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -13585,7 +13585,7 @@ _080CE358:
ldrsb r1, [r4, r1] ldrsb r1, [r4, r1]
cmp r1, 0x22 cmp r1, 0x22
beq _080CE378 beq _080CE378
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
movs r0, 0x4 movs r0, 0x4
ldrsb r0, [r2, r0] ldrsb r0, [r2, r0]
@@ -14632,7 +14632,7 @@ _080CEC86:
bl pokemon_getattr bl pokemon_getattr
ldr r0, [r4] ldr r0, [r4]
adds r0, r5 adds r0, r5
bl GetStringEnd_Limit7 bl StringGetEnd10
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x38 movs r1, 0x38
bl pokemon_getattr bl pokemon_getattr
@@ -14732,7 +14732,7 @@ _080CED7E:
bl pokemon_getattr_encrypted bl pokemon_getattr_encrypted
ldr r0, [r5] ldr r0, [r5]
adds r0, r4 adds r0, r4
bl GetStringEnd_Limit7 bl StringGetEnd10
adds r0, r7, 0 adds r0, r7, 0
bl sub_80690C0 bl sub_80690C0
ldr r1, [r5] ldr r1, [r5]
@@ -14802,25 +14802,25 @@ _080CEE34:
adds r0, r3 adds r0, r3
movs r1, 0 movs r1, 0
movs r2, 0x5 movs r2, 0x5
bl RepeatChar bl StringFill
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00000cf9 ldr r1, =0x00000cf9
adds r0, r1 adds r0, r1
movs r1, 0 movs r1, 0
movs r2, 0x8 movs r2, 0x8
bl RepeatChar bl StringFill
ldr r0, [r4] ldr r0, [r4]
ldr r2, =0x00000d1d ldr r2, =0x00000d1d
adds r0, r2 adds r0, r2
movs r1, 0 movs r1, 0
movs r2, 0x8 movs r2, 0x8
bl RepeatChar bl StringFill
ldr r0, [r4] ldr r0, [r4]
ldr r3, =0x00000d41 ldr r3, =0x00000d41
adds r0, r3 adds r0, r3
movs r1, 0 movs r1, 0
movs r2, 0x8 movs r2, 0x8
bl RepeatChar bl StringFill
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00000d65 ldr r1, =0x00000d65
adds r0, r1 adds r0, r1
@@ -14841,7 +14841,7 @@ _080CEE94:
adds r1, r3 adds r1, r3
movs r2, 0 movs r2, 0
movs r3, 0x5 movs r3, 0x5
bl CopyStringPadded bl StringCopyPadded
b _080CEECE b _080CEECE
.pool .pool
_080CEEC0: _080CEEC0:
@@ -14850,7 +14850,7 @@ _080CEEC0:
ldr r1, =gUnknown_085E8264 ldr r1, =gUnknown_085E8264
movs r2, 0 movs r2, 0
movs r3, 0x8 movs r3, 0x8
bl CopyStringPadded bl StringCopyPadded
_080CEECE: _080CEECE:
ldr r4, =gUnknown_02039D08 ldr r4, =gUnknown_02039D08
ldr r0, [r4] ldr r0, [r4]
@@ -14858,20 +14858,20 @@ _080CEECE:
adds r0, r3 adds r0, r3
movs r1, 0 movs r1, 0
movs r2, 0x8 movs r2, 0x8
bl RepeatChar bl StringFill
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00000d41 ldr r1, =0x00000d41
adds r0, r1 adds r0, r1
movs r1, 0 movs r1, 0
movs r2, 0x8 movs r2, 0x8
bl RepeatChar bl StringFill
ldr r0, [r4] ldr r0, [r4]
ldr r2, =0x00000d65 ldr r2, =0x00000d65
adds r0, r2 adds r0, r2
_080CEEF2: _080CEEF2:
movs r1, 0 movs r1, 0
movs r2, 0x8 movs r2, 0x8
bl RepeatChar bl StringFill
b _080CF0B8 b _080CF0B8
.pool .pool
_080CEF14: _080CEF14:
@@ -14891,7 +14891,7 @@ _080CEF20:
adds r1, r3 adds r1, r3
movs r2, 0 movs r2, 0
movs r3, 0x5 movs r3, 0x5
bl CopyStringPadded bl StringCopyPadded
ldr r1, [r4] ldr r1, [r4]
ldr r0, =0x00000d1d ldr r0, =0x00000d1d
adds r2, r1, r0 adds r2, r1, r0
@@ -14910,7 +14910,7 @@ _080CEF20:
adds r0, r2, 0 adds r0, r2, 0
movs r2, 0 movs r2, 0
movs r3, 0x5 movs r3, 0x5
bl CopyStringPadded bl StringCopyPadded
ldr r4, [r4] ldr r4, [r4]
ldr r3, =0x00000d41 ldr r3, =0x00000d41
adds r2, r4, r3 adds r2, r4, r3
@@ -15013,7 +15013,7 @@ _080CF020:
adds r0, r2, 0 adds r0, r2, 0
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
adds r2, r0, 0 adds r2, r0, 0
strb r5, [r2] strb r5, [r2]
movs r0, 0xFF movs r0, 0xFF
@@ -15031,7 +15031,7 @@ _080CF020:
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x8 movs r3, 0x8
bl CopyStringPadded bl StringCopyPadded
b _080CF0B8 b _080CF0B8
.pool .pool
_080CF0AC: _080CF0AC:
@@ -15039,7 +15039,7 @@ _080CF0AC:
adds r0, r4, r1 adds r0, r4, r1
movs r1, 0 movs r1, 0
movs r2, 0x8 movs r2, 0x8
bl RepeatChar bl StringFill
_080CF0B8: _080CF0B8:
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
@@ -15312,7 +15312,7 @@ _080CF2E4:
b _080CF366 b _080CF366
.pool .pool
_080CF2F8: _080CF2F8:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x1 cmp r0, 0x1
@@ -15622,7 +15622,7 @@ _080CF588:
movs r0, 0x18 movs r0, 0x18
b _080CF5BC b _080CF5BC
_080CF58C: _080CF58C:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x1 cmp r0, 0x1
@@ -15963,7 +15963,7 @@ _080CF834:
ands r0, r2 ands r0, r2
cmp r0, 0 cmp r0, 0
bne _080CF86E bne _080CF86E
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
cmp r0, 0x1 cmp r0, 0x1
@@ -16833,7 +16833,7 @@ sub_80CFF34: @ 80CFF34
ldr r0, [r0] ldr r0, [r0]
str r0, [r1] str r0, [r1]
str r3, [r1, 0x4] str r3, [r1, 0x4]
bl GetStringLength bl StringLength
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
ldr r0, [r4] ldr r0, [r4]
@@ -21546,7 +21546,7 @@ _080D241E:
thumb_func_start sub_80D242C thumb_func_start sub_80D242C
sub_80D242C: @ 80D242C sub_80D242C: @ 80D242C
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r0, [r2] ldr r0, [r2]
ldr r1, =0x00003d84 ldr r1, =0x00003d84
adds r0, r1 adds r0, r1
@@ -21579,7 +21579,7 @@ sub_80D242C: @ 80D242C
thumb_func_start sub_80D2480 thumb_func_start sub_80D2480
sub_80D2480: @ 80D2480 sub_80D2480: @ 80D2480
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
ldr r2, =0x00003d86 ldr r2, =0x00003d86
adds r1, r2 adds r1, r2
@@ -21590,7 +21590,7 @@ sub_80D2480: @ 80D2480
thumb_func_start sub_80D2494 thumb_func_start sub_80D2494
sub_80D2494: @ 80D2494 sub_80D2494: @ 80D2494
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003d86 ldr r1, =0x00003d86
adds r0, r1 adds r0, r1
@@ -21601,7 +21601,7 @@ sub_80D2494: @ 80D2494
thumb_func_start sub_80D24A8 thumb_func_start sub_80D24A8
sub_80D24A8: @ 80D24A8 sub_80D24A8: @ 80D24A8
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003d85 ldr r1, =0x00003d85
adds r0, r1 adds r0, r1
@@ -21617,7 +21617,7 @@ sub_80D24BC: @ 80D24BC
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0xF cmp r1, 0xF
bhi _080D24D0 bhi _080D24D0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00003d85 ldr r2, =0x00003d85
adds r0, r2 adds r0, r2
@@ -21630,7 +21630,7 @@ _080D24D0:
thumb_func_start sub_80D24DC thumb_func_start sub_80D24DC
sub_80D24DC: @ 80D24DC sub_80D24DC: @ 80D24DC
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003d84 ldr r1, =0x00003d84
adds r0, r1 adds r0, r1
@@ -21646,7 +21646,7 @@ sub_80D24F0: @ 80D24F0
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x1D cmp r1, 0x1D
bhi _080D2504 bhi _080D2504
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00003d84 ldr r2, =0x00003d84
adds r0, r2 adds r0, r2
@@ -21659,7 +21659,7 @@ _080D2504:
thumb_func_start sub_80D2510 thumb_func_start sub_80D2510
sub_80D2510: @ 80D2510 sub_80D2510: @ 80D2510
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003d70 ldr r1, =0x00003d70
adds r0, r1 adds r0, r1
@@ -21670,7 +21670,7 @@ sub_80D2510: @ 80D2510
thumb_func_start sub_80D2524 thumb_func_start sub_80D2524
sub_80D2524: @ 80D2524 sub_80D2524: @ 80D2524
push {r4,lr} push {r4,lr}
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r2, [r2] ldr r2, [r2]
ldr r4, =0x00003d70 ldr r4, =0x00003d70
adds r3, r2, r4 adds r3, r2, r4
@@ -21686,7 +21686,7 @@ sub_80D2524: @ 80D2524
thumb_func_start sub_80D2548 thumb_func_start sub_80D2548
sub_80D2548: @ 80D2548 sub_80D2548: @ 80D2548
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003d74 ldr r1, =0x00003d74
adds r0, r1 adds r0, r1
@@ -21698,11 +21698,11 @@ sub_80D2548: @ 80D2548
sub_80D255C: @ 80D255C sub_80D255C: @ 80D255C
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00003d74 ldr r2, =0x00003d74
adds r0, r2 adds r0, r2
bl CopyString bl StringCopy
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -21712,7 +21712,7 @@ sub_80D255C: @ 80D255C
sub_80D2578: @ 80D2578 sub_80D2578: @ 80D2578
push {lr} push {lr}
movs r1, 0 movs r1, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00003d74 ldr r2, =0x00003d74
adds r0, r2 adds r0, r2
@@ -25546,7 +25546,7 @@ sub_80D4354: @ 80D4354
sub_80D436C: @ 80D436C sub_80D436C: @ 80D436C
push {r4,r5,lr} push {r4,r5,lr}
movs r4, 0 movs r4, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
_080D4372: _080D4372:
lsls r1, r4, 3 lsls r1, r4, 3
adds r1, r4 adds r1, r4
@@ -25662,7 +25662,7 @@ sub_80D4420: @ 80D4420
strb r1, [r0, 0x1] strb r1, [r0, 0x1]
add r3, sp, 0x4 add r3, sp, 0x4
strb r2, [r3] strb r2, [r3]
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
mov r10, r4 mov r10, r4
mov r9, r3 mov r9, r3
adds r4, r3, 0 adds r4, r3, 0
@@ -25683,9 +25683,9 @@ _080D444C:
b _080D45A8 b _080D45A8
_080D4468: _080D4468:
movs r4, 0 movs r4, 0
ldr r2, =gUnknown_03005D90 ldr r2, =gSaveBlock2Ptr
mov r12, r2 mov r12, r2
ldr r7, =gUnknown_03005D8C ldr r7, =gSaveBlock1Ptr
add r5, sp, 0x4 add r5, sp, 0x4
ldr r3, =0x0000ffff ldr r3, =0x0000ffff
adds r6, r3, 0 adds r6, r3, 0
@@ -25709,7 +25709,7 @@ _080D4476:
cmp r4, 0x8 cmp r4, 0x8
bls _080D4476 bls _080D4476
movs r4, 0 movs r4, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
add r3, sp, 0x4 add r3, sp, 0x4
_080D44A0: _080D44A0:
ldr r2, [r5] ldr r2, [r5]
@@ -25756,9 +25756,9 @@ _080D44A0:
movs r1, 0 movs r1, 0
bl sub_81DB4DC bl sub_81DB4DC
movs r4, 0 movs r4, 0
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
add r3, sp, 0x4 add r3, sp, 0x4
ldr r5, =gUnknown_03005D90 ldr r5, =gSaveBlock2Ptr
_080D4500: _080D4500:
ldr r2, [r6] ldr r2, [r6]
ldrb r1, [r3] ldrb r1, [r3]
@@ -25900,7 +25900,7 @@ sub_80D460C: @ 80D460C
ldrb r2, [r4] ldrb r2, [r4]
cmp r2, 0xFF cmp r2, 0xFF
beq _080D4670 beq _080D4670
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
lsls r0, r2, 3 lsls r0, r2, 3
adds r0, r2 adds r0, r2
@@ -25960,7 +25960,7 @@ sub_80D4680: @ 80D4680
bl pokemon_getattr bl pokemon_getattr
add r2, sp, 0x4 add r2, sp, 0x4
strb r0, [r2] strb r0, [r2]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r3, [r0] ldr r3, [r0]
ldrb r1, [r2] ldrb r1, [r2]
lsls r0, r1, 3 lsls r0, r1, 3
@@ -25997,7 +25997,7 @@ _080D46D2:
sub_80D46E0: @ 80D46E0 sub_80D46E0: @ 80D46E0
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
lsls r1, r0, 3 lsls r1, r0, 3
adds r1, r0 adds r1, r0
@@ -26029,7 +26029,7 @@ sub_80D4700: @ 80D4700
strb r0, [r1] strb r0, [r1]
movs r7, 0x6 movs r7, 0x6
mov r9, r1 mov r9, r1
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r8, r0 mov r8, r0
ldr r3, =0x00002be0 ldr r3, =0x00002be0
_080D4724: _080D4724:
@@ -26375,7 +26375,7 @@ _080D49DC:
mov r4, sp mov r4, sp
adds r4, 0xF adds r4, 0xF
ldr r1, =gUnknown_0857F544 ldr r1, =gUnknown_0857F544
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00000cb2 ldr r2, =0x00000cb2
adds r0, r2 adds r0, r2
@@ -26385,7 +26385,7 @@ _080D49DC:
ldr r1, [r0] ldr r1, [r0]
_080D49F2: _080D49F2:
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
b _080D4A18 b _080D4A18
.pool .pool
_080D4A08: _080D4A08:
+210 -210
View File
File diff suppressed because it is too large Load Diff
+15 -15
View File
@@ -1823,7 +1823,7 @@ sub_81700F8: @ 81700F8
_08170148: _08170148:
bl init_sav2 bl init_sav2
_0817014C: _0817014C:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x15] ldrb r0, [r0, 0x15]
lsls r0, 31 lsls r0, 31
@@ -9114,7 +9114,7 @@ sub_8173EE4: @ 8173EE4
bl ShowBg bl ShowBg
movs r0, 0x3 movs r0, 0x3
bl ShowBg bl ShowBg
ldr r6, =gUnknown_03005D90 ldr r6, =gSaveBlock2Ptr
ldr r0, [r6] ldr r0, [r6]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
movs r1, 0x1 movs r1, 0x1
@@ -9823,7 +9823,7 @@ _0817454E:
ldr r2, =0x000063b0 ldr r2, =0x000063b0
movs r1, 0xC movs r1, 0xC
bl sub_80A2A20 bl sub_80A2A20
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r1, =gTasks ldr r1, =gTasks
ldr r4, [sp, 0x14] ldr r4, [sp, 0x14]
add r4, r8 add r4, r8
@@ -9833,11 +9833,11 @@ _0817454E:
ldrsh r1, [r4, r5] ldrsh r1, [r4, r5]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085E8C00 ldr r1, =gUnknown_085E8C00
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r1, 0x8 movs r1, 0x8
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
cmp r0, 0 cmp r0, 0
@@ -10413,7 +10413,7 @@ sub_8174A88: @ 8174A88
beq _08174B30 beq _08174B30
ldr r1, =gUnknown_085E8C36 ldr r1, =gUnknown_085E8C36
add r0, sp, 0xC add r0, sp, 0xC
bl CopyString bl StringCopy
adds r6, r0, 0 adds r6, r0, 0
ldrh r0, [r7, 0x8] ldrh r0, [r7, 0x8]
lsls r0, 23 lsls r0, 23
@@ -10537,7 +10537,7 @@ _08174B8C:
muls r1, r2 muls r1, r2
ldr r2, =gSpeciesNames ldr r2, =gSpeciesNames
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
adds r6, r0, 0 adds r6, r0, 0
ldrh r1, [r7, 0x8] ldrh r1, [r7, 0x8]
adds r0, r4, 0 adds r0, r4, 0
@@ -10583,13 +10583,13 @@ _08174C0A:
bl box_print bl box_print
ldr r1, =gUnknown_085E8C3B ldr r1, =gUnknown_085E8C3B
add r0, sp, 0xC add r0, sp, 0xC
bl CopyString bl StringCopy
adds r6, r0, 0 adds r6, r0, 0
ldrb r1, [r7, 0x9] ldrb r1, [r7, 0x9]
lsrs r1, 1 lsrs r1, 1
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
add r0, sp, 0xC add r0, sp, 0xC
@@ -10601,12 +10601,12 @@ _08174C0A:
bl box_print bl box_print
ldr r1, =gUnknown_085E8C4D ldr r1, =gUnknown_085E8C4D
add r0, sp, 0xC add r0, sp, 0xC
bl CopyString bl StringCopy
adds r6, r0, 0 adds r6, r0, 0
ldrh r1, [r7] ldrh r1, [r7]
movs r2, 0x2 movs r2, 0x2
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
add r0, sp, 0xC add r0, sp, 0xC
@@ -10659,7 +10659,7 @@ sub_8174C98: @ 8174C98
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl box_print bl box_print
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
mov r10, r0 mov r10, r0
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x1 movs r0, 0x1
@@ -10816,7 +10816,7 @@ _08174E30:
movs r0, 0xF0 movs r0, 0xF0
strb r0, [r1, 0x3] strb r0, [r1, 0x3]
adds r4, r1, 0 adds r4, r1, 0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r5, [r0] ldr r5, [r0]
ldrb r0, [r5, 0x10] ldrb r0, [r5, 0x10]
movs r1, 0x64 movs r1, 0x64
@@ -14235,7 +14235,7 @@ _08176B30:
b _08176C96 b _08176C96
.pool .pool
_08176B54: _08176B54:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
cmp r0, 0 cmp r0, 0
+16 -16
View File
@@ -13,7 +13,7 @@ sub_81795E8: @ 81795E8
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08179634 bne _08179634
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldrh r1, [r2, 0x4] ldrh r1, [r2, 0x4]
ldr r0, =0x00004718 ldr r0, =0x00004718
@@ -237,7 +237,7 @@ sub_81797DC: @ 81797DC
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0 cmp r2, 0
bne _0817982C bne _0817982C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r3, [r0] ldr r3, [r0]
ldrh r1, [r3, 0x4] ldrh r1, [r3, 0x4]
movs r0, 0xC3 movs r0, 0xC3
@@ -340,7 +340,7 @@ sub_81798D0: @ 81798D0
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08179910 bne _08179910
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldrh r1, [r2, 0x4] ldrh r1, [r2, 0x4]
ldr r0, =0x00004418 ldr r0, =0x00004418
@@ -473,7 +473,7 @@ sub_8179A04: @ 8179A04
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
push {r6,r7} push {r6,r7}
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
ldrh r1, [r0, 0x4] ldrh r1, [r0, 0x4]
ldr r0, =0x00004318 ldr r0, =0x00004318
@@ -595,7 +595,7 @@ _08179AF0:
lsrs r0, 16 lsrs r0, 16
cmp r0, 0xF cmp r0, 0xF
bne _08179B5A bne _08179B5A
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00150008 ldr r0, =0x00150008
@@ -1094,7 +1094,7 @@ sub_8179FAC: @ 8179FAC
sub_8179FEC: @ 8179FEC sub_8179FEC: @ 8179FEC
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
lsrs r0, 21 lsrs r0, 21
ldr r2, =0x00000848 ldr r2, =0x00000848
adds r0, r2 adds r0, r2
@@ -1310,7 +1310,7 @@ sub_817A1C4: @ 817A1C4
muls r5, r0 muls r5, r0
ldr r0, =gUnknown_020244EC ldr r0, =gUnknown_020244EC
adds r5, r0 adds r5, r0
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r0, =gUnknown_0203CE7C ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0] ldrh r0, [r0]
lsls r0, 3 lsls r0, 3
@@ -1326,33 +1326,33 @@ sub_817A1C4: @ 817A1C4
bl sub_8136FE4 bl sub_8136FE4
ldr r6, =gUnknown_0203BC9E ldr r6, =gUnknown_0203BC9E
strh r0, [r6] strh r0, [r6]
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
adds r0, r5, 0 adds r0, r5, 0
bl GetMonNickname bl GetMonNickname
ldr r1, =gUnknown_02021DC4 ldr r1, =gStringVar2
adds r0, r4, 0 adds r0, r4, 0
bl sub_8137044 bl sub_8137044
movs r1, 0 movs r1, 0
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
cmp r0, 0 cmp r0, 0
bne _0817A248 bne _0817A248
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E937F ldr r1, =gUnknown_085E937F
bl ExpandStringRefs bl StringExpandPlaceholders
b _0817A268 b _0817A268
.pool .pool
_0817A248: _0817A248:
cmp r0, 0 cmp r0, 0
ble _0817A260 ble _0817A260
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9390 ldr r1, =gUnknown_085E9390
bl ExpandStringRefs bl StringExpandPlaceholders
b _0817A268 b _0817A268
.pool .pool
_0817A260: _0817A260:
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E93A9 ldr r1, =gUnknown_085E93A9
bl ExpandStringRefs bl StringExpandPlaceholders
_0817A268: _0817A268:
ldr r2, =gUnknown_03003014 ldr r2, =gUnknown_03003014
ldrb r0, [r2] ldrb r0, [r2]
@@ -1363,7 +1363,7 @@ _0817A268:
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
ldr r2, =gUnknown_02021FC4 ldr r2, =gStringVar4
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
movs r0, 0x2 movs r0, 0x2
+1117 -1117
View File
File diff suppressed because it is too large Load Diff
+283 -283
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -8,7 +8,7 @@
thumb_func_start GetCurrentMapRotatingGatePuzzleType thumb_func_start GetCurrentMapRotatingGatePuzzleType
GetCurrentMapRotatingGatePuzzleType: @ 80FB7E8 GetCurrentMapRotatingGatePuzzleType: @ 80FB7E8
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrh r1, [r0, 0x4] ldrh r1, [r0, 0x4]
movs r0, 0x86 movs r0, 0x86
@@ -190,7 +190,7 @@ sub_80FB928: @ 80FB928
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
mov r10, r1 mov r10, r1
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldrh r1, [r2] ldrh r1, [r2]
subs r0, r1, 0x2 subs r0, r1, 0x2
@@ -557,7 +557,7 @@ sub_80FBC10: @ 80FBC10
mov r6, r9 mov r6, r9
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldrh r1, [r2] ldrh r1, [r2]
subs r0, r1, 0x2 subs r0, r1, 0x2
+14 -14
View File
@@ -2757,7 +2757,7 @@ sub_8141A18: @ 8141A18
sub sp, 0xC sub sp, 0xC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r3, =gUnknown_02021CC4 ldr r3, =gStringVar1
ldr r1, =gUnknown_0203AB88 ldr r1, =gUnknown_0203AB88
mov r9, r1 mov r9, r1
ldr r1, [r1] ldr r1, [r1]
@@ -2774,12 +2774,12 @@ sub_8141A18: @ 8141A18
adds r0, r3, 0 adds r0, r3, 0
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r2, =gUnknown_02021FC4 ldr r2, =gStringVar4
mov r8, r2 mov r8, r2
ldr r1, =gUnknown_082A5BEF ldr r1, =gUnknown_082A5BEF
mov r0, r8 mov r0, r8
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r5, =gUnknown_0203AB8C ldr r5, =gUnknown_0203AB8C
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
@@ -4635,14 +4635,14 @@ sub_81429F0: @ 81429F0
adds r0, r1 adds r0, r1
adds r0, r2 adds r0, r2
ldrb r1, [r0] ldrb r1, [r0]
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r2, 0x2 movs r2, 0x2
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_082A5B12 ldr r1, =gUnknown_082A5B12
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_81973FC bl sub_81973FC
@@ -4701,11 +4701,11 @@ sub_8142A88: @ 8142A88
adds r0, r1 adds r0, r1
adds r0, r2 adds r0, r2
ldrb r4, [r0] ldrb r4, [r0]
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r1, 0x22 movs r1, 0x22
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
cmp r0, r4 cmp r0, r4
@@ -4740,10 +4740,10 @@ sub_8142A88: @ 8142A88
b _08142BB0 b _08142BB0
.pool .pool
_08142B28: _08142B28:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_082A5B12 ldr r1, =gUnknown_082A5B12
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_81973FC bl sub_81973FC
@@ -4770,10 +4770,10 @@ _08142B28:
b _08142BB0 b _08142BB0
.pool .pool
_08142B78: _08142B78:
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r1, =gUnknown_082A5B4E ldr r1, =gUnknown_082A5B4E
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_81973FC bl sub_81973FC
+14 -14
View File
@@ -466,20 +466,20 @@ GameFreakRTC_FormatDecimalTimeString: @ 802F40C
adds r6, r3, 0 adds r6, r3, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r4, 0xF0 movs r4, 0xF0
strb r4, [r0] strb r4, [r0]
adds r0, 0x1 adds r0, 0x1
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
strb r4, [r0] strb r4, [r0]
adds r0, 0x1 adds r0, 0x1
adds r1, r6, 0 adds r1, r6, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r1, 0xFF movs r1, 0xFF
strb r1, [r0] strb r1, [r0]
pop {r4-r6} pop {r4-r6}
@@ -495,20 +495,20 @@ GameFreakRTC_FormatHexTimeString: @ 802F444
adds r6, r3, 0 adds r6, r3, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToHexString bl ConvertIntToHexStringN
movs r4, 0xF0 movs r4, 0xF0
strb r4, [r0] strb r4, [r0]
adds r0, 0x1 adds r0, 0x1
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToHexString bl ConvertIntToHexStringN
strb r4, [r0] strb r4, [r0]
adds r0, 0x1 adds r0, 0x1
adds r1, r6, 0 adds r1, r6, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToHexString bl ConvertIntToHexStringN
movs r1, 0xFF movs r1, 0xFF
strb r1, [r0] strb r1, [r0]
pop {r4-r6} pop {r4-r6}
@@ -538,20 +538,20 @@ GameFreakRTC_FormatDecimalYearMonthDayString: @ 802F494
adds r6, r3, 0 adds r6, r3, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r4, 0xAE movs r4, 0xAE
strb r4, [r0] strb r4, [r0]
adds r0, 0x1 adds r0, 0x1
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
strb r4, [r0] strb r4, [r0]
adds r0, 0x1 adds r0, 0x1
adds r1, r6, 0 adds r1, r6, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r1, 0xFF movs r1, 0xFF
strb r1, [r0] strb r1, [r0]
pop {r4-r6} pop {r4-r6}
@@ -567,20 +567,20 @@ GameFreakRTC_FormatHexYearMonthDayString: @ 802F4CC
adds r6, r3, 0 adds r6, r3, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToHexString bl ConvertIntToHexStringN
movs r4, 0xAE movs r4, 0xAE
strb r4, [r0] strb r4, [r0]
adds r0, 0x1 adds r0, 0x1
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToHexString bl ConvertIntToHexStringN
strb r4, [r0] strb r4, [r0]
adds r0, 0x1 adds r0, 0x1
adds r1, r6, 0 adds r1, r6, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToHexString bl ConvertIntToHexStringN
movs r1, 0xFF movs r1, 0xFF
strb r1, [r0] strb r1, [r0]
pop {r4-r6} pop {r4-r6}
@@ -666,7 +666,7 @@ GameFreakRTC_CalcLocalDateTime: @ 802F588
adds r0, r4, 0 adds r0, r4, 0
bl GameFreakRTC_GetRTCDateTime bl GameFreakRTC_GetRTCDateTime
ldr r1, =gUnknown_03005CF8 ldr r1, =gUnknown_03005CF8
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, [r0] ldr r2, [r0]
adds r2, 0x98 adds r2, 0x98
adds r0, r4, 0 adds r0, r4, 0
@@ -703,7 +703,7 @@ GameFreakRTC_CalcRTCToLocalDelta: @ 802F5C8
ldr r5, =gUnknown_03000DC0 ldr r5, =gUnknown_03000DC0
adds r0, r5, 0 adds r0, r5, 0
bl GameFreakRTC_GetRTCDateTime bl GameFreakRTC_GetRTCDateTime
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r1, 0x98 adds r1, 0x98
adds r0, r5, 0 adds r0, r5, 0
+7 -7
View File
@@ -213,7 +213,7 @@ sub_80FC258: @ 80FC258
bl GetXYCoordsOneStepInFrontOfPlayer bl GetXYCoordsOneStepInFrontOfPlayer
movs r5, 0 movs r5, 0
_080FC26A: _080FC26A:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldr r1, =gUnknown_0203A054 ldr r1, =gUnknown_0203A054
lsls r0, r5, 4 lsls r0, r5, 4
@@ -244,8 +244,8 @@ _080FC26A:
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
bl CopyString bl StringCopy
b _080FC2D6 b _080FC2D6
.pool .pool
_080FC2C4: _080FC2C4:
@@ -277,7 +277,7 @@ sub_80FC2E8: @ 80FC2E8
bl PlayerGetDestCoords bl PlayerGetDestCoords
movs r5, 0 movs r5, 0
adds r6, r4, 0 adds r6, r4, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r7, [r0] ldr r7, [r0]
mov r4, sp mov r4, sp
ldr r0, =gUnknown_0203A054 ldr r0, =gUnknown_0203A054
@@ -405,7 +405,7 @@ sub_80FC3E8: @ 80FC3E8
movs r0, 0x8 movs r0, 0x8
adds r0, r2 adds r0, r2
mov r9, r0 mov r9, r0
ldr r7, =gUnknown_03005D8C ldr r7, =gSaveBlock1Ptr
_080FC408: _080FC408:
lsls r5, r1, 4 lsls r5, r1, 4
adds r4, r5, r2 adds r4, r5, r2
@@ -503,14 +503,14 @@ sub_80FC4B4: @ 80FC4B4
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
cmp r1, r0 cmp r1, r0
beq _080FC4EC beq _080FC4EC
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r2, =gUnknown_0203A054 ldr r2, =gUnknown_0203A054
lsls r1, 4 lsls r1, 4
adds r1, r2 adds r1, r2
ldrb r1, [r1, 0x5] ldrb r1, [r1, 0x5]
movs r2, 0x2 movs r2, 0x2
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r0, 0x1 movs r0, 0x1
b _080FC4EE b _080FC4EE
.pool .pool
+2 -2
View File
@@ -1312,7 +1312,7 @@ _08153182:
sub_8153190: @ 8153190 sub_8153190: @ 8153190
push {r4,r5,lr} push {r4,r5,lr}
ldr r3, =gUnknown_03006220 ldr r3, =gUnknown_03006220
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, =gUnknown_085CDC00 ldr r2, =gUnknown_085CDC00
ldrh r1, [r2] ldrh r1, [r2]
ldr r0, [r0] ldr r0, [r0]
@@ -1320,7 +1320,7 @@ sub_8153190: @ 8153190
str r0, [r3] str r0, [r3]
ldrh r0, [r2, 0x2] ldrh r0, [r2, 0x2]
strh r0, [r3, 0x4] strh r0, [r3, 0x4]
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
adds r3, 0x8 adds r3, 0x8
adds r2, 0x4 adds r2, 0x4
movs r4, 0x3 movs r4, 0x3
+31 -31
View File
@@ -2324,7 +2324,7 @@ s42_get_map_camera_pos: @ 809A45C
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl GetVarPointer bl GetVarPointer
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r1, [r2] ldr r1, [r2]
ldrh r1, [r1] ldrh r1, [r1]
strh r1, [r5] strh r1, [r5]
@@ -2550,7 +2550,7 @@ s4F_execute_movement: @ 809A5E8
adds r3, r0, 0 adds r3, r0, 0
lsls r0, r4, 24 lsls r0, r4, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -2630,7 +2630,7 @@ s51_waitmove: @ 809A698
strh r1, [r0] strh r1, [r0]
_0809A6B4: _0809A6B4:
ldr r1, =gUnknown_020375CC ldr r1, =gUnknown_020375CC
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
movs r0, 0x4 movs r0, 0x4
ldrsb r0, [r2, r0] ldrsb r0, [r2, r0]
@@ -2694,7 +2694,7 @@ s53_hide_sprite: @ 809A740
bl VarGet bl VarGet
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -2738,7 +2738,7 @@ s55_show_sprite: @ 809A798
bl VarGet bl VarGet
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -2800,7 +2800,7 @@ s57_move_sprites: @ 809A7F0
bl VarGet bl VarGet
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -2869,7 +2869,7 @@ s64_set_sprite_top_left_corner: @ 809A8B0
bl VarGet bl VarGet
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -3026,7 +3026,7 @@ s5B_npc_set_direction: @ 809A9DC
str r1, [r4, 0x8] str r1, [r4, 0x8]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -3643,10 +3643,10 @@ sub_809AE6C: @ 809AE6C
sub sp, 0x20 sub sp, 0x20
bl script_read_word bl script_read_word
adds r1, r0, 0 adds r1, r0, 0
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
adds r1, 0x6 adds r1, 0x6
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r2, 0x1 movs r2, 0x1
negs r2, r2 negs r2, r2
movs r0, 0x6 movs r0, 0x6
@@ -3755,7 +3755,7 @@ _0809AEC6:
movs r1, 0x11 movs r1, 0x11
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
ldrb r0, [r5] ldrb r0, [r5]
ldr r2, =gUnknown_02021FC4 ldr r2, =gStringVar4
str r4, [sp] str r4, [sp]
movs r1, 0xFF movs r1, 0xFF
str r1, [sp, 0x4] str r1, [sp, 0x4]
@@ -3822,7 +3822,7 @@ s7D_load_pokename: @ 809AFBC
ldr r0, =gSpeciesNames ldr r0, =gSpeciesNames
adds r1, r0 adds r1, r0
adds r0, r2, 0 adds r0, r2, 0
bl CopyString bl StringCopy
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -3856,7 +3856,7 @@ s7E_load_first_pokenames: @ 809AFFC
ldr r0, =gSpeciesNames ldr r0, =gSpeciesNames
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -3889,7 +3889,7 @@ s7F_load_pokename_team: @ 809B048
adds r2, r4, 0 adds r2, r4, 0
bl pokemon_getattr bl pokemon_getattr
adds r0, r4, 0 adds r0, r4, 0
bl GetStringEnd_Limit7 bl StringGetEnd10
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -3979,7 +3979,7 @@ sub_809B114: @ 809B114
lsrs r1, 11 lsrs r1, 11
ldr r2, =gUnknown_085A5C09 ldr r2, =gUnknown_085A5C09
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -4009,7 +4009,7 @@ s82_load_item_name: @ 809B150
ldr r0, =gMoveNames ldr r0, =gMoveNames
adds r1, r0 adds r1, r0
adds r0, r2, 0 adds r0, r2, 0
bl CopyString bl StringCopy
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -4042,7 +4042,7 @@ s83_load_textvar_var: @ 809B190
ldr r0, [r5] ldr r0, [r5]
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r0, 0 movs r0, 0
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
@@ -4071,7 +4071,7 @@ s84_load_textvar_std_expression: @ 809B1D4
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
adds r0, r2, 0 adds r0, r2, 0
bl CopyString bl StringCopy
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -4118,7 +4118,7 @@ s85_load_textvar_pointer: @ 809B248
lsls r4, 2 lsls r4, 2
adds r4, r0 adds r4, r0
ldr r0, [r4] ldr r0, [r4]
bl CopyString bl StringCopy
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -4134,8 +4134,8 @@ sBE_virtual_load_text: @ 809B270
ldr r0, =gUnknown_020375C4 ldr r0, =gUnknown_020375C4
ldr r0, [r0] ldr r0, [r0]
subs r1, r0 subs r1, r0
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
pop {r1} pop {r1}
bx r1 bx r1
@@ -4158,7 +4158,7 @@ sBF_virtual_load_textbuffer: @ 809B294
lsls r4, 2 lsls r4, 2
adds r4, r0 adds r4, r0
ldr r0, [r4] ldr r0, [r4]
bl CopyString bl StringCopy
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -4186,7 +4186,7 @@ sC6_load_textvar_box_label: @ 809B2C8
bl sav3_get_box_name bl sav3_get_box_name
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -4369,7 +4369,7 @@ s90_add_money: @ 809B458
str r0, [r4, 0x8] str r0, [r4, 0x8]
cmp r1, 0 cmp r1, 0
bne _0809B47E bne _0809B47E
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -4397,7 +4397,7 @@ s91_subtract_money: @ 809B48C
str r0, [r4, 0x8] str r0, [r4, 0x8]
cmp r1, 0 cmp r1, 0
bne _0809B4B2 bne _0809B4B2
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -4426,7 +4426,7 @@ s92_check_money: @ 809B4C0
cmp r1, 0 cmp r1, 0
bne _0809B4EE bne _0809B4EE
ldr r4, =gUnknown_020375F0 ldr r4, =gUnknown_020375F0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -4460,7 +4460,7 @@ s93_display_money: @ 809B500
str r2, [r0, 0x8] str r2, [r0, 0x8]
cmp r1, 0 cmp r1, 0
bne _0809B530 bne _0809B530
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -4499,7 +4499,7 @@ s95_update_money: @ 809B548
str r2, [r0, 0x8] str r2, [r0, 0x8]
cmp r1, 0 cmp r1, 0
bne _0809B56E bne _0809B56E
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -4944,7 +4944,7 @@ s9F_changeposition_fly: @ 809B870
thumb_func_start sA0_check_gender thumb_func_start sA0_check_gender
sA0_check_gender: @ 809B88C sA0_check_gender: @ 809B88C
ldr r1, =gUnknown_020375F0 ldr r1, =gUnknown_020375F0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
strh r0, [r1] strh r0, [r1]
@@ -5633,7 +5633,7 @@ sub_809BDD0: @ 809BDD0
bl sub_806F07C bl sub_806F07C
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -5661,7 +5661,7 @@ sub_809BE0C: @ 809BE0C
bl sub_806F0B0 bl sub_806F0B0
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
+6 -6
View File
@@ -625,7 +625,7 @@ _080990A8:
thumb_func_start sub_80990AC thumb_func_start sub_80990AC
sub_80990AC: @ 80990AC sub_80990AC: @ 80990AC
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x0000372c ldr r1, =0x0000372c
adds r0, r1 adds r0, r1
@@ -645,7 +645,7 @@ killram: @ 80990D0
sub sp, 0x4 sub sp, 0x4
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00003728 ldr r0, =0x00003728
adds r1, r0 adds r1, r0
@@ -678,7 +678,7 @@ sub_80990FC: @ 80990FC
lsrs r7, r3, 24 lsrs r7, r3, 24
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r10, r0 mov r10, r0
ldr r5, [r0] ldr r5, [r0]
ldr r1, =0x0000372c ldr r1, =0x0000372c
@@ -727,7 +727,7 @@ sub_8099188: @ 8099188
adds r4, r1, 0 adds r4, r1, 0
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
ldr r5, [r6] ldr r5, [r6]
ldr r0, =0x0000372c ldr r0, =0x0000372c
adds r2, r5, r0 adds r2, r5, r0
@@ -775,7 +775,7 @@ _080991F2:
thumb_func_start sub_80991F8 thumb_func_start sub_80991F8
sub_80991F8: @ 80991F8 sub_80991F8: @ 80991F8
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
ldr r2, =0x0000372c ldr r2, =0x0000372c
adds r1, r0, r2 adds r1, r0, r2
@@ -812,7 +812,7 @@ _0809923E:
thumb_func_start sub_8099244 thumb_func_start sub_8099244
sub_8099244: @ 8099244 sub_8099244: @ 8099244
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
ldr r5, [r6] ldr r5, [r6]
ldr r0, =0x0000372c ldr r0, =0x0000372c
adds r4, r5, r0 adds r4, r5, r0
+6 -6
View File
@@ -106,9 +106,9 @@ _080E1EC0:
ldrb r0, [r4] ldrb r0, [r4]
cmp r0, 0x1 cmp r0, 0x1
bne _080E1EEC bne _080E1EEC
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
bl GetStringLength bl StringLength
adds r0, r5, r0 adds r0, r5, r0
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
@@ -828,10 +828,10 @@ _080E24B0:
adds r3, r7, 0 adds r3, r7, 0
bl Print bl Print
_080E24C6: _080E24C6:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EB183 ldr r1, =gUnknown_085EB183
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
adds r2, r7, 0 adds r2, r7, 0
@@ -1715,7 +1715,7 @@ CreateStartMenu: @ 80E2BAC
movs r1, 0x1 movs r1, 0x1
movs r3, 0x8 movs r3, 0x8
bl Print bl Print
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r2, [r0] ldr r2, [r0]
movs r0, 0x49 movs r0, 0x49
str r0, [sp] str r0, [sp]
@@ -1819,7 +1819,7 @@ display_text_and_get_width_internal: @ 80E2D10
sub sp, 0x40 sub sp, 0x40
adds r1, r0, 0 adds r1, r0, 0
mov r0, sp mov r0, sp
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
mov r1, sp mov r1, sp
movs r2, 0 movs r2, 0
+9 -9
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_80F87D8 thumb_func_start sub_80F87D8
sub_80F87D8: @ 80F87D8 sub_80F87D8: @ 80F87D8
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldr r1, =gUnknown_02039E00 ldr r1, =gUnknown_02039E00
ldrb r3, [r1, 0x15] ldrb r3, [r1, 0x15]
@@ -115,7 +115,7 @@ _080F88A0:
_080F88A4: _080F88A4:
movs r1, 0xC movs r1, 0xC
_080F88A6: _080F88A6:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
lsls r1, 5 lsls r1, 5
adds r0, r1 adds r0, r1
@@ -187,7 +187,7 @@ _080F8934:
sub_80F8940: @ 80F8940 sub_80F8940: @ 80F8940
push {lr} push {lr}
movs r3, 0 movs r3, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00002f98 ldr r2, =0x00002f98
adds r1, r0, r2 adds r1, r0, r2
@@ -349,15 +349,15 @@ _080F8A6E:
lsls r4, r6, 6 lsls r4, r6, 6
mov r0, r10 mov r0, r10
adds r1, r4, r0 adds r1, r4, r0
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
bl CopyString bl StringCopy
ldr r5, =gUnknown_02021DC4 ldr r5, =gStringVar2
mov r0, r10 mov r0, r10
adds r0, 0xB adds r0, 0xB
adds r4, r0 adds r4, r0
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl CopyString bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
bl sub_81DB5AC bl sub_81DB5AC
mov r1, r9 mov r1, r9
@@ -501,7 +501,7 @@ _080F8BBA:
ldr r0, =gUnknown_0858D8EC ldr r0, =gUnknown_0858D8EC
adds r0, r5, r0 adds r0, r5, r0
ldrb r0, [r0] ldrb r0, [r0]
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -1440,7 +1440,7 @@ sub_80F9370: @ 80F9370
bl ItemIdToBerryType bl ItemIdToBerryType
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl GetBerryNameByBerryType bl GetBerryNameByBerryType
_080F9392: _080F9392:
adds r0, r4, 0 adds r0, r4, 0
+52 -52
View File
@@ -40,7 +40,7 @@ _080E8B0A:
sub_80E8B28: @ 80E8B28 sub_80E8B28: @ 80E8B28
push {r4,r5,lr} push {r4,r5,lr}
movs r4, 0 movs r4, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
_080E8B2E: _080E8B2E:
lsls r1, r4, 2 lsls r1, r4, 2
adds r1, r4 adds r1, r4
@@ -89,7 +89,7 @@ _080E8B86:
cmp r3, 0x13 cmp r3, 0x13
bhi _080E8BB0 bhi _080E8BB0
ldr r2, =gUnknown_0203A01C ldr r2, =gUnknown_0203A01C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
lsls r0, r3, 2 lsls r0, r3, 2
adds r0, r3 adds r0, r3
@@ -116,7 +116,7 @@ _080E8BB0:
thumb_func_start sub_80E8BC8 thumb_func_start sub_80E8BC8
sub_80E8BC8: @ 80E8BC8 sub_80E8BC8: @ 80E8BC8
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00001a9c ldr r1, =0x00001a9c
adds r0, r1 adds r0, r1
@@ -439,7 +439,7 @@ sub_80E8E18: @ 80E8E18
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
ldr r0, [r2] ldr r0, [r2]
ldr r1, =gUnknown_0203A01C ldr r1, =gUnknown_0203A01C
ldrb r1, [r1] ldrb r1, [r1]
@@ -448,7 +448,7 @@ sub_80E8E18: @ 80E8E18
strb r1, [r0] strb r1, [r0]
movs r3, 0 movs r3, 0
ldr r5, =0x00001aa5 ldr r5, =0x00001aa5
ldr r4, =gUnknown_03005D90 ldr r4, =gSaveBlock2Ptr
_080E8E32: _080E8E32:
ldr r1, [r2] ldr r1, [r2]
adds r1, r5 adds r1, r5
@@ -466,11 +466,11 @@ _080E8E32:
ldr r0, =0x00004054 ldr r0, =0x00004054
movs r1, 0 movs r1, 0
bl VarSet bl VarSet
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
ldr r4, [r6] ldr r4, [r6]
ldr r0, =0x00001a9e ldr r0, =0x00001a9e
adds r4, r0 adds r4, r0
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
mov r8, r1 mov r8, r1
ldr r5, [r1] ldr r5, [r1]
adds r0, r5, 0 adds r0, r5, 0
@@ -480,7 +480,7 @@ _080E8E32:
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl CopyString_LimitN bl StringCopyN
ldr r3, [r6] ldr r3, [r6]
mov r1, r8 mov r1, r8
ldr r0, [r1] ldr r0, [r1]
@@ -536,7 +536,7 @@ _080E8EEE:
cmp r0, 0x8 cmp r0, 0x8
bne _080E8F82 bne _080E8F82
movs r4, 0 movs r4, 0
ldr r7, =gUnknown_03005D8C ldr r7, =gSaveBlock1Ptr
_080E8F0A: _080E8F0A:
ldr r1, [r7] ldr r1, [r7]
lsls r0, r4, 2 lsls r0, r4, 2
@@ -670,7 +670,7 @@ _080E900C:
bl VarGet bl VarGet
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
@@ -709,7 +709,7 @@ sub_80E9068: @ 80E9068
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl fade_screen
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x4 movs r1, 0x4
ldrsb r1, [r0, r1] ldrsb r1, [r0, r1]
@@ -837,7 +837,7 @@ sub_80E916C: @ 80E916C
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0xA movs r1, 0xA
bl __udivsi3 bl __udivsi3
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
movs r5, 0x4 movs r5, 0x4
ldrsb r5, [r1, r5] ldrsb r5, [r1, r5]
@@ -895,7 +895,7 @@ sub_80E91F8: @ 80E91F8
thumb_func_start CurrentMapIsSecretBase thumb_func_start CurrentMapIsSecretBase
CurrentMapIsSecretBase: @ 80E9214 CurrentMapIsSecretBase: @ 80E9214
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x4 movs r0, 0x4
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
@@ -931,7 +931,7 @@ sub_80E9238: @ 80E9238
bl VarGet bl VarGet
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r5 adds r0, r5
lsls r0, 5 lsls r0, 5
@@ -1044,7 +1044,7 @@ sub_80E933C: @ 80E933C
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080E9374 bne _080E9374
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x0000271c ldr r1, =0x0000271c
adds r1, r0, r1 adds r1, r0, r1
@@ -1061,7 +1061,7 @@ _080E9374:
bl VarGet bl VarGet
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r2, =gUnknown_03005D8C ldr r2, =gSaveBlock1Ptr
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
lsls r1, 5 lsls r1, 5
@@ -1210,7 +1210,7 @@ _080E9462:
lsrs r0, 16 lsrs r0, 16
bl FlagReset bl FlagReset
ldrb r0, [r6] ldrb r0, [r6]
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r2, [r5] ldr r2, [r5]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -1315,7 +1315,7 @@ _080E9588:
cmp r0, 0xD cmp r0, 0xD
bhi _080E95B6 bhi _080E95B6
ldrb r0, [r1] ldrb r0, [r1]
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -1518,7 +1518,7 @@ sub_80E9728: @ 80E9728
thumb_func_start sub_80E9744 thumb_func_start sub_80E9744
sub_80E9744: @ 80E9744 sub_80E9744: @ 80E9744
push {lr} push {lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00001a9c ldr r1, =0x00001a9c
adds r0, r1 adds r0, r1
@@ -1549,7 +1549,7 @@ sub_80E9780: @ 80E9780
adds r6, r0, 0 adds r6, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
mov r8, r0 mov r8, r0
lsls r5, r1, 2 lsls r5, r1, 2
adds r5, r1 adds r5, r1
@@ -1565,7 +1565,7 @@ sub_80E9780: @ 80E9780
lsrs r2, 24 lsrs r2, 24
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
bl CopyString_LimitN bl StringCopyN
movs r1, 0xFF movs r1, 0xFF
strb r1, [r0] strb r1, [r0]
mov r1, r8 mov r1, r8
@@ -1575,10 +1575,10 @@ sub_80E9780: @ 80E9780
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
ldr r1, =gUnknown_085EA72F ldr r1, =gUnknown_085EA72F
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
pop {r4-r6} pop {r4-r6}
@@ -1613,7 +1613,7 @@ sub_80E980C: @ 80E980C
bl VarGet bl VarGet
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
mov r8, r1 mov r8, r1
lsls r5, r0, 2 lsls r5, r0, 2
adds r5, r0 adds r5, r0
@@ -1622,7 +1622,7 @@ sub_80E980C: @ 80E980C
adds r4, r5, r4 adds r4, r5, r4
ldr r0, =0x00001a9e ldr r0, =0x00001a9e
adds r4, r0 adds r4, r0
ldr r6, =gUnknown_02021CC4 ldr r6, =gStringVar1
adds r0, r4, 0 adds r0, r4, 0
bl sub_80E8DF4 bl sub_80E8DF4
adds r2, r0, 0 adds r2, r0, 0
@@ -1630,7 +1630,7 @@ sub_80E980C: @ 80E980C
lsrs r2, 24 lsrs r2, 24
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
bl CopyString_LimitN bl StringCopyN
movs r1, 0xFF movs r1, 0xFF
strb r1, [r0] strb r1, [r0]
mov r1, r8 mov r1, r8
@@ -1640,7 +1640,7 @@ sub_80E980C: @ 80E980C
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
pop {r4-r6} pop {r4-r6}
@@ -1654,7 +1654,7 @@ sub_80E9878: @ 80E9878
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
@@ -1735,7 +1735,7 @@ sub_80E9914: @ 80E9914
sub sp, 0x24 sub sp, 0x24
movs r0, 0 movs r0, 0
mov r10, r0 mov r10, r0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r2, =0x00001ad0 ldr r2, =0x00001ad0
adds r2, r1, r2 adds r2, r1, r2
@@ -1905,7 +1905,7 @@ _080E9A60:
thumb_func_start sub_80E9A90 thumb_func_start sub_80E9A90
sub_80E9A90: @ 80E9A90 sub_80E9A90: @ 80E9A90
push {r4-r6,lr} push {r4-r6,lr}
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r0, [r5] ldr r0, [r5]
ldr r4, =0x00001aaa ldr r4, =0x00001aaa
adds r1, r0, r4 adds r1, r0, r4
@@ -1951,7 +1951,7 @@ _080E9AE0:
adds r7, r1, 0 adds r7, r1, 0
cmp r0, 0x8 cmp r0, 0x8
bne _080E9B5C bne _080E9B5C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00001a9c ldr r1, =0x00001a9c
adds r0, r1 adds r0, r1
@@ -2019,7 +2019,7 @@ sub_80E9B70: @ 80E9B70
bl sub_80E9AD0 bl sub_80E9AD0
movs r0, 0x14 movs r0, 0x14
bl sav12_xor_increment bl sav12_xor_increment
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r0, [r5] ldr r0, [r5]
ldr r4, =0x00001aaa ldr r4, =0x00001aaa
adds r1, r0, r4 adds r1, r0, r4
@@ -2109,7 +2109,7 @@ sub_80E9C2C: @ 80E9C2C
push {lr} push {lr}
ldr r0, =0x00004054 ldr r0, =0x00004054
bl VarGet bl VarGet
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -2579,13 +2579,13 @@ sub_80E9FFC: @ 80E9FFC
bl RemoveWindow bl RemoveWindow
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldrb r1, [r4, 0x8] ldrb r1, [r4, 0x8]
bl sub_80E9780 bl sub_80E9780
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA737 ldr r1, =gUnknown_085EA737
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r2, =sub_80EA06C ldr r2, =sub_80EA06C
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -2639,7 +2639,7 @@ sub_80EA08C: @ 80EA08C
mov r1, r9 mov r1, r9
mov r2, r10 mov r2, r10
bl sub_81AE6C8 bl sub_81AE6C8
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
movs r0, 0x8 movs r0, 0x8
ldrsh r1, [r6, r0] ldrsh r1, [r6, r0]
@@ -2790,7 +2790,7 @@ sub_80EA20C: @ 80EA20C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r4, [r1] ldr r4, [r1]
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
@@ -2912,7 +2912,7 @@ sub_80EA30C: @ 80EA30C
push {lr} push {lr}
ldr r0, =0x00004054 ldr r0, =0x00004054
bl VarGet bl VarGet
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r3, [r1] ldr r3, [r1]
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -2951,7 +2951,7 @@ sub_80EA354: @ 80EA354
cmp r0, 0 cmp r0, 0
bne _080EA39A bne _080EA39A
movs r3, 0 movs r3, 0
ldr r7, =gUnknown_03005D8C ldr r7, =gSaveBlock1Ptr
ldr r4, =0x00001a9d ldr r4, =0x00001a9d
movs r6, 0x21 movs r6, 0x21
negs r6, r6 negs r6, r6
@@ -2982,7 +2982,7 @@ _080EA39A:
lsrs r0, 24 lsrs r0, 24
strh r0, [r4] strh r0, [r4]
ldr r2, =gUnknown_020375F0 ldr r2, =gUnknown_020375F0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r5 adds r0, r5
@@ -3499,7 +3499,7 @@ sub_80EA828: @ 80EA828
mov r8, r3 mov r8, r3
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
ldr r0, [r6] ldr r0, [r6]
lsls r2, r5, 2 lsls r2, r5, 2
adds r2, r5 adds r2, r5
@@ -3555,7 +3555,7 @@ _080EA892:
_080EA8A0: _080EA8A0:
cmp r3, 0x5 cmp r3, 0x5
ble _080EA8B8 ble _080EA8B8
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r5 adds r0, r5
@@ -3691,7 +3691,7 @@ sub_80EA990: @ 80EA990
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
movs r1, 0 movs r1, 0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r2, [r0] ldr r2, [r0]
ldr r4, =0x00001a9c ldr r4, =0x00001a9c
_080EA99E: _080EA99E:
@@ -3727,7 +3727,7 @@ _080EA9D0:
sub_80EA9D8: @ 80EA9D8 sub_80EA9D8: @ 80EA9D8
push {r4,lr} push {r4,lr}
movs r2, 0x1 movs r2, 0x1
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r3, [r0] ldr r3, [r0]
ldr r4, =0x00001a9c ldr r4, =0x00001a9c
_080EA9E2: _080EA9E2:
@@ -3763,7 +3763,7 @@ _080EAA12:
sub_80EAA18: @ 80EAA18 sub_80EAA18: @ 80EAA18
push {r4,lr} push {r4,lr}
movs r3, 0x1 movs r3, 0x1
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r4, [r0] ldr r4, [r0]
_080EAA20: _080EAA20:
lsls r2, r3, 16 lsls r2, r3, 16
@@ -3820,7 +3820,7 @@ sub_80EAA64: @ 80EAA64
negs r0, r0 negs r0, r0
cmp r2, r0 cmp r2, r0
beq _080EAAC4 beq _080EAAC4
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
lsls r0, r2, 2 lsls r0, r2, 2
adds r0, r2 adds r0, r2
@@ -3880,7 +3880,7 @@ sub_80EAAF4: @ 80EAAF4
mov r6, r8 mov r6, r8
push {r6,r7} push {r6,r7}
sub sp, 0xA0 sub sp, 0xA0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00001a9c ldr r1, =0x00001a9c
adds r7, r0, r1 adds r7, r0, r1
@@ -4006,7 +4006,7 @@ sub_80EABDC: @ 80EABDC
beq _080EABF8 beq _080EABF8
ldrb r0, [r5, 0x1] ldrb r0, [r5, 0x1]
lsls r0, 27 lsls r0, 27
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r3, [r1] ldr r3, [r1]
lsrs r0, 31 lsrs r0, 31
adds r6, r1, 0 adds r6, r1, 0
@@ -4429,7 +4429,7 @@ sub_80EAEF4: @ 80EAEF4
ldr r1, [r4, 0xC] ldr r1, [r4, 0xC]
ldr r2, [r4, 0x18] ldr r2, [r4, 0x18]
bl sub_80EAC5C bl sub_80EAC5C
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00001a9c ldr r1, =0x00001a9c
adds r0, r1 adds r0, r1
@@ -4657,7 +4657,7 @@ _080EB0D4:
mov r0, sp mov r0, sp
bl sub_80EAEF4 bl sub_80EAEF4
movs r3, 0x1 movs r3, 0x1
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
movs r7, 0x10 movs r7, 0x10
negs r7, r7 negs r7, r7
_080EB0E2: _080EB0E2:
@@ -4693,7 +4693,7 @@ _080EB112:
bls _080EB0E2 bls _080EB0E2
bl sub_80EAAF4 bl sub_80EAAF4
movs r3, 0x1 movs r3, 0x1
ldr r7, =gUnknown_03005D8C ldr r7, =gSaveBlock1Ptr
adds r6, r7, 0 adds r6, r7, 0
adds r4, r5, 0 adds r4, r5, 0
movs r5, 0x3F movs r5, 0x3F
+37 -37
View File
@@ -590,7 +590,7 @@ _080DFF78:
ldr r0, [r4] ldr r0, [r4]
adds r0, r5 adds r0, r5
ldr r1, =gUnknown_085E8CF7 ldr r1, =gUnknown_085E8CF7
bl CopyString bl StringCopy
ldr r2, =gUnknown_02039F74 ldr r2, =gUnknown_02039F74
ldr r0, [r2] ldr r0, [r2]
lsls r1, r6, 3 lsls r1, r6, 3
@@ -660,7 +660,7 @@ _080E0020:
ldr r0, =gUnknown_085A5C09 ldr r0, =gUnknown_085A5C09
adds r1, r0 adds r1, r0
adds r0, r5, 0 adds r0, r5, 0
bl CopyString bl StringCopy
_080E002C: _080E002C:
str r5, [r6] str r5, [r6]
str r4, [r6, 0x4] str r4, [r6, 0x4]
@@ -787,7 +787,7 @@ BuyMenuPrintPriceInList: @ 80E0114
ldrb r0, [r0, 0xF] ldrb r0, [r0, 0xF]
cmp r0, 0 cmp r0, 0
bne _080E0164 bne _080E0164
ldr r5, =gUnknown_02021CC4 ldr r5, =gStringVar1
lsls r0, r1, 16 lsls r0, r1, 16
lsrs r0, 16 lsrs r0, 16
bl itemid_get_market_price bl itemid_get_market_price
@@ -803,23 +803,23 @@ BuyMenuPrintPriceInList: @ 80E0114
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
b _080E0176 b _080E0176
.pool .pool
_080E0164: _080E0164:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r2, =gUnknown_085A5C08 ldr r2, =gUnknown_085A5C08
lsls r1, 5 lsls r1, 5
adds r1, r2 adds r1, r2
ldrh r1, [r1, 0x14] ldrh r1, [r1, 0x14]
movs r2, 0 movs r2, 0
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
_080E0176: _080E0176:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E969C ldr r1, =gUnknown_085E969C
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0x7 movs r0, 0x7
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x78 movs r2, 0x78
@@ -1249,7 +1249,7 @@ BuyMenuDrawGraphics: @ 80E0524
movs r0, 0x13 movs r0, 0x13
movs r1, 0xB movs r1, 0xB
bl AddMoneyLabelObject bl AddMoneyLabelObject
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -2044,7 +2044,7 @@ _080E0B80:
ldrh r0, [r0, 0x14] ldrh r0, [r0, 0x14]
str r0, [r1] str r0, [r1]
_080E0B92: _080E0B92:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -2071,7 +2071,7 @@ _080E0BD0:
bne _080E0C38 bne _080E0C38
lsls r0, r5, 16 lsls r0, r5, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
adds r0, r5, 0 adds r0, r5, 0
bl itemid_get_name bl itemid_get_name
adds r0, r5, 0 adds r0, r5, 0
@@ -2080,7 +2080,7 @@ _080E0BD0:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x3 cmp r0, 0x3
bne _080E0C24 bne _080E0C24
ldr r4, =gUnknown_02021DC4 ldr r4, =gStringVar2
adds r0, r5, 0 adds r0, r5, 0
bl ItemIdToBattleMoveId bl ItemIdToBattleMoveId
lsls r0, 16 lsls r0, 16
@@ -2090,7 +2090,7 @@ _080E0BD0:
ldr r0, =gMoveNames ldr r0, =gMoveNames
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
ldr r1, =gUnknown_085E9417 ldr r1, =gUnknown_085E9417
b _080E0C26 b _080E0C26
.pool .pool
@@ -2104,33 +2104,33 @@ _080E0C28:
b _080E0C8E b _080E0C8E
.pool .pool
_080E0C38: _080E0C38:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
lsls r1, r5, 5 lsls r1, r5, 5
ldr r2, =gUnknown_085A5C09 ldr r2, =gUnknown_085A5C09
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
mov r3, r8 mov r3, r8
ldr r1, [r3] ldr r1, [r3]
adds r1, r7 adds r1, r7
ldr r1, [r1] ldr r1, [r1]
movs r2, 0 movs r2, 0
movs r3, 0x6 movs r3, 0x6
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldrb r0, [r4, 0xF] ldrb r0, [r4, 0xF]
cmp r0, 0x1 cmp r0, 0x1
bne _080E0C7C bne _080E0C7C
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9468 ldr r1, =gUnknown_085E9468
bl ExpandStringRefs bl StringExpandPlaceholders
b _080E0C84 b _080E0C84
.pool .pool
_080E0C7C: _080E0C7C:
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9493 ldr r1, =gUnknown_085E9493
bl ExpandStringRefs bl StringExpandPlaceholders
_080E0C84: _080E0C84:
ldr r1, =gUnknown_02021FC4 ldr r1, =gStringVar4
ldr r2, =BuyMenuConfirmPurchase ldr r2, =BuyMenuConfirmPurchase
adds r0, r6, 0 adds r0, r6, 0
bl BuyMenuDisplayMessage bl BuyMenuDisplayMessage
@@ -2165,15 +2165,15 @@ Task_BuyHowManyDialogueInit: @ 80E0CA4
movs r2, 0x1 movs r2, 0x1
movs r3, 0xD movs r3, 0xD
bl SetWindowBorderStyle bl SetWindowBorderStyle
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x1 movs r2, 0x1
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E93D5 ldr r1, =gUnknown_085E93D5
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
str r0, [sp, 0x4] str r0, [sp, 0x4]
@@ -2193,7 +2193,7 @@ Task_BuyHowManyDialogueInit: @ 80E0CA4
bl BuyMenuPrintItemQuantityAndPrice bl BuyMenuPrintItemQuantityAndPrice
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -2302,15 +2302,15 @@ _080E0DF0:
movs r0, 0x1 movs r0, 0x1
bl PutWindowTilemap bl PutWindowTilemap
ldrh r0, [r5, 0xA] ldrh r0, [r5, 0xA]
ldr r1, =gUnknown_02021CC4 ldr r1, =gStringVar1
bl itemid_get_name bl itemid_get_name
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
movs r2, 0x2 movs r2, 0x2
ldrsh r1, [r5, r2] ldrsh r1, [r5, r2]
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldr r1, [r7] ldr r1, [r7]
movs r2, 0x80 movs r2, 0x80
lsls r2, 6 lsls r2, 6
@@ -2318,7 +2318,7 @@ _080E0DF0:
ldr r1, [r1] ldr r1, [r1]
movs r2, 0 movs r2, 0
movs r3, 0x6 movs r3, 0x6
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085E943F ldr r1, =gUnknown_085E943F
ldr r2, =BuyMenuConfirmPurchase ldr r2, =BuyMenuConfirmPurchase
adds r0, r6, 0 adds r0, r6, 0
@@ -2454,7 +2454,7 @@ BuyMenuSubtractMoney: @ 80E0F88
lsrs r6, r0, 24 lsrs r6, r0, 24
movs r0, 0x26 movs r0, 0x26
bl sav12_xor_increment bl sav12_xor_increment
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r0, [r5] ldr r0, [r5]
movs r4, 0x92 movs r4, 0x92
lsls r4, 3 lsls r4, 3
@@ -2635,16 +2635,16 @@ BuyMenuPrintItemQuantityAndPrice: @ 80E10EC
movs r1, 0x26 movs r1, 0x26
movs r2, 0x1 movs r2, 0x1
bl PrintMoneyAmount bl PrintMoneyAmount
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
movs r2, 0x2 movs r2, 0x2
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gUnknown_085E8DA0
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
str r0, [sp, 0x4] str r0, [sp, 0x4]
+16 -16
View File
@@ -259,16 +259,16 @@ sub_809F654: @ 809F654
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_81973FC bl sub_81973FC
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r1, =gUnknown_0203A04C ldr r1, =gUnknown_0203A04C
ldrb r1, [r1] ldrb r1, [r1]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085EE6FF ldr r1, =gUnknown_085EE6FF
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
str r1, [sp] str r1, [sp]
@@ -294,7 +294,7 @@ sub_809F654: @ 809F654
sub_809F6C8: @ 809F6C8 sub_809F6C8: @ 809F6C8
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0xC sub sp, 0xC
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00000cb2 ldr r1, =0x00000cb2
adds r0, r1 adds r0, r1
@@ -317,9 +317,9 @@ _0809F6F4:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_81973FC bl sub_81973FC
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r2, =gUnknown_08510510 ldr r2, =gUnknown_08510510
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r1, [r1] ldr r1, [r1]
ldr r3, =0x00000cb2 ldr r3, =0x00000cb2
adds r1, r3 adds r1, r3
@@ -327,11 +327,11 @@ _0809F6F4:
lsls r1, 2 lsls r1, 2
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085EE716 ldr r1, =gUnknown_085EE716
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
str r1, [sp] str r1, [sp]
@@ -399,7 +399,7 @@ PrintStartMenuActions: @ 809F7C0
ldrb r2, [r0] ldrb r2, [r0]
ldr r0, =gUnknown_08510540 ldr r0, =gUnknown_08510540
mov r9, r0 mov r9, r0
ldr r1, =gUnknown_02021FC4 ldr r1, =gStringVar4
mov r10, r1 mov r10, r1
_0809F7DA: _0809F7DA:
ldr r0, =gUnknown_02037610 ldr r0, =gUnknown_02037610
@@ -436,7 +436,7 @@ _0809F828:
adds r0, r3, r1 adds r0, r3, r1
ldr r1, [r0] ldr r1, [r0]
mov r0, r10 mov r0, r10
bl ExpandStringRefs bl StringExpandPlaceholders
bl get_start_menu_window_id_maybe bl get_start_menu_window_id_maybe
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1317,9 +1317,9 @@ sub_809FF98: @ 809FF98
push {r4,lr} push {r4,lr}
adds r2, r0, 0 adds r2, r0, 0
adds r4, r1, 0 adds r4, r1, 0
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
adds r1, r2, 0 adds r1, r2, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_819786C bl sub_819786C
@@ -2213,7 +2213,7 @@ _080A06EC:
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0 movs r1, 0
bl sub_81973FC bl sub_81973FC
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
movs r1, 0x4 movs r1, 0x4
@@ -2224,7 +2224,7 @@ _080A06EC:
mov r9, r0 mov r9, r0
_080A0710: _080A0710:
movs r4, 0x1 movs r4, 0x1
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
movs r0, 0x3 movs r0, 0x3
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x6 movs r2, 0x6
+27 -1031
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -3417,15 +3417,15 @@ _08005F8A:
beq _08005FA0 beq _08005FA0
b _08005F02 b _08005F02
_08005F90: _08005F90:
ldr r6, =gUnknown_02021CC4 ldr r6, =gStringVar1
b _08005FA2 b _08005FA2
.pool .pool
_08005F98: _08005F98:
ldr r6, =gUnknown_02021DC4 ldr r6, =gStringVar2
b _08005FA2 b _08005FA2
.pool .pool
_08005FA0: _08005FA0:
ldr r6, =gUnknown_02021EC4 ldr r6, =gStringVar3
_08005FA2: _08005FA2:
cmp r6, 0 cmp r6, 0
bne _08005FE0 bne _08005FE0
+2 -2
View File
@@ -125,7 +125,7 @@ sub_809882C: @ 809882C
lsrs r4, 16 lsrs r4, 16
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r1, [r1] ldr r1, [r1]
ldrb r1, [r1, 0x14] ldrb r1, [r1, 0x14]
lsrs r1, 3 lsrs r1, 3
@@ -659,7 +659,7 @@ sub_8098C6C: @ 8098C6C
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r2, =gUnknown_0851021C ldr r2, =gUnknown_0851021C
ldr r5, =gUnknown_03005D90 ldr r5, =gSaveBlock2Ptr
ldr r1, [r5] ldr r1, [r5]
ldrb r1, [r1, 0x14] ldrb r1, [r1, 0x14]
lsrs r1, 3 lsrs r1, 3
+63 -63
View File
@@ -753,7 +753,7 @@ _08077810:
b _08077B22 b _08077B22
.pool .pool
_08077834: _08077834:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r5, =gUnknown_02032188 ldr r5, =gUnknown_02032188
ldr r1, [r5] ldr r1, [r5]
@@ -813,7 +813,7 @@ _080778BC:
_080778C8: _080778C8:
b _08077B1A b _08077B1A
_080778CA: _080778CA:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x1 movs r0, 0x1
movs r2, 0x78 movs r2, 0x78
@@ -1371,7 +1371,7 @@ _08077DD8:
b _080780D8 b _080780D8
.pool .pool
_08077DFC: _08077DFC:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r5, =gUnknown_02032188 ldr r5, =gUnknown_02032188
ldr r1, [r5] ldr r1, [r5]
@@ -1437,7 +1437,7 @@ _08077E90:
b _080780D8 b _080780D8
.pool .pool
_08077EA0: _08077EA0:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x1 movs r0, 0x1
movs r2, 0x78 movs r2, 0x78
@@ -2287,7 +2287,7 @@ _0807861A:
.pool .pool
_08078644: _08078644:
ldr r0, =gUnknown_020228C4 ldr r0, =gUnknown_020228C4
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
ldr r2, =0x00002be0 ldr r2, =0x00002be0
adds r1, r2 adds r1, r2
@@ -2329,7 +2329,7 @@ _0807868A:
.pool .pool
_080786B4: _080786B4:
ldr r0, =gUnknown_020228C4 ldr r0, =gUnknown_020228C4
ldr r1, =gUnknown_03005D8C ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
ldr r2, =0x000031a8 ldr r2, =0x000031a8
adds r1, r2 adds r1, r2
@@ -2393,7 +2393,7 @@ _08078726:
bl pokemon_getattr bl pokemon_getattr
mov r0, sp mov r0, sp
ldr r1, =gUnknown_0832DF94 ldr r1, =gUnknown_0832DF94
bl CompareStringWithoutExtendedControlCodes bl StringCompareWithoutExtCtrlCodes
cmp r0, 0 cmp r0, 0
bne _08078766 bne _08078766
adds r0, r4, 0 adds r0, r4, 0
@@ -4693,7 +4693,7 @@ _08079A64:
_08079A74: _08079A74:
adds r0, r4, 0 adds r0, r4, 0
mov r1, sp mov r1, sp
bl CopyString_Limit10 bl StringCopy10
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
bl GetFontAttribute bl GetFontAttribute
@@ -4769,7 +4769,7 @@ _08079AFE:
bls _08079ADE bls _08079ADE
ldr r1, =gUnknown_0832DABC ldr r1, =gUnknown_0832DABC
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
movs r4, 0 movs r4, 0
_08079B20: _08079B20:
lsls r0, r4, 1 lsls r0, r4, 1
@@ -4784,11 +4784,11 @@ _08079B20:
ldr r0, =gMoveNames ldr r0, =gMoveNames
adds r1, r0 adds r1, r0
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
_08079B3C: _08079B3C:
adds r0, r6, 0 adds r0, r6, 0
ldr r1, =gUnknown_0832DAD2 ldr r1, =gUnknown_0832DAD2
bl AppendString bl StringAppend
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -4799,10 +4799,10 @@ _08079B3C:
_08079B5C: _08079B5C:
ldr r1, =gUnknown_0832DABC ldr r1, =gUnknown_0832DABC
adds r0, r6, 0 adds r0, r6, 0
bl CopyString bl StringCopy
ldr r1, =gUnknown_0832DADF ldr r1, =gUnknown_0832DADF
adds r0, r6, 0 adds r0, r6, 0
bl AppendString bl StringAppend
_08079B6C: _08079B6C:
add sp, 0x8 add sp, 0x8
pop {r3,r4} pop {r3,r4}
@@ -4888,7 +4888,7 @@ _08079C02:
bl pokemon_getattr bl pokemon_getattr
adds r0, r5, 0 adds r0, r5, 0
mov r1, sp mov r1, sp
bl CopyString_Limit10 bl StringCopy10
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
@@ -6081,7 +6081,7 @@ _0807A596:
sub_807A5B0: @ 807A5B0 sub_807A5B0: @ 807A5B0
push {r4,r5,lr} push {r4,r5,lr}
movs r3, 0 movs r3, 0
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r4, =0x000031a8 ldr r4, =0x000031a8
_0807A5B8: _0807A5B8:
ldr r0, [r5] ldr r0, [r5]
@@ -7701,10 +7701,10 @@ _0807B2D0:
movs r0, 0x6 movs r0, 0x6
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
ldr r4, =gUnknown_020229F0 ldr r4, =gUnknown_020229F0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
ldr r5, =gUnknown_02024744 ldr r5, =gUnknown_02024744
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x7 movs r1, 0x7
@@ -7713,7 +7713,7 @@ _0807B2D0:
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x1C adds r0, 0x1C
mov r1, sp mov r1, sp
bl CopyString bl StringCopy
subs r4, 0x8 subs r4, 0x8
movs r0, 0 movs r0, 0
mov r8, r0 mov r8, r0
@@ -7940,7 +7940,7 @@ sub_807B4D0: @ 807B4D0
mov r8, r0 mov r8, r0
cmp r6, 0xFF cmp r6, 0xFF
beq _0807B52A beq _0807B52A
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
lsls r1, r6, 3 lsls r1, r6, 3
adds r1, r6 adds r1, r6
lsls r1, 2 lsls r1, 2
@@ -8523,7 +8523,7 @@ sub_807BAD8: @ 807BAD8
beq _0807BB68 beq _0807BB68
bl link_get_multiplayer_id bl link_get_multiplayer_id
lsls r0, 24 lsls r0, 24
ldr r3, =gUnknown_02021CC4 ldr r3, =gStringVar1
movs r2, 0x80 movs r2, 0x80
lsls r2, 17 lsls r2, 17
eors r2, r0 eors r2, r0
@@ -8534,7 +8534,7 @@ sub_807BAD8: @ 807BAD8
ldr r0, =gUnknown_020229F0 ldr r0, =gUnknown_020229F0
adds r1, r0 adds r1, r0
adds r0, r3, 0 adds r0, r3, 0
bl CopyString bl StringCopy
ldr r5, =gUnknown_02032298 ldr r5, =gUnknown_02032298
ldrb r0, [r5, 0x1] ldrb r0, [r5, 0x1]
movs r1, 0x6 movs r1, 0x6
@@ -8548,9 +8548,9 @@ sub_807BAD8: @ 807BAD8
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
mov r1, sp mov r1, sp
bl CopyString_Limit10 bl StringCopy10
ldrb r0, [r5] ldrb r0, [r5]
muls r0, r4 muls r0, r4
ldr r1, =gUnknown_020244EC ldr r1, =gUnknown_020244EC
@@ -8558,9 +8558,9 @@ sub_807BAD8: @ 807BAD8
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
mov r1, sp mov r1, sp
bl CopyString_Limit10 bl StringCopy10
b _0807BBA4 b _0807BBA4
.pool .pool
_0807BB68: _0807BB68:
@@ -8571,13 +8571,13 @@ _0807BB68:
lsls r4, 2 lsls r4, 2
ldr r0, =gUnknown_08338ED0 ldr r0, =gUnknown_08338ED0
adds r4, r0 adds r4, r0
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x2B adds r1, 0x2B
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
adds r1, r4, 0 adds r1, r4, 0
bl CopyString_Limit10 bl StringCopy10
ldr r0, =gUnknown_020375E2 ldr r0, =gUnknown_020375E2
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
@@ -8587,9 +8587,9 @@ _0807BB68:
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
mov r1, sp mov r1, sp
bl CopyString_Limit10 bl StringCopy10
_0807BBA4: _0807BBA4:
add sp, 0x14 add sp, 0x14
pop {r4,r5} pop {r4,r5}
@@ -9003,10 +9003,10 @@ _0807C0F8:
bl _0807CFB4 bl _0807CFB4
.pool .pool
_0807C120: _0807C120:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE942 ldr r1, =gUnknown_085EE942
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -9069,10 +9069,10 @@ _0807C178:
ldrh r0, [r1] ldrh r0, [r1]
adds r0, 0x1 adds r0, 0x1
strh r0, [r1] strh r0, [r1]
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE959 ldr r1, =gUnknown_085EE959
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -10470,10 +10470,10 @@ _0807CDDC:
lsls r1, 5 lsls r1, 5
movs r0, 0 movs r0, 0
bl SetGpuReg bl SetGpuReg
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE966 ldr r1, =gUnknown_085EE966
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -10541,10 +10541,10 @@ _0807CE70:
adds r0, 0x1 adds r0, 0x1
movs r5, 0 movs r5, 0
strh r0, [r1] strh r0, [r1]
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE977 ldr r1, =gUnknown_085EE977
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -11065,10 +11065,10 @@ _0807D4D4:
bl _0807E400 bl _0807E400
.pool .pool
_0807D4FC: _0807D4FC:
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE942 ldr r1, =gUnknown_085EE942
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -11131,10 +11131,10 @@ _0807D554:
ldrh r0, [r1] ldrh r0, [r1]
adds r0, 0x1 adds r0, 0x1
strh r0, [r1] strh r0, [r1]
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE959 ldr r1, =gUnknown_085EE959
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -12575,10 +12575,10 @@ _0807E228:
lsls r1, 5 lsls r1, 5
movs r0, 0 movs r0, 0
bl SetGpuReg bl SetGpuReg
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE966 ldr r1, =gUnknown_085EE966
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -12646,10 +12646,10 @@ _0807E2BC:
adds r0, 0x1 adds r0, 0x1
movs r5, 0 movs r5, 0
strh r0, [r1] strh r0, [r1]
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE977 ldr r1, =gUnknown_085EE977
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -13184,18 +13184,18 @@ sub_807E73C: @ 807E73C
lsls r4, 2 lsls r4, 2
ldr r0, =gUnknown_08338ED0 ldr r0, =gUnknown_08338ED0
adds r4, r0 adds r4, r0
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldrh r1, [r4, 0x38] ldrh r1, [r4, 0x38]
movs r6, 0xB movs r6, 0xB
muls r1, r6 muls r1, r6
ldr r5, =gSpeciesNames ldr r5, =gSpeciesNames
adds r1, r5 adds r1, r5
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldrh r1, [r4, 0xC] ldrh r1, [r4, 0xC]
muls r1, r6 muls r1, r6
adds r1, r5 adds r1, r5
bl CopyString bl StringCopy
ldrh r0, [r4, 0x38] ldrh r0, [r4, 0x38]
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
@@ -13223,16 +13223,16 @@ sub_807E784: @ 807E784
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
bl pokemon_getattr bl pokemon_getattr
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
mov r1, sp mov r1, sp
bl CopyString_Limit10 bl StringCopy10
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldrh r2, [r4, 0xC] ldrh r2, [r4, 0xC]
movs r1, 0xB movs r1, 0xB
muls r1, r2 muls r1, r2
ldr r2, =gSpeciesNames ldr r2, =gSpeciesNames
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
add sp, 0x20 add sp, 0x20
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -13437,7 +13437,7 @@ _0807E98E:
adds r1, r6, 0 adds r1, r6, 0
adds r1, 0x2B adds r1, 0x2B
adds r0, r4, 0 adds r0, r4, 0
bl CopyString bl StringCopy
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_81DB4DC bl sub_81DB4DC
@@ -13750,7 +13750,7 @@ _0807ED10:
ldrb r0, [r1] ldrb r0, [r1]
adds r0, 0x1 adds r0, 0x1
strb r0, [r1] strb r0, [r1]
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EF6D2 ldr r1, =gUnknown_085EF6D2
b _0807EDA6 b _0807EDA6
.pool .pool
@@ -13813,11 +13813,11 @@ _0807ED98:
adds r1, r2, r0 adds r1, r2, r0
movs r0, 0x32 movs r0, 0x32
strb r0, [r1] strb r0, [r1]
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_082C8959 ldr r1, =gUnknown_082C8959
_0807EDA6: _0807EDA6:
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -14633,10 +14633,10 @@ _0807F4C0:
adds r1, r2, r0 adds r1, r2, r0
movs r0, 0x1 movs r0, 0x1
strb r0, [r1] strb r0, [r1]
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085EF6D2 ldr r1, =gUnknown_085EF6D2
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -14667,10 +14667,10 @@ _0807F50A:
movs r5, 0 movs r5, 0
movs r1, 0x3 movs r1, 0x3
strb r1, [r0] strb r1, [r0]
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_082C8959 ldr r1, =gUnknown_082C8959
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
+17 -17
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_81339F8 thumb_func_start sub_81339F8
sub_81339F8: @ 81339F8 sub_81339F8: @ 81339F8
push {r4-r6,lr} push {r4-r6,lr}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =0x00002e28 ldr r0, =0x00002e28
adds r5, r1, r0 adds r5, r1, r0
@@ -28,7 +28,7 @@ _08133A12:
lsls r1, r4, 2 lsls r1, r4, 2
adds r1, r6 adds r1, r6
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
adds r1, r5, 0x1 adds r1, r5, 0x1
adds r1, r4 adds r1, r4
ldr r0, =gUnknown_085B09F4 ldr r0, =gUnknown_085B09F4
@@ -53,7 +53,7 @@ _08133A12:
thumb_func_start sub_8133A60 thumb_func_start sub_8133A60
sub_8133A60: @ 8133A60 sub_8133A60: @ 8133A60
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002e59 ldr r1, =0x00002e59
adds r0, r1 adds r0, r1
@@ -77,7 +77,7 @@ sub_8133A78: @ 8133A78
lsls r1, 3 lsls r1, 3
ldr r0, =gTasks + 0x8 ldr r0, =gTasks + 0x8
adds r7, r1, r0 adds r7, r1, r0
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r4, [r0] ldr r4, [r0]
ldr r0, =0x00002e28 ldr r0, =0x00002e28
adds r0, r4 adds r0, r4
@@ -269,7 +269,7 @@ sub_8133C48: @ 8133C48
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00002e28 ldr r1, =0x00002e28
adds r6, r0, r1 adds r6, r0, r1
@@ -305,20 +305,20 @@ _08133C90:
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
strh r4, [r0] strh r4, [r0]
ldr r5, =gUnknown_02021CC4 ldr r5, =gStringVar1
movs r0, 0xB movs r0, 0xB
adds r1, r4, 0 adds r1, r4, 0
muls r1, r0 muls r1, r0
adds r1, 0x5 adds r1, 0x5
adds r1, r6, r1 adds r1, r6, r1
adds r0, r5, 0 adds r0, r5, 0
bl CopyString bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x32 adds r0, 0x32
adds r0, r4 adds r0, r4
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r5, 0 adds r0, r5, 0
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
adds r0, r6, 0x1 adds r0, r6, 0x1
adds r0, r4 adds r0, r4
ldrb r1, [r0] ldrb r1, [r0]
@@ -333,7 +333,7 @@ _08133CCA:
thumb_func_start sub_8133CD8 thumb_func_start sub_8133CD8
sub_8133CD8: @ 8133CD8 sub_8133CD8: @ 8133CD8
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =gUnknown_020375F0 ldr r1, =gUnknown_020375F0
ldr r2, =0x00002e59 ldr r2, =0x00002e59
@@ -402,7 +402,7 @@ sub_8133D2C: @ 8133D2C
negs r1, r1 negs r1, r1
cmp r0, r1 cmp r0, r1
bne _08133D72 bne _08133D72
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldrh r1, [r5] ldrh r1, [r5]
lsls r1, 5 lsls r1, 5
adds r1, r4 adds r1, r4
@@ -446,18 +446,18 @@ sub_8133DA0: @ 8133DA0
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
strh r0, [r5] strh r0, [r5]
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldr r1, =gUnknown_020375E0 ldr r1, =gUnknown_020375E0
ldrh r1, [r1] ldrh r1, [r1]
lsls r1, 5 lsls r1, 5
ldr r4, =gUnknown_085A5C09 ldr r4, =gUnknown_085A5C09
adds r1, r4 adds r1, r4
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldrh r1, [r5] ldrh r1, [r5]
lsls r1, 5 lsls r1, 5
adds r1, r4 adds r1, r4
bl CopyString bl StringCopy
b _08133E04 b _08133E04
.pool .pool
_08133DFC: _08133DFC:
@@ -495,7 +495,7 @@ sub_8133E38: @ 8133E38
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r6, [r0] ldr r6, [r0]
ldr r0, =0x00002e28 ldr r0, =0x00002e28
adds r5, r6, r0 adds r5, r6, r0
@@ -512,10 +512,10 @@ sub_8133E38: @ 8133E38
muls r0, r1 muls r0, r1
adds r0, 0x5 adds r0, 0x5
adds r5, r0 adds r5, r0
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r0, r5, 0 adds r0, r5, 0
bl CopyString bl StringCopy
ldr r2, =0x00002e29 ldr r2, =0x00002e29
adds r0, r6, r2 adds r0, r6, r2
ldrh r1, [r4] ldrh r1, [r4]
+69 -69
View File
@@ -934,7 +934,7 @@ sub_80C2EC4: @ 80C2EC4
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
mov r8, r1 mov r8, r1
ldr r6, =gUnknown_03005D90 ldr r6, =gSaveBlock2Ptr
ldr r1, [r6] ldr r1, [r6]
ldrb r0, [r1, 0x8] ldrb r0, [r1, 0x8]
strb r0, [r5] strb r0, [r5]
@@ -993,7 +993,7 @@ _080C2F14:
movs r0, 0x15 movs r0, 0x15
bl sav12_xor_get_clamped_above bl sav12_xor_get_clamped_above
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
movs r1, 0x92 movs r1, 0x92
lsls r1, 3 lsls r1, 3
@@ -1019,10 +1019,10 @@ _080C2F74:
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0x3 cmp r2, 0x3
bls _080C2F74 bls _080C2F74
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r1, [r0] ldr r1, [r0]
adds r0, r7, 0 adds r0, r7, 0
bl CopyString bl StringCopy
mov r0, r8 mov r0, r8
cmp r0, 0x1 cmp r0, 0x1
beq _080C3004 beq _080C3004
@@ -1098,7 +1098,7 @@ sub_80C3020: @ 80C3020
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x60 adds r1, 0x60
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00000eba ldr r2, =0x00000eba
adds r0, r2 adds r0, r2
@@ -1159,7 +1159,7 @@ sub_80C30A4: @ 80C30A4
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x3A] strh r0, [r4, 0x3A]
ldr r1, =gUnknown_03005D90 ldr r1, =gSaveBlock2Ptr
ldr r1, [r1] ldr r1, [r1]
ldr r2, =0x00000eba ldr r2, =0x00000eba
adds r1, r2 adds r1, r2
@@ -1716,20 +1716,20 @@ sub_80C3574: @ 80C3574
sub sp, 0x2C sub sp, 0x2C
ldr r1, =gUnknown_085ECF71 ldr r1, =gUnknown_085ECF71
add r0, sp, 0xC add r0, sp, 0xC
bl CopyString bl StringCopy
adds r5, r0, 0 adds r5, r0, 0
ldr r4, =gUnknown_02039CE8 ldr r4, =gUnknown_02039CE8
ldr r1, [r4] ldr r1, [r4]
ldr r0, =0x00000564 ldr r0, =0x00000564
adds r1, r0 adds r1, r0
adds r0, r5, 0 adds r0, r5, 0
bl CopyString bl StringCopy
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00007caa ldr r1, =0x00007caa
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r5, 0 adds r0, r5, 0
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x0000052a ldr r1, =0x0000052a
adds r0, r1 adds r0, r1
@@ -1777,7 +1777,7 @@ sub_80C3608: @ 80C3608
sub sp, 0x2C sub sp, 0x2C
ldr r1, =gUnknown_085ECF78 ldr r1, =gUnknown_085ECF78
add r0, sp, 0xC add r0, sp, 0xC
bl CopyString bl StringCopy
ldr r4, =gUnknown_02039CE8 ldr r4, =gUnknown_02039CE8
ldr r1, [r4] ldr r1, [r4]
ldr r2, =0x00000542 ldr r2, =0x00000542
@@ -1785,7 +1785,7 @@ sub_80C3608: @ 80C3608
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x2 movs r2, 0x2
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x0000052a ldr r1, =0x0000052a
adds r0, r1 adds r0, r1
@@ -1865,7 +1865,7 @@ _080C36C4:
movs r3, 0x39 movs r3, 0x39
bl box_print bl box_print
_080C36DE: _080C36DE:
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r4, =gUnknown_02039CE8 ldr r4, =gUnknown_02039CE8
ldr r1, [r4] ldr r1, [r4]
movs r2, 0xAB movs r2, 0xAB
@@ -1874,11 +1874,11 @@ _080C36DE:
ldr r1, [r1] ldr r1, [r1]
movs r2, 0 movs r2, 0
movs r3, 0x6 movs r3, 0x6
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085E969C ldr r1, =gUnknown_085E969C
adds r0, r5, 0 adds r0, r5, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x0000052b ldr r1, =0x0000052b
adds r0, r1 adds r0, r1
@@ -1906,7 +1906,7 @@ _080C3740:
movs r0, 0x1 movs r0, 0x1
negs r0, r0 negs r0, r0
str r0, [sp, 0x4] str r0, [sp, 0x4]
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
@@ -1981,7 +1981,7 @@ _080C37DC:
movs r3, 0x49 movs r3, 0x49
bl box_print bl box_print
_080C37F6: _080C37F6:
ldr r5, =gUnknown_02021FC4 ldr r5, =gStringVar4
ldr r4, =gUnknown_02039CE8 ldr r4, =gUnknown_02039CE8
ldr r0, [r4] ldr r0, [r4]
movs r1, 0xA8 movs r1, 0xA8
@@ -1991,9 +1991,9 @@ _080C37F6:
adds r0, r5, 0 adds r0, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085ECF8E ldr r1, =gUnknown_085ECF8E
bl CopyString bl StringCopy
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x0000052b ldr r1, =0x0000052b
adds r0, r1 adds r0, r1
@@ -2021,7 +2021,7 @@ _080C3854:
movs r0, 0x1 movs r0, 0x1
negs r0, r0 negs r0, r0
str r0, [sp, 0x4] str r0, [sp, 0x4]
ldr r0, =gUnknown_02021FC4 ldr r0, =gStringVar4
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
@@ -2091,7 +2091,7 @@ _080C38E2:
b _080C3914 b _080C3914
.pool .pool
_080C390C: _080C390C:
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrh r5, [r0, 0xE] ldrh r5, [r0, 0xE]
ldrb r6, [r0, 0x10] ldrb r6, [r0, 0x10]
@@ -2139,13 +2139,13 @@ _080C395C:
movs r1, 0 movs r1, 0
adds r3, r4, 0 adds r3, r4, 0
bl FillWindowPixelRect bl FillWindowPixelRect
ldr r2, =gUnknown_02021FC4 ldr r2, =gStringVar4
mov r9, r2 mov r9, r2
mov r0, r9 mov r0, r9
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
lsls r2, r7, 24 lsls r2, r7, 24
lsrs r2, 24 lsrs r2, 24
ldr r0, =gUnknown_0856FB0C ldr r0, =gUnknown_0856FB0C
@@ -2183,7 +2183,7 @@ _080C395C:
adds r1, r6, 0 adds r1, r6, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
lsls r2, r7, 24 lsls r2, r7, 24
lsrs r2, 24 lsrs r2, 24
mov r0, r8 mov r0, r8
@@ -2312,27 +2312,27 @@ sub_80C3AF0: @ 80C3AF0
adds r0, 0x4D adds r0, 0x4D
ldr r2, =0x00000564 ldr r2, =0x00000564
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r1, [r4] ldr r1, [r4]
adds r0, r1, 0 adds r0, r1, 0
adds r0, 0x4D adds r0, 0x4D
ldr r2, =0x00007caa ldr r2, =0x00007caa
adds r1, r2 adds r1, r2
ldrb r1, [r1] ldrb r1, [r1]
bl StopMusicWhileStringIsPrinted bl ConvertInternationalString
ldr r1, [r4] ldr r1, [r4]
ldr r2, =0x0000052a ldr r2, =0x0000052a
adds r0, r1, r2 adds r0, r1, r2
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080C3B30 beq _080C3B30
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
adds r1, 0x4D adds r1, 0x4D
bl CopyString bl StringCopy
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x4D adds r0, 0x4D
ldr r1, =gUnknown_085ECFA6 ldr r1, =gUnknown_085ECFA6
bl ExpandStringRefs bl StringExpandPlaceholders
_080C3B30: _080C3B30:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -2402,33 +2402,33 @@ sub_80C3BC4: @ 80C3BC4
ldrb r0, [r1, 0xB] ldrb r0, [r1, 0xB]
cmp r0, 0 cmp r0, 0
beq _080C3C0E beq _080C3C0E
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r2, =0x0000053a ldr r2, =0x0000053a
adds r1, r2 adds r1, r2
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r1, [r4] ldr r1, [r4]
ldr r2, =0x0000053c ldr r2, =0x0000053c
adds r1, r2 adds r1, r2
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_02021EC4 ldr r0, =gStringVar3
ldr r1, [r4] ldr r1, [r4]
ldr r2, =0x0000053e ldr r2, =0x0000053e
adds r1, r2 adds r1, r2
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x93 adds r0, 0x93
ldr r1, =gUnknown_0856FB4C ldr r1, =gUnknown_0856FB4C
bl ExpandStringRefs bl StringExpandPlaceholders
_080C3C0E: _080C3C0E:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -2540,7 +2540,7 @@ sub_80C3CF4: @ 80C3CF4
lsls r1, 2 lsls r1, 2
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl CopyString bl StringCopy
ldr r1, [r4] ldr r1, [r4]
ldr r2, =0x00000165 ldr r2, =0x00000165
adds r0, r1, r2 adds r0, r1, r2
@@ -2550,7 +2550,7 @@ sub_80C3CF4: @ 80C3CF4
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0 movs r2, 0
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r1, [r4] ldr r1, [r4]
ldr r2, =0x000001ab ldr r2, =0x000001ab
adds r0, r1, r2 adds r0, r1, r2
@@ -2559,7 +2559,7 @@ sub_80C3CF4: @ 80C3CF4
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0 movs r2, 0
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
_080C3D40: _080C3D40:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -2575,19 +2575,19 @@ sub_80C3D60: @ 80C3D60
ldrb r0, [r1, 0xC] ldrb r0, [r1, 0xC]
cmp r0, 0 cmp r0, 0
beq _080C3D9A beq _080C3D9A
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r2, =0x00000165 ldr r2, =0x00000165
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r1, [r5] ldr r1, [r5]
ldr r2, =0x000001ab ldr r2, =0x000001ab
adds r1, r2 adds r1, r2
bl CopyString bl StringCopy
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085ECFED ldr r1, =gUnknown_085ECFED
adds r0, r4, 0 adds r0, r4, 0
bl ExpandStringRefs bl StringExpandPlaceholders
ldr r1, [r5] ldr r1, [r5]
adds r1, 0xD9 adds r1, 0xD9
ldr r3, =gUnknown_0856FB0C ldr r3, =gUnknown_0856FB0C
@@ -2616,7 +2616,7 @@ sub_80C3DC0: @ 80C3DC0
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
_080C3DDE: _080C3DDE:
pop {r0} pop {r0}
bx r0 bx r0
@@ -2663,7 +2663,7 @@ sub_80C3E20: @ 80C3E20
adds r0, r2, r3 adds r0, r2, r3
movs r2, 0x1 movs r2, 0x1
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
_080C3E48: _080C3E48:
pop {r0} pop {r0}
bx r0 bx r0
@@ -2716,7 +2716,7 @@ sub_80C3E98: @ 80C3E98
adds r0, r2, r3 adds r0, r2, r3
movs r2, 0x1 movs r2, 0x1
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
_080C3EBE: _080C3EBE:
pop {r0} pop {r0}
bx r0 bx r0
@@ -2765,16 +2765,16 @@ sub_80C3F14: @ 80C3F14
ldrh r0, [r1] ldrh r0, [r1]
cmp r0, 0 cmp r0, 0
beq _080C3F46 beq _080C3F46
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00000395 ldr r1, =0x00000395
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_085ED096 ldr r1, =gUnknown_085ED096
bl ExpandStringRefs bl StringExpandPlaceholders
_080C3F46: _080C3F46:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -2830,7 +2830,7 @@ sub_80C3FA4: @ 80C3FA4
ldrh r1, [r2] ldrh r1, [r2]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
_080C3FCE: _080C3FCE:
pop {r0} pop {r0}
bx r0 bx r0
@@ -2884,26 +2884,26 @@ _080C4044:
ldrb r0, [r1, 0xD] ldrb r0, [r1, 0xD]
cmp r0, 0 cmp r0, 0
beq _080C40B6 beq _080C40B6
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldr r2, =0x0000054c ldr r2, =0x0000054c
adds r1, r2 adds r1, r2
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_02021DC4 ldr r0, =gStringVar2
ldr r1, [r4] ldr r1, [r4]
ldr r2, =0x0000054e ldr r2, =0x0000054e
adds r1, r2 adds r1, r2
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00000421 ldr r1, =0x00000421
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_085ED0E0 ldr r1, =gUnknown_085ED0E0
bl ExpandStringRefs bl StringExpandPlaceholders
b _080C40B6 b _080C40B6
.pool .pool
_080C4094: _080C4094:
@@ -2912,16 +2912,16 @@ _080C4094:
ldrh r0, [r1] ldrh r0, [r1]
cmp r0, 0 cmp r0, 0
beq _080C40B6 beq _080C40B6
ldr r0, =gUnknown_02021CC4 ldr r0, =gStringVar1
ldrh r1, [r1] ldrh r1, [r1]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00000421 ldr r1, =0x00000421
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_085ED0C8 ldr r1, =gUnknown_085ED0C8
bl ExpandStringRefs bl StringExpandPlaceholders
_080C40B6: _080C40B6:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -4610,7 +4610,7 @@ sub_80C4EE4: @ 80C4EE4
movs r1, 0 movs r1, 0
strb r1, [r0] strb r1, [r0]
ldr r2, [r4] ldr r2, [r4]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x12] ldrb r0, [r0, 0x12]
strb r0, [r2, 0x6] strb r0, [r2, 0x6]
@@ -4994,7 +4994,7 @@ _080C5232:
adds r5, r2, 0 adds r5, r2, 0
_080C5240: _080C5240:
ldr r1, [r5] ldr r1, [r5]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r2, =0x00000eb8 ldr r2, =0x00000eb8
adds r0, r2 adds r0, r2
@@ -6387,14 +6387,14 @@ _080C5DC2:
movs r2, 0x5 movs r2, 0x5
movs r3, 0x4 movs r3, 0x4
bl box_print bl box_print
ldr r4, =gUnknown_02021FC4 ldr r4, =gStringVar4
ldr r5, =gUnknown_02039CEC ldr r5, =gUnknown_02039CEC
ldr r0, [r5] ldr r0, [r5]
ldrh r1, [r0, 0x6] ldrh r1, [r0, 0x6]
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalString bl ConvertIntToDecimalStringN
movs r0, 0x8 movs r0, 0x8
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x5B movs r2, 0x5B
@@ -7789,7 +7789,7 @@ sub_80C6974: @ 80C6974
beq _080C6A40 beq _080C6A40
b _080C6B7A b _080C6B7A
_080C6A40: _080C6A40:
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r2, [r4] ldr r2, [r4]
movs r0, 0x5 movs r0, 0x5
ldrsb r0, [r2, r0] ldrsb r0, [r2, r0]
@@ -7854,7 +7854,7 @@ _080C6AB4:
_080C6ACE: _080C6ACE:
ldrh r7, [r1, 0x28] ldrh r7, [r1, 0x28]
_080C6AD0: _080C6AD0:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldrh r4, [r0, 0x2A] ldrh r4, [r0, 0x2A]
lsls r0, r7, 16 lsls r0, r7, 16
@@ -7883,7 +7883,7 @@ _080C6AF2:
ldm r0!, {r2,r3,r6} ldm r0!, {r2,r3,r6}
stm r1!, {r2,r3,r6} stm r1!, {r2,r3,r6}
mov r1, sp mov r1, sp
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
adds r0, 0x4 adds r0, 0x4
@@ -7925,7 +7925,7 @@ _080C6B3E:
negs r0, r0 negs r0, r0
ands r0, r2 ands r0, r2
strb r0, [r1, 0x5] strb r0, [r1, 0x5]
ldr r0, =gUnknown_03005D90 ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
cmp r0, 0 cmp r0, 0
@@ -8353,7 +8353,7 @@ sub_80C6EAC: @ 80C6EAC
str r0, [sp, 0x18] str r0, [sp, 0x18]
str r1, [sp, 0x1C] str r1, [sp, 0x1C]
ldr r0, [sp, 0x20] ldr r0, [sp, 0x20]
bl GetStringLength_Multibyte bl StringLength_Multibyte
lsls r0, 24 lsls r0, 24
ldr r2, =0x00ffffff ldr r2, =0x00ffffff
ldr r1, [sp, 0x18] ldr r1, [sp, 0x18]
+4 -4
View File
@@ -65,7 +65,7 @@ sub_80FB0F8: @ 80FB0F8
ldrsh r0, [r5, r1] ldrsh r0, [r5, r1]
adds r0, 0x1E adds r0, 0x1E
bl sub_80FB0DC bl sub_80FB0DC
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r2, [r4] ldr r2, [r4]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -201,7 +201,7 @@ _080FB20C:
ldrsh r0, [r7, r4] ldrsh r0, [r7, r4]
adds r0, 0x1E adds r0, 0x1E
bl sub_80FB0DC bl sub_80FB0DC
ldr r6, =gUnknown_03005D8C ldr r6, =gSaveBlock1Ptr
ldr r2, [r6] ldr r2, [r6]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
@@ -303,7 +303,7 @@ _080FB304:
ldrsb r6, [r0, r6] ldrsb r6, [r0, r6]
adds r0, r6, 0 adds r0, r6, 0
bl SetCameraPanning bl SetCameraPanning
ldr r5, =gUnknown_03005D8C ldr r5, =gSaveBlock1Ptr
ldr r0, [r5] ldr r0, [r5]
ldrb r1, [r0, 0x5] ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4] ldrb r2, [r0, 0x4]
@@ -553,7 +553,7 @@ sub_80FB540: @ 80FB540
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0 cmp r6, 0
bne _080FB58A bne _080FB58A
ldr r4, =gUnknown_03005D8C ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
ldrb r1, [r0, 0x5] ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4] ldrb r2, [r0, 0x4]
+771 -771
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -31,7 +31,7 @@ _0809D660:
b _0809D688 b _0809D688
.pool .pool
_0809D67C: _0809D67C:
ldr r0, =gUnknown_03005D8C ldr r0, =gSaveBlock1Ptr
lsls r1, r2, 1 lsls r1, r2, 1
ldr r2, =0xffff939c ldr r2, =0xffff939c
adds r1, r2 adds r1, r2

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