mirror of
https://github.com/pret/pokefirered.git
synced 2026-06-02 22:04:27 -05:00
through sub_8113FBC
This commit is contained in:
PikalaxALT
parent
21b5f78d6a
commit
50709682c7
|
|
@ -4570,7 +4570,7 @@ _08030848:
|
|||
ldrh r1, [r4]
|
||||
movs r0, 0xD
|
||||
muls r1, r0
|
||||
ldr r0, _080308A4 @ =gUnknown_8247094
|
||||
ldr r0, _080308A4 @ =gMoveNames
|
||||
adds r1, r0
|
||||
adds r0, r6, 0
|
||||
bl StringAppend
|
||||
|
|
@ -4599,7 +4599,7 @@ _08030894: .4byte gUnknown_2022BC8
|
|||
_08030898: .4byte gUnknown_3004FF8
|
||||
_0803089C: .4byte gDisplayedStringBattle
|
||||
_080308A0: .4byte gUnknown_83FE770
|
||||
_080308A4: .4byte gUnknown_8247094
|
||||
_080308A4: .4byte gMoveNames
|
||||
thumb_func_end sub_8030830
|
||||
|
||||
thumb_func_start MoveSelectionDisplayPpString
|
||||
|
|
|
|||
|
|
@ -473,7 +473,7 @@ _080D762C:
|
|||
ldrh r2, [r2]
|
||||
movs r1, 0xD
|
||||
muls r1, r2
|
||||
ldr r2, _080D764C @ =gUnknown_8247094
|
||||
ldr r2, _080D764C @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
_080D763C:
|
||||
|
|
@ -483,7 +483,7 @@ _080D763C:
|
|||
b _080D77DC
|
||||
.align 2, 0
|
||||
_080D7648: .4byte gBattleTextBuff2
|
||||
_080D764C: .4byte gUnknown_8247094
|
||||
_080D764C: .4byte gMoveNames
|
||||
_080D7650: .4byte gUnknown_83FD57B
|
||||
_080D7654:
|
||||
ldr r4, _080D7694 @ =gBattleTextBuff1
|
||||
|
|
@ -1505,11 +1505,11 @@ _080D7ED4:
|
|||
_080D7ED6:
|
||||
movs r0, 0xD
|
||||
muls r1, r0
|
||||
ldr r0, _080D7EE0 @ =gUnknown_8247094
|
||||
ldr r0, _080D7EE0 @ =gMoveNames
|
||||
adds r4, r1, r0
|
||||
b _080D8382
|
||||
.align 2, 0
|
||||
_080D7EE0: .4byte gUnknown_8247094
|
||||
_080D7EE0: .4byte gMoveNames
|
||||
_080D7EE4:
|
||||
ldr r0, _080D7F1C @ =gBattleTypeFlags
|
||||
ldr r1, [r0]
|
||||
|
|
@ -2294,11 +2294,11 @@ _080D84EC:
|
|||
orrs r1, r0
|
||||
movs r0, 0xD
|
||||
muls r1, r0
|
||||
ldr r0, _080D8500 @ =gUnknown_8247094
|
||||
ldr r0, _080D8500 @ =gMoveNames
|
||||
adds r1, r0
|
||||
b _080D868E
|
||||
.align 2, 0
|
||||
_080D8500: .4byte gUnknown_8247094
|
||||
_080D8500: .4byte gMoveNames
|
||||
_080D8504:
|
||||
adds r0, r5, r7
|
||||
ldrb r0, [r0, 0x1]
|
||||
|
|
|
|||
|
|
@ -166,11 +166,11 @@ _080BD820: .4byte gSpeciesNames
|
|||
_080BD824:
|
||||
movs r0, 0xD
|
||||
muls r0, r2
|
||||
ldr r1, _080BD830 @ =gUnknown_8247094
|
||||
ldr r1, _080BD830 @ =gMoveNames
|
||||
adds r0, r1
|
||||
b _080BD846
|
||||
.align 2, 0
|
||||
_080BD830: .4byte gUnknown_8247094
|
||||
_080BD830: .4byte gMoveNames
|
||||
_080BD834:
|
||||
ldr r1, _080BD84C @ =gUnknown_83ECED4
|
||||
lsls r0, 3
|
||||
|
|
|
|||
|
|
@ -4570,7 +4570,7 @@ _080CC8EC:
|
|||
lsrs r0, 16
|
||||
movs r1, 0xD
|
||||
muls r1, r0
|
||||
ldr r0, _080CC914 @ =gUnknown_8247094
|
||||
ldr r0, _080CC914 @ =gMoveNames
|
||||
adds r1, r0
|
||||
adds r0, r4, 0
|
||||
bl StringCopy
|
||||
|
|
@ -4581,7 +4581,7 @@ _080CC908:
|
|||
bx r1
|
||||
.align 2, 0
|
||||
_080CC910: .4byte gStringVar1
|
||||
_080CC914: .4byte gUnknown_8247094
|
||||
_080CC914: .4byte gMoveNames
|
||||
thumb_func_end sub_80CC8CC
|
||||
|
||||
thumb_func_start sub_80CC918
|
||||
|
|
|
|||
|
|
@ -709,12 +709,12 @@ _0810D968:
|
|||
lsrs r0, 16
|
||||
movs r1, 0xD
|
||||
muls r1, r0
|
||||
ldr r0, _0810D9C0 @ =gUnknown_8247094
|
||||
ldr r0, _0810D9C0 @ =gMoveNames
|
||||
adds r5, r1, r0
|
||||
b _0810D9DA
|
||||
.align 2, 0
|
||||
_0810D9BC: .4byte gUnknown_203ADBC
|
||||
_0810D9C0: .4byte gUnknown_8247094
|
||||
_0810D9C0: .4byte gMoveNames
|
||||
_0810D9C4:
|
||||
adds r0, r4, 0
|
||||
bl ItemId_GetDescription
|
||||
|
|
|
|||
|
|
@ -882,7 +882,7 @@ _080E4DB4:
|
|||
mov r9, r1
|
||||
mov r1, r9
|
||||
muls r1, r0
|
||||
ldr r3, _080E4E58 @ =gUnknown_8247094
|
||||
ldr r3, _080E4E58 @ =gMoveNames
|
||||
mov r8, r3
|
||||
add r1, r8
|
||||
adds r0, r2, 0
|
||||
|
|
@ -938,7 +938,7 @@ _080E4DB4:
|
|||
.align 2, 0
|
||||
_080E4E50: .4byte gPlayerParty
|
||||
_080E4E54: .4byte gStringVar3
|
||||
_080E4E58: .4byte gUnknown_8247094
|
||||
_080E4E58: .4byte gMoveNames
|
||||
_080E4E5C: .4byte 0x00000261
|
||||
_080E4E60: .4byte 0x00000a67
|
||||
_080E4E64: .4byte gStringVar2
|
||||
|
|
@ -1297,7 +1297,7 @@ _080E511A:
|
|||
adds r1, r2
|
||||
ldrh r1, [r1]
|
||||
muls r1, r7
|
||||
ldr r2, _080E51F0 @ =gUnknown_8247094
|
||||
ldr r2, _080E51F0 @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
adds r4, 0xD
|
||||
|
|
@ -1394,7 +1394,7 @@ _080E51AA:
|
|||
.align 2, 0
|
||||
_080E51E8: .4byte gUnknown_203AAB4
|
||||
_080E51EC: .4byte gPlayerParty
|
||||
_080E51F0: .4byte gUnknown_8247094
|
||||
_080E51F0: .4byte gMoveNames
|
||||
_080E51F4: .4byte gStringVar1
|
||||
_080E51F8: .4byte gUnknown_84161C1
|
||||
_080E51FC: .4byte gUnknown_3005E70
|
||||
|
|
|
|||
|
|
@ -13647,7 +13647,7 @@ _08125620:
|
|||
movs r0, 0xD
|
||||
adds r2, r5, 0
|
||||
muls r2, r0
|
||||
ldr r0, _081256BC @ =gUnknown_8247094
|
||||
ldr r0, _081256BC @ =gMoveNames
|
||||
adds r2, r0
|
||||
lsls r0, r6, 4
|
||||
adds r0, 0x2
|
||||
|
|
@ -13697,7 +13697,7 @@ _08125680:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_081256B8: .4byte gPlayerParty
|
||||
_081256BC: .4byte gUnknown_8247094
|
||||
_081256BC: .4byte gMoveNames
|
||||
thumb_func_end sub_81255F0
|
||||
|
||||
thumb_func_start sub_81256C0
|
||||
|
|
@ -13974,7 +13974,7 @@ sub_8125898: @ 8125898
|
|||
ldr r2, _08125944 @ =gStringVar1
|
||||
movs r1, 0xD
|
||||
muls r1, r0
|
||||
ldr r0, _08125948 @ =gUnknown_8247094
|
||||
ldr r0, _08125948 @ =gMoveNames
|
||||
adds r1, r0
|
||||
adds r0, r2, 0
|
||||
bl StringCopy
|
||||
|
|
@ -14005,7 +14005,7 @@ _08125938: .4byte gUnknown_203AD30
|
|||
_0812593C: .4byte gUnknown_203B0C0
|
||||
_08125940: .4byte 0x0000ffff
|
||||
_08125944: .4byte gStringVar1
|
||||
_08125948: .4byte gUnknown_8247094
|
||||
_08125948: .4byte gMoveNames
|
||||
_0812594C: .4byte gStringVar4
|
||||
_08125950: .4byte gTasks
|
||||
_08125954: .4byte sub_81255BC
|
||||
|
|
@ -14076,7 +14076,7 @@ _081259A0:
|
|||
ldr r0, _08125A28 @ =gStringVar1
|
||||
movs r1, 0xD
|
||||
muls r1, r4
|
||||
ldr r2, _08125A2C @ =gUnknown_8247094
|
||||
ldr r2, _08125A2C @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
adds r0, r5, 0
|
||||
|
|
@ -14104,7 +14104,7 @@ _08125A1C: .4byte gUnknown_203B0C0
|
|||
_08125A20: .4byte gPlayerParty
|
||||
_08125A24: .4byte 0x0000ffff
|
||||
_08125A28: .4byte gStringVar1
|
||||
_08125A2C: .4byte gUnknown_8247094
|
||||
_08125A2C: .4byte gMoveNames
|
||||
_08125A30: .4byte gStringVar4
|
||||
_08125A34: .4byte gTasks
|
||||
_08125A38: .4byte sub_81255BC
|
||||
|
|
@ -14288,7 +14288,7 @@ sub_8125B40: @ 8125B40
|
|||
ldrsh r2, [r7, r1]
|
||||
movs r1, 0xD
|
||||
muls r1, r2
|
||||
ldr r2, _08125BE4 @ =gUnknown_8247094
|
||||
ldr r2, _08125BE4 @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
movs r0, 0
|
||||
|
|
@ -14328,7 +14328,7 @@ _08125BD4: .4byte gPlayerParty
|
|||
_08125BD8: .4byte gUnknown_203AD30
|
||||
_08125BDC: .4byte gStringVar1
|
||||
_08125BE0: .4byte gStringVar2
|
||||
_08125BE4: .4byte gUnknown_8247094
|
||||
_08125BE4: .4byte gMoveNames
|
||||
_08125BE8: .4byte 0x0000ffff
|
||||
_08125BEC: .4byte gUnknown_3005E98
|
||||
_08125BF0: .4byte sub_8125C38
|
||||
|
|
@ -14416,7 +14416,7 @@ _08125C84:
|
|||
ldrsh r2, [r6, r1]
|
||||
movs r1, 0xD
|
||||
muls r1, r2
|
||||
ldr r2, _08125CE0 @ =gUnknown_8247094
|
||||
ldr r2, _08125CE0 @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
ldr r4, _08125CE4 @ =gStringVar4
|
||||
|
|
@ -14444,7 +14444,7 @@ _08125CD0: .4byte gPlayerParty
|
|||
_08125CD4: .4byte gUnknown_203AD30
|
||||
_08125CD8: .4byte gStringVar1
|
||||
_08125CDC: .4byte gStringVar2
|
||||
_08125CE0: .4byte gUnknown_8247094
|
||||
_08125CE0: .4byte gMoveNames
|
||||
_08125CE4: .4byte gStringVar4
|
||||
_08125CE8: .4byte gUnknown_8416DB3
|
||||
_08125CEC: .4byte gTasks
|
||||
|
|
@ -14806,7 +14806,7 @@ sub_8125F5C: @ 8125F5C
|
|||
ldr r0, _08125FF4 @ =gStringVar2
|
||||
movs r1, 0xD
|
||||
muls r1, r4
|
||||
ldr r2, _08125FF8 @ =gUnknown_8247094
|
||||
ldr r2, _08125FF8 @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
adds r0, r6, 0
|
||||
|
|
@ -14831,7 +14831,7 @@ _08125FE8: .4byte gPlayerParty
|
|||
_08125FEC: .4byte gUnknown_203AD30
|
||||
_08125FF0: .4byte gStringVar1
|
||||
_08125FF4: .4byte gStringVar2
|
||||
_08125FF8: .4byte gUnknown_8247094
|
||||
_08125FF8: .4byte gMoveNames
|
||||
thumb_func_end sub_8125F5C
|
||||
|
||||
thumb_func_start sub_8125FFC
|
||||
|
|
@ -14864,7 +14864,7 @@ sub_8125FFC: @ 8125FFC
|
|||
ldr r0, _08126068 @ =gStringVar2
|
||||
movs r1, 0xD
|
||||
muls r1, r4
|
||||
ldr r2, _0812606C @ =gUnknown_8247094
|
||||
ldr r2, _0812606C @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
ldr r0, _08126070 @ =gUnknown_8416EC6
|
||||
|
|
@ -14884,7 +14884,7 @@ _0812605C: .4byte gUnknown_203B0A0
|
|||
_08126060: .4byte gPlayerParty
|
||||
_08126064: .4byte gStringVar1
|
||||
_08126068: .4byte gStringVar2
|
||||
_0812606C: .4byte gUnknown_8247094
|
||||
_0812606C: .4byte gMoveNames
|
||||
_08126070: .4byte gUnknown_8416EC6
|
||||
_08126074: .4byte gTasks
|
||||
_08126078: .4byte sub_812607C
|
||||
|
|
@ -14945,7 +14945,7 @@ sub_81260D8: @ 81260D8
|
|||
ldrsh r2, [r1, r3]
|
||||
movs r1, 0xD
|
||||
muls r1, r2
|
||||
ldr r2, _08126128 @ =gUnknown_8247094
|
||||
ldr r2, _08126128 @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
ldr r4, _0812612C @ =gStringVar4
|
||||
|
|
@ -14970,7 +14970,7 @@ sub_81260D8: @ 81260D8
|
|||
.align 2, 0
|
||||
_08126120: .4byte gStringVar2
|
||||
_08126124: .4byte gUnknown_203B0A0
|
||||
_08126128: .4byte gUnknown_8247094
|
||||
_08126128: .4byte gMoveNames
|
||||
_0812612C: .4byte gStringVar4
|
||||
_08126130: .4byte gUnknown_8416E6B
|
||||
_08126134: .4byte gTasks
|
||||
|
|
@ -15044,7 +15044,7 @@ _081261AE:
|
|||
ldrsh r2, [r7, r1]
|
||||
movs r1, 0xD
|
||||
muls r1, r2
|
||||
ldr r2, _081261FC @ =gUnknown_8247094
|
||||
ldr r2, _081261FC @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
ldr r4, _08126200 @ =gStringVar4
|
||||
|
|
@ -15069,7 +15069,7 @@ _081261AE:
|
|||
.align 2, 0
|
||||
_081261F4: .4byte gStringVar1
|
||||
_081261F8: .4byte gStringVar2
|
||||
_081261FC: .4byte gUnknown_8247094
|
||||
_081261FC: .4byte gMoveNames
|
||||
_08126200: .4byte gStringVar4
|
||||
_08126204: .4byte gUnknown_8416E84
|
||||
_08126208: .4byte gTasks
|
||||
|
|
@ -15105,7 +15105,7 @@ _0812623A:
|
|||
ldrsh r2, [r1, r3]
|
||||
movs r1, 0xD
|
||||
muls r1, r2
|
||||
ldr r2, _0812627C @ =gUnknown_8247094
|
||||
ldr r2, _0812627C @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
ldr r0, _08126280 @ =gUnknown_8416DF7
|
||||
|
|
@ -15125,7 +15125,7 @@ _0812626A:
|
|||
_08126270: .4byte gStringVar1
|
||||
_08126274: .4byte gStringVar2
|
||||
_08126278: .4byte gUnknown_203B0A0
|
||||
_0812627C: .4byte gUnknown_8247094
|
||||
_0812627C: .4byte gMoveNames
|
||||
_08126280: .4byte gUnknown_8416DF7
|
||||
_08126284: .4byte gTasks
|
||||
_08126288: .4byte sub_8125D88
|
||||
|
|
@ -15754,7 +15754,7 @@ sub_8126770: @ 8126770
|
|||
ldrh r2, [r6]
|
||||
movs r1, 0xD
|
||||
muls r1, r2
|
||||
ldr r2, _081267F0 @ =gUnknown_8247094
|
||||
ldr r2, _081267F0 @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
ldr r4, _081267F4 @ =gStringVar4
|
||||
|
|
@ -15787,7 +15787,7 @@ _081267E0: .4byte gPlayerParty
|
|||
_081267E4: .4byte gStringVar1
|
||||
_081267E8: .4byte gStringVar2
|
||||
_081267EC: .4byte gMoveToLearn
|
||||
_081267F0: .4byte gUnknown_8247094
|
||||
_081267F0: .4byte gMoveNames
|
||||
_081267F4: .4byte gStringVar4
|
||||
_081267F8: .4byte gUnknown_8416DF7
|
||||
_081267FC: .4byte gTasks
|
||||
|
|
@ -15818,7 +15818,7 @@ sub_8126804: @ 8126804
|
|||
ldr r0, _0812687C @ =gStringVar2
|
||||
movs r1, 0xD
|
||||
muls r1, r5
|
||||
ldr r2, _08126880 @ =gUnknown_8247094
|
||||
ldr r2, _08126880 @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
ldr r4, _08126884 @ =gStringVar4
|
||||
|
|
@ -15849,7 +15849,7 @@ _08126870: .4byte gUnknown_203B0A0
|
|||
_08126874: .4byte gPlayerParty
|
||||
_08126878: .4byte gStringVar1
|
||||
_0812687C: .4byte gStringVar2
|
||||
_08126880: .4byte gUnknown_8247094
|
||||
_08126880: .4byte gMoveNames
|
||||
_08126884: .4byte gStringVar4
|
||||
_08126888: .4byte gUnknown_8416DB3
|
||||
_0812688C: .4byte gTasks
|
||||
|
|
@ -16556,7 +16556,7 @@ sub_8126DC8: @ 8126DC8
|
|||
ldrsh r2, [r7, r1]
|
||||
movs r1, 0xD
|
||||
muls r1, r2
|
||||
ldr r2, _08126E64 @ =gUnknown_8247094
|
||||
ldr r2, _08126E64 @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
movs r0, 0x2
|
||||
|
|
@ -16589,7 +16589,7 @@ _08126E54: .4byte gPlayerParty
|
|||
_08126E58: .4byte gStringVar1
|
||||
_08126E5C: .4byte gSpecialVar_0x8005
|
||||
_08126E60: .4byte gStringVar2
|
||||
_08126E64: .4byte gUnknown_8247094
|
||||
_08126E64: .4byte gMoveNames
|
||||
_08126E68: .4byte 0xffff0000
|
||||
_08126E6C:
|
||||
ldr r1, _08126E70 @ =gUnknown_8416DC2
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ _0811C58C:
|
|||
adds r0, 0x77
|
||||
movs r1, 0xD
|
||||
muls r1, r6
|
||||
ldr r2, _0811C5A8 @ =gUnknown_8247094
|
||||
ldr r2, _0811C5A8 @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
adds r0, r4, 0
|
||||
|
|
@ -60,7 +60,7 @@ _0811C5A2:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0811C5A8: .4byte gUnknown_8247094
|
||||
_0811C5A8: .4byte gMoveNames
|
||||
thumb_func_end sub_811C568
|
||||
|
||||
thumb_func_start sub_811C5AC
|
||||
|
|
@ -194,7 +194,7 @@ _0811C628:
|
|||
adds r2, 0x84
|
||||
movs r1, 0xD
|
||||
muls r1, r0
|
||||
ldr r0, _0811C6E4 @ =gUnknown_8247094
|
||||
ldr r0, _0811C6E4 @ =gMoveNames
|
||||
adds r1, r0
|
||||
adds r0, r2, 0
|
||||
bl StringCopy
|
||||
|
|
@ -209,7 +209,7 @@ _0811C6D2:
|
|||
bx r1
|
||||
.align 2, 0
|
||||
_0811C6E0: .4byte gPlayerParty
|
||||
_0811C6E4: .4byte gUnknown_8247094
|
||||
_0811C6E4: .4byte gMoveNames
|
||||
thumb_func_end sub_811C5D4
|
||||
|
||||
thumb_func_start sub_811C6E8
|
||||
|
|
|
|||
|
|
@ -4241,7 +4241,7 @@ _081368B0:
|
|||
adds r0, r1
|
||||
ldrh r1, [r3]
|
||||
muls r1, r2
|
||||
ldr r2, _0813695C @ =gUnknown_8247094
|
||||
ldr r2, _0813695C @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
cmp r7, 0x3
|
||||
|
|
@ -4292,7 +4292,7 @@ _0813694C: .4byte 0x0000324e
|
|||
_08136950: .4byte gBattleMoves
|
||||
_08136954: .4byte 0x00003258
|
||||
_08136958: .4byte 0x00003128
|
||||
_0813695C: .4byte gUnknown_8247094
|
||||
_0813695C: .4byte gMoveNames
|
||||
_08136960: .4byte 0x00003208
|
||||
_08136964: .4byte 0x000030b8
|
||||
_08136968: .4byte 0x000030f0
|
||||
|
|
|
|||
268
asm/quest_log.s
268
asm/quest_log.s
|
|
@ -5,212 +5,6 @@
|
|||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_8113F80
|
||||
sub_8113F80: @ 8113F80
|
||||
push {r4,lr}
|
||||
adds r2, r0, 0
|
||||
adds r4, r1, 0
|
||||
movs r0, 0x4
|
||||
adds r1, r2, 0
|
||||
bl sub_8113DE0
|
||||
adds r2, r0, 0
|
||||
cmp r2, 0
|
||||
bne _08113F98
|
||||
movs r0, 0
|
||||
b _08113FB2
|
||||
_08113F98:
|
||||
ldrh r0, [r4]
|
||||
strh r0, [r2]
|
||||
ldrh r0, [r4, 0x4]
|
||||
strh r0, [r2, 0x2]
|
||||
ldrh r0, [r4, 0x6]
|
||||
strh r0, [r2, 0x4]
|
||||
ldrh r0, [r4]
|
||||
cmp r0, 0x55
|
||||
bne _08113FB0
|
||||
ldr r1, _08113FB8 @ =gUnknown_203B048
|
||||
movs r0, 0x2
|
||||
strb r0, [r1]
|
||||
_08113FB0:
|
||||
adds r0, r2, 0x6
|
||||
_08113FB2:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08113FB8: .4byte gUnknown_203B048
|
||||
thumb_func_end sub_8113F80
|
||||
|
||||
thumb_func_start sub_8113FBC
|
||||
sub_8113FBC: @ 8113FBC
|
||||
push {r4-r7,lr}
|
||||
adds r1, r0, 0
|
||||
movs r0, 0x4
|
||||
bl sub_8113E88
|
||||
adds r5, r0, 0
|
||||
ldrh r0, [r5]
|
||||
bl ItemId_GetPocket
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
subs r0, 0x1
|
||||
cmp r0, 0x4
|
||||
bls _08113FDA
|
||||
b _0811413C
|
||||
_08113FDA:
|
||||
lsls r0, 2
|
||||
ldr r1, _08113FE4 @ =_08113FE8
|
||||
adds r0, r1
|
||||
ldr r0, [r0]
|
||||
mov pc, r0
|
||||
.align 2, 0
|
||||
_08113FE4: .4byte _08113FE8
|
||||
.align 2, 0
|
||||
_08113FE8:
|
||||
.4byte _08113FFC
|
||||
.4byte _08114074
|
||||
.4byte _08113FFC
|
||||
.4byte _0811409C
|
||||
.4byte _08113FFC
|
||||
_08113FFC:
|
||||
ldr r4, _08114024 @ =gStringVar1
|
||||
ldrh r0, [r5]
|
||||
bl ItemId_GetItem
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
bl StringCopy
|
||||
ldrh r0, [r5]
|
||||
cmp r0, 0x55
|
||||
bne _08114034
|
||||
ldr r0, _08114028 @ =gStringVar2
|
||||
ldrb r1, [r5, 0x4]
|
||||
bl sub_80C4DF8
|
||||
ldr r0, _0811402C @ =gStringVar4
|
||||
ldr r1, _08114030 @ =gUnknown_841AFA6
|
||||
bl StringExpandPlaceholders
|
||||
b _0811413C
|
||||
.align 2, 0
|
||||
_08114024: .4byte gStringVar1
|
||||
_08114028: .4byte gStringVar2
|
||||
_0811402C: .4byte gStringVar4
|
||||
_08114030: .4byte gUnknown_841AFA6
|
||||
_08114034:
|
||||
ldrh r1, [r5, 0x2]
|
||||
ldr r0, _08114050 @ =0x0000ffff
|
||||
cmp r1, r0
|
||||
beq _08114060
|
||||
adds r0, r1, 0
|
||||
ldr r1, _08114054 @ =gStringVar2
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
ldr r0, _08114058 @ =gStringVar4
|
||||
ldr r1, _0811405C @ =gUnknown_841A1E7
|
||||
bl StringExpandPlaceholders
|
||||
b _0811413C
|
||||
.align 2, 0
|
||||
_08114050: .4byte 0x0000ffff
|
||||
_08114054: .4byte gStringVar2
|
||||
_08114058: .4byte gStringVar4
|
||||
_0811405C: .4byte gUnknown_841A1E7
|
||||
_08114060:
|
||||
ldr r0, _0811406C @ =gStringVar4
|
||||
ldr r1, _08114070 @ =gUnknown_841A210
|
||||
bl StringExpandPlaceholders
|
||||
b _0811413C
|
||||
.align 2, 0
|
||||
_0811406C: .4byte gStringVar4
|
||||
_08114070: .4byte gUnknown_841A210
|
||||
_08114074:
|
||||
ldr r4, _08114090 @ =gStringVar1
|
||||
ldrh r0, [r5]
|
||||
bl ItemId_GetItem
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
bl StringCopy
|
||||
ldr r0, _08114094 @ =gStringVar4
|
||||
ldr r1, _08114098 @ =gUnknown_841A220
|
||||
bl StringExpandPlaceholders
|
||||
b _0811413C
|
||||
.align 2, 0
|
||||
_08114090: .4byte gStringVar1
|
||||
_08114094: .4byte gStringVar4
|
||||
_08114098: .4byte gUnknown_841A220
|
||||
_0811409C:
|
||||
ldrh r0, [r5, 0x2]
|
||||
ldr r1, _081140E8 @ =gStringVar1
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
ldr r4, _081140EC @ =gStringVar2
|
||||
ldrh r0, [r5]
|
||||
bl ItemIdToBattleMoveId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r7, 0xD
|
||||
adds r1, r0, 0
|
||||
muls r1, r7
|
||||
ldr r6, _081140F0 @ =gUnknown_8247094
|
||||
adds r1, r6
|
||||
adds r0, r4, 0
|
||||
bl StringCopy
|
||||
ldrh r1, [r5, 0x4]
|
||||
ldr r0, _081140F4 @ =0x0000ffff
|
||||
cmp r1, r0
|
||||
beq _08114118
|
||||
ldr r0, _081140F8 @ =gStringVar3
|
||||
muls r1, r7
|
||||
adds r1, r6
|
||||
bl StringCopy
|
||||
ldrh r1, [r5]
|
||||
movs r0, 0xA9
|
||||
lsls r0, 1
|
||||
cmp r1, r0
|
||||
bls _08114104
|
||||
ldr r0, _081140FC @ =gStringVar4
|
||||
ldr r1, _08114100 @ =gUnknown_841A965
|
||||
bl StringExpandPlaceholders
|
||||
b _0811413C
|
||||
.align 2, 0
|
||||
_081140E8: .4byte gStringVar1
|
||||
_081140EC: .4byte gStringVar2
|
||||
_081140F0: .4byte gUnknown_8247094
|
||||
_081140F4: .4byte 0x0000ffff
|
||||
_081140F8: .4byte gStringVar3
|
||||
_081140FC: .4byte gStringVar4
|
||||
_08114100: .4byte gUnknown_841A965
|
||||
_08114104:
|
||||
ldr r0, _08114110 @ =gStringVar4
|
||||
ldr r1, _08114114 @ =gUnknown_841A277
|
||||
bl StringExpandPlaceholders
|
||||
b _0811413C
|
||||
.align 2, 0
|
||||
_08114110: .4byte gStringVar4
|
||||
_08114114: .4byte gUnknown_841A277
|
||||
_08114118:
|
||||
ldrh r1, [r5]
|
||||
movs r0, 0xA9
|
||||
lsls r0, 1
|
||||
cmp r1, r0
|
||||
bls _08114134
|
||||
ldr r0, _0811412C @ =gStringVar4
|
||||
ldr r1, _08114130 @ =gUnknown_841A938
|
||||
bl StringExpandPlaceholders
|
||||
b _0811413C
|
||||
.align 2, 0
|
||||
_0811412C: .4byte gStringVar4
|
||||
_08114130: .4byte gUnknown_841A938
|
||||
_08114134:
|
||||
ldr r0, _08114144 @ =gStringVar4
|
||||
ldr r1, _08114148 @ =gUnknown_841A255
|
||||
bl StringExpandPlaceholders
|
||||
_0811413C:
|
||||
adds r0, r5, 0x6
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08114144: .4byte gStringVar4
|
||||
_08114148: .4byte gUnknown_841A255
|
||||
thumb_func_end sub_8113FBC
|
||||
|
||||
thumb_func_start sub_811414C
|
||||
sub_811414C: @ 811414C
|
||||
push {r4,lr}
|
||||
|
|
@ -257,7 +51,7 @@ sub_8114188: @ 8114188
|
|||
ldrh r0, [r4, 0x2]
|
||||
ldr r1, _081141C0 @ =gStringVar1
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r5, _081141C4 @ =gStringVar2
|
||||
ldrh r0, [r4]
|
||||
bl ItemId_GetItem
|
||||
|
|
@ -301,7 +95,7 @@ sub_81141E4: @ 81141E4
|
|||
ldrh r0, [r4, 0x2]
|
||||
ldr r1, _0811421C @ =gStringVar1
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r5, _08114220 @ =gStringVar2
|
||||
ldrh r0, [r4]
|
||||
bl ItemId_GetItem
|
||||
|
|
@ -345,7 +139,7 @@ sub_8114240: @ 8114240
|
|||
ldrh r0, [r4, 0x2]
|
||||
ldr r1, _08114278 @ =gStringVar2
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r5, _0811427C @ =gStringVar1
|
||||
ldrh r0, [r4]
|
||||
bl ItemId_GetItem
|
||||
|
|
@ -389,7 +183,7 @@ sub_811429C: @ 811429C
|
|||
ldrh r0, [r4, 0x2]
|
||||
ldr r1, _081142D4 @ =gStringVar1
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r5, _081142D8 @ =gStringVar2
|
||||
ldrh r0, [r4]
|
||||
bl ItemId_GetItem
|
||||
|
|
@ -459,7 +253,7 @@ sub_8114324: @ 8114324
|
|||
ldrh r0, [r4, 0x4]
|
||||
ldr r1, _0811436C @ =gStringVar1
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r5, _08114370 @ =gStringVar2
|
||||
ldrh r0, [r4]
|
||||
bl ItemId_GetItem
|
||||
|
|
@ -510,7 +304,7 @@ sub_8114394: @ 8114394
|
|||
ldrh r0, [r4, 0x4]
|
||||
ldr r1, _081143DC @ =gStringVar2
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r5, _081143E0 @ =gStringVar3
|
||||
ldrh r0, [r4]
|
||||
bl ItemId_GetItem
|
||||
|
|
@ -645,11 +439,11 @@ sub_811448C: @ 811448C
|
|||
ldrh r0, [r5, 0x6]
|
||||
ldr r1, _081144DC @ =gStringVar2
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldrh r0, [r5, 0x4]
|
||||
ldr r1, _081144E0 @ =gStringVar3
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r0, _081144E4 @ =gStringVar4
|
||||
ldr r1, _081144E8 @ =gUnknown_841A3FF
|
||||
bl StringExpandPlaceholders
|
||||
|
|
@ -1019,11 +813,11 @@ sub_81147A8: @ 81147A8
|
|||
ldrh r0, [r5, 0x6]
|
||||
ldr r1, _081147F8 @ =gStringVar2
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldrh r0, [r5, 0x4]
|
||||
ldr r1, _081147FC @ =gStringVar3
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r0, _08114800 @ =gStringVar4
|
||||
ldr r1, _08114804 @ =gUnknown_841A76A
|
||||
bl StringExpandPlaceholders
|
||||
|
|
@ -1148,7 +942,7 @@ sub_81148BC: @ 81148BC
|
|||
ldrh r0, [r4]
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldrb r0, [r5, 0x1]
|
||||
bl GetBoxNamePtr
|
||||
adds r1, r0, 0
|
||||
|
|
@ -1157,7 +951,7 @@ sub_81148BC: @ 81148BC
|
|||
ldrh r0, [r4, 0x2]
|
||||
movs r1, 0
|
||||
movs r2, 0x3
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r0, _08114910 @ =gStringVar4
|
||||
ldr r1, _08114914 @ =gUnknown_841A566
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
|
|
@ -1214,11 +1008,11 @@ sub_8114944: @ 8114944
|
|||
ldrh r0, [r4]
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldrh r0, [r4, 0x2]
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r0, _08114988 @ =gStringVar4
|
||||
ldr r1, _0811498C @ =gUnknown_841A5D9
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
|
|
@ -1287,11 +1081,11 @@ sub_81149D0: @ 81149D0
|
|||
ldrh r0, [r4]
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldrh r0, [r4, 0x2]
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r0, _08114A14 @ =gStringVar4
|
||||
ldr r1, _08114A18 @ =gUnknown_841A60A
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
|
|
@ -1350,7 +1144,7 @@ sub_8114A4C: @ 8114A4C
|
|||
ldrh r0, [r4]
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldrb r0, [r5, 0x1]
|
||||
bl GetBoxNamePtr
|
||||
adds r1, r0, 0
|
||||
|
|
@ -1411,7 +1205,7 @@ sub_8114AC8: @ 8114AC8
|
|||
ldrh r0, [r4]
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r0, _08114B04 @ =gStringVar4
|
||||
ldr r1, _08114B08 @ =gUnknown_841A5FA
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
|
|
@ -1467,7 +1261,7 @@ sub_8114B34: @ 8114B34
|
|||
ldrh r0, [r4]
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r0, _08114B70 @ =gStringVar4
|
||||
ldr r1, _08114B74 @ =gUnknown_841A632
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
|
|
@ -1518,7 +1312,7 @@ sub_8114BA0: @ 8114BA0
|
|||
ldrh r0, [r4]
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldrb r0, [r4, 0x2]
|
||||
bl GetBoxNamePtr
|
||||
adds r1, r0, 0
|
||||
|
|
@ -1773,11 +1567,11 @@ sub_8114D68: @ 8114D68
|
|||
ldrh r0, [r4]
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldrh r0, [r4, 0x2]
|
||||
movs r1, 0
|
||||
movs r2, 0x3
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r1, _08114DDC @ =gUnknown_8456ACC
|
||||
ldrb r0, [r6, 0x1]
|
||||
lsls r0, 2
|
||||
|
|
@ -1903,7 +1697,7 @@ _08114E84:
|
|||
ldrh r0, [r5, 0x4]
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r4, _08114F04 @ =gStringVar2
|
||||
ldrb r1, [r5, 0x8]
|
||||
adds r0, r4, 0
|
||||
|
|
@ -1916,7 +1710,7 @@ _08114E84:
|
|||
ldrh r0, [r5, 0x6]
|
||||
movs r1, 0
|
||||
movs r2, 0x3
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r4, _08114F08 @ =gStringVar3
|
||||
ldrb r1, [r6, 0x1]
|
||||
adds r0, r4, 0
|
||||
|
|
@ -2092,11 +1886,11 @@ sub_811500C: @ 811500C
|
|||
ldrh r0, [r4]
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldrh r0, [r4, 0x2]
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r1, _0811506C @ =gUnknown_8456ACC
|
||||
ldrb r0, [r5, 0x1]
|
||||
lsls r0, 2
|
||||
|
|
@ -2229,7 +2023,7 @@ _08115148:
|
|||
ldrh r0, [r4, 0x4]
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r0, _08115188 @ =gSaveBlock2Ptr
|
||||
ldr r1, [r0]
|
||||
movs r0, 0x2
|
||||
|
|
@ -2237,7 +2031,7 @@ _08115148:
|
|||
ldrh r0, [r4, 0x6]
|
||||
movs r1, 0
|
||||
movs r2, 0x3
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r0, _0811518C @ =gStringVar4
|
||||
ldr r1, _08115190 @ =gUnknown_841A312
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
|
|
@ -2336,11 +2130,11 @@ _0811523E:
|
|||
ldrh r0, [r5]
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldrh r0, [r5, 0x2]
|
||||
movs r1, 0
|
||||
movs r2, 0x3
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldr r1, _08115274 @ =gUnknown_8456ACC
|
||||
ldrb r0, [r6, 0x1]
|
||||
lsls r0, 2
|
||||
|
|
@ -2626,7 +2420,7 @@ sub_8115460: @ 8115460
|
|||
ldrh r0, [r4]
|
||||
ldr r1, _0811549C @ =gStringVar1
|
||||
movs r2, 0
|
||||
bl sub_8113EAC
|
||||
bl QuestLog_AutoGetSpeciesname
|
||||
ldrb r0, [r5, 0x1]
|
||||
cmp r0, 0xFF
|
||||
beq _08115486
|
||||
|
|
|
|||
|
|
@ -4243,7 +4243,7 @@ ScrCmd_buffermovename: @ 806BE50
|
|||
ldr r2, [r4]
|
||||
movs r1, 0xD
|
||||
muls r1, r0
|
||||
ldr r0, _0806BE8C @ =gUnknown_8247094
|
||||
ldr r0, _0806BE8C @ =gMoveNames
|
||||
adds r1, r0
|
||||
adds r0, r2, 0
|
||||
bl StringCopy
|
||||
|
|
@ -4253,7 +4253,7 @@ ScrCmd_buffermovename: @ 806BE50
|
|||
bx r1
|
||||
.align 2, 0
|
||||
_0806BE88: .4byte gUnknown_83A7294
|
||||
_0806BE8C: .4byte gUnknown_8247094
|
||||
_0806BE8C: .4byte gMoveNames
|
||||
thumb_func_end ScrCmd_buffermovename
|
||||
|
||||
thumb_func_start ScrCmd_buffernumberstring
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50
|
|||
ldr r0, _080BFAA0 @ =gStringVar2
|
||||
movs r1, 0xD
|
||||
muls r1, r4
|
||||
ldr r2, _080BFAA4 @ =gUnknown_8247094
|
||||
ldr r2, _080BFAA4 @ =gMoveNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
pop {r4,r5}
|
||||
|
|
@ -208,7 +208,7 @@ _080BFA94: .4byte gPlayerParty
|
|||
_080BFA98: .4byte gSpecialVar_0x8005
|
||||
_080BFA9C: .4byte gStringVar1
|
||||
_080BFAA0: .4byte gStringVar2
|
||||
_080BFAA4: .4byte gUnknown_8247094
|
||||
_080BFAA4: .4byte gMoveNames
|
||||
thumb_func_end ScrSpecial_GetPokemonNicknameAndMoveName
|
||||
|
||||
thumb_func_start sub_80BFAA8
|
||||
|
|
|
|||
|
|
@ -1259,7 +1259,7 @@ sub_809B494: @ 809B494
|
|||
lsrs r0, 16
|
||||
movs r1, 0xD
|
||||
muls r1, r0
|
||||
ldr r0, _0809B524 @ =gUnknown_8247094
|
||||
ldr r0, _0809B524 @ =gMoveNames
|
||||
adds r1, r0
|
||||
adds r0, r5, 0
|
||||
bl StringCopy
|
||||
|
|
@ -1280,7 +1280,7 @@ _0809B514: .4byte gStringVar1
|
|||
_0809B518: .4byte 0xfffffee0
|
||||
_0809B51C: .4byte gStringVar4
|
||||
_0809B520: .4byte gUnknown_8416226
|
||||
_0809B524: .4byte gUnknown_8247094
|
||||
_0809B524: .4byte gMoveNames
|
||||
_0809B528:
|
||||
ldr r2, _0809B564 @ =gUnknown_8416213
|
||||
movs r4, 0
|
||||
|
|
|
|||
|
|
@ -704,7 +704,7 @@ _08131DC4:
|
|||
lsrs r0, 16
|
||||
movs r1, 0xD
|
||||
muls r1, r0
|
||||
ldr r0, _08131E14 @ =gUnknown_8247094
|
||||
ldr r0, _08131E14 @ =gMoveNames
|
||||
adds r1, r0
|
||||
adds r0, r4, 0
|
||||
bl StringAppend
|
||||
|
|
@ -721,7 +721,7 @@ _08131E04: .4byte 0xfffffee0
|
|||
_08131E08: .4byte gStringVar4
|
||||
_08131E0C: .4byte gUnknown_846317C
|
||||
_08131E10: .4byte gUnknown_8416703
|
||||
_08131E14: .4byte gUnknown_8247094
|
||||
_08131E14: .4byte gMoveNames
|
||||
thumb_func_end sub_8131D48
|
||||
|
||||
thumb_func_start sub_8131E18
|
||||
|
|
|
|||
|
|
@ -5033,7 +5033,7 @@ _0804EF50:
|
|||
adds r1, r0, 0
|
||||
movs r0, 0xD
|
||||
muls r1, r0
|
||||
ldr r0, _0804EF84 @ =gUnknown_8247094
|
||||
ldr r0, _0804EF84 @ =gMoveNames
|
||||
adds r1, r0
|
||||
adds r0, r6, 0
|
||||
bl StringAppend
|
||||
|
|
@ -5049,7 +5049,7 @@ _0804EF6C:
|
|||
b _0804EF9C
|
||||
.align 2, 0
|
||||
_0804EF80: .4byte gUnknown_8261EB6
|
||||
_0804EF84: .4byte gUnknown_8247094
|
||||
_0804EF84: .4byte gMoveNames
|
||||
_0804EF88: .4byte gUnknown_8261EC7
|
||||
_0804EF8C:
|
||||
ldr r1, _0804EFAC @ =gUnknown_8261EB6
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
.set POCKET_ITEMS, 0x01
|
||||
.set POCKET_POKE_BALLS, 0x02
|
||||
.set POCKET_TM_HM, 0x03
|
||||
.set POCKET_BERRIES, 0x04
|
||||
.set POCKET_KEY_ITEMS, 0x05
|
||||
.set POCKET_ITEMS, 0x01
|
||||
.set POCKET_KEY_ITEMS, 0x02
|
||||
.set POCKET_POKE_BALLS, 0x03
|
||||
.set POCKET_TM_CASE, 0x04
|
||||
.set POCKET_BERRY_POUCH, 0x05
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ gSpeciesNames:: @ 8245EE0
|
|||
gUnknown_8246BE5:: @ 8246BE5
|
||||
.incbin "baserom.gba", 0x246BE5, 0x4AF
|
||||
|
||||
gUnknown_8247094:: @ 8247094
|
||||
gMoveNames:: @ 8247094
|
||||
.incbin "baserom.gba", 0x247094, 0xF97
|
||||
|
||||
gUnknown_824802B:: @ 824802B
|
||||
|
|
|
|||
|
|
@ -1662,58 +1662,58 @@ gUnknown_841A155:: @ 841A155
|
|||
.string "Previously on your quest…$"
|
||||
|
||||
gUnknown_841A16F:: @ 841A16F
|
||||
.incbin "baserom.gba", 0x41A16F, 0x24
|
||||
.string "{PLAYER} switched the POKéMON\n{STR_VAR_1} with {STR_VAR_2}.$"
|
||||
|
||||
gUnknown_841A193:: @ 841A193
|
||||
.incbin "baserom.gba", 0x41A193, 0x3A
|
||||
.string "Took the item {STR_VAR_2} from\n{STR_VAR_1} and gave it the item\n{STR_VAR_3} to hold.$"
|
||||
|
||||
gUnknown_841A1CD:: @ 841A1CD
|
||||
.incbin "baserom.gba", 0x41A1CD, 0x1A
|
||||
.string "Took the item {STR_VAR_2} from\n{STR_VAR_1}.$"
|
||||
|
||||
gUnknown_841A1E7:: @ 841A1E7
|
||||
.incbin "baserom.gba", 0x41A1E7, 0x29
|
||||
.string "Used the item {STR_VAR_1} on {STR_VAR_2}\nat this location.$"
|
||||
|
||||
gUnknown_841A210:: @ 841A210
|
||||
.incbin "baserom.gba", 0x41A210, 0x10
|
||||
.string "{PLAYER} used the\n{STR_VAR_1}.$"
|
||||
|
||||
gUnknown_841A220:: @ 841A220
|
||||
.incbin "baserom.gba", 0x41A220, 0x35
|
||||
.string "Used the item {STR_VAR_1}, which was\nin the KEY ITEMS POCKET.$"
|
||||
|
||||
gUnknown_841A255:: @ 841A255
|
||||
.incbin "baserom.gba", 0x41A255, 0x22
|
||||
.string "{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM.$"
|
||||
|
||||
gUnknown_841A277:: @ 841A277
|
||||
.incbin "baserom.gba", 0x41A277, 0x39
|
||||
.string "{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM and forgot\nthe move {STR_VAR_3}.$"
|
||||
|
||||
gUnknown_841A2B0:: @ 841A2B0
|
||||
.incbin "baserom.gba", 0x41A2B0, 0x31
|
||||
.string "POKéMON were fully restored\nat a POKéMON CENTER.$"
|
||||
|
||||
gUnknown_841A2E1:: @ 841A2E1
|
||||
.incbin "baserom.gba", 0x41A2E1, 0x31
|
||||
.string "{UNKNOWN_F7 0x00} had a marvelous battle\nwith the CHAMPION, {UNKNOWN_F7 0x01}.$"
|
||||
|
||||
gUnknown_841A312:: @ 841A312
|
||||
.incbin "baserom.gba", 0x41A312, 0x37
|
||||
.string "In the end, {UNKNOWN_F7 0x00} sent out {UNKNOWN_F7 0x01}\nwhile {UNKNOWN_F7 0x02} countered with\n{UNKNOWN_F7 0x03}.$"
|
||||
|
||||
gUnknown_841A349:: @ 841A349
|
||||
.incbin "baserom.gba", 0x41A349, 0x48
|
||||
.string "And, as a result of battling with every\nbit of power, {UNKNOWN_F7 0x00} won\nthe match.$"
|
||||
|
||||
gUnknown_841A391:: @ 841A391
|
||||
.incbin "baserom.gba", 0x41A391, 0x49
|
||||
.string "Removed the item {STR_VAR_1} from\nthe BAG’s ITEMS POCKET and stored it\non the PC.$"
|
||||
|
||||
gUnknown_841A3DA:: @ 841A3DA
|
||||
.incbin "baserom.gba", 0x41A3DA, 0x25
|
||||
.string "{PLAYER} withdrew the item {STR_VAR_1}\nfrom the PC.$"
|
||||
|
||||
gUnknown_841A3FF:: @ 841A3FF
|
||||
.incbin "baserom.gba", 0x41A3FF, 0x23
|
||||
.string "Traded {STR_VAR_3} in exchange for\n{STR_VAR_1}’s {STR_VAR_2}.$"
|
||||
|
||||
gUnknown_841A422:: @ 841A422
|
||||
.incbin "baserom.gba", 0x41A422, 0x55
|
||||
.string "Took on {UNKNOWN_F7 0x00} in a SINGLE BATTLE.\nIt was a hotly contested match that\nresulted in a {UNKNOWN_F7 0x01}.$"
|
||||
|
||||
gUnknown_841A477:: @ 841A477
|
||||
.incbin "baserom.gba", 0x41A477, 0x4F
|
||||
.string "Took on {UNKNOWN_F7 0x00} in a DOUBLE BATTLE.\nIt was an extended match that resulted\nin a {UNKNOWN_F7 0x01}.$"
|
||||
|
||||
gUnknown_841A4C6:: @ 841A4C6
|
||||
.incbin "baserom.gba", 0x41A4C6, 0x3C
|
||||
.string "{UNKNOWN_F7 0x00} and {UNKNOWN_F7 0x01} took on\n{UNKNOWN_F7 0x02} and {UNKNOWN_F7 0x03} in a\nMULTI BATTLE and got a {UNKNOWN_F7 0x04}.$"
|
||||
|
||||
gUnknown_841A502::
|
||||
.string "win$"
|
||||
|
|
|
|||
|
|
@ -393,4 +393,11 @@
|
|||
// Check if the item is one that can be used on a Pokemon.
|
||||
#define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
|
||||
|
||||
// POCKETS
|
||||
#define POCKET_ITEMS 1
|
||||
#define POCKET_KEY_ITEMS 2
|
||||
#define POCKET_POKE_BALLS 3
|
||||
#define POCKET_TM_CASE 4
|
||||
#define POCKET_BERRY_POUCH 5
|
||||
|
||||
#endif // GUARD_CONSTANTS_ITEMS_H
|
||||
|
|
|
|||
|
|
@ -14,5 +14,6 @@ bool8 pokemon_has_move(struct Pokemon *, u16);
|
|||
void sub_81B58A8(void);
|
||||
void DoWallyTutorialBagMenu(void);
|
||||
u8 pokemon_ailments_get_primary(u32 status);
|
||||
u16 ItemIdToBattleMoveId(u16 itemId);
|
||||
|
||||
#endif // GUARD_PARTY_MENU_H
|
||||
|
|
|
|||
120
src/quest_log.c
120
src/quest_log.c
|
|
@ -1,5 +1,6 @@
|
|||
#include "global.h"
|
||||
#include "constants/species.h"
|
||||
#include "constants/items.h"
|
||||
#include "data2.h"
|
||||
#include "malloc.h"
|
||||
#include "main.h"
|
||||
|
|
@ -29,6 +30,7 @@
|
|||
#include "map_name_popup.h"
|
||||
#include "wild_encounter.h"
|
||||
#include "help_system.h"
|
||||
#include "party_menu.h"
|
||||
#include "unk_8159F40.h"
|
||||
#include "pokemon_storage_system.h"
|
||||
#include "save.h"
|
||||
|
|
@ -275,6 +277,14 @@ bool8 sub_81153E4(u16, void*);
|
|||
extern const u8 gUnknown_841A155[];
|
||||
extern const u8 gUnknown_841A16F[];
|
||||
extern const u8 gUnknown_841B073[];
|
||||
extern const u8 gUnknown_841AFA6[];
|
||||
extern const u8 gUnknown_841A1E7[];
|
||||
extern const u8 gUnknown_841A210[];
|
||||
extern const u8 gUnknown_841A220[];
|
||||
extern const u8 gUnknown_841A965[];
|
||||
extern const u8 gUnknown_841A277[];
|
||||
extern const u8 gUnknown_841A938[];
|
||||
extern const u8 gUnknown_841A255[];
|
||||
|
||||
const struct WindowTemplate gUnknown_845661C[3] = {
|
||||
{ 0, 0, 0, 30, 2, 15, 0x0e9 },
|
||||
|
|
@ -2646,7 +2656,7 @@ u8 sub_8113530(void)
|
|||
return sub_8113114(VAR_0x4038_STRUCT, gUnknown_20370C0);
|
||||
}
|
||||
|
||||
u16 * (*const gUnknown_8456948[])(u16 *, u16 *) = {
|
||||
static u16 * (*const sQuestLogStorageCBs[])(u16 *, u16 *) = {
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
|
|
@ -2752,18 +2762,18 @@ void sub_8113550(u16 a0, u16 * a1)
|
|||
if (gUnknown_203AE04 == NULL)
|
||||
{
|
||||
gUnknown_203AE04 = gUnknown_203AE08;
|
||||
r1 = gUnknown_8456948[a0](gUnknown_203AE04, a1);
|
||||
r1 = sQuestLogStorageCBs[a0](gUnknown_203AE04, a1);
|
||||
}
|
||||
else
|
||||
{
|
||||
gUnknown_8456948[a0](gUnknown_203AE04, a1);
|
||||
sQuestLogStorageCBs[a0](gUnknown_203AE04, a1);
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
gUnknown_203AE04 = NULL;
|
||||
r1 = gUnknown_8456948[a0](gUnknown_203AE08, a1);
|
||||
r1 = sQuestLogStorageCBs[a0](gUnknown_203AE08, a1);
|
||||
}
|
||||
|
||||
if (r1 == NULL)
|
||||
|
|
@ -2905,27 +2915,27 @@ void sub_8113550(u16 a0, u16 * a1)
|
|||
"\tldr r0, _08113660 @ =gUnknown_203AE08\n"
|
||||
"\tldr r0, [r0]\n"
|
||||
"\tstr r0, [r2]\n"
|
||||
"\tldr r1, _08113664 @ =gUnknown_8456948\n"
|
||||
"\tldr r1, _08113664 @ =sQuestLogStorageCBs\n"
|
||||
"\tldr r2, [r1, 0x7C]\n"
|
||||
"\tb _0811368E\n"
|
||||
"\t.align 2, 0\n"
|
||||
"_0811365C: .4byte gUnknown_203AE04\n"
|
||||
"_08113660: .4byte gUnknown_203AE08\n"
|
||||
"_08113664: .4byte gUnknown_8456948\n"
|
||||
"_08113664: .4byte sQuestLogStorageCBs\n"
|
||||
"_08113668:\n"
|
||||
"\tldr r0, _08113678 @ =gUnknown_8456948\n"
|
||||
"\tldr r0, _08113678 @ =sQuestLogStorageCBs\n"
|
||||
"\tldr r2, [r0, 0x7C]\n"
|
||||
"\tadds r0, r1, 0\n"
|
||||
"\tadds r1, r5, 0\n"
|
||||
"\tbl _call_via_r2\n"
|
||||
"\tb ._return\n"
|
||||
"\t.align 2, 0\n"
|
||||
"_08113678: .4byte gUnknown_8456948\n"
|
||||
"_08113678: .4byte sQuestLogStorageCBs\n"
|
||||
"_0811367C:\n"
|
||||
"\tldr r1, _081136C4 @ =gUnknown_203AE04\n"
|
||||
"\tmovs r0, 0\n"
|
||||
"\tstr r0, [r1]\n"
|
||||
"\tldr r0, _081136C8 @ =gUnknown_8456948\n"
|
||||
"\tldr r0, _081136C8 @ =sQuestLogStorageCBs\n"
|
||||
"\tlsls r1, r4, 2\n"
|
||||
"\tadds r1, r0\n"
|
||||
"\tldr r0, _081136CC @ =gUnknown_203AE08\n"
|
||||
|
|
@ -2958,7 +2968,7 @@ void sub_8113550(u16 a0, u16 * a1)
|
|||
"\tbx r0\n"
|
||||
"\t.align 2, 0\n"
|
||||
"_081136C4: .4byte gUnknown_203AE04\n"
|
||||
"_081136C8: .4byte gUnknown_8456948\n"
|
||||
"_081136C8: .4byte sQuestLogStorageCBs\n"
|
||||
"_081136CC: .4byte gUnknown_203AE08\n"
|
||||
"_081136D0: .4byte gUnknown_203B048");
|
||||
}
|
||||
|
|
@ -3051,7 +3061,7 @@ u16 * sub_8113828(u16 a0, u16 * a1)
|
|||
else
|
||||
gUnknown_203AE04 = NULL;
|
||||
|
||||
return gUnknown_8456948[a0](gUnknown_203AE08, a1);
|
||||
return sQuestLogStorageCBs[a0](gUnknown_203AE08, a1);
|
||||
}
|
||||
|
||||
bool8 sub_81138A0(u16 a0, u16 * a1)
|
||||
|
|
@ -3084,7 +3094,7 @@ void sub_811390C(void)
|
|||
u16 * resp;
|
||||
gUnknown_203B04A = 0;
|
||||
sub_8110AEC(gUnknown_203B024.unk_00);
|
||||
resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, (u16 *)&gUnknown_203B024.unk_04);
|
||||
resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, (u16 *)&gUnknown_203B024.unk_04);
|
||||
gUnknown_203AE08 = resp;
|
||||
sub_81138F8();
|
||||
}
|
||||
|
|
@ -3114,7 +3124,7 @@ void sub_81139BC(void)
|
|||
sub_8110AEC(gUnknown_203B024.unk_00);
|
||||
}
|
||||
sub_8113B94(gUnknown_203B024.unk_00);
|
||||
resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, (u16 *)&gUnknown_203B024.unk_04);
|
||||
resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, (u16 *)&gUnknown_203B024.unk_04);
|
||||
gUnknown_203AE08 = resp;
|
||||
sub_8113A1C(1);
|
||||
sub_81138F8();
|
||||
|
|
@ -3142,7 +3152,7 @@ bool8 sub_8113A44(u16 a0, u16 *a1)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
u16 * (*const gUnknown_84569F4[])(u16 *) = {
|
||||
static u16 * (*const sQuestLogScriptParsingCBs[])(u16 *) = {
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
|
|
@ -3261,7 +3271,7 @@ bool8 sub_8113AE8(u16 * a0)
|
|||
if (a0 == NULL || a0[1] > gUnknown_203AF98)
|
||||
return FALSE;
|
||||
|
||||
gUnknown_84569F4[a0[0] & 0xFFF](a0);
|
||||
sQuestLogScriptParsingCBs[a0[0] & 0xFFF](a0);
|
||||
gUnknown_203B044.unk_0 = a0[0];
|
||||
gUnknown_203B044.unk_1 = (a0[0] & 0xF000) >> 12;
|
||||
if (gUnknown_203B044.unk_1 != 0)
|
||||
|
|
@ -3287,7 +3297,7 @@ bool8 sub_8113AE8(u16 * a0)
|
|||
"\t.align 2, 0\n"
|
||||
"_08113B00: .4byte gUnknown_203AF98\n"
|
||||
"_08113B04:\n"
|
||||
"\tldr r2, _08113B38 @ =gUnknown_84569F4\n"
|
||||
"\tldr r2, _08113B38 @ =sQuestLogScriptParsingCBs\n"
|
||||
"\tldrh r1, [r4]\n"
|
||||
"\tldr r0, _08113B3C @ =0x00000fff\n"
|
||||
"\tands r0, r1\n"
|
||||
|
|
@ -3315,7 +3325,7 @@ bool8 sub_8113AE8(u16 * a0)
|
|||
"\tpop {r1}\n"
|
||||
"\tbx r1\n"
|
||||
"\t.align 2, 0\n"
|
||||
"_08113B38: .4byte gUnknown_84569F4\n"
|
||||
"_08113B38: .4byte sQuestLogScriptParsingCBs\n"
|
||||
"_08113B3C: .4byte 0x00000fff\n"
|
||||
"_08113B40: .4byte gUnknown_203B044");
|
||||
}
|
||||
|
|
@ -3326,7 +3336,7 @@ bool8 sub_8113B44(u16 * a0)
|
|||
if (gUnknown_203B044.unk_2 == 0)
|
||||
return FALSE;
|
||||
|
||||
gUnknown_84569F4[gUnknown_203B044.unk_0](a0);
|
||||
sQuestLogScriptParsingCBs[gUnknown_203B044.unk_0](a0);
|
||||
gUnknown_203B044.unk_2++;
|
||||
if (gUnknown_203B044.unk_2 > gUnknown_203B044.unk_1)
|
||||
sub_8113B88();
|
||||
|
|
@ -3517,7 +3527,7 @@ u16 * sub_8113E88(u16 a0, u16 * a1)
|
|||
// TODO: delete this declaration once data_83FECCC.s is decompiled
|
||||
extern const u8 gText_EggNickname[];
|
||||
|
||||
void sub_8113EAC(u16 a0, u8 * a1, u8 a2)
|
||||
void QuestLog_AutoGetSpeciesname(u16 a0, u8 * a1, u8 a2)
|
||||
{
|
||||
if (a1 != NULL)
|
||||
{
|
||||
|
|
@ -3549,9 +3559,77 @@ u16 * sub_8113F14(u16 * a0, u16 * a1)
|
|||
u16 * sub_8113F3C(u16 * a0)
|
||||
{
|
||||
u16 * r4 = sub_8113E88(3, a0);
|
||||
sub_8113EAC(r4[0], gStringVar1, 0);
|
||||
sub_8113EAC(r4[1], gStringVar2, 0);
|
||||
QuestLog_AutoGetSpeciesname(r4[0], gStringVar1, 0);
|
||||
QuestLog_AutoGetSpeciesname(r4[1], gStringVar2, 0);
|
||||
StringExpandPlaceholders(gStringVar4, gUnknown_841A16F);
|
||||
r4 += 2;
|
||||
return r4;
|
||||
}
|
||||
|
||||
u16 * sub_8113F80(u16 * a0, u16 * a1)
|
||||
{
|
||||
u16 * r2 = sub_8113DE0(4, a0);
|
||||
if (r2 == NULL)
|
||||
return NULL;
|
||||
|
||||
r2[0] = a1[0];
|
||||
r2[1] = a1[2];
|
||||
r2[2] = a1[3];
|
||||
|
||||
if (a1[0] == ITEM_ESCAPE_ROPE)
|
||||
gUnknown_203B048 = 2;
|
||||
|
||||
return r2 + 3;
|
||||
}
|
||||
|
||||
u16 * sub_8113FBC(u16 * a0)
|
||||
{
|
||||
u16 * r5 = sub_8113E88(4, a0);
|
||||
|
||||
switch (ItemId_GetPocket(r5[0]))
|
||||
{
|
||||
case POCKET_ITEMS:
|
||||
case POCKET_POKE_BALLS:
|
||||
case POCKET_BERRY_POUCH:
|
||||
StringCopy(gStringVar1, ItemId_GetItem(r5[0])->name);
|
||||
if (r5[0] == ITEM_ESCAPE_ROPE)
|
||||
{
|
||||
sub_80C4DF8(gStringVar2, r5[2]);
|
||||
StringExpandPlaceholders(gStringVar4, gUnknown_841AFA6);
|
||||
}
|
||||
else if (r5[1] != 0xFFFF)
|
||||
{
|
||||
QuestLog_AutoGetSpeciesname(r5[1], gStringVar2, 0);
|
||||
StringExpandPlaceholders(gStringVar4, gUnknown_841A1E7);
|
||||
}
|
||||
else
|
||||
{
|
||||
StringExpandPlaceholders(gStringVar4, gUnknown_841A210);
|
||||
}
|
||||
break;
|
||||
case POCKET_KEY_ITEMS:
|
||||
StringCopy(gStringVar1, ItemId_GetItem(r5[0])->name);
|
||||
StringExpandPlaceholders(gStringVar4, gUnknown_841A220);
|
||||
break;
|
||||
case POCKET_TM_CASE:
|
||||
QuestLog_AutoGetSpeciesname(r5[1], gStringVar1, 0);
|
||||
StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(r5[0])]);
|
||||
if (r5[2] != 0xFFFF)
|
||||
{
|
||||
StringCopy(gStringVar3, gMoveNames[r5[2]]);
|
||||
if (r5[0] > ITEM_TM50)
|
||||
StringExpandPlaceholders(gStringVar4, gUnknown_841A965);
|
||||
else
|
||||
StringExpandPlaceholders(gStringVar4, gUnknown_841A277);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (r5[0] > ITEM_TM50)
|
||||
StringExpandPlaceholders(gStringVar4, gUnknown_841A938);
|
||||
else
|
||||
StringExpandPlaceholders(gStringVar4, gUnknown_841A255);
|
||||
}
|
||||
break;
|
||||
}
|
||||
return r5 + 3;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user