tm_case and peripheral documentation

This commit is contained in:
PikalaxALT
2019-04-15 13:17:19 -04:00
parent 0298df9b5f
commit dfbddec062
40 changed files with 1083 additions and 853 deletions
+2 -2
View File
@@ -356,7 +356,7 @@ sub_810BAE8: @ 810BAE8
str r3, [sp, 0xC] str r3, [sp, 0xC]
movs r2, 0x2 movs r2, 0x2
movs r3, 0 movs r3, 0
bl sub_80BF5D0 bl CreateYesNoMenuWithCallbacks
add sp, 0x10 add sp, 0x10
pop {r0} pop {r0}
bx r0 bx r0
@@ -381,7 +381,7 @@ sub_810BB14: @ 810BB14
str r3, [sp, 0xC] str r3, [sp, 0xC]
movs r2, 0x2 movs r2, 0x2
movs r3, 0 movs r3, 0
bl sub_80BF5D0 bl CreateYesNoMenuWithCallbacks
add sp, 0x10 add sp, 0x10
pop {r0} pop {r0}
bx r0 bx r0
+56 -56
View File
@@ -255,7 +255,7 @@ _0813CF62:
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, _0813CF98 @ =gUnknown_3005E70 ldr r0, _0813CF98 @ =gMultiuseListMenuTemplate
ldr r2, _0813CF9C @ =gUnknown_203F370 ldr r2, _0813CF9C @ =gUnknown_203F370
ldrh r1, [r2, 0xA] ldrh r1, [r2, 0xA]
ldrh r2, [r2, 0x8] ldrh r2, [r2, 0x8]
@@ -273,7 +273,7 @@ _0813CF62:
b _0813CFD2 b _0813CFD2
.align 2, 0 .align 2, 0
_0813CF94: .4byte sub_813DA68 _0813CF94: .4byte sub_813DA68
_0813CF98: .4byte gUnknown_3005E70 _0813CF98: .4byte gMultiuseListMenuTemplate
_0813CF9C: .4byte gUnknown_203F370 _0813CF9C: .4byte gUnknown_203F370
_0813CFA0: .4byte gTasks _0813CFA0: .4byte gTasks
_0813CFA4: _0813CFA4:
@@ -615,10 +615,10 @@ _0813D254:
ldr r2, [r0] ldr r2, [r0]
lsls r0, r6, 3 lsls r0, r6, 3
adds r0, r2 adds r0, r2
ldr r1, _0813D290 @ =gUnknown_84166DB ldr r1, _0813D290 @ =gText_Close
str r1, [r0] str r1, [r0]
str r6, [r0, 0x4] str r6, [r0, 0x4]
ldr r1, _0813D294 @ =gUnknown_3005E70 ldr r1, _0813D294 @ =gMultiuseListMenuTemplate
str r2, [r1] str r2, [r1]
ldr r0, _0813D298 @ =gUnknown_203F370 ldr r0, _0813D298 @ =gUnknown_203F370
ldrb r0, [r0, 0x4] ldrb r0, [r0, 0x4]
@@ -637,8 +637,8 @@ _0813D280: .4byte gBagPockets + 0x20
_0813D284: .4byte gUnknown_203F36C _0813D284: .4byte gUnknown_203F36C
_0813D288: .4byte gUnknown_203F380 _0813D288: .4byte gUnknown_203F380
_0813D28C: .4byte gUnknown_203F37C _0813D28C: .4byte gUnknown_203F37C
_0813D290: .4byte gUnknown_84166DB _0813D290: .4byte gText_Close
_0813D294: .4byte gUnknown_3005E70 _0813D294: .4byte gMultiuseListMenuTemplate
_0813D298: .4byte gUnknown_203F370 _0813D298: .4byte gUnknown_203F370
_0813D29C: _0813D29C:
ldr r0, _0813D310 @ =gUnknown_203F36C ldr r0, _0813D310 @ =gUnknown_203F36C
@@ -715,10 +715,10 @@ sub_813D31C: @ 813D31C
lsls r5, r1, 16 lsls r5, r1, 16
lsrs r5, 16 lsrs r5, 16
ldr r4, _0813D384 @ =gStringVar4 ldr r4, _0813D384 @ =gStringVar4
ldr r1, _0813D388 @ =gUnknown_84166FF ldr r1, _0813D388 @ =gText_FontSize0
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
ldr r1, _0813D38C @ =gUnknown_8416226 ldr r1, _0813D38C @ =gOtherText_UnkF9_08_Clear_01
adds r0, r4, 0 adds r0, r4, 0
bl StringAppend bl StringAppend
ldr r6, _0813D390 @ =gStringVar1 ldr r6, _0813D390 @ =gStringVar1
@@ -737,7 +737,7 @@ sub_813D31C: @ 813D31C
ldr r1, _0813D394 @ =gUnknown_84643B4 ldr r1, _0813D394 @ =gUnknown_84643B4
adds r0, r4, 0 adds r0, r4, 0
bl StringAppend bl StringAppend
ldr r1, _0813D398 @ =gUnknown_8416703 ldr r1, _0813D398 @ =gText_FontSize2
adds r0, r4, 0 adds r0, r4, 0
bl StringAppend bl StringAppend
adds r0, r4, 0 adds r0, r4, 0
@@ -753,11 +753,11 @@ sub_813D31C: @ 813D31C
bx r0 bx r0
.align 2, 0 .align 2, 0
_0813D384: .4byte gStringVar4 _0813D384: .4byte gStringVar4
_0813D388: .4byte gUnknown_84166FF _0813D388: .4byte gText_FontSize0
_0813D38C: .4byte gUnknown_8416226 _0813D38C: .4byte gOtherText_UnkF9_08_Clear_01
_0813D390: .4byte gStringVar1 _0813D390: .4byte gStringVar1
_0813D394: .4byte gUnknown_84643B4 _0813D394: .4byte gUnknown_84643B4
_0813D398: .4byte gUnknown_8416703 _0813D398: .4byte gText_FontSize2
thumb_func_end sub_813D31C thumb_func_end sub_813D31C
thumb_func_start sub_813D39C thumb_func_start sub_813D39C
@@ -806,7 +806,7 @@ _0813D3D6:
lsls r1, r5, 16 lsls r1, r5, 16
lsrs r1, 16 lsrs r1, 16
movs r0, 0x5 movs r0, 0x5
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r1, [r4] ldr r1, [r4]
@@ -857,10 +857,10 @@ sub_813D430: @ 813D430
lsrs r4, 16 lsrs r4, 16
movs r0, 0x5 movs r0, 0x5
adds r1, r4, 0 adds r1, r4, 0
bl sub_809A798 bl BagGetItemIdByPocketPosition
movs r0, 0x5 movs r0, 0x5
adds r1, r4, 0 adds r1, r4, 0
bl sub_809A7B4 bl BagGetQuantityByPocketPosition
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
@@ -869,7 +869,7 @@ sub_813D430: @ 813D430
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, _0813D4A8 @ =gStringVar4 ldr r4, _0813D4A8 @ =gStringVar4
ldr r1, _0813D4AC @ =gUnknown_84162B9 ldr r1, _0813D4AC @ =gText_TimesStrVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
str r5, [sp] str r5, [sp]
@@ -894,7 +894,7 @@ _0813D498:
_0813D4A0: .4byte gUnknown_203F36C _0813D4A0: .4byte gUnknown_203F36C
_0813D4A4: .4byte gStringVar1 _0813D4A4: .4byte gStringVar1
_0813D4A8: .4byte gStringVar4 _0813D4A8: .4byte gStringVar4
_0813D4AC: .4byte gUnknown_84162B9 _0813D4AC: .4byte gText_TimesStrVar1
thumb_func_end sub_813D430 thumb_func_end sub_813D430
thumb_func_start sub_813D4B0 thumb_func_start sub_813D4B0
@@ -980,7 +980,7 @@ sub_813D538: @ 813D538
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
movs r0, 0x5 movs r0, 0x5
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl ItemId_GetDescription bl ItemId_GetDescription
@@ -1409,7 +1409,7 @@ sub_813D844: @ 813D844
ldr r4, _0813D884 @ =gUnknown_203F37A ldr r4, _0813D884 @ =gUnknown_203F37A
subs r2, r4, 0x2 subs r2, r4, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl sub_810713C bl DestroyListMenu
ldr r0, _0813D888 @ =gUnknown_203F36C ldr r0, _0813D888 @ =gUnknown_203F36C
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0] ldr r0, [r0]
@@ -1574,7 +1574,7 @@ sub_813D940: @ 813D940
movs r2, 0x2 movs r2, 0x2
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r1, _0813D9F4 @ =gUnknown_84162B9 ldr r1, _0813D9F4 @ =gText_TimesStrVar1
mov r0, r9 mov r0, r9
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
@@ -1601,7 +1601,7 @@ sub_813D940: @ 813D940
_0813D9E8: .4byte gTasks+0x8 _0813D9E8: .4byte gTasks+0x8
_0813D9EC: .4byte gStringVar1 _0813D9EC: .4byte gStringVar1
_0813D9F0: .4byte gStringVar4 _0813D9F0: .4byte gStringVar4
_0813D9F4: .4byte gUnknown_84162B9 _0813D9F4: .4byte gText_TimesStrVar1
thumb_func_end sub_813D940 thumb_func_end sub_813D940
thumb_func_start sub_813D9F8 thumb_func_start sub_813D9F8
@@ -1631,7 +1631,7 @@ sub_813D9F8: @ 813D9F8
adds r3, r5, 0 adds r3, r5, 0
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, _0813DA60 @ =gStringVar4 ldr r4, _0813DA60 @ =gStringVar4
ldr r1, _0813DA64 @ =gUnknown_84162B9 ldr r1, _0813DA64 @ =gText_TimesStrVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
@@ -1654,7 +1654,7 @@ sub_813D9F8: @ 813D9F8
.align 2, 0 .align 2, 0
_0813DA5C: .4byte gStringVar1 _0813DA5C: .4byte gStringVar1
_0813DA60: .4byte gStringVar4 _0813DA60: .4byte gStringVar4
_0813DA64: .4byte gUnknown_84162B9 _0813DA64: .4byte gText_TimesStrVar1
thumb_func_end sub_813D9F8 thumb_func_end sub_813D9F8
thumb_func_start sub_813DA68 thumb_func_start sub_813DA68
@@ -1748,7 +1748,7 @@ _0813DB10:
lsls r1, r5, 16 lsls r1, r5, 16
lsrs r1, 16 lsrs r1, 16
movs r0, 0x5 movs r0, 0x5
bl sub_809A798 bl BagGetItemIdByPocketPosition
ldr r1, _0813DB34 @ =gSpecialVar_ItemId ldr r1, _0813DB34 @ =gSpecialVar_ItemId
b _0813DB46 b _0813DB46
.align 2, 0 .align 2, 0
@@ -1784,11 +1784,11 @@ _0813DB58:
lsrs r4, 16 lsrs r4, 16
movs r0, 0x5 movs r0, 0x5
adds r1, r4, 0 adds r1, r4, 0
bl sub_809A7B4 bl BagGetQuantityByPocketPosition
strh r0, [r7, 0x4] strh r0, [r7, 0x4]
movs r0, 0x5 movs r0, 0x5
adds r1, r4, 0 adds r1, r4, 0
bl sub_809A798 bl BagGetItemIdByPocketPosition
ldr r1, _0813DBA8 @ =gSpecialVar_ItemId ldr r1, _0813DBA8 @ =gSpecialVar_ItemId
strh r0, [r1] strh r0, [r1]
ldr r0, _0813DBAC @ =gTasks ldr r0, _0813DBAC @ =gTasks
@@ -2504,11 +2504,11 @@ _0813E18A:
ldr r4, _0813E1F8 @ =gUnknown_203F37A ldr r4, _0813E1F8 @ =gUnknown_203F37A
subs r2, r4, 0x2 subs r2, r4, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl sub_810713C bl DestroyListMenu
bl sub_813D8AC bl sub_813D8AC
bl sub_813D6F4 bl sub_813D6F4
bl sub_813D204 bl sub_813D204
ldr r0, _0813E1FC @ =gUnknown_3005E70 ldr r0, _0813E1FC @ =gMultiuseListMenuTemplate
subs r4, 0xA subs r4, 0xA
ldrh r1, [r4, 0xA] ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0x8] ldrh r2, [r4, 0x8]
@@ -2534,7 +2534,7 @@ _0813E1EC: .4byte gTasks+0x8
_0813E1F0: .4byte gMain _0813E1F0: .4byte gMain
_0813E1F4: .4byte gSpecialVar_ItemId _0813E1F4: .4byte gSpecialVar_ItemId
_0813E1F8: .4byte gUnknown_203F37A _0813E1F8: .4byte gUnknown_203F37A
_0813E1FC: .4byte gUnknown_3005E70 _0813E1FC: .4byte gMultiuseListMenuTemplate
thumb_func_end sub_813E164 thumb_func_end sub_813E164
thumb_func_start sub_813E200 thumb_func_start sub_813E200
@@ -2595,14 +2595,14 @@ sub_813E274: @ 813E274
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _0813E288 @ =gUnknown_841632A ldr r2, _0813E288 @ =gText_ThereIsNoPokemon
ldr r3, _0813E28C @ =sub_813E290 ldr r3, _0813E28C @ =sub_813E290
movs r1, 0x2 movs r1, 0x2
bl sub_813EB20 bl sub_813EB20
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0813E288: .4byte gUnknown_841632A _0813E288: .4byte gText_ThereIsNoPokemon
_0813E28C: .4byte sub_813E290 _0813E28C: .4byte sub_813E290
thumb_func_end sub_813E274 thumb_func_end sub_813E274
@@ -2646,11 +2646,11 @@ sub_813E2B8: @ 813E2B8
ldr r4, _0813E318 @ =gUnknown_203F37A ldr r4, _0813E318 @ =gUnknown_203F37A
subs r2, r4, 0x2 subs r2, r4, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl sub_810713C bl DestroyListMenu
bl sub_813D8AC bl sub_813D8AC
bl sub_813D6F4 bl sub_813D6F4
bl sub_813D204 bl sub_813D204
ldr r0, _0813E31C @ =gUnknown_3005E70 ldr r0, _0813E31C @ =gMultiuseListMenuTemplate
subs r4, 0xA subs r4, 0xA
ldrh r1, [r4, 0xA] ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0x8] ldrh r2, [r4, 0x8]
@@ -2671,7 +2671,7 @@ sub_813E2B8: @ 813E2B8
.align 2, 0 .align 2, 0
_0813E314: .4byte gTasks+0x8 _0813E314: .4byte gTasks+0x8
_0813E318: .4byte gUnknown_203F37A _0813E318: .4byte gUnknown_203F37A
_0813E31C: .4byte gUnknown_3005E70 _0813E31C: .4byte gMultiuseListMenuTemplate
thumb_func_end sub_813E2B8 thumb_func_end sub_813E2B8
thumb_func_start sub_813E320 thumb_func_start sub_813E320
@@ -2726,7 +2726,7 @@ sub_813E37C: @ 813E37C
adds r0, r6, r7 adds r0, r6, r7
ldrh r1, [r0, 0x2] ldrh r1, [r0, 0x2]
movs r0, 0x5 movs r0, 0x5
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
adds r0, r4, 0 adds r0, r4, 0
@@ -2817,7 +2817,7 @@ sub_813E428: @ 813E428
ldr r1, _0813E478 @ =gStringVar1 ldr r1, _0813E478 @ =gStringVar1
bl CopyItemName bl CopyItemName
ldr r4, _0813E47C @ =gStringVar4 ldr r4, _0813E47C @ =gStringVar4
ldr r1, _0813E480 @ =gUnknown_84168F1 ldr r1, _0813E480 @ =gText_OhNoICantBuyThat
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
bl sub_80BF8E4 bl sub_80BF8E4
@@ -2834,7 +2834,7 @@ _0813E470: .4byte gTasks+0x8
_0813E474: .4byte gSpecialVar_ItemId _0813E474: .4byte gSpecialVar_ItemId
_0813E478: .4byte gStringVar1 _0813E478: .4byte gStringVar1
_0813E47C: .4byte gStringVar4 _0813E47C: .4byte gStringVar4
_0813E480: .4byte gUnknown_84168F1 _0813E480: .4byte gText_OhNoICantBuyThat
_0813E484: .4byte sub_813E2B8 _0813E484: .4byte sub_813E2B8
_0813E488: _0813E488:
movs r0, 0x1 movs r0, 0x1
@@ -2857,7 +2857,7 @@ _0813E4A8:
ldr r1, _0813E4D4 @ =gStringVar1 ldr r1, _0813E4D4 @ =gStringVar1
bl CopyItemName bl CopyItemName
ldr r4, _0813E4D8 @ =gStringVar4 ldr r4, _0813E4D8 @ =gStringVar4
ldr r1, _0813E4DC @ =gUnknown_8416911 ldr r1, _0813E4DC @ =gText_HowManyWouldYouLikeToSell
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
bl sub_80BF8E4 bl sub_80BF8E4
@@ -2875,7 +2875,7 @@ _0813E4CE:
.align 2, 0 .align 2, 0
_0813E4D4: .4byte gStringVar1 _0813E4D4: .4byte gStringVar1
_0813E4D8: .4byte gStringVar4 _0813E4D8: .4byte gStringVar4
_0813E4DC: .4byte gUnknown_8416911 _0813E4DC: .4byte gText_HowManyWouldYouLikeToSell
_0813E4E0: .4byte sub_813E5B8 _0813E4E0: .4byte sub_813E5B8
thumb_func_end sub_813E428 thumb_func_end sub_813E428
@@ -2893,7 +2893,7 @@ sub_813E4E4: @ 813E4E4
ldr r6, _0813E544 @ =gStringVar3 ldr r6, _0813E544 @ =gStringVar3
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
movs r0, 0x5 movs r0, 0x5
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl itemid_get_market_price bl itemid_get_market_price
@@ -2907,7 +2907,7 @@ sub_813E4E4: @ 813E4E4
movs r3, 0x6 movs r3, 0x6
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, _0813E548 @ =gStringVar4 ldr r4, _0813E548 @ =gStringVar4
ldr r1, _0813E54C @ =gUnknown_8416936 ldr r1, _0813E54C @ =gText_ICanPayThisMuch_WouldThatBeOkay
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
bl sub_80BF8E4 bl sub_80BF8E4
@@ -2925,7 +2925,7 @@ sub_813E4E4: @ 813E4E4
_0813E540: .4byte gTasks+0x8 _0813E540: .4byte gTasks+0x8
_0813E544: .4byte gStringVar3 _0813E544: .4byte gStringVar3
_0813E548: .4byte gStringVar4 _0813E548: .4byte gStringVar4
_0813E54C: .4byte gUnknown_8416936 _0813E54C: .4byte gText_ICanPayThisMuch_WouldThatBeOkay
_0813E550: .4byte sub_813E554 _0813E550: .4byte sub_813E554
thumb_func_end sub_813E4E4 thumb_func_end sub_813E4E4
@@ -3004,7 +3004,7 @@ sub_813E5B8: @ 813E5B8
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r2, _0813E65C @ =gStringVar4 ldr r2, _0813E65C @ =gStringVar4
mov r8, r2 mov r8, r2
ldr r1, _0813E660 @ =gUnknown_84162B9 ldr r1, _0813E660 @ =gText_TimesStrVar1
mov r0, r8 mov r0, r8
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
@@ -3024,7 +3024,7 @@ sub_813E5B8: @ 813E5B8
mov r3, r9 mov r3, r9
ldrh r1, [r3, 0x2] ldrh r1, [r3, 0x2]
movs r0, 0x5 movs r0, 0x5
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl itemid_get_market_price bl itemid_get_market_price
@@ -3052,7 +3052,7 @@ sub_813E5B8: @ 813E5B8
_0813E654: .4byte gTasks+0x8 _0813E654: .4byte gTasks+0x8
_0813E658: .4byte gStringVar1 _0813E658: .4byte gStringVar1
_0813E65C: .4byte gStringVar4 _0813E65C: .4byte gStringVar4
_0813E660: .4byte gUnknown_84162B9 _0813E660: .4byte gText_TimesStrVar1
_0813E664: .4byte sub_813E690 _0813E664: .4byte sub_813E690
thumb_func_end sub_813E5B8 thumb_func_end sub_813E5B8
@@ -3103,7 +3103,7 @@ sub_813E690: @ 813E690
bl sub_813D9F8 bl sub_813D9F8
ldrh r1, [r5, 0x2] ldrh r1, [r5, 0x2]
movs r0, 0x5 movs r0, 0x5
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl itemid_get_market_price bl itemid_get_market_price
@@ -3192,7 +3192,7 @@ sub_813E768: @ 813E768
ldr r6, _0813E7E0 @ =gStringVar3 ldr r6, _0813E7E0 @ =gStringVar3
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
movs r0, 0x5 movs r0, 0x5
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl itemid_get_market_price bl itemid_get_market_price
@@ -3206,7 +3206,7 @@ sub_813E768: @ 813E768
movs r3, 0x6 movs r3, 0x6
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, _0813E7E4 @ =gStringVar4 ldr r4, _0813E7E4 @ =gStringVar4
ldr r1, _0813E7E8 @ =gUnknown_8416959 ldr r1, _0813E7E8 @ =gText_TurnedOverItemsWorthYen
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
ldr r3, _0813E7EC @ =sub_813E7F0 ldr r3, _0813E7EC @ =sub_813E7F0
@@ -3223,7 +3223,7 @@ _0813E7D8: .4byte gSpecialVar_ItemId
_0813E7DC: .4byte gStringVar1 _0813E7DC: .4byte gStringVar1
_0813E7E0: .4byte gStringVar3 _0813E7E0: .4byte gStringVar3
_0813E7E4: .4byte gStringVar4 _0813E7E4: .4byte gStringVar4
_0813E7E8: .4byte gUnknown_8416959 _0813E7E8: .4byte gText_TurnedOverItemsWorthYen
_0813E7EC: .4byte sub_813E7F0 _0813E7EC: .4byte sub_813E7F0
thumb_func_end sub_813E768 thumb_func_end sub_813E768
@@ -3277,11 +3277,11 @@ sub_813E7F0: @ 813E7F0
ldr r4, _0813E8C8 @ =gUnknown_203F37A ldr r4, _0813E8C8 @ =gUnknown_203F37A
subs r2, r4, 0x2 subs r2, r4, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl sub_810713C bl DestroyListMenu
bl sub_813D8AC bl sub_813D8AC
bl sub_813D6F4 bl sub_813D6F4
bl sub_813D204 bl sub_813D204
ldr r0, _0813E8CC @ =gUnknown_3005E70 ldr r0, _0813E8CC @ =gMultiuseListMenuTemplate
subs r4, 0xA subs r4, 0xA
ldrh r1, [r4, 0xA] ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0x8] ldrh r2, [r4, 0x8]
@@ -3322,7 +3322,7 @@ _0813E8BC: .4byte gTasks+0x8
_0813E8C0: .4byte gSpecialVar_ItemId _0813E8C0: .4byte gSpecialVar_ItemId
_0813E8C4: .4byte gSaveBlock1Ptr _0813E8C4: .4byte gSaveBlock1Ptr
_0813E8C8: .4byte gUnknown_203F37A _0813E8C8: .4byte gUnknown_203F37A
_0813E8CC: .4byte gUnknown_3005E70 _0813E8CC: .4byte gMultiuseListMenuTemplate
_0813E8D0: .4byte sub_813E8D4 _0813E8D0: .4byte sub_813E8D4
thumb_func_end sub_813E7F0 thumb_func_end sub_813E7F0
@@ -3376,7 +3376,7 @@ sub_813E910: @ 813E910
movs r1, 0xA movs r1, 0xA
movs r2, 0xC0 movs r2, 0xC0
bl sub_814FF2C bl sub_814FF2C
ldr r0, _0813E998 @ =gUnknown_841F408 ldr r0, _0813E998 @ =gTMCaseMainWindowPalette
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
@@ -3418,7 +3418,7 @@ _0813E97C:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0813E994: .4byte gUnknown_84643B8 _0813E994: .4byte gUnknown_84643B8
_0813E998: .4byte gUnknown_841F408 _0813E998: .4byte gTMCaseMainWindowPalette
_0813E99C: .4byte gUnknown_203F38C _0813E99C: .4byte gUnknown_203F38C
thumb_func_end sub_813E910 thumb_func_end sub_813E910
@@ -3685,7 +3685,7 @@ sub_813EB7C: @ 813EB7C
str r3, [sp, 0xC] str r3, [sp, 0xC]
movs r2, 0x2 movs r2, 0x2
movs r3, 0 movs r3, 0
bl sub_80BF5D0 bl CreateYesNoMenuWithCallbacks
add sp, 0x10 add sp, 0x10
pop {r0} pop {r0}
bx r0 bx r0
@@ -3710,7 +3710,7 @@ sub_813EBA8: @ 813EBA8
str r3, [sp, 0xC] str r3, [sp, 0xC]
movs r2, 0x2 movs r2, 0x2
movs r3, 0 movs r3, 0
bl sub_80BF5D0 bl CreateYesNoMenuWithCallbacks
add sp, 0x10 add sp, 0x10
pop {r0} pop {r0}
bx r0 bx r0
+1 -1
View File
@@ -209,7 +209,7 @@ sub_813F7D8: @ 813F7D8
str r3, [sp, 0xC] str r3, [sp, 0xC]
movs r2, 0x2 movs r2, 0x2
movs r3, 0 movs r3, 0
bl sub_80BF5D0 bl CreateYesNoMenuWithCallbacks
add sp, 0x10 add sp, 0x10
pop {r0} pop {r0}
bx r0 bx r0
+4 -4
View File
@@ -2714,7 +2714,7 @@ _080467C8:
adds r0, r7, 0 adds r0, r7, 0
adds r1, r4, 0 adds r1, r4, 0
bl StringAppend bl StringAppend
ldr r1, _08046830 @ =gUnknown_84161C8 ldr r1, _08046830 @ =gOtherText_Exit
adds r0, r7, 0 adds r0, r7, 0
bl StringAppend bl StringAppend
add sp, 0x28 add sp, 0x28
@@ -2726,7 +2726,7 @@ _080467C8:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0804682C: .4byte gUnknown_825F83C _0804682C: .4byte gUnknown_825F83C
_08046830: .4byte gUnknown_84161C8 _08046830: .4byte gOtherText_Exit
thumb_func_end GetDaycareLevelMenuText thumb_func_end GetDaycareLevelMenuText
thumb_func_start GetDaycareLevelMenuLevelText thumb_func_start GetDaycareLevelMenuLevelText
@@ -3008,7 +3008,7 @@ _08046A46:
ldrb r0, [r4, 0x8] ldrb r0, [r4, 0x8]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
movs r1, 0x1 movs r1, 0x1
bl ClearStdWindowAndFrame bl ClearStdWindowAndFrame
@@ -3032,7 +3032,7 @@ _08046A7C:
ldrb r0, [r4, 0x8] ldrb r0, [r4, 0x8]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
movs r1, 0x1 movs r1, 0x1
bl ClearStdWindowAndFrame bl ClearStdWindowAndFrame
+1 -1
View File
@@ -2854,7 +2854,7 @@ sub_80CBBAC: @ 80CBBAC
lsrs r0, 24 lsrs r0, 24
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
ldr r0, _080CBC28 @ =gUnknown_2039A14 ldr r0, _080CBC28 @ =gUnknown_2039A14
ldr r0, [r0] ldr r0, [r0]
bl Free bl Free
+6 -6
View File
@@ -1404,8 +1404,8 @@ _0809A786:
bx r0 bx r0
thumb_func_end sub_809A720 thumb_func_end sub_809A720
thumb_func_start sub_809A798 thumb_func_start BagGetItemIdByPocketPosition
sub_809A798: @ 809A798 BagGetItemIdByPocketPosition: @ 809A798
lsls r0, 24 lsls r0, 24
lsls r1, 16 lsls r1, 16
ldr r2, _0809A7B0 @ =gBagPockets ldr r2, _0809A7B0 @ =gBagPockets
@@ -1419,10 +1419,10 @@ sub_809A798: @ 809A798
bx lr bx lr
.align 2, 0 .align 2, 0
_0809A7B0: .4byte gBagPockets _0809A7B0: .4byte gBagPockets
thumb_func_end sub_809A798 thumb_func_end BagGetItemIdByPocketPosition
thumb_func_start sub_809A7B4 thumb_func_start BagGetQuantityByPocketPosition
sub_809A7B4: @ 809A7B4 BagGetQuantityByPocketPosition: @ 809A7B4
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsls r1, 16 lsls r1, 16
@@ -1441,7 +1441,7 @@ sub_809A7B4: @ 809A7B4
bx r1 bx r1
.align 2, 0 .align 2, 0
_0809A7D8: .4byte gBagPockets _0809A7D8: .4byte gBagPockets
thumb_func_end sub_809A7B4 thumb_func_end BagGetQuantityByPocketPosition
thumb_func_start sub_809A7DC thumb_func_start sub_809A7DC
sub_809A7DC: @ 809A7DC sub_809A7DC: @ 809A7DC
+75 -75
View File
@@ -350,7 +350,7 @@ _0810806E:
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
ldr r0, _081080B0 @ =gUnknown_3005E70 ldr r0, _081080B0 @ =gMultiuseListMenuTemplate
ldrh r2, [r4, 0x6] ldrh r2, [r4, 0x6]
lsls r2, 1 lsls r2, 1
adds r1, r4, 0 adds r1, r4, 0
@@ -375,7 +375,7 @@ _0810806E:
b _08108104 b _08108104
.align 2, 0 .align 2, 0
_081080AC: .4byte gUnknown_203ACFC _081080AC: .4byte gUnknown_203ACFC
_081080B0: .4byte gUnknown_3005E70 _081080B0: .4byte gMultiuseListMenuTemplate
_081080B4: .4byte gTasks _081080B4: .4byte gTasks
_081080B8: _081080B8:
ldr r0, _081080C4 @ =gUnknown_203ACFC ldr r0, _081080C4 @ =gUnknown_203ACFC
@@ -881,7 +881,7 @@ _0810848C:
adds r0, r4 adds r0, r4
str r0, [r1] str r0, [r1]
str r6, [r1, 0x4] str r6, [r1, 0x4]
ldr r3, _08108554 @ =gUnknown_3005E70 ldr r3, _08108554 @ =gMultiuseListMenuTemplate
str r2, [r3] str r2, [r3]
ldr r0, _08108540 @ =gUnknown_203AD10 ldr r0, _08108540 @ =gUnknown_203AD10
ldr r2, [r0] ldr r2, [r0]
@@ -952,7 +952,7 @@ _08108544: .4byte gUnknown_203AD1C
_08108548: .4byte gUnknown_203AD18 _08108548: .4byte gUnknown_203AD18
_0810854C: .4byte gUnknown_8452F60 _0810854C: .4byte gUnknown_8452F60
_08108550: .4byte gFameCheckerText_Cancel _08108550: .4byte gFameCheckerText_Cancel
_08108554: .4byte gUnknown_3005E70 _08108554: .4byte gMultiuseListMenuTemplate
_08108558: .4byte sub_81085A4 _08108558: .4byte sub_81085A4
_0810855C: .4byte sub_8108654 _0810855C: .4byte sub_8108654
thumb_func_end sub_810842C thumb_func_end sub_810842C
@@ -1029,7 +1029,7 @@ _081085BA:
lsrs r0, 24 lsrs r0, 24
lsls r1, r5, 16 lsls r1, r5, 16
lsrs r1, 16 lsrs r1, 16
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r1, [r4] ldr r1, [r4]
@@ -1129,7 +1129,7 @@ _08108690:
lsls r4, 16 lsls r4, 16
lsrs r4, 16 lsrs r4, 16
adds r1, r4, 0 adds r1, r4, 0
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r7, r0, 16 lsrs r7, r0, 16
ldrb r0, [r5, 0x6] ldrb r0, [r5, 0x6]
@@ -1137,7 +1137,7 @@ _08108690:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r1, r4, 0 adds r1, r4, 0
bl sub_809A7B4 bl BagGetQuantityByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
ldrh r0, [r5, 0x6] ldrh r0, [r5, 0x6]
@@ -1155,7 +1155,7 @@ _08108690:
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, _08108724 @ =gStringVar4 ldr r4, _08108724 @ =gStringVar4
ldr r1, _08108728 @ =gUnknown_84162B9 ldr r1, _08108728 @ =gText_TimesStrVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
str r6, [sp] str r6, [sp]
@@ -1176,7 +1176,7 @@ _08108718: .4byte gUnknown_203AD10
_0810871C: .4byte gUnknown_203ACFC _0810871C: .4byte gUnknown_203ACFC
_08108720: .4byte gStringVar1 _08108720: .4byte gStringVar1
_08108724: .4byte gStringVar4 _08108724: .4byte gStringVar4
_08108728: .4byte gUnknown_84162B9 _08108728: .4byte gText_TimesStrVar1
_0810872C: _0810872C:
ldr r0, _08108760 @ =gSaveBlock1Ptr ldr r0, _08108760 @ =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
@@ -1317,7 +1317,7 @@ sub_8108818: @ 8108818
lsrs r0, 24 lsrs r0, 24
lsls r1, r2, 16 lsls r1, r2, 16
lsrs r1, 16 lsrs r1, 16
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl ItemId_GetDescription bl ItemId_GetDescription
@@ -1802,7 +1802,7 @@ sub_8108B8C: @ 8108B8C
adds r3, r4, 0 adds r3, r4, 0
adds r3, 0x8 adds r3, 0x8
adds r2, r3 adds r2, r3
bl sub_810713C bl DestroyListMenu
ldr r0, _08108BF0 @ =gUnknown_203AD10 ldr r0, _08108BF0 @ =gUnknown_203AD10
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0] ldr r0, [r0]
@@ -2422,14 +2422,14 @@ _08109084:
lsls r4, 16 lsls r4, 16
lsrs r4, 16 lsrs r4, 16
adds r1, r4, 0 adds r1, r4, 0
bl sub_809A7B4 bl BagGetQuantityByPocketPosition
strh r0, [r7, 0x4] strh r0, [r7, 0x4]
ldrb r0, [r5, 0x6] ldrb r0, [r5, 0x6]
adds r0, 0x1 adds r0, 0x1
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r1, r4, 0 adds r1, r4, 0
bl sub_809A798 bl BagGetItemIdByPocketPosition
ldr r1, _081090D0 @ =gSpecialVar_ItemId ldr r1, _081090D0 @ =gSpecialVar_ItemId
strh r0, [r1] strh r0, [r1]
ldr r1, _081090D4 @ =gTasks ldr r1, _081090D4 @ =gTasks
@@ -2617,7 +2617,7 @@ sub_81091D0: @ 81091D0
adds r1, r2, r1 adds r1, r2, r1
adds r3, 0x8 adds r3, 0x8
adds r2, r3 adds r2, r3
bl sub_810713C bl DestroyListMenu
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldr r0, _08109290 @ =gUnknown_203AD10 ldr r0, _08109290 @ =gUnknown_203AD10
@@ -2773,7 +2773,7 @@ _08109358:
bl sub_81087EC bl sub_81087EC
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_810842C bl sub_810842C
ldr r0, _081093B4 @ =gUnknown_3005E70 ldr r0, _081093B4 @ =gMultiuseListMenuTemplate
ldrh r2, [r4, 0x6] ldrh r2, [r4, 0x6]
lsls r2, 1 lsls r2, 1
adds r1, r4, 0 adds r1, r4, 0
@@ -2803,7 +2803,7 @@ _081093AA:
bx r0 bx r0
.align 2, 0 .align 2, 0
_081093B0: .4byte gUnknown_203ACFC _081093B0: .4byte gUnknown_203ACFC
_081093B4: .4byte gUnknown_3005E70 _081093B4: .4byte gMultiuseListMenuTemplate
thumb_func_end sub_8109298 thumb_func_end sub_8109298
thumb_func_start sub_81093B8 thumb_func_start sub_81093B8
@@ -2850,7 +2850,7 @@ sub_81093B8: @ 81093B8
lsrs r0, 24 lsrs r0, 24
mov r2, r8 mov r2, r8
ldrh r1, [r2, 0x2] ldrh r1, [r2, 0x2]
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl ItemId_GetItem bl ItemId_GetItem
@@ -3082,7 +3082,7 @@ _081095E8:
adds r7, r4, 0 adds r7, r4, 0
adds r7, 0x8 adds r7, 0x8
adds r2, r7 adds r2, r7
bl sub_810713C bl DestroyListMenu
movs r3, 0x2 movs r3, 0x2
ldrsh r0, [r6, r3] ldrsh r0, [r6, r3]
cmp r0, r5 cmp r0, r5
@@ -3096,7 +3096,7 @@ _081095E8:
_08109628: _08109628:
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_810842C bl sub_810842C
ldr r0, _08109674 @ =gUnknown_3005E70 ldr r0, _08109674 @ =gMultiuseListMenuTemplate
ldrh r2, [r4, 0x6] ldrh r2, [r4, 0x6]
lsls r2, 1 lsls r2, 1
mov r3, r8 mov r3, r8
@@ -3127,7 +3127,7 @@ _0810965C:
.align 2, 0 .align 2, 0
_0810966C: .4byte gBagPockets _0810966C: .4byte gBagPockets
_08109670: .4byte gUnknown_203ACFC _08109670: .4byte gUnknown_203ACFC
_08109674: .4byte gUnknown_3005E70 _08109674: .4byte gMultiuseListMenuTemplate
_08109678: .4byte sub_8108F0C _08109678: .4byte sub_8108F0C
thumb_func_end sub_81095AC thumb_func_end sub_81095AC
@@ -3160,7 +3160,7 @@ sub_810967C: @ 810967C
adds r7, r5, 0 adds r7, r5, 0
adds r7, 0x8 adds r7, 0x8
adds r2, r7 adds r2, r7
bl sub_810713C bl DestroyListMenu
movs r3, 0x2 movs r3, 0x2
ldrsh r0, [r6, r3] ldrsh r0, [r6, r3]
cmp r0, r4 cmp r0, r4
@@ -3174,7 +3174,7 @@ sub_810967C: @ 810967C
_081096CA: _081096CA:
ldrb r0, [r5, 0x6] ldrb r0, [r5, 0x6]
bl sub_810842C bl sub_810842C
ldr r0, _08109714 @ =gUnknown_3005E70 ldr r0, _08109714 @ =gMultiuseListMenuTemplate
ldrh r2, [r5, 0x6] ldrh r2, [r5, 0x6]
lsls r2, 1 lsls r2, 1
mov r3, r9 mov r3, r9
@@ -3204,7 +3204,7 @@ _081096CA:
.align 2, 0 .align 2, 0
_0810970C: .4byte gTasks+0x8 _0810970C: .4byte gTasks+0x8
_08109710: .4byte gUnknown_203ACFC _08109710: .4byte gUnknown_203ACFC
_08109714: .4byte gUnknown_3005E70 _08109714: .4byte gMultiuseListMenuTemplate
_08109718: .4byte sub_8108F0C _08109718: .4byte sub_8108F0C
thumb_func_end sub_810967C thumb_func_end sub_810967C
@@ -3232,7 +3232,7 @@ sub_810971C: @ 810971C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r1, r4, 0 adds r1, r4, 0
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r1, _081097D8 @ =gStringVar1 ldr r1, _081097D8 @ =gStringVar1
@@ -3267,7 +3267,7 @@ sub_810971C: @ 810971C
movs r2, 0x2 movs r2, 0x2
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r1, _081097E0 @ =gUnknown_84162B9 ldr r1, _081097E0 @ =gText_TimesStrVar1
mov r0, r9 mov r0, r9
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
@@ -3295,7 +3295,7 @@ sub_810971C: @ 810971C
_081097D4: .4byte gUnknown_203ACFC _081097D4: .4byte gUnknown_203ACFC
_081097D8: .4byte gStringVar1 _081097D8: .4byte gStringVar1
_081097DC: .4byte gStringVar4 _081097DC: .4byte gStringVar4
_081097E0: .4byte gUnknown_84162B9 _081097E0: .4byte gText_TimesStrVar1
thumb_func_end sub_810971C thumb_func_end sub_810971C
thumb_func_start sub_81097E4 thumb_func_start sub_81097E4
@@ -3324,7 +3324,7 @@ sub_81097E4: @ 81097E4
adds r3, r5, 0 adds r3, r5, 0
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, _0810984C @ =gStringVar4 ldr r4, _0810984C @ =gStringVar4
ldr r1, _08109850 @ =gUnknown_84162B9 ldr r1, _08109850 @ =gText_TimesStrVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
@@ -3347,7 +3347,7 @@ sub_81097E4: @ 81097E4
.align 2, 0 .align 2, 0
_08109848: .4byte gStringVar1 _08109848: .4byte gStringVar1
_0810984C: .4byte gStringVar4 _0810984C: .4byte gStringVar4
_08109850: .4byte gUnknown_84162B9 _08109850: .4byte gText_TimesStrVar1
thumb_func_end sub_81097E4 thumb_func_end sub_81097E4
thumb_func_start sub_8109854 thumb_func_start sub_8109854
@@ -4121,7 +4121,7 @@ sub_8109EA8: @ 8109EA8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r6, 0x2] ldrh r1, [r6, 0x2]
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r1, _08109F30 @ =gStringVar1 ldr r1, _08109F30 @ =gStringVar1
@@ -4213,14 +4213,14 @@ _08109F6E:
adds r6, r4, 0 adds r6, r4, 0
adds r6, 0x8 adds r6, 0x8
adds r2, r6 adds r2, r6
bl sub_810713C bl DestroyListMenu
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_8108DC8 bl sub_8108DC8
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_81089F4 bl sub_81089F4
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_810842C bl sub_810842C
ldr r0, _08109FFC @ =gUnknown_3005E70 ldr r0, _08109FFC @ =gMultiuseListMenuTemplate
ldrh r2, [r4, 0x6] ldrh r2, [r4, 0x6]
lsls r2, 1 lsls r2, 1
adds r5, r2, r5 adds r5, r2, r5
@@ -4251,7 +4251,7 @@ _08109FEC: .4byte gTasks+0x8
_08109FF0: .4byte gMain _08109FF0: .4byte gMain
_08109FF4: .4byte gSpecialVar_ItemId _08109FF4: .4byte gSpecialVar_ItemId
_08109FF8: .4byte gUnknown_203ACFC _08109FF8: .4byte gUnknown_203ACFC
_08109FFC: .4byte gUnknown_3005E70 _08109FFC: .4byte gMultiuseListMenuTemplate
thumb_func_end sub_8109F44 thumb_func_end sub_8109F44
thumb_func_start sub_810A000 thumb_func_start sub_810A000
@@ -4273,7 +4273,7 @@ sub_810A000: @ 810A000
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r7, 0x2] ldrh r1, [r7, 0x2]
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r2, r0, 16 lsrs r2, r0, 16
ldr r0, _0810A048 @ =gSaveBlock1Ptr ldr r0, _0810A048 @ =gSaveBlock1Ptr
@@ -4304,10 +4304,10 @@ _0810A052:
adds r6, r4, 0 adds r6, r4, 0
adds r6, 0x8 adds r6, 0x8
adds r2, r6 adds r2, r6
bl sub_810713C bl DestroyListMenu
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_810842C bl sub_810842C
ldr r0, _0810A0A4 @ =gUnknown_3005E70 ldr r0, _0810A0A4 @ =gMultiuseListMenuTemplate
ldrh r2, [r4, 0x6] ldrh r2, [r4, 0x6]
lsls r2, 1 lsls r2, 1
adds r5, r2, r5 adds r5, r2, r5
@@ -4330,7 +4330,7 @@ _0810A052:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0810A0A0: .4byte gUnknown_203ACFC _0810A0A0: .4byte gUnknown_203ACFC
_0810A0A4: .4byte gUnknown_3005E70 _0810A0A4: .4byte gMultiuseListMenuTemplate
thumb_func_end sub_810A000 thumb_func_end sub_810A000
thumb_func_start sub_810A0A8 thumb_func_start sub_810A0A8
@@ -4353,7 +4353,7 @@ sub_810A0A8: @ 810A0A8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r1, 0x2] ldrh r1, [r1, 0x2]
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
movs r0, 0xA movs r0, 0xA
@@ -4427,14 +4427,14 @@ sub_810A170: @ 810A170
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _0810A184 @ =gUnknown_841632A ldr r2, _0810A184 @ =gText_ThereIsNoPokemon
ldr r3, _0810A188 @ =sub_810A1D0 ldr r3, _0810A188 @ =sub_810A1D0
movs r1, 0x2 movs r1, 0x2
bl sub_8108E70 bl sub_8108E70
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0810A184: .4byte gUnknown_841632A _0810A184: .4byte gText_ThereIsNoPokemon
_0810A188: .4byte sub_810A1D0 _0810A188: .4byte sub_810A1D0
thumb_func_end sub_810A170 thumb_func_end sub_810A170
@@ -4449,7 +4449,7 @@ sub_810A18C: @ 810A18C
ldr r1, _0810A1C0 @ =gStringVar1 ldr r1, _0810A1C0 @ =gStringVar1
bl CopyItemName bl CopyItemName
ldr r5, _0810A1C4 @ =gStringVar4 ldr r5, _0810A1C4 @ =gStringVar4
ldr r1, _0810A1C8 @ =gUnknown_841635E ldr r1, _0810A1C8 @ =gText_ItemCantBeHeld
adds r0, r5, 0 adds r0, r5, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
ldr r3, _0810A1CC @ =sub_810A1D0 ldr r3, _0810A1CC @ =sub_810A1D0
@@ -4464,7 +4464,7 @@ sub_810A18C: @ 810A18C
_0810A1BC: .4byte gSpecialVar_ItemId _0810A1BC: .4byte gSpecialVar_ItemId
_0810A1C0: .4byte gStringVar1 _0810A1C0: .4byte gStringVar1
_0810A1C4: .4byte gStringVar4 _0810A1C4: .4byte gStringVar4
_0810A1C8: .4byte gUnknown_841635E _0810A1C8: .4byte gText_ItemCantBeHeld
_0810A1CC: .4byte sub_810A1D0 _0810A1CC: .4byte sub_810A1D0
thumb_func_end sub_810A18C thumb_func_end sub_810A18C
@@ -4519,14 +4519,14 @@ sub_810A1F8: @ 810A1F8
adds r3, r4 adds r3, r4
mov r9, r3 mov r9, r3
add r2, r9 add r2, r9
bl sub_810713C bl DestroyListMenu
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_8108DC8 bl sub_8108DC8
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_81089F4 bl sub_81089F4
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_810842C bl sub_810842C
ldr r0, _0810A284 @ =gUnknown_3005E70 ldr r0, _0810A284 @ =gMultiuseListMenuTemplate
ldrh r2, [r4, 0x6] ldrh r2, [r4, 0x6]
lsls r2, 1 lsls r2, 1
adds r6, r2, r6 adds r6, r2, r6
@@ -4553,7 +4553,7 @@ sub_810A1F8: @ 810A1F8
.align 2, 0 .align 2, 0
_0810A27C: .4byte gTasks+0x8 _0810A27C: .4byte gTasks+0x8
_0810A280: .4byte gUnknown_203ACFC _0810A280: .4byte gUnknown_203ACFC
_0810A284: .4byte gUnknown_3005E70 _0810A284: .4byte gMultiuseListMenuTemplate
thumb_func_end sub_810A1F8 thumb_func_end sub_810A1F8
thumb_func_start sub_810A288 thumb_func_start sub_810A288
@@ -4684,7 +4684,7 @@ sub_810A370: @ 810A370
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r1, 0x2] ldrh r1, [r1, 0x2]
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
adds r6, r4, 0 adds r6, r4, 0
@@ -4812,7 +4812,7 @@ sub_810A468: @ 810A468
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r1, 0x2] ldrh r1, [r1, 0x2]
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
adds r6, r4, 0 adds r6, r4, 0
@@ -4971,7 +4971,7 @@ _0810A5B4:
ldr r1, _0810A5E8 @ =gStringVar1 ldr r1, _0810A5E8 @ =gStringVar1
bl CopyItemName bl CopyItemName
ldr r4, _0810A5EC @ =gStringVar4 ldr r4, _0810A5EC @ =gStringVar4
ldr r1, _0810A5F0 @ =gUnknown_84168F1 ldr r1, _0810A5F0 @ =gText_OhNoICantBuyThat
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
bl sub_80BF8E4 bl sub_80BF8E4
@@ -4986,7 +4986,7 @@ _0810A5B4:
.align 2, 0 .align 2, 0
_0810A5E8: .4byte gStringVar1 _0810A5E8: .4byte gStringVar1
_0810A5EC: .4byte gStringVar4 _0810A5EC: .4byte gStringVar4
_0810A5F0: .4byte gUnknown_84168F1 _0810A5F0: .4byte gText_OhNoICantBuyThat
_0810A5F4: .4byte sub_810A1F8 _0810A5F4: .4byte sub_810A1F8
_0810A5F8: _0810A5F8:
movs r0, 0x1 movs r0, 0x1
@@ -5009,7 +5009,7 @@ _0810A618:
ldr r1, _0810A644 @ =gStringVar1 ldr r1, _0810A644 @ =gStringVar1
bl CopyItemName bl CopyItemName
ldr r4, _0810A648 @ =gStringVar4 ldr r4, _0810A648 @ =gStringVar4
ldr r1, _0810A64C @ =gUnknown_8416911 ldr r1, _0810A64C @ =gText_HowManyWouldYouLikeToSell
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
bl sub_80BF8E4 bl sub_80BF8E4
@@ -5027,7 +5027,7 @@ _0810A63E:
.align 2, 0 .align 2, 0
_0810A644: .4byte gStringVar1 _0810A644: .4byte gStringVar1
_0810A648: .4byte gStringVar4 _0810A648: .4byte gStringVar4
_0810A64C: .4byte gUnknown_8416911 _0810A64C: .4byte gText_HowManyWouldYouLikeToSell
_0810A650: .4byte sub_810A770 _0810A650: .4byte sub_810A770
thumb_func_end sub_810A568 thumb_func_end sub_810A568
@@ -5088,7 +5088,7 @@ sub_810A690: @ 810A690
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl itemid_get_market_price bl itemid_get_market_price
@@ -5102,7 +5102,7 @@ sub_810A690: @ 810A690
movs r3, 0x6 movs r3, 0x6
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, _0810A700 @ =gStringVar4 ldr r4, _0810A700 @ =gStringVar4
ldr r1, _0810A704 @ =gUnknown_8416936 ldr r1, _0810A704 @ =gText_ICanPayThisMuch_WouldThatBeOkay
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
bl sub_80BF8E4 bl sub_80BF8E4
@@ -5121,7 +5121,7 @@ _0810A6F4: .4byte gTasks+0x8
_0810A6F8: .4byte gStringVar3 _0810A6F8: .4byte gStringVar3
_0810A6FC: .4byte gUnknown_203ACFC _0810A6FC: .4byte gUnknown_203ACFC
_0810A700: .4byte gStringVar4 _0810A700: .4byte gStringVar4
_0810A704: .4byte gUnknown_8416936 _0810A704: .4byte gText_ICanPayThisMuch_WouldThatBeOkay
_0810A708: .4byte sub_810A70C _0810A708: .4byte sub_810A70C
thumb_func_end sub_810A690 thumb_func_end sub_810A690
@@ -5202,7 +5202,7 @@ sub_810A770: @ 810A770
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r6, _0810A824 @ =gStringVar4 ldr r6, _0810A824 @ =gStringVar4
ldr r1, _0810A828 @ =gUnknown_84162B9 ldr r1, _0810A828 @ =gText_TimesStrVar1
adds r0, r6, 0 adds r0, r6, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
@@ -5226,7 +5226,7 @@ sub_810A770: @ 810A770
lsrs r0, 24 lsrs r0, 24
mov r3, r9 mov r3, r9
ldrh r1, [r3, 0x2] ldrh r1, [r3, 0x2]
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl itemid_get_market_price bl itemid_get_market_price
@@ -5256,7 +5256,7 @@ sub_810A770: @ 810A770
_0810A81C: .4byte gTasks+0x8 _0810A81C: .4byte gTasks+0x8
_0810A820: .4byte gStringVar1 _0810A820: .4byte gStringVar1
_0810A824: .4byte gStringVar4 _0810A824: .4byte gStringVar4
_0810A828: .4byte gUnknown_84162B9 _0810A828: .4byte gText_TimesStrVar1
_0810A82C: .4byte gUnknown_203ACFC _0810A82C: .4byte gUnknown_203ACFC
_0810A830: .4byte sub_810A85C _0810A830: .4byte sub_810A85C
thumb_func_end sub_810A770 thumb_func_end sub_810A770
@@ -5311,7 +5311,7 @@ sub_810A85C: @ 810A85C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r5, 0x2] ldrh r1, [r5, 0x2]
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl itemid_get_market_price bl itemid_get_market_price
@@ -5405,7 +5405,7 @@ sub_810A940: @ 810A940
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
bl sub_809A798 bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl itemid_get_market_price bl itemid_get_market_price
@@ -5419,7 +5419,7 @@ sub_810A940: @ 810A940
movs r3, 0x6 movs r3, 0x6
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, _0810A9C8 @ =gStringVar4 ldr r4, _0810A9C8 @ =gStringVar4
ldr r1, _0810A9CC @ =gUnknown_8416959 ldr r1, _0810A9CC @ =gText_TurnedOverItemsWorthYen
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
ldr r3, _0810A9D0 @ =sub_810A9D4 ldr r3, _0810A9D0 @ =sub_810A9D4
@@ -5437,7 +5437,7 @@ _0810A9BC: .4byte gStringVar1
_0810A9C0: .4byte gStringVar3 _0810A9C0: .4byte gStringVar3
_0810A9C4: .4byte gUnknown_203ACFC _0810A9C4: .4byte gUnknown_203ACFC
_0810A9C8: .4byte gStringVar4 _0810A9C8: .4byte gStringVar4
_0810A9CC: .4byte gUnknown_8416959 _0810A9CC: .4byte gText_TurnedOverItemsWorthYen
_0810A9D0: .4byte sub_810A9D4 _0810A9D0: .4byte sub_810A9D4
thumb_func_end sub_810A940 thumb_func_end sub_810A940
@@ -5497,7 +5497,7 @@ sub_810A9D4: @ 810A9D4
adds r3, r4 adds r3, r4
mov r9, r3 mov r9, r3
add r2, r9 add r2, r9
bl sub_810713C bl DestroyListMenu
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_8108DC8 bl sub_8108DC8
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
@@ -5512,7 +5512,7 @@ sub_810A9D4: @ 810A9D4
strb r0, [r2, 0x5] strb r0, [r2, 0x5]
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_810842C bl sub_810842C
ldr r0, _0810AAEC @ =gUnknown_3005E70 ldr r0, _0810AAEC @ =gMultiuseListMenuTemplate
ldrh r2, [r4, 0x6] ldrh r2, [r4, 0x6]
lsls r2, 1 lsls r2, 1
adds r5, r2, r5 adds r5, r2, r5
@@ -5563,7 +5563,7 @@ _0810AADC: .4byte gSpecialVar_ItemId
_0810AAE0: .4byte gSaveBlock1Ptr _0810AAE0: .4byte gSaveBlock1Ptr
_0810AAE4: .4byte gUnknown_203ACFC _0810AAE4: .4byte gUnknown_203ACFC
_0810AAE8: .4byte gUnknown_203AD10 _0810AAE8: .4byte gUnknown_203AD10
_0810AAEC: .4byte gUnknown_3005E70 _0810AAEC: .4byte gMultiuseListMenuTemplate
_0810AAF0: .4byte sub_810AAF4 _0810AAF0: .4byte sub_810AAF4
thumb_func_end sub_810A9D4 thumb_func_end sub_810A9D4
@@ -6212,7 +6212,7 @@ _0810B01C:
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
bl sub_810AECC bl sub_810AECC
bl sub_8108CB4 bl sub_8108CB4
adds r0, r7, 0 adds r0, r7, 0
@@ -6342,11 +6342,11 @@ sub_810B108: @ 810B108
beq _0810B160 beq _0810B160
cmp r4, 0x8 cmp r4, 0x8
beq _0810B16C beq _0810B16C
ldr r2, _0810B15C @ =sub_815ABFC ldr r2, _0810B15C @ =CB2_ReturnToTeachyTV
adds r0, r4, 0 adds r0, r4, 0
b _0810B170 b _0810B170
.align 2, 0 .align 2, 0
_0810B15C: .4byte sub_815ABFC _0810B15C: .4byte CB2_ReturnToTeachyTV
_0810B160: _0810B160:
ldr r2, _0810B168 @ =sub_8030AEC ldr r2, _0810B168 @ =sub_8030AEC
movs r0, 0x7 movs r0, 0x7
@@ -6386,7 +6386,7 @@ _0810B19C:
bl sub_815AC20 bl sub_815AC20
ldr r0, _0810B1C4 @ =gUnknown_203AD10 ldr r0, _0810B1C4 @ =gUnknown_203AD10
ldr r1, [r0] ldr r1, [r0]
ldr r0, _0810B1C8 @ =sub_815ABFC ldr r0, _0810B1C8 @ =CB2_ReturnToTeachyTV
str r0, [r1] str r0, [r1]
ldr r1, _0810B1CC @ =gTasks ldr r1, _0810B1CC @ =gTasks
lsls r0, r4, 2 lsls r0, r4, 2
@@ -6402,7 +6402,7 @@ _0810B1BC:
bx r1 bx r1
.align 2, 0 .align 2, 0
_0810B1C4: .4byte gUnknown_203AD10 _0810B1C4: .4byte gUnknown_203AD10
_0810B1C8: .4byte sub_815ABFC _0810B1C8: .4byte CB2_ReturnToTeachyTV
_0810B1CC: .4byte gTasks _0810B1CC: .4byte gTasks
_0810B1D0: .4byte sub_810B070 _0810B1D0: .4byte sub_810B070
thumb_func_end sub_810B180 thumb_func_end sub_810B180
@@ -6537,10 +6537,10 @@ _0810B29E:
adds r6, r4, 0 adds r6, r4, 0
adds r6, 0x8 adds r6, 0x8
adds r2, r6 adds r2, r6
bl sub_810713C bl DestroyListMenu
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_810842C bl sub_810842C
ldr r0, _0810B328 @ =gUnknown_3005E70 ldr r0, _0810B328 @ =gMultiuseListMenuTemplate
ldrh r2, [r4, 0x6] ldrh r2, [r4, 0x6]
lsls r2, 1 lsls r2, 1
adds r5, r2, r5 adds r5, r2, r5
@@ -6565,7 +6565,7 @@ _0810B318: .4byte gSaveBlock1Ptr
_0810B31C: .4byte gSpecialVar_ItemId _0810B31C: .4byte gSpecialVar_ItemId
_0810B320: .4byte 0x00000296 _0810B320: .4byte 0x00000296
_0810B324: .4byte gUnknown_203ACFC _0810B324: .4byte gUnknown_203ACFC
_0810B328: .4byte gUnknown_3005E70 _0810B328: .4byte gMultiuseListMenuTemplate
_0810B32C: _0810B32C:
ldr r1, _0810B340 @ =gMain ldr r1, _0810B340 @ =gMain
movs r0, 0 movs r0, 0
@@ -6583,7 +6583,7 @@ _0810B344:
ldrb r0, [r7] ldrb r0, [r7]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
bl sub_810AECC bl sub_810AECC
bl sub_8108CB4 bl sub_8108CB4
adds r0, r6, 0 adds r0, r6, 0
@@ -6738,7 +6738,7 @@ _0810B468:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
bl sub_810AECC bl sub_810AECC
bl sub_8108CB4 bl sub_8108CB4
adds r0, r7, 0 adds r0, r7, 0
@@ -6854,7 +6854,7 @@ _0810B564:
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
bl sub_810AECC bl sub_810AECC
ldr r1, _0810B5B0 @ =gUnknown_3005E98 ldr r1, _0810B5B0 @ =gUnknown_3005E98
ldr r0, _0810B5B4 @ =ItemUseCB_Medicine ldr r0, _0810B5B4 @ =ItemUseCB_Medicine
@@ -6989,7 +6989,7 @@ _0810B68C:
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
bl sub_810AECC bl sub_810AECC
ldr r0, _0810B6D4 @ =gUnknown_203AD10 ldr r0, _0810B6D4 @ =gUnknown_203AD10
ldr r1, [r0] ldr r1, [r0]
+24 -24
View File
@@ -233,7 +233,7 @@ _0810D5CC:
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, _0810D5FC @ =gUnknown_3005E70 ldr r0, _0810D5FC @ =gMultiuseListMenuTemplate
ldr r2, _0810D600 @ =gUnknown_203ADCC ldr r2, _0810D600 @ =gUnknown_203ADCC
ldrh r1, [r2, 0x4] ldrh r1, [r2, 0x4]
ldrh r2, [r2, 0x6] ldrh r2, [r2, 0x6]
@@ -249,7 +249,7 @@ _0810D5CC:
b _0810D674 b _0810D674
.align 2, 0 .align 2, 0
_0810D5F8: .4byte sub_810DEA0 _0810D5F8: .4byte sub_810DEA0
_0810D5FC: .4byte gUnknown_3005E70 _0810D5FC: .4byte gMultiuseListMenuTemplate
_0810D600: .4byte gUnknown_203ADCC _0810D600: .4byte gUnknown_203ADCC
_0810D604: .4byte gTasks _0810D604: .4byte gTasks
_0810D608: _0810D608:
@@ -594,7 +594,7 @@ _0810D8A4:
movs r1, 0x2 movs r1, 0x2
negs r1, r1 negs r1, r1
str r1, [r0, 0x4] str r1, [r0, 0x4]
ldr r2, _0810D948 @ =gUnknown_3005E70 ldr r2, _0810D948 @ =gMultiuseListMenuTemplate
str r3, [r2] str r3, [r2]
ldr r0, _0810D940 @ =gUnknown_203ADBC ldr r0, _0810D940 @ =gUnknown_203ADBC
ldr r3, [r0] ldr r3, [r0]
@@ -658,7 +658,7 @@ _0810D938: .4byte gSaveBlock1Ptr
_0810D93C: .4byte gUnknown_203ADC4 _0810D93C: .4byte gUnknown_203ADC4
_0810D940: .4byte gUnknown_203ADBC _0810D940: .4byte gUnknown_203ADBC
_0810D944: .4byte gFameCheckerText_Cancel _0810D944: .4byte gFameCheckerText_Cancel
_0810D948: .4byte gUnknown_3005E70 _0810D948: .4byte gMultiuseListMenuTemplate
_0810D94C: .4byte sub_810D954 _0810D94C: .4byte sub_810D954
_0810D950: .4byte sub_810DA20 _0810D950: .4byte sub_810DA20
thumb_func_end sub_810D878 thumb_func_end sub_810D878
@@ -804,7 +804,7 @@ _0810DA58:
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, _0810DAAC @ =gStringVar4 ldr r4, _0810DAAC @ =gStringVar4
ldr r1, _0810DAB0 @ =gUnknown_84162B9 ldr r1, _0810DAB0 @ =gText_TimesStrVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
str r5, [sp] str r5, [sp]
@@ -828,7 +828,7 @@ _0810DA9E:
.align 2, 0 .align 2, 0
_0810DAA8: .4byte gStringVar1 _0810DAA8: .4byte gStringVar1
_0810DAAC: .4byte gStringVar4 _0810DAAC: .4byte gStringVar4
_0810DAB0: .4byte gUnknown_84162B9 _0810DAB0: .4byte gText_TimesStrVar1
thumb_func_end sub_810DA20 thumb_func_end sub_810DA20
thumb_func_start sub_810DAB4 thumb_func_start sub_810DAB4
@@ -1154,7 +1154,7 @@ sub_810DCE4: @ 810DCE4
ldr r4, _0810DD30 @ =gUnknown_203ADD0 ldr r4, _0810DD30 @ =gUnknown_203ADD0
adds r2, r4, 0x2 adds r2, r4, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl sub_810713C bl DestroyListMenu
ldr r0, _0810DD34 @ =gUnknown_203ADBC ldr r0, _0810DD34 @ =gUnknown_203ADBC
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0] ldr r0, [r0]
@@ -1731,7 +1731,7 @@ _0810E194:
ldr r5, _0810E1F4 @ =gUnknown_203ADD0 ldr r5, _0810E1F4 @ =gUnknown_203ADD0
adds r2, r5, 0x2 adds r2, r5, 0x2
adds r1, r5, 0 adds r1, r5, 0
bl sub_810713C bl DestroyListMenu
movs r1, 0x2 movs r1, 0x2
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
cmp r0, r4 cmp r0, r4
@@ -1742,7 +1742,7 @@ _0810E194:
strh r0, [r1, 0x6] strh r0, [r1, 0x6]
_0810E1C0: _0810E1C0:
bl sub_810D878 bl sub_810D878
ldr r0, _0810E1F8 @ =gUnknown_3005E70 ldr r0, _0810E1F8 @ =gMultiuseListMenuTemplate
subs r2, r5, 0x4 subs r2, r5, 0x4
ldrh r1, [r2, 0x4] ldrh r1, [r2, 0x4]
ldrh r2, [r2, 0x6] ldrh r2, [r2, 0x6]
@@ -1766,7 +1766,7 @@ _0810E1E6:
.align 2, 0 .align 2, 0
_0810E1F0: .4byte gSaveBlock1Ptr _0810E1F0: .4byte gSaveBlock1Ptr
_0810E1F4: .4byte gUnknown_203ADD0 _0810E1F4: .4byte gUnknown_203ADD0
_0810E1F8: .4byte gUnknown_3005E70 _0810E1F8: .4byte gMultiuseListMenuTemplate
_0810E1FC: .4byte sub_810DEA0 _0810E1FC: .4byte sub_810DEA0
thumb_func_end sub_810E160 thumb_func_end sub_810E160
@@ -1788,7 +1788,7 @@ sub_810E200: @ 810E200
ldr r5, _0810E268 @ =gUnknown_203ADD0 ldr r5, _0810E268 @ =gUnknown_203ADD0
adds r2, r5, 0x2 adds r2, r5, 0x2
adds r1, r5, 0 adds r1, r5, 0
bl sub_810713C bl DestroyListMenu
movs r1, 0x2 movs r1, 0x2
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
cmp r0, r4 cmp r0, r4
@@ -1799,7 +1799,7 @@ sub_810E200: @ 810E200
strh r0, [r1, 0x6] strh r0, [r1, 0x6]
_0810E234: _0810E234:
bl sub_810D878 bl sub_810D878
ldr r0, _0810E26C @ =gUnknown_3005E70 ldr r0, _0810E26C @ =gMultiuseListMenuTemplate
subs r2, r5, 0x4 subs r2, r5, 0x4
ldrh r1, [r2, 0x4] ldrh r1, [r2, 0x4]
ldrh r2, [r2, 0x6] ldrh r2, [r2, 0x6]
@@ -1822,7 +1822,7 @@ _0810E234:
.align 2, 0 .align 2, 0
_0810E264: .4byte gTasks+0x8 _0810E264: .4byte gTasks+0x8
_0810E268: .4byte gUnknown_203ADD0 _0810E268: .4byte gUnknown_203ADD0
_0810E26C: .4byte gUnknown_3005E70 _0810E26C: .4byte gMultiuseListMenuTemplate
_0810E270: .4byte sub_810DEA0 _0810E270: .4byte sub_810DEA0
thumb_func_end sub_810E200 thumb_func_end sub_810E200
@@ -2205,11 +2205,11 @@ sub_810E578: @ 810E578
ldr r4, _0810E5D8 @ =gUnknown_203ADD0 ldr r4, _0810E5D8 @ =gUnknown_203ADD0
adds r2, r4, 0x2 adds r2, r4, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl sub_810713C bl DestroyListMenu
bl sub_810DDA4 bl sub_810DDA4
bl sub_810DBF0 bl sub_810DBF0
bl sub_810D878 bl sub_810D878
ldr r0, _0810E5DC @ =gUnknown_3005E70 ldr r0, _0810E5DC @ =gMultiuseListMenuTemplate
subs r4, 0x4 subs r4, 0x4
ldrh r1, [r4, 0x4] ldrh r1, [r4, 0x4]
ldrh r2, [r4, 0x6] ldrh r2, [r4, 0x6]
@@ -2227,7 +2227,7 @@ sub_810E578: @ 810E578
.align 2, 0 .align 2, 0
_0810E5D4: .4byte gTasks+0x8 _0810E5D4: .4byte gTasks+0x8
_0810E5D8: .4byte gUnknown_203ADD0 _0810E5D8: .4byte gUnknown_203ADD0
_0810E5DC: .4byte gUnknown_3005E70 _0810E5DC: .4byte gMultiuseListMenuTemplate
thumb_func_end sub_810E578 thumb_func_end sub_810E578
thumb_func_start sub_810E5E0 thumb_func_start sub_810E5E0
@@ -2263,7 +2263,7 @@ sub_810E5E0: @ 810E5E0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r1, _0810E66C @ =gUnknown_84162B9 ldr r1, _0810E66C @ =gText_TimesStrVar1
adds r0, r5, 0 adds r0, r5, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x3 movs r0, 0x3
@@ -2290,7 +2290,7 @@ sub_810E5E0: @ 810E5E0
_0810E660: .4byte gStringVar1 _0810E660: .4byte gStringVar1
_0810E664: .4byte gStringVar4 _0810E664: .4byte gStringVar4
_0810E668: .4byte gUnknown_84177AC _0810E668: .4byte gUnknown_84177AC
_0810E66C: .4byte gUnknown_84162B9 _0810E66C: .4byte gText_TimesStrVar1
thumb_func_end sub_810E5E0 thumb_func_end sub_810E5E0
thumb_func_start sub_810E670 thumb_func_start sub_810E670
@@ -2317,7 +2317,7 @@ sub_810E670: @ 810E670
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, _0810E6D0 @ =gStringVar4 ldr r4, _0810E6D0 @ =gStringVar4
ldr r1, _0810E6D4 @ =gUnknown_84162B9 ldr r1, _0810E6D4 @ =gText_TimesStrVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
@@ -2340,7 +2340,7 @@ sub_810E670: @ 810E670
.align 2, 0 .align 2, 0
_0810E6CC: .4byte gStringVar1 _0810E6CC: .4byte gStringVar1
_0810E6D0: .4byte gStringVar4 _0810E6D0: .4byte gStringVar4
_0810E6D4: .4byte gUnknown_84162B9 _0810E6D4: .4byte gText_TimesStrVar1
thumb_func_end sub_810E670 thumb_func_end sub_810E670
thumb_func_start sub_810E6D8 thumb_func_start sub_810E6D8
@@ -2444,13 +2444,13 @@ sub_810E79C: @ 810E79C
bl ClearWindowTilemap bl ClearWindowTilemap
movs r0, 0 movs r0, 0
bl PutWindowTilemap bl PutWindowTilemap
ldr r1, _0810E7D4 @ =gUnknown_841632A ldr r1, _0810E7D4 @ =gText_ThereIsNoPokemon
ldr r2, _0810E7D8 @ =sub_810E848 ldr r2, _0810E7D8 @ =sub_810E848
adds r0, r4, 0 adds r0, r4, 0
bl sub_810EB30 bl sub_810EB30
b _0810E7EA b _0810E7EA
.align 2, 0 .align 2, 0
_0810E7D4: .4byte gUnknown_841632A _0810E7D4: .4byte gText_ThereIsNoPokemon
_0810E7D8: .4byte sub_810E848 _0810E7D8: .4byte sub_810E848
_0810E7DC: _0810E7DC:
ldr r0, _0810E7F0 @ =gUnknown_203ADBC ldr r0, _0810E7F0 @ =gUnknown_203ADBC
@@ -2610,7 +2610,7 @@ sub_810E8F0: @ 810E8F0
movs r1, 0xD0 movs r1, 0xD0
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
ldr r0, _0810E97C @ =gUnknown_841F408 ldr r0, _0810E97C @ =gTMCaseMainWindowPalette
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
@@ -2647,7 +2647,7 @@ _0810E95C:
.align 2, 0 .align 2, 0
_0810E974: .4byte gUnknown_8453F98 _0810E974: .4byte gUnknown_8453F98
_0810E978: .4byte 0x000003a3 _0810E978: .4byte 0x000003a3
_0810E97C: .4byte gUnknown_841F408 _0810E97C: .4byte gTMCaseMainWindowPalette
_0810E980: .4byte gUnknown_203ADD8 _0810E980: .4byte gUnknown_203ADD8
thumb_func_end sub_810E8F0 thumb_func_end sub_810E8F0
+14 -14
View File
@@ -1373,7 +1373,7 @@ _080E51AA:
adds r2, r3 adds r2, r3
movs r0, 0xFE movs r0, 0xFE
str r0, [r2] str r0, [r2]
ldr r2, _080E51FC @ =gUnknown_3005E70 ldr r2, _080E51FC @ =gMultiuseListMenuTemplate
adds r1, r2, 0 adds r1, r2, 0
ldr r0, _080E5200 @ =gUnknown_83FFA94 ldr r0, _080E5200 @ =gUnknown_83FFA94
ldm r0!, {r3,r5,r6} ldm r0!, {r3,r5,r6}
@@ -1397,7 +1397,7 @@ _080E51EC: .4byte gPlayerParty
_080E51F0: .4byte gMoveNames _080E51F0: .4byte gMoveNames
_080E51F4: .4byte gStringVar1 _080E51F4: .4byte gStringVar1
_080E51F8: .4byte gFameCheckerText_Cancel _080E51F8: .4byte gFameCheckerText_Cancel
_080E51FC: .4byte gUnknown_3005E70 _080E51FC: .4byte gMultiuseListMenuTemplate
_080E5200: .4byte gUnknown_83FFA94 _080E5200: .4byte gUnknown_83FFA94
thumb_func_end sub_80E50CC thumb_func_end sub_80E50CC
@@ -1523,7 +1523,7 @@ _080E52FA:
thumb_func_start sub_80E5300 thumb_func_start sub_80E5300
sub_80E5300: @ 80E5300 sub_80E5300: @ 80E5300
push {r4,lr} push {r4,lr}
ldr r0, _080E5330 @ =gUnknown_3005E70 ldr r0, _080E5330 @ =gMultiuseListMenuTemplate
ldr r4, _080E5334 @ =gUnknown_203AAB4 ldr r4, _080E5334 @ =gUnknown_203AAB4
ldr r2, [r4] ldr r2, [r4]
ldr r3, _080E5338 @ =0x00000a68 ldr r3, _080E5338 @ =0x00000a68
@@ -1544,7 +1544,7 @@ sub_80E5300: @ 80E5300
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E5330: .4byte gUnknown_3005E70 _080E5330: .4byte gMultiuseListMenuTemplate
_080E5334: .4byte gUnknown_203AAB4 _080E5334: .4byte gUnknown_203AAB4
_080E5338: .4byte 0x00000a68 _080E5338: .4byte 0x00000a68
_080E533C: .4byte 0x00000263 _080E533C: .4byte 0x00000263
@@ -1568,11 +1568,11 @@ sub_80E5340: @ 80E5340
movs r0, 0x2 movs r0, 0x2
movs r2, 0x1 movs r2, 0x1
movs r3, 0x4 movs r3, 0x4
bl sub_8107D68 bl blit_move_info_icon
ldrb r0, [r4, 0x1] ldrb r0, [r4, 0x1]
cmp r0, 0x1 cmp r0, 0x1
bhi _080E5388 bhi _080E5388
ldr r1, _080E5384 @ =gUnknown_8416213 ldr r1, _080E5384 @ =gText_ThreeHyphens
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
str r0, [sp, 0x4] str r0, [sp, 0x4]
@@ -1583,7 +1583,7 @@ sub_80E5340: @ 80E5340
b _080E53A6 b _080E53A6
.align 2, 0 .align 2, 0
_080E5380: .4byte gBattleMoves _080E5380: .4byte gBattleMoves
_080E5384: .4byte gUnknown_8416213 _080E5384: .4byte gText_ThreeHyphens
_080E5388: _080E5388:
ldrb r1, [r4, 0x1] ldrb r1, [r4, 0x1]
add r0, sp, 0x8 add r0, sp, 0x8
@@ -1608,7 +1608,7 @@ _080E53A6:
adds r4, r1, 0 adds r4, r1, 0
cmp r2, 0 cmp r2, 0
bne _080E53D4 bne _080E53D4
ldr r1, _080E53D0 @ =gUnknown_8416213 ldr r1, _080E53D0 @ =gText_ThreeHyphens
str r2, [sp] str r2, [sp]
movs r0, 0x1 movs r0, 0x1
str r0, [sp, 0x4] str r0, [sp, 0x4]
@@ -1619,7 +1619,7 @@ _080E53A6:
b _080E53F4 b _080E53F4
.align 2, 0 .align 2, 0
_080E53CC: .4byte gBattleMoves _080E53CC: .4byte gBattleMoves
_080E53D0: .4byte gUnknown_8416213 _080E53D0: .4byte gText_ThreeHyphens
_080E53D4: _080E53D4:
ldrb r1, [r0, 0x3] ldrb r1, [r0, 0x3]
add r0, sp, 0x8 add r0, sp, 0x8
@@ -1680,27 +1680,27 @@ sub_80E5444: @ 80E5444
movs r1, 0x13 movs r1, 0x13
movs r2, 0x1 movs r2, 0x1
movs r3, 0x4 movs r3, 0x4
bl sub_8107D68 bl blit_move_info_icon
movs r0, 0x1 movs r0, 0x1
movs r1, 0x14 movs r1, 0x14
movs r2, 0 movs r2, 0
movs r3, 0x4 movs r3, 0x4
bl sub_8107D68 bl blit_move_info_icon
movs r0, 0x1 movs r0, 0x1
movs r1, 0x15 movs r1, 0x15
movs r2, 0 movs r2, 0
movs r3, 0x13 movs r3, 0x13
bl sub_8107D68 bl blit_move_info_icon
movs r0, 0 movs r0, 0
movs r1, 0x16 movs r1, 0x16
movs r2, 0x1 movs r2, 0x1
movs r3, 0x13 movs r3, 0x13
bl sub_8107D68 bl blit_move_info_icon
movs r0, 0 movs r0, 0
movs r1, 0x17 movs r1, 0x17
movs r2, 0x1 movs r2, 0x1
movs r3, 0x22 movs r3, 0x22
bl sub_8107D68 bl blit_move_info_icon
movs r0, 0 movs r0, 0
bl PutWindowTilemap bl PutWindowTilemap
movs r0, 0x1 movs r0, 0x1
+2 -2
View File
@@ -3308,7 +3308,7 @@ _0800AD30:
lsls r1, 8 lsls r1, 8
movs r0, 0 movs r0, 0
bl ClearGpuRegBits bl ClearGpuRegBits
ldr r0, _0800AE08 @ =gUnknown_841F408 ldr r0, _0800AE08 @ =gTMCaseMainWindowPalette
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
@@ -3343,7 +3343,7 @@ _0800ADF8: .4byte sub_800978C
_0800ADFC: .4byte gUnknown_82345E8 _0800ADFC: .4byte gUnknown_82345E8
_0800AE00: .4byte gUnknown_2022860 _0800AE00: .4byte gUnknown_2022860
_0800AE04: .4byte gUnknown_82345F0 _0800AE04: .4byte gUnknown_82345F0
_0800AE08: .4byte gUnknown_841F408 _0800AE08: .4byte gTMCaseMainWindowPalette
_0800AE0C: .4byte gSoftResetDisabled _0800AE0C: .4byte gSoftResetDisabled
_0800AE10: .4byte sub_80094D4 _0800AE10: .4byte sub_80094D4
_0800AE14: .4byte gMain _0800AE14: .4byte gMain
+25 -25
View File
@@ -402,7 +402,7 @@ _08115B5C:
ldrb r0, [r5, 0xF] ldrb r0, [r5, 0xF]
movs r1, 0 movs r1, 0
bl DrawStdWindowFrame bl DrawStdWindowFrame
ldr r0, _08115C58 @ =gUnknown_3005E70 ldr r0, _08115C58 @ =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, _08115C5C @ =gUnknown_8456D34 ldr r1, _08115C5C @ =gUnknown_8456D34
ldm r1!, {r3,r6,r7} ldm r1!, {r3,r6,r7}
@@ -434,7 +434,7 @@ _08115C48: .4byte gUnknown_8456CD0
_08115C4C: .4byte gUnknown_8456CFC _08115C4C: .4byte gUnknown_8456CFC
_08115C50: .4byte gUnknown_8456D04 _08115C50: .4byte gUnknown_8456D04
_08115C54: .4byte gUnknown_845747C _08115C54: .4byte gUnknown_845747C
_08115C58: .4byte gUnknown_3005E70 _08115C58: .4byte gMultiuseListMenuTemplate
_08115C5C: .4byte gUnknown_8456D34 _08115C5C: .4byte gUnknown_8456D34
_08115C60: _08115C60:
ldr r0, _08115C98 @ =gStringVar1 ldr r0, _08115C98 @ =gStringVar1
@@ -1139,7 +1139,7 @@ sub_81161E4: @ 81161E4
ldrb r0, [r4, 0x12] ldrb r0, [r4, 0x12]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
ldrb r0, [r4, 0x10] ldrb r0, [r4, 0x10]
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r4, 0xF] ldrb r0, [r4, 0xF]
@@ -1920,7 +1920,7 @@ _08116838:
ldrb r0, [r6, 0xB] ldrb r0, [r6, 0xB]
movs r1, 0 movs r1, 0
bl DrawStdWindowFrame bl DrawStdWindowFrame
ldr r0, _081168FC @ =gUnknown_3005E70 ldr r0, _081168FC @ =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, _08116900 @ =gUnknown_8456DDC ldr r1, _08116900 @ =gUnknown_8456DDC
ldm r1!, {r3,r5,r7} ldm r1!, {r3,r5,r7}
@@ -1955,7 +1955,7 @@ _081168EC: .4byte gUnknown_8456CD0
_081168F0: .4byte gUnknown_8456D4C _081168F0: .4byte gUnknown_8456D4C
_081168F4: .4byte gUnknown_8456D54 _081168F4: .4byte gUnknown_8456D54
_081168F8: .4byte gUnknown_8458FC8 _081168F8: .4byte gUnknown_8458FC8
_081168FC: .4byte gUnknown_3005E70 _081168FC: .4byte gMultiuseListMenuTemplate
_08116900: .4byte gUnknown_8456DDC _08116900: .4byte gUnknown_8456DDC
_08116904: _08116904:
bl sub_8116FE4 bl sub_8116FE4
@@ -2322,7 +2322,7 @@ _08116C10:
ldrb r0, [r6, 0xE] ldrb r0, [r6, 0xE]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
ldrb r0, [r6, 0xC] ldrb r0, [r6, 0xC]
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r6, 0xB] ldrb r0, [r6, 0xB]
@@ -4068,7 +4068,7 @@ _08117AB8:
strb r0, [r5, 0xF] strb r0, [r5, 0xF]
ldrb r0, [r5, 0xF] ldrb r0, [r5, 0xF]
bl sub_814240C bl sub_814240C
ldr r0, _08117B74 @ =gUnknown_3005E70 ldr r0, _08117B74 @ =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, _08117B78 @ =gUnknown_8456D34 ldr r1, _08117B78 @ =gUnknown_8456D34
ldm r1!, {r3,r4,r6} ldm r1!, {r3,r4,r6}
@@ -4089,7 +4089,7 @@ _08117AB8:
.align 2, 0 .align 2, 0
_08117B6C: .4byte gUnknown_8456CFC _08117B6C: .4byte gUnknown_8456CFC
_08117B70: .4byte 0x0000ffff _08117B70: .4byte 0x0000ffff
_08117B74: .4byte gUnknown_3005E70 _08117B74: .4byte gMultiuseListMenuTemplate
_08117B78: .4byte gUnknown_8456D34 _08117B78: .4byte gUnknown_8456D34
_08117B7C: _08117B7C:
ldr r0, _08117B9C @ =gStringVar1 ldr r0, _08117B9C @ =gStringVar1
@@ -4398,7 +4398,7 @@ _08117DEE:
ldrb r0, [r5, 0x12] ldrb r0, [r5, 0x12]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
movs r0, 0 movs r0, 0
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF] ldrb r0, [r5, 0xF]
@@ -4457,7 +4457,7 @@ _08117E80:
ldrb r0, [r5, 0x12] ldrb r0, [r5, 0x12]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
movs r0, 0 movs r0, 0
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF] ldrb r0, [r5, 0xF]
@@ -4624,7 +4624,7 @@ _08117FC0:
strb r0, [r5, 0xD] strb r0, [r5, 0xD]
ldrb r0, [r5, 0xB] ldrb r0, [r5, 0xB]
bl sub_814240C bl sub_814240C
ldr r0, _08118068 @ =gUnknown_3005E70 ldr r0, _08118068 @ =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, _0811806C @ =gUnknown_8456DDC ldr r1, _0811806C @ =gUnknown_8456DDC
ldm r1!, {r3,r6,r7} ldm r1!, {r3,r6,r7}
@@ -4659,7 +4659,7 @@ _08117FC0:
_0811805C: .4byte gUnknown_8456D4C _0811805C: .4byte gUnknown_8456D4C
_08118060: .4byte 0x0000ffff _08118060: .4byte 0x0000ffff
_08118064: .4byte gUnknown_8456D54 _08118064: .4byte gUnknown_8456D54
_08118068: .4byte gUnknown_3005E70 _08118068: .4byte gMultiuseListMenuTemplate
_0811806C: .4byte gUnknown_8456DDC _0811806C: .4byte gUnknown_8456DDC
_08118070: _08118070:
bl sub_8116FE4 bl sub_8116FE4
@@ -4842,7 +4842,7 @@ _081181EC:
ldrb r0, [r5, 0xE] ldrb r0, [r5, 0xE]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
movs r0, 0 movs r0, 0
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xD] ldrb r0, [r5, 0xD]
@@ -5042,7 +5042,7 @@ _08118380:
strb r0, [r5, 0xB] strb r0, [r5, 0xB]
ldrb r0, [r5, 0xB] ldrb r0, [r5, 0xB]
bl sub_814240C bl sub_814240C
ldr r0, _08118400 @ =gUnknown_3005E70 ldr r0, _08118400 @ =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, _08118404 @ =gUnknown_8456DDC ldr r1, _08118404 @ =gUnknown_8456DDC
ldm r1!, {r3,r4,r6} ldm r1!, {r3,r4,r6}
@@ -5066,7 +5066,7 @@ _081183EC:
.align 2, 0 .align 2, 0
_081183F8: .4byte gUnknown_8456D4C _081183F8: .4byte gUnknown_8456D4C
_081183FC: .4byte 0x0000ffff _081183FC: .4byte 0x0000ffff
_08118400: .4byte gUnknown_3005E70 _08118400: .4byte gMultiuseListMenuTemplate
_08118404: .4byte gUnknown_8456DDC _08118404: .4byte gUnknown_8456DDC
_08118408: _08118408:
bl sub_8116FE4 bl sub_8116FE4
@@ -5242,7 +5242,7 @@ _08118564:
ldrb r0, [r5, 0xE] ldrb r0, [r5, 0xE]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
movs r0, 0 movs r0, 0
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xB] ldrb r0, [r5, 0xB]
@@ -8689,7 +8689,7 @@ _0811A234:
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
bl DrawStdWindowFrame bl DrawStdWindowFrame
ldr r0, _0811A270 @ =gUnknown_3005E70 ldr r0, _0811A270 @ =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, [sp, 0x1C] ldr r1, [sp, 0x1C]
ldm r1!, {r3,r4,r6} ldm r1!, {r3,r4,r6}
@@ -8711,7 +8711,7 @@ _0811A234:
strb r0, [r7] strb r0, [r7]
b _0811A2DA b _0811A2DA
.align 2, 0 .align 2, 0
_0811A270: .4byte gUnknown_3005E70 _0811A270: .4byte gMultiuseListMenuTemplate
_0811A274: _0811A274:
mov r3, r9 mov r3, r9
ldrb r0, [r3] ldrb r0, [r3]
@@ -8726,7 +8726,7 @@ _0811A274:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl ClearStdWindowAndFrame bl ClearStdWindowAndFrame
@@ -8747,7 +8747,7 @@ _0811A2B0:
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl ClearStdWindowAndFrame bl ClearStdWindowAndFrame
@@ -8795,7 +8795,7 @@ _0811A308:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl DrawStdWindowFrame bl DrawStdWindowFrame
ldr r0, _0811A354 @ =gUnknown_3005E70 ldr r0, _0811A354 @ =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, [sp, 0x20] ldr r1, [sp, 0x20]
ldm r1!, {r3,r6,r7} ldm r1!, {r3,r6,r7}
@@ -8818,7 +8818,7 @@ _0811A308:
b _0811A3E6 b _0811A3E6
.align 2, 0 .align 2, 0
_0811A350: .4byte gUnknown_8456F1C _0811A350: .4byte gUnknown_8456F1C
_0811A354: .4byte gUnknown_3005E70 _0811A354: .4byte gMultiuseListMenuTemplate
_0811A358: _0811A358:
ldrb r0, [r5] ldrb r0, [r5]
bl ListMenuHandleInput bl ListMenuHandleInput
@@ -8842,7 +8842,7 @@ _0811A37E:
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl ClearStdWindowAndFrame bl ClearStdWindowAndFrame
@@ -8867,7 +8867,7 @@ _0811A3AC:
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl ClearStdWindowAndFrame bl ClearStdWindowAndFrame
@@ -9999,7 +9999,7 @@ _0811AC3C:
adds r0, r6, 0 adds r0, r6, 0
movs r2, 0x44 movs r2, 0x44
adds r3, r5, 0 adds r3, r5, 0
bl sub_8107D68 bl blit_move_info_icon
movs r0, 0xB movs r0, 0xB
mov r2, r8 mov r2, r8
muls r2, r0 muls r2, r0
+9 -9
View File
@@ -62,7 +62,7 @@ _08106F24:
ldr r1, [sp, 0x4] ldr r1, [sp, 0x4]
bl sub_8150048 bl sub_8150048
_08106F34: _08106F34:
ldr r0, _08106F64 @ =gUnknown_3005E70 ldr r0, _08106F64 @ =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, [sp] ldr r1, [sp]
ldm r1!, {r3-r5} ldm r1!, {r3-r5}
@@ -84,7 +84,7 @@ _08106F34:
b _08106FE4 b _08106FE4
.align 2, 0 .align 2, 0
_08106F60: .4byte gUnknown_203ACF4 _08106F60: .4byte gUnknown_203ACF4
_08106F64: .4byte gUnknown_3005E70 _08106F64: .4byte gMultiuseListMenuTemplate
_08106F68: _08106F68:
ldrb r0, [r5, 0x6] ldrb r0, [r5, 0x6]
bl ListMenuHandleInput bl ListMenuHandleInput
@@ -139,7 +139,7 @@ _08106FCC:
ldrb r0, [r5, 0x6] ldrb r0, [r5, 0x6]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
ldrb r0, [r5, 0x5] ldrb r0, [r5, 0x5]
bl RemoveWindow bl RemoveWindow
movs r0, 0 movs r0, 0
@@ -340,8 +340,8 @@ _08107136:
bx r1 bx r1
thumb_func_end ListMenuHandleInput thumb_func_end ListMenuHandleInput
thumb_func_start sub_810713C thumb_func_start DestroyListMenu
sub_810713C: @ 810713C DestroyListMenu: @ 810713C
push {r4,lr} push {r4,lr}
adds r3, r1, 0 adds r3, r1, 0
lsls r0, 24 lsls r0, 24
@@ -377,7 +377,7 @@ _08107170:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0810717C: .4byte gTasks+0x8 _0810717C: .4byte gTasks+0x8
thumb_func_end sub_810713C thumb_func_end DestroyListMenu
thumb_func_start sub_8107180 thumb_func_start sub_8107180
sub_8107180: @ 8107180 sub_8107180: @ 8107180
@@ -1976,8 +1976,8 @@ _08107D56:
_08107D64: .4byte gUnknown_8E95DBC _08107D64: .4byte gUnknown_8E95DBC
thumb_func_end sub_8107D38 thumb_func_end sub_8107D38
thumb_func_start sub_8107D68 thumb_func_start blit_move_info_icon
sub_8107D68: @ 8107D68 blit_move_info_icon: @ 8107D68
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x18 sub sp, 0x18
lsls r0, 24 lsls r0, 24
@@ -2014,6 +2014,6 @@ sub_8107D68: @ 8107D68
.align 2, 0 .align 2, 0
_08107DAC: .4byte gUnknown_8452C94 _08107DAC: .4byte gUnknown_8452C94
_08107DB0: .4byte gUnknown_8E95DDC _08107DB0: .4byte gUnknown_8E95DDC
thumb_func_end sub_8107D68 thumb_func_end blit_move_info_icon
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
+2 -2
View File
@@ -176,7 +176,7 @@ sub_810EC98: @ 810EC98
ldr r7, _0810ED50 @ =gUnknown_203ADE0 ldr r7, _0810ED50 @ =gUnknown_203ADE0
ldr r0, _0810ED54 @ =gFameCheckerText_Cancel ldr r0, _0810ED54 @ =gFameCheckerText_Cancel
mov r12, r0 mov r12, r0
ldr r5, _0810ED58 @ =gUnknown_3005E70 ldr r5, _0810ED58 @ =gMultiuseListMenuTemplate
ldr r1, _0810ED5C @ =gUnknown_203ADDC ldr r1, _0810ED5C @ =gUnknown_203ADDC
mov r8, r1 mov r8, r1
ldrb r0, [r6, 0x5] ldrb r0, [r6, 0x5]
@@ -263,7 +263,7 @@ _0810ECCE:
.align 2, 0 .align 2, 0
_0810ED50: .4byte gUnknown_203ADE0 _0810ED50: .4byte gUnknown_203ADE0
_0810ED54: .4byte gFameCheckerText_Cancel _0810ED54: .4byte gFameCheckerText_Cancel
_0810ED58: .4byte gUnknown_3005E70 _0810ED58: .4byte gMultiuseListMenuTemplate
_0810ED5C: .4byte gUnknown_203ADDC _0810ED5C: .4byte gUnknown_203ADDC
_0810ED60: .4byte gUnknown_8454003 _0810ED60: .4byte gUnknown_8454003
_0810ED64: .4byte sub_810ED6C _0810ED64: .4byte sub_810ED6C
+3 -3
View File
@@ -182,8 +182,8 @@ _080BF5C8: .4byte gTasks
_080BF5CC: .4byte gUnknown_20399C8 _080BF5CC: .4byte gUnknown_20399C8
thumb_func_end sub_80BF560 thumb_func_end sub_80BF560
thumb_func_start sub_80BF5D0 thumb_func_start CreateYesNoMenuWithCallbacks
sub_80BF5D0: @ 80BF5D0 CreateYesNoMenuWithCallbacks: @ 80BF5D0
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0xC sub sp, 0xC
adds r6, r0, 0 adds r6, r0, 0
@@ -228,7 +228,7 @@ sub_80BF5D0: @ 80BF5D0
_080BF624: .4byte gUnknown_20399C8 _080BF624: .4byte gUnknown_20399C8
_080BF628: .4byte gTasks _080BF628: .4byte gTasks
_080BF62C: .4byte sub_80BF560 _080BF62C: .4byte sub_80BF560
thumb_func_end sub_80BF5D0 thumb_func_end CreateYesNoMenuWithCallbacks
thumb_func_start GetLRKeysState thumb_func_start GetLRKeysState
GetLRKeysState: @ 80BF630 GetLRKeysState: @ 80BF630
+8 -8
View File
@@ -2049,14 +2049,14 @@ _080F77A4:
thumb_func_start sub_80F77B8 thumb_func_start sub_80F77B8
sub_80F77B8: @ 80F77B8 sub_80F77B8: @ 80F77B8
push {lr} push {lr}
ldr r0, _080F77C8 @ =gUnknown_841F408 ldr r0, _080F77C8 @ =gTMCaseMainWindowPalette
movs r1, 0xE0 movs r1, 0xE0
movs r2, 0x14 movs r2, 0x14
bl LoadPalette bl LoadPalette
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F77C8: .4byte gUnknown_841F408 _080F77C8: .4byte gTMCaseMainWindowPalette
thumb_func_end sub_80F77B8 thumb_func_end sub_80F77B8
thumb_func_start Menu_LoadStdPalAt thumb_func_start Menu_LoadStdPalAt
@@ -2065,21 +2065,21 @@ Menu_LoadStdPalAt: @ 80F77CC
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
ldr r0, _080F77E0 @ =gUnknown_841F408 ldr r0, _080F77E0 @ =gTMCaseMainWindowPalette
movs r2, 0x14 movs r2, 0x14
bl LoadPalette bl LoadPalette
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F77E0: .4byte gUnknown_841F408 _080F77E0: .4byte gTMCaseMainWindowPalette
thumb_func_end Menu_LoadStdPalAt thumb_func_end Menu_LoadStdPalAt
thumb_func_start sub_80F77E4 thumb_func_start sub_80F77E4
sub_80F77E4: @ 80F77E4 sub_80F77E4: @ 80F77E4
ldr r0, _080F77E8 @ =gUnknown_841F408 ldr r0, _080F77E8 @ =gTMCaseMainWindowPalette
bx lr bx lr
.align 2, 0 .align 2, 0
_080F77E8: .4byte gUnknown_841F408 _080F77E8: .4byte gTMCaseMainWindowPalette
thumb_func_end sub_80F77E4 thumb_func_end sub_80F77E4
thumb_func_start sub_80F77EC thumb_func_start sub_80F77EC
@@ -2091,14 +2091,14 @@ sub_80F77EC: @ 80F77EC
bls _080F77F8 bls _080F77F8
movs r1, 0 movs r1, 0
_080F77F8: _080F77F8:
ldr r0, _080F7804 @ =gUnknown_841F408 ldr r0, _080F7804 @ =gTMCaseMainWindowPalette
lsls r1, 1 lsls r1, 1
adds r1, r0 adds r1, r0
ldrh r0, [r1] ldrh r0, [r1]
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_080F7804: .4byte gUnknown_841F408 _080F7804: .4byte gTMCaseMainWindowPalette
thumb_func_end sub_80F77EC thumb_func_end sub_80F77EC
thumb_func_start DisplayItemMessageOnField thumb_func_start DisplayItemMessageOnField
+4 -4
View File
@@ -4879,12 +4879,12 @@ sub_8120FB0: @ 8120FB0
bl FreeRestoreBattleData bl FreeRestoreBattleData
bl LoadPlayerParty bl LoadPlayerParty
bl sub_815AC20 bl sub_815AC20
ldr r0, _08120FC8 @ =sub_815ABFC ldr r0, _08120FC8 @ =CB2_ReturnToTeachyTV
bl SetMainCallback2 bl SetMainCallback2
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08120FC8: .4byte sub_815ABFC _08120FC8: .4byte CB2_ReturnToTeachyTV
thumb_func_end sub_8120FB0 thumb_func_end sub_8120FB0
thumb_func_start sub_8120FCC thumb_func_start sub_8120FCC
@@ -5149,7 +5149,7 @@ _081211E4: .4byte gUnknown_203B0A0
_081211E8: .4byte gFameCheckerText_Cancel _081211E8: .4byte gFameCheckerText_Cancel
_081211EC: .4byte gUnknown_8459FFC _081211EC: .4byte gUnknown_8459FFC
_081211F0: _081211F0:
ldr r4, _08121240 @ =gUnknown_84161C8 ldr r4, _08121240 @ =gOtherText_Exit
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -5187,7 +5187,7 @@ _08121238:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08121240: .4byte gUnknown_84161C8 _08121240: .4byte gOtherText_Exit
_08121244: .4byte gUnknown_8459FFC _08121244: .4byte gUnknown_8459FFC
thumb_func_end sub_81210F8 thumb_func_end sub_81210F8
+4 -4
View File
@@ -1174,7 +1174,7 @@ _080EBFB6:
ldrb r0, [r4, 0x16] ldrb r0, [r4, 0x16]
adds r1, r7, 0 adds r1, r7, 0
mov r2, r8 mov r2, r8
bl sub_810713C bl DestroyListMenu
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
mov r1, r8 mov r1, r8
@@ -1288,7 +1288,7 @@ sub_80EC094: @ 80EC094
ldrb r0, [r4, 0x16] ldrb r0, [r4, 0x16]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
bl sub_810EDB0 bl sub_810EDB0
@@ -1852,14 +1852,14 @@ sub_80EC520: @ 80EC520
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _080EC534 @ =gUnknown_841632A ldr r2, _080EC534 @ =gText_ThereIsNoPokemon
ldr r3, _080EC538 @ =sub_80EC574 ldr r3, _080EC538 @ =sub_80EC574
movs r1, 0x2 movs r1, 0x2
bl DisplayItemMessageOnField bl DisplayItemMessageOnField
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080EC534: .4byte gUnknown_841632A _080EC534: .4byte gText_ThereIsNoPokemon
_080EC538: .4byte sub_80EC574 _080EC538: .4byte sub_80EC574
thumb_func_end sub_80EC520 thumb_func_end sub_80EC520
+11 -11
View File
@@ -754,7 +754,7 @@ _08102B24:
adds r1, r2, 0 adds r1, r2, 0
adds r1, 0x12 adds r1, 0x12
adds r2, 0x10 adds r2, 0x10
bl sub_810713C bl DestroyListMenu
movs r0, 0x20 movs r0, 0x20
str r0, [sp] str r0, [sp]
movs r0, 0x14 movs r0, 0x14
@@ -804,7 +804,7 @@ _08102B94:
adds r1, r2, 0 adds r1, r2, 0
adds r1, 0x12 adds r1, 0x12
adds r2, 0x10 adds r2, 0x10
bl sub_810713C bl DestroyListMenu
movs r0, 0x1 movs r0, 0x1
bl HideBg bl HideBg
ldr r0, [r4] ldr r0, [r4]
@@ -832,7 +832,7 @@ _08102BD8:
adds r1, r2, 0 adds r1, r2, 0
adds r1, 0x12 adds r1, 0x12
adds r2, 0x10 adds r2, 0x10
bl sub_810713C bl DestroyListMenu
movs r0, 0x1 movs r0, 0x1
bl HideBg bl HideBg
ldr r0, [r4] ldr r0, [r4]
@@ -2467,7 +2467,7 @@ _0810399C:
adds r1, r2, 0 adds r1, r2, 0
adds r1, 0x36 adds r1, 0x36
adds r2, 0x34 adds r2, 0x34
bl sub_810713C bl DestroyListMenu
b _081039E8 b _081039E8
.align 2, 0 .align 2, 0
_081039B4: .4byte gUnknown_203ACF0 _081039B4: .4byte gUnknown_203ACF0
@@ -2480,7 +2480,7 @@ _081039B8:
adds r1, r2, 0 adds r1, r2, 0
adds r1, 0x3A adds r1, 0x3A
adds r2, 0x38 adds r2, 0x38
bl sub_810713C bl DestroyListMenu
b _081039E8 b _081039E8
.align 2, 0 .align 2, 0
_081039D0: .4byte gUnknown_203ACF0 _081039D0: .4byte gUnknown_203ACF0
@@ -2493,7 +2493,7 @@ _081039D4:
adds r1, r2, 0 adds r1, r2, 0
adds r1, 0x3E adds r1, 0x3E
adds r2, 0x3C adds r2, 0x3C
bl sub_810713C bl DestroyListMenu
_081039E8: _081039E8:
pop {r0} pop {r0}
bx r0 bx r0
@@ -2572,7 +2572,7 @@ sub_8103A40: @ 8103A40
movs r1, 0 movs r1, 0
movs r2, 0x28 movs r2, 0x28
adds r3, r6, 0 adds r3, r6, 0
bl sub_8107D68 bl blit_move_info_icon
ldr r0, _08103AC4 @ =gBaseStats ldr r0, _08103AC4 @ =gBaseStats
lsls r4, r5, 3 lsls r4, r5, 3
subs r4, r5 subs r4, r5
@@ -2587,7 +2587,7 @@ sub_8103A40: @ 8103A40
lsrs r1, 24 lsrs r1, 24
movs r2, 0x78 movs r2, 0x78
adds r3, r6, 0 adds r3, r6, 0
bl sub_8107D68 bl blit_move_info_icon
ldrb r1, [r4, 0x7] ldrb r1, [r4, 0x7]
cmp r5, r1 cmp r5, r1
beq _08103AB6 beq _08103AB6
@@ -2599,7 +2599,7 @@ sub_8103A40: @ 8103A40
lsrs r1, 24 lsrs r1, 24
movs r2, 0x98 movs r2, 0x98
adds r3, r6, 0 adds r3, r6, 0
bl sub_8107D68 bl blit_move_info_icon
_08103AB6: _08103AB6:
add sp, 0x4 add sp, 0x4
pop {r4-r7} pop {r4-r7}
@@ -7753,7 +7753,7 @@ _08106478:
lsrs r1, 24 lsrs r1, 24
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl sub_8107D68 bl blit_move_info_icon
ldrb r1, [r4, 0x7] ldrb r1, [r4, 0x7]
cmp r5, r1 cmp r5, r1
beq _08106504 beq _08106504
@@ -7765,7 +7765,7 @@ _08106478:
lsrs r1, 24 lsrs r1, 24
movs r2, 0x20 movs r2, 0x20
movs r3, 0x1 movs r3, 0x1
bl sub_8107D68 bl blit_move_info_icon
_08106504: _08106504:
ldr r7, _081066B8 @ =gUnknown_203ACF0 ldr r7, _081066B8 @ =gUnknown_203ACF0
ldr r0, [r7] ldr r0, [r7]
+12 -12
View File
@@ -4180,7 +4180,7 @@ _08136812:
adds r1, r4, r3 adds r1, r4, r3
ldr r0, [r6] ldr r0, [r6]
adds r0, r1 adds r0, r1
ldr r5, _081368A4 @ =gUnknown_8416213 ldr r5, _081368A4 @ =gText_ThreeHyphens
adds r1, r5, 0 adds r1, r5, 0
bl StringCopy bl StringCopy
ldr r0, _081368A8 @ =0x00003188 ldr r0, _081368A8 @ =0x00003188
@@ -4209,7 +4209,7 @@ _08136894: .4byte gUnknown_841620E
_08136898: .4byte 0x000030b8 _08136898: .4byte 0x000030b8
_0813689C: .4byte gUnknown_8416210 _0813689C: .4byte gUnknown_8416210
_081368A0: .4byte 0x0000316c _081368A0: .4byte 0x0000316c
_081368A4: .4byte gUnknown_8416213 _081368A4: .4byte gText_ThreeHyphens
_081368A8: .4byte 0x00003188 _081368A8: .4byte 0x00003188
_081368AC: .4byte gUnknown_203B144 _081368AC: .4byte gUnknown_203B144
_081368B0: _081368B0:
@@ -4399,7 +4399,7 @@ _081369D0:
ldr r1, _08136A68 @ =0x0000316c ldr r1, _08136A68 @ =0x0000316c
adds r0, r1 adds r0, r1
adds r0, r6, r0 adds r0, r6, r0
ldr r1, _08136A6C @ =gUnknown_8416213 ldr r1, _08136A6C @ =gText_ThreeHyphens
bl StringCopy bl StringCopy
b _08136A84 b _08136A84
.align 2, 0 .align 2, 0
@@ -4411,7 +4411,7 @@ _08136A5C: .4byte 0x00003258
_08136A60: .4byte gUnknown_203B144 _08136A60: .4byte gUnknown_203B144
_08136A64: .4byte gBattleMoves _08136A64: .4byte gBattleMoves
_08136A68: .4byte 0x0000316c _08136A68: .4byte 0x0000316c
_08136A6C: .4byte gUnknown_8416213 _08136A6C: .4byte gText_ThreeHyphens
_08136A70: _08136A70:
lsls r4, r7, 2 lsls r4, r7, 2
adds r0, r4, r7 adds r0, r4, r7
@@ -4441,7 +4441,7 @@ _08136A84:
ldr r2, _08136AC0 @ =0x00003188 ldr r2, _08136AC0 @ =0x00003188
adds r0, r2 adds r0, r2
adds r0, r3, r0 adds r0, r3, r0
ldr r1, _08136AC4 @ =gUnknown_8416213 ldr r1, _08136AC4 @ =gText_ThreeHyphens
bl StringCopy bl StringCopy
b _08136ADA b _08136ADA
.align 2, 0 .align 2, 0
@@ -4450,7 +4450,7 @@ _08136AB4: .4byte gBattleMoves
_08136AB8: .4byte gUnknown_203B140 _08136AB8: .4byte gUnknown_203B140
_08136ABC: .4byte 0x00003258 _08136ABC: .4byte 0x00003258
_08136AC0: .4byte 0x00003188 _08136AC0: .4byte 0x00003188
_08136AC4: .4byte gUnknown_8416213 _08136AC4: .4byte gText_ThreeHyphens
_08136AC8: _08136AC8:
adds r0, r4, r7 adds r0, r4, r7
ldr r4, _08136AE8 @ =0x00003188 ldr r4, _08136AE8 @ =0x00003188
@@ -6636,7 +6636,7 @@ _08137CA4:
adds r3, r2 adds r3, r2
lsrs r3, 16 lsrs r3, 16
movs r2, 0x3 movs r2, 0x3
bl sub_8107D68 bl blit_move_info_icon
_08137CDE: _08137CDE:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
@@ -6660,7 +6660,7 @@ _08137CDE:
lsrs r1, 24 lsrs r1, 24
movs r2, 0x3 movs r2, 0x3
movs r3, 0x75 movs r3, 0x75
bl sub_8107D68 bl blit_move_info_icon
_08137D0E: _08137D0E:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -8325,7 +8325,7 @@ _08138A62:
lsrs r1, 24 lsrs r1, 24
movs r2, 0x2F movs r2, 0x2F
movs r3, 0x23 movs r3, 0x23
bl sub_8107D68 bl blit_move_info_icon
ldr r1, [r6] ldr r1, [r6]
adds r4, r1, r4 adds r4, r1, r4
ldr r3, _08138AB8 @ =0x00003221 ldr r3, _08138AB8 @ =0x00003221
@@ -8342,7 +8342,7 @@ _08138A62:
lsrs r1, 24 lsrs r1, 24
movs r2, 0x53 movs r2, 0x53
movs r3, 0x23 movs r3, 0x23
bl sub_8107D68 bl blit_move_info_icon
b _08138B0E b _08138B0E
.align 2, 0 .align 2, 0
_08138AB0: .4byte 0x00003003 _08138AB0: .4byte 0x00003003
@@ -8365,7 +8365,7 @@ _08138ABC:
lsrs r1, 24 lsrs r1, 24
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl sub_8107D68 bl blit_move_info_icon
ldr r2, [r6] ldr r2, [r6]
adds r4, r2, r4 adds r4, r2, r4
ldr r1, _08138B1C @ =0x00003221 ldr r1, _08138B1C @ =0x00003221
@@ -8381,7 +8381,7 @@ _08138ABC:
lsrs r1, 24 lsrs r1, 24
movs r2, 0x24 movs r2, 0x24
movs r3, 0x3 movs r3, 0x3
bl sub_8107D68 bl blit_move_info_icon
_08138B04: _08138B04:
ldr r0, [r6] ldr r0, [r6]
adds r0, r5 adds r0, r5
+2 -2
View File
@@ -1925,7 +1925,7 @@ _0809D844:
bl AddTextPrinterParameterized bl AddTextPrinterParameterized
adds r0, r6, 0x1 adds r0, r6, 0x1
lsls r0, 24 lsls r0, 24
ldr r2, _0809D8BC @ =gUnknown_84161C8 ldr r2, _0809D8BC @ =gOtherText_Exit
lsrs r0, 20 lsrs r0, 20
adds r0, 0x2 adds r0, 0x2
lsls r0, 24 lsls r0, 24
@@ -1964,7 +1964,7 @@ _0809D8A8:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0809D8B8: .4byte gUnknown_8417DED _0809D8B8: .4byte gUnknown_8417DED
_0809D8BC: .4byte gUnknown_84161C8 _0809D8BC: .4byte gOtherText_Exit
thumb_func_end sub_809D764 thumb_func_end sub_809D764
thumb_func_start sub_809D8C0 thumb_func_start sub_809D8C0
+13 -13
View File
@@ -477,7 +477,7 @@ _0809AE2C:
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, _0809AE9C @ =gUnknown_3005E70 ldr r0, _0809AE9C @ =gMultiuseListMenuTemplate
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl ListMenuInit bl ListMenuInit
@@ -510,7 +510,7 @@ _0809AE2C:
_0809AE90: .4byte gMain _0809AE90: .4byte gMain
_0809AE94: .4byte gUnknown_2039934 _0809AE94: .4byte gUnknown_2039934
_0809AE98: .4byte sub_809BBC0 _0809AE98: .4byte sub_809BBC0
_0809AE9C: .4byte gUnknown_3005E70 _0809AE9C: .4byte gMultiuseListMenuTemplate
_0809AEA0: .4byte gTasks _0809AEA0: .4byte gTasks
_0809AEA4: .4byte sub_809AE00 _0809AEA4: .4byte sub_809AE00
_0809AEA8: .4byte sub_809ADE4 _0809AEA8: .4byte sub_809ADE4
@@ -904,7 +904,7 @@ _0809B1F2:
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
str r0, [r1, 0x4] str r0, [r1, 0x4]
ldr r5, _0809B2D4 @ =gUnknown_3005E70 ldr r5, _0809B2D4 @ =gMultiuseListMenuTemplate
str r2, [r5] str r2, [r5]
ldr r6, _0809B2D8 @ =gUnknown_2039934 ldr r6, _0809B2D8 @ =gUnknown_2039934
ldrh r0, [r6, 0x10] ldrh r0, [r6, 0x10]
@@ -992,7 +992,7 @@ _0809B2BC:
_0809B2C8: .4byte gUnknown_2039968 _0809B2C8: .4byte gUnknown_2039968
_0809B2CC: .4byte gFameCheckerText_Cancel _0809B2CC: .4byte gFameCheckerText_Cancel
_0809B2D0: .4byte gUnknown_2039964 _0809B2D0: .4byte gUnknown_2039964
_0809B2D4: .4byte gUnknown_3005E70 _0809B2D4: .4byte gMultiuseListMenuTemplate
_0809B2D8: .4byte gUnknown_2039934 _0809B2D8: .4byte gUnknown_2039934
_0809B2DC: .4byte sub_809B320 _0809B2DC: .4byte sub_809B320
_0809B2E0: .4byte sub_809B408 _0809B2E0: .4byte sub_809B408
@@ -1000,7 +1000,7 @@ _0809B2E4:
strh r0, [r5, 0xE] strh r0, [r5, 0xE]
_0809B2E6: _0809B2E6:
ldr r0, _0809B2F8 @ =gUnknown_2039934 ldr r0, _0809B2F8 @ =gUnknown_2039934
ldr r1, _0809B2FC @ =gUnknown_3005E70 ldr r1, _0809B2FC @ =gMultiuseListMenuTemplate
ldrh r1, [r1, 0xE] ldrh r1, [r1, 0xE]
strh r1, [r0, 0x12] strh r1, [r0, 0x12]
movs r0, 0x1 movs r0, 0x1
@@ -1010,7 +1010,7 @@ _0809B2F0:
bx r1 bx r1
.align 2, 0 .align 2, 0
_0809B2F8: .4byte gUnknown_2039934 _0809B2F8: .4byte gUnknown_2039934
_0809B2FC: .4byte gUnknown_3005E70 _0809B2FC: .4byte gMultiuseListMenuTemplate
thumb_func_end sub_809B188 thumb_func_end sub_809B188
thumb_func_start sub_809B300 thumb_func_start sub_809B300
@@ -1233,7 +1233,7 @@ sub_809B494: @ 809B494
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r5, _0809B51C @ =gStringVar4 ldr r5, _0809B51C @ =gStringVar4
ldr r1, _0809B520 @ =gUnknown_8416226 ldr r1, _0809B520 @ =gOtherText_UnkF9_08_Clear_01
adds r0, r5, 0 adds r0, r5, 0
bl StringCopy bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
@@ -1279,10 +1279,10 @@ sub_809B494: @ 809B494
_0809B514: .4byte gStringVar1 _0809B514: .4byte gStringVar1
_0809B518: .4byte 0xfffffee0 _0809B518: .4byte 0xfffffee0
_0809B51C: .4byte gStringVar4 _0809B51C: .4byte gStringVar4
_0809B520: .4byte gUnknown_8416226 _0809B520: .4byte gOtherText_UnkF9_08_Clear_01
_0809B524: .4byte gMoveNames _0809B524: .4byte gMoveNames
_0809B528: _0809B528:
ldr r2, _0809B564 @ =gUnknown_8416213 ldr r2, _0809B564 @ =gText_ThreeHyphens
movs r4, 0 movs r4, 0
str r4, [sp] str r4, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
@@ -1312,7 +1312,7 @@ _0809B55C:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0809B564: .4byte gUnknown_8416213 _0809B564: .4byte gText_ThreeHyphens
_0809B568: .4byte gUnknown_8416217 _0809B568: .4byte gUnknown_8416217
thumb_func_end sub_809B494 thumb_func_end sub_809B494
@@ -2119,7 +2119,7 @@ sub_809BB44: @ 809BB44
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, _0809BBB8 @ =gStringVar4 ldr r4, _0809BBB8 @ =gStringVar4
ldr r1, _0809BBBC @ =gUnknown_84162B9 ldr r1, _0809BBBC @ =gText_TimesStrVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
@@ -2144,7 +2144,7 @@ _0809BBAC: .4byte gTasks+0x8
_0809BBB0: .4byte gUnknown_2039934 _0809BBB0: .4byte gUnknown_2039934
_0809BBB4: .4byte gStringVar1 _0809BBB4: .4byte gStringVar1
_0809BBB8: .4byte gStringVar4 _0809BBB8: .4byte gStringVar4
_0809BBBC: .4byte gUnknown_84162B9 _0809BBBC: .4byte gText_TimesStrVar1
thumb_func_end sub_809BB44 thumb_func_end sub_809BB44
thumb_func_start sub_809BBC0 thumb_func_start sub_809BBC0
@@ -2691,7 +2691,7 @@ sub_809C04C: @ 809C04C
ldrb r0, [r2, 0xE] ldrb r0, [r2, 0xE]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_810713C bl DestroyListMenu
bl sub_809B604 bl sub_809B604
ldr r0, _0809C090 @ =c2_exit_to_overworld_2_switch ldr r0, _0809C090 @ =c2_exit_to_overworld_2_switch
bl SetMainCallback2 bl SetMainCallback2
+37 -37
View File
@@ -33,7 +33,7 @@ sub_815ABC4: @ 815ABC4
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r2, r0, 0 adds r2, r0, 0
ldr r3, _0815ABF4 @ =gUnknown_203F444 ldr r3, _0815ABF4 @ =gTeachyTV_StaticResources
movs r4, 0 movs r4, 0
strb r2, [r3, 0x4] strb r2, [r3, 0x4]
str r1, [r3] str r1, [r3]
@@ -54,14 +54,14 @@ _0815ABE6:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0815ABF4: .4byte gUnknown_203F444 _0815ABF4: .4byte gTeachyTV_StaticResources
_0815ABF8: .4byte sub_815AC2C _0815ABF8: .4byte sub_815AC2C
thumb_func_end sub_815ABC4 thumb_func_end sub_815ABC4
thumb_func_start sub_815ABFC thumb_func_start CB2_ReturnToTeachyTV
sub_815ABFC: @ 815ABFC CB2_ReturnToTeachyTV: @ 815ABFC
push {lr} push {lr}
ldr r1, _0815AC10 @ =gUnknown_203F444 ldr r1, _0815AC10 @ =gTeachyTV_StaticResources
ldrb r0, [r1, 0x4] ldrb r0, [r1, 0x4]
cmp r0, 0x1 cmp r0, 0x1
bne _0815AC14 bne _0815AC14
@@ -70,7 +70,7 @@ sub_815ABFC: @ 815ABFC
bl sub_815ABC4 bl sub_815ABC4
b _0815AC1C b _0815AC1C
.align 2, 0 .align 2, 0
_0815AC10: .4byte gUnknown_203F444 _0815AC10: .4byte gTeachyTV_StaticResources
_0815AC14: _0815AC14:
ldr r1, [r1] ldr r1, [r1]
movs r0, 0x2 movs r0, 0x2
@@ -78,16 +78,16 @@ _0815AC14:
_0815AC1C: _0815AC1C:
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_815ABFC thumb_func_end CB2_ReturnToTeachyTV
thumb_func_start sub_815AC20 thumb_func_start sub_815AC20
sub_815AC20: @ 815AC20 sub_815AC20: @ 815AC20
ldr r1, _0815AC28 @ =gUnknown_203F444 ldr r1, _0815AC28 @ =gTeachyTV_StaticResources
movs r0, 0x1 movs r0, 0x1
strb r0, [r1, 0x4] strb r0, [r1, 0x4]
bx lr bx lr
.align 2, 0 .align 2, 0
_0815AC28: .4byte gUnknown_203F444 _0815AC28: .4byte gTeachyTV_StaticResources
thumb_func_end sub_815AC20 thumb_func_end sub_815AC20
thumb_func_start sub_815AC2C thumb_func_start sub_815AC2C
@@ -145,7 +145,7 @@ _0815AC9C:
beq _0815AD6E beq _0815AD6E
bl sub_815AEB8 bl sub_815AEB8
bl sub_815AFEC bl sub_815AFEC
ldr r0, _0815ACE0 @ =gUnknown_203F444 ldr r0, _0815ACE0 @ =gTeachyTV_StaticResources
ldrb r0, [r0, 0x4] ldrb r0, [r0, 0x4]
cmp r0, 0x2 cmp r0, 0x2
bne _0815ACEC bne _0815ACEC
@@ -167,7 +167,7 @@ _0815AC9C:
bl sub_815B118 bl sub_815B118
b _0815AD26 b _0815AD26
.align 2, 0 .align 2, 0
_0815ACE0: .4byte gUnknown_203F444 _0815ACE0: .4byte gTeachyTV_StaticResources
_0815ACE4: .4byte sub_815BA54 _0815ACE4: .4byte sub_815BA54
_0815ACE8: .4byte gTasks _0815ACE8: .4byte gTasks
_0815ACEC: _0815ACEC:
@@ -384,7 +384,7 @@ _0815AEE4: .4byte gUnknown_84792F0
thumb_func_start sub_815AEE8 thumb_func_start sub_815AEE8
sub_815AEE8: @ 815AEE8 sub_815AEE8: @ 815AEE8
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, _0815AF48 @ =gUnknown_3005E70 ldr r4, _0815AF48 @ =gMultiuseListMenuTemplate
adds r1, r4, 0 adds r1, r4, 0
ldr r0, _0815AF4C @ =gUnknown_8479368 ldr r0, _0815AF4C @ =gUnknown_8479368
ldm r0!, {r2,r3,r5} ldm r0!, {r2,r3,r5}
@@ -419,7 +419,7 @@ sub_815AEE8: @ 815AEE8
orrs r0, r1 orrs r0, r1
strb r0, [r4, 0x14] strb r0, [r4, 0x14]
_0815AF30: _0815AF30:
ldr r0, _0815AF58 @ =gUnknown_203F444 ldr r0, _0815AF58 @ =gTeachyTV_StaticResources
ldrh r1, [r0, 0x6] ldrh r1, [r0, 0x6]
ldrh r2, [r0, 0x8] ldrh r2, [r0, 0x8]
adds r0, r4, 0 adds r0, r4, 0
@@ -430,11 +430,11 @@ _0815AF30:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0815AF48: .4byte gUnknown_3005E70 _0815AF48: .4byte gMultiuseListMenuTemplate
_0815AF4C: .4byte gUnknown_8479368 _0815AF4C: .4byte gUnknown_8479368
_0815AF50: .4byte sub_815AFD8 _0815AF50: .4byte sub_815AFD8
_0815AF54: .4byte gUnknown_8479340 _0815AF54: .4byte gUnknown_8479340
_0815AF58: .4byte gUnknown_203F444 _0815AF58: .4byte gTeachyTV_StaticResources
thumb_func_end sub_815AEE8 thumb_func_end sub_815AEE8
thumb_func_start sub_815AF5C thumb_func_start sub_815AF5C
@@ -694,7 +694,7 @@ sub_815B118: @ 815B118
movs r0, 0x1 movs r0, 0x1
bl ClearWindowTilemap bl ClearWindowTilemap
bl sub_815B0B4 bl sub_815B0B4
ldr r0, _0815B198 @ =gUnknown_203F444 ldr r0, _0815B198 @ =gTeachyTV_StaticResources
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
cmp r0, 0 cmp r0, 0
blt _0815B1B8 blt _0815B1B8
@@ -732,7 +732,7 @@ sub_815B118: @ 815B118
.align 2, 0 .align 2, 0
_0815B190: .4byte gTasks+0x8 _0815B190: .4byte gTasks+0x8
_0815B194: .4byte gSprites _0815B194: .4byte gSprites
_0815B198: .4byte gUnknown_203F444 _0815B198: .4byte gTeachyTV_StaticResources
_0815B19C: .4byte gUnknown_203F450 _0815B19C: .4byte gUnknown_203F450
_0815B1A0: .4byte 0x00004004 _0815B1A0: .4byte 0x00004004
_0815B1A4: .4byte 0x00004005 _0815B1A4: .4byte 0x00004005
@@ -867,7 +867,7 @@ _0815B298: .4byte gPaletteFade
_0815B29C: .4byte gUnknown_203F450 _0815B29C: .4byte gUnknown_203F450
_0815B2A0: _0815B2A0:
bl sub_8055DC4 bl sub_8055DC4
ldr r0, _0815B2BC @ =gUnknown_203F444 ldr r0, _0815B2BC @ =gTeachyTV_StaticResources
ldr r0, [r0] ldr r0, [r0]
bl SetMainCallback2 bl SetMainCallback2
_0815B2AC: _0815B2AC:
@@ -879,7 +879,7 @@ _0815B2B6:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0815B2BC: .4byte gUnknown_203F444 _0815B2BC: .4byte gTeachyTV_StaticResources
thumb_func_end sub_815B274 thumb_func_end sub_815B274
thumb_func_start sub_815B2C0 thumb_func_start sub_815B2C0
@@ -942,13 +942,13 @@ _0815B330:
_0815B33E: _0815B33E:
movs r0, 0x5 movs r0, 0x5
bl PlaySE bl PlaySE
ldr r2, _0815B380 @ =gUnknown_203F444 ldr r2, _0815B380 @ =gTeachyTV_StaticResources
movs r4, 0 movs r4, 0
strb r5, [r2, 0x5] strb r5, [r2, 0x5]
ldrb r0, [r6] ldrb r0, [r6]
adds r1, r2, 0x6 adds r1, r2, 0x6
adds r2, 0x8 adds r2, 0x8
bl sub_810713C bl DestroyListMenu
bl sub_815B0B4 bl sub_815B0B4
movs r0, 0x1 movs r0, 0x1
bl ClearWindowTilemap bl ClearWindowTilemap
@@ -969,7 +969,7 @@ _0815B37A:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0815B380: .4byte gUnknown_203F444 _0815B380: .4byte gTeachyTV_StaticResources
_0815B384: .4byte gTasks _0815B384: .4byte gTasks
_0815B388: .4byte sub_815B4EC _0815B388: .4byte sub_815B4EC
thumb_func_end sub_815B2C0 thumb_func_end sub_815B2C0
@@ -1208,7 +1208,7 @@ _0815B554: .4byte 0x00004006
_0815B558: .4byte sub_815B92C _0815B558: .4byte sub_815B92C
_0815B55C: _0815B55C:
ldr r1, _0815B580 @ =gUnknown_8479548 ldr r1, _0815B580 @ =gUnknown_8479548
ldr r0, _0815B584 @ =gUnknown_203F444 ldr r0, _0815B584 @ =gTeachyTV_StaticResources
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -1226,7 +1226,7 @@ _0815B578:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0815B580: .4byte gUnknown_8479548 _0815B580: .4byte gUnknown_8479548
_0815B584: .4byte gUnknown_203F444 _0815B584: .4byte gTeachyTV_StaticResources
thumb_func_end sub_815B4EC thumb_func_end sub_815B4EC
thumb_func_start sub_815B588 thumb_func_start sub_815B588
@@ -1240,7 +1240,7 @@ sub_815B588: @ 815B588
ldr r0, _0815B5B4 @ =gTasks+0x8 ldr r0, _0815B5B4 @ =gTasks+0x8
adds r4, r0 adds r4, r0
ldr r1, _0815B5B8 @ =gUnknown_8479560 ldr r1, _0815B5B8 @ =gUnknown_8479560
ldr r0, _0815B5BC @ =gUnknown_203F444 ldr r0, _0815B5BC @ =gTeachyTV_StaticResources
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -1255,7 +1255,7 @@ sub_815B588: @ 815B588
.align 2, 0 .align 2, 0
_0815B5B4: .4byte gTasks+0x8 _0815B5B4: .4byte gTasks+0x8
_0815B5B8: .4byte gUnknown_8479560 _0815B5B8: .4byte gUnknown_8479560
_0815B5BC: .4byte gUnknown_203F444 _0815B5BC: .4byte gTeachyTV_StaticResources
thumb_func_end sub_815B588 thumb_func_end sub_815B588
thumb_func_start sub_815B5C0 thumb_func_start sub_815B5C0
@@ -1269,7 +1269,7 @@ sub_815B5C0: @ 815B5C0
ldr r0, _0815B5EC @ =gTasks+0x8 ldr r0, _0815B5EC @ =gTasks+0x8
adds r4, r0 adds r4, r0
ldr r1, _0815B5F0 @ =gUnknown_8479578 ldr r1, _0815B5F0 @ =gUnknown_8479578
ldr r0, _0815B5F4 @ =gUnknown_203F444 ldr r0, _0815B5F4 @ =gTeachyTV_StaticResources
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -1284,7 +1284,7 @@ sub_815B5C0: @ 815B5C0
.align 2, 0 .align 2, 0
_0815B5EC: .4byte gTasks+0x8 _0815B5EC: .4byte gTasks+0x8
_0815B5F0: .4byte gUnknown_8479578 _0815B5F0: .4byte gUnknown_8479578
_0815B5F4: .4byte gUnknown_203F444 _0815B5F4: .4byte gTeachyTV_StaticResources
thumb_func_end sub_815B5C0 thumb_func_end sub_815B5C0
thumb_func_start sub_815B5F8 thumb_func_start sub_815B5F8
@@ -1806,7 +1806,7 @@ sub_815B9F0: @ 815B9F0
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
adds r2, r1, 0 adds r2, r1, 0
ldr r0, _0815BA0C @ =gUnknown_203F444 ldr r0, _0815BA0C @ =gTeachyTV_StaticResources
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
cmp r0, 0 cmp r0, 0
blt _0815BA22 blt _0815BA22
@@ -1816,7 +1816,7 @@ sub_815B9F0: @ 815B9F0
bl sub_815BC90 bl sub_815BC90
b _0815BA22 b _0815BA22
.align 2, 0 .align 2, 0
_0815BA0C: .4byte gUnknown_203F444 _0815BA0C: .4byte gTeachyTV_StaticResources
_0815BA10: _0815BA10:
cmp r0, 0x5 cmp r0, 0x5
bgt _0815BA22 bgt _0815BA22
@@ -1837,7 +1837,7 @@ _0815BA2C: .4byte sub_815BA30
thumb_func_start sub_815BA30 thumb_func_start sub_815BA30
sub_815BA30: @ 815BA30 sub_815BA30: @ 815BA30
push {lr} push {lr}
ldr r0, _0815BA44 @ =gUnknown_203F444 ldr r0, _0815BA44 @ =gTeachyTV_StaticResources
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
cmp r0, 0x4 cmp r0, 0x4
bne _0815BA48 bne _0815BA48
@@ -1845,7 +1845,7 @@ sub_815BA30: @ 815BA30
bl sub_810B108 bl sub_810B108
b _0815BA4E b _0815BA4E
.align 2, 0 .align 2, 0
_0815BA44: .4byte gUnknown_203F444 _0815BA44: .4byte gTeachyTV_StaticResources
_0815BA48: _0815BA48:
movs r0, 0x9 movs r0, 0x9
bl sub_810B108 bl sub_810B108
@@ -1871,7 +1871,7 @@ sub_815BA54: @ 815BA54
cmp r0, 0 cmp r0, 0
bne _0815BA86 bne _0815BA86
ldr r1, _0815BA94 @ =gUnknown_8479390 ldr r1, _0815BA94 @ =gUnknown_8479390
ldr r0, _0815BA98 @ =gUnknown_203F444 ldr r0, _0815BA98 @ =gTeachyTV_StaticResources
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
@@ -1889,7 +1889,7 @@ _0815BA86:
_0815BA8C: .4byte gTasks+0x8 _0815BA8C: .4byte gTasks+0x8
_0815BA90: .4byte gPaletteFade _0815BA90: .4byte gPaletteFade
_0815BA94: .4byte gUnknown_8479390 _0815BA94: .4byte gUnknown_8479390
_0815BA98: .4byte gUnknown_203F444 _0815BA98: .4byte gTeachyTV_StaticResources
_0815BA9C: .4byte sub_815B4EC _0815BA9C: .4byte sub_815B4EC
thumb_func_end sub_815BA54 thumb_func_end sub_815BA54
@@ -2155,7 +2155,7 @@ sub_815BC90: @ 815BC90
adds r5, r0, r1 adds r5, r0, r1
bl sub_815B220 bl sub_815B220
ldr r1, _0815BCD0 @ =gSpecialVar_0x8004 ldr r1, _0815BCD0 @ =gSpecialVar_0x8004
ldr r4, _0815BCD4 @ =gUnknown_203F444 ldr r4, _0815BCD4 @ =gTeachyTV_StaticResources
ldrb r0, [r4, 0x5] ldrb r0, [r4, 0x5]
strh r0, [r1] strh r0, [r1]
ldr r1, _0815BCD8 @ =gMain ldr r1, _0815BCD8 @ =gMain
@@ -2173,7 +2173,7 @@ sub_815BC90: @ 815BC90
.align 2, 0 .align 2, 0
_0815BCCC: .4byte gTasks+0x8 _0815BCCC: .4byte gTasks+0x8
_0815BCD0: .4byte gSpecialVar_0x8004 _0815BCD0: .4byte gSpecialVar_0x8004
_0815BCD4: .4byte gUnknown_203F444 _0815BCD4: .4byte gTeachyTV_StaticResources
_0815BCD8: .4byte gMain _0815BCD8: .4byte gMain
_0815BCDC: .4byte sub_815BD58 _0815BCDC: .4byte sub_815BD58
_0815BCE0: _0815BCE0:
@@ -2257,7 +2257,7 @@ _0815BD70:
lsls r0, 1 lsls r0, 1
bl PlayNewMapMusic bl PlayNewMapMusic
_0815BD78: _0815BD78:
bl sub_815ABFC bl CB2_ReturnToTeachyTV
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_815BD58 thumb_func_end sub_815BD58
+2 -2
View File
@@ -20,7 +20,7 @@ sub_804C600: @ 804C600
strb r0, [r2, 0x8] strb r0, [r2, 0x8]
ldr r0, _0804C6FC @ =sub_804D4F8 ldr r0, _0804C6FC @ =sub_804D4F8
bl SetVBlankCallback bl SetVBlankCallback
ldr r4, _0804C700 @ =gUnknown_841F408 ldr r4, _0804C700 @ =gTMCaseMainWindowPalette
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0x14 movs r2, 0x14
@@ -118,7 +118,7 @@ _0804C6F0:
.align 2, 0 .align 2, 0
_0804C6F8: .4byte gPaletteFade _0804C6F8: .4byte gPaletteFade
_0804C6FC: .4byte sub_804D4F8 _0804C6FC: .4byte sub_804D4F8
_0804C700: .4byte gUnknown_841F408 _0804C700: .4byte gTMCaseMainWindowPalette
_0804C704: .4byte gUnknown_8261F1C _0804C704: .4byte gUnknown_8261F1C
_0804C708: .4byte gUnknown_2031DA8 _0804C708: .4byte gUnknown_2031DA8
_0804C70C: .4byte gUnknown_8261F2C _0804C70C: .4byte gUnknown_8261F2C
+2 -2
View File
@@ -5355,14 +5355,14 @@ sub_812AD20: @ 812AD20
movs r1, 0xA movs r1, 0xA
movs r2, 0x20 movs r2, 0x20
bl sub_814FF2C bl sub_814FF2C
ldr r0, _0812AD4C @ =gUnknown_841F408 ldr r0, _0812AD4C @ =gTMCaseMainWindowPalette
movs r1, 0xE0 movs r1, 0xE0
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0812AD4C: .4byte gUnknown_841F408 _0812AD4C: .4byte gTMCaseMainWindowPalette
thumb_func_end sub_812AD20 thumb_func_end sub_812AD20
thumb_func_start sub_812AD50 thumb_func_start sub_812AD50
+242 -36
View File
@@ -734,7 +734,7 @@ gUnknown_8416190:: @ 8416190
gUnknown_8416195:: gUnknown_8416195::
.string " ?$" .string " ?$"
gUnknown_84161A0:: gOtherText_Use::
.string "USE$" .string "USE$"
gUnknown_84161A4:: gUnknown_84161A4::
@@ -743,7 +743,7 @@ gUnknown_84161A4::
gUnknown_84161A9:: gUnknown_84161A9::
.string "REGISTER$" .string "REGISTER$"
gUnknown_84161B2:: gOtherText_Give::
.string "GIVE$" .string "GIVE$"
gUnknown_84161B7:: gUnknown_84161B7::
@@ -755,7 +755,7 @@ gUnknown_84161BC::
gFameCheckerText_Cancel:: @ 84161C1 gFameCheckerText_Cancel:: @ 84161C1
.string "CANCEL$" .string "CANCEL$"
gUnknown_84161C8:: @ 84161C8 gOtherText_Exit:: @ 84161C8
.string "EXIT$" .string "EXIT$"
gUnknown_84161CD:: @ 84161CD gUnknown_84161CD:: @ 84161CD
@@ -803,7 +803,7 @@ gUnknown_841620E:: @ 841620E
gUnknown_8416210:: @ 8416210 gUnknown_8416210:: @ 8416210
.string "--$" .string "--$"
gUnknown_8416213:: @ 8416213 gText_ThreeHyphens:: @ 8416213
.string "---$" .string "---$"
gUnknown_8416217:: @ 8416217 gUnknown_8416217:: @ 8416217
@@ -818,7 +818,7 @@ gUnknown_8416221:: @ 8416221
gUnknown_8416223:: @ 8416223 gUnknown_8416223:: @ 8416223
.string "{UNKNOWN_F9 0x05}$" .string "{UNKNOWN_F9 0x05}$"
gUnknown_8416226:: @ 8416226 gOtherText_UnkF9_08_Clear_01:: @ 8416226
.string "{UNKNOWN_F9 0x08}{CLEAR 0x01}$" .string "{UNKNOWN_F9 0x08}{CLEAR 0x01}$"
gUnknown_841622C:: gUnknown_841622C::
@@ -872,7 +872,7 @@ gUnknown_84162A2::
gUnknown_84162A9:: @ 84162A9 gUnknown_84162A9:: @ 84162A9
.string "{STR_VAR_1}/{STR_VAR_2}\nBALLS {STR_VAR_3}$" .string "{STR_VAR_1}/{STR_VAR_2}\nBALLS {STR_VAR_3}$"
gUnknown_84162B9:: @ 84162B9 gText_TimesStrVar1:: @ 84162B9
.string "×{STR_VAR_1}$" .string "×{STR_VAR_1}$"
gUnknown_84162BD:: @ 84162BD gUnknown_84162BD:: @ 84162BD
@@ -890,20 +890,21 @@ gUnknown_84162F5:: @ 84162F5
gUnknown_84162FF:: @ 84162FF gUnknown_84162FF:: @ 84162FF
.incbin "baserom.gba", 0x4162FF, 0x2 .incbin "baserom.gba", 0x4162FF, 0x2
gUnknown_8416301:: @ 8416301 gText_IsSelected:: @ 8416301
.incbin "baserom.gba", 0x416301, 0xE .string " is\nselected.$"
gUnknown_841630F:: @ 841630F gUnknown_841630F:: @ 841630F
.incbin "baserom.gba", 0x41630F, 0x1B .incbin "baserom.gba", 0x41630F, 0x1B
gUnknown_841632A:: @ 841632A gText_ThereIsNoPokemon:: @ 841632A
.incbin "baserom.gba", 0x41632A, 0x15 .string "There is no\n"
.string "POKéMON.$"
gUnknown_841633F:: @ 841633F gUnknown_841633F:: @ 841633F
.incbin "baserom.gba", 0x41633F, 0x1F .incbin "baserom.gba", 0x41633F, 0x1F
gUnknown_841635E:: @ 841635E gText_ItemCantBeHeld:: @ 841635E
.incbin "baserom.gba", 0x41635E, 0x16 .string "The {STR_VAR_1} cant be held.$"
gUnknown_8416374:: @ 8416374 gUnknown_8416374:: @ 8416374
.incbin "baserom.gba", 0x416374, 0x1B .incbin "baserom.gba", 0x416374, 0x1B
@@ -974,20 +975,24 @@ gUnknown_8416690:: @ 8416690
gUnknown_84166A7:: @ 84166A7 gUnknown_84166A7:: @ 84166A7
.incbin "baserom.gba", 0x4166A7, 0x2C .incbin "baserom.gba", 0x4166A7, 0x2C
gUnknown_84166D3:: @ 84166D3 gText_TMCase:: @ 84166D3
.incbin "baserom.gba", 0x4166D3, 0x8 .string "TM CASE$"
gUnknown_84166DB:: @ 84166DB gText_Close:: @ 84166DB
.incbin "baserom.gba", 0x4166DB, 0x6 .string "CLOSE$"
gUnknown_84166E1:: @ 84166E1 gText_TMCaseWillBePutAway:: @ 84166E1
.incbin "baserom.gba", 0x4166E1, 0x1E .string "The TM CASE will be\n"
.string "put away.$"
gUnknown_84166FF:: @ 84166FF gText_FontSize0:: @ 84166FF
.incbin "baserom.gba", 0x4166FF, 0x4 .string "{SIZE 0}$"
gUnknown_8416703:: @ 8416703 gText_FontSize2:: @ 8416703
.incbin "baserom.gba", 0x416703, 0x7 .string "{SIZE 2}$"
gUnknown_8416707:: @ 8416707
.string " $"
gUnknown_841670A:: @ 841670A gUnknown_841670A:: @ 841670A
.incbin "baserom.gba", 0x41670A, 0xC .incbin "baserom.gba", 0x41670A, 0xC
@@ -1019,16 +1024,19 @@ gUnknown_8416861:: @ 8416861
gUnknown_841689E:: @ 841689E gUnknown_841689E:: @ 841689E
.incbin "baserom.gba", 0x41689E, 0x53 .incbin "baserom.gba", 0x41689E, 0x53
gUnknown_84168F1:: @ 84168F1 gText_OhNoICantBuyThat:: @ 84168F1
.incbin "baserom.gba", 0x4168F1, 0x20 .string "{STR_VAR_1}? Oh, no.\n"
.string "I cant buy that.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416911:: @ 8416911 gText_HowManyWouldYouLikeToSell:: @ 8416911
.incbin "baserom.gba", 0x416911, 0x25 .string "{STR_VAR_1}?\n"
.string "How many would you like to sell?$"
gUnknown_8416936:: @ 8416936 gText_ICanPayThisMuch_WouldThatBeOkay:: @ 8416936
.incbin "baserom.gba", 0x416936, 0x23 .string "I can pay ¥{STR_VAR_3}.\n"
.string "Would that be okay?$"
gUnknown_8416959:: @ 8416959 gText_TurnedOverItemsWorthYen:: @ 8416959
.incbin "baserom.gba", 0x416959, 0x21 .incbin "baserom.gba", 0x416959, 0x21
gText_PokedollarVar1:: @ 841697A gText_PokedollarVar1:: @ 841697A
@@ -1894,13 +1902,211 @@ gUnknown_841B779:: @ 841B779
.incbin "baserom.gba", 0x41B779, 0xC4 .incbin "baserom.gba", 0x41B779, 0xC4
gUnknown_841B83D:: @ 841B83D gUnknown_841B83D:: @ 841B83D
.incbin "baserom.gba", 0x41B83D, 0xD4A .string "Hey, all you TRAINERS out there!\n"
.string "HELLO, TRAINERS!\p"
.string " \p"
.string "Come on, let me hear you!\n"
.string "HELLO, TRAINERS!\l"
.string "Its me, the POKé DUDE!\p"
.string "$"
gUnknown_841C587:: @ 841C587 gUnknown_841B8BF:: @ 841B8BF
.incbin "baserom.gba", 0x41C587, 0x10C .string "Today, the POKé DUDEs here to\n"
.string "tell you about how you can battle\l"
.string "POKéMON!\p"
.string "Say youre out for a stroll when,\n"
.string "suddenly, a wild POKéMON appears!\p"
.string "Its up to you to smartly use your\n"
.string "POKéMON and their moves to reduce\l"
.string "the opponents HP to nothing, and\l"
.string "claim victory!\p"
.string "Ill show you how to do that in\n"
.string "person and for sure!\p"
.string "All righty, here goes!\p"
.string "Keep your eyes glued to the super\n"
.string "POKé DUDE SHOW!$"
gUnknown_841C693:: @ 841C693 gUnknown_841BA41:: @ 841BA41
.incbin "baserom.gba", 0x41C693, 0x4A9 .string "Well, did you get that?\p"
.string "Even if your own POKéMONs HP\n"
.string "falls to zero, and it becomes\l"
.string "unable to battle, not to worry!\p"
.string "Just take it to any POKéMON\n"
.string "CENTER and heal it!\p"
.string "All righty, be seeing you!\p"
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gUnknown_841BB40:: @ 841BB40
.string "Today, the POKé DUDEs here to\n"
.string "tell you about status problems!\p"
.string "Status problems include poisoning,\n"
.string "paralysis, sleep, burn\p"
.string "There are a couple others, but\n"
.string "they really are trouble.\p"
.string "Get any one, and your POKéMON\n"
.string "may become useless in battle.\p"
.string "You know, it hurts the POKé DUDE\n"
.string "to see a POKéMON suffer\p"
.string "So, what should you do if your\n"
.string "POKéMON gets a status problem?\p"
.string "Well, youve got me to show you!\p"
.string "All righty, here goes!\p"
.string "Keep your eyes glued to the super\n"
.string "POKé DUDE SHOW!$"
gUnknown_841BD10:: @ 841BD10
.string "Poisoning or paralysis dont go\n"
.string "away after a battle.\p"
.string "If a POKéMON is poisoned, it loses\n"
.string "HP even while youre walking.\p"
.string "You should heal POKéMON of these\n"
.string "kinds of problems right away.\p"
.string "Use an item, or try to get to a\n"
.string "POKéMON CENTER for healing.\p"
.string "That wasnt hard, was it?\n"
.string "All righty, be seeing you!\p"
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gUnknown_841BE76:: @ 841BE76
.string "Does everyone know about type\n"
.string "matchups?\p"
.string "POKéMON and their moves all\n"
.string "belong to certain types.\p"
.string "For example, there are such types\n"
.string "as GRASS and WATER.\p"
.string "You need to consider the type of\n"
.string "the move used to attack\p"
.string "And, the type of the POKéMON that\n"
.string "is hit by that attack.\p"
.string "Depending on how those two types\n"
.string "match up, the damage can change.\p"
.string "You see, it depends on whether\n"
.string "the type matchup is good or bad.\p"
.string "If you dont know how matchups\n"
.string "work, battles will be tough.\p"
.string "So, let me demonstrate exactly\n"
.string "what I mean.\p"
.string "All righty, here goes!\p"
.string "Keep your eyes glued to the super\n"
.string "POKé DUDE SHOW!$"
gUnknown_841C0AF:: @ 841C0AF
.string "Is it possible to launch an attack\n"
.string "that will inflict heavy damage?\p"
.string "Does the opposing POKéMON pose\n"
.string "a threat to your POKéMON?\p"
.string "Is there any chance that it may\n"
.string "have disastrously tough moves?\p"
.string "Watch the type matchups to gain\n"
.string "the upper hand!\p"
.string "All righty, be seeing you!\p"
.string "Oh, for the COOL-type POKé DUDE,\n"
.string "AWESOME-type kids like you match\l"
.string "up perfectly!\p"
.string "Remember, a good deed a day\n"
.string "brings happiness to stay!$"
gUnknown_841C23B:: @ 841C23B
.string "Today, the POKé DUDEs going to\n"
.string "show you how to catch POKéMON!\p"
.string "Just imagine A groovy POKéMON\n"
.string "suddenly appearing in the wild!\p"
.string "Oh, you want it!\n"
.string "You just cant help it!\p"
.string "Oh, you have to catch it!\n"
.string "You gotta have it!\p"
.string "Let me show you how you can make\n"
.string "it happen!\p"
.string "All righty, here goes!\p"
.string "Keep your eyes glued to the super\n"
.string "POKé DUDE SHOW!$"
gUnknown_841C384:: @ 841C384
.string "If your first POKé BALL fails to\n"
.string "catch the POKéMON, dont give up!\p"
.string "Keep throwing POKé BALLS\n"
.string "Its bound to work sometime!\p"
.string "All righty, be seeing you!\p"
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gUnknown_841C459:: @ 841C459
.string "Hey, everyone!\n"
.string "Do you all have TMs?\p"
.string "A TM, Technical Machine, is an\n"
.string "amazingly great item!\p"
.string "It teaches POKéMON a move that\n"
.string "it may not learn when leveling up!\p"
.string "Isnt that just great? What a\n"
.string "convenient world we live in!\p"
.string "Open the TM CASE and check out\n"
.string "the TMs you have.\p"
.string "You can check them out in detail,\n"
.string "too.$"
gPokeDudeText_TMTypes:: @ 841C587
.string "POKé DUDE: NORMAL, WATER, GRASS\n"
.string "TMs also come in types.\p"
.string "Check the type and teach it to\n"
.string "a POKéMON that matches up well.\p"
.string "For example, WATER PULSE is\n"
.string "suitable for WATER-type POKéMON.\p"
.string "BULLET SEED is a move that most\n"
.string "GRASS-type POKéMON can learn.\p"
.string "Theres one other thing!$"
gPokeDudeText_ReadTMDescription:: @ 841C693
.string "Dont just look at the type, read\n"
.string "the description, too.\p"
.string "It will contain hints about what\n"
.string "POKéMON might learn the move.\p"
.string "For example, take a move like\n"
.string "FOCUS PUNCH.\p"
.string "It doesnt sound like anything a\n"
.string "bird or fish POKéMON can learn.\p"
.string "So, try using it on POKéMON with\n"
.string "arms that can throw punches!$"
gUnknown_841C7B4:: @ 841C7B4
.string "Wow, I talked a lot today!\n"
.string "All righty, be seeing you!\p"
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gUnknown_841C82A:: @ 841C82A
.string "A TRAINERs BAG has a bunch of\n"
.string "nifty, convenient features!\p"
.string "Take stuff in the KEY ITEMS\n"
.string "POCKET, for instance.\p"
.string "You can use a key item without\n"
.string "opening the BAG every time.\p"
.string "For example, lets pretend I have\n"
.string "a TEACHY TV in my BAG.\p"
.string "I can register it for instant use,\n"
.string "and Ill show you how!\p"
.string "All righty, here goes!\p"
.string "Keep your eyes glued to the sorta\n"
.string "super POKé DUDE SHOW!$"
gUnknown_841C994:: @ 841C994
.string "And now, your TEACHY TV is\n"
.string "registered.\p"
.string "How do you use it?\n"
.string "Well, heres how it works.\p"
.string "Once an item in the KEY ITEMS\n"
.string "POKCET is registered, you can use\l"
.string "it by pressing SELECT.\p"
.string "So, youve given yourself\n"
.string "one-touch access to TEACHY TV.\p"
.string "All it takes for you to see me is\n"
.string "pressing one button!\p"
.string "That kind of attention is a little\n"
.string "embarrassing!\p"
.string "All righty, be seeing you!\p"
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gUnknown_841CB3C:: @ 841CB3C gUnknown_841CB3C:: @ 841CB3C
.incbin "baserom.gba", 0x41CB3C, 0x5 .incbin "baserom.gba", 0x41CB3C, 0x5
@@ -2407,8 +2613,8 @@ gUnknown_841EF10:: @ 841EF10
gUnknown_841F1C8:: @ 841F1C8 gUnknown_841F1C8:: @ 841F1C8
.incbin "baserom.gba", 0x41F1C8, 0x240 .incbin "baserom.gba", 0x41F1C8, 0x240
gUnknown_841F408:: @ 841F408 gTMCaseMainWindowPalette:: @ 841F408
.incbin "baserom.gba", 0x41F408, 0x20 .incbin "graphics/tm_case/unk_841F408.gbapal"
gUnknown_841F428:: @ 841F428 gUnknown_841F428:: @ 841F428
.incbin "baserom.gba", 0x41F428, 0x4 .incbin "baserom.gba", 0x41F428, 0x4
+6 -1
View File
@@ -237,7 +237,12 @@ gUnknown_8479548:: @ 8479548
.incbin "baserom.gba", 0x479548, 0x18 .incbin "baserom.gba", 0x479548, 0x18
gUnknown_8479560:: @ 8479560 gUnknown_8479560:: @ 8479560
.incbin "baserom.gba", 0x479560, 0x18 .4byte gUnknown_841B8BF
.4byte gUnknown_841BB40
.4byte gUnknown_841BE76
.4byte gUnknown_841C23B
.4byte gUnknown_841C459
.4byte gUnknown_841C82A
gUnknown_8479578:: @ 8479578 gUnknown_8479578:: @ 8479578
.incbin "baserom.gba", 0x479578, 0x18 .incbin "baserom.gba", 0x479578, 0x18
+1 -1
View File
@@ -13967,7 +13967,7 @@ gUnknown_8E84CB0:: @ 8E84CB0
gUnknown_8E84D20:: @ 8E84D20 gUnknown_8E84D20:: @ 8E84D20
.incbin "graphics/tm_case/unk_8E84D20.gbapal.lz" .incbin "graphics/tm_case/unk_8E84D20.gbapal.lz"
gUnknown_8E84D90:: @ 8E84D90 gTMCase_TMSpriteGfx:: @ 8E84D90
.incbin "graphics/tm_case/unk_8E84D90.4bpp.lz" .incbin "graphics/tm_case/unk_8E84D90.4bpp.lz"
gUnknown_8E84F20:: @ 8E84F20 gUnknown_8E84F20:: @ 8E84F20
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 255 255
255 255 255
98 98 98
213 213 205
230 8 8
255 189 115
32 156 8
148 246 148
49 82 205
164 197 246
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
+1 -1
View File
@@ -156,7 +156,7 @@ extern const u32 gUnknown_8E84A24[];
extern const u32 gUnknown_8E84B70[]; extern const u32 gUnknown_8E84B70[];
extern const u32 gUnknown_8E84CB0[]; extern const u32 gUnknown_8E84CB0[];
extern const u32 gUnknown_8E84D20[]; extern const u32 gUnknown_8E84D20[];
extern const u32 gUnknown_8E84D90[]; extern const u32 gTMCase_TMSpriteGfx[];
extern const u32 gUnknown_8E84F20[]; extern const u32 gUnknown_8E84F20[];
extern const u32 gUnknown_8E85068[]; extern const u32 gUnknown_8E85068[];
extern const u8 gUnknown_8E99118[]; extern const u8 gUnknown_8E99118[];
+2 -2
View File
@@ -67,8 +67,8 @@ void sub_809A824(u16 itemId);
bool8 AddBagItem(u16 itemId, u16 amount); bool8 AddBagItem(u16 itemId, u16 amount);
void sub_809A5E4(struct BagPocket *); void sub_809A5E4(struct BagPocket *);
u16 sub_809A798(u8 a0, u16 a1); u16 BagGetItemIdByPocketPosition(u8 a0, u16 a1);
u16 sub_809A7B4(u8 a0, u16 a1); u16 BagGetQuantityByPocketPosition(u8 a0, u16 a1);
bool8 itemid_is_unique(u16 itemId); bool8 itemid_is_unique(u16 itemId);
void sub_809A584(struct ItemSlot * slots, u8 capacity); void sub_809A584(struct ItemSlot * slots, u8 capacity);
+2 -3
View File
@@ -48,7 +48,7 @@ struct ListMenu {
}; };
extern struct ListMenuTemplate gUnknown_03006310; extern struct ListMenuTemplate gUnknown_03006310;
extern struct ListMenuTemplate gUnknown_3005E70; extern struct ListMenuTemplate gMultiuseListMenuTemplate;
// Exported ROM declarations // Exported ROM declarations
@@ -56,9 +56,8 @@ u8 ListMenuInit(struct ListMenuTemplate *template, u16 a1, u16 a2);
s32 ListMenuHandleInput(u8 id); s32 ListMenuHandleInput(u8 id);
void get_coro_args_x18_x1A(u8 a0, u16 *a1, u16 *a2); void get_coro_args_x18_x1A(u8 a0, u16 *a1, u16 *a2);
void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2); void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2);
void sub_810713C(u8, u16 *, u16 *); void DestroyListMenu(u8, u16 *, u16 *);
u16 ListMenuGetYCoordForPrintingArrowCursor(u8); u16 ListMenuGetYCoordForPrintingArrowCursor(u8);
void sub_8107D38(u8, u8); void sub_8107D38(u8, u8);
void sub_8107D68(u8, u8, u8, u8);
#endif //GUARD_LIST_MENU_H #endif //GUARD_LIST_MENU_H
+1 -1
View File
@@ -25,6 +25,6 @@ void sub_80BF7C8(void);
u8 sub_80BF8E4(void); u8 sub_80BF8E4(void);
u8 sub_80BF848(s16 * a0, u16 a1); u8 sub_80BF848(s16 * a0, u16 a1);
void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc); void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
void sub_80BF5D0(u8 taskId, const struct WindowTemplate * unk1, u8 unk2, u8 unk3, u8 unk4, u8 unk5, u8 unk6, const TaskFunc *ptrs); void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate * unk1, u8 unk2, u8 unk3, u8 unk4, u8 unk5, u8 unk6, const struct YesNoFuncTable *ptrs);
#endif //GUARD_MENU_HELPERS_H #endif //GUARD_MENU_HELPERS_H
+1 -1
View File
@@ -29,6 +29,6 @@ void ResetBg0(void);
void Menu_LoadStdPalAt(u16); void Menu_LoadStdPalAt(u16);
void * malloc_and_decompress(const void * src, u32 * size); void * malloc_and_decompress(const void * src, u32 * size);
u16 sub_80F796C(void); u16 sub_80F796C(void);
void sub_80F6B08(u8 bgId, u8 value, u8 height, u8 width, u8 x, u8 y); void sub_80F6B08(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
#endif // GUARD_NEW_MENU_HELPERS_H #endif // GUARD_NEW_MENU_HELPERS_H
+21 -21
View File
@@ -92,27 +92,27 @@ extern const u8 gText_Coins[];
extern const u8 gText_EggNickname[]; extern const u8 gText_EggNickname[];
extern const u8 gText_Pokemon[]; extern const u8 gText_Pokemon[];
extern const u8 gUnknown_84161A0[]; extern const u8 gOtherText_Use[];
extern const u8 gUnknown_84161B2[]; extern const u8 gOtherText_Give[];
extern const u8 gUnknown_84161C8[]; extern const u8 gOtherText_Exit[];
extern const u8 gUnknown_8416213[]; extern const u8 gText_ThreeHyphens[];
extern const u8 gUnknown_8416226[]; extern const u8 gOtherText_UnkF9_08_Clear_01[];
extern const u8 gFameCheckerText_ListMenuCursor[]; extern const u8 gFameCheckerText_ListMenuCursor[];
extern const u8 gUnknown_84162B9[]; extern const u8 gText_TimesStrVar1[];
extern const u8 gUnknown_8416301[]; extern const u8 gText_IsSelected[];
extern const u8 gUnknown_841632A[]; extern const u8 gText_ThereIsNoPokemon[];
extern const u8 gUnknown_841635E[]; extern const u8 gText_ItemCantBeHeld[];
extern const u8 gUnknown_84166D3[]; extern const u8 gText_TMCase[];
extern const u8 gUnknown_84166DB[]; extern const u8 gText_Close[];
extern const u8 gUnknown_84166E1[]; extern const u8 gText_TMCaseWillBePutAway[];
extern const u8 gUnknown_84166FF[]; extern const u8 gText_FontSize0[];
extern const u8 gUnknown_8416703[]; extern const u8 gText_FontSize2[];
extern const u8 gUnknown_84168F1[]; extern const u8 gText_OhNoICantBuyThat[];
extern const u8 gUnknown_8416911[]; extern const u8 gText_HowManyWouldYouLikeToSell[];
extern const u8 gUnknown_8416936[]; extern const u8 gText_ICanPayThisMuch_WouldThatBeOkay[];
extern const u8 gUnknown_8416959[]; extern const u8 gText_TurnedOverItemsWorthYen[];
extern const u8 gUnknown_841C587[]; extern const u8 gPokeDudeText_TMTypes[];
extern const u8 gUnknown_841C693[]; extern const u8 gPokeDudeText_ReadTMDescription[];
extern const u16 gUnknown_841F408[]; extern const u16 gTMCaseMainWindowPalette[];
#endif //GUARD_STRINGS_H #endif //GUARD_STRINGS_H
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef GUARD_TEACHY_TV_H #ifndef GUARD_TEACHY_TV_H
#define GUARD_TEACHY_TV_H #define GUARD_TEACHY_TV_H
void sub_815ABFC(void); void CB2_ReturnToTeachyTV(void);
void sub_815AC20(void); void sub_815AC20(void);
#endif //GUARD_TEACHY_TV_H #endif //GUARD_TEACHY_TV_H
+1 -1
View File
@@ -853,7 +853,7 @@ static void Task_DestroyAssetsAndCloseFameChecker(u8 taskId)
FreeQuestionMarkSpriteResources(); FreeQuestionMarkSpriteResources();
FreeListMenuSelectorArrowPairResources(); FreeListMenuSelectorArrowPairResources();
SetMainCallback2(sFameCheckerData->savedCallback); SetMainCallback2(sFameCheckerData->savedCallback);
sub_810713C(sFameCheckerData->listMenuTaskId, NULL, NULL); DestroyListMenu(sFameCheckerData->listMenuTaskId, NULL, NULL);
Free(sBg3TilemapBuffer); Free(sBg3TilemapBuffer);
Free(sBg1TilemapBuffer); Free(sBg1TilemapBuffer);
Free(sBg2TilemapBuffer); Free(sBg2TilemapBuffer);
+2 -2
View File
@@ -8,7 +8,7 @@
extern u8 gGlyphInfo[0x90]; extern u8 gGlyphInfo[0x90];
extern u8 gUnknown_203ADFA; extern u8 gUnknown_203ADFA;
extern u16 gUnknown_841F408[]; extern u16 gTMCaseMainWindowPalette[];
extern const struct OamData gOamData_83AC9D0; extern const struct OamData gOamData_83AC9D0;
extern void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue); extern void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue);
@@ -52,7 +52,7 @@ const struct SpriteSheet gUnknown_81EA68C[] =
const struct SpritePalette gUnknown_81EA6A4[] = const struct SpritePalette gUnknown_81EA6A4[] =
{ {
{gUnknown_841F408, 0x8000}, {gTMCaseMainWindowPalette, 0x8000},
{NULL} {NULL}
}; };
+462 -461
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -301,7 +301,7 @@ gUnknown_3005E20: @ 3005E20
gUnknown_3005E60: @ 3005E60 gUnknown_3005E60: @ 3005E60
.space 0x10 .space 0x10
gUnknown_3005E70: @ 3005E70 gMultiuseListMenuTemplate: @ 3005E70
.space 0x18 .space 0x18
.include "quest_log.o" .include "quest_log.o"
+1 -1
View File
@@ -1659,7 +1659,7 @@ gUnknown_203F43C: @ 203F43C
gUnknown_203F440: @ 203F440 gUnknown_203F440: @ 203F440
.space 0x4 .space 0x4
gUnknown_203F444: @ 203F444 gTeachyTV_StaticResources: @ 203F444
.space 0x6 .space 0x6
gUnknown_203F44A: @ 203F44A gUnknown_203F44A: @ 203F44A