dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

decompile main

Browse Source
This commit is contained in:
sceptillion
2017-12-17 13:22:46 -08:00
parent 3ddda066d9
commit b849ce93db
305 changed files with 18946 additions and 3564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/bag.s
+2 -2
View File
@@ -398,7 +398,7 @@ sub_810BB40: @ 810BB40
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _0810BB70 @ =gUnknown_3005008
ldr r0, _0810BB70 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xA4
lsls r1, 2
@@ -413,7 +413,7 @@ sub_810BB40: @ 810BB40
pop {r0}
bx r0
.align 2, 0
_0810BB70: .4byte gUnknown_3005008
_0810BB70: .4byte gSaveBlock1Ptr
thumb_func_end sub_810BB40
thumb_func_start sub_810BB74
asm/battle_1.s
+2 -2
View File
@@ -1231,7 +1231,7 @@ _0800FBA6:
ands r0, r1
cmp r0, 0
beq _0800FBD8
ldr r0, _0800FBCC @ =gUnknown_81E9F10
ldr r0, _0800FBCC @ =gGameVersion
ldrb r0, [r0]
cmp r0, 0x4
bne _0800FBD0
@@ -1240,7 +1240,7 @@ _0800FBA6:
b _0800FC26
.align 2, 0
_0800FBC8: .4byte 0x00080902
_0800FBCC: .4byte gUnknown_81E9F10
_0800FBCC: .4byte gGameVersion
_0800FBD0:
movs r0, 0x4
bl sub_800F2AC
asm/battle_2.s
+34 -34
View File
@@ -218,7 +218,7 @@ _0800FF7E:
bl sub_80112E0
bl SetWildMonHeldItem
_0800FF98:
ldr r0, _0800FFDC @ =gUnknown_30030F0
ldr r0, _0800FFDC @ =gMain
ldr r1, _0800FFE0 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -248,7 +248,7 @@ _0800FFCC: .4byte sub_8010508
_0800FFD0: .4byte gUnknown_2022B4C
_0800FFD4: .4byte gUnknown_202402C
_0800FFD8: .4byte gUnknown_20386AE
_0800FFDC: .4byte gUnknown_30030F0
_0800FFDC: .4byte gMain
_0800FFE0: .4byte 0x00000439
_0800FFE4: .4byte gUnknown_2024284
_0800FFE8: .4byte gUnknown_2023E82
@@ -373,7 +373,7 @@ sub_80100B8: @ 80100B8
cmp r0, 0x1
bne _08010134
movs r2, 0
ldr r7, _08010124 @ =gUnknown_3005008
ldr r7, _08010124 @ =gSaveBlock1Ptr
movs r1, 0xC8
lsls r1, 1
adds r5, r1
@@ -394,7 +394,7 @@ _080100DA:
strb r0, [r1]
movs r2, 0
adds r3, r5, 0
ldr r6, _08010124 @ =gUnknown_3005008
ldr r6, _08010124 @ =gSaveBlock1Ptr
ldr r5, _0801012C @ =0x00003108
_080100FA:
adds r0, r3, r2
@@ -418,7 +418,7 @@ _080100FA:
b _08010174
.align 2, 0
_08010120: .4byte gUnknown_2023FE8
_08010124: .4byte gUnknown_3005008
_08010124: .4byte gSaveBlock1Ptr
_08010128: .4byte 0x000030ec
_0801012C: .4byte 0x00003108
_08010130: .4byte 0x0000311a
@@ -482,7 +482,7 @@ _08010194:
bne _08010250
movs r5, 0
ldr r3, _08010238 @ =gUnknown_2023F54
ldr r0, _0801023C @ =gUnknown_3005008
ldr r0, _0801023C @ =gSaveBlock1Ptr
mov r8, r0
adds r6, r3, 0
mov r4, r8
@@ -517,7 +517,7 @@ _080101AE:
movs r5, 0
adds r7, r3, 0
adds r7, 0x8
ldr r4, _0801023C @ =gUnknown_3005008
ldr r4, _0801023C @ =gSaveBlock1Ptr
ldr r2, _08010244 @ =0x00003108
adds r6, r3, 0
adds r6, 0x40
@@ -561,7 +561,7 @@ _080101EC:
.align 2, 0
_08010234: .4byte gUnknown_2022B4C
_08010238: .4byte gUnknown_2023F54
_0801023C: .4byte gUnknown_3005008
_0801023C: .4byte gSaveBlock1Ptr
_08010240: .4byte 0x000030ec
_08010244: .4byte 0x00003108
_08010248: .4byte 0x0000311a
@@ -1296,7 +1296,7 @@ _0801084C:
cmp r0, 0
beq _080108B8
ldr r2, _08010884 @ =gUnknown_3004F80
ldr r1, _08010888 @ =gUnknown_30030F0
ldr r1, _08010888 @ =gMain
ldr r0, [r1]
str r0, [r2]
ldr r0, _0801088C @ =sub_80123E4
@@ -1316,7 +1316,7 @@ _0801084C:
.align 2, 0
_08010880: .4byte gUnknown_2023E83
_08010884: .4byte gUnknown_3004F80
_08010888: .4byte gUnknown_30030F0
_08010888: .4byte gMain
_0801088C: .4byte sub_80123E4
_08010890: .4byte sub_8011100
_08010894: .4byte gUnknown_2022B4C
@@ -1600,7 +1600,7 @@ _08010ABA:
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
ldr r1, _08010AF0 @ =gUnknown_30030F0
ldr r1, _08010AF0 @ =gMain
ldr r0, [r1, 0x8]
mov r2, r9
str r0, [r2]
@@ -1616,7 +1616,7 @@ _08010ABA:
_08010AE4: .4byte gUnknown_2022118
_08010AE8: .4byte gUnknown_2022B58
_08010AEC: .4byte gUnknown_2023E82
_08010AF0: .4byte gUnknown_30030F0
_08010AF0: .4byte gMain
_08010AF4: .4byte gUnknown_2022B4C
_08010AF8: .4byte sub_80109C8
_08010AFC:
@@ -1653,7 +1653,7 @@ _08010B2A:
mov r2, r8
ldrh r0, [r2]
str r0, [r1]
ldr r1, _08010B5C @ =gUnknown_30030F0
ldr r1, _08010B5C @ =gMain
mov r2, r9
ldr r0, [r2]
str r0, [r1, 0x8]
@@ -1663,7 +1663,7 @@ _08010B2A:
.align 2, 0
_08010B54: .4byte gUnknown_3003F3C
_08010B58: .4byte gUnknown_2022B4C
_08010B5C: .4byte gUnknown_30030F0
_08010B5C: .4byte gMain
_08010B60: .4byte sub_800FE24
_08010B64:
ldr r0, _08010B90 @ =gUnknown_3003F64
@@ -1674,7 +1674,7 @@ _08010B64:
mov r2, r8
ldrh r0, [r2]
str r0, [r1]
ldr r1, _08010B98 @ =gUnknown_30030F0
ldr r1, _08010B98 @ =gMain
mov r2, r9
ldr r0, [r2]
str r0, [r1, 0x8]
@@ -1690,7 +1690,7 @@ _08010B82:
.align 2, 0
_08010B90: .4byte gUnknown_3003F64
_08010B94: .4byte gUnknown_2022B4C
_08010B98: .4byte gUnknown_30030F0
_08010B98: .4byte gMain
_08010B9C: .4byte sub_800FE24
thumb_func_end sub_80109C8
@@ -2300,7 +2300,7 @@ _08011084:
cmp r0, 0
beq _080110F0
ldr r2, _080110BC @ =gUnknown_3004F80
ldr r1, _080110C0 @ =gUnknown_30030F0
ldr r1, _080110C0 @ =gMain
ldr r0, [r1]
str r0, [r2]
ldr r0, _080110C4 @ =sub_80123E4
@@ -2320,7 +2320,7 @@ _08011084:
.align 2, 0
_080110B8: .4byte gUnknown_2023E83
_080110BC: .4byte gUnknown_3004F80
_080110C0: .4byte gUnknown_30030F0
_080110C0: .4byte gMain
_080110C4: .4byte sub_80123E4
_080110C8: .4byte sub_8011100
_080110CC: .4byte gUnknown_2022B4C
@@ -2362,7 +2362,7 @@ sub_8011100: @ 8011100
bl sub_8002DE8
bl UpdatePaletteFade
bl RunTasks
ldr r0, _08011160 @ =gUnknown_30030F0
ldr r0, _08011160 @ =gMain
ldrh r1, [r0, 0x2C]
movs r0, 0x2
ands r0, r1
@@ -2396,7 +2396,7 @@ _08011158:
pop {r0}
bx r0
.align 2, 0
_08011160: .4byte gUnknown_30030F0
_08011160: .4byte gMain
_08011164: .4byte gUnknown_2022B4C
_08011168: .4byte gUnknown_20370D0
_0801116C: .4byte gUnknown_2023E8A
@@ -2406,7 +2406,7 @@ _08011170: .4byte CB2_QuitRecordedBattle
thumb_func_start FreeRestoreBattleData
FreeRestoreBattleData: @ 8011174
push {lr}
ldr r1, _080111AC @ =gUnknown_30030F0
ldr r1, _080111AC @ =gMain
ldr r0, _080111B0 @ =gUnknown_3004F80
ldr r0, [r0]
str r0, [r1]
@@ -2429,7 +2429,7 @@ FreeRestoreBattleData: @ 8011174
pop {r0}
bx r0
.align 2, 0
_080111AC: .4byte gUnknown_30030F0
_080111AC: .4byte gMain
_080111B0: .4byte gUnknown_3004F80
_080111B4: .4byte gUnknown_2039600
_080111B8: .4byte 0x00000439
@@ -2447,7 +2447,7 @@ CB2_QuitRecordedBattle: @ 80111BC
bne _080111DE
bl FreeRestoreBattleData
bl FreeAllWindowBuffers
ldr r0, _080111E8 @ =gUnknown_30030F0
ldr r0, _080111E8 @ =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
_080111DE:
@@ -2455,7 +2455,7 @@ _080111DE:
bx r0
.align 2, 0
_080111E4: .4byte gUnknown_2037AB8
_080111E8: .4byte gUnknown_30030F0
_080111E8: .4byte gMain
thumb_func_end CB2_QuitRecordedBattle
thumb_func_start sub_80111EC
@@ -3732,7 +3732,7 @@ _08011C10:
ands r0, r1
cmp r0, 0
bne _08011C34
ldr r0, _08011C40 @ =gUnknown_30030F0
ldr r0, _08011C40 @ =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
bl sub_812C224
@@ -3746,7 +3746,7 @@ _08011C34:
bx r0
.align 2, 0
_08011C3C: .4byte gUnknown_2037AB8
_08011C40: .4byte gUnknown_30030F0
_08011C40: .4byte gMain
thumb_func_end sub_8011BB0
thumb_func_start sub_8011C44
@@ -4945,7 +4945,7 @@ _080124F2:
ands r0, r1
cmp r0, 0
bne _08012522
ldr r1, _0801271C @ =gUnknown_300500C
ldr r1, _0801271C @ =gSaveBlock2Ptr
ldr r0, [r1]
ldrb r1, [r0, 0x15]
movs r0, 0x4
@@ -4956,7 +4956,7 @@ _080124F2:
ldr r2, _08012710 @ =gUnknown_2023DD0
str r0, [r2]
_08012522:
ldr r1, _0801271C @ =gUnknown_300500C
ldr r1, _0801271C @ =gSaveBlock2Ptr
ldr r0, [r1]
ldrb r0, [r0, 0x15]
lsls r0, 30
@@ -5191,7 +5191,7 @@ _0801270C: .4byte gUnknown_2023F20
_08012710: .4byte gUnknown_2023DD0
_08012714: .4byte gUnknown_2022B4C
_08012718: .4byte 0x00010002
_0801271C: .4byte gUnknown_300500C
_0801271C: .4byte gSaveBlock2Ptr
_08012720: .4byte gUnknown_2023FC4
_08012724: .4byte gUnknown_2023D72
_08012728: .4byte gUnknown_2023E8A
@@ -11609,7 +11609,7 @@ _08015B2C: .4byte ReturnFromBattleToOverworld
thumb_func_start sub_8015B30
sub_8015B30: @ 8015B30
push {lr}
ldr r0, _08015B48 @ =gUnknown_30030F0
ldr r0, _08015B48 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _08015B4C @ =sub_8011100
cmp r1, r0
@@ -11621,7 +11621,7 @@ _08015B42:
pop {r0}
bx r0
.align 2, 0
_08015B48: .4byte gUnknown_30030F0
_08015B48: .4byte gMain
_08015B4C: .4byte sub_8011100
_08015B50: .4byte gUnknown_3004F84
_08015B54: .4byte sub_8015AA0
@@ -11656,7 +11656,7 @@ _08015B86:
ldr r5, _08015BEC @ =gUnknown_2023E8A
ldrb r0, [r5]
strh r0, [r1]
ldr r3, _08015BF0 @ =gUnknown_30030F0
ldr r3, _08015BF0 @ =gMain
ldr r0, _08015BF4 @ =0x00000439
adds r2, r3, r0
ldrb r1, [r2]
@@ -11686,7 +11686,7 @@ _08015BC2:
_08015BC6:
movs r0, 0x53
bl m4aSongNumStop
ldr r0, _08015BF0 @ =gUnknown_30030F0
ldr r0, _08015BF0 @ =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
_08015BD4:
@@ -11699,7 +11699,7 @@ _08015BE0: .4byte gUnknown_2024284
_08015BE4: .4byte gUnknown_3003F64
_08015BE8: .4byte gUnknown_20370D0
_08015BEC: .4byte gUnknown_2023E8A
_08015BF0: .4byte gUnknown_30030F0
_08015BF0: .4byte gMain
_08015BF4: .4byte 0x00000439
_08015BF8: .4byte gUnknown_3004F80
_08015BFC: .4byte gUnknown_202402C
asm/battle_ai_switch_items.s
+2 -2
View File
@@ -2163,7 +2163,7 @@ _0803A296:
mov r0, r9
cmp r0, 0xAF
bne _0803A2BC
ldr r0, _0803A2B4 @ =gUnknown_3005008
ldr r0, _0803A2B4 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _0803A2B8 @ =0x00003108
adds r5, r0, r1
@@ -2172,7 +2172,7 @@ _0803A296:
_0803A2A8: .4byte gUnknown_202402C
_0803A2AC: .4byte gUnknown_2023FF4
_0803A2B0: .4byte gUnknown_82528BC
_0803A2B4: .4byte gUnknown_3005008
_0803A2B4: .4byte gSaveBlock1Ptr
_0803A2B8: .4byte 0x00003108
_0803A2BC:
adds r5, r1, 0
asm/battle_anim_80A22E8.s
+2 -2
View File
@@ -53813,7 +53813,7 @@ _080BC3C0:
ands r1, r0
cmp r1, 0
beq _080BC3E0
ldr r0, _080BC3D8 @ =gUnknown_81E9F10
ldr r0, _080BC3D8 @ =gGameVersion
ldrb r0, [r0]
cmp r0, 0x2
beq _080BC3E0
@@ -53821,7 +53821,7 @@ _080BC3C0:
ldr r0, _080BC3DC @ =task00_battle_intro_80BC6C8
b _080BC3E8
.align 2, 0
_080BC3D8: .4byte gUnknown_81E9F10
_080BC3D8: .4byte gGameVersion
_080BC3DC: .4byte task00_battle_intro_80BC6C8
_080BC3E0:
ldr r1, _080BC414 @ =gUnknown_83E7CD4
asm/battle_anim_80EEC0C.s
+24 -24
View File
@@ -1362,7 +1362,7 @@ _080EF6F4: .4byte gUnknown_2022B4C
_080EF6F8:
movs r5, 0x17
movs r6, 0xB
ldr r0, _080EF7C4 @ =gUnknown_300500C
ldr r0, _080EF7C4 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0x1
@@ -1456,7 +1456,7 @@ _080EF708:
pop {r0}
bx r0
.align 2, 0
_080EF7C4: .4byte gUnknown_300500C
_080EF7C4: .4byte gSaveBlock2Ptr
_080EF7C8: .4byte gUnknown_2023D68
_080EF7CC: .4byte gUnknown_82606F4
_080EF7D0: .4byte gUnknown_202063C
@@ -3348,7 +3348,7 @@ _080F0670: .4byte gUnknown_3005090
thumb_func_start sub_80F0674
sub_80F0674: @ 80F0674
push {lr}
ldr r0, _080F0698 @ =gUnknown_30030F0
ldr r0, _080F0698 @ =gMain
ldr r1, _080F069C @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -3366,7 +3366,7 @@ _080F0692:
pop {r0}
bx r0
.align 2, 0
_080F0698: .4byte gUnknown_30030F0
_080F0698: .4byte gMain
_080F069C: .4byte 0x00000439
_080F06A0: .4byte gUnknown_2024018
thumb_func_end sub_80F0674
@@ -3461,7 +3461,7 @@ _080F0740:
adds r2, r0, 0
cmp r1, 0xF
bne _080F079C
ldr r0, _080F0794 @ =gUnknown_30030F0
ldr r0, _080F0794 @ =gMain
ldr r4, _080F0798 @ =0x00000439
adds r0, r4
ldrb r1, [r0]
@@ -3487,7 +3487,7 @@ _080F0784: .4byte gUnknown_840C0A4
_080F0788: .4byte gUnknown_202063C
_080F078C: .4byte gUnknown_840C068
_080F0790: .4byte sub_80F07BC
_080F0794: .4byte gUnknown_30030F0
_080F0794: .4byte gMain
_080F0798: .4byte 0x00000439
_080F079C:
mov r4, r8
@@ -3651,7 +3651,7 @@ _080F08BE:
lsrs r7, r0, 24
cmp r7, 0x7
bls _080F085E
ldr r0, _080F0914 @ =gUnknown_30030F0
ldr r0, _080F0914 @ =gMain
ldr r1, _080F0918 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -3684,7 +3684,7 @@ _080F0904: .4byte gUnknown_840C0A4
_080F0908: .4byte gUnknown_840C068
_080F090C: .4byte gUnknown_2020658
_080F0910: .4byte sub_80F0D5C
_080F0914: .4byte gUnknown_30030F0
_080F0914: .4byte gMain
_080F0918: .4byte 0x00000439
thumb_func_end sub_80F0818
@@ -3777,7 +3777,7 @@ _080F09C2:
lsrs r7, r0, 24
cmp r7, 0x7
bls _080F0962
ldr r0, _080F0A18 @ =gUnknown_30030F0
ldr r0, _080F0A18 @ =gMain
ldr r1, _080F0A1C @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -3810,7 +3810,7 @@ _080F0A08: .4byte gUnknown_840C0A4
_080F0A0C: .4byte gUnknown_840C068
_080F0A10: .4byte gUnknown_2020658
_080F0A14: .4byte sub_80F0D5C
_080F0A18: .4byte gUnknown_30030F0
_080F0A18: .4byte gMain
_080F0A1C: .4byte 0x00000439
thumb_func_end sub_80F091C
@@ -3901,7 +3901,7 @@ _080F0AC2:
lsrs r7, r0, 24
cmp r7, 0x7
bls _080F0A66
ldr r0, _080F0B18 @ =gUnknown_30030F0
ldr r0, _080F0B18 @ =gMain
ldr r1, _080F0B1C @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -3934,7 +3934,7 @@ _080F0B08: .4byte gUnknown_840C068
_080F0B0C: .4byte gUnknown_840C0A4
_080F0B10: .4byte gUnknown_2020658
_080F0B14: .4byte sub_80F0D5C
_080F0B18: .4byte gUnknown_30030F0
_080F0B18: .4byte gMain
_080F0B1C: .4byte 0x00000439
thumb_func_end sub_80F0A20
@@ -4029,7 +4029,7 @@ _080F0BCA:
lsrs r7, r0, 24
cmp r7, 0x9
bls _080F0B66
ldr r0, _080F0C20 @ =gUnknown_30030F0
ldr r0, _080F0C20 @ =gMain
ldr r1, _080F0C24 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -4062,7 +4062,7 @@ _080F0C10: .4byte gUnknown_840C0A4
_080F0C14: .4byte gUnknown_840C068
_080F0C18: .4byte gUnknown_2020658
_080F0C1C: .4byte sub_80F0D5C
_080F0C20: .4byte gUnknown_30030F0
_080F0C20: .4byte gMain
_080F0C24: .4byte 0x00000439
thumb_func_end sub_80F0B20
@@ -4179,7 +4179,7 @@ _080F0CE0:
asrs r2, r0, 16
cmp r2, 0x2
bne _080F0D2A
ldr r0, _080F0D54 @ =gUnknown_30030F0
ldr r0, _080F0D54 @ =gMain
ldr r4, _080F0D58 @ =0x00000439
adds r0, r4
ldrb r1, [r0]
@@ -4213,7 +4213,7 @@ _080F0D44: .4byte gUnknown_840C0A4
_080F0D48: .4byte gUnknown_2020658
_080F0D4C: .4byte sub_80F0D5C
_080F0D50: .4byte gUnknown_3005090
_080F0D54: .4byte gUnknown_30030F0
_080F0D54: .4byte gMain
_080F0D58: .4byte 0x00000439
thumb_func_end sub_80F0C28
@@ -4347,7 +4347,7 @@ _080F0E52:
lsrs r7, r0, 24
cmp r7, 0xB
bls _080F0DFA
ldr r0, _080F0EA8 @ =gUnknown_30030F0
ldr r0, _080F0EA8 @ =gMain
ldr r1, _080F0EAC @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -4380,7 +4380,7 @@ _080F0E98: .4byte gUnknown_840C068
_080F0E9C: .4byte gUnknown_840C0A4
_080F0EA0: .4byte gUnknown_2020658
_080F0EA4: .4byte sub_80F0EB0
_080F0EA8: .4byte gUnknown_30030F0
_080F0EA8: .4byte gMain
_080F0EAC: .4byte 0x00000439
thumb_func_end sub_80F0DB4
@@ -4547,7 +4547,7 @@ _080F0FE4:
mov r8, r0
cmp r0, 0x1
bls _080F0F54
ldr r0, _080F1030 @ =gUnknown_30030F0
ldr r0, _080F1030 @ =gMain
ldr r2, _080F1034 @ =0x00000439
adds r0, r2
ldrb r1, [r0]
@@ -4574,7 +4574,7 @@ _080F1018:
pop {r0}
bx r0
.align 2, 0
_080F1030: .4byte gUnknown_30030F0
_080F1030: .4byte gMain
_080F1034: .4byte 0x00000439
_080F1038: .4byte gUnknown_202063C
thumb_func_end sub_80F0F10
@@ -4661,7 +4661,7 @@ _080F10D4:
lsrs r7, r0, 24
cmp r7, 0x7
bls _080F1082
ldr r0, _080F112C @ =gUnknown_30030F0
ldr r0, _080F112C @ =gMain
ldr r1, _080F1130 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -4694,7 +4694,7 @@ _080F111C: .4byte gUnknown_840C068
_080F1120: .4byte gUnknown_840C0A4
_080F1124: .4byte gUnknown_2020658
_080F1128: .4byte sub_80F1134
_080F112C: .4byte gUnknown_30030F0
_080F112C: .4byte gMain
_080F1130: .4byte 0x00000439
thumb_func_end sub_80F103C
@@ -4752,7 +4752,7 @@ _080F1190:
sub_80F1198: @ 80F1198
push {r4-r7,lr}
adds r7, r0, 0
ldr r0, _080F11BC @ =gUnknown_30030F0
ldr r0, _080F11BC @ =gMain
ldr r1, _080F11C0 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -4768,7 +4768,7 @@ sub_80F1198: @ 80F1198
bl DestroySpriteAndFreeResources
b _080F1212
.align 2, 0
_080F11BC: .4byte gUnknown_30030F0
_080F11BC: .4byte gMain
_080F11C0: .4byte 0x00000439
_080F11C4:
ldr r2, _080F1200 @ =gUnknown_2024018
asm/battle_controller_oak.s
+14 -14
View File
@@ -107,7 +107,7 @@ sub_80E763C: @ 80E763C
movs r2, 0x7
movs r3, 0x1
bl dp11b_obj_instanciate
ldr r0, _080E76A4 @ =gUnknown_30030F0
ldr r0, _080E76A4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r2, 0x1
adds r0, r2, 0
@@ -130,7 +130,7 @@ sub_80E763C: @ 80E763C
.align 2, 0
_080E769C: .4byte gUnknown_2022BC4
_080E76A0: .4byte gUnknown_2023BC4
_080E76A4: .4byte gUnknown_30030F0
_080E76A4: .4byte gMain
_080E76A8: .4byte gUnknown_2023FF8
_080E76AC:
cmp r0, 0x2
@@ -470,7 +470,7 @@ sub_80E7930: @ 80E7930
ands r0, r1
cmp r0, 0
bne _080E795A
ldr r2, _080E7964 @ =gUnknown_30030F0
ldr r2, _080E7964 @ =gMain
ldr r0, _080E7968 @ =0x00000439
adds r3, r2, r0
ldrb r1, [r3]
@@ -488,7 +488,7 @@ _080E795A:
bx r0
.align 2, 0
_080E7960: .4byte gUnknown_2037AB8
_080E7964: .4byte gUnknown_30030F0
_080E7964: .4byte gMain
_080E7968: .4byte 0x00000439
_080E796C: .4byte gUnknown_3004F80
thumb_func_end sub_80E7930
@@ -579,7 +579,7 @@ _080E7A10: .4byte gUnknown_3004FFC
thumb_func_start sub_80E7A14
sub_80E7A14: @ 80E7A14
push {lr}
ldr r0, _080E7A44 @ =gUnknown_30030F0
ldr r0, _080E7A44 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _080E7A48 @ =sub_8011100
cmp r1, r0
@@ -601,7 +601,7 @@ sub_80E7A14: @ 80E7A14
bl EmitChosenMonReturnValue
b _080E7A66
.align 2, 0
_080E7A44: .4byte gUnknown_30030F0
_080E7A44: .4byte gMain
_080E7A48: .4byte sub_8011100
_080E7A4C: .4byte gUnknown_2037AB8
_080E7A50: .4byte gUnknown_203B0C0
@@ -661,7 +661,7 @@ _080E7AC0:
thumb_func_start sub_80E7AC4
sub_80E7AC4: @ 80E7AC4
push {lr}
ldr r0, _080E7B14 @ =gUnknown_30030F0
ldr r0, _080E7B14 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _080E7B18 @ =sub_8011100
cmp r1, r0
@@ -698,7 +698,7 @@ sub_80E7AC4: @ 80E7AC4
str r1, [r0]
b _080E7B42
.align 2, 0
_080E7B14: .4byte gUnknown_30030F0
_080E7B14: .4byte gMain
_080E7B18: .4byte sub_8011100
_080E7B1C: .4byte gUnknown_2037AB8
_080E7B20: .4byte gUnknown_203AD30
@@ -4961,7 +4961,7 @@ sub_80E9E6C: @ 80E9E6C
ands r0, r1
cmp r0, 0
beq _080E9EE0
ldr r4, _080E9ECC @ =gUnknown_300500C
ldr r4, _080E9ECC @ =gSaveBlock2Ptr
ldr r0, [r4]
ldrb r0, [r0, 0x8]
ldr r6, _080E9ED0 @ =gUnknown_2023BC4
@@ -4998,7 +4998,7 @@ sub_80E9E6C: @ 80E9E6C
b _080E9F1C
.align 2, 0
_080E9EC8: .4byte gUnknown_2022B4C
_080E9ECC: .4byte gUnknown_300500C
_080E9ECC: .4byte gSaveBlock2Ptr
_080E9ED0: .4byte gUnknown_2023BC4
_080E9ED4: .4byte gUnknown_20244DC
_080E9ED8: .4byte gUnknown_8239F8C
@@ -5107,7 +5107,7 @@ sub_80E9FB0: @ 80E9FB0
ands r0, r1
cmp r0, 0
beq _080EA024
ldr r4, _080EA010 @ =gUnknown_300500C
ldr r4, _080EA010 @ =gSaveBlock2Ptr
ldr r0, [r4]
ldrb r0, [r0, 0x8]
ldr r6, _080EA014 @ =gUnknown_2023BC4
@@ -5144,7 +5144,7 @@ sub_80E9FB0: @ 80E9FB0
b _080EA060
.align 2, 0
_080EA00C: .4byte gUnknown_2022B4C
_080EA010: .4byte gUnknown_300500C
_080EA010: .4byte gSaveBlock2Ptr
_080EA014: .4byte gUnknown_2023BC4
_080EA018: .4byte gUnknown_20244DC
_080EA01C: .4byte gUnknown_8239F8C
@@ -6892,7 +6892,7 @@ _080EAD64:
adds r4, r0, 0
lsls r4, 24
ldr r1, _080EAEC0 @ =gUnknown_8239FD4
ldr r0, _080EAEC4 @ =gUnknown_300500C
ldr r0, _080EAEC4 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
lsls r0, 3
@@ -6974,7 +6974,7 @@ _080EAEB4: .4byte sub_8075590
_080EAEB8: .4byte sub_80335F8
_080EAEBC: .4byte 0x0000d6f8
_080EAEC0: .4byte gUnknown_8239FD4
_080EAEC4: .4byte gUnknown_300500C
_080EAEC4: .4byte gSaveBlock2Ptr
_080EAEC8: .4byte sub_80EB0A8
_080EAECC: .4byte gUnknown_3005090
_080EAED0: .4byte gUnknown_2024018
asm/battle_controller_opponent.s
+2 -2
View File
@@ -6704,7 +6704,7 @@ OpponentHandleCmd55: @ 8039140
ands r0, r1
cmp r0, 0x2
bne _0803916A
ldr r2, _08039178 @ =gUnknown_30030F0
ldr r2, _08039178 @ =gMain
ldr r0, _0803917C @ =0x00000439
adds r3, r2, r0
ldrb r1, [r3]
@@ -6723,7 +6723,7 @@ _0803916A:
bx r0
.align 2, 0
_08039174: .4byte gUnknown_2022B4C
_08039178: .4byte gUnknown_30030F0
_08039178: .4byte gMain
_0803917C: .4byte 0x00000439
_08039180: .4byte gUnknown_3004F80
thumb_func_end OpponentHandleCmd55
asm/battle_controller_player.s
+41 -41
View File
@@ -180,7 +180,7 @@ sub_802E438: @ 802E438
movs r2, 0x7
movs r3, 0x1
bl dp11b_obj_instanciate
ldr r0, _0802E4A0 @ =gUnknown_30030F0
ldr r0, _0802E4A0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r2, 0x1
adds r0, r2, 0
@@ -203,7 +203,7 @@ sub_802E438: @ 802E438
.align 2, 0
_0802E498: .4byte gUnknown_2022BC4
_0802E49C: .4byte gUnknown_2023BC4
_0802E4A0: .4byte gUnknown_30030F0
_0802E4A0: .4byte gMain
_0802E4A4: .4byte gUnknown_2023FF8
_0802E4A8:
cmp r0, 0x2
@@ -471,7 +471,7 @@ _0802E6AC:
cmp r4, r0
blt _0802E69A
_0802E6B6:
ldr r0, _0802E714 @ =gUnknown_30030F0
ldr r0, _0802E714 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -512,7 +512,7 @@ _0802E6B6:
_0802E708: .4byte gUnknown_8250980
_0802E70C: .4byte gUnknown_3004FF4
_0802E710: .4byte gUnknown_2023BCC
_0802E714: .4byte gUnknown_30030F0
_0802E714: .4byte gMain
_0802E718: .4byte gUnknown_202063C
_0802E71C: .4byte gUnknown_2023D44
_0802E720: .4byte sub_8012098
@@ -885,7 +885,7 @@ sub_802EA10: @ 802EA10
ldr r1, _0802EA70 @ =gUnknown_2022BC8
adds r7, r0, r1
bl sub_8033AC8
ldr r0, _0802EA74 @ =gUnknown_30030F0
ldr r0, _0802EA74 @ =gMain
ldrh r1, [r0, 0x2E]
movs r5, 0x1
adds r0, r5, 0
@@ -921,7 +921,7 @@ _0802EA3A:
.align 2, 0
_0802EA6C: .4byte gUnknown_2023BC4
_0802EA70: .4byte gUnknown_2022BC8
_0802EA74: .4byte gUnknown_30030F0
_0802EA74: .4byte gMain
_0802EA78: .4byte gUnknown_2023FFC
_0802EA7C:
ldr r2, _0802EA9C @ =gUnknown_8250C04
@@ -1336,7 +1336,7 @@ _0802EDD8: .4byte sub_802EF58
sub_802EDDC: @ 802EDDC
push {r4-r7,lr}
movs r7, 0
ldr r4, _0802EF40 @ =gUnknown_30030F0
ldr r4, _0802EF40 @ =gMain
ldrh r1, [r4, 0x2E]
movs r6, 0x1
adds r0, r6, 0
@@ -1394,7 +1394,7 @@ _0802EE18:
movs r1, 0
bl MoveSelectionCreateCursorAt
_0802EE58:
ldr r0, _0802EF40 @ =gUnknown_30030F0
ldr r0, _0802EF40 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x10
ands r0, r1
@@ -1431,7 +1431,7 @@ _0802EE58:
movs r1, 0
bl MoveSelectionCreateCursorAt
_0802EEA6:
ldr r0, _0802EF40 @ =gUnknown_30030F0
ldr r0, _0802EF40 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -1462,7 +1462,7 @@ _0802EEA6:
movs r1, 0
bl MoveSelectionCreateCursorAt
_0802EEE8:
ldr r0, _0802EF40 @ =gUnknown_30030F0
ldr r0, _0802EF40 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x80
ands r0, r1
@@ -1504,7 +1504,7 @@ _0802EF36:
pop {r1}
bx r1
.align 2, 0
_0802EF40: .4byte gUnknown_30030F0
_0802EF40: .4byte gMain
_0802EF44: .4byte gUnknown_2022974
_0802EF48: .4byte gUnknown_2022976
_0802EF4C: .4byte gUnknown_2023FFC
@@ -1520,7 +1520,7 @@ sub_802EF58: @ 802EF58
mov r5, r8
push {r5-r7}
sub sp, 0x24
ldr r0, _0802F2E4 @ =gUnknown_30030F0
ldr r0, _0802F2E4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x5
ands r0, r1
@@ -1972,7 +1972,7 @@ _0802F2C8:
ldr r1, _0802F314 @ =sub_80E7988
b _0802F324
.align 2, 0
_0802F2E4: .4byte gUnknown_30030F0
_0802F2E4: .4byte gMain
_0802F2E8: .4byte gUnknown_2023FFC
_0802F2EC: .4byte gUnknown_2023BC4
_0802F2F0: .4byte gUnknown_3004FF4
@@ -2010,7 +2010,7 @@ _0802F324:
bl MoveSelectionDisplayPpNumber
bl MoveSelectionDisplayMoveType
_0802F34C:
ldr r0, _0802F3A4 @ =gUnknown_30030F0
ldr r0, _0802F3A4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -2046,7 +2046,7 @@ _0802F394: .4byte gUnknown_2023BC4
_0802F398: .4byte sub_802EA10
_0802F39C: .4byte gUnknown_2023FFC
_0802F3A0: .4byte gUnknown_3004FF4
_0802F3A4: .4byte gUnknown_30030F0
_0802F3A4: .4byte gMain
_0802F3A8: .4byte gUnknown_2022B4C
_0802F3AC: .4byte sub_80E7988
_0802F3B0:
@@ -2061,7 +2061,7 @@ _0802F3BA:
bl MoveSelectionDisplayPpNumber
bl MoveSelectionDisplayMoveType
_0802F3C8:
ldr r0, _0802F400 @ =gUnknown_30030F0
ldr r0, _0802F400 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x20
ands r0, r1
@@ -2087,7 +2087,7 @@ _0802F3C8:
.align 2, 0
_0802F3F8: .4byte gUnknown_3004FE0
_0802F3FC: .4byte sub_802EA10
_0802F400: .4byte gUnknown_30030F0
_0802F400: .4byte gMain
_0802F404: .4byte gUnknown_3004FF4
_0802F408: .4byte gUnknown_2023FFC
_0802F40C: .4byte gUnknown_2023BC4
@@ -2123,7 +2123,7 @@ _0802F44C:
movs r1, 0x1B
bl MoveSelectionCreateCursorAt
_0802F454:
ldr r0, _0802F490 @ =gUnknown_30030F0
ldr r0, _0802F490 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x10
ands r0, r1
@@ -2153,7 +2153,7 @@ _0802F454:
bl MoveSelectionCreateCursorAt
b _0802F4AA
.align 2, 0
_0802F490: .4byte gUnknown_30030F0
_0802F490: .4byte gMain
_0802F494: .4byte gUnknown_3004FF4
_0802F498: .4byte gUnknown_3004FF8
_0802F49C: .4byte gUnknown_2023FFC
@@ -2190,7 +2190,7 @@ _0802F4E0:
movs r1, 0x1B
bl MoveSelectionCreateCursorAt
_0802F4E8:
ldr r0, _0802F518 @ =gUnknown_30030F0
ldr r0, _0802F518 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -2214,7 +2214,7 @@ _0802F4E8:
bl MoveSelectionCreateCursorAt
b _0802F52E
.align 2, 0
_0802F518: .4byte gUnknown_30030F0
_0802F518: .4byte gMain
_0802F51C: .4byte gUnknown_3004FF4
_0802F520: .4byte gUnknown_2023FFC
_0802F524: .4byte gUnknown_2023BC4
@@ -2250,7 +2250,7 @@ _0802F564:
movs r1, 0x1B
bl MoveSelectionCreateCursorAt
_0802F56C:
ldr r0, _0802F5A8 @ =gUnknown_30030F0
ldr r0, _0802F5A8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x80
ands r0, r1
@@ -2280,7 +2280,7 @@ _0802F56C:
bl MoveSelectionCreateCursorAt
b _0802F5C2
.align 2, 0
_0802F5A8: .4byte gUnknown_30030F0
_0802F5A8: .4byte gMain
_0802F5AC: .4byte gUnknown_3004FF4
_0802F5B0: .4byte gUnknown_3004FF8
_0802F5B4: .4byte gUnknown_2023FFC
@@ -2340,7 +2340,7 @@ sub_802F610: @ 802F610
bne _0802F694
movs r0, 0x53
bl m4aSongNumStop
ldr r3, _0802F654 @ =gUnknown_30030F0
ldr r3, _0802F654 @ =gMain
ldr r0, _0802F658 @ =0x00000439
adds r2, r3, r0
ldrb r1, [r2]
@@ -2358,7 +2358,7 @@ sub_802F610: @ 802F610
.align 2, 0
_0802F64C: .4byte gUnknown_3003F3C
_0802F650: .4byte gUnknown_3003F64
_0802F654: .4byte gUnknown_30030F0
_0802F654: .4byte gMain
_0802F658: .4byte 0x00000439
_0802F65C: .4byte gUnknown_3004F80
_0802F660: .4byte sub_8011A1C
@@ -2369,7 +2369,7 @@ _0802F664:
beq _0802F694
movs r0, 0x53
bl m4aSongNumStop
ldr r3, _0802F698 @ =gUnknown_30030F0
ldr r3, _0802F698 @ =gMain
ldr r0, _0802F69C @ =0x00000439
adds r2, r3, r0
ldrb r1, [r2]
@@ -2387,7 +2387,7 @@ _0802F694:
pop {r0}
bx r0
.align 2, 0
_0802F698: .4byte gUnknown_30030F0
_0802F698: .4byte gMain
_0802F69C: .4byte 0x00000439
_0802F6A0: .4byte gUnknown_3004F80
_0802F6A4: .4byte sub_8011A1C
@@ -2436,7 +2436,7 @@ _0802F6F8: .4byte sub_802F610
_0802F6FC:
movs r0, 0x53
bl m4aSongNumStop
ldr r2, _0802F724 @ =gUnknown_30030F0
ldr r2, _0802F724 @ =gMain
ldr r0, _0802F728 @ =0x00000439
adds r3, r2, r0
ldrb r1, [r3]
@@ -2453,7 +2453,7 @@ _0802F71E:
pop {r0}
bx r0
.align 2, 0
_0802F724: .4byte gUnknown_30030F0
_0802F724: .4byte gMain
_0802F728: .4byte 0x00000439
_0802F72C: .4byte gUnknown_3004F80
thumb_func_end sub_802F6A8
@@ -2535,7 +2535,7 @@ sub_802F7A0: @ 802F7A0
ldr r0, _0802F808 @ =nullsub_8
cmp r1, r0
bne _0802F7F4
ldr r0, _0802F80C @ =gUnknown_300500C
ldr r0, _0802F80C @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
bl nullsub_16
@@ -2565,7 +2565,7 @@ _0802F7FC: .4byte gUnknown_202063C
_0802F800: .4byte gUnknown_2023D44
_0802F804: .4byte gUnknown_2023BC4
_0802F808: .4byte nullsub_8
_0802F80C: .4byte gUnknown_300500C
_0802F80C: .4byte gSaveBlock2Ptr
thumb_func_end sub_802F7A0
thumb_func_start sub_802F810
@@ -4336,7 +4336,7 @@ _08030680: .4byte gUnknown_3004FFC
thumb_func_start sub_8030684
sub_8030684: @ 8030684
push {lr}
ldr r0, _080306B4 @ =gUnknown_30030F0
ldr r0, _080306B4 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _080306B8 @ =sub_8011100
cmp r1, r0
@@ -4358,7 +4358,7 @@ sub_8030684: @ 8030684
bl EmitChosenMonReturnValue
b _080306D6
.align 2, 0
_080306B4: .4byte gUnknown_30030F0
_080306B4: .4byte gMain
_080306B8: .4byte sub_8011100
_080306BC: .4byte gUnknown_2037AB8
_080306C0: .4byte gUnknown_203B0C0
@@ -4424,7 +4424,7 @@ _08030738: .4byte CompleteWhenChoseItem
thumb_func_start CompleteWhenChoseItem
CompleteWhenChoseItem: @ 803073C
push {lr}
ldr r0, _08030768 @ =gUnknown_30030F0
ldr r0, _08030768 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _0803076C @ =sub_8011100
cmp r1, r0
@@ -4444,7 +4444,7 @@ _08030762:
pop {r0}
bx r0
.align 2, 0
_08030768: .4byte gUnknown_30030F0
_08030768: .4byte gMain
_0803076C: .4byte sub_8011100
_08030770: .4byte gUnknown_2037AB8
_08030774: .4byte gUnknown_203AD30
@@ -7796,7 +7796,7 @@ _08032328:
ldrb r4, [r1, 0x13]
b _08032342
_0803233C:
ldr r0, _08032400 @ =gUnknown_300500C
ldr r0, _08032400 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r4, [r0, 0x8]
_08032342:
@@ -7891,7 +7891,7 @@ _08032342:
pop {r0}
bx r0
.align 2, 0
_08032400: .4byte gUnknown_300500C
_08032400: .4byte gSaveBlock2Ptr
_08032404: .4byte gUnknown_2023BC4
_08032408: .4byte gUnknown_20244DC
_0803240C: .4byte gUnknown_8239F8C
@@ -7973,7 +7973,7 @@ _080324A4:
ldrb r4, [r1, 0x13]
b _080324BE
_080324B8:
ldr r0, _08032568 @ =gUnknown_300500C
ldr r0, _08032568 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r4, [r0, 0x8]
_080324BE:
@@ -8059,7 +8059,7 @@ _080324BE:
pop {r0}
bx r0
.align 2, 0
_08032568: .4byte gUnknown_300500C
_08032568: .4byte gSaveBlock2Ptr
_0803256C: .4byte gUnknown_2023BC4
_08032570: .4byte gUnknown_20244DC
_08032574: .4byte gUnknown_8239F8C
@@ -10010,7 +10010,7 @@ PlayerHandleIntroTrainerBallThrow: @ 8033478
adds r4, r0, 0
lsls r4, 24
ldr r1, _080335D4 @ =gUnknown_8239FD4
ldr r0, _080335D8 @ =gUnknown_300500C
ldr r0, _080335D8 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
lsls r0, 3
@@ -10093,7 +10093,7 @@ _080335C8: .4byte sub_80755B8
_080335CC: .4byte sub_80335F8
_080335D0: .4byte 0x0000d6f8
_080335D4: .4byte gUnknown_8239FD4
_080335D8: .4byte gUnknown_300500C
_080335D8: .4byte gSaveBlock2Ptr
_080335DC: .4byte task05_08033660
_080335E0: .4byte gUnknown_3005090
_080335E4: .4byte gUnknown_2024018
asm/battle_controller_pokedude.s
+10 -10
View File
@@ -233,7 +233,7 @@ sub_8156254: @ 8156254
ands r0, r1
cmp r0, 0
bne _0815627E
ldr r2, _08156288 @ =gUnknown_30030F0
ldr r2, _08156288 @ =gMain
ldr r0, _0815628C @ =0x00000439
adds r3, r2, r0
ldrb r1, [r3]
@@ -251,7 +251,7 @@ _0815627E:
bx r0
.align 2, 0
_08156284: .4byte gUnknown_2037AB8
_08156288: .4byte gUnknown_30030F0
_08156288: .4byte gMain
_0815628C: .4byte 0x00000439
_08156290: .4byte gUnknown_3004F80
thumb_func_end sub_8156254
@@ -584,7 +584,7 @@ _08156534: .4byte gUnknown_3004FFC
thumb_func_start sub_8156538
sub_8156538: @ 8156538
push {lr}
ldr r0, _08156568 @ =gUnknown_30030F0
ldr r0, _08156568 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _0815656C @ =sub_8011100
cmp r1, r0
@@ -606,7 +606,7 @@ sub_8156538: @ 8156538
bl EmitChosenMonReturnValue
b _0815658A
.align 2, 0
_08156568: .4byte gUnknown_30030F0
_08156568: .4byte gMain
_0815656C: .4byte sub_8011100
_08156570: .4byte gUnknown_2037AB8
_08156574: .4byte gUnknown_203B0C0
@@ -669,7 +669,7 @@ _081565E2:
thumb_func_start sub_81565E8
sub_81565E8: @ 81565E8
push {lr}
ldr r0, _08156614 @ =gUnknown_30030F0
ldr r0, _08156614 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _08156618 @ =sub_8011100
cmp r1, r0
@@ -689,7 +689,7 @@ _0815660E:
pop {r0}
bx r0
.align 2, 0
_08156614: .4byte gUnknown_30030F0
_08156614: .4byte gMain
_08156618: .4byte sub_8011100
_0815661C: .4byte gUnknown_2037AB8
_08156620: .4byte gUnknown_203AD30
@@ -7281,7 +7281,7 @@ _08159C64:
lsrs r4, r0, 16
cmp r4, 0
bne _08159CEE
ldr r0, _08159CA8 @ =gUnknown_30030F0
ldr r0, _08159CA8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -7310,7 +7310,7 @@ _08159C9E:
strb r0, [r1, 0x2]
b _08159CEE
.align 2, 0
_08159CA8: .4byte gUnknown_30030F0
_08159CA8: .4byte gMain
_08159CAC: .4byte gUnknown_3005EE0
_08159CB0: .4byte gUnknown_2023BC4
_08159CB4:
@@ -7481,7 +7481,7 @@ _08159E0C:
lsrs r4, r0, 16
cmp r4, 0
bne _08159EDE
ldr r0, _08159E58 @ =gUnknown_30030F0
ldr r0, _08159E58 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -7511,7 +7511,7 @@ _08159E0C:
movs r3, 0x8
b _08159E80
.align 2, 0
_08159E58: .4byte gUnknown_30030F0
_08159E58: .4byte gMain
_08159E5C: .4byte gUnknown_825E45C
_08159E60: .4byte gUnknown_2023FE8
_08159E64:
asm/battle_controller_safari.s
+8 -8
View File
@@ -69,7 +69,7 @@ _080DD5A0:
thumb_func_start HandleInputChooseAction_0
HandleInputChooseAction_0: @ 80DD5A4
push {r4,r5,lr}
ldr r0, _080DD5D4 @ =gUnknown_30030F0
ldr r0, _080DD5D4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r2, 0x1
adds r0, r2, 0
@@ -91,7 +91,7 @@ HandleInputChooseAction_0: @ 80DD5A4
beq _080DD5EA
b _080DD60C
.align 2, 0
_080DD5D4: .4byte gUnknown_30030F0
_080DD5D4: .4byte gMain
_080DD5D8: .4byte gUnknown_2023FF8
_080DD5DC: .4byte gUnknown_2023BC4
_080DD5E0:
@@ -336,7 +336,7 @@ sub_80DD7B0: @ 80DD7B0
ands r0, r1
cmp r0, 0
bne _080DD7DA
ldr r2, _080DD7E4 @ =gUnknown_30030F0
ldr r2, _080DD7E4 @ =gMain
ldr r0, _080DD7E8 @ =0x00000439
adds r3, r2, r0
ldrb r1, [r3]
@@ -354,7 +354,7 @@ _080DD7DA:
bx r0
.align 2, 0
_080DD7E0: .4byte gUnknown_2037AB8
_080DD7E4: .4byte gUnknown_30030F0
_080DD7E4: .4byte gMain
_080DD7E8: .4byte 0x00000439
_080DD7EC: .4byte gUnknown_3004F80
thumb_func_end sub_80DD7B0
@@ -420,7 +420,7 @@ _080DD858: .4byte CompleteWhenChosePokeblock
thumb_func_start CompleteWhenChosePokeblock
CompleteWhenChosePokeblock: @ 80DD85C
push {lr}
ldr r0, _080DD888 @ =gUnknown_30030F0
ldr r0, _080DD888 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _080DD88C @ =sub_8011100
cmp r1, r0
@@ -440,7 +440,7 @@ _080DD882:
pop {r0}
bx r0
.align 2, 0
_080DD888: .4byte gUnknown_30030F0
_080DD888: .4byte gMain
_080DD88C: .4byte sub_8011100
_080DD890: .4byte gUnknown_2037AB8
_080DD894: .4byte gUnknown_203AD30
@@ -614,7 +614,7 @@ sub_80DD9B8: @ 80DD9B8
thumb_func_start SafariHandleDrawTrainerPic
SafariHandleDrawTrainerPic: @ 80DD9C4
push {r4-r6,lr}
ldr r4, _080DDA7C @ =gUnknown_300500C
ldr r4, _080DDA7C @ =gSaveBlock2Ptr
ldr r0, [r4]
ldrb r0, [r0, 0x8]
ldr r5, _080DDA80 @ =gUnknown_2023BC4
@@ -702,7 +702,7 @@ SafariHandleDrawTrainerPic: @ 80DD9C4
pop {r0}
bx r0
.align 2, 0
_080DDA7C: .4byte gUnknown_300500C
_080DDA7C: .4byte gSaveBlock2Ptr
_080DDA80: .4byte gUnknown_2023BC4
_080DDA84: .4byte gUnknown_20244DC
_080DDA88: .4byte gUnknown_8239F8C
asm/battle_gfx_sfx_util.s
+2 -2
View File
@@ -2711,7 +2711,7 @@ sub_803539C: @ 803539C
mov r7, r9
mov r6, r8
push {r6,r7}
ldr r0, _08035440 @ =gUnknown_30030F0
ldr r0, _08035440 @ =gMain
ldr r1, _08035444 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -2782,7 +2782,7 @@ _08035432:
pop {r0}
bx r0
.align 2, 0
_08035440: .4byte gUnknown_30030F0
_08035440: .4byte gMain
_08035444: .4byte 0x00000439
_08035448: .4byte gUnknown_2023BCE
_0803544C: .4byte gUnknown_2024284
asm/battle_message.s
+2 -2
View File
@@ -1895,11 +1895,11 @@ _080D81C8:
_080D81D4: .4byte gUnknown_2023FC4
_080D81D8: .4byte gUnknown_2022744
_080D81DC:
ldr r0, _080D81E4 @ =gUnknown_300500C
ldr r0, _080D81E4 @ =gSaveBlock2Ptr
ldr r4, [r0]
b _080D8382
.align 2, 0
_080D81E4: .4byte gUnknown_300500C
_080D81E4: .4byte gSaveBlock2Ptr
_080D81E8:
ldr r0, _080D8204 @ =gUnknown_2022B4C
ldr r0, [r0]
asm/battle_records.s
+16 -16
View File
@@ -22,7 +22,7 @@ _080CD23C: .4byte sub_80CD240
sub_80CD240: @ 80CD240
push {r4,lr}
sub sp, 0x4
ldr r0, _080CD260 @ =gUnknown_30030F0
ldr r0, _080CD260 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -37,7 +37,7 @@ _080CD254:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080CD260: .4byte gUnknown_30030F0
_080CD260: .4byte gMain
_080CD264: .4byte _080CD268
.align 2, 0
_080CD268:
@@ -115,7 +115,7 @@ _080CD314:
movs r3, 0
bl BeginNormalPaletteFade
_080CD324:
ldr r1, _080CD334 @ =gUnknown_30030F0
ldr r1, _080CD334 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -124,7 +124,7 @@ _080CD324:
strb r0, [r1]
b _080CD376
.align 2, 0
_080CD334: .4byte gUnknown_30030F0
_080CD334: .4byte gMain
_080CD338:
bl sub_80CD628
ldr r0, _080CD350 @ =sub_80CD38C
@@ -146,7 +146,7 @@ _080CD35C:
bl CreateTask
ldr r0, _080CD384 @ =sub_80CD3A0
bl SetMainCallback2
ldr r0, _080CD388 @ =gUnknown_30030F0
ldr r0, _080CD388 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -160,7 +160,7 @@ _080CD376:
.align 2, 0
_080CD380: .4byte sub_80CD3B8
_080CD384: .4byte sub_80CD3A0
_080CD388: .4byte gUnknown_30030F0
_080CD388: .4byte gMain
thumb_func_end sub_80CD240
thumb_func_start sub_80CD38C
@@ -221,7 +221,7 @@ sub_80CD3E8: @ 80CD3E8
lsls r1, 3
ldr r0, _080CD41C @ =gUnknown_3005090
adds r4, r1, r0
ldr r0, _080CD420 @ =gUnknown_30030F0
ldr r0, _080CD420 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -242,7 +242,7 @@ _080CD416:
bx r0
.align 2, 0
_080CD41C: .4byte gUnknown_3005090
_080CD420: .4byte gUnknown_30030F0
_080CD420: .4byte gMain
_080CD424: .4byte sub_80CD428
thumb_func_end sub_80CD3E8
@@ -859,7 +859,7 @@ _080CD8BE:
thumb_func_start InitLinkBattleRecords
InitLinkBattleRecords: @ 80CD8DC
push {lr}
ldr r0, _080CD8F0 @ =gUnknown_300500C
ldr r0, _080CD8F0 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, _080CD8F4 @ =0x00000a98
adds r0, r1
@@ -867,7 +867,7 @@ InitLinkBattleRecords: @ 80CD8DC
pop {r0}
bx r0
.align 2, 0
_080CD8F0: .4byte gUnknown_300500C
_080CD8F0: .4byte gSaveBlock2Ptr
_080CD8F4: .4byte 0x00000a98
thumb_func_end InitLinkBattleRecords
@@ -957,7 +957,7 @@ sub_80CD98C: @ 80CD98C
push {r4-r6,lr}
sub sp, 0x4
adds r6, r0, 0
ldr r0, _080CD9DC @ =gUnknown_3005008
ldr r0, _080CD9DC @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
movs r0, 0x80
@@ -966,7 +966,7 @@ sub_80CD98C: @ 80CD98C
beq _080CD9D4
adds r0, r6, 0
bl sub_80CD950
ldr r0, _080CD9E0 @ =gUnknown_300500C
ldr r0, _080CD9E0 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, _080CD9E4 @ =0x00000a98
adds r0, r1
@@ -994,8 +994,8 @@ _080CD9D4:
pop {r0}
bx r0
.align 2, 0
_080CD9DC: .4byte gUnknown_3005008
_080CD9E0: .4byte gUnknown_300500C
_080CD9DC: .4byte gSaveBlock1Ptr
_080CD9E0: .4byte gSaveBlock2Ptr
_080CD9E4: .4byte 0x00000a98
_080CD9E8: .4byte gUnknown_2039654
_080CD9EC: .4byte gUnknown_2023E8A
@@ -1292,7 +1292,7 @@ sub_80CDBE4: @ 80CDBE4
movs r1, 0x2
movs r3, 0x4
bl AddTextPrinterParametrized2
ldr r5, _080CDCA8 @ =gUnknown_300500C
ldr r5, _080CDCA8 @ =gSaveBlock2Ptr
ldr r0, [r5]
ldr r1, _080CDCAC @ =0x00000a98
mov r8, r1
@@ -1340,7 +1340,7 @@ _080CDC70:
_080CDC9C: .4byte gUnknown_2021D18
_080CDCA0: .4byte gUnknown_8418174
_080CDCA4: .4byte gUnknown_83F6C78
_080CDCA8: .4byte gUnknown_300500C
_080CDCA8: .4byte gSaveBlock2Ptr
_080CDCAC: .4byte 0x00000a98
_080CDCB0: .4byte gUnknown_84181A4
thumb_func_end sub_80CDBE4
asm/battle_script_commands.s
+36 -36
View File
@@ -8481,7 +8481,7 @@ _08021B88:
lsrs r0, 16
cmp r0, 0xAF
bne _08021BB4
ldr r0, _08021BAC @ =gUnknown_3005008
ldr r0, _08021BAC @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, _08021BB0 @ =0x0000311a
adds r0, r2
@@ -8490,7 +8490,7 @@ _08021B88:
.align 2, 0
_08021BA4: .4byte gUnknown_2024284
_08021BA8: .4byte gUnknown_825E45C
_08021BAC: .4byte gUnknown_3005008
_08021BAC: .4byte gSaveBlock1Ptr
_08021BB0: .4byte 0x0000311a
_08021BB4:
bl ItemId_GetHoldEffect
@@ -8601,7 +8601,7 @@ _08021C74:
lsrs r0, 16
cmp r0, 0xAF
bne _08021CB8
ldr r0, _08021CB0 @ =gUnknown_3005008
ldr r0, _08021CB0 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08021CB4 @ =0x0000311a
adds r0, r1
@@ -8613,7 +8613,7 @@ _08021CA0: .4byte gUnknown_2023FC4
_08021CA4: .4byte gUnknown_2023FE8
_08021CA8: .4byte gUnknown_2023BC8
_08021CAC: .4byte gUnknown_2024284
_08021CB0: .4byte gUnknown_3005008
_08021CB0: .4byte gSaveBlock1Ptr
_08021CB4: .4byte 0x0000311a
_08021CB8:
bl ItemId_GetHoldEffect
@@ -15573,7 +15573,7 @@ _080253F0: .4byte gUnknown_83FE791
_080253F4: .4byte gUnknown_2023FC4
_080253F8: .4byte gUnknown_2023E82
_080253FC:
ldr r0, _08025484 @ =gUnknown_30030F0
ldr r0, _08025484 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -15590,7 +15590,7 @@ _080253FC:
strb r0, [r4, 0x1]
bl sub_802DCB8
_08025422:
ldr r0, _08025484 @ =gUnknown_30030F0
ldr r0, _08025484 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x80
ands r0, r1
@@ -15607,7 +15607,7 @@ _08025422:
strb r0, [r4, 0x1]
bl sub_802DCB8
_08025448:
ldr r0, _08025484 @ =gUnknown_30030F0
ldr r0, _08025484 @ =gMain
ldrh r1, [r0, 0x2E]
movs r5, 0x1
adds r0, r5, 0
@@ -15635,7 +15635,7 @@ _08025448:
bl BeginNormalPaletteFade
b _080254D8
.align 2, 0
_08025484: .4byte gUnknown_30030F0
_08025484: .4byte gMain
_08025488: .4byte gUnknown_2023E82
_0802548C:
movs r0, 0x2
@@ -15700,7 +15700,7 @@ _08025500:
beq _0802550E
b _080256D0
_0802550E:
ldr r0, _08025530 @ =gUnknown_30030F0
ldr r0, _08025530 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _08025534 @ =sub_8011100
cmp r1, r0
@@ -15717,7 +15717,7 @@ _0802551A:
b _080256D0
.align 2, 0
_0802552C: .4byte gUnknown_2037AB8
_08025530: .4byte gUnknown_30030F0
_08025530: .4byte gMain
_08025534: .4byte sub_8011100
_08025538: .4byte gUnknown_2023FC4
_0802553C:
@@ -15948,7 +15948,7 @@ _080256F8:
_08025720: .4byte gUnknown_83FE791
_08025724: .4byte gUnknown_2023E82
_08025728:
ldr r0, _080257AC @ =gUnknown_30030F0
ldr r0, _080257AC @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -15965,7 +15965,7 @@ _08025728:
strb r0, [r4, 0x1]
bl sub_802DCB8
_0802574E:
ldr r0, _080257AC @ =gUnknown_30030F0
ldr r0, _080257AC @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x80
ands r0, r1
@@ -15982,7 +15982,7 @@ _0802574E:
strb r0, [r4, 0x1]
bl sub_802DCB8
_08025774:
ldr r0, _080257AC @ =gUnknown_30030F0
ldr r0, _080257AC @ =gMain
ldrh r1, [r0, 0x2E]
movs r4, 0x1
adds r0, r4, 0
@@ -16010,7 +16010,7 @@ _08025774:
str r1, [r3]
b _080257C0
.align 2, 0
_080257AC: .4byte gUnknown_30030F0
_080257AC: .4byte gMain
_080257B0: .4byte gUnknown_2023E82
_080257B4: .4byte gUnknown_2023D74
_080257B8:
@@ -16167,7 +16167,7 @@ _080258C0:
lsls r0, 2
adds r4, r2, 0
muls r4, r0
ldr r0, _08025900 @ =gUnknown_3005008
ldr r0, _08025900 @ =gSaveBlock1Ptr
mov r8, r0
b _080259E8
.align 2, 0
@@ -16175,7 +16175,7 @@ _080258F0: .4byte gUnknown_2023E8A
_080258F4: .4byte gUnknown_20386AE
_080258F8: .4byte gUnknown_2023FF4
_080258FC: .4byte gUnknown_2023FE8
_08025900: .4byte gUnknown_3005008
_08025900: .4byte gSaveBlock1Ptr
_08025904:
ldr r2, _08025920 @ =gUnknown_823EAC8
ldrh r1, [r0]
@@ -16245,7 +16245,7 @@ _08025970:
mov r12, r0
lsls r4, r5, 2
ldr r5, _080259D4 @ =gUnknown_2022B4C
ldr r0, _080259D8 @ =gUnknown_3005008
ldr r0, _080259D8 @ =gSaveBlock1Ptr
mov r8, r0
cmp r1, 0xFF
beq _080259AA
@@ -16289,7 +16289,7 @@ _080259AA:
_080259CC: .4byte gUnknown_824F220
_080259D0: .4byte gUnknown_2023FE8
_080259D4: .4byte gUnknown_2022B4C
_080259D8: .4byte gUnknown_3005008
_080259D8: .4byte gSaveBlock1Ptr
_080259DC: .4byte gUnknown_823EAC8
_080259E0: .4byte gUnknown_20386AE
_080259E4:
@@ -16942,7 +16942,7 @@ _08025EE4:
.align 2, 0
_08025F08: .4byte gUnknown_83FE791
_08025F0C:
ldr r0, _08025F6C @ =gUnknown_30030F0
ldr r0, _08025F6C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -16958,7 +16958,7 @@ _08025F0C:
strb r0, [r5, 0x1]
bl sub_802DCB8
_08025F30:
ldr r0, _08025F6C @ =gUnknown_30030F0
ldr r0, _08025F6C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x80
ands r0, r1
@@ -16975,7 +16975,7 @@ _08025F30:
strb r0, [r4, 0x1]
bl sub_802DCB8
_08025F56:
ldr r0, _08025F6C @ =gUnknown_30030F0
ldr r0, _08025F6C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -16986,7 +16986,7 @@ _08025F56:
strb r4, [r0, 0x1]
b _08025F7E
.align 2, 0
_08025F6C: .4byte gUnknown_30030F0
_08025F6C: .4byte gMain
_08025F70: .4byte gUnknown_2023E82
_08025F74:
movs r4, 0x1
@@ -17444,7 +17444,7 @@ _08026318:
.align 2, 0
_0802632C: .4byte gUnknown_202297A
_08026330:
ldr r0, _0802634C @ =gUnknown_30030F0
ldr r0, _0802634C @ =gMain
ldrh r0, [r0, 0x2E]
cmp r0, 0
beq _080263F6
@@ -17456,9 +17456,9 @@ _08026330:
bl CopyWindowToVram
b _0802636E
.align 2, 0
_0802634C: .4byte gUnknown_30030F0
_0802634C: .4byte gMain
_08026350:
ldr r0, _08026378 @ =gUnknown_30030F0
ldr r0, _08026378 @ =gMain
ldrh r0, [r0, 0x2E]
cmp r0, 0
beq _080263F6
@@ -17478,7 +17478,7 @@ _0802636E:
strb r0, [r1, 0x1E]
b _080263F6
.align 2, 0
_08026378: .4byte gUnknown_30030F0
_08026378: .4byte gMain
_0802637C: .4byte gUnknown_2023FC4
_08026380:
bl sub_8026648
@@ -22088,7 +22088,7 @@ atk91_givepaydaymoney: @ 80287A8
ldrb r0, [r0]
adds r4, r1, 0
muls r4, r0
ldr r0, _08028818 @ =gUnknown_3005008
ldr r0, _08028818 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xA4
lsls r1, 2
@@ -22122,7 +22122,7 @@ atk91_givepaydaymoney: @ 80287A8
_0802880C: .4byte gUnknown_2022B4C
_08028810: .4byte gUnknown_2023E7E
_08028814: .4byte gUnknown_2023FE8
_08028818: .4byte gUnknown_3005008
_08028818: .4byte gSaveBlock1Ptr
_0802881C: .4byte gUnknown_2022AB8
_08028820: .4byte gUnknown_2023D74
_08028824: .4byte gUnknown_81D911D
@@ -32469,7 +32469,7 @@ _0802DA64:
beq _0802DA72
b _0802DB6C
_0802DA72:
ldr r0, _0802DAB0 @ =gUnknown_30030F0
ldr r0, _0802DAB0 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _0802DAB4 @ =sub_8011100
cmp r1, r0
@@ -32498,7 +32498,7 @@ _0802DA72:
b _0802DB6C
.align 2, 0
_0802DAAC: .4byte gUnknown_2037AB8
_0802DAB0: .4byte gUnknown_30030F0
_0802DAB0: .4byte gMain
_0802DAB4: .4byte sub_8011100
_0802DAB8: .4byte gUnknown_3005090
_0802DABC: .4byte gUnknown_2023E82
@@ -32875,7 +32875,7 @@ _0802DD78:
_0802DDA0: .4byte gUnknown_83FE791
_0802DDA4: .4byte gUnknown_2023E82
_0802DDA8:
ldr r0, _0802DE1C @ =gUnknown_30030F0
ldr r0, _0802DE1C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -32891,7 +32891,7 @@ _0802DDA8:
strb r0, [r4, 0x1]
bl sub_802DCB8
_0802DDCC:
ldr r0, _0802DE1C @ =gUnknown_30030F0
ldr r0, _0802DE1C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x80
ands r0, r1
@@ -32908,7 +32908,7 @@ _0802DDCC:
strb r0, [r4, 0x1]
bl sub_802DCB8
_0802DDF2:
ldr r0, _0802DE1C @ =gUnknown_30030F0
ldr r0, _0802DE1C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -32927,7 +32927,7 @@ _0802DDF2:
bl BeginFastPaletteFade
b _0802DFA6
.align 2, 0
_0802DE1C: .4byte gUnknown_30030F0
_0802DE1C: .4byte gMain
_0802DE20: .4byte gUnknown_2023E82
_0802DE24:
movs r0, 0x2
@@ -33043,7 +33043,7 @@ _0802DF0C: .4byte gUnknown_2023FE8
_0802DF10: .4byte sub_8011100
_0802DF14: .4byte gUnknown_2023E82
_0802DF18:
ldr r0, _0802DF54 @ =gUnknown_30030F0
ldr r0, _0802DF54 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _0802DF58 @ =sub_8011100
cmp r1, r0
@@ -33073,7 +33073,7 @@ _0802DF18:
bl sub_804037C
b _0802DF8C
.align 2, 0
_0802DF54: .4byte gUnknown_30030F0
_0802DF54: .4byte gMain
_0802DF58: .4byte sub_8011100
_0802DF5C: .4byte gUnknown_2037AB8
_0802DF60: .4byte gUnknown_2023BCE
asm/battle_setup.s
+34 -34
View File
@@ -128,7 +128,7 @@ sub_807F704: @ 807F704
bl sub_807F7D8
b _0807F744
_0807F714:
ldr r0, _0807F73C @ =gUnknown_3005008
ldr r0, _0807F73C @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x4
ldrsb r0, [r1, r0]
@@ -146,7 +146,7 @@ _0807F714:
bl sub_807F810
b _0807F744
.align 2, 0
_0807F73C: .4byte gUnknown_3005008
_0807F73C: .4byte gSaveBlock1Ptr
_0807F740:
bl sub_807F748
_0807F744:
@@ -160,7 +160,7 @@ sub_807F748: @ 807F748
bl ScriptContext2_Enable
bl player_bitmagic
bl sub_805C780
ldr r1, _0807F780 @ =gUnknown_30030F0
ldr r1, _0807F780 @ =gMain
ldr r0, _0807F784 @ =sub_807FB40
str r0, [r1, 0x8]
ldr r1, _0807F788 @ =gUnknown_2022B4C
@@ -178,7 +178,7 @@ sub_807F748: @ 807F748
pop {r0}
bx r0
.align 2, 0
_0807F780: .4byte gUnknown_30030F0
_0807F780: .4byte gMain
_0807F784: .4byte sub_807FB40
_0807F788: .4byte gUnknown_2022B4C
thumb_func_end sub_807F748
@@ -189,7 +189,7 @@ sub_807F78C: @ 807F78C
bl ScriptContext2_Enable
bl player_bitmagic
bl sub_805C780
ldr r1, _0807F7C8 @ =gUnknown_30030F0
ldr r1, _0807F7C8 @ =gMain
ldr r0, _0807F7CC @ =sub_807FB40
str r0, [r1, 0x8]
ldr r1, _0807F7D0 @ =gUnknown_2022B4C
@@ -208,7 +208,7 @@ sub_807F78C: @ 807F78C
pop {r0}
bx r0
.align 2, 0
_0807F7C8: .4byte gUnknown_30030F0
_0807F7C8: .4byte gMain
_0807F7CC: .4byte sub_807FB40
_0807F7D0: .4byte gUnknown_2022B4C
_0807F7D4: .4byte 0x00000155
@@ -220,7 +220,7 @@ sub_807F7D8: @ 807F7D8
bl ScriptContext2_Enable
bl player_bitmagic
bl sub_805C780
ldr r1, _0807F804 @ =gUnknown_30030F0
ldr r1, _0807F804 @ =gMain
ldr r0, _0807F808 @ =sub_80A0F4C
str r0, [r1, 0x8]
ldr r1, _0807F80C @ =gUnknown_2022B4C
@@ -234,7 +234,7 @@ sub_807F7D8: @ 807F7D8
pop {r0}
bx r0
.align 2, 0
_0807F804: .4byte gUnknown_30030F0
_0807F804: .4byte gMain
_0807F808: .4byte sub_80A0F4C
_0807F80C: .4byte gUnknown_2022B4C
thumb_func_end sub_807F7D8
@@ -245,7 +245,7 @@ sub_807F810: @ 807F810
bl ScriptContext2_Enable
bl player_bitmagic
bl sub_805C780
ldr r1, _0807F854 @ =gUnknown_30030F0
ldr r1, _0807F854 @ =gMain
ldr r0, _0807F858 @ =sub_807FB40
str r0, [r1, 0x8]
ldr r1, _0807F85C @ =gUnknown_2022B4C
@@ -268,7 +268,7 @@ sub_807F810: @ 807F810
pop {r0}
bx r0
.align 2, 0
_0807F854: .4byte gUnknown_30030F0
_0807F854: .4byte gMain
_0807F858: .4byte sub_807FB40
_0807F85C: .4byte gUnknown_2022B4C
_0807F860: .4byte gUnknown_202402C
@@ -299,7 +299,7 @@ sub_807F888: @ 807F888
movs r2, 0x5
bl CreateMaleMon
bl ScriptContext2_Enable
ldr r1, _0807F8B8 @ =gUnknown_30030F0
ldr r1, _0807F8B8 @ =gMain
ldr r0, _0807F8BC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
str r0, [r1, 0x8]
ldr r1, _0807F8C0 @ =gUnknown_2022B4C
@@ -313,7 +313,7 @@ sub_807F888: @ 807F888
bx r0
.align 2, 0
_0807F8B4: .4byte gUnknown_202402C
_0807F8B8: .4byte gUnknown_30030F0
_0807F8B8: .4byte gMain
_0807F8BC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_0807F8C0: .4byte gUnknown_2022B4C
thumb_func_end sub_807F888
@@ -322,7 +322,7 @@ _0807F8C0: .4byte gUnknown_2022B4C
sub_807F8C4: @ 807F8C4
push {lr}
bl ScriptContext2_Enable
ldr r1, _0807F8F8 @ =gUnknown_30030F0
ldr r1, _0807F8F8 @ =gMain
ldr r0, _0807F8FC @ =sub_807FBA0
str r0, [r1, 0x8]
ldr r1, _0807F900 @ =gUnknown_2022B4C
@@ -341,7 +341,7 @@ sub_807F8C4: @ 807F8C4
pop {r0}
bx r0
.align 2, 0
_0807F8F8: .4byte gUnknown_30030F0
_0807F8F8: .4byte gMain
_0807F8FC: .4byte sub_807FBA0
_0807F900: .4byte gUnknown_2022B4C
thumb_func_end sub_807F8C4
@@ -351,7 +351,7 @@ sub_807F904: @ 807F904
push {lr}
sub sp, 0xC
bl ScriptContext2_Enable
ldr r1, _0807F944 @ =gUnknown_30030F0
ldr r1, _0807F944 @ =gMain
ldr r0, _0807F948 @ =sub_807FBF0
str r0, [r1, 0x8]
ldr r0, _0807F94C @ =0x00000167
@@ -377,7 +377,7 @@ sub_807F904: @ 807F904
bl CreateMonWithGenderNatureLetter
b _0807F960
.align 2, 0
_0807F944: .4byte gUnknown_30030F0
_0807F944: .4byte gMain
_0807F948: .4byte sub_807FBF0
_0807F94C: .4byte 0x00000167
_0807F950: .4byte gUnknown_2022B4C
@@ -414,7 +414,7 @@ _0807F994: .4byte gUnknown_841D148
sub_807F998: @ 807F998
push {lr}
bl ScriptContext2_Enable
ldr r1, _0807F9CC @ =gUnknown_30030F0
ldr r1, _0807F9CC @ =gMain
ldr r0, _0807F9D0 @ =sub_807FBA0
str r0, [r1, 0x8]
ldr r1, _0807F9D4 @ =gUnknown_2022B4C
@@ -433,7 +433,7 @@ sub_807F998: @ 807F998
pop {r0}
bx r0
.align 2, 0
_0807F9CC: .4byte gUnknown_30030F0
_0807F9CC: .4byte gMain
_0807F9D0: .4byte sub_807FBA0
_0807F9D4: .4byte gUnknown_2022B4C
thumb_func_end sub_807F998
@@ -442,7 +442,7 @@ _0807F9D4: .4byte gUnknown_2022B4C
sub_807F9D8: @ 807F9D8
push {lr}
bl ScriptContext2_Enable
ldr r1, _0807FA0C @ =gUnknown_30030F0
ldr r1, _0807FA0C @ =gMain
ldr r0, _0807FA10 @ =sub_807FBA0
str r0, [r1, 0x8]
ldr r1, _0807FA14 @ =gUnknown_2022B4C
@@ -465,7 +465,7 @@ sub_807F9D8: @ 807F9D8
blt _0807FA4C
b _0807FA3C
.align 2, 0
_0807FA0C: .4byte gUnknown_30030F0
_0807FA0C: .4byte gMain
_0807FA10: .4byte sub_807FBA0
_0807FA14: .4byte gUnknown_2022B4C
_0807FA18: .4byte gUnknown_202402C
@@ -514,14 +514,14 @@ _0807FA56:
sub_807FA68: @ 807FA68
push {lr}
bl ScriptContext2_Enable
ldr r1, _0807FA90 @ =gUnknown_30030F0
ldr r1, _0807FA90 @ =gMain
ldr r0, _0807FA94 @ =sub_807FBA0
str r0, [r1, 0x8]
ldr r1, _0807FA98 @ =gUnknown_2022B4C
movs r0, 0xC0
lsls r0, 6
str r0, [r1]
ldr r0, _0807FA9C @ =gUnknown_81E9F10
ldr r0, _0807FA9C @ =gGameVersion
ldrb r0, [r0]
cmp r0, 0x4
bne _0807FAA0
@@ -531,10 +531,10 @@ sub_807FA68: @ 807FA68
bl sub_807F690
b _0807FAAA
.align 2, 0
_0807FA90: .4byte gUnknown_30030F0
_0807FA90: .4byte gMain
_0807FA94: .4byte sub_807FBA0
_0807FA98: .4byte gUnknown_2022B4C
_0807FA9C: .4byte gUnknown_81E9F10
_0807FA9C: .4byte gGameVersion
_0807FAA0:
movs r1, 0x85
lsls r1, 1
@@ -553,7 +553,7 @@ _0807FAAA:
sub_807FABC: @ 807FABC
push {lr}
bl ScriptContext2_Enable
ldr r1, _0807FAEC @ =gUnknown_30030F0
ldr r1, _0807FAEC @ =gMain
ldr r0, _0807FAF0 @ =sub_807FBA0
str r0, [r1, 0x8]
ldr r1, _0807FAF4 @ =gUnknown_2022B4C
@@ -571,7 +571,7 @@ sub_807FABC: @ 807FABC
pop {r0}
bx r0
.align 2, 0
_0807FAEC: .4byte gUnknown_30030F0
_0807FAEC: .4byte gMain
_0807FAF0: .4byte sub_807FBA0
_0807FAF4: .4byte gUnknown_2022B4C
thumb_func_end sub_807FABC
@@ -591,7 +591,7 @@ sub_807FB08: @ 807FB08
bl ScriptContext2_Enable
bl player_bitmagic
bl sub_805C780
ldr r1, _0807FB38 @ =gUnknown_30030F0
ldr r1, _0807FB38 @ =gMain
ldr r0, _0807FB3C @ =sub_807FAF8
str r0, [r1, 0x8]
bl copy_player_party_to_sav1
@@ -604,7 +604,7 @@ sub_807FB08: @ 807FB08
pop {r0}
bx r0
.align 2, 0
_0807FB38: .4byte gUnknown_30030F0
_0807FB38: .4byte gMain
_0807FB3C: .4byte sub_807FAF8
thumb_func_end sub_807FB08
@@ -1507,7 +1507,7 @@ battle_80801F0: @ 80801F0
strh r1, [r0]
lsls r0, r1, 24
lsrs r0, 24
ldr r1, _08080220 @ =gUnknown_3005008
ldr r1, _08080220 @ =gSaveBlock1Ptr
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
@@ -1520,7 +1520,7 @@ _08080212:
.align 2, 0
_08080218: .4byte gUnknown_20386B0
_0808021C: .4byte gUnknown_20370D2
_08080220: .4byte gUnknown_3005008
_08080220: .4byte gSaveBlock1Ptr
_08080224: .4byte gUnknown_3005074
thumb_func_end battle_80801F0
@@ -1832,7 +1832,7 @@ sub_8080464: @ 8080464
orrs r0, r1
str r0, [r4]
_0808048C:
ldr r1, _080804A4 @ =gUnknown_30030F0
ldr r1, _080804A4 @ =gMain
ldr r0, _080804A8 @ =sub_80804AC
str r0, [r1, 0x8]
bl sub_807F868
@@ -1842,7 +1842,7 @@ _0808048C:
bx r0
.align 2, 0
_080804A0: .4byte gUnknown_2022B4C
_080804A4: .4byte gUnknown_30030F0
_080804A4: .4byte gMain
_080804A8: .4byte sub_80804AC
thumb_func_end sub_8080464
@@ -1970,7 +1970,7 @@ sub_80805B0: @ 80805B0
ldr r1, _080805CC @ =gUnknown_2022B4C
movs r0, 0x8
str r0, [r1]
ldr r1, _080805D0 @ =gUnknown_30030F0
ldr r1, _080805D0 @ =gMain
ldr r0, _080805D4 @ =sub_8080558
str r0, [r1, 0x8]
bl sub_807F868
@@ -1979,7 +1979,7 @@ sub_80805B0: @ 80805B0
bx r0
.align 2, 0
_080805CC: .4byte gUnknown_2022B4C
_080805D0: .4byte gUnknown_30030F0
_080805D0: .4byte gMain
_080805D4: .4byte sub_8080558
thumb_func_end sub_80805B0
asm/battle_tower.s
+122 -122
View File
@@ -11,7 +11,7 @@ sub_80E5970: @ 80E5970
movs r4, 0
movs r5, 0
_080E5976:
ldr r0, _080E5990 @ =gUnknown_300500C
ldr r0, _080E5990 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, _080E5994 @ =0x0000055e
adds r0, r1
@@ -25,7 +25,7 @@ _080E5976:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080E5990: .4byte gUnknown_300500C
_080E5990: .4byte gSaveBlock2Ptr
_080E5994: .4byte 0x0000055e
_080E5998: .4byte _080E599C
.align 2, 0
@@ -79,7 +79,7 @@ _080E5A00:
adds r5, 0x1
cmp r5, 0x1
ble _080E5976
ldr r0, _080E5A2C @ =gUnknown_300500C
ldr r0, _080E5A2C @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, _080E5A30 @ =0x0000055e
adds r0, r1
@@ -97,7 +97,7 @@ _080E5A20:
pop {r0}
bx r0
.align 2, 0
_080E5A2C: .4byte gUnknown_300500C
_080E5A2C: .4byte gSaveBlock2Ptr
_080E5A30: .4byte 0x0000055e
_080E5A34: .4byte 0x00000303
thumb_func_end sub_80E5970
@@ -106,7 +106,7 @@ _080E5A34: .4byte 0x00000303
sub_80E5A38: @ 80E5A38
lsls r0, 24
lsrs r0, 24
ldr r3, _080E5A64 @ =gUnknown_300500C
ldr r3, _080E5A64 @ =gSaveBlock2Ptr
ldr r1, [r3]
ldr r2, _080E5A68 @ =0x0000055e
adds r1, r2
@@ -127,7 +127,7 @@ sub_80E5A38: @ 80E5A38
strh r3, [r2]
bx lr
.align 2, 0
_080E5A64: .4byte gUnknown_300500C
_080E5A64: .4byte gSaveBlock2Ptr
_080E5A68: .4byte 0x0000055e
_080E5A6C: .4byte 0x00000564
thumb_func_end sub_80E5A38
@@ -149,7 +149,7 @@ sub_80E5A70: @ 80E5A70
adds r7, r4, 0
cmp r0, 0
bne _080E5A9E
ldr r0, _080E5AA8 @ =gUnknown_300500C
ldr r0, _080E5AA8 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, _080E5AAC @ =0x000004a2
adds r0, r1
@@ -161,7 +161,7 @@ _080E5A9E:
b _080E5B02
.align 2, 0
_080E5AA4: .4byte gUnknown_20370D0
_080E5AA8: .4byte gUnknown_300500C
_080E5AA8: .4byte gSaveBlock2Ptr
_080E5AAC: .4byte 0x000004a2
_080E5AB0:
movs r6, 0x32
@@ -171,7 +171,7 @@ _080E5AB0:
_080E5AB8:
movs r4, 0
_080E5ABA:
ldr r0, _080E5B0C @ =gUnknown_300500C
ldr r0, _080E5B0C @ =gSaveBlock2Ptr
ldr r1, [r0]
movs r0, 0x2C
muls r0, r4
@@ -213,7 +213,7 @@ _080E5B02:
pop {r1}
bx r1
.align 2, 0
_080E5B0C: .4byte gUnknown_300500C
_080E5B0C: .4byte gSaveBlock2Ptr
_080E5B10: .4byte 0x000004d4
thumb_func_end sub_80E5A70
@@ -227,7 +227,7 @@ sub_80E5B14: @ 80E5B14
sub sp, 0x24
movs r0, 0
str r0, [sp, 0x14]
ldr r4, _080E5B58 @ =gUnknown_300500C
ldr r4, _080E5B58 @ =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, _080E5B5C @ =0x0000055c
adds r0, r1
@@ -252,7 +252,7 @@ sub_80E5B14: @ 80E5B14
strb r1, [r0]
b _080E5C0C
.align 2, 0
_080E5B58: .4byte gUnknown_300500C
_080E5B58: .4byte gSaveBlock2Ptr
_080E5B5C: .4byte 0x0000055c
_080E5B60: .4byte 0x0000056c
_080E5B64:
@@ -262,7 +262,7 @@ _080E5B64:
movs r7, 0xAA
lsls r7, 1
mov r12, r7
ldr r0, _080E5BE8 @ =gUnknown_300500C
ldr r0, _080E5BE8 @ =gSaveBlock2Ptr
ldr r0, [r0]
str r0, [sp, 0x18]
mov r1, sp
@@ -285,7 +285,7 @@ _080E5B8E:
adds r1, 0x1
cmp r1, 0x27
bls _080E5B8E
ldr r7, _080E5BE8 @ =gUnknown_300500C
ldr r7, _080E5BE8 @ =gSaveBlock2Ptr
ldr r2, [r7]
mov r3, r10
muls r3, r6
@@ -326,10 +326,10 @@ _080E5BD8:
movs r0, 0
b _080E5C0E
.align 2, 0
_080E5BE8: .4byte gUnknown_300500C
_080E5BE8: .4byte gSaveBlock2Ptr
_080E5BEC:
bl Random
ldr r1, _080E5C20 @ =gUnknown_300500C
ldr r1, _080E5C20 @ =gSaveBlock2Ptr
ldr r4, [r1]
lsls r0, 16
lsrs r0, 16
@@ -354,7 +354,7 @@ _080E5C0E:
pop {r1}
bx r1
.align 2, 0
_080E5C20: .4byte gUnknown_300500C
_080E5C20: .4byte gSaveBlock2Ptr
_080E5C24: .4byte 0x0000056c
thumb_func_end sub_80E5B14
@@ -363,7 +363,7 @@ sub_80E5C28: @ 80E5C28
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r5, _080E5C6C @ =gUnknown_300500C
ldr r5, _080E5C6C @ =gSaveBlock2Ptr
ldr r0, [r5]
ldr r1, _080E5C70 @ =0x0000055c
adds r0, r1
@@ -392,7 +392,7 @@ sub_80E5C28: @ 80E5C28
adds r1, r4
b _080E5E3E
.align 2, 0
_080E5C6C: .4byte gUnknown_300500C
_080E5C6C: .4byte gSaveBlock2Ptr
_080E5C70: .4byte 0x0000055c
_080E5C74: .4byte 0x0000056c
_080E5C78: .4byte 0x00000571
@@ -472,7 +472,7 @@ _080E5CFC:
adds r0, r6
ldrh r0, [r0]
subs r0, 0x1
ldr r4, _080E5D24 @ =gUnknown_300500C
ldr r4, _080E5D24 @ =gSaveBlock2Ptr
cmp r3, r0
bne _080E5CA2
ldr r0, [r4]
@@ -482,7 +482,7 @@ _080E5CFC:
.align 2, 0
_080E5D1C: .4byte 0x00000564
_080E5D20: .4byte 0x00000572
_080E5D24: .4byte gUnknown_300500C
_080E5D24: .4byte gSaveBlock2Ptr
_080E5D28: .4byte 0x0000056c
_080E5D2C:
adds r7, r6, 0
@@ -541,7 +541,7 @@ _080E5D88:
adds r0, r6
ldrh r0, [r0]
subs r0, 0x1
ldr r4, _080E5DB0 @ =gUnknown_300500C
ldr r4, _080E5DB0 @ =gSaveBlock2Ptr
cmp r3, r0
bne _080E5D30
ldr r0, [r4]
@@ -551,7 +551,7 @@ _080E5D88:
.align 2, 0
_080E5DA8: .4byte 0x00000564
_080E5DAC: .4byte 0x00000572
_080E5DB0: .4byte gUnknown_300500C
_080E5DB0: .4byte gSaveBlock2Ptr
_080E5DB4: .4byte 0x0000056c
_080E5DB8:
adds r7, r5, 0
@@ -597,7 +597,7 @@ _080E5DFC:
adds r0, r6
ldrh r0, [r0]
subs r0, 0x1
ldr r4, _080E5E50 @ =gUnknown_300500C
ldr r4, _080E5E50 @ =gSaveBlock2Ptr
cmp r3, r0
bne _080E5DBA
ldr r0, [r4]
@@ -634,7 +634,7 @@ _080E5E42:
bx r0
.align 2, 0
_080E5E4C: .4byte 0x00000572
_080E5E50: .4byte gUnknown_300500C
_080E5E50: .4byte gSaveBlock2Ptr
_080E5E54: .4byte 0x0000056c
_080E5E58: .4byte 0x00000571
thumb_func_end sub_80E5C28
@@ -672,7 +672,7 @@ sub_80E5E7C: @ 80E5E7C
mov r8, r1
mov r10, r0
movs r5, 0
ldr r2, _080E5F08 @ =gUnknown_300500C
ldr r2, _080E5F08 @ =gSaveBlock2Ptr
ldr r0, [r2]
mov r4, r10
ldrb r4, [r4, 0xC]
@@ -699,7 +699,7 @@ _080E5EBC:
adds r3, 0x1
cmp r3, 0x3
bgt _080E5EDA
ldr r7, _080E5F08 @ =gUnknown_300500C
ldr r7, _080E5F08 @ =gSaveBlock2Ptr
ldr r0, [r7]
adds r1, r3, r4
movs r7, 0xB0
@@ -715,7 +715,7 @@ _080E5EDA:
cmp r3, 0x4
bne _080E5F20
movs r6, 0
ldr r1, _080E5F08 @ =gUnknown_300500C
ldr r1, _080E5F08 @ =gSaveBlock2Ptr
ldr r0, [r1]
movs r3, 0xAC
lsls r3, 1
@@ -736,12 +736,12 @@ _080E5EFE:
movs r6, 0x7
b _080E5F20
.align 2, 0
_080E5F08: .4byte gUnknown_300500C
_080E5F08: .4byte gSaveBlock2Ptr
_080E5F0C:
adds r6, 0x1
cmp r6, 0x6
bgt _080E5F20
ldr r7, _080E5F4C @ =gUnknown_300500C
ldr r7, _080E5F4C @ =gSaveBlock2Ptr
ldr r0, [r7]
adds r0, r3
adds r0, r2
@@ -763,7 +763,7 @@ _080E5F20:
_080E5F36:
cmp r5, 0x4
bgt _080E5F50
ldr r2, _080E5F4C @ =gUnknown_300500C
ldr r2, _080E5F4C @ =gSaveBlock2Ptr
ldr r0, [r2]
movs r1, 0xA4
muls r1, r5
@@ -773,10 +773,10 @@ _080E5F36:
adds r0, r4
b _080E5F90
.align 2, 0
_080E5F4C: .4byte gUnknown_300500C
_080E5F4C: .4byte gSaveBlock2Ptr
_080E5F50:
movs r5, 0
ldr r7, _080E5F9C @ =gUnknown_300500C
ldr r7, _080E5F9C @ =gSaveBlock2Ptr
ldr r0, [r7]
movs r1, 0xAB
lsls r1, 1
@@ -801,7 +801,7 @@ _080E5F68:
_080E5F7C:
cmp r5, 0x4
bgt _080E5FA0
ldr r1, _080E5F9C @ =gUnknown_300500C
ldr r1, _080E5F9C @ =gSaveBlock2Ptr
ldr r0, [r1]
movs r1, 0xA4
muls r1, r5
@@ -815,10 +815,10 @@ _080E5F90:
bl memcpy
b _080E6062
.align 2, 0
_080E5F9C: .4byte gUnknown_300500C
_080E5F9C: .4byte gSaveBlock2Ptr
_080E5FA0:
mov r2, sp
ldr r4, _080E5FF8 @ =gUnknown_300500C
ldr r4, _080E5FF8 @ =gSaveBlock2Ptr
ldr r0, [r4]
movs r3, 0xAB
lsls r3, 1
@@ -839,7 +839,7 @@ _080E5FC2:
adds r7, r5, 0x1
cmp r3, r8
bge _080E6006
ldr r1, _080E5FF8 @ =gUnknown_300500C
ldr r1, _080E5FF8 @ =gSaveBlock2Ptr
ldr r0, [r1]
movs r2, 0xA4
adds r1, r5, 0
@@ -864,7 +864,7 @@ _080E5FDC:
strh r5, [r0]
b _080E6006
.align 2, 0
_080E5FF8: .4byte gUnknown_300500C
_080E5FF8: .4byte gSaveBlock2Ptr
_080E5FFC:
cmp r1, r0
bhi _080E6006
@@ -878,7 +878,7 @@ _080E6006:
lsls r2, r1, 1
mov r4, sp
adds r3, r4, r2
ldr r1, _080E6074 @ =gUnknown_300500C
ldr r1, _080E6074 @ =gSaveBlock2Ptr
ldr r0, [r1]
movs r4, 0xA4
adds r1, r5, 0
@@ -901,7 +901,7 @@ _080E602C:
mov r1, r8
bl __modsi3
adds r5, r0, 0
ldr r0, _080E6074 @ =gUnknown_300500C
ldr r0, _080E6074 @ =gSaveBlock2Ptr
ldr r0, [r0]
lsls r1, r5, 1
add r1, sp
@@ -926,13 +926,13 @@ _080E6062:
pop {r0}
bx r0
.align 2, 0
_080E6074: .4byte gUnknown_300500C
_080E6074: .4byte gSaveBlock2Ptr
thumb_func_end sub_80E5E7C
thumb_func_start sub_80E6078
sub_80E6078: @ 80E6078
push {lr}
ldr r0, _080E6094 @ =gUnknown_300500C
ldr r0, _080E6094 @ =gSaveBlock2Ptr
ldr r3, [r0]
ldr r0, _080E6098 @ =0x0000056c
adds r1, r3, r0
@@ -946,7 +946,7 @@ sub_80E6078: @ 80E6078
adds r0, r1
b _080E60D6
.align 2, 0
_080E6094: .4byte gUnknown_300500C
_080E6094: .4byte gSaveBlock2Ptr
_080E6098: .4byte 0x0000056c
_080E609C: .4byte gUnknown_82538A8
_080E60A0: .4byte 0x000004a1
@@ -988,7 +988,7 @@ _080E60E0: .4byte gUnknown_83FFAC4
thumb_func_start sub_80E60E4
sub_80E60E4: @ 80E60E4
push {lr}
ldr r0, _080E6100 @ =gUnknown_300500C
ldr r0, _080E6100 @ =gSaveBlock2Ptr
ldr r3, [r0]
ldr r0, _080E6104 @ =0x0000056c
adds r1, r3, r0
@@ -1002,7 +1002,7 @@ sub_80E60E4: @ 80E60E4
adds r0, r1
b _080E6144
.align 2, 0
_080E6100: .4byte gUnknown_300500C
_080E6100: .4byte gSaveBlock2Ptr
_080E6104: .4byte 0x0000056c
_080E6108: .4byte gUnknown_825393E
_080E610C: .4byte 0x000004a1
@@ -1045,7 +1045,7 @@ _080E614C: .4byte gUnknown_825393E
sub_80E6150: @ 80E6150
push {r4-r6,lr}
adds r4, r0, 0
ldr r0, _080E6178 @ =gUnknown_300500C
ldr r0, _080E6178 @ =gSaveBlock2Ptr
ldr r1, [r0]
ldr r2, _080E617C @ =0x0000056c
adds r0, r1, r2
@@ -1065,7 +1065,7 @@ _080E6168:
ble _080E6168
b _080E61CE
.align 2, 0
_080E6178: .4byte gUnknown_300500C
_080E6178: .4byte gSaveBlock2Ptr
_080E617C: .4byte 0x0000056c
_080E6180: .4byte 0x000004a4
_080E6184:
@@ -1134,7 +1134,7 @@ sub_80E61DC: @ 80E61DC
movs r0, 0xFF
strb r0, [r4]
bl ZeroEnemyPartyMons
ldr r1, _080E6210 @ =gUnknown_300500C
ldr r1, _080E6210 @ =gSaveBlock2Ptr
ldr r0, [r1]
ldr r2, _080E6214 @ =0x0000056c
adds r0, r2
@@ -1145,7 +1145,7 @@ sub_80E61DC: @ 80E61DC
str r3, [sp, 0x14]
b _080E62F4
.align 2, 0
_080E6210: .4byte gUnknown_300500C
_080E6210: .4byte gSaveBlock2Ptr
_080E6214: .4byte 0x0000056c
_080E6218:
cmp r0, 0x1D
@@ -1237,7 +1237,7 @@ _080E62B2:
muls r0, r6
ldr r1, _080E62E4 @ =gUnknown_202402C
adds r0, r1
ldr r1, _080E62E8 @ =gUnknown_300500C
ldr r1, _080E62E8 @ =gSaveBlock2Ptr
ldr r1, [r1]
ldr r3, _080E62EC @ =0x0000056c
adds r2, r1, r3
@@ -1258,11 +1258,11 @@ _080E62B2:
b _080E64A6
.align 2, 0
_080E62E4: .4byte gUnknown_202402C
_080E62E8: .4byte gUnknown_300500C
_080E62E8: .4byte gSaveBlock2Ptr
_080E62EC: .4byte 0x0000056c
_080E62F0: .4byte 0xffffc144
_080E62F4:
ldr r2, _080E6314 @ =gUnknown_300500C
ldr r2, _080E6314 @ =gSaveBlock2Ptr
ldr r0, [r2]
ldr r1, _080E6318 @ =0x0000055c
adds r0, r1
@@ -1278,7 +1278,7 @@ _080E62F4:
str r3, [sp, 0x10]
b _080E6328
.align 2, 0
_080E6314: .4byte gUnknown_300500C
_080E6314: .4byte gSaveBlock2Ptr
_080E6318: .4byte 0x0000055c
_080E631C: .4byte gUnknown_8400E04
_080E6320:
@@ -1828,7 +1828,7 @@ _080E6750:
ldr r1, _080E6780 @ =gUnknown_20370C0
movs r0, 0
strh r0, [r1]
ldr r0, _080E6784 @ =gUnknown_300500C
ldr r0, _080E6784 @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r0, [r5]
ldr r1, _080E6788 @ =0x0000055c
@@ -1852,7 +1852,7 @@ _080E6770:
bx r0
.align 2, 0
_080E6780: .4byte gUnknown_20370C0
_080E6784: .4byte gUnknown_300500C
_080E6784: .4byte gSaveBlock2Ptr
_080E6788: .4byte 0x0000055c
thumb_func_end sub_80E6648
@@ -1921,7 +1921,7 @@ _080E67F8: .4byte gUnknown_2021D18
thumb_func_start sub_80E67FC
sub_80E67FC: @ 80E67FC
push {lr}
ldr r0, _080E6818 @ =gUnknown_300500C
ldr r0, _080E6818 @ =gSaveBlock2Ptr
ldr r2, [r0]
ldr r1, _080E681C @ =0x0000056c
adds r0, r2, r1
@@ -1934,7 +1934,7 @@ sub_80E67FC: @ 80E67FC
bl sub_80E678C
b _080E684C
.align 2, 0
_080E6818: .4byte gUnknown_300500C
_080E6818: .4byte gSaveBlock2Ptr
_080E681C: .4byte 0x0000056c
_080E6820:
cmp r1, 0x63
@@ -1981,7 +1981,7 @@ sub_80E6854: @ 80E6854
_080E686C: .4byte gUnknown_203AAB8
_080E6870:
movs r5, 0
ldr r6, _080E68A4 @ =gUnknown_3005008
ldr r6, _080E68A4 @ =gSaveBlock1Ptr
_080E6874:
movs r0, 0x64
adds r4, r5, 0
@@ -2005,7 +2005,7 @@ _080E6874:
ble _080E6874
b _080E68B0
.align 2, 0
_080E68A4: .4byte gUnknown_3005008
_080E68A4: .4byte gSaveBlock1Ptr
_080E68A8: .4byte gUnknown_2024284
_080E68AC:
bl sub_80E7550
@@ -2030,7 +2030,7 @@ sub_80E68C4: @ 80E68C4
lsrs r0, 24
cmp r0, 0x1
bne _080E68EC
ldr r0, _080E68F4 @ =gUnknown_30030F0
ldr r0, _080E68F4 @ =gMain
ldr r1, _080E68F8 @ =sub_80E6854
str r1, [r0, 0x8]
bl sub_80563F0
@@ -2043,7 +2043,7 @@ _080E68EC:
pop {r0}
bx r0
.align 2, 0
_080E68F4: .4byte gUnknown_30030F0
_080E68F4: .4byte gMain
_080E68F8: .4byte sub_80E6854
_080E68FC: .4byte sub_800FD9C
thumb_func_end sub_80E68C4
@@ -2085,7 +2085,7 @@ _080E693C: .4byte gUnknown_2022B4C
_080E6940: .4byte gUnknown_20386AE
_080E6944:
movs r5, 0
ldr r6, _080E698C @ =gUnknown_3005008
ldr r6, _080E698C @ =gSaveBlock1Ptr
_080E6948:
movs r0, 0x64
adds r4, r5, 0
@@ -2117,13 +2117,13 @@ _080E6970:
bl sub_80D08B8
b _080E69E6
.align 2, 0
_080E698C: .4byte gUnknown_3005008
_080E698C: .4byte gSaveBlock1Ptr
_080E6990: .4byte gUnknown_2024284
_080E6994: .4byte sub_80E68C4
_080E6998:
bl ZeroEnemyPartyMons
movs r5, 0
ldr r4, _080E69F0 @ =gUnknown_300500C
ldr r4, _080E69F0 @ =gSaveBlock2Ptr
_080E69A0:
movs r0, 0x64
muls r0, r5
@@ -2161,7 +2161,7 @@ _080E69E6:
pop {r0}
bx r0
.align 2, 0
_080E69F0: .4byte gUnknown_300500C
_080E69F0: .4byte gSaveBlock2Ptr
_080E69F4: .4byte gUnknown_202402C
_080E69F8: .4byte 0x000004d4
_080E69FC: .4byte gUnknown_2022B4C
@@ -2173,7 +2173,7 @@ _080E6A08: .4byte sub_80E68C4
thumb_func_start sub_80E6A0C
sub_80E6A0C: @ 80E6A0C
push {r4-r6,lr}
ldr r1, _080E6A34 @ =gUnknown_300500C
ldr r1, _080E6A34 @ =gSaveBlock2Ptr
ldr r0, [r1]
ldr r2, _080E6A38 @ =0x0000055c
adds r0, r2
@@ -2193,7 +2193,7 @@ _080E6A28:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080E6A34: .4byte gUnknown_300500C
_080E6A34: .4byte gSaveBlock2Ptr
_080E6A38: .4byte 0x0000055c
_080E6A3C: .4byte gUnknown_20370C0
_080E6A40: .4byte _080E6A44
@@ -2288,7 +2288,7 @@ _080E6B0C: .4byte gUnknown_20370C2
_080E6B10: .4byte 0x0000056c
_080E6B14:
movs r2, 0
ldr r5, _080E6B30 @ =gUnknown_300500C
ldr r5, _080E6B30 @ =gSaveBlock2Ptr
ldr r4, _080E6B34 @ =0x0000056d
ldr r3, _080E6B38 @ =gUnknown_203B0D4
_080E6B1C:
@@ -2303,7 +2303,7 @@ _080E6B1C:
ble _080E6B1C
b _080E6C80
.align 2, 0
_080E6B30: .4byte gUnknown_300500C
_080E6B30: .4byte gSaveBlock2Ptr
_080E6B34: .4byte 0x0000056d
_080E6B38: .4byte gUnknown_203B0D4
_080E6B3C:
@@ -2440,7 +2440,7 @@ _080E6C48: .4byte gUnknown_2023FE8
_080E6C4C:
adds r0, r5, 0
bl sub_80E7188
ldr r1, _080E6C64 @ =gUnknown_300500C
ldr r1, _080E6C64 @ =gSaveBlock2Ptr
ldr r1, [r1]
lsls r2, r5, 1
ldr r3, _080E6C68 @ =0x0000057c
@@ -2449,7 +2449,7 @@ _080E6C4C:
strh r0, [r1]
b _080E6C80
.align 2, 0
_080E6C64: .4byte gUnknown_300500C
_080E6C64: .4byte gSaveBlock2Ptr
_080E6C68: .4byte 0x0000057c
_080E6C6C:
ldr r1, [r6]
@@ -2474,7 +2474,7 @@ _080E6C88: .4byte 0x0000055c
thumb_func_start sub_80E6C8C
sub_80E6C8C: @ 80E6C8C
push {r4,lr}
ldr r1, _080E6CB4 @ =gUnknown_300500C
ldr r1, _080E6CB4 @ =gSaveBlock2Ptr
ldr r0, [r1]
ldr r2, _080E6CB8 @ =0x0000055c
adds r0, r2
@@ -2494,7 +2494,7 @@ _080E6CA8:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080E6CB4: .4byte gUnknown_300500C
_080E6CB4: .4byte gSaveBlock2Ptr
_080E6CB8: .4byte 0x0000055c
_080E6CBC: .4byte gUnknown_20370C0
_080E6CC0: .4byte _080E6CC4
@@ -2623,7 +2623,7 @@ _080E6DD0: .4byte gUnknown_2023FE8
_080E6DD4:
adds r0, r4, 0
bl sub_80E7188
ldr r1, _080E6DEC @ =gUnknown_300500C
ldr r1, _080E6DEC @ =gSaveBlock2Ptr
ldr r1, [r1]
lsls r2, r4, 1
ldr r3, _080E6DF0 @ =0x0000057c
@@ -2632,7 +2632,7 @@ _080E6DD4:
strh r0, [r1]
b _080E6E08
.align 2, 0
_080E6DEC: .4byte gUnknown_300500C
_080E6DEC: .4byte gSaveBlock2Ptr
_080E6DF0: .4byte 0x0000057c
_080E6DF4:
ldr r1, [r3]
@@ -2659,7 +2659,7 @@ sub_80E6E14: @ 80E6E14
push {r4,r5,lr}
movs r2, 0
ldr r5, _080E6E3C @ =gUnknown_203B0D4
ldr r4, _080E6E40 @ =gUnknown_300500C
ldr r4, _080E6E40 @ =gSaveBlock2Ptr
ldr r3, _080E6E44 @ =0x0000056d
_080E6E1E:
adds r0, r2, r5
@@ -2677,14 +2677,14 @@ _080E6E1E:
bx r0
.align 2, 0
_080E6E3C: .4byte gUnknown_203B0D4
_080E6E40: .4byte gUnknown_300500C
_080E6E40: .4byte gSaveBlock2Ptr
_080E6E44: .4byte 0x0000056d
thumb_func_end sub_80E6E14
thumb_func_start sub_80E6E48
sub_80E6E48: @ 80E6E48
push {r4-r6,lr}
ldr r6, _080E6E98 @ =gUnknown_300500C
ldr r6, _080E6E98 @ =gSaveBlock2Ptr
ldr r0, [r6]
ldr r1, _080E6E9C @ =0x0000055c
adds r0, r1
@@ -2723,7 +2723,7 @@ _080E6E76:
bhi _080E6EB8
b _080E6ECC
.align 2, 0
_080E6E98: .4byte gUnknown_300500C
_080E6E98: .4byte gSaveBlock2Ptr
_080E6E9C: .4byte 0x0000055c
_080E6EA0: .4byte 0x0000056a
_080E6EA4: .4byte 0x0000270f
@@ -2760,7 +2760,7 @@ _080E6EDC: .4byte 0x0000057a
thumb_func_start sub_80E6EE0
sub_80E6EE0: @ 80E6EE0
push {r4-r6,lr}
ldr r0, _080E6F00 @ =gUnknown_300500C
ldr r0, _080E6F00 @ =gSaveBlock2Ptr
ldr r2, [r0]
adds r5, r2, 0
adds r5, 0xB0
@@ -2775,7 +2775,7 @@ sub_80E6EE0: @ 80E6EE0
ldr r4, _080E6F08 @ =gUnknown_84020C4
b _080E6F0E
.align 2, 0
_080E6F00: .4byte gUnknown_300500C
_080E6F00: .4byte gSaveBlock2Ptr
_080E6F04: .4byte 0x0000055c
_080E6F08: .4byte gUnknown_84020C4
_080E6F0C:
@@ -2796,7 +2796,7 @@ _080E6F0E:
strb r0, [r5, 0x1]
adds r0, r5, 0
adds r0, 0xC
ldr r4, _080E6FA4 @ =gUnknown_300500C
ldr r4, _080E6FA4 @ =gSaveBlock2Ptr
ldr r1, [r4]
adds r1, 0xA
bl CopyUnalignedWord
@@ -2807,7 +2807,7 @@ _080E6F0E:
bl sub_80E7188
strh r0, [r5, 0x2]
movs r4, 0
ldr r6, _080E6FA8 @ =gUnknown_3005008
ldr r6, _080E6FA8 @ =gSaveBlock1Ptr
ldr r3, _080E6FAC @ =0x00002cac
adds r2, r5, 0
adds r2, 0x10
@@ -2824,7 +2824,7 @@ _080E6F52:
ble _080E6F52
movs r4, 0
_080E6F68:
ldr r6, _080E6FA4 @ =gUnknown_300500C
ldr r6, _080E6FA4 @ =gSaveBlock2Ptr
ldr r0, [r6]
ldr r1, _080E6FB0 @ =0x0000056d
adds r0, r1
@@ -2851,8 +2851,8 @@ _080E6F68:
bx r0
.align 2, 0
_080E6FA0: .4byte gUnknown_84020C4
_080E6FA4: .4byte gUnknown_300500C
_080E6FA8: .4byte gUnknown_3005008
_080E6FA4: .4byte gSaveBlock2Ptr
_080E6FA8: .4byte gSaveBlock1Ptr
_080E6FAC: .4byte 0x00002cac
_080E6FB0: .4byte 0x0000056d
_080E6FB4: .4byte gUnknown_2024220
@@ -2861,7 +2861,7 @@ _080E6FB4: .4byte gUnknown_2024220
thumb_func_start sub_80E6FB8
sub_80E6FB8: @ 80E6FB8
push {r4,r5,lr}
ldr r0, _080E703C @ =gUnknown_300500C
ldr r0, _080E703C @ =gSaveBlock2Ptr
ldr r1, [r0]
ldr r2, _080E7040 @ =0x0000055c
adds r0, r1, r2
@@ -2892,7 +2892,7 @@ _080E6FEE:
bl sub_80E6EE0
_080E6FF2:
bl sub_80E712C
ldr r4, _080E703C @ =gUnknown_300500C
ldr r4, _080E703C @ =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, _080E704C @ =gUnknown_2023E8A
ldrb r1, [r1]
@@ -2926,7 +2926,7 @@ _080E7016:
pop {r0}
bx r0
.align 2, 0
_080E703C: .4byte gUnknown_300500C
_080E703C: .4byte gSaveBlock2Ptr
_080E7040: .4byte 0x0000055c
_080E7044: .4byte gUnknown_20370C0
_080E7048: .4byte 0x00000564
@@ -2938,7 +2938,7 @@ _080E7054: .4byte 0x0000055e
thumb_func_start sub_80E7058
sub_80E7058: @ 80E7058
push {lr}
bl sub_80008D8
bl DoSoftReset
pop {r0}
bx r0
thumb_func_end sub_80E7058
@@ -2948,7 +2948,7 @@ sub_80E7064: @ 80E7064
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r0, _080E70F0 @ =gUnknown_300500C
ldr r0, _080E70F0 @ =gSaveBlock2Ptr
ldr r0, [r0]
movs r3, 0
movs r2, 0
@@ -2960,7 +2960,7 @@ _080E7076:
adds r2, 0x1
cmp r2, 0x27
bls _080E7076
ldr r5, _080E70F0 @ =gUnknown_300500C
ldr r5, _080E70F0 @ =gSaveBlock2Ptr
ldr r1, [r5]
movs r2, 0xA8
lsls r2, 1
@@ -3019,7 +3019,7 @@ _080E70E0:
pop {r0}
bx r0
.align 2, 0
_080E70F0: .4byte gUnknown_300500C
_080E70F0: .4byte gSaveBlock2Ptr
thumb_func_end sub_80E7064
thumb_func_start SetBattleTowerRecordChecksum
@@ -3061,7 +3061,7 @@ _080E711E:
thumb_func_start sub_80E712C
sub_80E712C: @ 80E712C
push {r4,r5,lr}
ldr r4, _080E7174 @ =gUnknown_300500C
ldr r4, _080E7174 @ =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, _080E7178 @ =0x0000048c
adds r0, r1
@@ -3097,7 +3097,7 @@ _080E715C:
pop {r0}
bx r0
.align 2, 0
_080E7174: .4byte gUnknown_300500C
_080E7174: .4byte gSaveBlock2Ptr
_080E7178: .4byte 0x0000048c
_080E717C: .4byte gUnknown_2023BE4
_080E7180: .4byte 0x0000048a
@@ -3108,7 +3108,7 @@ _080E7184: .4byte 0x00000494
sub_80E7188: @ 80E7188
push {lr}
lsls r0, 24
ldr r1, _080E71C0 @ =gUnknown_300500C
ldr r1, _080E71C0 @ =gSaveBlock2Ptr
ldr r3, [r1]
lsrs r0, 23
ldr r2, _080E71C4 @ =0x00000564
@@ -3136,7 +3136,7 @@ _080E71BC:
pop {r1}
bx r1
.align 2, 0
_080E71C0: .4byte gUnknown_300500C
_080E71C0: .4byte gSaveBlock2Ptr
_080E71C4: .4byte 0x00000564
_080E71C8: .4byte 0x0000ffff
_080E71CC: .4byte 0x0000270f
@@ -3145,7 +3145,7 @@ _080E71CC: .4byte 0x0000270f
thumb_func_start sub_80E71D0
sub_80E71D0: @ 80E71D0
push {r4,r5,lr}
ldr r4, _080E7214 @ =gUnknown_300500C
ldr r4, _080E7214 @ =gSaveBlock2Ptr
ldr r1, [r4]
ldr r2, _080E7218 @ =0x0000055c
adds r0, r1, r2
@@ -3176,7 +3176,7 @@ sub_80E71D0: @ 80E71D0
adds r4, r1
b _080E7240
.align 2, 0
_080E7214: .4byte gUnknown_300500C
_080E7214: .4byte gSaveBlock2Ptr
_080E7218: .4byte 0x0000055c
_080E721C: .4byte gUnknown_84020E6
_080E7220:
@@ -3206,7 +3206,7 @@ _080E7248: .4byte gUnknown_84020DA
thumb_func_start sub_80E724C
sub_80E724C: @ 80E724C
push {r4-r6,lr}
ldr r5, _080E7288 @ =gUnknown_300500C
ldr r5, _080E7288 @ =gSaveBlock2Ptr
ldr r1, [r5]
ldr r2, _080E728C @ =0x0000055c
adds r0, r1, r2
@@ -3234,7 +3234,7 @@ sub_80E724C: @ 80E724C
strh r4, [r0]
b _080E72AA
.align 2, 0
_080E7288: .4byte gUnknown_300500C
_080E7288: .4byte gSaveBlock2Ptr
_080E728C: .4byte 0x0000055c
_080E7290: .4byte gUnknown_2021CD0
_080E7294: .4byte gUnknown_20370D0
@@ -3260,7 +3260,7 @@ _080E72B4: .4byte 0x0000055e
thumb_func_start sub_80E72B8
sub_80E72B8: @ 80E72B8
push {r4-r7,lr}
ldr r0, _080E7334 @ =gUnknown_300500C
ldr r0, _080E7334 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, _080E7338 @ =0x0000055c
adds r0, r1
@@ -3285,7 +3285,7 @@ _080E72D2:
movs r5, 0
adds r6, r4, 0
_080E72EA:
ldr r0, _080E7334 @ =gUnknown_300500C
ldr r0, _080E7334 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, _080E7340 @ =0x0000056d
adds r0, r1
@@ -3323,7 +3323,7 @@ _080E732E:
pop {r0}
bx r0
.align 2, 0
_080E7334: .4byte gUnknown_300500C
_080E7334: .4byte gSaveBlock2Ptr
_080E7338: .4byte 0x0000055c
_080E733C: .4byte gUnknown_20370D0
_080E7340: .4byte 0x0000056d
@@ -3336,7 +3336,7 @@ sub_80E7348: @ 80E7348
mov r7, r9
mov r6, r8
push {r6,r7}
ldr r1, _080E7368 @ =gUnknown_300500C
ldr r1, _080E7368 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r0, 0x94
lsls r0, 3
@@ -3348,7 +3348,7 @@ sub_80E7348: @ 80E7348
ldr r4, _080E736C @ =gUnknown_84020C4
b _080E7372
.align 2, 0
_080E7368: .4byte gUnknown_300500C
_080E7368: .4byte gSaveBlock2Ptr
_080E736C: .4byte gUnknown_84020C4
_080E7370:
ldr r4, _080E7410 @ =gUnknown_84020C4
@@ -3377,7 +3377,7 @@ _080E7372:
strh r0, [r7, 0x2]
movs r6, 0x7
movs r4, 0
ldr r0, _080E7414 @ =gUnknown_3005008
ldr r0, _080E7414 @ =gSaveBlock1Ptr
mov r8, r0
adds r5, r7, 0
adds r5, 0x10
@@ -3430,7 +3430,7 @@ _080E73E2:
bx r0
.align 2, 0
_080E7410: .4byte gUnknown_84020C4
_080E7414: .4byte gUnknown_3005008
_080E7414: .4byte gSaveBlock1Ptr
_080E7418: .4byte 0x00002cac
_080E741C: .4byte gUnknown_2024284
thumb_func_end sub_80E7348
@@ -3438,7 +3438,7 @@ _080E741C: .4byte gUnknown_2024284
thumb_func_start GetEreaderTrainerFrontSpriteId
GetEreaderTrainerFrontSpriteId: @ 80E7420
ldr r1, _080E7434 @ =gUnknown_82538A8
ldr r0, _080E7438 @ =gUnknown_300500C
ldr r0, _080E7438 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, _080E743C @ =0x000004a1
adds r0, r2
@@ -3448,14 +3448,14 @@ GetEreaderTrainerFrontSpriteId: @ 80E7420
bx lr
.align 2, 0
_080E7434: .4byte gUnknown_82538A8
_080E7438: .4byte gUnknown_300500C
_080E7438: .4byte gSaveBlock2Ptr
_080E743C: .4byte 0x000004a1
thumb_func_end GetEreaderTrainerFrontSpriteId
thumb_func_start GetEreaderTrainerClassId
GetEreaderTrainerClassId: @ 80E7440
ldr r1, _080E7454 @ =gUnknown_825393E
ldr r0, _080E7458 @ =gUnknown_300500C
ldr r0, _080E7458 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, _080E745C @ =0x000004a1
adds r0, r2
@@ -3465,7 +3465,7 @@ GetEreaderTrainerClassId: @ 80E7440
bx lr
.align 2, 0
_080E7454: .4byte gUnknown_825393E
_080E7458: .4byte gUnknown_300500C
_080E7458: .4byte gSaveBlock2Ptr
_080E745C: .4byte 0x000004a1
thumb_func_end GetEreaderTrainerClassId
@@ -3474,7 +3474,7 @@ sub_80E7460: @ 80E7460
push {r4,lr}
adds r3, r0, 0
movs r2, 0
ldr r0, _080E7488 @ =gUnknown_300500C
ldr r0, _080E7488 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, _080E748C @ =0x000004a4
adds r4, r0, r1
@@ -3493,7 +3493,7 @@ _080E746E:
pop {r0}
bx r0
.align 2, 0
_080E7488: .4byte gUnknown_300500C
_080E7488: .4byte gSaveBlock2Ptr
_080E748C: .4byte 0x000004a4
thumb_func_end sub_80E7460
@@ -3503,7 +3503,7 @@ sub_80E7490: @ 80E7490
ldr r2, _080E74C0 @ =gUnknown_20370D0
movs r0, 0
strh r0, [r2]
ldr r1, _080E74C4 @ =gUnknown_300500C
ldr r1, _080E74C4 @ =gSaveBlock2Ptr
ldr r0, [r1]
movs r3, 0x94
lsls r3, 3
@@ -3525,7 +3525,7 @@ _080E74AA:
b _080E74F6
.align 2, 0
_080E74C0: .4byte gUnknown_20370D0
_080E74C4: .4byte gUnknown_300500C
_080E74C4: .4byte gSaveBlock2Ptr
_080E74C8:
movs r4, 0
movs r3, 0
@@ -3597,7 +3597,7 @@ _080E752A:
thumb_func_start sub_80E7538
sub_80E7538: @ 80E7538
push {lr}
ldr r0, _080E754C @ =gUnknown_300500C
ldr r0, _080E754C @ =gSaveBlock2Ptr
ldr r0, [r0]
movs r1, 0x96
lsls r1, 3
@@ -3606,7 +3606,7 @@ sub_80E7538: @ 80E7538
pop {r0}
bx r0
.align 2, 0
_080E754C: .4byte gUnknown_300500C
_080E754C: .4byte gSaveBlock2Ptr
thumb_func_end sub_80E7538
thumb_func_start sub_80E7550
@@ -3626,7 +3626,7 @@ _080E7568: .4byte gUnknown_2021D18
_080E756C:
cmp r0, 0x1
bne _080E7584
ldr r0, _080E7580 @ =gUnknown_300500C
ldr r0, _080E7580 @ =gSaveBlock2Ptr
ldr r0, [r0]
movs r1, 0x99
lsls r1, 3
@@ -3634,9 +3634,9 @@ _080E756C:
bl sub_80E678C
b _080E7590
.align 2, 0
_080E7580: .4byte gUnknown_300500C
_080E7580: .4byte gSaveBlock2Ptr
_080E7584:
ldr r0, _080E7594 @ =gUnknown_300500C
ldr r0, _080E7594 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, _080E7598 @ =0x000004bc
adds r0, r1
@@ -3645,7 +3645,7 @@ _080E7590:
pop {r0}
bx r0
.align 2, 0
_080E7594: .4byte gUnknown_300500C
_080E7594: .4byte gSaveBlock2Ptr
_080E7598: .4byte 0x000004bc
thumb_func_end sub_80E7550
asm/battle_transition.s
+6 -6
View File
@@ -15,7 +15,7 @@ sub_80D08B8: @ 80D08B8
movs r0, 0x3C
bl AllocZeroed
str r0, [r5]
ldr r1, _080D08E0 @ =gUnknown_30030F0
ldr r1, _080D08E0 @ =gMain
ldr r0, _080D08E4 @ =sub_80565A8
str r0, [r1, 0x4]
adds r0, r4, 0
@@ -25,7 +25,7 @@ sub_80D08B8: @ 80D08B8
bx r0
.align 2, 0
_080D08DC: .4byte gUnknown_2039A2C
_080D08E0: .4byte gUnknown_30030F0
_080D08E0: .4byte gMain
_080D08E4: .4byte sub_80565A8
thumb_func_end sub_80D08B8
@@ -4174,7 +4174,7 @@ Phase2_Mugshot_Func2: @ 80D28A8
movs r2, 0x20
bl LoadPalette
ldr r1, _080D295C @ =gUnknown_83FA754
ldr r0, _080D2960 @ =gUnknown_300500C
ldr r0, _080D2960 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
lsls r0, 2
@@ -4235,7 +4235,7 @@ _080D2950: .4byte gUnknown_83FAC34
_080D2954: .4byte gUnknown_83F8F60
_080D2958: .4byte gUnknown_83FA740
_080D295C: .4byte gUnknown_83FA754
_080D2960: .4byte gUnknown_300500C
_080D2960: .4byte gSaveBlock2Ptr
_080D2964: .4byte sub_80D2E6C
thumb_func_end Phase2_Mugshot_Func2
@@ -4949,7 +4949,7 @@ sub_80D2EA4: @ 80D2EA4
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
ldr r0, _080D3008 @ =gUnknown_300500C
ldr r0, _080D3008 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
movs r1, 0x1
@@ -5078,7 +5078,7 @@ _080D2FF8: .4byte gUnknown_3003E58
_080D2FFC: .4byte gUnknown_83FA494
_080D3000: .4byte gUnknown_83FA4AE
_080D3004: .4byte gUnknown_201C000
_080D3008: .4byte gUnknown_300500C
_080D3008: .4byte gSaveBlock2Ptr
_080D300C: .4byte gUnknown_202063C
_080D3010: .4byte sub_80D301C
_080D3014: .4byte gUnknown_83FA49A
asm/berry.s
+10 -10
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_809C718
sub_809C718: @ 809C718
push {r4,r5,lr}
ldr r2, _0809C778 @ =gUnknown_3005008
ldr r2, _0809C778 @ =gSaveBlock1Ptr
ldr r1, [r2]
ldr r0, _0809C77C @ =gUnknown_83DF7E8
ldr r3, _0809C780 @ =0x000030ec
@@ -56,7 +56,7 @@ _0809C740:
pop {r0}
bx r0
.align 2, 0
_0809C778: .4byte gUnknown_3005008
_0809C778: .4byte gSaveBlock1Ptr
_0809C77C: .4byte gUnknown_83DF7E8
_0809C780: .4byte 0x000030ec
_0809C784: .4byte 0x00003108
@@ -72,7 +72,7 @@ sub_809C794: @ 809C794
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r0, _0809C7B8 @ =gUnknown_3005008
ldr r0, _0809C7B8 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, _0809C7BC @ =0x000030ec
adds r1, r0
@@ -84,7 +84,7 @@ sub_809C794: @ 809C794
pop {r0}
bx r0
.align 2, 0
_0809C7B8: .4byte gUnknown_3005008
_0809C7B8: .4byte gSaveBlock1Ptr
_0809C7BC: .4byte 0x000030ec
_0809C7C0: .4byte 0x0100001a
thumb_func_end sub_809C794
@@ -95,7 +95,7 @@ sub_809C7C4: @ 809C7C4
adds r4, r0, 0
bl sub_809C794
adds r5, r4, 0
ldr r0, _0809C824 @ =gUnknown_3005008
ldr r0, _0809C824 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldr r0, _0809C828 @ =0x000030ec
adds r4, r2, r0
@@ -139,7 +139,7 @@ _0809C7F0:
pop {r0}
bx r0
.align 2, 0
_0809C824: .4byte gUnknown_3005008
_0809C824: .4byte gSaveBlock1Ptr
_0809C828: .4byte 0x000030ec
_0809C82C: .4byte 0x00003108
_0809C830: .4byte 0x00000516
@@ -167,7 +167,7 @@ _0809C840:
thumb_func_start IsEnigmaBerryValid
IsEnigmaBerryValid: @ 809C854
push {r4,lr}
ldr r4, _0809C888 @ =gUnknown_3005008
ldr r4, _0809C888 @ =gSaveBlock1Ptr
ldr r1, [r4]
movs r2, 0xC4
lsls r2, 6
@@ -192,7 +192,7 @@ IsEnigmaBerryValid: @ 809C854
movs r0, 0x1
b _0809C89A
.align 2, 0
_0809C888: .4byte gUnknown_3005008
_0809C888: .4byte gSaveBlock1Ptr
_0809C88C: .4byte 0x000030f6
_0809C890: .4byte 0x000030ec
_0809C894: .4byte 0x0000311c
@@ -214,12 +214,12 @@ sub_809C8A0: @ 809C8A0
bl IsEnigmaBerryValid
cmp r0, 0
beq _0809C8C4
ldr r0, _0809C8BC @ =gUnknown_3005008
ldr r0, _0809C8BC @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _0809C8C0 @ =0x000030ec
b _0809C8D8
.align 2, 0
_0809C8BC: .4byte gUnknown_3005008
_0809C8BC: .4byte gSaveBlock1Ptr
_0809C8C0: .4byte 0x000030ec
_0809C8C4:
subs r0, r4, 0x1
asm/berry_fix_program.s
+9 -9
View File
@@ -173,7 +173,7 @@ _0815F84C:
movs r0, 0x1
b _0815F9A4
_0815F856:
ldr r0, _0815F870 @ =gUnknown_30030F0
ldr r0, _0815F870 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -186,9 +186,9 @@ _0815F864:
movs r0, 0x2
b _0815F9A4
.align 2, 0
_0815F870: .4byte gUnknown_30030F0
_0815F870: .4byte gMain
_0815F874:
ldr r0, _0815F88C @ =gUnknown_30030F0
ldr r0, _0815F88C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -201,7 +201,7 @@ _0815F882:
movs r0, 0x4
b _0815F9A4
.align 2, 0
_0815F88C: .4byte gUnknown_30030F0
_0815F88C: .4byte gMain
_0815F890:
ldr r0, _0815F8B4 @ =gUnknown_3005EF0
ldr r1, _0815F8B8 @ =gMultiBootProgram_BerryGlitchFix_Start
@@ -305,7 +305,7 @@ _0815F96A:
movs r0, 0x8
b _0815F9A4
_0815F96E:
ldr r0, _0815F988 @ =gUnknown_30030F0
ldr r0, _0815F988 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -313,17 +313,17 @@ _0815F96E:
beq _0815F9A6
adds r0, r2, 0
bl DestroyTask
bl sub_80008D8
bl DoSoftReset
b _0815F9A6
.align 2, 0
_0815F988: .4byte gUnknown_30030F0
_0815F988: .4byte gMain
_0815F98C:
movs r0, 0x4
bl sub_815F6E0
movs r0, 0xA
b _0815F9A4
_0815F996:
ldr r0, _0815F9B0 @ =gUnknown_30030F0
ldr r0, _0815F9B0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -338,7 +338,7 @@ _0815F9A6:
pop {r0}
bx r0
.align 2, 0
_0815F9B0: .4byte gUnknown_30030F0
_0815F9B0: .4byte gMain
thumb_func_end sub_815F7F0
.align 2, 0 @ Don't pad with nop.
asm/berry_pouch.s
+22 -22
View File
@@ -144,7 +144,7 @@ _0813CE56:
sub_813CE5C: @ 813CE5C
push {r4,lr}
sub sp, 0x4
ldr r0, _0813CE7C @ =gUnknown_30030F0
ldr r0, _0813CE7C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -159,7 +159,7 @@ _0813CE70:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0813CE7C: .4byte gUnknown_30030F0
_0813CE7C: .4byte gMain
_0813CE80: .4byte _0813CE84
.align 2, 0
_0813CE84:
@@ -300,7 +300,7 @@ _0813CFBE:
movs r3, 0
bl BeginNormalPaletteFade
_0813CFD2:
ldr r1, _0813CFE4 @ =gUnknown_30030F0
ldr r1, _0813CFE4 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -309,7 +309,7 @@ _0813CFD2:
strb r0, [r1]
b _0813D000
.align 2, 0
_0813CFE4: .4byte gUnknown_30030F0
_0813CFE4: .4byte gMain
_0813CFE8:
ldr r0, _0813CFF8 @ =sub_813CE1C
bl SetVBlankCallback
@@ -482,7 +482,7 @@ _0813D14C:
movs r1, 0
movs r2, 0x60
bl LoadCompressedPalette
ldr r0, _0813D170 @ =gUnknown_300500C
ldr r0, _0813D170 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -494,7 +494,7 @@ _0813D14C:
b _0813D17E
.align 2, 0
_0813D16C: .4byte gUnknown_8E85BA4
_0813D170: .4byte gUnknown_300500C
_0813D170: .4byte gSaveBlock2Ptr
_0813D174: .4byte gUnknown_8E85BF4
_0813D178:
ldr r0, _0813D18C @ =gUnknown_84644A8
@@ -1695,7 +1695,7 @@ _0813DA9E:
subs r2, r4, 0x2
adds r1, r4, 0
bl get_coro_args_x18_x1A
ldr r0, _0813DAE4 @ =gUnknown_30030F0
ldr r0, _0813DAE4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x4
ands r0, r1
@@ -1716,7 +1716,7 @@ _0813DA9E:
_0813DAD8: .4byte gUnknown_3005098
_0813DADC: .4byte gUnknown_2037AB8
_0813DAE0: .4byte gUnknown_203F37A
_0813DAE4: .4byte gUnknown_30030F0
_0813DAE4: .4byte gMain
_0813DAE8: .4byte gUnknown_203AD30
_0813DAEC:
movs r0, 0x2
@@ -2352,7 +2352,7 @@ sub_813E010: @ 813E010
.align 2, 0
_0813E044: .4byte gUnknown_3005098
_0813E048:
ldr r0, _0813E08C @ =gUnknown_30030F0
ldr r0, _0813E08C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -2378,7 +2378,7 @@ _0813E048:
bl sub_813DF54
b _0813E0D4
.align 2, 0
_0813E08C: .4byte gUnknown_30030F0
_0813E08C: .4byte gMain
_0813E090:
movs r0, 0x2
ands r0, r1
@@ -2481,7 +2481,7 @@ sub_813E164: @ 813E164
lsls r0, 3
ldr r1, _0813E1EC @ =gUnknown_3005098
adds r5, r0, r1
ldr r0, _0813E1F0 @ =gUnknown_30030F0
ldr r0, _0813E1F0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -2531,7 +2531,7 @@ _0813E1E4:
bx r0
.align 2, 0
_0813E1EC: .4byte gUnknown_3005098
_0813E1F0: .4byte gUnknown_30030F0
_0813E1F0: .4byte gMain
_0813E1F4: .4byte gUnknown_203AD30
_0813E1F8: .4byte gUnknown_203F37A
_0813E1FC: .4byte gUnknown_3005E70
@@ -2611,7 +2611,7 @@ sub_813E290: @ 813E290
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0813E2B4 @ =gUnknown_30030F0
ldr r0, _0813E2B4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -2626,7 +2626,7 @@ _0813E2AE:
pop {r0}
bx r0
.align 2, 0
_0813E2B4: .4byte gUnknown_30030F0
_0813E2B4: .4byte gMain
thumb_func_end sub_813E290
thumb_func_start sub_813E2B8
@@ -3117,7 +3117,7 @@ sub_813E690: @ 813E690
.align 2, 0
_0813E6E0: .4byte gUnknown_3005098
_0813E6E4:
ldr r0, _0813E714 @ =gUnknown_30030F0
ldr r0, _0813E714 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3136,7 +3136,7 @@ _0813E6E4:
bl sub_813E4E4
b _0813E762
.align 2, 0
_0813E714: .4byte gUnknown_30030F0
_0813E714: .4byte gMain
_0813E718:
movs r0, 0x2
ands r0, r1
@@ -3251,7 +3251,7 @@ sub_813E7F0: @ 813E7F0
mov r2, r8
ldrh r1, [r2, 0x10]
bl sub_809A1D8
ldr r7, _0813E8C4 @ =gUnknown_3005008
ldr r7, _0813E8C4 @ =gSaveBlock1Ptr
ldr r4, [r7]
movs r3, 0xA4
lsls r3, 2
@@ -3320,7 +3320,7 @@ sub_813E7F0: @ 813E7F0
.align 2, 0
_0813E8BC: .4byte gUnknown_3005098
_0813E8C0: .4byte gUnknown_203AD30
_0813E8C4: .4byte gUnknown_3005008
_0813E8C4: .4byte gSaveBlock1Ptr
_0813E8C8: .4byte gUnknown_203F37A
_0813E8CC: .4byte gUnknown_3005E70
_0813E8D0: .4byte sub_813E8D4
@@ -3331,7 +3331,7 @@ sub_813E8D4: @ 813E8D4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0813E90C @ =gUnknown_30030F0
ldr r0, _0813E90C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3355,7 +3355,7 @@ _0813E906:
pop {r0}
bx r0
.align 2, 0
_0813E90C: .4byte gUnknown_30030F0
_0813E90C: .4byte gMain
thumb_func_end sub_813E8D4
thumb_func_start sub_813E910
@@ -3726,7 +3726,7 @@ sub_813EBD4: @ 813EBD4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _0813EC04 @ =gUnknown_3005008
ldr r0, _0813EC04 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xA4
lsls r1, 2
@@ -3741,7 +3741,7 @@ sub_813EBD4: @ 813EBD4
pop {r0}
bx r0
.align 2, 0
_0813EC04: .4byte gUnknown_3005008
_0813EC04: .4byte gSaveBlock1Ptr
thumb_func_end sub_813EBD4
thumb_func_start sub_813EC08
asm/bike.s
+2 -2
View File
@@ -90,7 +90,7 @@ sub_80BD100: @ 80BD100
bl sub_805A1DC
cmp r0, 0x1
bne _080BD176
ldr r0, _080BD164 @ =gUnknown_30030F0
ldr r0, _080BD164 @ =gMain
ldrh r1, [r0, 0x2C]
movs r2, 0x2
movs r0, 0x2
@@ -107,7 +107,7 @@ sub_80BD100: @ 80BD100
.align 2, 0
_080BD15C: .4byte gUnknown_2037078
_080BD160: .4byte gUnknown_2036E38
_080BD164: .4byte gUnknown_30030F0
_080BD164: .4byte gMain
_080BD168:
ldrb r0, [r6]
cmp r0, 0
asm/braille_text.s
+4 -4
View File
@@ -33,7 +33,7 @@ _0814F8A4:
.4byte _0814FC70
.4byte _0814FC82
_0814F8C0:
ldr r2, _0814F914 @ =gUnknown_30030F0
ldr r2, _0814F914 @ =gMain
ldrh r1, [r2, 0x2C]
movs r0, 0x3
ands r0, r1
@@ -78,7 +78,7 @@ _0814F904:
strb r0, [r6, 0x1E]
b _0814FB42
.align 2, 0
_0814F914: .4byte gUnknown_30030F0
_0814F914: .4byte gMain
_0814F918: .4byte gUnknown_3003E50
_0814F91C:
ldr r2, _0814F92C @ =gUnknown_3003E50
@@ -457,7 +457,7 @@ _0814FBFC:
cmp r2, 0
beq _0814FC6C
ldr r4, _0814FC30 @ =gUnknown_846FB08
ldr r5, _0814FC34 @ =gUnknown_300500C
ldr r5, _0814FC34 @ =gSaveBlock2Ptr
ldr r0, [r5]
ldrb r0, [r0, 0x14]
lsls r1, r0, 29
@@ -479,7 +479,7 @@ _0814FBFC:
b _0814FC62
.align 2, 0
_0814FC30: .4byte gUnknown_846FB08
_0814FC34: .4byte gUnknown_300500C
_0814FC34: .4byte gSaveBlock2Ptr
_0814FC38:
ldrb r0, [r6, 0x4]
lsrs r1, 29
asm/buy_menu_helpers.s
+2 -2
View File
@@ -54,7 +54,7 @@ _0813F6CC: .4byte gUnknown_846483C
thumb_func_start sub_813F6D0
sub_813F6D0: @ 813F6D0
push {lr}
ldr r0, _0813F6F0 @ =gUnknown_3005008
ldr r0, _0813F6F0 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xA4
lsls r1, 2
@@ -68,7 +68,7 @@ sub_813F6D0: @ 813F6D0
pop {r0}
bx r0
.align 2, 0
_0813F6F0: .4byte gUnknown_3005008
_0813F6F0: .4byte gSaveBlock1Ptr
thumb_func_end sub_813F6D0
thumb_func_start sub_813F6F4
asm/cable_club.s
+18 -18
View File
@@ -232,7 +232,7 @@ sub_80808F0: @ 80808F0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08080924 @ =gUnknown_30030F0
ldr r0, _08080924 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -255,7 +255,7 @@ sub_80808F0: @ 80808F0
movs r0, 0x1
b _08080936
.align 2, 0
_08080924: .4byte gUnknown_30030F0
_08080924: .4byte gMain
_08080928: .4byte gUnknown_202271A
_0808092C: .4byte gUnknown_3005090
_08080930: .4byte sub_8080FB4
@@ -279,7 +279,7 @@ sub_808093C: @ 808093C
movs r0, 0x1
bl SetSuppressLinkErrorMessage
_08080952:
ldr r0, _08080964 @ =gUnknown_30030F0
ldr r0, _08080964 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -288,7 +288,7 @@ _08080952:
movs r0, 0
b _0808097E
.align 2, 0
_08080964: .4byte gUnknown_30030F0
_08080964: .4byte gMain
_08080968:
ldr r1, _08080984 @ =gUnknown_202271A
movs r0, 0
@@ -545,7 +545,7 @@ sub_8080B20: @ 8080B20
adds r0, r4, 0
adds r1, r6, 0
bl sub_8080808
ldr r0, _08080BB8 @ =gUnknown_30030F0
ldr r0, _08080BB8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -580,7 +580,7 @@ _08080BA8:
bx r0
.align 2, 0
_08080BB4: .4byte gUnknown_3005098
_08080BB8: .4byte gUnknown_30030F0
_08080BB8: .4byte gMain
_08080BBC: .4byte gUnknown_2021CD0
_08080BC0: .4byte gUnknown_81BC50D
_08080BC4: .4byte sub_8080BC8
@@ -615,7 +615,7 @@ sub_8080BC8: @ 8080BC8
lsls r0, 24
cmp r4, r0
bne _08080C16
ldr r0, _08080C2C @ =gUnknown_30030F0
ldr r0, _08080C2C @ =gMain
ldrh r1, [r0, 0x2C]
movs r0, 0x2
ands r0, r1
@@ -633,7 +633,7 @@ _08080C16:
str r1, [r0]
b _08080C5C
.align 2, 0
_08080C2C: .4byte gUnknown_30030F0
_08080C2C: .4byte gMain
_08080C30: .4byte gUnknown_81BC4CE
_08080C34: .4byte gUnknown_3005090
_08080C38: .4byte sub_8080AD0
@@ -1639,7 +1639,7 @@ _0808141A:
strh r0, [r1]
ldr r0, _08081448 @ =sub_800FD9C
bl SetMainCallback2
ldr r1, _0808144C @ =gUnknown_30030F0
ldr r1, _0808144C @ =gMain
ldr r0, _08081450 @ =sub_8081668
str r0, [r1, 0x8]
adds r0, r5, 0
@@ -1652,7 +1652,7 @@ _0808143A:
_08081440: .4byte gUnknown_2022B4C
_08081444: .4byte gUnknown_20386AE
_08081448: .4byte sub_800FD9C
_0808144C: .4byte gUnknown_30030F0
_0808144C: .4byte gMain
_08081450: .4byte sub_8081668
thumb_func_end sub_8081318
@@ -1862,7 +1862,7 @@ _080815EA:
strh r0, [r1]
ldr r0, _08081618 @ =sub_800FD9C
bl SetMainCallback2
ldr r1, _0808161C @ =gUnknown_30030F0
ldr r1, _0808161C @ =gMain
ldr r0, _08081620 @ =sub_8081668
str r0, [r1, 0x8]
adds r0, r4, 0
@@ -1875,14 +1875,14 @@ _0808160A:
_08081610: .4byte gUnknown_2022B4C
_08081614: .4byte gUnknown_20386AE
_08081618: .4byte sub_800FD9C
_0808161C: .4byte gUnknown_30030F0
_0808161C: .4byte gMain
_08081620: .4byte sub_8081668
thumb_func_end sub_8081454
thumb_func_start sub_8081624
sub_8081624: @ 8081624
push {r4,lr}
ldr r0, _0808163C @ =gUnknown_30030F0
ldr r0, _0808163C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r4, r0, r1
@@ -1893,7 +1893,7 @@ sub_8081624: @ 8081624
beq _0808164C
b _0808165C
.align 2, 0
_0808163C: .4byte gUnknown_30030F0
_0808163C: .4byte gMain
_08081640:
bl sub_800AAC0
ldrb r0, [r4]
@@ -1989,15 +1989,15 @@ _0808170A:
bl InUnionRoom
cmp r0, 0x1
bne _08081724
ldr r1, _0808171C @ =gUnknown_30030F0
ldr r1, _0808171C @ =gMain
ldr r0, _08081720 @ =sub_8081624
b _08081728
.align 2, 0
_08081718: .4byte gUnknown_202273C
_0808171C: .4byte gUnknown_30030F0
_0808171C: .4byte gMain
_08081720: .4byte sub_8081624
_08081724:
ldr r1, _08081738 @ =gUnknown_30030F0
ldr r1, _08081738 @ =gMain
ldr r0, _0808173C @ =c2_8056854
_08081728:
str r0, [r1, 0x8]
@@ -2007,7 +2007,7 @@ _08081728:
pop {r0}
bx r0
.align 2, 0
_08081738: .4byte gUnknown_30030F0
_08081738: .4byte gMain
_0808173C: .4byte c2_8056854
_08081740: .4byte sub_806FB7C
thumb_func_end sub_8081668
asm/cereader_tool.s
+2 -2
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_815D654
sub_815D654: @ 815D654
push {lr}
ldr r0, _0815D674 @ =gUnknown_3005008
ldr r0, _0815D674 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _0815D678 @ =0x00003d41
adds r0, r1
@@ -23,7 +23,7 @@ sub_815D654: @ 815D654
pop {r1}
bx r1
.align 2, 0
_0815D674: .4byte gUnknown_3005008
_0815D674: .4byte gSaveBlock1Ptr
_0815D678: .4byte 0x00003d41
thumb_func_end sub_815D654
asm/clear_save_data_screen.s
+1 -1
View File
@@ -311,7 +311,7 @@ _080F57D4:
ldr r0, [r5]
bl Free
str r4, [r5]
bl sub_80008D8
bl DoSoftReset
_080F57FE:
add sp, 0x4
pop {r4-r6}
asm/coins.s
+8 -8
View File
@@ -7,12 +7,12 @@
thumb_func_start sub_80D0554
sub_80D0554: @ 80D0554
ldr r0, _080D0574 @ =gUnknown_3005008
ldr r0, _080D0574 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0xA5
lsls r0, 2
adds r1, r0
ldr r0, _080D0578 @ =gUnknown_300500C
ldr r0, _080D0578 @ =gSaveBlock2Ptr
ldr r0, [r0]
movs r2, 0xF2
lsls r2, 4
@@ -24,17 +24,17 @@ sub_80D0554: @ 80D0554
lsrs r0, 16
bx lr
.align 2, 0
_080D0574: .4byte gUnknown_3005008
_080D0578: .4byte gUnknown_300500C
_080D0574: .4byte gSaveBlock1Ptr
_080D0578: .4byte gSaveBlock2Ptr
thumb_func_end sub_80D0554
thumb_func_start sub_80D057C
sub_80D057C: @ 80D057C
lsls r0, 16
lsrs r0, 16
ldr r1, _080D059C @ =gUnknown_3005008
ldr r1, _080D059C @ =gSaveBlock1Ptr
ldr r2, [r1]
ldr r1, _080D05A0 @ =gUnknown_300500C
ldr r1, _080D05A0 @ =gSaveBlock2Ptr
ldr r1, [r1]
movs r3, 0xF2
lsls r3, 4
@@ -47,8 +47,8 @@ sub_80D057C: @ 80D057C
strh r0, [r2]
bx lr
.align 2, 0
_080D059C: .4byte gUnknown_3005008
_080D05A0: .4byte gUnknown_300500C
_080D059C: .4byte gSaveBlock1Ptr
_080D05A0: .4byte gSaveBlock2Ptr
thumb_func_end sub_80D057C
thumb_func_start sub_80D05A4
asm/credits.s
+4 -4
View File
@@ -909,7 +909,7 @@ _080F410A:
.align 2, 0
_080F4114: .4byte gUnknown_203AB40
_080F4118:
ldr r0, _080F4140 @ =gUnknown_30030F0
ldr r0, _080F4140 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -930,7 +930,7 @@ _080F413C:
strb r0, [r1]
b _080F3D06
.align 2, 0
_080F4140: .4byte gUnknown_30030F0
_080F4140: .4byte gMain
_080F4144: .4byte 0x00007fff
_080F4148: .4byte gUnknown_203AB40
_080F414C:
@@ -1966,7 +1966,7 @@ _080F49A8:
_080F49D0: .4byte gUnknown_841431C
_080F49D4: .4byte 0x0000ffff
_080F49D8:
ldr r0, _080F4A0C @ =gUnknown_300500C
ldr r0, _080F4A0C @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -1991,7 +1991,7 @@ _080F49D8:
ldr r0, _080F4A1C @ =gUnknown_8410E10
b _080F4A36
.align 2, 0
_080F4A0C: .4byte gUnknown_300500C
_080F4A0C: .4byte gSaveBlock2Ptr
_080F4A10: .4byte gUnknown_8410E30
_080F4A14: .4byte 0xffff0000
_080F4A18: .4byte 0x0000ffff
asm/daycare.s
+48 -48
View File
@@ -168,7 +168,7 @@ StorePokemonInDaycare: @ 80454CC
beq _08045524
adds r0, r4, 0
adds r0, 0x74
ldr r1, _08045550 @ =gUnknown_300500C
ldr r1, _08045550 @ =gSaveBlock2Ptr
ldr r1, [r1]
bl StringCopy
adds r1, r4, 0
@@ -180,7 +180,7 @@ StorePokemonInDaycare: @ 80454CC
bl GetMonData
lsls r0, 24
lsrs r0, 24
ldr r1, _08045554 @ =gUnknown_3005008
ldr r1, _08045554 @ =gSaveBlock1Ptr
ldr r1, [r1]
lsls r2, r0, 3
adds r2, r0
@@ -217,8 +217,8 @@ _08045524:
pop {r0}
bx r0
.align 2, 0
_08045550: .4byte gUnknown_300500C
_08045554: .4byte gUnknown_3005008
_08045550: .4byte gSaveBlock2Ptr
_08045554: .4byte gSaveBlock1Ptr
_08045558: .4byte 0x00002cd0
thumb_func_end StorePokemonInDaycare
@@ -252,7 +252,7 @@ StoreSelectedPokemonInDaycare: @ 8045580
muls r0, r1
ldr r1, _080455A4 @ =gUnknown_2024284
adds r0, r1
ldr r1, _080455A8 @ =gUnknown_3005008
ldr r1, _080455A8 @ =gSaveBlock1Ptr
ldr r1, [r1]
movs r2, 0xBE
lsls r2, 6
@@ -262,7 +262,7 @@ StoreSelectedPokemonInDaycare: @ 8045580
bx r0
.align 2, 0
_080455A4: .4byte gUnknown_2024284
_080455A8: .4byte gUnknown_3005008
_080455A8: .4byte gSaveBlock1Ptr
thumb_func_end StoreSelectedPokemonInDaycare
thumb_func_start ShiftDaycareSlots
@@ -453,7 +453,7 @@ TakeSelectedPokemonMonFromDaycareShiftSlots: @ 8045700
thumb_func_start TakePokemonFromDaycare
TakePokemonFromDaycare: @ 8045728
push {lr}
ldr r0, _08045744 @ =gUnknown_3005008
ldr r0, _08045744 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
@@ -466,7 +466,7 @@ TakePokemonFromDaycare: @ 8045728
pop {r1}
bx r1
.align 2, 0
_08045744: .4byte gUnknown_3005008
_08045744: .4byte gSaveBlock1Ptr
_08045748: .4byte gUnknown_20370C0
thumb_func_end TakePokemonFromDaycare
@@ -593,7 +593,7 @@ GetDaycareCostForMon: @ 8045820
thumb_func_start GetDaycareCost
GetDaycareCost: @ 8045838
push {lr}
ldr r0, _08045854 @ =gUnknown_3005008
ldr r0, _08045854 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
@@ -606,7 +606,7 @@ GetDaycareCost: @ 8045838
pop {r0}
bx r0
.align 2, 0
_08045854: .4byte gUnknown_3005008
_08045854: .4byte gSaveBlock1Ptr
_08045858: .4byte gUnknown_20370C0
_0804585C: .4byte gUnknown_20370C2
thumb_func_end GetDaycareCost
@@ -615,7 +615,7 @@ _0804585C: .4byte gUnknown_20370C2
sub_8045860: @ 8045860
lsls r0, 16
lsrs r0, 16
ldr r1, _08045888 @ =gUnknown_3005008
ldr r1, _08045888 @ =gSaveBlock1Ptr
ldr r2, [r1]
ldr r1, _0804588C @ =0x00003008
adds r3, r2, r1
@@ -634,7 +634,7 @@ sub_8045860: @ 8045860
str r1, [r2]
bx lr
.align 2, 0
_08045888: .4byte gUnknown_3005008
_08045888: .4byte gSaveBlock1Ptr
_0804588C: .4byte 0x00003008
_08045890: .4byte 0x00003094
_08045894: .4byte 0x00003d20
@@ -643,7 +643,7 @@ _08045894: .4byte 0x00003d20
thumb_func_start GetNumLevelsGainedFromDaycare
GetNumLevelsGainedFromDaycare: @ 8045898
push {r4-r6,lr}
ldr r6, _080458C0 @ =gUnknown_3005008
ldr r6, _080458C0 @ =gSaveBlock1Ptr
ldr r5, _080458C4 @ =gUnknown_20370C0
ldrh r0, [r5]
movs r4, 0x8C
@@ -661,7 +661,7 @@ GetNumLevelsGainedFromDaycare: @ 8045898
movs r0, 0
b _080458E0
.align 2, 0
_080458C0: .4byte gUnknown_3005008
_080458C0: .4byte gSaveBlock1Ptr
_080458C4: .4byte gUnknown_20370C0
_080458C8:
ldrh r0, [r5]
@@ -879,7 +879,7 @@ _08045A44: .4byte 0x00000266
thumb_func_start sub_8045A48
sub_8045A48: @ 8045A48
push {lr}
ldr r0, _08045A5C @ =gUnknown_3005008
ldr r0, _08045A5C @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
@@ -888,13 +888,13 @@ sub_8045A48: @ 8045A48
pop {r0}
bx r0
.align 2, 0
_08045A5C: .4byte gUnknown_3005008
_08045A5C: .4byte gSaveBlock1Ptr
thumb_func_end sub_8045A48
thumb_func_start sub_8045A60
sub_8045A60: @ 8045A60
push {lr}
ldr r0, _08045A74 @ =gUnknown_3005008
ldr r0, _08045A74 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
@@ -903,7 +903,7 @@ sub_8045A60: @ 8045A60
pop {r0}
bx r0
.align 2, 0
_08045A74: .4byte gUnknown_3005008
_08045A74: .4byte gSaveBlock1Ptr
thumb_func_end sub_8045A60
thumb_func_start RemoveIVIndexFromList
@@ -1570,7 +1570,7 @@ RemoveEggFromDayCare: @ 8045F70
thumb_func_start RejectEggFromDayCare
RejectEggFromDayCare: @ 8045F88
push {lr}
ldr r0, _08045F9C @ =gUnknown_3005008
ldr r0, _08045F9C @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
@@ -1579,7 +1579,7 @@ RejectEggFromDayCare: @ 8045F88
pop {r0}
bx r0
.align 2, 0
_08045F9C: .4byte gUnknown_3005008
_08045F9C: .4byte gSaveBlock1Ptr
thumb_func_end RejectEggFromDayCare
thumb_func_start sub_8045FA0
@@ -1972,7 +1972,7 @@ _080462A8: .4byte gUnknown_8254795
thumb_func_start GiveEggFromDaycare
GiveEggFromDaycare: @ 80462AC
push {lr}
ldr r0, _080462C0 @ =gUnknown_3005008
ldr r0, _080462C0 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
@@ -1981,7 +1981,7 @@ GiveEggFromDaycare: @ 80462AC
pop {r0}
bx r0
.align 2, 0
_080462C0: .4byte gUnknown_3005008
_080462C0: .4byte gSaveBlock1Ptr
thumb_func_end GiveEggFromDaycare
thumb_func_start sub_80462C4
@@ -2111,7 +2111,7 @@ _080463B4: .4byte gUnknown_2024029
thumb_func_start sub_80463B8
sub_80463B8: @ 80463B8
push {r4,lr}
ldr r4, _080463F0 @ =gUnknown_3005008
ldr r4, _080463F0 @ =gSaveBlock1Ptr
ldr r0, [r4]
ldr r1, _080463F4 @ =0x00003c98
adds r0, r1
@@ -2137,7 +2137,7 @@ _080463D8:
pop {r1}
bx r1
.align 2, 0
_080463F0: .4byte gUnknown_3005008
_080463F0: .4byte gSaveBlock1Ptr
_080463F4: .4byte 0x00003c98
_080463F8: .4byte 0x00003d20
thumb_func_end sub_80463B8
@@ -2226,7 +2226,7 @@ _08046498: .4byte gUnknown_2021CD0
thumb_func_start GetDaycareMonNicknames
GetDaycareMonNicknames: @ 804649C
push {lr}
ldr r0, _080464B0 @ =gUnknown_3005008
ldr r0, _080464B0 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
@@ -2235,13 +2235,13 @@ GetDaycareMonNicknames: @ 804649C
pop {r0}
bx r0
.align 2, 0
_080464B0: .4byte gUnknown_3005008
_080464B0: .4byte gSaveBlock1Ptr
thumb_func_end GetDaycareMonNicknames
thumb_func_start sub_80464B4
sub_80464B4: @ 80464B4
push {r4,lr}
ldr r4, _080464D0 @ =gUnknown_3005008
ldr r4, _080464D0 @ =gSaveBlock1Ptr
ldr r0, [r4]
movs r1, 0xBE
lsls r1, 6
@@ -2253,7 +2253,7 @@ sub_80464B4: @ 80464B4
movs r0, 0x1
b _080464F2
.align 2, 0
_080464D0: .4byte gUnknown_3005008
_080464D0: .4byte gSaveBlock1Ptr
_080464D4:
ldr r0, [r4]
movs r1, 0xBE
@@ -2279,7 +2279,7 @@ _080464F2:
thumb_func_start GetDaycarePokemonCount
GetDaycarePokemonCount: @ 80464F8
push {lr}
ldr r0, _08046518 @ =gUnknown_3005008
ldr r0, _08046518 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
@@ -2294,7 +2294,7 @@ _08046512:
pop {r1}
bx r1
.align 2, 0
_08046518: .4byte gUnknown_3005008
_08046518: .4byte gSaveBlock1Ptr
thumb_func_end GetDaycarePokemonCount
thumb_func_start EggGroupsOverlap
@@ -2484,7 +2484,7 @@ _0804665C:
thumb_func_start GetDaycareCompatibilityScoreFromSave
GetDaycareCompatibilityScoreFromSave: @ 804666C
push {lr}
ldr r0, _08046684 @ =gUnknown_3005008
ldr r0, _08046684 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
@@ -2495,7 +2495,7 @@ GetDaycareCompatibilityScoreFromSave: @ 804666C
pop {r1}
bx r1
.align 2, 0
_08046684: .4byte gUnknown_3005008
_08046684: .4byte gSaveBlock1Ptr
thumb_func_end GetDaycareCompatibilityScoreFromSave
thumb_func_start SetDaycareCompatibilityString
@@ -2934,7 +2934,7 @@ DaycarePrintMonInfo: @ 80469B4
lsrs r5, r2, 24
cmp r6, 0x1
bhi _080469EE
ldr r0, _080469F8 @ =gUnknown_3005008
ldr r0, _080469F8 @ =gSaveBlock1Ptr
mov r8, r0
ldr r0, [r0]
movs r4, 0xBE
@@ -2958,7 +2958,7 @@ _080469EE:
pop {r0}
bx r0
.align 2, 0
_080469F8: .4byte gUnknown_3005008
_080469F8: .4byte gSaveBlock1Ptr
thumb_func_end DaycarePrintMonInfo
thumb_func_start Task_HandleDaycareLevelMenuInput
@@ -2975,7 +2975,7 @@ Task_HandleDaycareLevelMenuInput: @ 80469FC
ldrb r0, [r4, 0x8]
bl ListMenuHandleInput
adds r1, r0, 0
ldr r0, _08046A30 @ =gUnknown_30030F0
ldr r0, _08046A30 @ =gMain
ldrh r2, [r0, 0x2E]
movs r0, 0x1
ands r0, r2
@@ -2988,7 +2988,7 @@ Task_HandleDaycareLevelMenuInput: @ 80469FC
b _08046A46
.align 2, 0
_08046A2C: .4byte gUnknown_3005090
_08046A30: .4byte gUnknown_30030F0
_08046A30: .4byte gMain
_08046A34:
ldr r0, _08046A3C @ =gUnknown_20370D0
strh r1, [r0]
@@ -3105,13 +3105,13 @@ _08046B24: .4byte gUnknown_3005090
ChooseSendDaycareMon: @ 8046B28
push {lr}
bl sub_8128370
ldr r1, _08046B38 @ =gUnknown_30030F0
ldr r1, _08046B38 @ =gMain
ldr r0, _08046B3C @ =c2_exit_to_overworld_2_switch
str r0, [r1, 0x8]
pop {r0}
bx r0
.align 2, 0
_08046B38: .4byte gUnknown_30030F0
_08046B38: .4byte gMain
_08046B3C: .4byte c2_exit_to_overworld_2_switch
thumb_func_end ChooseSendDaycareMon
@@ -3125,7 +3125,7 @@ sub_8046B40: @ 8046B40
muls r0, r1
ldr r1, _08046B64 @ =gUnknown_2024284
adds r0, r1
ldr r1, _08046B68 @ =gUnknown_3005008
ldr r1, _08046B68 @ =gSaveBlock1Ptr
ldr r1, [r1]
ldr r2, _08046B6C @ =0x00003c98
adds r1, r2
@@ -3134,14 +3134,14 @@ sub_8046B40: @ 8046B40
bx r0
.align 2, 0
_08046B64: .4byte gUnknown_2024284
_08046B68: .4byte gUnknown_3005008
_08046B68: .4byte gSaveBlock1Ptr
_08046B6C: .4byte 0x00003c98
thumb_func_end sub_8046B40
thumb_func_start sub_8046B70
sub_8046B70: @ 8046B70
push {lr}
ldr r0, _08046B88 @ =gUnknown_3005008
ldr r0, _08046B88 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08046B8C @ =0x00003c98
adds r0, r1
@@ -3151,7 +3151,7 @@ sub_8046B70: @ 8046B70
pop {r0}
bx r0
.align 2, 0
_08046B88: .4byte gUnknown_3005008
_08046B88: .4byte gSaveBlock1Ptr
_08046B8C: .4byte 0x00003c98
_08046B90: .4byte gUnknown_20370C2
thumb_func_end sub_8046B70
@@ -3159,7 +3159,7 @@ _08046B90: .4byte gUnknown_20370C2
thumb_func_start sub_8046B94
sub_8046B94: @ 8046B94
push {lr}
ldr r0, _08046BAC @ =gUnknown_3005008
ldr r0, _08046BAC @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08046BB0 @ =0x00003c98
adds r0, r1
@@ -3170,7 +3170,7 @@ sub_8046B94: @ 8046B94
movs r0, 0
b _08046BB6
.align 2, 0
_08046BAC: .4byte gUnknown_3005008
_08046BAC: .4byte gSaveBlock1Ptr
_08046BB0: .4byte 0x00003c98
_08046BB4:
movs r0, 0x1
@@ -3182,7 +3182,7 @@ _08046BB6:
thumb_func_start sub_8046BBC
sub_8046BBC: @ 8046BBC
push {lr}
ldr r0, _08046BD4 @ =gUnknown_3005008
ldr r0, _08046BD4 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08046BD8 @ =0x00003c98
adds r0, r1
@@ -3192,14 +3192,14 @@ sub_8046BBC: @ 8046BBC
pop {r1}
bx r1
.align 2, 0
_08046BD4: .4byte gUnknown_3005008
_08046BD4: .4byte gSaveBlock1Ptr
_08046BD8: .4byte 0x00003c98
thumb_func_end sub_8046BBC
thumb_func_start sub_8046BDC
sub_8046BDC: @ 8046BDC
push {lr}
ldr r0, _08046BF4 @ =gUnknown_3005008
ldr r0, _08046BF4 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08046BF8 @ =0x00003c98
adds r0, r1
@@ -3209,7 +3209,7 @@ sub_8046BDC: @ 8046BDC
pop {r1}
bx r1
.align 2, 0
_08046BF4: .4byte gUnknown_3005008
_08046BF4: .4byte gSaveBlock1Ptr
_08046BF8: .4byte 0x00003c98
thumb_func_end sub_8046BDC
asm/diploma.s
+4 -4
View File
@@ -210,7 +210,7 @@ _080F4D9A:
beq _080F4DD6
b _080F4DC2
_080F4DA8:
ldr r0, _080F4DCC @ =gUnknown_30030F0
ldr r0, _080F4DCC @ =gMain
ldrh r0, [r0, 0x2E]
ands r1, r0
cmp r1, 0
@@ -229,7 +229,7 @@ _080F4DC2:
strb r0, [r1]
b _080F4DD6
.align 2, 0
_080F4DCC: .4byte gUnknown_30030F0
_080F4DCC: .4byte gMain
_080F4DD0:
adds r0, r2, 0
bl sub_80F4DE0
@@ -514,7 +514,7 @@ sub_80F5018: @ 80F5018
push {r4-r6,lr}
sub sp, 0xAC
bl UnkTextUtil_Reset
ldr r0, _080F5040 @ =gUnknown_300500C
ldr r0, _080F5040 @ =gSaveBlock2Ptr
ldr r1, [r0]
movs r0, 0
bl UnkTextUtil_SetPtrI
@@ -527,7 +527,7 @@ sub_80F5018: @ 80F5018
bl UnkTextUtil_SetPtrI
b _080F5050
.align 2, 0
_080F5040: .4byte gUnknown_300500C
_080F5040: .4byte gSaveBlock2Ptr
_080F5044: .4byte gUnknown_841B68F
_080F5048:
ldr r1, _080F50E0 @ =gUnknown_841B698
asm/easy_chat.s
+18 -18
View File
@@ -513,17 +513,17 @@ _080BDA94:
beq _080BDAEC
b _080BDB08
_080BDA9E:
ldr r0, _080BDAAC @ =gUnknown_3005008
ldr r0, _080BDAAC @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _080BDAB0 @ =0x00002ca0
adds r5, r0, r1
movs r2, 0x2
b _080BDAF6
.align 2, 0
_080BDAAC: .4byte gUnknown_3005008
_080BDAAC: .4byte gSaveBlock1Ptr
_080BDAB0: .4byte 0x00002ca0
_080BDAB4:
ldr r0, _080BDAD4 @ =gUnknown_3005008
ldr r0, _080BDAD4 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _080BDAD8 @ =0x00002cac
adds r5, r0, r1
@@ -539,18 +539,18 @@ _080BDAB4:
movs r3, 0x3
b _080BDAF8
.align 2, 0
_080BDAD4: .4byte gUnknown_3005008
_080BDAD4: .4byte gSaveBlock1Ptr
_080BDAD8: .4byte 0x00002cac
_080BDADC:
ldr r0, _080BDAE4 @ =gUnknown_3005008
ldr r0, _080BDAE4 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _080BDAE8 @ =0x00002cb8
b _080BDAF2
.align 2, 0
_080BDAE4: .4byte gUnknown_3005008
_080BDAE4: .4byte gSaveBlock1Ptr
_080BDAE8: .4byte 0x00002cb8
_080BDAEC:
ldr r0, _080BDB10 @ =gUnknown_3005008
ldr r0, _080BDB10 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _080BDB14 @ =0x00002cc4
_080BDAF2:
@@ -571,7 +571,7 @@ _080BDB08:
pop {r0}
bx r0
.align 2, 0
_080BDB10: .4byte gUnknown_3005008
_080BDB10: .4byte gSaveBlock1Ptr
_080BDB14: .4byte 0x00002cc4
_080BDB18: .4byte gUnknown_2021D18
thumb_func_end sub_80BDA7C
@@ -607,7 +607,7 @@ sub_80BDB48: @ 80BDB48
lsls r1, 19
ands r1, r0
lsrs r1, 24
ldr r0, _080BDB68 @ =gUnknown_3005008
ldr r0, _080BDB68 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r3, _080BDB6C @ =0x00002f10
adds r0, r3
@@ -618,7 +618,7 @@ sub_80BDB48: @ 80BDB48
ands r0, r1
bx lr
.align 2, 0
_080BDB68: .4byte gUnknown_3005008
_080BDB68: .4byte gSaveBlock1Ptr
_080BDB6C: .4byte 0x00002f10
thumb_func_end sub_80BDB48
@@ -632,7 +632,7 @@ sub_80BDB70: @ 80BDB70
lsrs r3, r0, 27
movs r2, 0x7
ands r2, r1
ldr r0, _080BDB98 @ =gUnknown_3005008
ldr r0, _080BDB98 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, _080BDB9C @ =0x00002f10
adds r1, r0
@@ -646,7 +646,7 @@ _080BDB94:
pop {r0}
bx r0
.align 2, 0
_080BDB98: .4byte gUnknown_3005008
_080BDB98: .4byte gSaveBlock1Ptr
_080BDB9C: .4byte 0x00002f10
thumb_func_end sub_80BDB70
@@ -872,7 +872,7 @@ _080BDD30: .4byte 0x0000ffff
sub_80BDD34: @ 80BDD34
push {r4-r7,lr}
movs r4, 0
ldr r5, _080BDE00 @ =gUnknown_3005008
ldr r5, _080BDE00 @ =gSaveBlock1Ptr
ldr r3, _080BDE04 @ =0x00002ca0
ldr r2, _080BDE08 @ =gUnknown_83EDFF0
_080BDD3E:
@@ -889,7 +889,7 @@ _080BDD3E:
cmp r4, 0x3
bls _080BDD3E
movs r4, 0
ldr r5, _080BDE00 @ =gUnknown_3005008
ldr r5, _080BDE00 @ =gSaveBlock1Ptr
ldr r3, _080BDE0C @ =0x00002cac
ldr r2, _080BDE10 @ =gUnknown_83EDFF8
_080BDD5E:
@@ -906,7 +906,7 @@ _080BDD5E:
cmp r4, 0x5
bls _080BDD5E
movs r4, 0
ldr r0, _080BDE00 @ =gUnknown_3005008
ldr r0, _080BDE00 @ =gSaveBlock1Ptr
mov r12, r0
ldr r7, _080BDE14 @ =0x00002cb8
ldr r0, _080BDE18 @ =0x0000ffff
@@ -932,7 +932,7 @@ _080BDD84:
cmp r4, 0x5
bls _080BDD84
movs r4, 0
ldr r7, _080BDE00 @ =gUnknown_3005008
ldr r7, _080BDE00 @ =gSaveBlock1Ptr
ldr r6, _080BDE20 @ =0x00002cd0
ldr r0, _080BDE18 @ =0x0000ffff
adds r5, r0, 0
@@ -961,7 +961,7 @@ _080BDDBA:
cmp r4, 0xF
bls _080BDDB2
movs r4, 0
ldr r3, _080BDE00 @ =gUnknown_3005008
ldr r3, _080BDE00 @ =gSaveBlock1Ptr
ldr r2, _080BDE24 @ =0x00002f10
movs r1, 0
_080BDDE6:
@@ -978,7 +978,7 @@ _080BDDE6:
pop {r0}
bx r0
.align 2, 0
_080BDE00: .4byte gUnknown_3005008
_080BDE00: .4byte gSaveBlock1Ptr
_080BDE04: .4byte 0x00002ca0
_080BDE08: .4byte gUnknown_83EDFF0
_080BDE0C: .4byte 0x00002cac
asm/egg_hatch.s
+8 -8
View File
@@ -292,7 +292,7 @@ sub_8046E34: @ 8046E34
adds r4, 0x74
cmp r0, 0
bne _08046E74
ldr r0, _08046E90 @ =gUnknown_300500C
ldr r0, _08046E90 @ =gSaveBlock2Ptr
ldr r0, [r0]
adds r1, r4, 0
bl StringCompare
@@ -311,7 +311,7 @@ _08046E74:
movs r0, 0x1
b _08046EA2
.align 2, 0
_08046E90: .4byte gUnknown_300500C
_08046E90: .4byte gSaveBlock2Ptr
_08046E94: .4byte gUnknown_2021CD0
_08046E98: .4byte gUnknown_2021CF0
_08046E9C: .4byte gUnknown_2021D04
@@ -327,7 +327,7 @@ _08046EA2:
thumb_func_start sub_8046EAC
sub_8046EAC: @ 8046EAC
push {lr}
ldr r0, _08046EC8 @ =gUnknown_3005008
ldr r0, _08046EC8 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
@@ -340,7 +340,7 @@ sub_8046EAC: @ 8046EAC
pop {r1}
bx r1
.align 2, 0
_08046EC8: .4byte gUnknown_3005008
_08046EC8: .4byte gSaveBlock1Ptr
_08046ECC: .4byte gUnknown_20370C0
thumb_func_end sub_8046EAC
@@ -528,7 +528,7 @@ _08047040: .4byte sub_807DD24
CB2_EggHatch_0: @ 8047044
push {r4,lr}
sub sp, 0x4
ldr r0, _08047064 @ =gUnknown_30030F0
ldr r0, _08047064 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -543,7 +543,7 @@ _08047058:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08047064: .4byte gUnknown_30030F0
_08047064: .4byte gMain
_08047068: .4byte _0804706C
.align 2, 0
_0804706C:
@@ -732,7 +732,7 @@ _08047214:
movs r0, 0x1
bl CopyBgTilemapBufferToVram
_0804724A:
ldr r1, _08047268 @ =gUnknown_30030F0
ldr r1, _08047268 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -744,7 +744,7 @@ _0804724A:
_0804725C: .4byte gUnknown_8EAEA20
_08047260: .4byte gUnknown_8EAEA80
_08047264: .4byte gUnknown_826601C
_08047268: .4byte gUnknown_30030F0
_08047268: .4byte gMain
_0804726C:
ldr r0, _08047298 @ =sub_8047338
bl SetMainCallback2
asm/event_data.s
+26 -26
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_806E0D0
sub_806E0D0: @ 806E0D0
push {r4,lr}
ldr r4, _0806E108 @ =gUnknown_3005008
ldr r4, _0806E108 @ =gSaveBlock1Ptr
ldr r0, [r4]
movs r1, 0xEE
lsls r1, 4
@@ -33,14 +33,14 @@ sub_806E0D0: @ 806E0D0
pop {r0}
bx r0
.align 2, 0
_0806E108: .4byte gUnknown_3005008
_0806E108: .4byte gSaveBlock1Ptr
_0806E10C: .4byte gUnknown_20370E0
thumb_func_end sub_806E0D0
thumb_func_start sub_806E110
sub_806E110: @ 806E110
push {lr}
ldr r0, _0806E150 @ =gUnknown_3005008
ldr r0, _0806E150 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xEE
lsls r1, 4
@@ -66,7 +66,7 @@ sub_806E110: @ 806E110
pop {r0}
bx r0
.align 2, 0
_0806E150: .4byte gUnknown_3005008
_0806E150: .4byte gSaveBlock1Ptr
_0806E154: .4byte 0x00000803
_0806E158: .4byte 0x00000804
_0806E15C: .4byte 0x00000805
@@ -79,7 +79,7 @@ sub_806E168: @ 806E168
push {lr}
ldr r0, _0806E184 @ =0x0000403c
bl sub_806E454
ldr r1, _0806E188 @ =gUnknown_300500C
ldr r1, _0806E188 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0
strb r1, [r2, 0x1A]
@@ -90,7 +90,7 @@ sub_806E168: @ 806E168
bx r0
.align 2, 0
_0806E184: .4byte 0x0000403c
_0806E188: .4byte gUnknown_300500C
_0806E188: .4byte gSaveBlock2Ptr
_0806E18C: .4byte 0x00000838
thumb_func_end sub_806E168
@@ -99,7 +99,7 @@ sub_806E190: @ 806E190
push {lr}
ldr r0, _0806E1B0 @ =0x0000403c
bl sub_806E454
ldr r1, _0806E1B4 @ =gUnknown_300500C
ldr r1, _0806E1B4 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0xDA
strb r1, [r2, 0x1A]
@@ -112,7 +112,7 @@ sub_806E190: @ 806E190
bx r0
.align 2, 0
_0806E1B0: .4byte 0x0000403c
_0806E1B4: .4byte gUnknown_300500C
_0806E1B4: .4byte gSaveBlock2Ptr
_0806E1B8: .4byte 0x00000302
_0806E1BC: .4byte 0x00000838
thumb_func_end sub_806E190
@@ -120,7 +120,7 @@ _0806E1BC: .4byte 0x00000838
thumb_func_start sub_806E1C0
sub_806E1C0: @ 806E1C0
push {lr}
ldr r0, _0806E1EC @ =gUnknown_300500C
ldr r0, _0806E1EC @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x1A]
cmp r0, 0xDA
@@ -139,7 +139,7 @@ sub_806E1C0: @ 806E1C0
movs r0, 0x1
b _0806E1FE
.align 2, 0
_0806E1EC: .4byte gUnknown_300500C
_0806E1EC: .4byte gSaveBlock2Ptr
_0806E1F0: .4byte 0x0000403c
_0806E1F4: .4byte 0x03020000
_0806E1F8: .4byte 0x00000838
@@ -155,7 +155,7 @@ sub_806E204: @ 806E204
push {lr}
ldr r0, _0806E224 @ =0x0000404e
bl sub_806E454
ldr r1, _0806E228 @ =gUnknown_300500C
ldr r1, _0806E228 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0
strb r1, [r2, 0x1B]
@@ -167,7 +167,7 @@ sub_806E204: @ 806E204
bx r0
.align 2, 0
_0806E224: .4byte 0x0000404e
_0806E228: .4byte gUnknown_300500C
_0806E228: .4byte gSaveBlock2Ptr
thumb_func_end sub_806E204
thumb_func_start sub_806E22C
@@ -175,7 +175,7 @@ sub_806E22C: @ 806E22C
push {lr}
ldr r0, _0806E250 @ =0x0000404e
bl sub_806E454
ldr r1, _0806E254 @ =gUnknown_300500C
ldr r1, _0806E254 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0xB9
strb r1, [r2, 0x1B]
@@ -189,14 +189,14 @@ sub_806E22C: @ 806E22C
bx r0
.align 2, 0
_0806E250: .4byte 0x0000404e
_0806E254: .4byte gUnknown_300500C
_0806E254: .4byte gSaveBlock2Ptr
_0806E258: .4byte 0x00006258
thumb_func_end sub_806E22C
thumb_func_start sub_806E25C
sub_806E25C: @ 806E25C
push {lr}
ldr r0, _0806E288 @ =gUnknown_300500C
ldr r0, _0806E288 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x1B]
cmp r0, 0xB9
@@ -216,7 +216,7 @@ sub_806E25C: @ 806E25C
movs r0, 0x1
b _0806E296
.align 2, 0
_0806E288: .4byte gUnknown_300500C
_0806E288: .4byte gSaveBlock2Ptr
_0806E28C: .4byte 0x0000404e
_0806E290: .4byte 0x62580000
_0806E294:
@@ -454,7 +454,7 @@ _0806E488:
adds r2, r0, 0
cmp r2, 0
beq _0806E4EE
ldr r0, _0806E4B0 @ =gUnknown_3005008
ldr r0, _0806E4B0 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r3, _0806E4B4 @ =0xffffc000
adds r0, r4, r3
@@ -467,7 +467,7 @@ _0806E488:
strh r0, [r1]
b _0806E4EE
.align 2, 0
_0806E4B0: .4byte gUnknown_3005008
_0806E4B0: .4byte gSaveBlock1Ptr
_0806E4B4: .4byte 0xffffc000
_0806E4B8:
ldr r0, _0806E4FC @ =0xffffc000
@@ -482,7 +482,7 @@ _0806E4B8:
bne _0806E4EE
ldr r0, _0806E500 @ =gUnknown_300507C
strh r5, [r0]
ldr r0, _0806E504 @ =gUnknown_3005008
ldr r0, _0806E504 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, _0806E4FC @ =0xffffc000
adds r0, r4, r2
@@ -496,7 +496,7 @@ _0806E4B8:
adds r1, r4, 0
bl sub_8112DB0
_0806E4EE:
ldr r0, _0806E504 @ =gUnknown_3005008
ldr r0, _0806E504 @ =gSaveBlock1Ptr
lsls r1, r6, 1
ldr r2, _0806E508 @ =0xffff9000
adds r1, r2
@@ -506,7 +506,7 @@ _0806E4EE:
.align 2, 0
_0806E4FC: .4byte 0xffffc000
_0806E500: .4byte gUnknown_300507C
_0806E504: .4byte gUnknown_3005008
_0806E504: .4byte gSaveBlock1Ptr
_0806E508: .4byte 0xffff9000
_0806E50C:
ldr r0, _0806E520 @ =gUnknown_815FD0C
@@ -653,7 +653,7 @@ _0806E5F0:
adds r2, r0, 0
cmp r2, 0
beq _0806E644
ldr r0, _0806E614 @ =gUnknown_3005008
ldr r0, _0806E614 @ =gSaveBlock1Ptr
ldr r0, [r0]
lsrs r1, r5, 19
movs r3, 0xEE
@@ -664,7 +664,7 @@ _0806E5F0:
strb r1, [r0]
b _0806E644
.align 2, 0
_0806E614: .4byte gUnknown_3005008
_0806E614: .4byte gSaveBlock1Ptr
_0806E618:
adds r0, r4, 0
movs r1, 0
@@ -675,7 +675,7 @@ _0806E618:
bne _0806E644
ldr r0, _0806E654 @ =gUnknown_300507C
strh r4, [r0]
ldr r0, _0806E658 @ =gUnknown_3005008
ldr r0, _0806E658 @ =gSaveBlock1Ptr
ldr r0, [r0]
lsrs r1, r5, 19
movs r2, 0xEE
@@ -687,7 +687,7 @@ _0806E618:
adds r1, r4, 0
bl sub_8112DB0
_0806E644:
ldr r0, _0806E658 @ =gUnknown_3005008
ldr r0, _0806E658 @ =gSaveBlock1Ptr
lsrs r1, r6, 3
movs r3, 0xEE
lsls r3, 4
@@ -696,7 +696,7 @@ _0806E644:
b _0806E66C
.align 2, 0
_0806E654: .4byte gUnknown_300507C
_0806E658: .4byte gUnknown_3005008
_0806E658: .4byte gSaveBlock1Ptr
_0806E65C:
ldr r1, _0806E674 @ =0xffffc000
adds r0, r6, r1
asm/evolution_scene.s
+20 -20
View File
@@ -648,7 +648,7 @@ CB2_TradeEvolutionSceneLoadGraphics: @ 80CE2DC
ldr r1, _080CE320 @ =gUnknown_2024284
adds r4, r2, r1
ldrh r6, [r0, 0xC]
ldr r0, _080CE324 @ =gUnknown_30030F0
ldr r0, _080CE324 @ =gMain
movs r3, 0x87
lsls r3, 3
adds r0, r3
@@ -666,7 +666,7 @@ _080CE30E:
_080CE318: .4byte gUnknown_3005090
_080CE31C: .4byte gUnknown_2039A20
_080CE320: .4byte gUnknown_2024284
_080CE324: .4byte gUnknown_30030F0
_080CE324: .4byte gMain
_080CE328: .4byte _080CE32C
.align 2, 0
_080CE32C:
@@ -728,7 +728,7 @@ _080CE3BC:
bl SetHBlankCallback
ldr r0, _080CE3DC @ =sub_80D00D8
bl SetVBlankCallback
ldr r1, _080CE3E0 @ =gUnknown_30030F0
ldr r1, _080CE3E0 @ =gMain
movs r3, 0x87
lsls r3, 3
adds r1, r3
@@ -736,7 +736,7 @@ _080CE3BC:
.align 2, 0
_080CE3D8: .4byte nullsub_76
_080CE3DC: .4byte sub_80D00D8
_080CE3E0: .4byte gUnknown_30030F0
_080CE3E0: .4byte gMain
_080CE3E4:
bl sub_80544FC
b _080CE4EC
@@ -753,13 +753,13 @@ _080CE3EA:
bl FillBgTilemapBufferRect
movs r0, 0x1
bl CopyBgTilemapBufferToVram
ldr r1, _080CE410 @ =gUnknown_30030F0
ldr r1, _080CE410 @ =gMain
movs r3, 0x87
lsls r3, 3
adds r1, r3
b _080CE4F4
.align 2, 0
_080CE410: .4byte gUnknown_30030F0
_080CE410: .4byte gMain
_080CE414:
adds r0, r4, 0
movs r1, 0x1
@@ -822,7 +822,7 @@ _080CE45C:
movs r2, 0x20
orrs r0, r2
strb r0, [r1, 0x5]
ldr r1, _080CE4C8 @ =gUnknown_30030F0
ldr r1, _080CE4C8 @ =gMain
movs r3, 0x87
lsls r3, 3
adds r1, r3
@@ -837,7 +837,7 @@ _080CE4B8: .4byte gUnknown_8231CFC
_080CE4BC: .4byte gUnknown_2039A20
_080CE4C0: .4byte gUnknown_202063C
_080CE4C4: .4byte nullsub_10
_080CE4C8: .4byte gUnknown_30030F0
_080CE4C8: .4byte gMain
_080CE4CC:
ldr r0, _080CE4FC @ =gUnknown_3003F3C
ldrb r0, [r0]
@@ -854,7 +854,7 @@ _080CE4E0:
movs r2, 0
bl BlendPalettes
_080CE4EC:
ldr r1, _080CE500 @ =gUnknown_30030F0
ldr r1, _080CE500 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -865,7 +865,7 @@ _080CE4F4:
b _080CE534
.align 2, 0
_080CE4FC: .4byte gUnknown_3003F3C
_080CE500: .4byte gUnknown_30030F0
_080CE500: .4byte gMain
_080CE504:
movs r0, 0x1
negs r0, r0
@@ -1351,7 +1351,7 @@ _080CE93C: .4byte gUnknown_3005090
_080CE940: .4byte gUnknown_2024284
_080CE944: .4byte gUnknown_2023E82
_080CE948:
ldr r0, _080CE9A0 @ =gUnknown_30030F0
ldr r0, _080CE9A0 @ =gMain
ldrh r1, [r0, 0x2C]
ldr r3, _080CE9A4 @ =gUnknown_3005090
mov r10, r3
@@ -1393,7 +1393,7 @@ _080CE948:
bl sub_80D04A8
bl _080CF528
.align 2, 0
_080CE9A0: .4byte gUnknown_30030F0
_080CE9A0: .4byte gMain
_080CE9A4: .4byte gUnknown_3005090
_080CE9A8: .4byte gUnknown_2023E82
_080CE9AC:
@@ -2310,7 +2310,7 @@ _080CF1B0: .4byte gUnknown_3005090
_080CF1B4: .4byte gUnknown_83FE791
_080CF1B8: .4byte gUnknown_2023E82
_080CF1BC:
ldr r0, _080CF244 @ =gUnknown_30030F0
ldr r0, _080CF244 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -2327,7 +2327,7 @@ _080CF1BC:
strb r0, [r4, 0x1]
bl sub_802DCB8
_080CF1E2:
ldr r0, _080CF244 @ =gUnknown_30030F0
ldr r0, _080CF244 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x80
ands r0, r1
@@ -2344,7 +2344,7 @@ _080CF1E2:
strb r0, [r4, 0x1]
bl sub_802DCB8
_080CF208:
ldr r0, _080CF244 @ =gUnknown_30030F0
ldr r0, _080CF244 @ =gMain
ldrh r1, [r0, 0x2E]
movs r2, 0x1
adds r0, r2, 0
@@ -2372,7 +2372,7 @@ _080CF208:
strh r0, [r1, 0x14]
b _080CF276
.align 2, 0
_080CF244: .4byte gUnknown_30030F0
_080CF244: .4byte gMain
_080CF248: .4byte gUnknown_2023E82
_080CF24C: .4byte gUnknown_3005090
_080CF250:
@@ -2395,7 +2395,7 @@ _080CF250:
movs r3, 0x10
bl BeginNormalPaletteFade
_080CF276:
ldr r0, _080CF2B0 @ =gUnknown_30030F0
ldr r0, _080CF2B0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -2422,7 +2422,7 @@ _080CF284:
b _080CF528
.align 2, 0
_080CF2AC: .4byte gUnknown_3005090
_080CF2B0: .4byte gUnknown_30030F0
_080CF2B0: .4byte gMain
_080CF2B4:
ldr r0, _080CF2F4 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
@@ -3740,7 +3740,7 @@ _080CFE30:
beq _080CFE3E
b _080D003A
_080CFE3E:
ldr r0, _080CFE68 @ =gUnknown_30030F0
ldr r0, _080CFE68 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _080CFE6C @ =sub_80CE72C
cmp r1, r0
@@ -3760,7 +3760,7 @@ _080CFE4A:
b _080D0038
.align 2, 0
_080CFE64: .4byte gUnknown_2037AB8
_080CFE68: .4byte gUnknown_30030F0
_080CFE68: .4byte gMain
_080CFE6C: .4byte sub_80CE72C
_080CFE70: .4byte gUnknown_3005090
_080CFE74:
asm/fame_checker.s
+30 -30
View File
@@ -68,7 +68,7 @@ sub_812C3F8: @ 812C3F8
mov r6, r8
push {r6}
sub sp, 0xC
ldr r0, _0812C41C @ =gUnknown_30030F0
ldr r0, _0812C41C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -83,7 +83,7 @@ _0812C410:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0812C41C: .4byte gUnknown_30030F0
_0812C41C: .4byte gMain
_0812C420: .4byte _0812C424
.align 2, 0
_0812C424:
@@ -245,7 +245,7 @@ _0812C5A0:
movs r3, 0
bl BeginNormalPaletteFade
_0812C5BE:
ldr r1, _0812C5D0 @ =gUnknown_30030F0
ldr r1, _0812C5D0 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -254,7 +254,7 @@ _0812C5BE:
strb r0, [r1]
b _0812C626
.align 2, 0
_0812C5D0: .4byte gUnknown_30030F0
_0812C5D0: .4byte gMain
_0812C5D4:
bl sub_812D584
movs r1, 0xFD
@@ -283,7 +283,7 @@ _0812C5D4:
bl CreateTask
ldr r0, _0812C640 @ =sub_812C394
bl SetMainCallback2
ldr r0, _0812C644 @ =gUnknown_30030F0
ldr r0, _0812C644 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -300,7 +300,7 @@ _0812C634: .4byte sub_812C380
_0812C638: .4byte gUnknown_203B0FC
_0812C63C: .4byte sub_812C664
_0812C640: .4byte sub_812C394
_0812C644: .4byte gUnknown_30030F0
_0812C644: .4byte gMain
thumb_func_end sub_812C3F8
thumb_func_start sub_812C648
@@ -369,7 +369,7 @@ sub_812C694: @ 812C694
b _0812C8EA
_0812C6C0:
bl sub_8002DE8
ldr r0, _0812C71C @ =gUnknown_30030F0
ldr r0, _0812C71C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x4
ands r0, r1
@@ -388,7 +388,7 @@ _0812C6C0:
beq _0812C6E8
b _0812C8DA
_0812C6E8:
ldr r0, _0812C71C @ =gUnknown_30030F0
ldr r0, _0812C71C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x8
ands r0, r1
@@ -409,7 +409,7 @@ _0812C6E8:
.align 2, 0
_0812C714: .4byte gUnknown_3005090
_0812C718: .4byte sub_812E110
_0812C71C: .4byte gUnknown_30030F0
_0812C71C: .4byte gMain
_0812C720: .4byte gUnknown_203B0FC
_0812C724: .4byte sub_8107EB8
_0812C728:
@@ -880,7 +880,7 @@ sub_812CAD8: @ 812CAD8
adds r0, 0x8
adds r6, r1, r0
bl sub_8002DE8
ldr r0, _0812CBA0 @ =gUnknown_30030F0
ldr r0, _0812CBA0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -910,7 +910,7 @@ sub_812CAD8: @ 812CAD8
adds r0, r4, 0
bl sub_812CE04
_0812CB2E:
ldr r0, _0812CBA0 @ =gUnknown_30030F0
ldr r0, _0812CBA0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -960,7 +960,7 @@ _0812CB80:
b _0812CC62
.align 2, 0
_0812CB9C: .4byte gUnknown_3005090
_0812CBA0: .4byte gUnknown_30030F0
_0812CBA0: .4byte gMain
_0812CBA4: .4byte gUnknown_203B0FC
_0812CBA8: .4byte gUnknown_202063C
_0812CBAC: .4byte sub_812D764
@@ -1176,7 +1176,7 @@ sub_812CD3C: @ 812CD3C
lsls r0, 16
lsrs r0, 16
adds r6, r0, 0
ldr r0, _0812CD7C @ =gUnknown_3005008
ldr r0, _0812CD7C @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r7, _0812CD80 @ =gUnknown_203B0FC
ldr r0, [r7]
@@ -1196,7 +1196,7 @@ sub_812CD3C: @ 812CD3C
bl sub_812C990
b _0812CDEE
.align 2, 0
_0812CD7C: .4byte gUnknown_3005008
_0812CD7C: .4byte gSaveBlock1Ptr
_0812CD80: .4byte gUnknown_203B0FC
_0812CD84: .4byte 0x00003a54
_0812CD88:
@@ -1720,7 +1720,7 @@ sub_812D1A8: @ 812D1A8
movs r6, 0
ldr r7, _0812D238 @ =gUnknown_203B0FC
_0812D1BA:
ldr r0, _0812D23C @ =gUnknown_3005008
ldr r0, _0812D23C @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, [r7]
adds r0, 0xC
@@ -1781,7 +1781,7 @@ _0812D1BA:
b _0812D2A0
.align 2, 0
_0812D238: .4byte gUnknown_203B0FC
_0812D23C: .4byte gUnknown_3005008
_0812D23C: .4byte gSaveBlock1Ptr
_0812D240: .4byte 0x00003a54
_0812D244: .4byte gUnknown_845F83C
_0812D248:
@@ -1884,7 +1884,7 @@ sub_812D304: @ 812D304
mov r6, r8
push {r6,r7}
movs r4, 0
ldr r0, _0812D378 @ =gUnknown_3005008
ldr r0, _0812D378 @ =gSaveBlock1Ptr
mov r9, r0
mov r6, r9
ldr r5, _0812D37C @ =0x00003a54
@@ -1938,7 +1938,7 @@ _0812D322:
pop {r0}
bx r0
.align 2, 0
_0812D378: .4byte gUnknown_3005008
_0812D378: .4byte gSaveBlock1Ptr
_0812D37C: .4byte 0x00003a54
_0812D380: .4byte 0xffffc003
_0812D384: .4byte 0x00003a55
@@ -1953,7 +1953,7 @@ sub_812D388: @ 812D388
push {r5-r7}
sub sp, 0x4
movs r5, 0
ldr r0, _0812D410 @ =gUnknown_3005008
ldr r0, _0812D410 @ =gSaveBlock1Ptr
mov r12, r0
ldr r7, _0812D414 @ =0x00003a54
movs r1, 0x4
@@ -2017,7 +2017,7 @@ _0812D3C8:
pop {r0}
bx r0
.align 2, 0
_0812D410: .4byte gUnknown_3005008
_0812D410: .4byte gSaveBlock1Ptr
_0812D414: .4byte 0x00003a54
_0812D418: .4byte 0xffffc003
_0812D41C: .4byte 0x00000fff
@@ -2243,7 +2243,7 @@ sub_812D5EC: @ 812D5EC
ldrh r0, [r5]
cmp r0, 0x5
bhi _0812D632
ldr r0, _0812D640 @ =gUnknown_3005008
ldr r0, _0812D640 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldrh r0, [r1]
lsls r0, 2
@@ -2275,7 +2275,7 @@ _0812D632:
.align 2, 0
_0812D638: .4byte gUnknown_20370C0
_0812D63C: .4byte gUnknown_20370C2
_0812D640: .4byte gUnknown_3005008
_0812D640: .4byte gSaveBlock1Ptr
_0812D644: .4byte 0x00003a54
_0812D648: .4byte 0x00000fff
_0812D64C: .4byte 0xffffc003
@@ -2295,7 +2295,7 @@ sub_812D650: @ 812D650
bhi _0812D69E
cmp r0, 0
beq _0812D69E
ldr r2, _0812D6AC @ =gUnknown_3005008
ldr r2, _0812D6AC @ =gSaveBlock1Ptr
ldrh r3, [r1]
cmp r0, 0x1
bne _0812D684
@@ -2330,7 +2330,7 @@ _0812D69E:
.align 2, 0
_0812D6A4: .4byte gUnknown_20370C0
_0812D6A8: .4byte gUnknown_20370C2
_0812D6AC: .4byte gUnknown_3005008
_0812D6AC: .4byte gSaveBlock1Ptr
_0812D6B0: .4byte 0x00003a54
thumb_func_end sub_812D650
@@ -2346,7 +2346,7 @@ sub_812D6B4: @ 812D6B4
adds r4, r0
ldrb r1, [r4]
movs r2, 0
ldr r0, _0812D6F0 @ =gUnknown_3005008
ldr r0, _0812D6F0 @ =gSaveBlock1Ptr
ldr r0, [r0]
lsls r1, 2
adds r0, r1
@@ -2365,7 +2365,7 @@ _0812D6DC:
b _0812D704
.align 2, 0
_0812D6EC: .4byte gUnknown_203B0FC
_0812D6F0: .4byte gUnknown_3005008
_0812D6F0: .4byte gSaveBlock1Ptr
_0812D6F4: .4byte 0x00003a54
_0812D6F8:
adds r0, r2, 0x1
@@ -2697,7 +2697,7 @@ _0812D950:
adds r0, r1
ldr r1, _0812D998 @ =sub_812D840
str r1, [r0]
ldr r0, _0812D99C @ =gUnknown_3005008
ldr r0, _0812D99C @ =gSaveBlock1Ptr
ldr r0, [r0]
lsls r1, r5, 2
adds r0, r1
@@ -2724,7 +2724,7 @@ _0812D98C: .4byte gUnknown_845F61C
_0812D990: .4byte 0x0000ffff
_0812D994: .4byte gUnknown_202063C
_0812D998: .4byte sub_812D840
_0812D99C: .4byte gUnknown_3005008
_0812D99C: .4byte gSaveBlock1Ptr
_0812D9A0: .4byte 0x00003a54
_0812D9A4: .4byte gUnknown_845F5C0
thumb_func_end sub_812D888
@@ -3410,7 +3410,7 @@ _0812DF00:
bl sub_812D0C0
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0812DF4C @ =gUnknown_3005008
ldr r0, _0812DF4C @ =gSaveBlock1Ptr
ldr r0, [r0]
lsls r1, r5, 2
adds r0, r1
@@ -3442,7 +3442,7 @@ _0812DF00:
.align 2, 0
_0812DF44: .4byte 0x0000fdff
_0812DF48: .4byte gUnknown_845F60C
_0812DF4C: .4byte gUnknown_3005008
_0812DF4C: .4byte gSaveBlock1Ptr
_0812DF50: .4byte 0x00003a54
_0812DF54: .4byte gUnknown_845F5EA
_0812DF58: .4byte gUnknown_203B100
asm/field_camera.s
+12 -12
View File
@@ -130,7 +130,7 @@ _0805A680: .4byte gUnknown_3000E9A
thumb_func_start DrawWholeMapView
DrawWholeMapView: @ 805A684
push {lr}
ldr r0, _0805A6A0 @ =gUnknown_3005008
ldr r0, _0805A6A0 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r2, 0
ldrsh r0, [r1, r2]
@@ -142,7 +142,7 @@ DrawWholeMapView: @ 805A684
pop {r0}
bx r0
.align 2, 0
_0805A6A0: .4byte gUnknown_3005008
_0805A6A0: .4byte gSaveBlock1Ptr
_0805A6A4: .4byte gUnknown_2036DFC
thumb_func_end DrawWholeMapView
@@ -290,7 +290,7 @@ _0805A7A6:
adds r1, r6, r0
lsls r1, 16
lsrs r1, 16
ldr r0, _0805A7D4 @ =gUnknown_3005008
ldr r0, _0805A7D4 @ =gSaveBlock1Ptr
ldr r3, [r0]
movs r0, 0
ldrsh r2, [r3, r0]
@@ -310,7 +310,7 @@ _0805A7A6:
pop {r0}
bx r0
.align 2, 0
_0805A7D4: .4byte gUnknown_3005008
_0805A7D4: .4byte gSaveBlock1Ptr
thumb_func_end RedrawMapSliceNorth
thumb_func_start RedrawMapSliceSouth
@@ -333,7 +333,7 @@ _0805A7E4:
lsrs r0, 24
_0805A7F6:
adds r1, r6, r0
ldr r0, _0805A820 @ =gUnknown_3005008
ldr r0, _0805A820 @ =gSaveBlock1Ptr
ldr r3, [r0]
movs r0, 0
ldrsh r2, [r3, r0]
@@ -352,7 +352,7 @@ _0805A7F6:
pop {r0}
bx r0
.align 2, 0
_0805A820: .4byte gUnknown_3005008
_0805A820: .4byte gSaveBlock1Ptr
thumb_func_end RedrawMapSliceSouth
thumb_func_start RedrawMapSliceEast
@@ -379,7 +379,7 @@ _0805A844:
adds r1, r6
lsls r1, 16
lsrs r1, 16
ldr r0, _0805A878 @ =gUnknown_3005008
ldr r0, _0805A878 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r3, 0
ldrsh r2, [r0, r3]
@@ -400,7 +400,7 @@ _0805A844:
pop {r0}
bx r0
.align 2, 0
_0805A878: .4byte gUnknown_3005008
_0805A878: .4byte gSaveBlock1Ptr
thumb_func_end RedrawMapSliceEast
thumb_func_start RedrawMapSliceWest
@@ -437,7 +437,7 @@ _0805A8AE:
adds r1, r5
lsls r1, 16
lsrs r1, 16
ldr r0, _0805A8E4 @ =gUnknown_3005008
ldr r0, _0805A8E4 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r3, 0
ldrsh r2, [r0, r3]
@@ -459,7 +459,7 @@ _0805A8AE:
pop {r0}
bx r0
.align 2, 0
_0805A8E4: .4byte gUnknown_3005008
_0805A8E4: .4byte gSaveBlock1Ptr
thumb_func_end RedrawMapSliceWest
thumb_func_start CurrentMapDrawMetatileAt
@@ -729,7 +729,7 @@ _0805AAE4: .4byte gUnknown_3005018
MapPosToBgTilemapOffset: @ 805AAE8
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, _0805AB18 @ =gUnknown_3005008
ldr r0, _0805AB18 @ =gSaveBlock1Ptr
ldr r3, [r0]
movs r5, 0
ldrsh r0, [r3, r5]
@@ -754,7 +754,7 @@ _0805AB12:
negs r0, r0
b _0805AB2A
.align 2, 0
_0805AB18: .4byte gUnknown_3005008
_0805AB18: .4byte gSaveBlock1Ptr
_0805AB1C:
ldrb r0, [r4, 0x3]
adds r2, r0
asm/field_control_avatar.s
+6 -6
View File
@@ -1980,7 +1980,7 @@ sub_806D804: @ 806D804
lsls r2, 24
lsrs r5, r2, 24
adds r7, r5, 0
ldr r0, _0806D840 @ =gUnknown_30030F0
ldr r0, _0806D840 @ =gMain
ldrh r1, [r0, 0x2C]
movs r0, 0x30
ands r0, r1
@@ -2002,7 +2002,7 @@ sub_806D804: @ 806D804
adds r1, r5, 0
b _0806D888
.align 2, 0
_0806D840: .4byte gUnknown_30030F0
_0806D840: .4byte gMain
_0806D844: .4byte gUnknown_81A76E7
_0806D848:
cmp r4, 0x1
@@ -2583,7 +2583,7 @@ _0806DC78:
bne _0806DCC4
adds r0, r6, r1
ldrb r0, [r0, 0x5]
ldr r1, _0806DCCC @ =gUnknown_3005008
ldr r1, _0806DCCC @ =gSaveBlock1Ptr
ldr r2, [r1]
movs r1, 0x4
ldrsb r1, [r2, r1]
@@ -2597,7 +2597,7 @@ _0806DCC4:
pop {r0}
bx r0
.align 2, 0
_0806DCCC: .4byte gUnknown_3005008
_0806DCCC: .4byte gSaveBlock1Ptr
thumb_func_end sub_806DC54
thumb_func_start sub_806DCD0
@@ -2805,7 +2805,7 @@ sub_806DE28: @ 806DE28
movs r0, 0x25
bl sub_80722CC
ldrb r0, [r5, 0x8]
ldr r4, _0806DE6C @ =gUnknown_3005008
ldr r4, _0806DE6C @ =gSaveBlock1Ptr
ldr r2, [r4]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
@@ -2823,7 +2823,7 @@ _0806DE64:
pop {r0}
bx r0
.align 2, 0
_0806DE6C: .4byte gUnknown_3005008
_0806DE6C: .4byte gSaveBlock1Ptr
thumb_func_end sub_806DE28
thumb_func_start sub_806DE70
asm/field_effect.s
+12 -12
View File
@@ -5880,7 +5880,7 @@ sub_8086110: @ 8086110
strh r0, [r4, 0x20]
adds r0, r4, 0
adds r0, 0x22
ldr r1, _08086170 @ =gUnknown_30030F0
ldr r1, _08086170 @ =gMain
ldr r1, [r1, 0xC]
bl StoreWordInTwoHalfwords
ldr r1, _08086174 @ =0x0000f0f1
@@ -5911,7 +5911,7 @@ sub_8086110: @ 8086110
pop {r0}
bx r0
.align 2, 0
_08086170: .4byte gUnknown_30030F0
_08086170: .4byte gMain
_08086174: .4byte 0x0000f0f1
_08086178: .4byte 0x00005051
_0808617C: .4byte sub_80863C0
@@ -6330,7 +6330,7 @@ sub_8086498: @ 8086498
bl SetGpuReg
adds r0, r4, 0
adds r0, 0x22
ldr r1, _080864CC @ =gUnknown_30030F0
ldr r1, _080864CC @ =gMain
ldr r1, [r1, 0xC]
bl StoreWordInTwoHalfwords
ldr r0, _080864D0 @ =sub_80866E0
@@ -6342,7 +6342,7 @@ sub_8086498: @ 8086498
pop {r0}
bx r0
.align 2, 0
_080864CC: .4byte gUnknown_30030F0
_080864CC: .4byte gMain
_080864D0: .4byte sub_80866E0
thumb_func_end sub_8086498
@@ -7880,7 +7880,7 @@ sub_808706C: @ 808706C
lsls r0, 2
ldr r4, _0808710C @ =gUnknown_202063C
adds r0, r4
ldr r1, _08087110 @ =gUnknown_300500C
ldr r1, _08087110 @ =gSaveBlock2Ptr
ldr r1, [r1]
ldrb r1, [r1, 0x8]
lsls r1, 1
@@ -7917,7 +7917,7 @@ _080870FC:
_08087104: .4byte gUnknown_2037078
_08087108: .4byte gUnknown_2036E38
_0808710C: .4byte gUnknown_202063C
_08087110: .4byte gUnknown_300500C
_08087110: .4byte gSaveBlock2Ptr
_08087114: .4byte sub_8087828
thumb_func_end sub_808706C
@@ -8088,7 +8088,7 @@ sub_8087220: @ 8087220
adds r0, r4, 0
movs r1, 0
bl StartSpriteAffineAnim
ldr r0, _08087260 @ =gUnknown_300500C
ldr r0, _08087260 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -8097,7 +8097,7 @@ sub_8087220: @ 8087220
b _08087266
.align 2, 0
_0808725C: .4byte gUnknown_83CC1CC
_08087260: .4byte gUnknown_300500C
_08087260: .4byte gSaveBlock2Ptr
_08087264:
movs r0, 0x76
_08087266:
@@ -8255,7 +8255,7 @@ sub_8087364: @ 8087364
adds r0, r4, 0
movs r1, 0x1
bl StartSpriteAffineAnim
ldr r0, _080873A4 @ =gUnknown_300500C
ldr r0, _080873A4 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -8264,7 +8264,7 @@ sub_8087364: @ 8087364
b _080873AA
.align 2, 0
_080873A0: .4byte gUnknown_83CC1CC
_080873A4: .4byte gUnknown_300500C
_080873A4: .4byte gSaveBlock2Ptr
_080873A8:
movs r0, 0x64
_080873AA:
@@ -8500,7 +8500,7 @@ _0808751A:
adds r0, r1
lsls r0, 2
adds r0, r4
ldr r1, _080875C0 @ =gUnknown_300500C
ldr r1, _080875C0 @ =gSaveBlock2Ptr
ldr r1, [r1]
ldrb r1, [r1, 0x8]
lsls r1, 25
@@ -8534,7 +8534,7 @@ _080875AE:
_080875B4: .4byte gUnknown_2037078
_080875B8: .4byte gUnknown_2036E38
_080875BC: .4byte gUnknown_202063C
_080875C0: .4byte gUnknown_300500C
_080875C0: .4byte gSaveBlock2Ptr
_080875C4: .4byte sub_8087828
thumb_func_end sub_80874C8
asm/field_effect_helpers.s
+4 -4
View File
@@ -851,7 +851,7 @@ unc_grass_normal: @ 80DB3EC
ands r0, r1
cmp r0, 0
beq _080DB438
ldr r0, _080DB49C @ =gUnknown_3005008
ldr r0, _080DB49C @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r0, 0x5
ldrsb r0, [r2, r0]
@@ -922,7 +922,7 @@ _080DB48C:
b _080DB4E4
.align 2, 0
_080DB498: .4byte gUnknown_2036E18
_080DB49C: .4byte gUnknown_3005008
_080DB49C: .4byte gSaveBlock1Ptr
_080DB4A0:
mov r0, sp
ldrb r1, [r0]
@@ -1202,7 +1202,7 @@ unc_grass_tall: @ 80DB69C
ands r0, r1
cmp r0, 0
beq _080DB6E8
ldr r0, _080DB74C @ =gUnknown_3005008
ldr r0, _080DB74C @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r0, 0x5
ldrsb r0, [r2, r0]
@@ -1273,7 +1273,7 @@ _080DB73C:
b _080DB786
.align 2, 0
_080DB748: .4byte gUnknown_2036E18
_080DB74C: .4byte gUnknown_3005008
_080DB74C: .4byte gSaveBlock1Ptr
_080DB750:
mov r0, sp
ldrb r1, [r0]
asm/field_ground_effect.s
+8 -8
View File
@@ -1158,7 +1158,7 @@ GroundEffect_SpawnOnTallGrass: @ 806837C
str r1, [r3, 0x10]
ldrb r0, [r0, 0xA]
str r0, [r3, 0x14]
ldr r0, _080683C4 @ =gUnknown_3005008
ldr r0, _080683C4 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldrb r0, [r1, 0x5]
lsls r0, 8
@@ -1173,7 +1173,7 @@ GroundEffect_SpawnOnTallGrass: @ 806837C
bx r0
.align 2, 0
_080683C0: .4byte gUnknown_20386E0
_080683C4: .4byte gUnknown_3005008
_080683C4: .4byte gSaveBlock1Ptr
thumb_func_end GroundEffect_SpawnOnTallGrass
thumb_func_start GroundEffect_StepOnTallGrass
@@ -1198,7 +1198,7 @@ GroundEffect_StepOnTallGrass: @ 80683C8
str r1, [r3, 0x10]
ldrb r0, [r0, 0xA]
str r0, [r3, 0x14]
ldr r0, _08068410 @ =gUnknown_3005008
ldr r0, _08068410 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldrb r0, [r1, 0x5]
lsls r0, 8
@@ -1213,7 +1213,7 @@ GroundEffect_StepOnTallGrass: @ 80683C8
bx r0
.align 2, 0
_0806840C: .4byte gUnknown_20386E0
_08068410: .4byte gUnknown_3005008
_08068410: .4byte gSaveBlock1Ptr
thumb_func_end GroundEffect_StepOnTallGrass
thumb_func_start GroundEffect_SpawnOnLongGrass
@@ -1238,7 +1238,7 @@ GroundEffect_SpawnOnLongGrass: @ 8068414
str r1, [r3, 0x10]
ldrb r0, [r0, 0xA]
str r0, [r3, 0x14]
ldr r0, _0806845C @ =gUnknown_3005008
ldr r0, _0806845C @ =gSaveBlock1Ptr
ldr r1, [r0]
ldrb r0, [r1, 0x5]
lsls r0, 8
@@ -1253,7 +1253,7 @@ GroundEffect_SpawnOnLongGrass: @ 8068414
bx r0
.align 2, 0
_08068458: .4byte gUnknown_20386E0
_0806845C: .4byte gUnknown_3005008
_0806845C: .4byte gSaveBlock1Ptr
thumb_func_end GroundEffect_SpawnOnLongGrass
thumb_func_start GroundEffect_StepOnLongGrass
@@ -1278,7 +1278,7 @@ GroundEffect_StepOnLongGrass: @ 8068460
str r1, [r3, 0x10]
ldrb r0, [r0, 0xA]
str r0, [r3, 0x14]
ldr r0, _080684A8 @ =gUnknown_3005008
ldr r0, _080684A8 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldrb r0, [r1, 0x5]
lsls r0, 8
@@ -1293,7 +1293,7 @@ GroundEffect_StepOnLongGrass: @ 8068460
bx r0
.align 2, 0
_080684A4: .4byte gUnknown_20386E0
_080684A8: .4byte gUnknown_3005008
_080684A8: .4byte gSaveBlock1Ptr
thumb_func_end GroundEffect_StepOnLongGrass
thumb_func_start GroundEffect_WaterReflection
asm/field_map_obj.s
+22 -22
View File
@@ -616,7 +616,7 @@ sub_805E27C: @ 805E27C
lsrs r0, 24
cmp r0, 0x1
bhi _0805E2DE
ldr r0, _0805E2B8 @ =gUnknown_3005008
ldr r0, _0805E2B8 @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r0, 0
ldrsh r1, [r2, r0]
@@ -634,7 +634,7 @@ sub_805E27C: @ 805E27C
lsls r0, r4, 16
b _0805E2CE
.align 2, 0
_0805E2B8: .4byte gUnknown_3005008
_0805E2B8: .4byte gSaveBlock1Ptr
_0805E2BC:
movs r1, 0
ldrsh r0, [r2, r1]
@@ -686,7 +686,7 @@ sub_805E2E8: @ 805E2E8
lsrs r0, 24
cmp r0, 0x1
bhi _0805E37C
ldr r0, _0805E378 @ =gUnknown_3005008
ldr r0, _0805E378 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r2, 0
ldrsh r1, [r1, r2]
@@ -737,7 +737,7 @@ _0805E36A:
b _0805E37E
.align 2, 0
_0805E374: .4byte gUnknown_3005040
_0805E378: .4byte gUnknown_3005008
_0805E378: .4byte gSaveBlock1Ptr
_0805E37C:
movs r0, 0x1
_0805E37E:
@@ -792,7 +792,7 @@ _0805E3CE:
movs r5, 0
cmp r5, r6
bcs _0805E404
ldr r7, _0805E410 @ =gUnknown_3005008
ldr r7, _0805E410 @ =gSaveBlock1Ptr
_0805E3D8:
lsls r0, r5, 1
adds r0, r5
@@ -825,7 +825,7 @@ _0805E406:
pop {r1}
bx r1
.align 2, 0
_0805E410: .4byte gUnknown_3005008
_0805E410: .4byte gSaveBlock1Ptr
thumb_func_end sub_805E3A0
thumb_func_start GetAvailableFieldObjectSlot
@@ -1351,7 +1351,7 @@ SpawnSpecialFieldObject: @ 805E7F4
add r0, sp, 0x4
adds r1, r4, 0
bl GetFieldObjectMovingCameraOffset
ldr r0, _0805E82C @ =gUnknown_3005008
ldr r0, _0805E82C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
@@ -1370,7 +1370,7 @@ SpawnSpecialFieldObject: @ 805E7F4
pop {r1}
bx r1
.align 2, 0
_0805E82C: .4byte gUnknown_3005008
_0805E82C: .4byte gSaveBlock1Ptr
thumb_func_end SpawnSpecialFieldObject
thumb_func_start SpawnSpecialFieldObjectParametrized
@@ -1907,7 +1907,7 @@ sub_805EC30: @ 805EC30
ldr r3, [r0, 0x4]
cmp r3, 0
beq _0805ECF8
ldr r7, _0805ED0C @ =gUnknown_3005008
ldr r7, _0805ED0C @ =gSaveBlock1Ptr
ldr r2, [r7]
ldrh r1, [r2]
subs r0, r1, 0x2
@@ -2002,7 +2002,7 @@ _0805ECF8:
bx r0
.align 2, 0
_0805ED08: .4byte gUnknown_2036DFC
_0805ED0C: .4byte gUnknown_3005008
_0805ED0C: .4byte gSaveBlock1Ptr
thumb_func_end sub_805EC30
thumb_func_start RemoveFieldObjectsOutsideView
@@ -2062,7 +2062,7 @@ _0805ED6C: .4byte 0x00010001
RemoveFieldObjectIfOutsideView: @ 805ED70
push {r4-r7,lr}
adds r3, r0, 0
ldr r0, _0805EDEC @ =gUnknown_3005008
ldr r0, _0805EDEC @ =gSaveBlock1Ptr
ldr r2, [r0]
ldrh r0, [r2]
subs r1, r0, 0x2
@@ -2124,7 +2124,7 @@ _0805EDE4:
pop {r0}
bx r0
.align 2, 0
_0805EDEC: .4byte gUnknown_3005008
_0805EDEC: .4byte gSaveBlock1Ptr
thumb_func_end RemoveFieldObjectIfOutsideView
thumb_func_start sub_805EDF0
@@ -4272,7 +4272,7 @@ GetFieldObjectTemplateByLocalIdAndMap: @ 805FD5C
lsrs r3, r1, 24
lsls r2, 24
lsrs r2, 24
ldr r0, _0805FD8C @ =gUnknown_3005008
ldr r0, _0805FD8C @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x5
ldrsb r0, [r1, r0]
@@ -4289,7 +4289,7 @@ GetFieldObjectTemplateByLocalIdAndMap: @ 805FD5C
ldr r0, [r0, 0x4]
b _0805FDA0
.align 2, 0
_0805FD8C: .4byte gUnknown_3005008
_0805FD8C: .4byte gSaveBlock1Ptr
_0805FD90: .4byte gUnknown_2036DFC
_0805FD94:
adds r0, r2, 0
@@ -4348,7 +4348,7 @@ sub_805FDE8: @ 805FDE8
push {r7}
adds r4, r0, 0
ldrb r0, [r4, 0x9]
ldr r1, _0805FE0C @ =gUnknown_3005008
ldr r1, _0805FE0C @ =gSaveBlock1Ptr
ldr r2, [r1]
movs r1, 0x5
ldrsb r1, [r2, r1]
@@ -4361,7 +4361,7 @@ sub_805FDE8: @ 805FDE8
beq _0805FE18
b _0805FE50
.align 2, 0
_0805FE0C: .4byte gUnknown_3005008
_0805FE0C: .4byte gSaveBlock1Ptr
_0805FE10:
mov r1, r8
adds r0, r5, r1
@@ -12878,7 +12878,7 @@ _08063AD0: .4byte gUnknown_83A64C8
thumb_func_start sub_8063AD4
sub_8063AD4: @ 8063AD4
push {r4,r5,lr}
ldr r5, _08063B10 @ =gUnknown_3005008
ldr r5, _08063B10 @ =gSaveBlock1Ptr
ldr r4, [r5]
ldrh r4, [r4]
lsls r0, 16
@@ -12907,7 +12907,7 @@ sub_8063AD4: @ 8063AD4
pop {r0}
bx r0
.align 2, 0
_08063B10: .4byte gUnknown_3005008
_08063B10: .4byte gSaveBlock1Ptr
_08063B14: .4byte gUnknown_300506C
_08063B18: .4byte gUnknown_3005068
thumb_func_end sub_8063AD4
@@ -12966,7 +12966,7 @@ _08063B70:
adds r0, r1
lsrs r4, r0, 16
_08063B7C:
ldr r2, _08063BC0 @ =gUnknown_3005008
ldr r2, _08063BC0 @ =gSaveBlock1Ptr
ldr r0, [r2]
ldrh r1, [r0]
lsls r0, r5, 16
@@ -12996,7 +12996,7 @@ _08063BB0: .4byte gUnknown_300506C
_08063BB4: .4byte gUnknown_3005050
_08063BB8: .4byte gUnknown_3005068
_08063BBC: .4byte 0xfff00000
_08063BC0: .4byte gUnknown_3005008
_08063BC0: .4byte gSaveBlock1Ptr
thumb_func_end sub_8063B1C
thumb_func_start sub_8063BC4
@@ -21984,7 +21984,7 @@ _08067A9C:
adds r0, r2
lsls r0, 16
lsrs r7, r0, 16
ldr r0, _08067B00 @ =gUnknown_3005008
ldr r0, _08067B00 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, _08067B04 @ =0x00000401
@@ -22030,7 +22030,7 @@ _08067AFA:
pop {r0}
bx r0
.align 2, 0
_08067B00: .4byte gUnknown_3005008
_08067B00: .4byte gSaveBlock1Ptr
_08067B04: .4byte 0x00000401
_08067B08: .4byte 0x0000fff0
thumb_func_end sub_8067A10
asm/field_player_avatar.s
+2 -2
View File
@@ -4565,7 +4565,7 @@ _0805D5C0: .4byte gUnknown_835B91A
_0805D5C4: .4byte gUnknown_2037078
_0805D5C8: .4byte gUnknown_202063C
_0805D5CC:
ldr r0, _0805D5E8 @ =gUnknown_30030F0
ldr r0, _0805D5E8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -4582,7 +4582,7 @@ _0805D5DE:
pop {r1}
bx r1
.align 2, 0
_0805D5E8: .4byte gUnknown_30030F0
_0805D5E8: .4byte gMain
thumb_func_end sub_805D580
thumb_func_start sub_805D5EC
asm/field_screen_effect.s
+2 -2
View File
@@ -881,7 +881,7 @@ _0807F4A8:
movs r0, 0x1
bl GetHealLocationPointer
adds r3, r0, 0
ldr r0, _0807F520 @ =gUnknown_3005008
ldr r0, _0807F520 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldrh r0, [r2, 0x1C]
ldrh r5, [r3]
@@ -911,7 +911,7 @@ _0807F4A8:
.align 2, 0
_0807F518: .4byte gUnknown_83C68E4
_0807F51C: .4byte gUnknown_3005090
_0807F520: .4byte gUnknown_3005008
_0807F520: .4byte gSaveBlock1Ptr
_0807F524:
ldr r0, _0807F534 @ =gUnknown_3005090
adds r1, r4, r6
asm/field_specials.s
+46 -46
View File
@@ -87,7 +87,7 @@ _080CA698: .4byte gUnknown_2021D18
thumb_func_start sub_80CA69C
sub_80CA69C: @ 80CA69C
ldr r1, _080CA6B0 @ =gUnknown_20370C0
ldr r0, _080CA6B4 @ =gUnknown_3005008
ldr r0, _080CA6B4 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldrh r0, [r2]
strh r0, [r1]
@@ -97,14 +97,14 @@ sub_80CA69C: @ 80CA69C
bx lr
.align 2, 0
_080CA6B0: .4byte gUnknown_20370C0
_080CA6B4: .4byte gUnknown_3005008
_080CA6B4: .4byte gSaveBlock1Ptr
_080CA6B8: .4byte gUnknown_20370C2
thumb_func_end sub_80CA69C
thumb_func_start sub_80CA6BC
sub_80CA6BC: @ 80CA6BC
push {lr}
ldr r0, _080CA6D8 @ =gUnknown_300500C
ldr r0, _080CA6D8 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r1, [r0, 0xB]
lsls r1, 8
@@ -117,13 +117,13 @@ sub_80CA6BC: @ 80CA6BC
pop {r1}
bx r1
.align 2, 0
_080CA6D8: .4byte gUnknown_300500C
_080CA6D8: .4byte gSaveBlock2Ptr
thumb_func_end sub_80CA6BC
thumb_func_start sub_80CA6DC
sub_80CA6DC: @ 80CA6DC
push {lr}
ldr r0, _080CA6F4 @ =gUnknown_300500C
ldr r0, _080CA6F4 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -133,7 +133,7 @@ sub_80CA6DC: @ 80CA6DC
bl StringCopy
b _080CA708
.align 2, 0
_080CA6F4: .4byte gUnknown_300500C
_080CA6F4: .4byte gSaveBlock2Ptr
_080CA6F8: .4byte gUnknown_2021CD0
_080CA6FC: .4byte gUnknown_8417FBB
_080CA700:
@@ -151,7 +151,7 @@ _080CA710: .4byte gUnknown_8417FC3
thumb_func_start sub_80CA714
sub_80CA714: @ 80CA714
push {lr}
ldr r0, _080CA72C @ =gUnknown_300500C
ldr r0, _080CA72C @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -161,7 +161,7 @@ sub_80CA714: @ 80CA714
bl StringCopy
b _080CA740
.align 2, 0
_080CA72C: .4byte gUnknown_300500C
_080CA72C: .4byte gSaveBlock2Ptr
_080CA730: .4byte gUnknown_2021CD0
_080CA734: .4byte gUnknown_8417FD0
_080CA738:
@@ -476,7 +476,7 @@ _080CA964:
_080CA96C:
ldr r4, _080CA9A0 @ =0x0000028a
_080CA96E:
ldr r0, _080CA9A4 @ =gUnknown_3005008
ldr r0, _080CA9A4 @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r1, 0
ldrsh r0, [r2, r1]
@@ -501,7 +501,7 @@ _080CA96E:
bx r0
.align 2, 0
_080CA9A0: .4byte 0x0000028a
_080CA9A4: .4byte gUnknown_3005008
_080CA9A4: .4byte gSaveBlock1Ptr
thumb_func_end sub_80CA8F8
thumb_func_start sub_80CA9A8
@@ -552,7 +552,7 @@ _080CA9EC:
_080CA9F4:
ldr r4, _080CAA2C @ =0x0000028f
_080CA9F6:
ldr r0, _080CAA30 @ =gUnknown_3005008
ldr r0, _080CAA30 @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r1, 0
ldrsh r0, [r2, r1]
@@ -578,14 +578,14 @@ _080CA9F6:
bx r0
.align 2, 0
_080CAA2C: .4byte 0x0000028f
_080CAA30: .4byte gUnknown_3005008
_080CAA30: .4byte gSaveBlock1Ptr
thumb_func_end sub_80CA9A8
thumb_func_start SpawnScriptFieldObject
SpawnScriptFieldObject: @ 80CAA34
push {lr}
sub sp, 0x8
ldr r0, _080CAA80 @ =gUnknown_3005008
ldr r0, _080CAA80 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r3, [r0]
adds r3, 0x7
@@ -619,7 +619,7 @@ SpawnScriptFieldObject: @ 80CAA34
pop {r0}
bx r0
.align 2, 0
_080CAA80: .4byte gUnknown_3005008
_080CAA80: .4byte gSaveBlock1Ptr
_080CAA84: .4byte gUnknown_2036E38
thumb_func_end SpawnScriptFieldObject
@@ -630,7 +630,7 @@ RemoveScriptFieldObject: @ 80CAA88
lsls r0, 24
lsrs r0, 24
bl CameraObjectSetFollowedObjectId
ldr r0, _080CAAA8 @ =gUnknown_3005008
ldr r0, _080CAAA8 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
@@ -639,7 +639,7 @@ RemoveScriptFieldObject: @ 80CAA88
pop {r0}
bx r0
.align 2, 0
_080CAAA8: .4byte gUnknown_3005008
_080CAAA8: .4byte gSaveBlock1Ptr
thumb_func_end RemoveScriptFieldObject
thumb_func_start sub_80CAAAC
@@ -1033,7 +1033,7 @@ sub_80CAD7C: @ 80CAD7C
movs r1, 0x7
adds r2, r4, 0
bl GetMonData
ldr r0, _080CADB4 @ =gUnknown_300500C
ldr r0, _080CADB4 @ =gSaveBlock2Ptr
ldr r0, [r0]
adds r1, r4, 0
bl StringCompare
@@ -1045,7 +1045,7 @@ sub_80CAD7C: @ 80CAD7C
_080CADA8: .4byte gUnknown_20370C0
_080CADAC: .4byte gUnknown_2024284
_080CADB0: .4byte gUnknown_2021CD0
_080CADB4: .4byte gUnknown_300500C
_080CADB4: .4byte gSaveBlock2Ptr
_080CADB8:
movs r0, 0
_080CADBA:
@@ -1594,7 +1594,7 @@ _080CB1FE:
sub_80CB204: @ 80CB204
push {r4,lr}
movs r3, 0x4
ldr r0, _080CB22C @ =gUnknown_3005008
ldr r0, _080CB22C @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r1, 0x14
ldrsb r1, [r2, r1]
@@ -1613,7 +1613,7 @@ sub_80CB204: @ 80CB204
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080CB22C: .4byte gUnknown_3005008
_080CB22C: .4byte gSaveBlock1Ptr
_080CB230: .4byte _080CB234
.align 2, 0
_080CB234:
@@ -1751,7 +1751,7 @@ sub_80CB328: @ 80CB328
strh r0, [r3]
ldr r1, _080CB360 @ =gUnknown_2039A10
strh r0, [r1]
ldr r0, _080CB364 @ =gUnknown_3005008
ldr r0, _080CB364 @ =gSaveBlock1Ptr
ldr r5, [r0]
movs r2, 0x14
ldrsb r2, [r5, r2]
@@ -1774,7 +1774,7 @@ sub_80CB328: @ 80CB328
.align 2, 0
_080CB35C: .4byte gUnknown_2039A0E
_080CB360: .4byte gUnknown_2039A10
_080CB364: .4byte gUnknown_3005008
_080CB364: .4byte gSaveBlock1Ptr
_080CB368: .4byte _080CB36C
.align 2, 0
_080CB36C:
@@ -3647,7 +3647,7 @@ _080CC1E0: .4byte gUnknown_20370D0
thumb_func_start sub_80CC1E4
sub_80CC1E4: @ 80CC1E4
ldr r0, _080CC200 @ =gUnknown_300500C
ldr r0, _080CC200 @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r0, [r2, 0xD]
lsls r0, 24
@@ -3661,7 +3661,7 @@ sub_80CC1E4: @ 80CC1E4
orrs r0, r1
bx lr
.align 2, 0
_080CC200: .4byte gUnknown_300500C
_080CC200: .4byte gSaveBlock2Ptr
thumb_func_end sub_80CC1E4
thumb_func_start sub_80CC204
@@ -4026,7 +4026,7 @@ _080CC4CC:
sub_80CC4D4: @ 80CC4D4
push {r4-r7,lr}
movs r3, 0
ldr r0, _080CC508 @ =gUnknown_3005008
ldr r0, _080CC508 @ =gSaveBlock1Ptr
ldr r4, [r0]
movs r6, 0x4
ldrsb r6, [r4, r6]
@@ -4052,7 +4052,7 @@ _080CC4E8:
ldrb r0, [r0]
b _080CC51C
.align 2, 0
_080CC508: .4byte gUnknown_3005008
_080CC508: .4byte gSaveBlock1Ptr
_080CC50C: .4byte gUnknown_83F5D32
_080CC510:
adds r0, r3, 0x1
@@ -4081,7 +4081,7 @@ sub_80CC524: @ 80CC524
sub_80CC534: @ 80CC534
push {r4-r6,lr}
movs r4, 0
ldr r6, _080CC57C @ =gUnknown_3005008
ldr r6, _080CC57C @ =gSaveBlock1Ptr
ldr r5, _080CC580 @ =gUnknown_83F5D58
_080CC53C:
ldr r3, [r6]
@@ -4114,7 +4114,7 @@ _080CC56A:
bl FlagSet
b _080CC596
.align 2, 0
_080CC57C: .4byte gUnknown_3005008
_080CC57C: .4byte gSaveBlock1Ptr
_080CC580: .4byte gUnknown_83F5D58
_080CC584: .4byte 0x0000404d
_080CC588: .4byte 0x00000808
@@ -4153,7 +4153,7 @@ sub_80CC59C: @ 80CC59C
_080CC5C4:
cmp r5, 0x5
bne _080CC61C
ldr r0, _080CC608 @ =gUnknown_3005008
ldr r0, _080CC608 @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r1, 0x4
ldrsb r1, [r2, r1]
@@ -4183,7 +4183,7 @@ _080CC5F8: .4byte 0x0000404d
_080CC5FC: .4byte 0xffffff00
_080CC600: .4byte 0xffff00ff
_080CC604: .4byte 0x00000808
_080CC608: .4byte gUnknown_3005008
_080CC608: .4byte gSaveBlock1Ptr
_080CC60C:
movs r0, 0xC0
lsls r0, 3
@@ -4195,7 +4195,7 @@ _080CC610:
movs r0, 0x23
b _080CC66C
_080CC61C:
ldr r7, _080CC65C @ =gUnknown_3005008
ldr r7, _080CC65C @ =gSaveBlock1Ptr
cmp r5, 0x3
bne _080CC67C
ldr r1, [r7]
@@ -4226,7 +4226,7 @@ _080CC61C:
strb r5, [r6, 0x1]
b _080CC668
.align 2, 0
_080CC65C: .4byte gUnknown_3005008
_080CC65C: .4byte gSaveBlock1Ptr
_080CC660: .4byte gUnknown_83F5D58
_080CC664:
movs r0, 0x4
@@ -4661,7 +4661,7 @@ _080CC9A8: .4byte sub_80CCA18
_080CC9AC: .4byte gUnknown_3005098
_080CC9B0: .4byte sub_80CCAF4
_080CC9B4:
ldr r0, _080CC9D8 @ =gUnknown_3005008
ldr r0, _080CC9D8 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, _080CC9DC @ =0x00004f01
@@ -4678,7 +4678,7 @@ _080CC9B4:
bl LoadPalette
b _080CC9FC
.align 2, 0
_080CC9D8: .4byte gUnknown_3005008
_080CC9D8: .4byte gSaveBlock1Ptr
_080CC9DC: .4byte 0x00004f01
_080CC9E0: .4byte gUnknown_83F61FB
_080CC9E4: .4byte gUnknown_83F60D0
@@ -4756,7 +4756,7 @@ sub_80CCA18: @ 80CCA18
bne _080CCA78
strh r2, [r4, 0x2]
_080CCA78:
ldr r0, _080CCAB0 @ =gUnknown_3005008
ldr r0, _080CCAB0 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, _080CCAB4 @ =0x00004f01
@@ -4781,7 +4781,7 @@ _080CCA78:
_080CCAA4: .4byte gUnknown_3005098
_080CCAA8: .4byte gUnknown_2037AB8
_080CCAAC: .4byte gUnknown_2036E28
_080CCAB0: .4byte gUnknown_3005008
_080CCAB0: .4byte gSaveBlock1Ptr
_080CCAB4: .4byte 0x00004f01
_080CCAB8: .4byte gUnknown_83F61FB
_080CCABC: .4byte gUnknown_83F60D0
@@ -4823,7 +4823,7 @@ sub_80CCAF4: @ 80CCAF4
lsls r0, 24
cmp r0, 0
beq _080CCB5A
ldr r0, _080CCB20 @ =gUnknown_3005008
ldr r0, _080CCB20 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, _080CCB24 @ =0x00004f01
@@ -4835,7 +4835,7 @@ sub_80CCAF4: @ 80CCAF4
bl LoadPalette
b _080CCB36
.align 2, 0
_080CCB20: .4byte gUnknown_3005008
_080CCB20: .4byte gSaveBlock1Ptr
_080CCB24: .4byte 0x00004f01
_080CCB28: .4byte gUnknown_83F61D0
_080CCB2C:
@@ -5142,7 +5142,7 @@ sub_80CCD84: @ 80CCD84
lsrs r0, 24
cmp r0, 0x1
beq _080CCDC8
ldr r0, _080CCDBC @ =gUnknown_3005008
ldr r0, _080CCDBC @ =gSaveBlock1Ptr
ldr r2, [r0]
ldrh r1, [r2, 0x4]
ldr r0, _080CCDC0 @ =0x00003d03
@@ -5161,7 +5161,7 @@ sub_80CCD84: @ 80CCD84
b _080CCDCA
.align 2, 0
_080CCDB8: .4byte 0x000002e3
_080CCDBC: .4byte gUnknown_3005008
_080CCDBC: .4byte gSaveBlock1Ptr
_080CCDC0: .4byte 0x00003d03
_080CCDC4: .4byte 0x00190018
_080CCDC8:
@@ -5316,7 +5316,7 @@ sub_80CCEE8: @ 80CCEE8
bl LoadPalette
movs r0, 0xA
bl sub_8083598
ldr r0, _080CCF28 @ =gUnknown_3005008
ldr r0, _080CCF28 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
@@ -5330,7 +5330,7 @@ sub_80CCEE8: @ 80CCEE8
b _080CCF32
.align 2, 0
_080CCF24: .4byte gUnknown_83F6206
_080CCF28: .4byte gUnknown_3005008
_080CCF28: .4byte gSaveBlock1Ptr
_080CCF2C:
movs r0, 0xFD
bl sub_80722CC
@@ -5412,7 +5412,7 @@ sub_80CCFBC: @ 80CCFBC
bl VarGet
lsls r0, 16
lsrs r2, r0, 16
ldr r0, _080CCFF0 @ =gUnknown_3005008
ldr r0, _080CCFF0 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, _080CCFF4 @ =0x00003802
@@ -5429,7 +5429,7 @@ sub_80CCFBC: @ 80CCFBC
b _080CD000
.align 2, 0
_080CCFEC: .4byte 0x00004026
_080CCFF0: .4byte gUnknown_3005008
_080CCFF0: .4byte gSaveBlock1Ptr
_080CCFF4: .4byte 0x00003802
_080CCFF8:
adds r0, r4, 0
@@ -5502,7 +5502,7 @@ _080CD06C:
thumb_func_start sub_80CD074
sub_80CD074: @ 80CD074
push {lr}
ldr r0, _080CD088 @ =gUnknown_3005008
ldr r0, _080CD088 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, _080CD08C @ =0x00000a02
@@ -5511,7 +5511,7 @@ sub_80CD074: @ 80CD074
movs r0, 0x1
b _080CD092
.align 2, 0
_080CD088: .4byte gUnknown_3005008
_080CD088: .4byte gSaveBlock1Ptr
_080CD08C: .4byte 0x00000a02
_080CD090:
movs r0, 0
asm/field_weather.s
+10 -10
View File
@@ -2771,7 +2771,7 @@ _0807B0FA:
thumb_func_start SetSav1Weather
SetSav1Weather: @ 807B100
push {r4,r5,lr}
ldr r4, _0807B12C @ =gUnknown_3005008
ldr r4, _0807B12C @ =gSaveBlock1Ptr
ldr r1, [r4]
adds r1, 0x2E
ldrb r5, [r1]
@@ -2790,24 +2790,24 @@ SetSav1Weather: @ 807B100
pop {r0}
bx r0
.align 2, 0
_0807B12C: .4byte gUnknown_3005008
_0807B12C: .4byte gSaveBlock1Ptr
thumb_func_end SetSav1Weather
thumb_func_start sav1_get_weather_probably
sav1_get_weather_probably: @ 807B130
ldr r0, _0807B13C @ =gUnknown_3005008
ldr r0, _0807B13C @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x2E
ldrb r0, [r0]
bx lr
.align 2, 0
_0807B13C: .4byte gUnknown_3005008
_0807B13C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_get_weather_probably
thumb_func_start sub_807B140
sub_807B140: @ 807B140
push {r4,r5,lr}
ldr r4, _0807B16C @ =gUnknown_3005008
ldr r4, _0807B16C @ =gSaveBlock1Ptr
ldr r0, [r4]
adds r0, 0x2E
ldrb r5, [r0]
@@ -2826,7 +2826,7 @@ sub_807B140: @ 807B140
pop {r0}
bx r0
.align 2, 0
_0807B16C: .4byte gUnknown_3005008
_0807B16C: .4byte gSaveBlock1Ptr
_0807B170: .4byte gUnknown_2036DFC
thumb_func_end sub_807B140
@@ -2964,7 +2964,7 @@ _0807B278: .4byte gUnknown_83C65C0
_0807B27C:
ldr r1, _0807B28C @ =gUnknown_83C65C4
_0807B27E:
ldr r0, _0807B290 @ =gUnknown_3005008
ldr r0, _0807B290 @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x2F
ldrb r0, [r0]
@@ -2973,7 +2973,7 @@ _0807B27E:
b _0807B296
.align 2, 0
_0807B28C: .4byte gUnknown_83C65C4
_0807B290: .4byte gUnknown_3005008
_0807B290: .4byte gSaveBlock1Ptr
_0807B294:
movs r0, 0
_0807B296:
@@ -2984,7 +2984,7 @@ _0807B296:
thumb_func_start UpdateWeatherPerDay
UpdateWeatherPerDay: @ 807B29C
lsls r0, 16
ldr r1, _0807B2B8 @ =gUnknown_3005008
ldr r1, _0807B2B8 @ =gSaveBlock1Ptr
ldr r2, [r1]
adds r2, 0x2F
lsrs r0, 16
@@ -2998,7 +2998,7 @@ UpdateWeatherPerDay: @ 807B29C
strb r1, [r2]
bx lr
.align 2, 0
_0807B2B8: .4byte gUnknown_3005008
_0807B2B8: .4byte gSaveBlock1Ptr
thumb_func_end UpdateWeatherPerDay
thumb_func_start UpdateRainCounter
asm/fieldmap.s
+41 -41
View File
@@ -995,14 +995,14 @@ sub_80590D8: @ 80590D8
mov r7, r9
mov r6, r8
push {r6,r7}
ldr r0, _08059144 @ =gUnknown_300500C
ldr r0, _08059144 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, _08059148 @ =0x00000898
adds r4, r0, r1
ldr r0, _0805914C @ =gUnknown_3005040
ldr r0, [r0]
mov r8, r0
ldr r0, _08059150 @ =gUnknown_3005008
ldr r0, _08059150 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r2, 0
ldrsh r6, [r0, r2]
@@ -1050,10 +1050,10 @@ _08059138:
pop {r0}
bx r0
.align 2, 0
_08059144: .4byte gUnknown_300500C
_08059144: .4byte gSaveBlock2Ptr
_08059148: .4byte 0x00000898
_0805914C: .4byte gUnknown_3005040
_08059150: .4byte gUnknown_3005008
_08059150: .4byte gSaveBlock1Ptr
_08059154: .4byte gUnknown_2031DFC
thumb_func_end sub_80590D8
@@ -1062,7 +1062,7 @@ sub_8059158: @ 8059158
push {r4,lr}
movs r2, 0
movs r1, 0
ldr r0, _08059184 @ =gUnknown_300500C
ldr r0, _08059184 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r4, _08059188 @ =0x00000898
adds r3, r0, r4
@@ -1082,7 +1082,7 @@ _08059168:
movs r0, 0
b _08059192
.align 2, 0
_08059184: .4byte gUnknown_300500C
_08059184: .4byte gSaveBlock2Ptr
_08059188: .4byte 0x00000898
_0805918C: .4byte 0x000001ff
_08059190:
@@ -1100,7 +1100,7 @@ sub_8059198: @ 8059198
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r0, _080591B8 @ =gUnknown_300500C
ldr r0, _080591B8 @ =gSaveBlock2Ptr
ldr r1, [r0]
ldr r0, _080591BC @ =0x00000898
adds r1, r0
@@ -1111,7 +1111,7 @@ sub_8059198: @ 8059198
pop {r0}
bx r0
.align 2, 0
_080591B8: .4byte gUnknown_300500C
_080591B8: .4byte gSaveBlock2Ptr
_080591BC: .4byte 0x00000898
_080591C0: .4byte 0x01000100
thumb_func_end sub_8059198
@@ -1122,7 +1122,7 @@ sub_80591C4: @ 80591C4
mov r7, r9
mov r6, r8
push {r6,r7}
ldr r0, _0805923C @ =gUnknown_300500C
ldr r0, _0805923C @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, _08059240 @ =0x00000898
adds r4, r0, r1
@@ -1132,7 +1132,7 @@ sub_80591C4: @ 80591C4
ldr r0, _08059244 @ =gUnknown_3005040
ldr r0, [r0]
mov r8, r0
ldr r0, _08059248 @ =gUnknown_3005008
ldr r0, _08059248 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r2, 0
ldrsh r6, [r0, r2]
@@ -1182,10 +1182,10 @@ _08059230:
pop {r0}
bx r0
.align 2, 0
_0805923C: .4byte gUnknown_300500C
_0805923C: .4byte gSaveBlock2Ptr
_08059240: .4byte 0x00000898
_08059244: .4byte gUnknown_3005040
_08059248: .4byte gUnknown_3005008
_08059248: .4byte gSaveBlock1Ptr
_0805924C: .4byte gUnknown_2031DFC
thumb_func_end sub_80591C4
@@ -1200,7 +1200,7 @@ sub_8059250: @ 8059250
lsls r0, 24
lsrs r1, r0, 24
adds r2, r1, 0
ldr r0, _0805929C @ =gUnknown_300500C
ldr r0, _0805929C @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, _080592A0 @ =0x00000898
adds r3, r0, r3
@@ -1211,7 +1211,7 @@ sub_8059250: @ 8059250
movs r4, 0
mov r9, r4
mov r8, r4
ldr r0, _080592A8 @ =gUnknown_3005008
ldr r0, _080592A8 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r3, 0
ldrsh r6, [r0, r3]
@@ -1229,10 +1229,10 @@ sub_8059250: @ 8059250
beq _080592BE
b _080592D6
.align 2, 0
_0805929C: .4byte gUnknown_300500C
_0805929C: .4byte gSaveBlock2Ptr
_080592A0: .4byte 0x00000898
_080592A4: .4byte gUnknown_3005040
_080592A8: .4byte gUnknown_3005008
_080592A8: .4byte gSaveBlock1Ptr
_080592AC:
cmp r2, 0x3
beq _080592C8
@@ -1454,7 +1454,7 @@ _08059432:
GetPostCameraMoveMapBorderId: @ 805943C
push {r4,lr}
adds r3, r1, 0
ldr r1, _08059460 @ =gUnknown_3005008
ldr r1, _08059460 @ =gSaveBlock1Ptr
ldr r1, [r1]
movs r4, 0
ldrsh r2, [r1, r4]
@@ -1470,13 +1470,13 @@ GetPostCameraMoveMapBorderId: @ 805943C
pop {r1}
bx r1
.align 2, 0
_08059460: .4byte gUnknown_3005008
_08059460: .4byte gSaveBlock1Ptr
thumb_func_end GetPostCameraMoveMapBorderId
thumb_func_start CanCameraMoveInDirection
CanCameraMoveInDirection: @ 8059464
push {r4,r5,lr}
ldr r1, _0805949C @ =gUnknown_3005008
ldr r1, _0805949C @ =gSaveBlock1Ptr
ldr r4, [r1]
movs r1, 0
ldrsh r3, [r4, r1]
@@ -1502,7 +1502,7 @@ CanCameraMoveInDirection: @ 8059464
movs r0, 0x1
b _080594A6
.align 2, 0
_0805949C: .4byte gUnknown_3005008
_0805949C: .4byte gSaveBlock1Ptr
_080594A0: .4byte gUnknown_826D2D8
_080594A4:
movs r0, 0
@@ -1533,7 +1533,7 @@ _080594CA:
beq _080594E8
cmp r4, 0x4
bne _08059526
ldr r0, _080594E4 @ =gUnknown_3005008
ldr r0, _080594E4 @ =gSaveBlock1Ptr
ldr r1, [r0]
negs r0, r6
strh r0, [r1]
@@ -1542,9 +1542,9 @@ _080594CA:
subs r0, r2
b _08059524
.align 2, 0
_080594E4: .4byte gUnknown_3005008
_080594E4: .4byte gSaveBlock1Ptr
_080594E8:
ldr r0, _080594FC @ =gUnknown_3005008
ldr r0, _080594FC @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, [r3]
ldr r0, [r0]
@@ -1554,9 +1554,9 @@ _080594E8:
subs r0, r2
b _08059524
.align 2, 0
_080594FC: .4byte gUnknown_3005008
_080594FC: .4byte gSaveBlock1Ptr
_08059500:
ldr r0, _08059510 @ =gUnknown_3005008
ldr r0, _08059510 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, [r5, 0x4]
ldrh r0, [r1]
@@ -1565,9 +1565,9 @@ _08059500:
negs r0, r7
b _08059524
.align 2, 0
_08059510: .4byte gUnknown_3005008
_08059510: .4byte gSaveBlock1Ptr
_08059514:
ldr r0, _0805952C @ =gUnknown_3005008
ldr r0, _0805952C @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, [r5, 0x4]
ldrh r0, [r1]
@@ -1582,7 +1582,7 @@ _08059526:
pop {r0}
bx r0
.align 2, 0
_0805952C: .4byte gUnknown_3005008
_0805952C: .4byte gSaveBlock1Ptr
thumb_func_end sub_80594AC
thumb_func_start CameraMove
@@ -1608,7 +1608,7 @@ CameraMove: @ 8059530
adds r0, r7, 0x1
cmp r0, 0x1
bhi _08059578
ldr r0, _08059574 @ =gUnknown_3005008
ldr r0, _08059574 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldrh r0, [r1]
add r0, r10
@@ -1619,10 +1619,10 @@ CameraMove: @ 8059530
b _080595E2
.align 2, 0
_08059570: .4byte gUnknown_2036E18
_08059574: .4byte gUnknown_3005008
_08059574: .4byte gSaveBlock1Ptr
_08059578:
bl sub_80590D8
ldr r1, _080595F8 @ =gUnknown_3005008
ldr r1, _080595F8 @ =gSaveBlock1Ptr
ldr r0, [r1]
movs r2, 0
ldrsh r5, [r0, r2]
@@ -1649,7 +1649,7 @@ _08059578:
orrs r0, r1
ldr r2, _080595FC @ =gUnknown_2036E18
strb r0, [r2]
ldr r0, _080595F8 @ =gUnknown_3005008
ldr r0, _080595F8 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r2, 0
ldrsh r0, [r1, r2]
@@ -1682,7 +1682,7 @@ _080595E2:
pop {r1}
bx r1
.align 2, 0
_080595F8: .4byte gUnknown_3005008
_080595F8: .4byte gSaveBlock1Ptr
_080595FC: .4byte gUnknown_2036E18
thumb_func_end CameraMove
@@ -1977,7 +1977,7 @@ sub_80597EC: @ 80597EC
lsrs r0, 16
lsls r1, 16
lsrs r1, 16
ldr r2, _08059804 @ =gUnknown_3005008
ldr r2, _08059804 @ =gSaveBlock1Ptr
ldr r2, [r2]
subs r0, 0x7
strh r0, [r2]
@@ -1985,12 +1985,12 @@ sub_80597EC: @ 80597EC
strh r1, [r2, 0x2]
bx lr
.align 2, 0
_08059804: .4byte gUnknown_3005008
_08059804: .4byte gSaveBlock1Ptr
thumb_func_end sub_80597EC
thumb_func_start sav1_camera_get_focus_coords
sav1_camera_get_focus_coords: @ 8059808
ldr r2, _0805981C @ =gUnknown_3005008
ldr r2, _0805981C @ =gSaveBlock1Ptr
ldr r3, [r2]
ldrh r2, [r3]
adds r2, 0x7
@@ -2000,23 +2000,23 @@ sav1_camera_get_focus_coords: @ 8059808
strh r0, [r1]
bx lr
.align 2, 0
_0805981C: .4byte gUnknown_3005008
_0805981C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_camera_get_focus_coords
thumb_func_start SetCameraCoords
SetCameraCoords: @ 8059820
ldr r2, _0805982C @ =gUnknown_3005008
ldr r2, _0805982C @ =gSaveBlock1Ptr
ldr r2, [r2]
strh r0, [r2]
strh r1, [r2, 0x2]
bx lr
.align 2, 0
_0805982C: .4byte gUnknown_3005008
_0805982C: .4byte gSaveBlock1Ptr
thumb_func_end SetCameraCoords
thumb_func_start GetCameraCoords
GetCameraCoords: @ 8059830
ldr r2, _08059840 @ =gUnknown_3005008
ldr r2, _08059840 @ =gSaveBlock1Ptr
ldr r3, [r2]
ldrh r2, [r3]
strh r2, [r0]
@@ -2024,7 +2024,7 @@ GetCameraCoords: @ 8059830
strh r0, [r1]
bx lr
.align 2, 0
_08059840: .4byte gUnknown_3005008
_08059840: .4byte gSaveBlock1Ptr
thumb_func_end GetCameraCoords
thumb_func_start copy_tileset_patterns_to_vram
asm/fldeff_flash.s
+10 -10
View File
@@ -185,7 +185,7 @@ sub_80C9BFC: @ 80C9BFC
lsls r0, 24
cmp r0, 0
bne _080C9CC2
ldr r0, _080C9CE4 @ =gUnknown_30030F0
ldr r0, _080C9CE4 @ =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
_080C9CC2:
@@ -200,7 +200,7 @@ _080C9CD4: .4byte 0x05000002
_080C9CD8: .4byte 0x810001ff
_080C9CDC: .4byte sub_80C9BE8
_080C9CE0: .4byte sub_80C9BD0
_080C9CE4: .4byte gUnknown_30030F0
_080C9CE4: .4byte gMain
thumb_func_end sub_80C9BFC
thumb_func_start sub_80C9CE8
@@ -579,14 +579,14 @@ sub_80C9FA0: @ 80C9FA0
.align 2, 0
_080C9FC0: .4byte gUnknown_3005090
_080C9FC4:
ldr r0, _080C9FD0 @ =gUnknown_30030F0
ldr r0, _080C9FD0 @ =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
_080C9FCC:
pop {r0}
bx r0
.align 2, 0
_080C9FD0: .4byte gUnknown_30030F0
_080C9FD0: .4byte gMain
thumb_func_end sub_80C9FA0
thumb_func_start sub_80C9FD4
@@ -766,7 +766,7 @@ _080CA140:
movs r1, 0
movs r2, 0x20
bl LoadPalette
ldr r0, _080CA15C @ =gUnknown_30030F0
ldr r0, _080CA15C @ =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
_080CA152:
@@ -775,7 +775,7 @@ _080CA152:
bx r0
.align 2, 0
_080CA158: .4byte gUnknown_83F5824
_080CA15C: .4byte gUnknown_30030F0
_080CA15C: .4byte gMain
thumb_func_end sub_80CA108
thumb_func_start sub_80CA160
@@ -837,7 +837,7 @@ _080CA1C0:
.4byte _080CA262
.4byte _080CA2A4
_080CA1D8:
ldr r0, _080CA204 @ =gUnknown_30030F0
ldr r0, _080CA204 @ =gMain
ldr r2, [r0, 0xC]
adds r0, r5, 0
movs r1, 0x5
@@ -854,7 +854,7 @@ _080CA1D8:
bl BlendPalettes
b _080CA294
.align 2, 0
_080CA204: .4byte gUnknown_30030F0
_080CA204: .4byte gMain
_080CA208:
bl sub_80F8258
cmp r0, 0
@@ -904,7 +904,7 @@ _080CA262:
ldrsh r1, [r4, r2]
cmp r0, r1
bgt _080CA280
ldr r0, _080CA29C @ =gUnknown_30030F0
ldr r0, _080CA29C @ =gMain
ldrh r1, [r0, 0x2C]
movs r0, 0x2
ands r0, r1
@@ -926,7 +926,7 @@ _080CA294:
strh r0, [r4]
b _080CA2D2
.align 2, 0
_080CA29C: .4byte gUnknown_30030F0
_080CA29C: .4byte gMain
_080CA2A0: .4byte 0x00007fff
_080CA2A4:
bl UpdatePaletteFade
asm/hall_of_fame.s
+23 -23
View File
@@ -31,7 +31,7 @@ sub_80F1DC0: @ 80F1DC0
InitHallOfFameScreen: @ 80F1DDC
push {r4,lr}
sub sp, 0x4
ldr r0, _080F1DFC @ =gUnknown_30030F0
ldr r0, _080F1DFC @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -46,7 +46,7 @@ _080F1DF0:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080F1DFC: .4byte gUnknown_30030F0
_080F1DFC: .4byte gMain
_080F1E00: .4byte _080F1E04
.align 2, 0
_080F1E04:
@@ -66,7 +66,7 @@ _080F1E18:
ldr r0, _080F1E48 @ =0x00002008
bl AllocZeroed
str r0, [r4]
ldr r0, _080F1E4C @ =gUnknown_30030F0
ldr r0, _080F1E4C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -77,7 +77,7 @@ _080F1E18:
_080F1E40: .4byte gUnknown_3005ECC
_080F1E44: .4byte gUnknown_203AB3C
_080F1E48: .4byte 0x00002008
_080F1E4C: .4byte gUnknown_30030F0
_080F1E4C: .4byte gMain
_080F1E50:
bl sub_80F36BC
b _080F1EAA
@@ -117,7 +117,7 @@ _080F1E88:
movs r3, 0
bl BeginNormalPaletteFade
_080F1EAA:
ldr r1, _080F1EC0 @ =gUnknown_30030F0
ldr r1, _080F1EC0 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -127,7 +127,7 @@ _080F1EAA:
b _080F1EF0
.align 2, 0
_080F1EBC: .4byte sub_80F1DAC
_080F1EC0: .4byte gUnknown_30030F0
_080F1EC0: .4byte gMain
_080F1EC4:
bl UpdatePaletteFade
ldr r0, _080F1EE8 @ =gUnknown_2037AB8
@@ -1168,7 +1168,7 @@ sub_80F26D4: @ 80F26D4
bl ShowBg
movs r0, 0x3
bl ShowBg
ldr r0, _080F2748 @ =gUnknown_300500C
ldr r0, _080F2748 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
movs r1, 0x1
@@ -1204,7 +1204,7 @@ sub_80F26D4: @ 80F26D4
pop {r0}
bx r0
.align 2, 0
_080F2748: .4byte gUnknown_300500C
_080F2748: .4byte gSaveBlock2Ptr
_080F274C: .4byte 0x0000ffff
_080F2750: .4byte gUnknown_3005090
_080F2754: .4byte gUnknown_840C234
@@ -1298,7 +1298,7 @@ Task_Hof_ExitOnKeyPressed: @ 80F2804
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080F2830 @ =gUnknown_30030F0
ldr r0, _080F2830 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1318,7 +1318,7 @@ _080F282A:
pop {r0}
bx r0
.align 2, 0
_080F2830: .4byte gUnknown_30030F0
_080F2830: .4byte gMain
_080F2834: .4byte gUnknown_3005090
_080F2838: .4byte Task_Hof_HandlePaletteOnExit
thumb_func_end Task_Hof_ExitOnKeyPressed
@@ -1472,7 +1472,7 @@ _080F2974: .4byte gUnknown_2031DD8
thumb_func_start sub_80F2978
sub_80F2978: @ 80F2978
push {r4,lr}
ldr r0, _080F2994 @ =gUnknown_30030F0
ldr r0, _080F2994 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -1485,7 +1485,7 @@ sub_80F2978: @ 80F2978
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080F2994: .4byte gUnknown_30030F0
_080F2994: .4byte gMain
_080F2998: .4byte _080F299C
.align 2, 0
_080F299C:
@@ -1503,7 +1503,7 @@ _080F29B4:
ldr r0, _080F29DC @ =0x00002008
bl AllocZeroed
str r0, [r4]
ldr r0, _080F29E0 @ =gUnknown_30030F0
ldr r0, _080F29E0 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -1513,7 +1513,7 @@ _080F29B4:
.align 2, 0
_080F29D8: .4byte gUnknown_203AB3C
_080F29DC: .4byte 0x00002008
_080F29E0: .4byte gUnknown_30030F0
_080F29E0: .4byte gMain
_080F29E4:
bl sub_80F36BC
b _080F2A42
@@ -1553,7 +1553,7 @@ _080F2A28:
cmp r0, 0
bne _080F2A8C
_080F2A42:
ldr r1, _080F2A54 @ =gUnknown_30030F0
ldr r1, _080F2A54 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -1562,7 +1562,7 @@ _080F2A42:
strb r0, [r1]
b _080F2A8C
.align 2, 0
_080F2A54: .4byte gUnknown_30030F0
_080F2A54: .4byte gMain
_080F2A58:
ldr r1, _080F2A94 @ =0x00003f42
movs r0, 0x50
@@ -2087,7 +2087,7 @@ Task_HofPC_HandleInput: @ 80F2E8C
push {r7}
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _080F2F00 @ =gUnknown_30030F0
ldr r1, _080F2F00 @ =gMain
ldrh r2, [r1, 0x2E]
movs r0, 0x1
ands r0, r2
@@ -2142,7 +2142,7 @@ _080F2EF8:
str r0, [r1]
b _080F2FD8
.align 2, 0
_080F2F00: .4byte gUnknown_30030F0
_080F2F00: .4byte gMain
_080F2F04: .4byte gUnknown_3005090
_080F2F08: .4byte sub_80F2B6C
_080F2F0C:
@@ -2385,7 +2385,7 @@ Task_HofPC_ExitOnButtonPress: @ 80F310C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080F3130 @ =gUnknown_30030F0
ldr r0, _080F3130 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -2402,7 +2402,7 @@ _080F312C:
pop {r0}
bx r0
.align 2, 0
_080F3130: .4byte gUnknown_30030F0
_080F3130: .4byte gMain
_080F3134: .4byte gUnknown_3005090
_080F3138: .4byte sub_80F2FEC
thumb_func_end Task_HofPC_ExitOnButtonPress
@@ -2765,7 +2765,7 @@ sub_80F33DC: @ 80F33DC
movs r2, 0x4
movs r3, 0x3
bl AddTextPrinterParametrized2
ldr r0, _080F35FC @ =gUnknown_300500C
ldr r0, _080F35FC @ =gSaveBlock2Ptr
mov r10, r0
ldr r1, [r0]
movs r0, 0x2
@@ -2926,7 +2926,7 @@ _080F3582:
movs r0, 0xF0
strb r0, [r1, 0x3]
adds r4, r1, 0
ldr r0, _080F35FC @ =gUnknown_300500C
ldr r0, _080F35FC @ =gSaveBlock2Ptr
ldr r5, [r0]
ldrb r0, [r5, 0x10]
movs r1, 0x64
@@ -2974,7 +2974,7 @@ _080F35EC: .4byte gUnknown_840C234
_080F35F0: .4byte 0x0000021d
_080F35F4: .4byte gUnknown_840C240
_080F35F8: .4byte gUnknown_84160FC
_080F35FC: .4byte gUnknown_300500C
_080F35FC: .4byte gSaveBlock2Ptr
_080F3600: .4byte gUnknown_8416104
_080F3604: .4byte 0x000186a0
_080F3608: .4byte 0x00002710
asm/heal_location.s
+4 -4
View File
@@ -93,7 +93,7 @@ sub_80BFCD0: @ 80BFCD0
lsrs r5, r0, 16
cmp r5, 0x1
bne _080BFD38
ldr r0, _080BFD28 @ =gUnknown_3005008
ldr r0, _080BFD28 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, _080BFD2C @ =0x00003d34
adds r0, r1, r2
@@ -127,12 +127,12 @@ _080BFD0A:
b _080BFDFA
.align 2, 0
_080BFD24: .4byte 0x00004082
_080BFD28: .4byte gUnknown_3005008
_080BFD28: .4byte gSaveBlock1Ptr
_080BFD2C: .4byte 0x00003d34
_080BFD30: .4byte 0x00003d42
_080BFD34: .4byte gUnknown_20370D2
_080BFD38:
ldr r0, _080BFD7C @ =gUnknown_3005008
ldr r0, _080BFD7C @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x1C
ldrsb r0, [r1, r0]
@@ -166,7 +166,7 @@ _080BFD38:
movs r0, 0x5
b _080BFDF2
.align 2, 0
_080BFD7C: .4byte gUnknown_3005008
_080BFD7C: .4byte gSaveBlock1Ptr
_080BFD80: .4byte gUnknown_83EEC98
_080BFD84:
ldr r0, _080BFDA4 @ =gUnknown_83EEC98
asm/help_system.s
+13 -13
View File
@@ -37,12 +37,12 @@ _0813B8B4:
ldr r1, _0813B904 @ =gUnknown_203F177
movs r0, 0
strb r0, [r1]
ldr r0, _0813B908 @ =gUnknown_300500C
ldr r0, _0813B908 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0
bne _0813B900
ldr r2, _0813B90C @ =gUnknown_30030F0
ldr r2, _0813B90C @ =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x80
lsls r0, 1
@@ -78,8 +78,8 @@ _0813B900:
b _0813BB28
.align 2, 0
_0813B904: .4byte gUnknown_203F177
_0813B908: .4byte gUnknown_300500C
_0813B90C: .4byte gUnknown_30030F0
_0813B908: .4byte gSaveBlock2Ptr
_0813B90C: .4byte gMain
_0813B910: .4byte gUnknown_203F175
_0813B914: .4byte gUnknown_3005ECC
_0813B918:
@@ -309,7 +309,7 @@ _0813BB34: .4byte gUnknown_203F178
thumb_func_start sub_813BB38
sub_813BB38: @ 813BB38
ldr r2, _0813BB60 @ =gUnknown_203F178
ldr r1, _0813BB64 @ =gUnknown_30030F0
ldr r1, _0813BB64 @ =gMain
ldr r0, [r1, 0xC]
str r0, [r2]
ldr r0, [r1, 0x10]
@@ -330,7 +330,7 @@ sub_813BB38: @ 813BB38
bx lr
.align 2, 0
_0813BB60: .4byte gUnknown_203F178
_0813BB64: .4byte gUnknown_30030F0
_0813BB64: .4byte gMain
_0813BB68: .4byte 0x040000b0
_0813BB6C: .4byte 0x0000c5ff
_0813BB70: .4byte 0x00007fff
@@ -393,7 +393,7 @@ _0813BBD8: .4byte gUnknown_203F18A
thumb_func_start sub_813BBDC
sub_813BBDC: @ 813BBDC
ldr r2, _0813BBEC @ =gUnknown_30030F0
ldr r2, _0813BBEC @ =gMain
ldr r1, _0813BBF0 @ =gUnknown_203F178
ldr r0, [r1]
str r0, [r2, 0xC]
@@ -401,7 +401,7 @@ sub_813BBDC: @ 813BBDC
str r0, [r2, 0x10]
bx lr
.align 2, 0
_0813BBEC: .4byte gUnknown_30030F0
_0813BBEC: .4byte gMain
_0813BBF0: .4byte gUnknown_203F178
thumb_func_end sub_813BBDC
@@ -1095,7 +1095,7 @@ _0813C0EC:
cmp r1, 0x1
bne _0813C154
movs r4, 0
ldr r0, _0813C14C @ =gUnknown_300500C
ldr r0, _0813C14C @ =gSaveBlock2Ptr
ldr r1, [r0]
ldrb r1, [r1]
cmp r1, 0xFF
@@ -1128,7 +1128,7 @@ _0813C106:
lsrs r4, r0, 24
cmp r4, 0x9
bhi _0813C0AC
ldr r0, _0813C14C @ =gUnknown_300500C
ldr r0, _0813C14C @ =gSaveBlock2Ptr
ldr r1, [r0]
adds r1, r4
ldrb r1, [r1]
@@ -1136,7 +1136,7 @@ _0813C106:
bne _0813C106
b _0813C0AC
.align 2, 0
_0813C14C: .4byte gUnknown_300500C
_0813C14C: .4byte gSaveBlock2Ptr
_0813C150: .4byte gUnknown_3003E20
_0813C154:
cmp r1, 0x2
@@ -1815,7 +1815,7 @@ sub_813C690: @ 813C690
.align 2, 0
_0813C6A0: .4byte gUnknown_203F176
_0813C6A4:
ldr r2, _0813C6C8 @ =gUnknown_30030F0
ldr r2, _0813C6C8 @ =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1833,7 +1833,7 @@ _0813C6A4:
ldr r0, [r0, 0x4]
b _0813C756
.align 2, 0
_0813C6C8: .4byte gUnknown_30030F0
_0813C6C8: .4byte gMain
_0813C6CC: .4byte gUnknown_203F190
_0813C6D0:
movs r0, 0x2
asm/help_system_812B1E0.s
+10 -10
View File
@@ -108,7 +108,7 @@ _0812B278: .4byte gUnknown_845C5BC
sub_812B27C: @ 812B27C
push {r4,lr}
adds r2, r0, 0
ldr r0, _0812B2AC @ =gUnknown_3005008
ldr r0, _0812B2AC @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x4
ldrsb r1, [r0, r1]
@@ -132,7 +132,7 @@ _0812B2A2:
movs r0, 0x1
b _0812B2BE
.align 2, 0
_0812B2AC: .4byte gUnknown_3005008
_0812B2AC: .4byte gSaveBlock1Ptr
_0812B2B0: .4byte 0x0000ffff
_0812B2B4:
adds r1, 0x2
@@ -173,7 +173,7 @@ _0812B2EC:
adds r3, r1, r5
adds r0, r3, r4
ldrb r1, [r0]
ldr r0, _0812B324 @ =gUnknown_3005008
ldr r0, _0812B324 @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r0, 0x4
ldrsb r0, [r2, r0]
@@ -199,7 +199,7 @@ _0812B320:
movs r0, 0x1
b _0812B34C
.align 2, 0
_0812B324: .4byte gUnknown_3005008
_0812B324: .4byte gSaveBlock1Ptr
_0812B328: .4byte 0x00000849
_0812B32C:
adds r0, r6, 0x1
@@ -257,7 +257,7 @@ _0812B388:
lsls r0, 24
cmp r0, 0
beq _0812B400
ldr r0, _0812B3B4 @ =gUnknown_3005008
ldr r0, _0812B3B4 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
cmp r1, 0x4
@@ -272,7 +272,7 @@ _0812B3A8:
b _0812B406
.align 2, 0
_0812B3B0: .4byte gUnknown_2036DFC
_0812B3B4: .4byte gUnknown_3005008
_0812B3B4: .4byte gSaveBlock1Ptr
_0812B3B8:
movs r0, 0xC1
lsls r0, 2
@@ -1312,7 +1312,7 @@ _0812BC7C: .4byte gUnknown_841DFA5
sub_812BC80: @ 812BC80
push {r4,lr}
adds r4, r0, 0
ldr r0, _0812BCA4 @ =gUnknown_30030F0
ldr r0, _0812BCA4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1328,7 +1328,7 @@ _0812BC9A:
pop {r1}
bx r1
.align 2, 0
_0812BCA4: .4byte gUnknown_30030F0
_0812BCA4: .4byte gMain
thumb_func_end sub_812BC80
thumb_func_start sub_812BCA8
@@ -1646,7 +1646,7 @@ _0812BF14: .4byte gUnknown_3005E9C
sub_812BF18: @ 812BF18
push {r4,lr}
adds r4, r0, 0
ldr r0, _0812BF40 @ =gUnknown_30030F0
ldr r0, _0812BF40 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -1664,7 +1664,7 @@ _0812BF30:
movs r0, 0x1
b _0812BF54
.align 2, 0
_0812BF40: .4byte gUnknown_30030F0
_0812BF40: .4byte gMain
_0812BF44:
movs r0, 0xC0
lsls r0, 2
asm/intro.s
+21 -21
View File
@@ -81,7 +81,7 @@ _080EC628: .4byte gUnknown_203AAD4
sub_80EC62C: @ 80EC62C
push {r4-r6,lr}
sub sp, 0xC
ldr r0, _080EC64C @ =gUnknown_30030F0
ldr r0, _080EC64C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r5, r0, r1
@@ -96,7 +96,7 @@ _080EC640:
beq _080EC65E
b _080EC732
.align 2, 0
_080EC64C: .4byte gUnknown_30030F0
_080EC64C: .4byte gMain
_080EC650:
cmp r4, 0x8D
bne _080EC656
@@ -191,12 +191,12 @@ _080EC65E:
movs r0, 0
bl SetGpuReg
ldr r0, _080EC76C @ =SerialCb_CopyrightScreen
bl sub_8000718
bl SetSerialCallback
ldr r0, _080EC770 @ =gUnknown_203AAD4
bl GameCubeMultiBoot_Init
_080EC732:
bl UpdatePaletteFade
ldr r0, _080EC774 @ =gUnknown_30030F0
ldr r0, _080EC774 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -217,7 +217,7 @@ _080EC764: .4byte 0x0000ffff
_080EC768: .4byte sub_80EC5A4
_080EC76C: .4byte SerialCb_CopyrightScreen
_080EC770: .4byte gUnknown_203AAD4
_080EC774: .4byte gUnknown_30030F0
_080EC774: .4byte gMain
_080EC778:
ldr r4, _080EC7A0 @ =gUnknown_203AAD4
adds r0, r4, 0
@@ -277,7 +277,7 @@ _080EC7F0: .4byte gMultiBootProgram_PokemonColosseum_Start
_080EC7F4:
bl GameCubeMultiBoot_Quit
ldr r0, _080EC804 @ =SerialCB
bl sub_8000718
bl SetSerialCallback
_080EC7FE:
movs r0, 0
b _080EC814
@@ -298,8 +298,8 @@ _080EC814:
_080EC81C: .4byte sub_80EC5B8
thumb_func_end sub_80EC62C
thumb_func_start sub_80EC820
sub_80EC820: @ 80EC820
thumb_func_start c2_copyright_1
c2_copyright_1: @ 80EC820
push {lr}
bl sub_80EC62C
lsls r0, 24
@@ -318,7 +318,7 @@ sub_80EC820: @ 80EC820
_080EC846:
bl Sav2_ClearSetDefault
_080EC84A:
ldr r0, _080EC860 @ =gUnknown_300500C
ldr r0, _080EC860 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x15]
lsls r0, 31
@@ -329,8 +329,8 @@ _080EC858:
bx r0
.align 2, 0
_080EC85C: .4byte gUnknown_30053A0
_080EC860: .4byte gUnknown_300500C
thumb_func_end sub_80EC820
_080EC860: .4byte gSaveBlock2Ptr
thumb_func_end c2_copyright_1
thumb_func_start sub_80EC864
sub_80EC864: @ 80EC864
@@ -344,7 +344,7 @@ sub_80EC864: @ 80EC864
sub_80EC870: @ 80EC870
push {r4,lr}
sub sp, 0xC
ldr r0, _080EC88C @ =gUnknown_30030F0
ldr r0, _080EC88C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -357,12 +357,12 @@ sub_80EC870: @ 80EC870
beq _080EC8A0
b _080EC894
.align 2, 0
_080EC88C: .4byte gUnknown_30030F0
_080EC88C: .4byte gMain
_080EC890:
cmp r4, 0x2
beq _080EC988
_080EC894:
ldr r0, _080EC928 @ =gUnknown_30030F0
ldr r0, _080EC928 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -427,7 +427,7 @@ _080EC8A0:
bl sub_8001658
b _080EC9B8
.align 2, 0
_080EC928: .4byte gUnknown_30030F0
_080EC928: .4byte gMain
_080EC92C: .4byte gHeap
_080EC930: .4byte 0x040000d4
_080EC934: .4byte 0x8100c000
@@ -482,7 +482,7 @@ _080EC988:
_080EC9B0: .4byte sub_80EC9D4
_080EC9B4: .4byte sub_80EC9EC
_080EC9B8:
ldr r1, _080EC9D0 @ =gUnknown_30030F0
ldr r1, _080EC9D0 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -495,7 +495,7 @@ _080EC9C6:
pop {r0}
bx r0
.align 2, 0
_080EC9D0: .4byte gUnknown_30030F0
_080EC9D0: .4byte gMain
thumb_func_end sub_80EC870
thumb_func_start sub_80EC9D4
@@ -607,7 +607,7 @@ sub_80ECAB0: @ 80ECAB0
movs r1, 0
bl GetWordTaskArg
adds r4, r0, 0
ldr r0, _080ECAE8 @ =gUnknown_30030F0
ldr r0, _080ECAE8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xD
ands r0, r1
@@ -627,7 +627,7 @@ _080ECAD8:
pop {r0}
bx r0
.align 2, 0
_080ECAE8: .4byte gUnknown_30030F0
_080ECAE8: .4byte gMain
_080ECAEC: .4byte sub_80EDBE8
thumb_func_end sub_80ECAB0
@@ -2528,7 +2528,7 @@ _080EDA7C:
.align 2, 0
_080EDA94: .4byte sub_80EDBE8
_080EDA98:
ldr r0, _080EDACC @ =gUnknown_30030F0
ldr r0, _080EDACC @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x80
lsls r0, 1
@@ -2556,7 +2556,7 @@ _080EDAC4:
pop {r0}
bx r0
.align 2, 0
_080EDACC: .4byte gUnknown_30030F0
_080EDACC: .4byte gMain
_080EDAD0: .4byte 0xffff0064
_080EDAD4: .4byte 0x00007fff
thumb_func_end sub_80ED898
asm/item.s
+26 -26
View File
@@ -8,7 +8,7 @@
thumb_func_start GetBagItemQuantity
GetBagItemQuantity: @ 8099DA0
adds r1, r0, 0
ldr r0, _08099DB8 @ =gUnknown_300500C
ldr r0, _08099DB8 @ =gSaveBlock2Ptr
ldr r0, [r0]
movs r2, 0xF2
lsls r2, 4
@@ -20,14 +20,14 @@ GetBagItemQuantity: @ 8099DA0
lsrs r0, 16
bx lr
.align 2, 0
_08099DB8: .4byte gUnknown_300500C
_08099DB8: .4byte gSaveBlock2Ptr
thumb_func_end GetBagItemQuantity
thumb_func_start sub_8099DBC
sub_8099DBC: @ 8099DBC
lsls r1, 16
lsrs r1, 16
ldr r2, _08099DD4 @ =gUnknown_300500C
ldr r2, _08099DD4 @ =gSaveBlock2Ptr
ldr r2, [r2]
movs r3, 0xF2
lsls r3, 4
@@ -37,7 +37,7 @@ sub_8099DBC: @ 8099DBC
strh r1, [r0]
bx lr
.align 2, 0
_08099DD4: .4byte gUnknown_300500C
_08099DD4: .4byte gSaveBlock2Ptr
thumb_func_end sub_8099DBC
thumb_func_start GetBagItemId
@@ -113,7 +113,7 @@ ApplyNewEncryptionKeyToBagItems_: @ 8099E38
thumb_func_start sub_8099E44
sub_8099E44: @ 8099E44
ldr r1, _08099E84 @ =gUnknown_203988C
ldr r0, _08099E88 @ =gUnknown_3005008
ldr r0, _08099E88 @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r3, 0xC4
lsls r3, 2
@@ -145,7 +145,7 @@ sub_8099E44: @ 8099E44
bx lr
.align 2, 0
_08099E84: .4byte gUnknown_203988C
_08099E88: .4byte gUnknown_3005008
_08099E88: .4byte gSaveBlock1Ptr
_08099E8C: .4byte 0x0000054c
thumb_func_end sub_8099E44
@@ -717,7 +717,7 @@ sub_809A2A4: @ 809A2A4
movs r5, 0xA6
lsls r5, 2
_0809A2AC:
ldr r0, _0809A2D8 @ =gUnknown_3005008
ldr r0, _0809A2D8 @ =gSaveBlock1Ptr
ldr r0, [r0]
lsls r3, r4, 2
adds r1, r0, r3
@@ -738,7 +738,7 @@ _0809A2AC:
pop {r0}
bx r0
.align 2, 0
_0809A2D8: .4byte gUnknown_3005008
_0809A2D8: .4byte gSaveBlock1Ptr
thumb_func_end sub_809A2A4
thumb_func_start sub_809A2DC
@@ -768,7 +768,7 @@ _0809A300: .4byte gUnknown_203988C
sub_809A304: @ 809A304
push {lr}
movs r1, 0
ldr r0, _0809A324 @ =gUnknown_3005008
ldr r0, _0809A324 @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r3, 0xA6
lsls r3, 2
@@ -784,7 +784,7 @@ _0809A310:
adds r0, r1, 0
b _0809A338
.align 2, 0
_0809A324: .4byte gUnknown_3005008
_0809A324: .4byte gSaveBlock1Ptr
_0809A328:
adds r0, r1, 0x1
lsls r0, 24
@@ -804,7 +804,7 @@ sub_809A33C: @ 809A33C
push {r4,lr}
movs r2, 0
movs r1, 0
ldr r0, _0809A370 @ =gUnknown_3005008
ldr r0, _0809A370 @ =gSaveBlock1Ptr
ldr r3, [r0]
movs r4, 0xA6
lsls r4, 2
@@ -829,7 +829,7 @@ _0809A35C:
pop {r1}
bx r1
.align 2, 0
_0809A370: .4byte gUnknown_3005008
_0809A370: .4byte gSaveBlock1Ptr
thumb_func_end sub_809A33C
thumb_func_start sub_809A374
@@ -841,7 +841,7 @@ sub_809A374: @ 809A374
lsrs r5, r1, 16
movs r4, 0
_0809A380:
ldr r0, _0809A3AC @ =gUnknown_3005008
ldr r0, _0809A3AC @ =gSaveBlock1Ptr
ldr r2, [r0]
lsls r1, r4, 2
adds r0, r2, r1
@@ -862,7 +862,7 @@ _0809A380:
movs r0, 0x1
b _0809A3C0
.align 2, 0
_0809A3AC: .4byte gUnknown_3005008
_0809A3AC: .4byte gSaveBlock1Ptr
_0809A3B0: .4byte 0x0000029a
_0809A3B4:
adds r0, r4, 0x1
@@ -885,7 +885,7 @@ sub_809A3C8: @ 809A3C8
lsls r1, 16
lsrs r5, r1, 16
movs r3, 0
ldr r6, _0809A404 @ =gUnknown_3005008
ldr r6, _0809A404 @ =gSaveBlock1Ptr
_0809A3D6:
ldr r2, [r6]
lsls r1, r3, 2
@@ -909,7 +909,7 @@ _0809A3D6:
ble _0809A444
b _0809A456
.align 2, 0
_0809A404: .4byte gUnknown_3005008
_0809A404: .4byte gSaveBlock1Ptr
_0809A408: .4byte 0x000003e7
_0809A40C:
adds r0, r3, 0x1
@@ -924,7 +924,7 @@ _0809A40C:
negs r0, r0
cmp r2, r0
beq _0809A456
ldr r0, _0809A440 @ =gUnknown_3005008
ldr r0, _0809A440 @ =gSaveBlock1Ptr
ldr r0, [r0]
lsls r2, 2
adds r1, r0, r2
@@ -938,7 +938,7 @@ _0809A40C:
adds r1, r5, 0
b _0809A44E
.align 2, 0
_0809A440: .4byte gUnknown_3005008
_0809A440: .4byte gSaveBlock1Ptr
_0809A444:
lsls r1, 16
lsrs r1, 16
@@ -970,7 +970,7 @@ sub_809A460: @ 809A460
cmp r2, 0
beq _0809A4D8
movs r4, 0
ldr r0, _0809A4E4 @ =gUnknown_3005008
ldr r0, _0809A4E4 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r3, 0xA6
lsls r3, 2
@@ -1026,7 +1026,7 @@ _0809A4D8:
pop {r0}
bx r0
.align 2, 0
_0809A4E4: .4byte gUnknown_3005008
_0809A4E4: .4byte gSaveBlock1Ptr
thumb_func_end sub_809A460
thumb_func_start sub_809A4E8
@@ -1040,7 +1040,7 @@ _0809A4EC:
adds r6, r1, 0
cmp r4, 0x1D
bhi _0809A52E
ldr r0, _0809A53C @ =gUnknown_3005008
ldr r0, _0809A53C @ =gSaveBlock1Ptr
mov r12, r0
lsls r5, r2, 2
movs r7, 0xA6
@@ -1078,13 +1078,13 @@ _0809A52E:
pop {r0}
bx r0
.align 2, 0
_0809A53C: .4byte gUnknown_3005008
_0809A53C: .4byte gSaveBlock1Ptr
thumb_func_end sub_809A4E8
thumb_func_start sub_809A540
sub_809A540: @ 809A540
push {lr}
ldr r0, _0809A55C @ =gUnknown_3005008
ldr r0, _0809A55C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, _0809A560 @ =0x00000296
adds r1, r0, r2
@@ -1098,7 +1098,7 @@ sub_809A540: @ 809A540
beq _0809A570
b _0809A572
.align 2, 0
_0809A55C: .4byte gUnknown_3005008
_0809A55C: .4byte gSaveBlock1Ptr
_0809A560: .4byte 0x00000296
_0809A564: .4byte 0x00000103
_0809A568:
@@ -1518,7 +1518,7 @@ _0809A85A:
ldr r0, _0809A898 @ =0x00000169
cmp r5, r0
bne _0809A86E
ldr r0, _0809A89C @ =gUnknown_3005008
ldr r0, _0809A89C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
movs r0, 0x81
@@ -1545,7 +1545,7 @@ _0809A88C:
.align 2, 0
_0809A894: .4byte 0xfea30000
_0809A898: .4byte 0x00000169
_0809A89C: .4byte gUnknown_3005008
_0809A89C: .4byte gSaveBlock1Ptr
_0809A8A0: .4byte gUnknown_2036DFC
thumb_func_end sub_809A824
asm/item_menu.s
+56 -56
View File
@@ -213,7 +213,7 @@ _08107F36:
thumb_func_start sub_8107F3C
sub_8107F3C: @ 8107F3C
push {r4,r5,lr}
ldr r0, _08107F58 @ =gUnknown_30030F0
ldr r0, _08107F58 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -228,7 +228,7 @@ _08107F4E:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08107F58: .4byte gUnknown_30030F0
_08107F58: .4byte gMain
_08107F5C: .4byte _08107F60
.align 2, 0
_08107F60:
@@ -415,7 +415,7 @@ _081080FA:
_08108102:
strb r0, [r2, 0x8]
_08108104:
ldr r1, _08108118 @ =gUnknown_30030F0
ldr r1, _08108118 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -425,7 +425,7 @@ _08108104:
b _08108134
.align 2, 0
_08108114: .4byte gUnknown_2037AB8
_08108118: .4byte gUnknown_30030F0
_08108118: .4byte gMain
_0810811C:
ldr r0, _0810812C @ =sub_8107EFC
bl SetVBlankCallback
@@ -643,7 +643,7 @@ _081082D8:
lsls r0, 24
cmp r0, 0
bne _08108352
ldr r0, _08108308 @ =gUnknown_300500C
ldr r0, _08108308 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -655,7 +655,7 @@ _081082D8:
b _08108352
.align 2, 0
_08108304: .4byte gUnknown_8E835B4
_08108308: .4byte gUnknown_300500C
_08108308: .4byte gSaveBlock2Ptr
_0810830C: .4byte gUnknown_8E83604
_08108310:
bl sub_810ADAC
@@ -663,7 +663,7 @@ _08108310:
lsrs r0, 24
cmp r0, 0x1
beq _08108326
ldr r0, _0810832C @ =gUnknown_300500C
ldr r0, _0810832C @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -672,7 +672,7 @@ _08108326:
ldr r0, _08108330 @ =gUnknown_83D41E4
b _0810834E
.align 2, 0
_0810832C: .4byte gUnknown_300500C
_0810832C: .4byte gSaveBlock2Ptr
_08108330: .4byte gUnknown_83D41E4
_08108334:
ldr r0, _0810833C @ =gUnknown_83D41EC
@@ -1178,7 +1178,7 @@ _08108720: .4byte gUnknown_2021CD0
_08108724: .4byte gUnknown_2021D18
_08108728: .4byte gUnknown_84162B9
_0810872C:
ldr r0, _08108760 @ =gUnknown_3005008
ldr r0, _08108760 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08108764 @ =0x00000296
adds r0, r1
@@ -1204,7 +1204,7 @@ _08108752:
pop {r0}
bx r0
.align 2, 0
_08108760: .4byte gUnknown_3005008
_08108760: .4byte gSaveBlock1Ptr
_08108764: .4byte 0x00000296
_08108768: .4byte gUnknown_8452F7C
thumb_func_end sub_8108654
@@ -2278,7 +2278,7 @@ _08108F4A:
beq _08108F8C
cmp r0, 0x2
beq _08108F94
ldr r0, _08108F88 @ =gUnknown_30030F0
ldr r0, _08108F88 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x4
ands r0, r1
@@ -2294,7 +2294,7 @@ _08108F78: .4byte gUnknown_3005098
_08108F7C: .4byte gUnknown_2037AB8
_08108F80: .4byte sub_8108CFC
_08108F84: .4byte gUnknown_203ACFC
_08108F88: .4byte gUnknown_30030F0
_08108F88: .4byte gMain
_08108F8C:
movs r1, 0x1
negs r1, r1
@@ -2537,7 +2537,7 @@ sub_8109168: @ 8109168
bl GetLRKeysState
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _081091A8 @ =gUnknown_30030F0
ldr r0, _081091A8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x20
ands r0, r1
@@ -2554,7 +2554,7 @@ _08109194:
b _081091C8
.align 2, 0
_081091A4: .4byte gUnknown_203AD10
_081091A8: .4byte gUnknown_30030F0
_081091A8: .4byte gMain
_081091AC:
movs r0, 0x10
ands r0, r1
@@ -2950,7 +2950,7 @@ sub_81094B0: @ 81094B0
lsrs r1, 16
movs r0, 0
bl sub_80986A8
ldr r0, _08109540 @ =gUnknown_30030F0
ldr r0, _08109540 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x4
ands r0, r1
@@ -2978,7 +2978,7 @@ sub_81094B0: @ 81094B0
.align 2, 0
_08109538: .4byte gUnknown_3005098
_0810953C: .4byte gUnknown_203ACFC
_08109540: .4byte gUnknown_30030F0
_08109540: .4byte gMain
_08109544: .4byte gUnknown_203AD10
_08109548:
movs r0, 0x2
@@ -3587,7 +3587,7 @@ _08109A34:
strb r0, [r3]
movs r0, 0x4
strb r0, [r2, 0x2]
ldr r0, _08109A68 @ =gUnknown_3005008
ldr r0, _08109A68 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08109A6C @ =0x00000296
adds r0, r1
@@ -3603,7 +3603,7 @@ _08109A34:
_08109A5C: .4byte gUnknown_203AD24
_08109A60: .4byte gUnknown_203AD20
_08109A64: .4byte gUnknown_203AD28
_08109A68: .4byte gUnknown_3005008
_08109A68: .4byte gSaveBlock1Ptr
_08109A6C: .4byte 0x00000296
_08109A70: .4byte gUnknown_203AD30
_08109A74:
@@ -4048,7 +4048,7 @@ sub_8109DEC: @ 8109DEC
.align 2, 0
_08109E1C: .4byte gUnknown_3005098
_08109E20:
ldr r0, _08109E60 @ =gUnknown_30030F0
ldr r0, _08109E60 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -4072,7 +4072,7 @@ _08109E20:
bl sub_8109D38
b _08109EA2
.align 2, 0
_08109E60: .4byte gUnknown_30030F0
_08109E60: .4byte gMain
_08109E64:
movs r0, 0x2
ands r0, r1
@@ -4184,7 +4184,7 @@ sub_8109F44: @ 8109F44
lsls r0, 3
ldr r1, _08109FEC @ =gUnknown_3005098
adds r7, r0, r1
ldr r0, _08109FF0 @ =gUnknown_30030F0
ldr r0, _08109FF0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -4248,7 +4248,7 @@ _08109FE0:
bx r0
.align 2, 0
_08109FEC: .4byte gUnknown_3005098
_08109FF0: .4byte gUnknown_30030F0
_08109FF0: .4byte gMain
_08109FF4: .4byte gUnknown_203AD30
_08109FF8: .4byte gUnknown_203ACFC
_08109FFC: .4byte gUnknown_3005E70
@@ -4276,7 +4276,7 @@ sub_810A000: @ 810A000
bl sub_809A798
lsls r0, 16
lsrs r2, r0, 16
ldr r0, _0810A048 @ =gUnknown_3005008
ldr r0, _0810A048 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r3, _0810A04C @ =0x00000296
adds r1, r0, r3
@@ -4289,7 +4289,7 @@ sub_810A000: @ 810A000
.align 2, 0
_0810A040: .4byte gUnknown_3005098
_0810A044: .4byte gUnknown_203ACFC
_0810A048: .4byte gUnknown_3005008
_0810A048: .4byte gSaveBlock1Ptr
_0810A04C: .4byte 0x00000296
_0810A050:
strh r2, [r1]
@@ -4473,7 +4473,7 @@ sub_810A1D0: @ 810A1D0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0810A1F4 @ =gUnknown_30030F0
ldr r0, _0810A1F4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -4488,7 +4488,7 @@ _0810A1EE:
pop {r0}
bx r0
.align 2, 0
_0810A1F4: .4byte gUnknown_30030F0
_0810A1F4: .4byte gMain
thumb_func_end sub_810A1D0
thumb_func_start sub_810A1F8
@@ -5326,7 +5326,7 @@ sub_810A85C: @ 810A85C
_0810A8B4: .4byte gUnknown_3005098
_0810A8B8: .4byte gUnknown_203ACFC
_0810A8BC:
ldr r0, _0810A8EC @ =gUnknown_30030F0
ldr r0, _0810A8EC @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -5345,7 +5345,7 @@ _0810A8BC:
bl sub_810A690
b _0810A93A
.align 2, 0
_0810A8EC: .4byte gUnknown_30030F0
_0810A8EC: .4byte gMain
_0810A8F0:
movs r0, 0x2
ands r0, r1
@@ -5465,7 +5465,7 @@ sub_810A9D4: @ 810A9D4
mov r2, r8
ldrh r1, [r2, 0x10]
bl sub_809A1D8
ldr r3, _0810AAE0 @ =gUnknown_3005008
ldr r3, _0810AAE0 @ =gSaveBlock1Ptr
ldr r4, [r3]
movs r7, 0xA4
lsls r7, 2
@@ -5536,7 +5536,7 @@ sub_810A9D4: @ 810A9D4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, _0810AAE0 @ =gUnknown_3005008
ldr r2, _0810AAE0 @ =gSaveBlock1Ptr
ldr r0, [r2]
adds r0, r7
bl sub_809FD58
@@ -5560,7 +5560,7 @@ sub_810A9D4: @ 810A9D4
.align 2, 0
_0810AAD8: .4byte gUnknown_3005098
_0810AADC: .4byte gUnknown_203AD30
_0810AAE0: .4byte gUnknown_3005008
_0810AAE0: .4byte gSaveBlock1Ptr
_0810AAE4: .4byte gUnknown_203ACFC
_0810AAE8: .4byte gUnknown_203AD10
_0810AAEC: .4byte gUnknown_3005E70
@@ -5572,7 +5572,7 @@ sub_810AAF4: @ 810AAF4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0810AB38 @ =gUnknown_30030F0
ldr r0, _0810AB38 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -5602,7 +5602,7 @@ _0810AB32:
pop {r0}
bx r0
.align 2, 0
_0810AB38: .4byte gUnknown_30030F0
_0810AB38: .4byte gMain
_0810AB3C: .4byte gUnknown_203AD10
thumb_func_end sub_810AAF4
@@ -5672,7 +5672,7 @@ sub_810AB88: @ 810AB88
.align 2, 0
_0810ABB8: .4byte gUnknown_3005098
_0810ABBC:
ldr r0, _0810ABFC @ =gUnknown_30030F0
ldr r0, _0810ABFC @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -5696,7 +5696,7 @@ _0810ABBC:
bl sub_810AC40
b _0810AC38
.align 2, 0
_0810ABFC: .4byte gUnknown_30030F0
_0810ABFC: .4byte gMain
_0810AC00:
movs r0, 0x2
ands r0, r1
@@ -5831,7 +5831,7 @@ _0810AD1E:
movs r1, 0
movs r2, 0
bl ChangeBgY
ldr r4, _0810AD80 @ =gUnknown_3005008
ldr r4, _0810AD80 @ =gSaveBlock1Ptr
ldr r0, [r4]
ldr r5, _0810AD84 @ =0x00000296
adds r1, r0, r5
@@ -5867,7 +5867,7 @@ _0810AD1E:
strh r6, [r1, 0xE]
b _0810AD9E
.align 2, 0
_0810AD80: .4byte gUnknown_3005008
_0810AD80: .4byte gSaveBlock1Ptr
_0810AD84: .4byte 0x00000296
_0810AD88: .4byte gUnknown_203AD30
_0810AD8C: .4byte gUnknown_3005090
@@ -5926,7 +5926,7 @@ sub_810ADD8: @ 810ADD8
lsls r0, 1
bl AllocZeroed
str r0, [r5]
ldr r4, _0810AEC0 @ =gUnknown_3005008
ldr r4, _0810AEC0 @ =gSaveBlock1Ptr
ldr r1, [r4]
movs r2, 0xC4
lsls r2, 2
@@ -5995,7 +5995,7 @@ _0810AE54:
adds r4, 0x1
cmp r4, 0x2
bls _0810AE54
ldr r4, _0810AEC0 @ =gUnknown_3005008
ldr r4, _0810AEC0 @ =gSaveBlock1Ptr
ldr r0, [r4]
movs r1, 0xC4
lsls r1, 2
@@ -6027,7 +6027,7 @@ _0810AE54:
bx r0
.align 2, 0
_0810AEBC: .4byte gUnknown_203AD2C
_0810AEC0: .4byte gUnknown_3005008
_0810AEC0: .4byte gSaveBlock1Ptr
_0810AEC4: .4byte 0x00000296
_0810AEC8: .4byte gUnknown_203ACFC
thumb_func_end sub_810ADD8
@@ -6035,7 +6035,7 @@ _0810AEC8: .4byte gUnknown_203ACFC
thumb_func_start sub_810AECC
sub_810AECC: @ 810AECC
push {r4-r7,lr}
ldr r4, _0810AF64 @ =gUnknown_3005008
ldr r4, _0810AF64 @ =gSaveBlock1Ptr
ldr r0, [r4]
movs r1, 0xC4
lsls r1, 2
@@ -6108,7 +6108,7 @@ _0810AF3A:
pop {r0}
bx r0
.align 2, 0
_0810AF64: .4byte gUnknown_3005008
_0810AF64: .4byte gSaveBlock1Ptr
_0810AF68: .4byte gUnknown_203AD2C
_0810AF6C: .4byte 0x00000296
_0810AF70: .4byte gUnknown_203ACFC
@@ -6371,7 +6371,7 @@ sub_810B180: @ 810B180
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0810B198 @ =gUnknown_30030F0
ldr r0, _0810B198 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -6380,7 +6380,7 @@ sub_810B180: @ 810B180
movs r0, 0
b _0810B1BC
.align 2, 0
_0810B198: .4byte gUnknown_30030F0
_0810B198: .4byte gMain
_0810B19C:
bl sub_810AECC
bl sub_815AC20
@@ -6512,7 +6512,7 @@ _0810B290:
_0810B29E:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0810B318 @ =gUnknown_3005008
ldr r0, _0810B318 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _0810B31C @ =gUnknown_203AD30
ldrh r1, [r1]
@@ -6561,13 +6561,13 @@ _0810B29E:
bl CopyWindowToVram
b _0810B36C
.align 2, 0
_0810B318: .4byte gUnknown_3005008
_0810B318: .4byte gSaveBlock1Ptr
_0810B31C: .4byte gUnknown_203AD30
_0810B320: .4byte 0x00000296
_0810B324: .4byte gUnknown_203ACFC
_0810B328: .4byte gUnknown_3005E70
_0810B32C:
ldr r1, _0810B340 @ =gUnknown_30030F0
ldr r1, _0810B340 @ =gMain
movs r0, 0
strh r0, [r1, 0x2E]
movs r0, 0x80
@@ -6576,7 +6576,7 @@ _0810B32C:
bl ListMenuHandleInput
b _0810B36C
.align 2, 0
_0810B340: .4byte gUnknown_30030F0
_0810B340: .4byte gMain
_0810B344:
movs r0, 0x5
bl sub_80722CC
@@ -6686,15 +6686,15 @@ _0810B408:
bl sub_81091D0
b _0810B4B0
_0810B41A:
ldr r1, _0810B424 @ =gUnknown_30030F0
ldr r1, _0810B424 @ =gMain
movs r0, 0
strh r0, [r1, 0x2E]
movs r0, 0x80
b _0810B430
.align 2, 0
_0810B424: .4byte gUnknown_30030F0
_0810B424: .4byte gMain
_0810B428:
ldr r1, _0810B43C @ =gUnknown_30030F0
ldr r1, _0810B43C @ =gMain
movs r0, 0
strh r0, [r1, 0x2E]
movs r0, 0x40
@@ -6704,7 +6704,7 @@ _0810B430:
bl ListMenuHandleInput
b _0810B4B0
.align 2, 0
_0810B43C: .4byte gUnknown_30030F0
_0810B43C: .4byte gMain
_0810B440:
movs r0, 0x5
bl sub_80722CC
@@ -6813,14 +6813,14 @@ _0810B51E:
beq _0810B564
b _0810B5C0
_0810B528:
ldr r0, _0810B538 @ =gUnknown_30030F0
ldr r0, _0810B538 @ =gMain
strh r6, [r0, 0x2E]
strh r7, [r0, 0x30]
ldrb r0, [r5]
bl ListMenuHandleInput
b _0810B5C0
.align 2, 0
_0810B538: .4byte gUnknown_30030F0
_0810B538: .4byte gMain
_0810B53C:
movs r0, 0x5
bl sub_80722CC
@@ -6946,14 +6946,14 @@ _0810B63C:
bl sub_81091D0
b _0810B6E0
_0810B64E:
ldr r0, _0810B65C @ =gUnknown_30030F0
ldr r0, _0810B65C @ =gMain
strh r5, [r0, 0x2E]
strh r7, [r0, 0x30]
ldrb r0, [r6]
bl ListMenuHandleInput
b _0810B6E0
.align 2, 0
_0810B65C: .4byte gUnknown_30030F0
_0810B65C: .4byte gMain
_0810B660:
movs r0, 0x5
bl sub_80722CC
asm/item_pc.s
+26 -26
View File
@@ -117,7 +117,7 @@ _0810D4BA:
sub_810D4C0: @ 810D4C0
push {r4,lr}
sub sp, 0x4
ldr r0, _0810D4E0 @ =gUnknown_30030F0
ldr r0, _0810D4E0 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -132,7 +132,7 @@ _0810D4D4:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0810D4E0: .4byte gUnknown_30030F0
_0810D4E0: .4byte gMain
_0810D4E4: .4byte _0810D4E8
.align 2, 0
_0810D4E8:
@@ -304,7 +304,7 @@ _0810D668:
cmp r0, 0x1
beq _0810D6A0
_0810D674:
ldr r1, _0810D684 @ =gUnknown_30030F0
ldr r1, _0810D684 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -313,7 +313,7 @@ _0810D674:
strb r0, [r1]
b _0810D6A0
.align 2, 0
_0810D684: .4byte gUnknown_30030F0
_0810D684: .4byte gMain
_0810D688:
ldr r0, _0810D698 @ =sub_810D48C
bl SetVBlankCallback
@@ -561,7 +561,7 @@ sub_810D878: @ 810D878
movs r4, 0
b _0810D8A4
_0810D87E:
ldr r0, _0810D938 @ =gUnknown_3005008
ldr r0, _0810D938 @ =gSaveBlock1Ptr
ldr r0, [r0]
lsls r1, r4, 2
adds r0, r1
@@ -654,7 +654,7 @@ _0810D8A4:
pop {r0}
bx r0
.align 2, 0
_0810D938: .4byte gUnknown_3005008
_0810D938: .4byte gSaveBlock1Ptr
_0810D93C: .4byte gUnknown_203ADC4
_0810D940: .4byte gUnknown_203ADBC
_0810D944: .4byte gUnknown_84161C1
@@ -1198,7 +1198,7 @@ _0810DD64: .4byte gUnknown_203ADCC
thumb_func_start sub_810DD68
sub_810DD68: @ 810DD68
lsls r0, 16
ldr r1, _0810DD7C @ =gUnknown_3005008
ldr r1, _0810DD7C @ =gSaveBlock1Ptr
ldr r1, [r1]
lsrs r0, 14
adds r1, r0
@@ -1208,14 +1208,14 @@ sub_810DD68: @ 810DD68
ldrh r0, [r1]
bx lr
.align 2, 0
_0810DD7C: .4byte gUnknown_3005008
_0810DD7C: .4byte gSaveBlock1Ptr
thumb_func_end sub_810DD68
thumb_func_start sub_810DD80
sub_810DD80: @ 810DD80
push {lr}
lsls r0, 16
ldr r1, _0810DD9C @ =gUnknown_3005008
ldr r1, _0810DD9C @ =gSaveBlock1Ptr
lsrs r0, 14
ldr r1, [r1]
adds r0, r1
@@ -1227,7 +1227,7 @@ sub_810DD80: @ 810DD80
pop {r1}
bx r1
.align 2, 0
_0810DD9C: .4byte gUnknown_3005008
_0810DD9C: .4byte gSaveBlock1Ptr
_0810DDA0: .4byte 0x0000029a
thumb_func_end sub_810DD80
@@ -1240,7 +1240,7 @@ sub_810DDA4: @ 810DDA4
movs r0, 0
strb r0, [r1, 0x7]
movs r2, 0
ldr r3, _0810DE04 @ =gUnknown_3005008
ldr r3, _0810DE04 @ =gSaveBlock1Ptr
ldr r0, [r3]
movs r1, 0xA6
lsls r1, 2
@@ -1283,7 +1283,7 @@ _0810DDF8:
bx r0
.align 2, 0
_0810DE00: .4byte gUnknown_203ADBC
_0810DE04: .4byte gUnknown_3005008
_0810DE04: .4byte gSaveBlock1Ptr
thumb_func_end sub_810DDA4
thumb_func_start sub_810DE08
@@ -1392,7 +1392,7 @@ sub_810DEA0: @ 810DEA0
lsls r0, 24
cmp r0, 0
bne _0810DF9E
ldr r0, _0810DF18 @ =gUnknown_30030F0
ldr r0, _0810DF18 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x4
ands r0, r1
@@ -1427,7 +1427,7 @@ sub_810DEA0: @ 810DEA0
.align 2, 0
_0810DF10: .4byte gUnknown_3005098
_0810DF14: .4byte gUnknown_2037AB8
_0810DF18: .4byte gUnknown_30030F0
_0810DF18: .4byte gMain
_0810DF1C: .4byte gUnknown_203ADBC
_0810DF20:
ldrb r0, [r6]
@@ -1640,7 +1640,7 @@ sub_810E0B4: @ 810E0B4
lsrs r1, 16
adds r0, r5, 0
bl sub_80986A8
ldr r0, _0810E124 @ =gUnknown_30030F0
ldr r0, _0810E124 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x5
ands r0, r1
@@ -1662,7 +1662,7 @@ sub_810E0B4: @ 810E0B4
.align 2, 0
_0810E11C: .4byte gUnknown_3005098
_0810E120: .4byte gUnknown_203ADD0
_0810E124: .4byte gUnknown_30030F0
_0810E124: .4byte gMain
_0810E128: .4byte gUnknown_203ADBC
_0810E12C:
movs r0, 0x2
@@ -1720,7 +1720,7 @@ _0810E186:
.align 2, 0
_0810E190: .4byte gUnknown_3005098
_0810E194:
ldr r0, _0810E1F0 @ =gUnknown_3005008
ldr r0, _0810E1F0 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r2, 0xA6
lsls r2, 2
@@ -1764,7 +1764,7 @@ _0810E1E6:
pop {r0}
bx r0
.align 2, 0
_0810E1F0: .4byte gUnknown_3005008
_0810E1F0: .4byte gSaveBlock1Ptr
_0810E1F4: .4byte gUnknown_203ADD0
_0810E1F8: .4byte gUnknown_3005E70
_0810E1FC: .4byte sub_810DEA0
@@ -2127,7 +2127,7 @@ sub_810E4F4: @ 810E4F4
lsls r0, 3
ldr r1, _0810E540 @ =gUnknown_3005098
adds r5, r0, r1
ldr r0, _0810E544 @ =gUnknown_30030F0
ldr r0, _0810E544 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -2155,7 +2155,7 @@ _0810E53A:
bx r0
.align 2, 0
_0810E540: .4byte gUnknown_3005098
_0810E544: .4byte gUnknown_30030F0
_0810E544: .4byte gMain
thumb_func_end sub_810E4F4
thumb_func_start sub_810E548
@@ -2163,7 +2163,7 @@ sub_810E548: @ 810E548
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0810E574 @ =gUnknown_30030F0
ldr r0, _0810E574 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -2183,7 +2183,7 @@ _0810E56E:
pop {r0}
bx r0
.align 2, 0
_0810E574: .4byte gUnknown_30030F0
_0810E574: .4byte gMain
thumb_func_end sub_810E548
thumb_func_start sub_810E578
@@ -2369,7 +2369,7 @@ sub_810E6D8: @ 810E6D8
.align 2, 0
_0810E708: .4byte gUnknown_3005098
_0810E70C:
ldr r0, _0810E74C @ =gUnknown_30030F0
ldr r0, _0810E74C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -2393,7 +2393,7 @@ _0810E70C:
bl sub_810E418
b _0810E796
.align 2, 0
_0810E74C: .4byte gUnknown_30030F0
_0810E74C: .4byte gMain
_0810E750:
movs r0, 0x2
ands r0, r1
@@ -2518,7 +2518,7 @@ sub_810E848: @ 810E848
lsls r0, 3
ldr r1, _0810E898 @ =gUnknown_3005098
adds r5, r0, r1
ldr r0, _0810E89C @ =gUnknown_30030F0
ldr r0, _0810E89C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -2546,7 +2546,7 @@ _0810E892:
bx r0
.align 2, 0
_0810E898: .4byte gUnknown_3005098
_0810E89C: .4byte gUnknown_30030F0
_0810E89C: .4byte gMain
thumb_func_end sub_810E848
thumb_func_start sub_810E8A0
asm/item_use.s
+4 -4
View File
@@ -1778,7 +1778,7 @@ sub_80A1D9C: @ 80A1D9C
cmp r0, 0x2
bne _080A1DD2
_080A1DB2:
ldr r0, _080A1DEC @ =gUnknown_3005008
ldr r0, _080A1DEC @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x4
ldrsb r0, [r1, r0]
@@ -1806,7 +1806,7 @@ _080A1DD2:
b _080A1E00
.align 2, 0
_080A1DE8: .4byte gUnknown_2036DFC
_080A1DEC: .4byte gUnknown_3005008
_080A1DEC: .4byte gSaveBlock1Ptr
_080A1DF0: .4byte gUnknown_3005090
_080A1DF4:
ldr r1, _080A1E04 @ =gUnknown_2039998
@@ -1982,7 +1982,7 @@ sub_80A1F48: @ 80A1F48
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1F74 @ =gUnknown_30030F0
ldr r0, _080A1F74 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -2001,7 +2001,7 @@ _080A1F6C:
pop {r0}
bx r0
.align 2, 0
_080A1F74: .4byte gUnknown_30030F0
_080A1F74: .4byte gMain
thumb_func_end sub_80A1F48
thumb_func_start sub_80A1F78
asm/learn_move.s
+4 -4
View File
@@ -979,7 +979,7 @@ _080E4EA8:
.align 2, 0
_080E4EBC: .4byte gUnknown_203AAB4
_080E4EC0:
ldr r0, _080E4EE8 @ =gUnknown_30030F0
ldr r0, _080E4EE8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1003,7 +1003,7 @@ _080E4EDA:
pop {r0}
bx r0
.align 2, 0
_080E4EE8: .4byte gUnknown_30030F0
_080E4EE8: .4byte gMain
_080E4EEC: .4byte gUnknown_203AAB4
thumb_func_end sub_80E48F4
@@ -1410,7 +1410,7 @@ sub_80E5204: @ 80E5204
adds r0, r1
ldrb r0, [r0]
bl ListMenuHandleInput
ldr r0, _080E5260 @ =gUnknown_30030F0
ldr r0, _080E5260 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1443,7 +1443,7 @@ sub_80E5204: @ 80E5204
.align 2, 0
_080E5258: .4byte gUnknown_203AAB4
_080E525C: .4byte 0x00000263
_080E5260: .4byte gUnknown_30030F0
_080E5260: .4byte gMain
_080E5264: .4byte 0x00000a67
_080E5268: .4byte gUnknown_2021CF0
_080E526C: .4byte gUnknown_841E3FB
asm/link.s
+39 -39
View File
@@ -30,7 +30,7 @@ _08009498:
beq _080094C4
bl sub_800B210
bl sub_80098B8
bl sub_8000874
bl RestoreSerialTimer3IntrHandlers
movs r0, 0
b _080094CE
.align 2, 0
@@ -237,13 +237,13 @@ sub_8009640: @ 8009640
adds r0, r2, 0
strh r0, [r1]
bl sub_8009804
ldr r0, _080096E0 @ =gUnknown_30030F0
ldr r0, _080096E0 @ =gMain
ldrh r0, [r0, 0x24]
bl SeedRng
movs r4, 0
_08009670:
bl Random
ldr r1, _080096E4 @ =gUnknown_300500C
ldr r1, _080096E4 @ =gSaveBlock2Ptr
ldr r1, [r1]
adds r1, 0xA
adds r1, r4
@@ -285,8 +285,8 @@ _08009670:
_080096D4: .4byte sub_800978C
_080096D8: .4byte gUnknown_202271A
_080096DC: .4byte 0x00001111
_080096E0: .4byte gUnknown_30030F0
_080096E4: .4byte gUnknown_300500C
_080096E0: .4byte gMain
_080096E4: .4byte gSaveBlock2Ptr
_080096E8: .4byte sub_80094D4
_080096EC: .4byte gUnknown_3000E58
_080096F0: .4byte task00_link_test
@@ -308,7 +308,7 @@ _08009704: .4byte gUnknown_2022720
sub_8009708: @ 8009708
push {r4,r5,lr}
ldr r5, _08009774 @ =gUnknown_2022720
ldr r4, _08009778 @ =gUnknown_300500C
ldr r4, _08009778 @ =gSaveBlock2Ptr
ldr r1, [r4]
ldrb r2, [r1, 0xA]
ldrb r0, [r1, 0xB]
@@ -330,10 +330,10 @@ sub_8009708: @ 8009708
ldr r0, _0800977C @ =gUnknown_202271A
ldrh r0, [r0]
str r0, [r5, 0x14]
ldr r0, _08009780 @ =gUnknown_81E9F11
ldr r0, _08009780 @ =gGameLanguage
ldrb r0, [r0]
strh r0, [r5, 0x1A]
ldr r0, _08009784 @ =gUnknown_81E9F10
ldr r0, _08009784 @ =gGameVersion
ldrb r0, [r0]
movs r2, 0x80
lsls r2, 7
@@ -360,10 +360,10 @@ _0800976E:
bx r0
.align 2, 0
_08009774: .4byte gUnknown_2022720
_08009778: .4byte gUnknown_300500C
_08009778: .4byte gSaveBlock2Ptr
_0800977C: .4byte gUnknown_202271A
_08009780: .4byte gUnknown_81E9F11
_08009784: .4byte gUnknown_81E9F10
_08009780: .4byte gGameLanguage
_08009784: .4byte gGameVersion
_08009788: .4byte 0x00000844
thumb_func_end sub_8009708
@@ -443,7 +443,7 @@ sub_8009804: @ 8009804
ldr r1, _08009850 @ =gUnknown_3003F80
ldr r0, _08009854 @ =sub_800A720
str r0, [r1]
ldr r0, _08009858 @ =gUnknown_300357C
ldr r0, _08009858 @ =gLinkVSyncDisabled
strb r4, [r0]
ldr r0, _0800985C @ =gUnknown_3003EAC
strb r4, [r0]
@@ -467,7 +467,7 @@ sub_8009804: @ 8009804
_0800984C: .4byte gUnknown_3003F3C
_08009850: .4byte gUnknown_3003F80
_08009854: .4byte sub_800A720
_08009858: .4byte gUnknown_300357C
_08009858: .4byte gLinkVSyncDisabled
_0800985C: .4byte gUnknown_3003EAC
_08009860: .4byte gUnknown_3003F38
_08009864: .4byte gUnknown_3000E4C
@@ -647,7 +647,7 @@ _080099CC: .4byte gUnknown_2022111
LinkTestProcessKeyInput: @ 80099D0
push {r4,r5,lr}
sub sp, 0x4
ldr r4, _08009A70 @ =gUnknown_30030F0
ldr r4, _08009A70 @ =gMain
ldrh r1, [r4, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -710,7 +710,7 @@ _08009A46:
cmp r0, 0
beq _08009A66
ldr r2, [r4, 0x24]
ldr r0, _08009A84 @ =gUnknown_300357C
ldr r0, _08009A84 @ =gLinkVSyncDisabled
ldrb r1, [r0]
ldr r0, _08009A88 @ =gUnknown_3003F80
ldr r0, [r0]
@@ -727,12 +727,12 @@ _08009A66:
pop {r0}
bx r0
.align 2, 0
_08009A70: .4byte gUnknown_30030F0
_08009A70: .4byte gMain
_08009A74: .4byte gUnknown_3003F84
_08009A78: .4byte gHeap + 0x4000
_08009A7C: .4byte 0x00002004
_08009A80: .4byte gUnknown_2022110
_08009A84: .4byte gUnknown_300357C
_08009A84: .4byte gLinkVSyncDisabled
_08009A88: .4byte gUnknown_3003F80
thumb_func_end LinkTestProcessKeyInput
@@ -1327,12 +1327,12 @@ _08009F18: .4byte gUnknown_202271A
_08009F1C:
ldr r0, _08009F28 @ =gUnknown_3003F50
strh r2, [r0]
ldr r1, _08009F2C @ =gUnknown_30030F0
ldr r1, _08009F2C @ =gMain
ldrh r1, [r1, 0x2C]
b _08009FD4
.align 2, 0
_08009F28: .4byte gUnknown_3003F50
_08009F2C: .4byte gUnknown_30030F0
_08009F2C: .4byte gMain
_08009F30:
ldr r0, _08009F38 @ =gUnknown_3003F50
movs r1, 0
@@ -1408,7 +1408,7 @@ _08009FC0:
ldrh r1, [r0]
cmp r1, 0
beq _08009FD6
ldr r0, _08009FE0 @ =gUnknown_30030E4
ldr r0, _08009FE0 @ =gLinkTransferringData
ldrb r0, [r0]
cmp r0, 0
bne _08009FD6
@@ -1422,7 +1422,7 @@ _08009FD6:
bx r0
.align 2, 0
_08009FDC: .4byte gUnknown_3005028
_08009FE0: .4byte gUnknown_30030E4
_08009FE0: .4byte gLinkTransferringData
_08009FE4: .4byte gUnknown_3003F50
thumb_func_end sub_8009E60
@@ -3042,7 +3042,7 @@ _0800AB5C:
ldr r1, _0800AB8C @ =0x0000ffdf
ands r0, r1
str r0, [r2]
ldr r0, _0800AB90 @ =gUnknown_300357C
ldr r0, _0800AB90 @ =gLinkVSyncDisabled
movs r4, 0x1
strb r4, [r0]
bl sub_80098B8
@@ -3059,7 +3059,7 @@ _0800AB7E:
_0800AB84: .4byte gUnknown_3003F30
_0800AB88: .4byte gUnknown_2022B4C
_0800AB8C: .4byte 0x0000ffdf
_0800AB90: .4byte gUnknown_300357C
_0800AB90: .4byte gLinkVSyncDisabled
_0800AB94: .4byte gUnknown_3003F80
_0800AB98: .4byte gUnknown_3003F24
thumb_func_end sub_800AB38
@@ -3312,14 +3312,14 @@ _0800AD30:
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
ldr r1, _0800AE0C @ =gUnknown_3003530
ldr r1, _0800AE0C @ =gSoftResetDisabled
movs r0, 0
strb r0, [r1]
ldr r0, _0800AE10 @ =sub_80094D4
movs r1, 0
bl CreateTask
bl StopMapMusic
ldr r1, _0800AE14 @ =gUnknown_30030F0
ldr r1, _0800AE14 @ =gMain
movs r0, 0
str r0, [r1]
bl RunTasks
@@ -3344,9 +3344,9 @@ _0800ADFC: .4byte gUnknown_82345E8
_0800AE00: .4byte gUnknown_2022860
_0800AE04: .4byte gUnknown_82345F0
_0800AE08: .4byte gUnknown_841F408
_0800AE0C: .4byte gUnknown_3003530
_0800AE0C: .4byte gSoftResetDisabled
_0800AE10: .4byte sub_80094D4
_0800AE14: .4byte gUnknown_30030F0
_0800AE14: .4byte gMain
_0800AE18: .4byte sub_800AF2C
thumb_func_end c2_800ACD4
@@ -3469,7 +3469,7 @@ _0800AF28: .4byte gUnknown_841DE9D
sub_800AF2C: @ 800AF2C
push {r4,lr}
sub sp, 0xC
ldr r0, _0800AF4C @ =gUnknown_30030F0
ldr r0, _0800AF4C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -3484,7 +3484,7 @@ sub_800AF2C: @ 800AF2C
beq _0800AF72
b _0800AFC4
.align 2, 0
_0800AF4C: .4byte gUnknown_30030F0
_0800AF4C: .4byte gMain
_0800AF50:
cmp r0, 0x5A
beq _0800AF72
@@ -3543,7 +3543,7 @@ _0800AFA8:
movs r3, 0x14
bl box_print
_0800AFC4:
ldr r0, _0800B004 @ =gUnknown_30030F0
ldr r0, _0800B004 @ =gMain
movs r2, 0x87
lsls r2, 3
adds r1, r0, r2
@@ -3571,7 +3571,7 @@ _0800AFC4:
.align 2, 0
_0800AFFC: .4byte gUnknown_8234610
_0800B000: .4byte gUnknown_841DF4C
_0800B004: .4byte gUnknown_30030F0
_0800B004: .4byte gMain
_0800B008: .4byte gUnknown_3003F3C
_0800B00C: .4byte gUnknown_2022854
_0800B010:
@@ -3585,9 +3585,9 @@ _0800B010:
bl sub_812B484
bl rfu_REQ_stopMode
bl rfu_waitREQComplete
bl sub_80008D8
bl DoSoftReset
_0800B02E:
ldr r0, _0800B050 @ =gUnknown_30030F0
ldr r0, _0800B050 @ =gMain
movs r2, 0x87
lsls r2, 3
adds r1, r0, r2
@@ -3607,7 +3607,7 @@ _0800B048:
pop {r0}
bx r0
.align 2, 0
_0800B050: .4byte gUnknown_30030F0
_0800B050: .4byte gMain
thumb_func_end sub_800AF2C
thumb_func_start GetSioMultiSI
@@ -3783,7 +3783,7 @@ HandleLinkConnection: @ 800B178
bl LinkMain1
ldr r4, _0800B1C0 @ =gUnknown_3003F20
str r0, [r4]
ldr r0, _0800B1C4 @ =gUnknown_300311C
ldr r0, _0800B1C4 @ =gMain + 0x2C
bl LinkMain2
ldr r0, [r4]
movs r1, 0x80
@@ -3803,7 +3803,7 @@ _0800B1B4: .4byte gUnknown_3003F84
_0800B1B8: .4byte gUnknown_3003F50
_0800B1BC: .4byte gUnknown_3003ED0
_0800B1C0: .4byte gUnknown_3003F20
_0800B1C4: .4byte gUnknown_300311C
_0800B1C4: .4byte gMain + 0x2C
_0800B1C8:
bl sub_80FAE94
adds r4, r0, 0
@@ -4505,8 +4505,8 @@ _0800B710: .4byte 0x04000208
_0800B714: .4byte gUnknown_3004F74
thumb_func_end sub_800B608
thumb_func_start sub_800B718
sub_800B718: @ 800B718
thumb_func_start LinkVSync
LinkVSync: @ 800B718
push {r4,lr}
ldr r3, _0800B740 @ =gUnknown_3003FB0
ldrb r4, [r3]
@@ -4568,7 +4568,7 @@ _0800B77E:
bx r0
.align 2, 0
_0800B784: .4byte gUnknown_3000E64
thumb_func_end sub_800B718
thumb_func_end LinkVSync
thumb_func_start Timer3Intr
Timer3Intr: @ 800B788
asm/link_rfu.s
+18 -18
View File
@@ -3534,47 +3534,47 @@ _080FEE60:
.4byte _080FEF12
.4byte _080FEEEC
_080FEE9C:
ldr r0, _080FEEA8 @ =gUnknown_3005008
ldr r0, _080FEEA8 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, _080FEEAC @ =0x00002ca0
adds r1, r0, r2
b _080FEF08
.align 2, 0
_080FEEA8: .4byte gUnknown_3005008
_080FEEA8: .4byte gSaveBlock1Ptr
_080FEEAC: .4byte 0x00002ca0
_080FEEB0:
ldr r0, _080FEEBC @ =gUnknown_3005008
ldr r0, _080FEEBC @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, _080FEEC0 @ =0x00002cac
adds r1, r0, r2
b _080FEF08
.align 2, 0
_080FEEBC: .4byte gUnknown_3005008
_080FEEBC: .4byte gSaveBlock1Ptr
_080FEEC0: .4byte 0x00002cac
_080FEEC4:
ldr r0, _080FEED0 @ =gUnknown_3005008
ldr r0, _080FEED0 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, _080FEED4 @ =0x00002cb8
adds r1, r0, r2
b _080FEF08
.align 2, 0
_080FEED0: .4byte gUnknown_3005008
_080FEED0: .4byte gSaveBlock1Ptr
_080FEED4: .4byte 0x00002cb8
_080FEED8:
ldr r0, _080FEEE4 @ =gUnknown_3005008
ldr r0, _080FEEE4 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, _080FEEE8 @ =0x00002cc4
adds r1, r0, r2
b _080FEF08
.align 2, 0
_080FEEE4: .4byte gUnknown_3005008
_080FEEE4: .4byte gSaveBlock1Ptr
_080FEEE8: .4byte 0x00002cc4
_080FEEEC:
bl sub_8143DA8
adds r1, r0, 0
b _080FEF08
_080FEEF4:
ldr r2, _080FEF18 @ =gUnknown_3005008
ldr r2, _080FEF18 @ =gSaveBlock1Ptr
ldr r0, _080FEF1C @ =gUnknown_20370C2
ldrh r1, [r0]
lsls r0, r1, 3
@@ -3593,7 +3593,7 @@ _080FEF12:
pop {r0}
bx r0
.align 2, 0
_080FEF18: .4byte gUnknown_3005008
_080FEF18: .4byte gSaveBlock1Ptr
_080FEF1C: .4byte gUnknown_20370C2
_080FEF20: .4byte 0x00002cd0
_080FEF24: .4byte gUnknown_20370C0
@@ -3794,7 +3794,7 @@ _080FF094:
thumb_func_start sub_80FF098
sub_80FF098: @ 80FF098
push {r4-r7,lr}
ldr r0, _080FF0C0 @ =gUnknown_30030F0
ldr r0, _080FF0C0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3814,7 +3814,7 @@ sub_80FF098: @ 80FF098
movs r0, 0x9
b _080FF1FC
.align 2, 0
_080FF0C0: .4byte gUnknown_30030F0
_080FF0C0: .4byte gMain
_080FF0C4: .4byte gUnknown_203ACE8
_080FF0C8:
movs r0, 0x20
@@ -3994,7 +3994,7 @@ _080FF208: .4byte 0x00040100
thumb_func_start sub_80FF20C
sub_80FF20C: @ 80FF20C
push {r4-r6,lr}
ldr r2, _080FF22C @ =gUnknown_30030F0
ldr r2, _080FF22C @ =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -4009,7 +4009,7 @@ sub_80FF20C: @ 80FF20C
beq _080FF26A
b _080FF254
.align 2, 0
_080FF22C: .4byte gUnknown_30030F0
_080FF22C: .4byte gMain
_080FF230: .4byte gUnknown_203ACE8
_080FF234:
movs r0, 0x20
@@ -4176,7 +4176,7 @@ _080FF35C: .4byte gUnknown_203ACE8
thumb_func_start sub_80FF360
sub_80FF360: @ 80FF360
push {lr}
ldr r1, _080FF378 @ =gUnknown_30030F0
ldr r1, _080FF378 @ =gMain
ldrh r2, [r1, 0x2E]
movs r0, 0x2
ands r0, r2
@@ -4186,7 +4186,7 @@ sub_80FF360: @ 80FF360
bl sub_80FF678
b _080FF412
.align 2, 0
_080FF378: .4byte gUnknown_30030F0
_080FF378: .4byte gMain
_080FF37C:
movs r0, 0x1
ands r0, r2
@@ -4279,7 +4279,7 @@ _080FF416:
thumb_func_start sub_80FF41C
sub_80FF41C: @ 80FF41C
push {lr}
ldr r2, _080FF438 @ =gUnknown_30030F0
ldr r2, _080FF438 @ =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -4292,7 +4292,7 @@ sub_80FF41C: @ 80FF41C
movs r0, 0xD
b _080FF4A2
.align 2, 0
_080FF438: .4byte gUnknown_30030F0
_080FF438: .4byte gMain
_080FF43C: .4byte gUnknown_203ACE8
_080FF440:
movs r0, 0x1
asm/link_rfu_2.s
+32 -32
View File
@@ -105,8 +105,8 @@ _080F86BC: .4byte gUnknown_202273C
_080F86C0: .4byte 0x01000046
thumb_func_end sub_80F85F8
thumb_func_start sub_80F86C4
sub_80F86C4: @ 80F86C4
thumb_func_start InitRFU
InitRFU: @ 80F86C4
push {r4-r6,lr}
ldr r4, _080F86EC @ =gIntrTable
ldr r5, [r4, 0x4]
@@ -127,14 +127,14 @@ sub_80F86C4: @ 80F86C4
.align 2, 0
_080F86EC: .4byte gIntrTable
_080F86F0: .4byte 0x04000208
thumb_func_end sub_80F86C4
thumb_func_end InitRFU
thumb_func_start sub_80F86F4
sub_80F86F4: @ 80F86F4
push {r4,lr}
ldr r0, _080F8728 @ =gUnknown_3001190
ldr r1, _080F872C @ =0x00000e64
ldr r4, _080F8730 @ =gUnknown_3003544
ldr r4, _080F8730 @ =gIntrTable + 0x4
adds r2, r4, 0
movs r3, 0x1
bl sub_81E05B0
@@ -157,7 +157,7 @@ _080F8722:
.align 2, 0
_080F8728: .4byte gUnknown_3001190
_080F872C: .4byte 0x00000e64
_080F8730: .4byte gUnknown_3003544
_080F8730: .4byte gIntrTable + 0x4
_080F8734: .4byte gUnknown_202271A
thumb_func_end sub_80F86F4
@@ -2248,7 +2248,7 @@ rfu_func_080F97B8: @ 80F97B8
ldrh r2, [r3]
cmp r2, 0
beq _080F97EA
ldr r0, _080F97F8 @ =gUnknown_30030E4
ldr r0, _080F97F8 @ =gLinkTransferringData
ldrb r0, [r0]
cmp r0, 0x1
beq _080F97EA
@@ -2269,7 +2269,7 @@ _080F97EA:
.align 2, 0
_080F97F0: .4byte gUnknown_3003F64
_080F97F4: .4byte gUnknown_3005028
_080F97F8: .4byte gUnknown_30030E4
_080F97F8: .4byte gLinkTransferringData
_080F97FC: .4byte gUnknown_3001188
thumb_func_end rfu_func_080F97B8
@@ -5150,7 +5150,7 @@ sub_80FAD98: @ 80FAD98
ldrb r0, [r0, 0x2]
cmp r0, 0
bne _080FAE30
ldr r6, _080FAE18 @ =gUnknown_30030F0
ldr r6, _080FAE18 @ =gMain
ldr r1, [r6, 0x4]
ldr r0, _080FAE1C @ =sub_814208C
cmp r1, r0
@@ -5198,7 +5198,7 @@ _080FADF8:
.align 2, 0
_080FAE10: .4byte gUnknown_3005450
_080FAE14: .4byte gUnknown_3005E10
_080FAE18: .4byte gUnknown_30030F0
_080FAE18: .4byte gMain
_080FAE1C: .4byte sub_814208C
_080FAE20: .4byte gUnknown_3003F3C
_080FAE24: .4byte c2_800ACD4
@@ -5335,14 +5335,14 @@ _080FAF18: .4byte gUnknown_3005450
sub_80FAF1C: @ 80FAF1C
push {lr}
ldr r0, _080FAF2C @ =gUnknown_3005E00
ldr r1, _080FAF30 @ =gUnknown_300500C
ldr r1, _080FAF30 @ =gSaveBlock2Ptr
ldr r1, [r1]
bl StringCopy
pop {r0}
bx r0
.align 2, 0
_080FAF2C: .4byte gUnknown_3005E00
_080FAF30: .4byte gUnknown_300500C
_080FAF30: .4byte gSaveBlock2Ptr
thumb_func_end sub_80FAF1C
thumb_func_start sub_80FAF34
@@ -6821,13 +6821,13 @@ sub_80FBA2C: @ 80FBA2C
_080FBA34: .4byte gUnknown_3005450
thumb_func_end sub_80FBA2C
thumb_func_start LinkVSync
LinkVSync: @ 80FBA38
thumb_func_start RFUVSync
RFUVSync: @ 80FBA38
push {lr}
bl rfu_syncVBlank_
pop {r0}
bx r0
thumb_func_end LinkVSync
thumb_func_end RFUVSync
thumb_func_start sub_80FBA44
sub_80FBA44: @ 80FBA44
@@ -6876,13 +6876,13 @@ sub_80FBA78: @ 80FBA78
strh r0, [r1]
bl sub_800B1F4
bl sub_8009804
ldr r0, _080FBB00 @ =gUnknown_30030F0
ldr r0, _080FBB00 @ =gMain
ldrh r0, [r0, 0x24]
bl SeedRng
movs r4, 0
_080FBAB4:
bl Random
ldr r1, _080FBB04 @ =gUnknown_300500C
ldr r1, _080FBB04 @ =gSaveBlock2Ptr
ldr r1, [r1]
adds r1, 0xA
adds r1, r4
@@ -6909,8 +6909,8 @@ _080FBAEC:
_080FBAF4: .4byte sub_80FBA64
_080FBAF8: .4byte gUnknown_202271A
_080FBAFC: .4byte 0x00001111
_080FBB00: .4byte gUnknown_30030F0
_080FBB04: .4byte gUnknown_300500C
_080FBB00: .4byte gMain
_080FBB04: .4byte gSaveBlock2Ptr
_080FBB08: .4byte sub_80FBB74
thumb_func_end sub_80FBA78
@@ -9106,7 +9106,7 @@ sub_80FCB54: @ 80FCB54
lsrs r1, 24
mov r9, r1
movs r4, 0
ldr r0, _080FCC30 @ =gUnknown_300500C
ldr r0, _080FCC30 @ =gSaveBlock2Ptr
mov r8, r0
adds r6, r7, 0x2
ldr r0, [r0]
@@ -9207,7 +9207,7 @@ _080FCB88:
pop {r0}
bx r0
.align 2, 0
_080FCC30: .4byte gUnknown_300500C
_080FCC30: .4byte gSaveBlock2Ptr
_080FCC34: .4byte 0x00000844
_080FCC38: .4byte 0x0000082c
thumb_func_end sub_80FCB54
@@ -9489,7 +9489,7 @@ sub_80FCE44: @ 80FCE44
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r3, _080FCE9C @ =gUnknown_30030F0
ldr r3, _080FCE9C @ =gMain
movs r0, 0x84
lsls r0, 3
adds r3, r0
@@ -9509,7 +9509,7 @@ _080FCE8A:
_080FCE90: .4byte gUnknown_202063C
_080FCE94: .4byte gUnknown_203ACE4
_080FCE98: .4byte 0x00001234
_080FCE9C: .4byte gUnknown_30030F0
_080FCE9C: .4byte gMain
_080FCEA0: .4byte gUnknown_8231CE4
_080FCEA4: .4byte 0x070003e8
thumb_func_end sub_80FCE44
@@ -9760,7 +9760,7 @@ _080FD06C:
adds r0, 0x1
strh r0, [r6, 0x34]
_080FD072:
ldr r4, _080FD110 @ =gUnknown_30030F0
ldr r4, _080FD110 @ =gMain
movs r1, 0x84
lsls r1, 3
adds r0, r4, r1
@@ -9838,7 +9838,7 @@ _080FD106:
pop {r0}
bx r0
.align 2, 0
_080FD110: .4byte gUnknown_30030F0
_080FD110: .4byte gMain
_080FD114: .4byte gUnknown_843F204
_080FD118: .4byte 0x00000422
_080FD11C: .4byte 0x000001ff
@@ -9964,7 +9964,7 @@ _080FD1C8:
adds r3, r7, r0
_080FD1F4:
ldrh r1, [r3]
ldr r0, _080FD254 @ =gUnknown_3005008
ldr r0, _080FD254 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldr r7, _080FD250 @ =0x00003ba8
adds r0, r2, r7
@@ -10000,7 +10000,7 @@ _080FD22C:
movs r0, 0
mov r8, r0
movs r4, 0
ldr r1, _080FD254 @ =gUnknown_3005008
ldr r1, _080FD254 @ =gSaveBlock1Ptr
mov r9, r1
mov r7, sp
movs r5, 0
@@ -10009,7 +10009,7 @@ _080FD22C:
.align 2, 0
_080FD24C: .4byte gUnknown_2022744
_080FD250: .4byte 0x00003ba8
_080FD254: .4byte gUnknown_3005008
_080FD254: .4byte gSaveBlock1Ptr
_080FD258:
bl GetMultiplayerId
lsls r0, 24
@@ -10055,7 +10055,7 @@ _080FD2A4:
cmp r4, r0
blt _080FD258
movs r4, 0
ldr r7, _080FD330 @ =gUnknown_3005008
ldr r7, _080FD330 @ =gSaveBlock1Ptr
mov r9, r7
ldr r6, _080FD334 @ =0x00003ba8
movs r7, 0
@@ -10096,7 +10096,7 @@ _080FD2F8:
cmp r4, 0x13
ble _080FD2C6
_080FD302:
ldr r0, _080FD330 @ =gUnknown_3005008
ldr r0, _080FD330 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _080FD334 @ =0x00003ba8
adds r0, r1
@@ -10117,7 +10117,7 @@ _080FD318:
.align 2, 0
_080FD328: .4byte gUnknown_202273C
_080FD32C: .4byte 0x00003bac
_080FD330: .4byte gUnknown_3005008
_080FD330: .4byte gSaveBlock1Ptr
_080FD334: .4byte 0x00003ba8
thumb_func_end sub_80FD1A0
@@ -10132,7 +10132,7 @@ sub_80FD338: @ 80FD338
lsrs r0, 16
mov r8, r0
movs r7, 0
ldr r6, _080FD374 @ =gUnknown_3005008
ldr r6, _080FD374 @ =gSaveBlock1Ptr
ldr r4, _080FD378 @ =0x00003ba8
movs r5, 0
_080FD350:
@@ -10154,7 +10154,7 @@ _080FD350:
movs r0, 0x1
b _080FD396
.align 2, 0
_080FD374: .4byte gUnknown_3005008
_080FD374: .4byte gSaveBlock1Ptr
_080FD378: .4byte 0x00003ba8
_080FD37C:
ldr r0, [r6]
asm/link_rfu_3.s
+78 -78
View File
@@ -111,7 +111,7 @@ sub_8115924: @ 8115924
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r6, _08115994 @ =gUnknown_300500C
ldr r6, _08115994 @ =gSaveBlock2Ptr
ldr r2, [r6]
movs r0, 0x2
str r0, [sp]
@@ -155,7 +155,7 @@ sub_8115924: @ 8115924
pop {r0}
bx r0
.align 2, 0
_08115994: .4byte gUnknown_300500C
_08115994: .4byte gSaveBlock2Ptr
_08115998: .4byte gUnknown_84571B4
thumb_func_end sub_8115924
@@ -513,7 +513,7 @@ _08115D04:
movs r1, 0x7
movs r2, 0xA
bl sub_8116444
ldr r0, _08115D24 @ =gUnknown_30030F0
ldr r0, _08115D24 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -525,7 +525,7 @@ _08115D04:
movs r0, 0x17
b _08115D3E
.align 2, 0
_08115D24: .4byte gUnknown_30030F0
_08115D24: .4byte gMain
_08115D28:
ldr r0, _08115D38 @ =gUnknown_203B059
ldrb r1, [r0]
@@ -559,7 +559,7 @@ _08115D40:
bl sub_80FC1CC
cmp r0, 0
beq _08115D76
ldr r0, _08115D90 @ =gUnknown_30030F0
ldr r0, _08115D90 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x8
ands r0, r1
@@ -581,7 +581,7 @@ _08115D88:
b _08115EEE
.align 2, 0
_08115D8C: .4byte gUnknown_203B059
_08115D90: .4byte gUnknown_30030F0
_08115D90: .4byte gMain
_08115D94:
bl sub_80FA5D4
cmp r0, 0
@@ -1974,7 +1974,7 @@ _0811691E:
ldrb r0, [r6, 0xE]
bl ListMenuHandleInput
adds r4, r0, 0
ldr r0, _0811696C @ =gUnknown_30030F0
ldr r0, _0811696C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -2008,7 +2008,7 @@ _0811691E:
movs r0, 0x5
b _08116982
.align 2, 0
_0811696C: .4byte gUnknown_30030F0
_0811696C: .4byte gMain
_08116970:
ldr r0, _0811698C @ =gUnknown_2021D18
ldr r2, _08116990 @ =gUnknown_8457608
@@ -2031,7 +2031,7 @@ _08116994:
bl sub_80722CC
b _08116D06
_0811699C:
ldr r0, _081169B0 @ =gUnknown_30030F0
ldr r0, _081169B0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -2043,7 +2043,7 @@ _081169AA:
strb r0, [r6, 0x8]
b _08116D06
.align 2, 0
_081169B0: .4byte gUnknown_30030F0
_081169B0: .4byte gMain
_081169B4:
ldr r4, _081169FC @ =gUnknown_2021D18
ldr r0, _08116A00 @ =gUnknown_203B058
@@ -2233,7 +2233,7 @@ _08116B70:
beq _08116B7C
b _08116D06
_08116B7C:
ldr r0, _08116B90 @ =gUnknown_30030F0
ldr r0, _08116B90 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -2245,7 +2245,7 @@ _08116B8A:
strb r0, [r6, 0x8]
b _08116D06
.align 2, 0
_08116B90: .4byte gUnknown_30030F0
_08116B90: .4byte gMain
_08116B94:
adds r0, r6, 0
adds r0, 0x9
@@ -2441,7 +2441,7 @@ sub_8116D10: @ 8116D10
beq _08116D56
cmp r1, 0x14
beq _08116D56
ldr r0, _08116D48 @ =gUnknown_300500C
ldr r0, _08116D48 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x9]
movs r2, 0x80
@@ -2453,7 +2453,7 @@ sub_8116D10: @ 8116D10
b _08116D5C
.align 2, 0
_08116D44: .4byte gUnknown_203B058
_08116D48: .4byte gUnknown_300500C
_08116D48: .4byte gSaveBlock2Ptr
_08116D4C:
ldrb r1, [r3]
adds r0, r2, 0
@@ -3041,7 +3041,7 @@ _081171D0: .4byte gUnknown_202402C
_081171D4: .4byte gUnknown_2022118
_081171D8:
ldr r4, _08117204 @ =gUnknown_2022618
ldr r0, _08117208 @ =gUnknown_3005008
ldr r0, _08117208 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, _0811720C @ =0x00002cd0
adds r1, r0
@@ -3062,7 +3062,7 @@ _081171FA:
b _0811725C
.align 2, 0
_08117204: .4byte gUnknown_2022618
_08117208: .4byte gUnknown_3005008
_08117208: .4byte gSaveBlock1Ptr
_0811720C: .4byte 0x00002cd0
_08117210:
bl GetBlockReceivedStatus
@@ -3087,7 +3087,7 @@ _08117210:
strb r7, [r1]
movs r0, 0x6
strb r0, [r1, 0x1]
ldr r1, _08117274 @ =gUnknown_30030F0
ldr r1, _08117274 @ =gMain
ldr r0, _08117278 @ =c2_exit_to_overworld_2_switch
str r0, [r1, 0x8]
ldr r0, _0811727C @ =sub_8050138
@@ -3106,7 +3106,7 @@ _0811725C:
_08117268: .4byte gUnknown_2031CCC
_0811726C: .4byte gUnknown_2022118
_08117270: .4byte gUnknown_2031DA4
_08117274: .4byte gUnknown_30030F0
_08117274: .4byte gMain
_08117278: .4byte c2_exit_to_overworld_2_switch
_0811727C: .4byte sub_8050138
thumb_func_end sub_8117130
@@ -3218,7 +3218,7 @@ _0811734A:
thumb_func_start sub_8117354
sub_8117354: @ 8117354
push {r4,lr}
ldr r0, _0811736C @ =gUnknown_30030F0
ldr r0, _0811736C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r4, r0, r1
@@ -3229,7 +3229,7 @@ sub_8117354: @ 8117354
beq _08117384
b _081173A2
.align 2, 0
_0811736C: .4byte gUnknown_30030F0
_0811736C: .4byte gMain
_08117370:
ldr r0, _08117380 @ =sub_8117280
movs r1, 0x5
@@ -3305,7 +3305,7 @@ sub_81173C0: @ 81173C0
lsls r0, 24
lsrs r0, 24
strh r0, [r1, 0x18]
ldr r1, _08117434 @ =gUnknown_30030F0
ldr r1, _08117434 @ =gMain
ldr r0, _08117438 @ =sub_8081668
str r0, [r1, 0x8]
ldr r0, _0811743C @ =gUnknown_2022B4C
@@ -3317,7 +3317,7 @@ sub_81173C0: @ 81173C0
.align 2, 0
_0811742C: .4byte gUnknown_202273C
_08117430: .4byte 0x00002211
_08117434: .4byte gUnknown_30030F0
_08117434: .4byte gMain
_08117438: .4byte sub_8081668
_0811743C: .4byte gUnknown_2022B4C
thumb_func_end sub_81173C0
@@ -3340,7 +3340,7 @@ sub_8117440: @ 8117440
ldr r0, _081174AC @ =0x0000406f
adds r1, r3, 0
bl VarSet
ldr r6, _081174B0 @ =gUnknown_3005008
ldr r6, _081174B0 @ =gSaveBlock1Ptr
ldr r1, [r6]
movs r0, 0x4
ldrsb r0, [r1, r0]
@@ -3376,7 +3376,7 @@ sub_8117440: @ 8117440
bx r0
.align 2, 0
_081174AC: .4byte 0x0000406f
_081174B0: .4byte gUnknown_3005008
_081174B0: .4byte gSaveBlock1Ptr
thumb_func_end sub_8117440
thumb_func_start sub_81174B4
@@ -3441,7 +3441,7 @@ _08117530: .4byte gUnknown_300502C
thumb_func_start sub_8117534
sub_8117534: @ 8117534
push {r4,lr}
ldr r0, _0811754C @ =gUnknown_30030F0
ldr r0, _0811754C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r4, r0, r1
@@ -3452,7 +3452,7 @@ sub_8117534: @ 8117534
beq _08117564
b _08117576
.align 2, 0
_0811754C: .4byte gUnknown_30030F0
_0811754C: .4byte gMain
_08117550:
ldr r0, _08117560 @ =sub_8117280
movs r1, 0x5
@@ -3646,14 +3646,14 @@ _08117640:
.4byte _08117784
_08117784:
bl sub_80563F0
ldr r1, _08117798 @ =gUnknown_30030F0
ldr r1, _08117798 @ =gMain
ldr r0, _0811779C @ =sub_811C1C8
str r0, [r1, 0x8]
movs r0, 0x2
bl sub_81274A8
b _081178E0
.align 2, 0
_08117798: .4byte gUnknown_30030F0
_08117798: .4byte gMain
_0811779C: .4byte sub_811C1C8
_081177A0:
bl sub_80563F0
@@ -4124,7 +4124,7 @@ _08117BBC:
movs r1, 0x5
movs r2, 0x6
bl sub_8116444
ldr r0, _08117BE0 @ =gUnknown_30030F0
ldr r0, _08117BE0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -4137,7 +4137,7 @@ _08117BD4:
bl sub_80FCE44
b _08117ECA
.align 2, 0
_08117BE0: .4byte gUnknown_30030F0
_08117BE0: .4byte gMain
_08117BE4:
adds r0, r5, 0
adds r0, 0xD
@@ -4679,7 +4679,7 @@ _0811808E:
ldrb r0, [r5, 0xE]
bl ListMenuHandleInput
adds r2, r0, 0
ldr r0, _08118128 @ =gUnknown_30030F0
ldr r0, _08118128 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -4744,14 +4744,14 @@ _0811808E:
strb r0, [r5, 0x8]
b _08118288
.align 2, 0
_08118128: .4byte gUnknown_30030F0
_08118128: .4byte gMain
_0811812C: .4byte gUnknown_2021CD0
_08118130:
movs r0, 0x7
bl sub_80722CC
b _08118288
_08118138:
ldr r0, _0811814C @ =gUnknown_30030F0
ldr r0, _0811814C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -4763,7 +4763,7 @@ _08118146:
strb r0, [r5, 0x8]
b _08118288
.align 2, 0
_0811814C: .4byte gUnknown_30030F0
_0811814C: .4byte gMain
_08118150:
ldr r0, _08118184 @ =gUnknown_8459238
bl sub_8142504
@@ -5144,7 +5144,7 @@ _0811849C:
strb r0, [r5, 0x8]
b _081184BC
_081184A8:
ldr r0, _081184C4 @ =gUnknown_30030F0
ldr r0, _081184C4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -5160,7 +5160,7 @@ _081184BC:
strb r0, [r5, 0x14]
b _08118604
.align 2, 0
_081184C4: .4byte gUnknown_30030F0
_081184C4: .4byte gMain
_081184C8:
ldr r0, _081184FC @ =gUnknown_845928C
bl sub_8142504
@@ -5716,7 +5716,7 @@ _081189AA:
movs r0, 0x2
bl sub_80722CC
ldr r0, _081189DC @ =gUnknown_2021CD0
ldr r1, _081189E0 @ =gUnknown_300500C
ldr r1, _081189E0 @ =gSaveBlock2Ptr
ldr r1, [r1]
bl StringCopy
movs r1, 0
@@ -5725,7 +5725,7 @@ _081189AA:
.align 2, 0
_081189D8: .4byte gUnknown_20370D0
_081189DC: .4byte gUnknown_2021CD0
_081189E0: .4byte gUnknown_300500C
_081189E0: .4byte gSaveBlock2Ptr
_081189E4:
cmp r0, 0xB
bne _081189F8
@@ -5756,7 +5756,7 @@ _08118A0E:
bne _08118A1E
bl _081198DC
_08118A1E:
ldr r0, _08118A4C @ =gUnknown_30030F0
ldr r0, _08118A4C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -5776,7 +5776,7 @@ _08118A1E:
movs r0, 0x18
bl _081198DA
.align 2, 0
_08118A4C: .4byte gUnknown_30030F0
_08118A4C: .4byte gMain
_08118A50:
bl sub_811A9B8
cmp r0, 0
@@ -5789,14 +5789,14 @@ _08118A50:
bl sub_80722CC
bl sub_811B298
ldr r0, _08118A7C @ =gUnknown_2021CD0
ldr r1, _08118A80 @ =gUnknown_300500C
ldr r1, _08118A80 @ =gSaveBlock2Ptr
ldr r1, [r1]
bl StringCopy
movs r0, 0x2D
bl _081198DA
.align 2, 0
_08118A7C: .4byte gUnknown_2021CD0
_08118A80: .4byte gUnknown_300500C
_08118A80: .4byte gSaveBlock2Ptr
_08118A84:
bl sub_8119B94
lsls r0, 24
@@ -6590,7 +6590,7 @@ _08119184:
bne _08119196
b _081198DC
_08119196:
ldr r0, _081191B8 @ =gUnknown_30030F0
ldr r0, _081191B8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -6606,7 +6606,7 @@ _081191A4:
movs r0, 0x24
b _081198DA
.align 2, 0
_081191B8: .4byte gUnknown_30030F0
_081191B8: .4byte gMain
_081191BC: .4byte gUnknown_2021D18
_081191C0: .4byte gUnknown_8457E60
_081191C4:
@@ -8717,7 +8717,7 @@ _0811A274:
ldrb r0, [r3]
bl ListMenuHandleInput
mov r8, r0
ldr r0, _0811A2AC @ =gUnknown_30030F0
ldr r0, _0811A2AC @ =gMain
ldrh r1, [r0, 0x2E]
ands r4, r1
cmp r4, 0
@@ -8737,7 +8737,7 @@ _0811A274:
mov r0, r8
b _0811A2DE
.align 2, 0
_0811A2AC: .4byte gUnknown_30030F0
_0811A2AC: .4byte gMain
_0811A2B0:
movs r0, 0x2
ands r0, r1
@@ -8823,7 +8823,7 @@ _0811A358:
ldrb r0, [r5]
bl ListMenuHandleInput
adds r1, r0, 0
ldr r0, _0811A3A8 @ =gUnknown_30030F0
ldr r0, _0811A3A8 @ =gMain
ldrh r2, [r0, 0x2E]
movs r0, 0x3
ands r0, r2
@@ -8857,7 +8857,7 @@ _0811A37E:
negs r0, r0
b _0811A3EA
.align 2, 0
_0811A3A8: .4byte gUnknown_30030F0
_0811A3A8: .4byte gMain
_0811A3AC:
ldr r0, [sp, 0x24]
bl sub_811AD7C
@@ -10077,7 +10077,7 @@ sub_811ACA4: @ 811ACA4
ands r0, r1
cmp r0, 0
beq _0811AD6C
ldr r0, _0811AD04 @ =gUnknown_300500C
ldr r0, _0811AD04 @ =gSaveBlock2Ptr
ldr r3, [r0]
movs r0, 0x5
str r0, [sp]
@@ -10089,7 +10089,7 @@ sub_811ACA4: @ 811ACA4
_0811ACF8: .4byte gUnknown_203B05C
_0811ACFC: .4byte gUnknown_8456F7C
_0811AD00: .4byte 0x000003ff
_0811AD04: .4byte gUnknown_300500C
_0811AD04: .4byte gSaveBlock2Ptr
_0811AD08:
mov r0, r12
adds r1, r0, r4
@@ -10605,7 +10605,7 @@ _0811B0CA:
InUnionRoom: @ 811B0D0
push {lr}
movs r2, 0
ldr r0, _0811B0EC @ =gUnknown_3005008
ldr r0, _0811B0EC @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
movs r0, 0x80
@@ -10618,7 +10618,7 @@ _0811B0E4:
pop {r1}
bx r1
.align 2, 0
_0811B0EC: .4byte gUnknown_3005008
_0811B0EC: .4byte gSaveBlock1Ptr
thumb_func_end InUnionRoom
thumb_func_start sub_811B0F0
@@ -11326,7 +11326,7 @@ sub_811B62C: @ 811B62C
ldr r1, _0811B644 @ =gUnknown_8457120
adds r0, r1
ldrb r0, [r0]
ldr r1, _0811B648 @ =gUnknown_3005008
ldr r1, _0811B648 @ =gSaveBlock1Ptr
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
@@ -11335,7 +11335,7 @@ sub_811B62C: @ 811B62C
bx r0
.align 2, 0
_0811B644: .4byte gUnknown_8457120
_0811B648: .4byte gUnknown_3005008
_0811B648: .4byte gSaveBlock1Ptr
thumb_func_end sub_811B62C
thumb_func_start sub_811B64C
@@ -11344,7 +11344,7 @@ sub_811B64C: @ 811B64C
ldr r1, _0811B664 @ =gUnknown_8457120
adds r0, r1
ldrb r0, [r0]
ldr r1, _0811B668 @ =gUnknown_3005008
ldr r1, _0811B668 @ =gSaveBlock1Ptr
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
@@ -11353,7 +11353,7 @@ sub_811B64C: @ 811B64C
bx r0
.align 2, 0
_0811B664: .4byte gUnknown_8457120
_0811B668: .4byte gUnknown_3005008
_0811B668: .4byte gSaveBlock1Ptr
thumb_func_end sub_811B64C
thumb_func_start sub_811B66C
@@ -11364,7 +11364,7 @@ sub_811B66C: @ 811B66C
ldr r1, _0811B6B8 @ =gUnknown_8457120
adds r0, r1
ldrb r0, [r0]
ldr r1, _0811B6BC @ =gUnknown_3005008
ldr r1, _0811B6BC @ =gSaveBlock1Ptr
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
@@ -11395,7 +11395,7 @@ sub_811B66C: @ 811B66C
b _0811B6D2
.align 2, 0
_0811B6B8: .4byte gUnknown_8457120
_0811B6BC: .4byte gUnknown_3005008
_0811B6BC: .4byte gSaveBlock1Ptr
_0811B6C0: .4byte gUnknown_2036E38
_0811B6C4:
ldr r0, _0811B6DC @ =gUnknown_8457138
@@ -11423,7 +11423,7 @@ sub_811B6E8: @ 811B6E8
ldr r1, _0811B724 @ =gUnknown_8457120
adds r0, r1
ldrb r0, [r0]
ldr r1, _0811B728 @ =gUnknown_3005008
ldr r1, _0811B728 @ =gSaveBlock1Ptr
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
@@ -11448,7 +11448,7 @@ sub_811B6E8: @ 811B6E8
b _0811B74A
.align 2, 0
_0811B724: .4byte gUnknown_8457120
_0811B728: .4byte gUnknown_3005008
_0811B728: .4byte gSaveBlock1Ptr
_0811B72C: .4byte gUnknown_2036E38
_0811B730:
bl ScriptContext2_IsEnabled
@@ -12846,7 +12846,7 @@ sub_811C1B4: @ 811C1B4
sub_811C1C8: @ 811C1C8
push {r4,lr}
sub sp, 0xC
ldr r1, _0811C1E8 @ =gUnknown_30030F0
ldr r1, _0811C1E8 @ =gMain
movs r2, 0x87
lsls r2, 3
adds r0, r1, r2
@@ -12862,7 +12862,7 @@ _0811C1DE:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0811C1E8: .4byte gUnknown_30030F0
_0811C1E8: .4byte gMain
_0811C1EC: .4byte _0811C1F0
.align 2, 0
_0811C1F0:
@@ -12970,7 +12970,7 @@ _0811C300:
bl sub_80F77B8
ldr r0, _0811C35C @ =sub_811C1B4
bl SetVBlankCallback
ldr r1, _0811C360 @ =gUnknown_30030F0
ldr r1, _0811C360 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -12980,7 +12980,7 @@ _0811C350: .4byte gUnknown_203B08C
_0811C354: .4byte gUnknown_8457194
_0811C358: .4byte gUnknown_8457198
_0811C35C: .4byte sub_811C1B4
_0811C360: .4byte gUnknown_30030F0
_0811C360: .4byte gMain
_0811C364:
ldr r0, _0811C380 @ =gUnknown_203B08C
ldr r0, [r0]
@@ -12991,7 +12991,7 @@ _0811C364:
bne _0811C376
b _0811C516
_0811C376:
ldr r1, _0811C388 @ =gUnknown_30030F0
ldr r1, _0811C388 @ =gMain
movs r2, 0x87
lsls r2, 3
adds r1, r2
@@ -12999,7 +12999,7 @@ _0811C376:
.align 2, 0
_0811C380: .4byte gUnknown_203B08C
_0811C384: .4byte gUnknown_841E538
_0811C388: .4byte gUnknown_30030F0
_0811C388: .4byte gMain
_0811C38C:
movs r0, 0x1
negs r0, r0
@@ -13010,13 +13010,13 @@ _0811C38C:
bl BeginNormalPaletteFade
movs r0, 0
bl ShowBg
ldr r1, _0811C3AC @ =gUnknown_30030F0
ldr r1, _0811C3AC @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
b _0811C4F2
.align 2, 0
_0811C3AC: .4byte gUnknown_30030F0
_0811C3AC: .4byte gMain
_0811C3B0:
bl UpdatePaletteFade
lsls r0, 24
@@ -13047,14 +13047,14 @@ _0811C3E2:
movs r0, 0
movs r2, 0x20
bl SendBlock
ldr r1, _0811C3FC @ =gUnknown_30030F0
ldr r1, _0811C3FC @ =gMain
movs r2, 0x87
lsls r2, 3
adds r1, r2
b _0811C4F2
.align 2, 0
_0811C3F8: .4byte gUnknown_2022618
_0811C3FC: .4byte gUnknown_30030F0
_0811C3FC: .4byte gMain
_0811C400:
bl GetBlockReceivedStatus
lsls r0, 24
@@ -13080,7 +13080,7 @@ _0811C40E:
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
ldr r0, _0811C444 @ =gUnknown_30030F0
ldr r0, _0811C444 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -13088,7 +13088,7 @@ _0811C40E:
b _0811C47E
.align 2, 0
_0811C440: .4byte gUnknown_2022118
_0811C444: .4byte gUnknown_30030F0
_0811C444: .4byte gMain
_0811C448:
bl sub_800AAC0
ldr r4, _0811C46C @ =gUnknown_2022118
@@ -13099,7 +13099,7 @@ _0811C448:
ldrh r0, [r0]
cmp r0, 0x52
bne _0811C474
ldr r0, _0811C470 @ =gUnknown_30030F0
ldr r0, _0811C470 @ =gMain
movs r2, 0x87
lsls r2, 3
adds r0, r2
@@ -13107,9 +13107,9 @@ _0811C448:
b _0811C47E
.align 2, 0
_0811C46C: .4byte gUnknown_2022118
_0811C470: .4byte gUnknown_30030F0
_0811C470: .4byte gMain
_0811C474:
ldr r0, _0811C488 @ =gUnknown_30030F0
ldr r0, _0811C488 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -13119,20 +13119,20 @@ _0811C47E:
bl ResetBlockReceivedFlags
b _0811C516
.align 2, 0
_0811C488: .4byte gUnknown_30030F0
_0811C488: .4byte gMain
_0811C48C:
bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _0811C516
bl sub_800AB9C
ldr r1, _0811C4A4 @ =gUnknown_30030F0
ldr r1, _0811C4A4 @ =gMain
movs r2, 0x87
lsls r2, 3
adds r1, r2
b _0811C4F2
.align 2, 0
_0811C4A4: .4byte gUnknown_30030F0
_0811C4A4: .4byte gMain
_0811C4A8:
bl sub_800A4BC
lsls r0, 24
asm/link_rfu_4.s
+10 -10
View File
@@ -230,7 +230,7 @@ _081425A4:
movs r2, 0x14
movs r3, 0x1
bl DrawDownArrow
ldr r0, _081425D4 @ =gUnknown_30030F0
ldr r0, _081425D4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -242,7 +242,7 @@ _081425C8:
b _08142602
.align 2, 0
_081425D0: .4byte gUnknown_203F3B0
_081425D4: .4byte gUnknown_30030F0
_081425D4: .4byte gMain
_081425D8:
movs r0, 0x1
str r0, [sp]
@@ -331,7 +331,7 @@ sub_8142660: @ 8142660
b _08142698
_08142670:
bl sub_8142610
ldr r0, _08142688 @ =gUnknown_30030F0
ldr r0, _08142688 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -342,7 +342,7 @@ _08142670:
strb r0, [r4]
b _08142698
.align 2, 0
_08142688: .4byte gUnknown_30030F0
_08142688: .4byte gMain
_0814268C:
bl sub_8142638
movs r0, 0
@@ -996,7 +996,7 @@ _08142B80:
.align 2, 0
_08142B88: .4byte gUnknown_841ED50
_08142B8C:
ldr r0, _08142BA0 @ =gUnknown_30030F0
ldr r0, _08142BA0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -1008,7 +1008,7 @@ _08142B98:
strb r0, [r4]
b _08142BB0
.align 2, 0
_08142BA0: .4byte gUnknown_30030F0
_08142BA0: .4byte gMain
_08142BA4:
movs r0, 0
strb r0, [r4]
@@ -1926,7 +1926,7 @@ _081432DE:
ldrb r0, [r5, 0xC]
cmp r0, 0
bne _08143308
ldr r2, _08143304 @ =gUnknown_30030F0
ldr r2, _08143304 @ =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1944,9 +1944,9 @@ _081432F4:
_08143300:
b _08143326
.align 2, 0
_08143304: .4byte gUnknown_30030F0
_08143304: .4byte gMain
_08143308:
ldr r0, _0814331C @ =gUnknown_30030F0
ldr r0, _0814331C @ =gMain
ldrh r0, [r0, 0x2E]
bl sub_8146884
cmp r0, 0
@@ -1955,7 +1955,7 @@ _08143308:
beq _08143326
b _081435C6
.align 2, 0
_0814331C: .4byte gUnknown_30030F0
_0814331C: .4byte gMain
_08143320:
bl sub_81467EC
b _08143402
asm/list_menu.s
+4 -4
View File
@@ -89,7 +89,7 @@ _08106F68:
ldrb r0, [r5, 0x6]
bl ListMenuHandleInput
str r0, [r5]
ldr r1, _08106FA4 @ =gUnknown_30030F0
ldr r1, _08106FA4 @ =gMain
ldrh r0, [r1, 0x2E]
ands r4, r0
cmp r4, 0
@@ -117,7 +117,7 @@ _08106F92:
bl ClearWindowTilemap
b _08106FBA
.align 2, 0
_08106FA4: .4byte gUnknown_30030F0
_08106FA4: .4byte gMain
_08106FA8:
mov r4, r10
cmp r4, 0
@@ -237,7 +237,7 @@ ListMenuHandleInput: @ 8107078
lsls r1, 3
ldr r0, _081070A4 @ =gUnknown_3005098
adds r3, r1, r0
ldr r2, _081070A8 @ =gUnknown_30030F0
ldr r2, _081070A8 @ =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -253,7 +253,7 @@ ListMenuHandleInput: @ 8107078
b _08107136
.align 2, 0
_081070A4: .4byte gUnknown_3005098
_081070A8: .4byte gUnknown_30030F0
_081070A8: .4byte gMain
_081070AC:
movs r0, 0x2
ands r0, r1
asm/load_save.s
+67 -67
View File
@@ -37,7 +37,7 @@ ClearSav2: @ 804C010
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, _0804C02C @ =gUnknown_2024588
ldr r1, _0804C02C @ =gSaveBlock2
ldr r2, _0804C030 @ =0x010007d2
mov r0, sp
bl CpuSet
@@ -45,7 +45,7 @@ ClearSav2: @ 804C010
pop {r0}
bx r0
.align 2, 0
_0804C02C: .4byte gUnknown_2024588
_0804C02C: .4byte gSaveBlock2
_0804C030: .4byte 0x010007d2
thumb_func_end ClearSav2
@@ -56,7 +56,7 @@ ClearSav1: @ 804C034
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, _0804C050 @ =gUnknown_202552C
ldr r1, _0804C050 @ =gSaveBlock1
ldr r2, _0804C054 @ =0x01001ef4
mov r0, sp
bl CpuSet
@@ -64,27 +64,27 @@ ClearSav1: @ 804C034
pop {r0}
bx r0
.align 2, 0
_0804C050: .4byte gUnknown_202552C
_0804C050: .4byte gSaveBlock1
_0804C054: .4byte 0x01001ef4
thumb_func_end ClearSav1
thumb_func_start SetSaveBlocksPointers
SetSaveBlocksPointers: @ 804C058
push {r4,r5,lr}
ldr r4, _0804C08C @ =gUnknown_3005008
ldr r4, _0804C08C @ =gSaveBlock1Ptr
ldr r5, [r4]
bl Random
movs r1, 0x7C
ands r1, r0
ldr r2, _0804C090 @ =gUnknown_300500C
ldr r0, _0804C094 @ =gUnknown_2024588
ldr r2, _0804C090 @ =gSaveBlock2Ptr
ldr r0, _0804C094 @ =gSaveBlock2
adds r0, r1, r0
str r0, [r2]
ldr r0, _0804C098 @ =gUnknown_202552C
ldr r0, _0804C098 @ =gSaveBlock1
adds r0, r1, r0
str r0, [r4]
ldr r2, _0804C09C @ =gUnknown_3005010
ldr r0, _0804C0A0 @ =gUnknown_2029314
ldr r0, _0804C0A0 @ =gPokemonStorage
adds r1, r0
str r1, [r2]
bl sub_8099E44
@@ -94,12 +94,12 @@ SetSaveBlocksPointers: @ 804C058
pop {r0}
bx r0
.align 2, 0
_0804C08C: .4byte gUnknown_3005008
_0804C090: .4byte gUnknown_300500C
_0804C094: .4byte gUnknown_2024588
_0804C098: .4byte gUnknown_202552C
_0804C08C: .4byte gSaveBlock1Ptr
_0804C090: .4byte gSaveBlock2Ptr
_0804C094: .4byte gSaveBlock2
_0804C098: .4byte gSaveBlock1
_0804C09C: .4byte gUnknown_3005010
_0804C0A0: .4byte gUnknown_2029314
_0804C0A0: .4byte gPokemonStorage
thumb_func_end SetSaveBlocksPointers
thumb_func_start sub_804C0A4
@@ -110,7 +110,7 @@ sub_804C0A4: @ 804C0A4
mov r5, r8
push {r5-r7}
sub sp, 0x8
ldr r4, _0804C160 @ =gUnknown_30030F0
ldr r4, _0804C160 @ =gMain
ldr r0, [r4, 0xC]
str r0, [sp]
ldr r1, [r4, 0x10]
@@ -120,14 +120,14 @@ sub_804C0A4: @ 804C0A4
str r0, [r4, 0x10]
str r0, [r4, 0x20]
ldr r5, _0804C164 @ =gHeap
ldr r0, _0804C168 @ =gUnknown_300500C
ldr r0, _0804C168 @ =gSaveBlock2Ptr
ldr r1, [r0]
ldr r0, _0804C16C @ =0x00000f24
mov r9, r0
adds r0, r5, 0
mov r2, r9
bl memcpy
ldr r1, _0804C170 @ =gUnknown_3005008
ldr r1, _0804C170 @ =gSaveBlock1Ptr
mov r10, r1
ldr r1, [r1]
ldr r7, _0804C174 @ =0x00003d68
@@ -142,7 +142,7 @@ sub_804C0A4: @ 804C0A4
mov r2, r8
bl memcpy
bl SetSaveBlocksPointers
ldr r1, _0804C168 @ =gUnknown_300500C
ldr r1, _0804C168 @ =gSaveBlock2Ptr
ldr r0, [r1]
adds r1, r5, 0
mov r2, r9
@@ -173,7 +173,7 @@ sub_804C0A4: @ 804C0A4
adds r4, r0
adds r0, r4, 0
bl sub_804C5A4
ldr r1, _0804C168 @ =gUnknown_300500C
ldr r1, _0804C168 @ =gSaveBlock2Ptr
ldr r0, [r1]
movs r1, 0xF2
lsls r1, 4
@@ -188,11 +188,11 @@ sub_804C0A4: @ 804C0A4
pop {r0}
bx r0
.align 2, 0
_0804C160: .4byte gUnknown_30030F0
_0804C160: .4byte gMain
_0804C164: .4byte gHeap
_0804C168: .4byte gUnknown_300500C
_0804C168: .4byte gSaveBlock2Ptr
_0804C16C: .4byte 0x00000f24
_0804C170: .4byte gUnknown_3005008
_0804C170: .4byte gSaveBlock1Ptr
_0804C174: .4byte 0x00003d68
_0804C178: .4byte gHeap + 0xf24
_0804C17C: .4byte gUnknown_3005010
@@ -202,19 +202,19 @@ _0804C184: .4byte gHeap + 0x4c8c
thumb_func_start sav2_x1_query_bit1
sav2_x1_query_bit1: @ 804C188
ldr r0, _0804C194 @ =gUnknown_300500C
ldr r0, _0804C194 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x9]
movs r0, 0x1
ands r0, r1
bx lr
.align 2, 0
_0804C194: .4byte gUnknown_300500C
_0804C194: .4byte gSaveBlock2Ptr
thumb_func_end sav2_x1_query_bit1
thumb_func_start sav2_x9_clear_bit1
sav2_x9_clear_bit1: @ 804C198
ldr r0, _0804C1A8 @ =gUnknown_300500C
ldr r0, _0804C1A8 @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r1, [r2, 0x9]
movs r0, 0xFE
@@ -222,12 +222,12 @@ sav2_x9_clear_bit1: @ 804C198
strb r0, [r2, 0x9]
bx lr
.align 2, 0
_0804C1A8: .4byte gUnknown_300500C
_0804C1A8: .4byte gSaveBlock2Ptr
thumb_func_end sav2_x9_clear_bit1
thumb_func_start sub_804C1AC
sub_804C1AC: @ 804C1AC
ldr r0, _0804C1BC @ =gUnknown_300500C
ldr r0, _0804C1BC @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r1, [r2, 0x9]
movs r0, 0x1
@@ -235,7 +235,7 @@ sub_804C1AC: @ 804C1AC
strb r0, [r2, 0x9]
bx lr
.align 2, 0
_0804C1BC: .4byte gUnknown_300500C
_0804C1BC: .4byte gSaveBlock2Ptr
thumb_func_end sub_804C1AC
thumb_func_start sub_804C1C0
@@ -243,7 +243,7 @@ sub_804C1C0: @ 804C1C0
push {lr}
movs r0, 0
bl sub_8055778
ldr r0, _0804C1D8 @ =gUnknown_300500C
ldr r0, _0804C1D8 @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r1, [r2, 0x9]
movs r0, 0x1
@@ -252,12 +252,12 @@ sub_804C1C0: @ 804C1C0
pop {r0}
bx r0
.align 2, 0
_0804C1D8: .4byte gUnknown_300500C
_0804C1D8: .4byte gSaveBlock2Ptr
thumb_func_end sub_804C1C0
thumb_func_start sav2_gender2_inplace_and_xFE
sav2_gender2_inplace_and_xFE: @ 804C1DC
ldr r0, _0804C1EC @ =gUnknown_300500C
ldr r0, _0804C1EC @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r1, [r2, 0x9]
movs r0, 0xFE
@@ -265,13 +265,13 @@ sav2_gender2_inplace_and_xFE: @ 804C1DC
strb r0, [r2, 0x9]
bx lr
.align 2, 0
_0804C1EC: .4byte gUnknown_300500C
_0804C1EC: .4byte gSaveBlock2Ptr
thumb_func_end sav2_gender2_inplace_and_xFE
thumb_func_start copy_player_party_to_sav1
copy_player_party_to_sav1: @ 804C1F0
push {r4,lr}
ldr r0, _0804C224 @ =gUnknown_3005008
ldr r0, _0804C224 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _0804C228 @ =gUnknown_2024029
ldrb r1, [r1]
@@ -279,7 +279,7 @@ copy_player_party_to_sav1: @ 804C1F0
strb r1, [r0]
movs r4, 0
_0804C200:
ldr r0, _0804C224 @ =gUnknown_3005008
ldr r0, _0804C224 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x64
muls r1, r4
@@ -296,7 +296,7 @@ _0804C200:
pop {r0}
bx r0
.align 2, 0
_0804C224: .4byte gUnknown_3005008
_0804C224: .4byte gSaveBlock1Ptr
_0804C228: .4byte gUnknown_2024029
_0804C22C: .4byte gUnknown_2024284
thumb_func_end copy_player_party_to_sav1
@@ -305,7 +305,7 @@ _0804C22C: .4byte gUnknown_2024284
sub_804C230: @ 804C230
push {r4,r5,lr}
ldr r1, _0804C264 @ =gUnknown_2024029
ldr r0, _0804C268 @ =gUnknown_3005008
ldr r0, _0804C268 @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x34
ldrb r0, [r0]
@@ -317,7 +317,7 @@ _0804C242:
adds r2, r4, 0
muls r2, r0
adds r0, r2, r5
ldr r1, _0804C268 @ =gUnknown_3005008
ldr r1, _0804C268 @ =gSaveBlock1Ptr
ldr r1, [r1]
adds r1, r2
adds r1, 0x38
@@ -331,7 +331,7 @@ _0804C242:
bx r0
.align 2, 0
_0804C264: .4byte gUnknown_2024029
_0804C268: .4byte gUnknown_3005008
_0804C268: .4byte gSaveBlock1Ptr
_0804C26C: .4byte gUnknown_2024284
thumb_func_end sub_804C230
@@ -340,7 +340,7 @@ save_serialize_npcs: @ 804C270
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r0, _0804C2B0 @ =gUnknown_3005008
ldr r0, _0804C2B0 @ =gSaveBlock1Ptr
mov r12, r0
movs r5, 0xD4
lsls r5, 3
@@ -371,7 +371,7 @@ _0804C286:
pop {r0}
bx r0
.align 2, 0
_0804C2B0: .4byte gUnknown_3005008
_0804C2B0: .4byte gSaveBlock1Ptr
_0804C2B4: .4byte gUnknown_2036E38
thumb_func_end save_serialize_npcs
@@ -380,7 +380,7 @@ sub_804C2B8: @ 804C2B8
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r0, _0804C2F8 @ =gUnknown_3005008
ldr r0, _0804C2F8 @ =gSaveBlock1Ptr
mov r12, r0
movs r5, 0xD4
lsls r5, 3
@@ -411,7 +411,7 @@ _0804C2CE:
pop {r0}
bx r0
.align 2, 0
_0804C2F8: .4byte gUnknown_3005008
_0804C2F8: .4byte gSaveBlock1Ptr
_0804C2FC: .4byte gUnknown_2036E38
thumb_func_end sub_804C2B8
@@ -443,9 +443,9 @@ copy_bags_and_unk_data_from_save_blocks: @ 804C320
movs r2, 0
ldr r0, _0804C424 @ =gUnknown_2031C8C
mov r12, r0
ldr r1, _0804C428 @ =gUnknown_300500C
ldr r1, _0804C428 @ =gSaveBlock2Ptr
mov r10, r1
ldr r5, _0804C42C @ =gUnknown_3005008
ldr r5, _0804C42C @ =gSaveBlock1Ptr
movs r3, 0xC4
lsls r3, 2
ldr r4, _0804C430 @ =gUnknown_2031764
@@ -461,7 +461,7 @@ _0804C33C:
ble _0804C33C
movs r2, 0
ldr r0, _0804C430 @ =gUnknown_2031764
ldr r5, _0804C42C @ =gUnknown_3005008
ldr r5, _0804C42C @ =gSaveBlock1Ptr
movs r3, 0xEE
lsls r3, 2
adds r4, r0, 0
@@ -478,7 +478,7 @@ _0804C35C:
ble _0804C35C
movs r2, 0
ldr r0, _0804C430 @ =gUnknown_2031764
ldr r5, _0804C42C @ =gUnknown_3005008
ldr r5, _0804C42C @ =gSaveBlock1Ptr
movs r6, 0x90
lsls r6, 1
adds r4, r0, r6
@@ -496,7 +496,7 @@ _0804C37E:
ble _0804C37E
movs r2, 0
ldr r0, _0804C430 @ =gUnknown_2031764
ldr r5, _0804C42C @ =gUnknown_3005008
ldr r5, _0804C42C @ =gSaveBlock1Ptr
movs r7, 0xAA
lsls r7, 1
adds r4, r0, r7
@@ -513,7 +513,7 @@ _0804C39E:
ble _0804C39E
movs r2, 0
ldr r0, _0804C430 @ =gUnknown_2031764
ldr r5, _0804C42C @ =gUnknown_3005008
ldr r5, _0804C42C @ =gSaveBlock1Ptr
movs r1, 0x8F
lsls r1, 2
adds r4, r0, r1
@@ -529,7 +529,7 @@ _0804C3BE:
cmp r2, 0x2A
ble _0804C3BE
ldr r0, _0804C430 @ =gUnknown_2031764
ldr r5, _0804C42C @ =gUnknown_3005008
ldr r5, _0804C42C @ =gSaveBlock1Ptr
mov r8, r5
movs r6, 0xBA
lsls r6, 2
@@ -572,8 +572,8 @@ _0804C3E4:
bx r0
.align 2, 0
_0804C424: .4byte gUnknown_2031C8C
_0804C428: .4byte gUnknown_300500C
_0804C42C: .4byte gUnknown_3005008
_0804C428: .4byte gSaveBlock2Ptr
_0804C42C: .4byte gSaveBlock1Ptr
_0804C430: .4byte gUnknown_2031764
_0804C434: .4byte 0x00000464
_0804C438: .4byte 0x0000054c
@@ -588,11 +588,11 @@ sub_804C440: @ 804C440
mov r5, r8
push {r5-r7}
movs r2, 0
ldr r0, _0804C550 @ =gUnknown_300500C
ldr r0, _0804C550 @ =gSaveBlock2Ptr
mov r8, r0
ldr r1, _0804C554 @ =gUnknown_2031C8C
mov r12, r1
ldr r5, _0804C558 @ =gUnknown_3005008
ldr r5, _0804C558 @ =gSaveBlock1Ptr
movs r3, 0xC4
lsls r3, 2
ldr r4, _0804C55C @ =gUnknown_2031764
@@ -607,7 +607,7 @@ _0804C45C:
cmp r2, 0x29
ble _0804C45C
movs r2, 0
ldr r5, _0804C558 @ =gUnknown_3005008
ldr r5, _0804C558 @ =gSaveBlock1Ptr
movs r4, 0xEE
lsls r4, 2
ldr r0, _0804C55C @ =gUnknown_2031764
@@ -624,7 +624,7 @@ _0804C47C:
cmp r2, 0x1D
ble _0804C47C
movs r2, 0
ldr r5, _0804C558 @ =gUnknown_3005008
ldr r5, _0804C558 @ =gSaveBlock1Ptr
movs r4, 0x86
lsls r4, 3
ldr r0, _0804C55C @ =gUnknown_2031764
@@ -642,7 +642,7 @@ _0804C49E:
cmp r2, 0xC
ble _0804C49E
movs r2, 0
ldr r5, _0804C558 @ =gUnknown_3005008
ldr r5, _0804C558 @ =gSaveBlock1Ptr
ldr r4, _0804C560 @ =0x00000464
ldr r0, _0804C55C @ =gUnknown_2031764
movs r7, 0xAA
@@ -659,7 +659,7 @@ _0804C4BE:
cmp r2, 0x39
ble _0804C4BE
movs r2, 0
ldr r5, _0804C558 @ =gUnknown_3005008
ldr r5, _0804C558 @ =gSaveBlock1Ptr
ldr r4, _0804C564 @ =0x0000054c
ldr r0, _0804C55C @ =gUnknown_2031764
movs r1, 0x8F
@@ -675,7 +675,7 @@ _0804C4DE:
adds r2, 0x1
cmp r2, 0x2A
ble _0804C4DE
ldr r2, _0804C558 @ =gUnknown_3005008
ldr r2, _0804C558 @ =gSaveBlock1Ptr
mov r9, r2
ldr r5, _0804C568 @ =0x00002cd0
mov r10, r5
@@ -724,9 +724,9 @@ _0804C4FE:
pop {r0}
bx r0
.align 2, 0
_0804C550: .4byte gUnknown_300500C
_0804C550: .4byte gSaveBlock2Ptr
_0804C554: .4byte gUnknown_2031C8C
_0804C558: .4byte gUnknown_3005008
_0804C558: .4byte gSaveBlock1Ptr
_0804C55C: .4byte gUnknown_2031764
_0804C560: .4byte 0x00000464
_0804C564: .4byte 0x0000054c
@@ -735,7 +735,7 @@ _0804C568: .4byte 0x00002cd0
thumb_func_start sub_804C56C
sub_804C56C: @ 804C56C
ldr r2, _0804C584 @ =gUnknown_300500C
ldr r2, _0804C584 @ =gSaveBlock2Ptr
ldr r2, [r2]
movs r3, 0xF2
lsls r3, 4
@@ -747,12 +747,12 @@ sub_804C56C: @ 804C56C
strh r2, [r0]
bx lr
.align 2, 0
_0804C584: .4byte gUnknown_300500C
_0804C584: .4byte gSaveBlock2Ptr
thumb_func_end sub_804C56C
thumb_func_start sub_804C588
sub_804C588: @ 804C588
ldr r2, _0804C5A0 @ =gUnknown_300500C
ldr r2, _0804C5A0 @ =gSaveBlock2Ptr
ldr r3, [r2]
movs r2, 0xF2
lsls r2, 4
@@ -764,14 +764,14 @@ sub_804C588: @ 804C588
str r2, [r0]
bx lr
.align 2, 0
_0804C5A0: .4byte gUnknown_300500C
_0804C5A0: .4byte gSaveBlock2Ptr
thumb_func_end sub_804C588
thumb_func_start sub_804C5A4
sub_804C5A4: @ 804C5A4
push {r4-r7,lr}
adds r5, r0, 0
ldr r7, _0804C5F8 @ =gUnknown_3005008
ldr r7, _0804C5F8 @ =gSaveBlock1Ptr
ldr r6, _0804C5FC @ =0x00003d38
movs r4, 0x3
_0804C5AE:
@@ -790,7 +790,7 @@ _0804C5AE:
bl ApplyNewEncryptionKeyToBagItems_
adds r0, r5, 0
bl sub_815EE6C
ldr r4, _0804C5F8 @ =gUnknown_3005008
ldr r4, _0804C5F8 @ =gSaveBlock1Ptr
ldr r0, [r4]
movs r1, 0xA4
lsls r1, 2
@@ -807,7 +807,7 @@ _0804C5AE:
pop {r0}
bx r0
.align 2, 0
_0804C5F8: .4byte gUnknown_3005008
_0804C5F8: .4byte gSaveBlock1Ptr
_0804C5FC: .4byte 0x00003d38
thumb_func_end sub_804C5A4
asm/mail.s
+8 -8
View File
@@ -159,7 +159,7 @@ _080BED14: .4byte sub_80BF110
sub_80BED18: @ 80BED18
push {r4-r6,lr}
sub sp, 0xC
ldr r0, _080BED38 @ =gUnknown_30030F0
ldr r0, _080BED38 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -174,7 +174,7 @@ _080BED2C:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080BED38: .4byte gUnknown_30030F0
_080BED38: .4byte gMain
_080BED3C: .4byte _080BED40
.align 2, 0
_080BED40:
@@ -433,7 +433,7 @@ _080BEF28:
movs r2, 0x20
bl LoadPalette
ldr r1, _080BEFE0 @ =gUnknown_83EE9C0
ldr r0, _080BEFE4 @ =gUnknown_300500C
ldr r0, _080BEFE4 @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r0, [r2, 0x8]
lsls r0, 2
@@ -463,7 +463,7 @@ _080BEFD4: .4byte gUnknown_83EE9C8
_080BEFD8: .4byte gUnknown_20399C4
_080BEFDC: .4byte gUnknown_20375F8
_080BEFE0: .4byte gUnknown_83EE9C0
_080BEFE4: .4byte gUnknown_300500C
_080BEFE4: .4byte gSaveBlock2Ptr
_080BEFE8:
ldr r0, _080BEFFC @ =gUnknown_20399C4
ldr r0, [r0]
@@ -590,7 +590,7 @@ _080BF0E8: .4byte gUnknown_2037AB8
_080BF0EC: .4byte gUnknown_20399C4
_080BF0F0: .4byte sub_80BF394
_080BF0F4:
ldr r1, _080BF10C @ =gUnknown_30030F0
ldr r1, _080BF10C @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -605,7 +605,7 @@ _080BF104:
pop {r1}
bx r1
.align 2, 0
_080BF10C: .4byte gUnknown_30030F0
_080BF10C: .4byte gMain
thumb_func_end sub_80BED18
thumb_func_start sub_80BF110
@@ -952,7 +952,7 @@ _080BF3B4: .4byte sub_80BF3B8
sub_80BF3B8: @ 80BF3B8
push {lr}
sub sp, 0x4
ldr r0, _080BF3E8 @ =gUnknown_30030F0
ldr r0, _080BF3E8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -975,7 +975,7 @@ _080BF3E2:
pop {r0}
bx r0
.align 2, 0
_080BF3E8: .4byte gUnknown_30030F0
_080BF3E8: .4byte gMain
_080BF3EC: .4byte gUnknown_20399C4
_080BF3F0: .4byte sub_80BF3F4
thumb_func_end sub_80BF3B8
asm/mail_data.s
+19 -19
View File
@@ -9,7 +9,7 @@
ClearMailData: @ 8097C84
push {r4,r5,lr}
movs r4, 0
ldr r5, _08097CAC @ =gUnknown_3005008
ldr r5, _08097CAC @ =gSaveBlock1Ptr
_08097C8A:
lsls r1, r4, 3
adds r1, r4
@@ -28,7 +28,7 @@ _08097C8A:
pop {r0}
bx r0
.align 2, 0
_08097CAC: .4byte gUnknown_3005008
_08097CAC: .4byte gSaveBlock1Ptr
_08097CB0: .4byte 0x00002cd0
thumb_func_end ClearMailData
@@ -132,7 +132,7 @@ sub_8097D38: @ 8097D38
mov r9, r4
adds r5, r4, 0
_08097D62:
ldr r2, _08097EC0 @ =gUnknown_3005008
ldr r2, _08097EC0 @ =gSaveBlock1Ptr
ldr r0, [r2]
ldrb r3, [r5]
lsls r1, r3, 3
@@ -147,7 +147,7 @@ _08097D62:
b _08097EE0
_08097D7C:
movs r4, 0
ldr r3, _08097EC8 @ =gUnknown_300500C
ldr r3, _08097EC8 @ =gSaveBlock2Ptr
mov r10, r3
adds r7, r2, 0
mov r5, r12
@@ -178,9 +178,9 @@ _08097D8A:
ldrb r0, [r0]
cmp r0, 0xFF
beq _08097DEE
ldr r3, _08097EC8 @ =gUnknown_300500C
ldr r3, _08097EC8 @ =gSaveBlock2Ptr
_08097DBC:
ldr r0, _08097EC0 @ =gUnknown_3005008
ldr r0, _08097EC0 @ =gSaveBlock1Ptr
ldr r2, [r0]
mov r0, r12
ldrb r1, [r0]
@@ -208,7 +208,7 @@ _08097DBC:
_08097DEE:
cmp r4, 0x5
bhi _08097E16
ldr r7, _08097EC0 @ =gUnknown_3005008
ldr r7, _08097EC0 @ =gSaveBlock1Ptr
mov r3, r12
ldr r6, _08097ED4 @ =0x00002ce2
movs r5, 0
@@ -228,7 +228,7 @@ _08097DFA:
cmp r4, 0x5
bls _08097DFA
_08097E16:
ldr r3, _08097EC0 @ =gUnknown_3005008
ldr r3, _08097EC0 @ =gSaveBlock1Ptr
ldr r2, [r3]
mov r0, r12
ldrb r1, [r0]
@@ -277,7 +277,7 @@ _08097E36:
adds r1, r0, 0
adds r0, r4, 0
bl SpeciesToMailSpecies
ldr r1, _08097EC0 @ =gUnknown_3005008
ldr r1, _08097EC0 @ =gSaveBlock1Ptr
ldr r3, [r1]
mov r4, r9
ldrb r2, [r4]
@@ -310,9 +310,9 @@ _08097E36:
ldrb r0, [r1]
b _08097EEE
.align 2, 0
_08097EC0: .4byte gUnknown_3005008
_08097EC0: .4byte gSaveBlock1Ptr
_08097EC4: .4byte 0x00002cf0
_08097EC8: .4byte gUnknown_300500C
_08097EC8: .4byte gSaveBlock2Ptr
_08097ECC: .4byte 0x0000ffff
_08097ED0: .4byte 0x00002cd0
_08097ED4: .4byte 0x00002ce2
@@ -395,7 +395,7 @@ GiveMailToMon2: @ 8097F44
ldrb r2, [r4]
cmp r2, 0xFF
beq _08097FA8
ldr r0, _08097FA0 @ =gUnknown_3005008
ldr r0, _08097FA0 @ =gSaveBlock1Ptr
ldr r1, [r0]
lsls r0, r2, 3
adds r0, r2
@@ -426,7 +426,7 @@ GiveMailToMon2: @ 8097F44
ldrb r0, [r4]
b _08097FAA
.align 2, 0
_08097FA0: .4byte gUnknown_3005008
_08097FA0: .4byte gSaveBlock1Ptr
_08097FA4: .4byte 0x00002cd0
_08097FA8:
movs r0, 0xFF
@@ -457,7 +457,7 @@ TakeMailFromMon: @ 8097FB8
bl GetMonData
add r2, sp, 0x4
strb r0, [r2]
ldr r0, _08098010 @ =gUnknown_3005008
ldr r0, _08098010 @ =gSaveBlock1Ptr
ldr r3, [r0]
ldrb r1, [r2]
lsls r0, r1, 3
@@ -487,7 +487,7 @@ _08098008:
pop {r0}
bx r0
.align 2, 0
_08098010: .4byte gUnknown_3005008
_08098010: .4byte gSaveBlock1Ptr
_08098014: .4byte 0x00002cf0
thumb_func_end TakeMailFromMon
@@ -495,7 +495,7 @@ _08098014: .4byte 0x00002cf0
sub_8098018: @ 8098018
lsls r0, 24
lsrs r0, 24
ldr r1, _08098034 @ =gUnknown_3005008
ldr r1, _08098034 @ =gSaveBlock1Ptr
ldr r2, [r1]
lsls r1, r0, 3
adds r1, r0
@@ -507,7 +507,7 @@ sub_8098018: @ 8098018
strh r0, [r2]
bx lr
.align 2, 0
_08098034: .4byte gUnknown_3005008
_08098034: .4byte gSaveBlock1Ptr
_08098038: .4byte 0x00002cf0
thumb_func_end sub_8098018
@@ -528,7 +528,7 @@ sub_809803C: @ 809803C
strb r0, [r1]
movs r7, 0x6
mov r9, r1
ldr r0, _080980D0 @ =gUnknown_3005008
ldr r0, _080980D0 @ =gSaveBlock1Ptr
mov r8, r0
ldr r3, _080980D4 @ =0x00002cd0
_08098060:
@@ -585,7 +585,7 @@ _08098060:
adds r0, r7, 0
b _080980E8
.align 2, 0
_080980D0: .4byte gUnknown_3005008
_080980D0: .4byte gSaveBlock1Ptr
_080980D4: .4byte 0x00002cd0
_080980D8: .4byte 0x00002cf0
_080980DC:
asm/mailbox_pc.s
+2 -2
View File
@@ -120,7 +120,7 @@ sub_810EC20: @ 810EC20
negs r0, r0
cmp r3, r0
beq _0810EC82
ldr r0, _0810EC8C @ =gUnknown_3005008
ldr r0, _0810EC8C @ =gSaveBlock1Ptr
lsls r1, r3, 3
adds r1, r3
lsls r1, 2
@@ -161,7 +161,7 @@ _0810EC82:
pop {r0}
bx r0
.align 2, 0
_0810EC8C: .4byte gUnknown_3005008
_0810EC8C: .4byte gSaveBlock1Ptr
_0810EC90: .4byte 0x00002dba
_0810EC94: .4byte gUnknown_8454000
thumb_func_end sub_810EC20
asm/main.s
-757
View File
@@ -1,757 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start AgbMain
AgbMain: @ 80003A4
push {r4-r7,lr}
mov r7, r8
push {r7}
movs r0, 0xFF
bl RegisterRamReset
movs r1, 0xA0
lsls r1, 19
ldr r2, _08000458 @ =0x00007fff
adds r0, r2, 0
strh r0, [r1]
bl InitGpuRegManager
ldr r1, _0800045C @ =0x04000204
ldr r2, _08000460 @ =0x00004014
adds r0, r2, 0
strh r0, [r1]
bl InitKeys
bl InitIntrHandlers
bl m4aSoundInit
bl EnableVCountIntrAtLine150
bl sub_80F86C4
bl CheckForFlashMemory
bl sub_80004C4
bl InitMapMusic
bl ClearDma3Requests
bl ResetBgs
ldr r0, _08000464 @ =gHeap
movs r1, 0xE0
lsls r1, 9
bl InitHeap
bl SetDefaultFontsPointer
ldr r0, _08000468 @ =gUnknown_3003530
movs r4, 0
strb r4, [r0]
ldr r0, _0800046C @ =gUnknown_3005ECC
strb r4, [r0]
bl sub_80F50F4
bl AGBPrintInit
ldr r0, _08000470 @ =gUnknown_30030E4
strb r4, [r0]
ldr r7, _08000474 @ =gUnknown_30030F0
movs r1, 0
mov r8, r1
adds r6, r0, 0
_0800041A:
bl ReadKeys
ldr r0, _08000468 @ =gUnknown_3003530
ldrb r0, [r0]
cmp r0, 0
bne _08000444
ldrh r1, [r7, 0x28]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _08000444
movs r0, 0xE
ands r0, r1
cmp r0, 0xE
bne _08000444
bl rfu_REQ_stopMode
bl rfu_waitREQComplete
bl sub_80008D8
_08000444:
bl sub_80582E0
cmp r0, 0x1
bne _08000478
strb r0, [r6]
bl sub_80004B0
movs r0, 0
strb r0, [r6]
b _0800049E
.align 2, 0
_08000458: .4byte 0x00007fff
_0800045C: .4byte 0x04000204
_08000460: .4byte 0x00004014
_08000464: .4byte gHeap
_08000468: .4byte gUnknown_3003530
_0800046C: .4byte gUnknown_3005ECC
_08000470: .4byte gUnknown_30030E4
_08000474: .4byte gUnknown_30030F0
_08000478:
ldr r5, _080004AC @ =gUnknown_30030E4
movs r0, 0
strb r0, [r5]
bl sub_80004B0
bl sub_8058274
adds r4, r0, 0
cmp r4, 0x1
bne _0800049E
movs r0, 0
strh r0, [r7, 0x2E]
bl ClearSpriteCopyRequests
strb r4, [r5]
bl sub_80004B0
mov r2, r8
strb r2, [r5]
_0800049E:
bl PlayTimeCounter_Update
bl MapMusicMain
bl sub_8000890
b _0800041A
.align 2, 0
_080004AC: .4byte gUnknown_30030E4
thumb_func_end AgbMain
thumb_func_start sub_80004B0
sub_80004B0: @ 80004B0
push {lr}
bl HandleLinkConnection
lsls r0, 24
cmp r0, 0
bne _080004C0
bl sub_8000510
_080004C0:
pop {r0}
bx r0
thumb_func_end sub_80004B0
thumb_func_start sub_80004C4
sub_80004C4: @ 80004C4
push {r4,lr}
ldr r0, _080004F4 @ =gUnknown_30030F0
movs r4, 0
str r4, [r0, 0x20]
str r4, [r0, 0x24]
str r4, [r0]
ldr r0, _080004F8 @ =sub_80EC820
bl SetMainCallback2
ldr r0, _080004FC @ =gUnknown_300500C
ldr r1, _08000500 @ =gUnknown_2024588
str r1, [r0]
ldr r2, _08000504 @ =gUnknown_3005008
ldr r0, _08000508 @ =gUnknown_202552C
str r0, [r2]
movs r0, 0xF2
lsls r0, 4
adds r1, r0
str r4, [r1]
ldr r0, _0800050C @ =gUnknown_3005E88
strb r4, [r0]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080004F4: .4byte gUnknown_30030F0
_080004F8: .4byte sub_80EC820
_080004FC: .4byte gUnknown_300500C
_08000500: .4byte gUnknown_2024588
_08000504: .4byte gUnknown_3005008
_08000508: .4byte gUnknown_202552C
_0800050C: .4byte gUnknown_3005E88
thumb_func_end sub_80004C4
thumb_func_start sub_8000510
sub_8000510: @ 8000510
push {r4,lr}
bl sub_80F5118
cmp r0, 0
bne _0800053A
bl sub_813B870
lsls r0, 24
cmp r0, 0
bne _0800053A
ldr r4, _08000540 @ =gUnknown_30030F0
ldr r0, [r4]
cmp r0, 0
beq _08000530
bl _call_via_r0
_08000530:
ldr r0, [r4, 0x4]
cmp r0, 0
beq _0800053A
bl _call_via_r0
_0800053A:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08000540: .4byte gUnknown_30030F0
thumb_func_end sub_8000510
thumb_func_start SetMainCallback2
SetMainCallback2: @ 8000544
ldr r1, _08000554 @ =gUnknown_30030F0
str r0, [r1, 0x4]
movs r0, 0x87
lsls r0, 3
adds r1, r0
movs r0, 0
strb r0, [r1]
bx lr
.align 2, 0
_08000554: .4byte gUnknown_30030F0
thumb_func_end SetMainCallback2
thumb_func_start StartTimer1
StartTimer1: @ 8000558
ldr r1, _08000560 @ =0x04000106
movs r0, 0x80
strh r0, [r1]
bx lr
.align 2, 0
_08000560: .4byte 0x04000106
thumb_func_end StartTimer1
thumb_func_start SeedRngAndSetTrainerId
SeedRngAndSetTrainerId: @ 8000564
push {r4,lr}
ldr r0, _08000580 @ =0x04000104
ldrh r4, [r0]
adds r0, r4, 0
bl SeedRng
ldr r1, _08000584 @ =0x04000106
movs r0, 0
strh r0, [r1]
ldr r0, _08000588 @ =gUnknown_2020000
strh r4, [r0]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08000580: .4byte 0x04000104
_08000584: .4byte 0x04000106
_08000588: .4byte gUnknown_2020000
thumb_func_end SeedRngAndSetTrainerId
thumb_func_start GetGeneratedTrainerIdLower
GetGeneratedTrainerIdLower: @ 800058C
ldr r0, _08000594 @ =gUnknown_2020000
ldrh r0, [r0]
bx lr
.align 2, 0
_08000594: .4byte gUnknown_2020000
thumb_func_end GetGeneratedTrainerIdLower
thumb_func_start EnableVCountIntrAtLine150
EnableVCountIntrAtLine150: @ 8000598
push {lr}
movs r0, 0x4
bl GetGpuReg
movs r1, 0xFF
ands r1, r0
movs r2, 0x96
lsls r2, 8
adds r0, r2, 0
orrs r1, r0
movs r0, 0x20
orrs r1, r0
movs r0, 0x4
bl SetGpuReg
movs r0, 0x4
bl EnableInterrupts
pop {r0}
bx r0
thumb_func_end EnableVCountIntrAtLine150
thumb_func_start InitKeys
InitKeys: @ 80005C0
ldr r1, _080005DC @ =gUnknown_300352C
movs r0, 0x5
strh r0, [r1]
ldr r1, _080005E0 @ =gUnknown_30030E0
movs r0, 0x28
strh r0, [r1]
ldr r1, _080005E4 @ =gUnknown_30030F0
movs r0, 0
strh r0, [r1, 0x2C]
strh r0, [r1, 0x2E]
strh r0, [r1, 0x30]
strh r0, [r1, 0x28]
strh r0, [r1, 0x2A]
bx lr
.align 2, 0
_080005DC: .4byte gUnknown_300352C
_080005E0: .4byte gUnknown_30030E0
_080005E4: .4byte gUnknown_30030F0
thumb_func_end InitKeys
thumb_func_start ReadKeys
ReadKeys: @ 80005E8
push {lr}
ldr r0, _08000624 @ =0x04000130
ldrh r1, [r0]
ldr r2, _08000628 @ =0x000003ff
adds r0, r2, 0
adds r3, r0, 0
eors r3, r1
ldr r1, _0800062C @ =gUnknown_30030F0
ldrh r2, [r1, 0x28]
adds r0, r3, 0
bics r0, r2
strh r0, [r1, 0x2A]
strh r0, [r1, 0x2E]
strh r0, [r1, 0x30]
adds r2, r1, 0
cmp r3, 0
beq _08000634
ldrh r0, [r2, 0x2C]
cmp r0, r3
bne _08000634
ldrh r0, [r2, 0x32]
subs r0, 0x1
strh r0, [r2, 0x32]
lsls r0, 16
cmp r0, 0
bne _0800063A
strh r3, [r2, 0x30]
ldr r0, _08000630 @ =gUnknown_300352C
b _08000636
.align 2, 0
_08000624: .4byte 0x04000130
_08000628: .4byte 0x000003ff
_0800062C: .4byte gUnknown_30030F0
_08000630: .4byte gUnknown_300352C
_08000634:
ldr r0, _08000680 @ =gUnknown_30030E0
_08000636:
ldrh r0, [r0]
strh r0, [r2, 0x32]
_0800063A:
strh r3, [r2, 0x28]
strh r3, [r2, 0x2C]
ldr r0, _08000684 @ =gUnknown_300500C
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x2
bne _0800066C
ldrh r1, [r2, 0x2E]
movs r3, 0x80
lsls r3, 2
adds r0, r3, 0
ands r0, r1
cmp r0, 0
beq _0800065C
movs r0, 0x1
orrs r0, r1
strh r0, [r2, 0x2E]
_0800065C:
ldrh r1, [r2, 0x2C]
adds r0, r3, 0
ands r0, r1
cmp r0, 0
beq _0800066C
movs r0, 0x1
orrs r0, r1
strh r0, [r2, 0x2C]
_0800066C:
ldrh r1, [r2, 0x2E]
ldrh r0, [r2, 0x36]
ands r0, r1
cmp r0, 0
beq _0800067A
movs r0, 0x1
strh r0, [r2, 0x34]
_0800067A:
pop {r0}
bx r0
.align 2, 0
_08000680: .4byte gUnknown_30030E0
_08000684: .4byte gUnknown_300500C
thumb_func_end ReadKeys
thumb_func_start InitIntrHandlers
InitIntrHandlers: @ 8000688
push {r4,r5,lr}
ldr r5, _080006D4 @ =IntrMain
ldr r4, _080006D8 @ =gUnknown_3003580
ldr r3, _080006DC @ =gUnknown_81E9F28
ldr r2, _080006E0 @ =gIntrTable
movs r1, 0xD
_08000694:
ldm r3!, {r0}
stm r2!, {r0}
subs r1, 0x1
cmp r1, 0
bge _08000694
ldr r0, _080006E4 @ =0x040000d4
str r5, [r0]
str r4, [r0, 0x4]
ldr r1, _080006E8 @ =0x84000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
ldr r0, _080006EC @ =INTR_VECTOR
str r4, [r0]
movs r0, 0
bl SetVBlankCallback
movs r0, 0
bl SetHBlankCallback
movs r0, 0
bl sub_8000718
ldr r1, _080006F0 @ =0x04000208
movs r0, 0x1
strh r0, [r1]
movs r0, 0x1
bl EnableInterrupts
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080006D4: .4byte IntrMain
_080006D8: .4byte gUnknown_3003580
_080006DC: .4byte gUnknown_81E9F28
_080006E0: .4byte gIntrTable
_080006E4: .4byte 0x040000d4
_080006E8: .4byte 0x84000200
_080006EC: .4byte INTR_VECTOR
_080006F0: .4byte 0x04000208
thumb_func_end InitIntrHandlers
thumb_func_start SetVBlankCallback
SetVBlankCallback: @ 80006F4
ldr r1, _080006FC @ =gUnknown_30030F0
str r0, [r1, 0xC]
bx lr
.align 2, 0
_080006FC: .4byte gUnknown_30030F0
thumb_func_end SetVBlankCallback
thumb_func_start SetHBlankCallback
SetHBlankCallback: @ 8000700
ldr r1, _08000708 @ =gUnknown_30030F0
str r0, [r1, 0x10]
bx lr
.align 2, 0
_08000708: .4byte gUnknown_30030F0
thumb_func_end SetHBlankCallback
thumb_func_start sub_800070C
sub_800070C: @ 800070C
ldr r1, _08000714 @ =gUnknown_30030F0
str r0, [r1, 0x14]
bx lr
.align 2, 0
_08000714: .4byte gUnknown_30030F0
thumb_func_end sub_800070C
thumb_func_start sub_8000718
sub_8000718: @ 8000718
ldr r1, _08000720 @ =gUnknown_30030F0
str r0, [r1, 0x18]
bx lr
.align 2, 0
_08000720: .4byte gUnknown_30030F0
thumb_func_end sub_8000718
thumb_func_start sub_8000724
sub_8000724: @ 8000724
push {r4,r5,lr}
ldr r0, _08000734 @ =gUnknown_3003F3C
ldrb r0, [r0]
cmp r0, 0
beq _08000738
bl LinkVSync
b _08000744
.align 2, 0
_08000734: .4byte gUnknown_3003F3C
_08000738:
ldr r0, _080007A8 @ =gUnknown_300357C
ldrb r0, [r0]
cmp r0, 0
bne _08000744
bl sub_800B718
_08000744:
ldr r5, _080007AC @ =gUnknown_30030F0
ldr r1, [r5, 0x20]
cmp r1, 0
beq _08000752
ldr r0, [r1]
adds r0, 0x1
str r0, [r1]
_08000752:
ldr r0, [r5, 0xC]
cmp r0, 0
beq _0800075C
bl _call_via_r0
_0800075C:
ldr r0, [r5, 0x24]
adds r0, 0x1
str r0, [r5, 0x24]
bl CopyBufferedValuesToGpuRegs
bl ProcessDma3Requests
ldr r1, _080007B0 @ =gUnknown_3003D88
ldr r0, _080007B4 @ =gSoundInfo
ldrb r0, [r0, 0x4]
strb r0, [r1]
ldr r1, _080007B8 @ =gUnknown_3003D84
ldr r4, _080007BC @ =0x04000006
ldrh r0, [r4]
strb r0, [r1]
bl m4aSoundMain
ldr r1, _080007C0 @ =gUnknown_3003578
ldrh r0, [r4]
strb r0, [r1]
bl sub_800DD28
bl Random
bl sub_80FCF34
ldr r2, _080007C4 @ =INTR_CHECK
ldrh r0, [r2]
movs r1, 0x1
orrs r0, r1
strh r0, [r2]
ldrh r0, [r5, 0x1C]
ldrh r2, [r5, 0x1C]
orrs r1, r0
strh r1, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080007A8: .4byte gUnknown_300357C
_080007AC: .4byte gUnknown_30030F0
_080007B0: .4byte gUnknown_3003D88
_080007B4: .4byte gSoundInfo
_080007B8: .4byte gUnknown_3003D84
_080007BC: .4byte 0x04000006
_080007C0: .4byte gUnknown_3003578
_080007C4: .4byte INTR_CHECK
thumb_func_end sub_8000724
thumb_func_start InitFlashTimer
InitFlashTimer: @ 80007C8
push {lr}
ldr r0, _080007D8 @ =gUnknown_81E9F60
ldr r1, [r0]
movs r0, 0x2
bl SetFlashTimerIntr
pop {r0}
bx r0
.align 2, 0
_080007D8: .4byte gUnknown_81E9F60
thumb_func_end InitFlashTimer
thumb_func_start HBlankIntr
HBlankIntr: @ 80007DC
push {r4,lr}
ldr r4, _08000804 @ =gUnknown_30030F0
ldr r0, [r4, 0x10]
cmp r0, 0
beq _080007EA
bl _call_via_r0
_080007EA:
ldr r2, _08000808 @ =INTR_CHECK
ldrh r0, [r2]
movs r1, 0x2
orrs r0, r1
strh r0, [r2]
ldrh r0, [r4, 0x1C]
ldrh r2, [r4, 0x1C]
orrs r1, r0
strh r1, [r4, 0x1C]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08000804: .4byte gUnknown_30030F0
_08000808: .4byte INTR_CHECK
thumb_func_end HBlankIntr
thumb_func_start sub_800080C
sub_800080C: @ 800080C
push {lr}
ldr r1, _08000834 @ =gUnknown_3003D80
ldr r0, _08000838 @ =0x04000006
ldrh r0, [r0]
strb r0, [r1]
bl m4aSoundVSync
ldr r2, _0800083C @ =INTR_CHECK
ldrh r0, [r2]
movs r1, 0x4
orrs r0, r1
strh r0, [r2]
ldr r0, _08000840 @ =gUnknown_30030F0
ldrh r2, [r0, 0x1C]
ldrh r3, [r0, 0x1C]
orrs r1, r2
strh r1, [r0, 0x1C]
pop {r0}
bx r0
.align 2, 0
_08000834: .4byte gUnknown_3003D80
_08000838: .4byte 0x04000006
_0800083C: .4byte INTR_CHECK
_08000840: .4byte gUnknown_30030F0
thumb_func_end sub_800080C
thumb_func_start sub_8000844
sub_8000844: @ 8000844
push {r4,lr}
ldr r4, _0800086C @ =gUnknown_30030F0
ldr r0, [r4, 0x18]
cmp r0, 0
beq _08000852
bl _call_via_r0
_08000852:
ldr r2, _08000870 @ =INTR_CHECK
ldrh r0, [r2]
movs r1, 0x80
orrs r0, r1
strh r0, [r2]
ldrh r0, [r4, 0x1C]
ldrh r2, [r4, 0x1C]
orrs r1, r0
strh r1, [r4, 0x1C]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0800086C: .4byte gUnknown_30030F0
_08000870: .4byte INTR_CHECK
thumb_func_end sub_8000844
thumb_func_start sub_8000874
sub_8000874: @ 8000874
ldr r0, _08000880 @ =gIntrTable
ldr r1, _08000884 @ =sub_8000844
str r1, [r0, 0x4]
ldr r1, _08000888 @ =Timer3Intr
str r1, [r0, 0x8]
bx lr
.align 2, 0
_08000880: .4byte gIntrTable
_08000884: .4byte sub_8000844
_08000888: .4byte Timer3Intr
thumb_func_end sub_8000874
thumb_func_start nullsub_4
nullsub_4: @ 800088C
bx lr
thumb_func_end nullsub_4
thumb_func_start sub_8000890
sub_8000890: @ 8000890
push {lr}
ldr r2, _080008B8 @ =gUnknown_30030F0
ldrh r1, [r2, 0x1C]
ldr r0, _080008BC @ =0x0000fffe
ands r0, r1
ldrh r1, [r2, 0x1C]
strh r0, [r2, 0x1C]
ldrh r1, [r2, 0x1C]
movs r0, 0x1
ands r0, r1
cmp r0, 0
bne _080008B4
movs r3, 0x1
_080008AA:
ldrh r1, [r2, 0x1C]
adds r0, r3, 0
ands r0, r1
cmp r0, 0
beq _080008AA
_080008B4:
pop {r0}
bx r0
.align 2, 0
_080008B8: .4byte gUnknown_30030F0
_080008BC: .4byte 0x0000fffe
thumb_func_end sub_8000890
thumb_func_start sub_80008C0
sub_80008C0: @ 80008C0
ldr r1, _080008C8 @ =gUnknown_30030F0
str r0, [r1, 0x20]
bx lr
.align 2, 0
_080008C8: .4byte gUnknown_30030F0
thumb_func_end sub_80008C0
thumb_func_start sub_80008CC
sub_80008CC: @ 80008CC
ldr r1, _080008D4 @ =gUnknown_30030F0
movs r0, 0
str r0, [r1, 0x20]
bx lr
.align 2, 0
_080008D4: .4byte gUnknown_30030F0
thumb_func_end sub_80008CC
thumb_func_start sub_80008D8
sub_80008D8: @ 80008D8
push {r4,lr}
ldr r1, _08000930 @ =0x04000208
movs r0, 0
strh r0, [r1]
bl m4aSoundVSyncOff
bl remove_some_task
ldr r1, _08000934 @ =0x040000bc
ldrh r2, [r1, 0xA]
ldr r3, _08000938 @ =0x0000c5ff
adds r0, r3, 0
ands r0, r2
strh r0, [r1, 0xA]
ldrh r4, [r1, 0xA]
ldr r2, _0800093C @ =0x00007fff
adds r0, r2, 0
ands r0, r4
strh r0, [r1, 0xA]
ldrh r0, [r1, 0xA]
adds r1, 0xC
ldrh r4, [r1, 0xA]
adds r0, r3, 0
ands r0, r4
strh r0, [r1, 0xA]
ldrh r4, [r1, 0xA]
adds r0, r2, 0
ands r0, r4
strh r0, [r1, 0xA]
ldrh r0, [r1, 0xA]
ldr r0, _08000940 @ =0x040000d4
ldrh r1, [r0, 0xA]
ands r3, r1
strh r3, [r0, 0xA]
ldrh r1, [r0, 0xA]
ands r2, r1
strh r2, [r0, 0xA]
ldrh r0, [r0, 0xA]
movs r0, 0xDF
bl SoftReset
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08000930: .4byte 0x04000208
_08000934: .4byte 0x040000bc
_08000938: .4byte 0x0000c5ff
_0800093C: .4byte 0x00007fff
_08000940: .4byte 0x040000d4
thumb_func_end sub_80008D8
thumb_func_start sub_8000944
sub_8000944: @ 8000944
push {lr}
sub sp, 0x4
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, _08000960 @ =gPokemonCrySongs
ldr r2, _08000964 @ =0x01000034
mov r0, sp
bl CpuSet
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_08000960: .4byte gPokemonCrySongs
_08000964: .4byte 0x01000034
thumb_func_end sub_8000944
.align 2, 0 @ Don't pad with nop.
asm/main_menu.s
+14 -14
View File
@@ -442,7 +442,7 @@ sub_800C688: @ 800C688
lsls r0, 16
cmp r0, 0
bne _0800C6F8
ldr r0, _0800C6E4 @ =gUnknown_30030F0
ldr r0, _0800C6E4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -467,7 +467,7 @@ sub_800C688: @ 800C688
b _0800C6F6
.align 2, 0
_0800C6E0: .4byte gUnknown_2037AB8
_0800C6E4: .4byte gUnknown_30030F0
_0800C6E4: .4byte gMain
_0800C6E8: .4byte gUnknown_8234638
_0800C6EC: .4byte gUnknown_3005090
_0800C6F0: .4byte sub_800C704
@@ -591,7 +591,7 @@ sub_800C7A0: @ 800C7A0
movs r0, 0x54
movs r1, 0x7
bl SetGpuReg
ldr r0, _0800C7F4 @ =gUnknown_300500C
ldr r0, _0800C7F4 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -599,7 +599,7 @@ sub_800C7A0: @ 800C7A0
ldr r1, _0800C7F8 @ =0x00007e04
b _0800C7FE
.align 2, 0
_0800C7F4: .4byte gUnknown_300500C
_0800C7F4: .4byte gSaveBlock2Ptr
_0800C7F8: .4byte 0x00007e04
_0800C7FC:
ldr r1, _0800C85C @ =0x0000547f
@@ -1104,7 +1104,7 @@ _0800CC28:
strh r0, [r4, 0x1A]
b _0800CC58
_0800CC34:
ldr r0, _0800CC60 @ =gUnknown_30030F0
ldr r0, _0800CC60 @ =gMain
ldrh r0, [r0, 0x2E]
ands r1, r0
cmp r1, 0
@@ -1126,7 +1126,7 @@ _0800CC58:
pop {r0}
bx r0
.align 2, 0
_0800CC60: .4byte gUnknown_30030F0
_0800CC60: .4byte gMain
_0800CC64: .4byte sub_800CC68
thumb_func_end sub_800CB90
@@ -1218,7 +1218,7 @@ sub_800CCF8: @ 800CCF8
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0800CD38 @ =gUnknown_30030F0
ldr r0, _0800CD38 @ =gMain
ldrh r1, [r0, 0x2E]
movs r5, 0x1
ands r5, r1
@@ -1244,7 +1244,7 @@ sub_800CCF8: @ 800CCF8
str r1, [r0]
b _0800CDEC
.align 2, 0
_0800CD38: .4byte gUnknown_30030F0
_0800CD38: .4byte gMain
_0800CD3C: .4byte gUnknown_3005090
_0800CD40: .4byte sub_800CA94
_0800CD44:
@@ -1407,7 +1407,7 @@ sub_800CE70: @ 800CE70
bl box_print
add r1, sp, 0xC
movs r2, 0
ldr r0, _0800CED0 @ =gUnknown_300500C
ldr r0, _0800CED0 @ =gSaveBlock2Ptr
ldr r3, [r0]
_0800CE96:
adds r0, r3, r2
@@ -1437,7 +1437,7 @@ _0800CE96:
.align 2, 0
_0800CEC8: .4byte gUnknown_823468B
_0800CECC: .4byte gUnknown_841B6D5
_0800CED0: .4byte gUnknown_300500C
_0800CED0: .4byte gSaveBlock2Ptr
thumb_func_end sub_800CE70
thumb_func_start sub_800CED4
@@ -1456,7 +1456,7 @@ sub_800CED4: @ 800CED4
movs r2, 0x2
movs r3, 0x22
bl box_print
ldr r4, _0800CF38 @ =gUnknown_300500C
ldr r4, _0800CF38 @ =gSaveBlock2Ptr
ldr r0, [r4]
ldrh r1, [r0, 0xE]
add r0, sp, 0xC
@@ -1487,7 +1487,7 @@ sub_800CED4: @ 800CED4
.align 2, 0
_0800CF30: .4byte gUnknown_823468B
_0800CF34: .4byte gUnknown_841B6DC
_0800CF38: .4byte gUnknown_300500C
_0800CF38: .4byte gSaveBlock2Ptr
thumb_func_end sub_800CED4
thumb_func_start sub_800CF3C
@@ -1620,7 +1620,7 @@ sub_800D044: @ 800D044
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r5, _0800D088 @ =gUnknown_300500C
ldr r5, _0800D088 @ =gSaveBlock2Ptr
ldr r0, [r5]
ldrb r0, [r0, 0x14]
lsrs r0, 3
@@ -1645,7 +1645,7 @@ sub_800D044: @ 800D044
pop {r0}
bx r0
.align 2, 0
_0800D088: .4byte gUnknown_300500C
_0800D088: .4byte gSaveBlock2Ptr
_0800D08C: .4byte 0x000001b1
_0800D090: .4byte gUnknown_8234638
thumb_func_end sub_800D044
asm/menu.s
+16 -16
View File
@@ -1508,7 +1508,7 @@ _0810F994: .4byte gUnknown_203ADE4
thumb_func_start ProcessMenuInput
ProcessMenuInput: @ 810F998
push {r4,lr}
ldr r0, _0810F9BC @ =gUnknown_30030F0
ldr r0, _0810F9BC @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1525,7 +1525,7 @@ _0810F9B4:
ldrsb r0, [r4, r0]
b _0810F9FE
.align 2, 0
_0810F9BC: .4byte gUnknown_30030F0
_0810F9BC: .4byte gMain
_0810F9C0: .4byte gUnknown_203ADE4
_0810F9C4:
movs r0, 0x2
@@ -1570,7 +1570,7 @@ ProcessMenuInputNoWrapAround: @ 810FA04
ldr r4, _0810FA2C @ =gUnknown_203ADE4
ldrb r5, [r4, 0x2]
adds r6, r5, 0
ldr r0, _0810FA30 @ =gUnknown_30030F0
ldr r0, _0810FA30 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1587,7 +1587,7 @@ _0810FA24:
b _0810FA7C
.align 2, 0
_0810FA2C: .4byte gUnknown_203ADE4
_0810FA30: .4byte gUnknown_30030F0
_0810FA30: .4byte gMain
_0810FA34:
movs r0, 0x2
ands r0, r1
@@ -1635,7 +1635,7 @@ _0810FA7C:
thumb_func_start ProcessMenuInput_other
ProcessMenuInput_other: @ 810FA84
push {r4,lr}
ldr r2, _0810FAA8 @ =gUnknown_30030F0
ldr r2, _0810FAA8 @ =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1652,7 +1652,7 @@ _0810FAA0:
ldrsb r0, [r4, r0]
b _0810FAE8
.align 2, 0
_0810FAA8: .4byte gUnknown_30030F0
_0810FAA8: .4byte gMain
_0810FAAC: .4byte gUnknown_203ADE4
_0810FAB0:
movs r0, 0x2
@@ -1696,7 +1696,7 @@ ProcessMenuInputNoWrapAround_other: @ 810FAF0
ldr r4, _0810FB18 @ =gUnknown_203ADE4
ldrb r5, [r4, 0x2]
adds r6, r5, 0
ldr r2, _0810FB1C @ =gUnknown_30030F0
ldr r2, _0810FB1C @ =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1713,7 +1713,7 @@ _0810FB10:
b _0810FB66
.align 2, 0
_0810FB18: .4byte gUnknown_203ADE4
_0810FB1C: .4byte gUnknown_30030F0
_0810FB1C: .4byte gMain
_0810FB20:
movs r0, 0x2
ands r0, r1
@@ -3095,7 +3095,7 @@ _08110592:
thumb_func_start sub_81105A0
sub_81105A0: @ 81105A0
push {r4,lr}
ldr r4, _081105C0 @ =gUnknown_30030F0
ldr r4, _081105C0 @ =gMain
ldrh r1, [r4, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3109,7 +3109,7 @@ sub_81105A0: @ 81105A0
asrs r0, 24
b _08110648
.align 2, 0
_081105C0: .4byte gUnknown_30030F0
_081105C0: .4byte gMain
_081105C4: .4byte gUnknown_203ADE4
_081105C8:
movs r0, 0x2
@@ -3189,7 +3189,7 @@ sub_8110650: @ 8110650
push {r4-r6,lr}
ldr r5, _08110670 @ =gUnknown_203ADE4
ldrb r4, [r5, 0x2]
ldr r6, _08110674 @ =gUnknown_30030F0
ldr r6, _08110674 @ =gMain
ldrh r1, [r6, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3202,7 +3202,7 @@ sub_8110650: @ 8110650
b _081106EE
.align 2, 0
_08110670: .4byte gUnknown_203ADE4
_08110674: .4byte gUnknown_30030F0
_08110674: .4byte gMain
_08110678:
movs r0, 0x2
ands r0, r1
@@ -3277,7 +3277,7 @@ _081106EE:
thumb_func_start sub_81106F4
sub_81106F4: @ 81106F4
push {r4,r5,lr}
ldr r4, _08110714 @ =gUnknown_30030F0
ldr r4, _08110714 @ =gMain
ldrh r1, [r4, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3291,7 +3291,7 @@ sub_81106F4: @ 81106F4
asrs r0, 24
b _08110798
.align 2, 0
_08110714: .4byte gUnknown_30030F0
_08110714: .4byte gMain
_08110718: .4byte gUnknown_203ADE4
_0811071C:
movs r0, 0x2
@@ -3369,7 +3369,7 @@ sub_81107A0: @ 81107A0
push {r4-r6,lr}
ldr r6, _081107C0 @ =gUnknown_203ADE4
ldrb r4, [r6, 0x2]
ldr r5, _081107C4 @ =gUnknown_30030F0
ldr r5, _081107C4 @ =gMain
ldrh r1, [r5, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3382,7 +3382,7 @@ sub_81107A0: @ 81107A0
b _0811083A
.align 2, 0
_081107C0: .4byte gUnknown_203ADE4
_081107C4: .4byte gUnknown_30030F0
_081107C4: .4byte gMain
_081107C8:
movs r0, 0x2
ands r0, r1
asm/menu2.s
+2 -2
View File
@@ -246,7 +246,7 @@ sub_812E6DC: @ 812E6DC
lsls r3, 16
lsrs r6, r3, 16
movs r4, 0
ldr r0, _0812E734 @ =gUnknown_300500C
ldr r0, _0812E734 @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r0, [r2]
ldr r7, _0812E738 @ =gUnknown_2021D18
@@ -278,7 +278,7 @@ _0812E70A:
bl PrintTextOnWindow
b _0812E75C
.align 2, 0
_0812E734: .4byte gUnknown_300500C
_0812E734: .4byte gSaveBlock2Ptr
_0812E738: .4byte gUnknown_2021D18
_0812E73C:
lsls r3, r5, 24
asm/menu_helpers.s
+12 -12
View File
@@ -233,12 +233,12 @@ _080BF62C: .4byte sub_80BF560
thumb_func_start GetLRKeysState
GetLRKeysState: @ 80BF630
push {lr}
ldr r0, _080BF650 @ =gUnknown_300500C
ldr r0, _080BF650 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x1
bne _080BF666
ldr r0, _080BF654 @ =gUnknown_30030F0
ldr r0, _080BF654 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x80
lsls r0, 2
@@ -248,8 +248,8 @@ GetLRKeysState: @ 80BF630
movs r0, 0x1
b _080BF668
.align 2, 0
_080BF650: .4byte gUnknown_300500C
_080BF654: .4byte gUnknown_30030F0
_080BF650: .4byte gSaveBlock2Ptr
_080BF654: .4byte gMain
_080BF658:
movs r0, 0x80
lsls r0, 1
@@ -268,12 +268,12 @@ _080BF668:
thumb_func_start sub_80BF66C
sub_80BF66C: @ 80BF66C
push {lr}
ldr r0, _080BF68C @ =gUnknown_300500C
ldr r0, _080BF68C @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x1
bne _080BF6A2
ldr r0, _080BF690 @ =gUnknown_30030F0
ldr r0, _080BF690 @ =gMain
ldrh r1, [r0, 0x30]
movs r0, 0x80
lsls r0, 2
@@ -283,8 +283,8 @@ sub_80BF66C: @ 80BF66C
movs r0, 0x1
b _080BF6A4
.align 2, 0
_080BF68C: .4byte gUnknown_300500C
_080BF690: .4byte gUnknown_30030F0
_080BF68C: .4byte gSaveBlock2Ptr
_080BF690: .4byte gMain
_080BF694:
movs r0, 0x80
lsls r0, 1
@@ -307,7 +307,7 @@ sub_80BF6A8: @ 80BF6A8
lsrs r0, 16
cmp r0, 0xAF
bne _080BF6D0
ldr r0, _080BF6CC @ =gUnknown_3005008
ldr r0, _080BF6CC @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
movs r0, 0x80
@@ -321,7 +321,7 @@ _080BF6C8:
movs r0, 0
b _080BF6D2
.align 2, 0
_080BF6CC: .4byte gUnknown_3005008
_080BF6CC: .4byte gSaveBlock1Ptr
_080BF6D0:
movs r0, 0x1
_080BF6D2:
@@ -528,7 +528,7 @@ sub_80BF848: @ 80BF848
adds r5, r1, 0
ldrh r4, [r2]
adds r6, r4, 0
ldr r0, _080BF87C @ =gUnknown_30030F0
ldr r0, _080BF87C @ =gMain
ldrh r0, [r0, 0x30]
movs r3, 0xF0
ands r3, r0
@@ -549,7 +549,7 @@ _080BF876:
lsls r0, r4, 16
b _080BF8CA
.align 2, 0
_080BF87C: .4byte gUnknown_30030F0
_080BF87C: .4byte gMain
_080BF880:
cmp r3, 0x80
bne _080BF896
asm/mevent.s
+76 -76
View File
@@ -66,7 +66,7 @@ sub_8143644: @ 8143644
strh r0, [r4]
bl sub_815C960
bl sub_815C91C
bl sub_8000874
bl RestoreSerialTimer3IntrHandlers
mov r0, sp
ldrh r0, [r0]
strh r0, [r4]
@@ -292,7 +292,7 @@ _081437F8:
strh r0, [r5]
b _08143872
_08143814:
ldr r0, _08143828 @ =gUnknown_30030F0
ldr r0, _08143828 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -303,7 +303,7 @@ _08143814:
movs r0, 0x1
b _0814389A
.align 2, 0
_08143828: .4byte gUnknown_30030F0
_08143828: .4byte gMain
_0814382C:
ldrh r0, [r5]
adds r0, 0x1
@@ -555,7 +555,7 @@ _08143A24:
strb r0, [r4, 0x8]
b _08143D1A
_08143A3A:
ldr r0, _08143A58 @ =gUnknown_30030F0
ldr r0, _08143A58 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -569,9 +569,9 @@ _08143A48:
bl sub_80722CC
b _08143BE6
.align 2, 0
_08143A58: .4byte gUnknown_30030F0
_08143A58: .4byte gMain
_08143A5C:
ldr r0, _08143A7C @ =gUnknown_30030F0
ldr r0, _08143A7C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -584,7 +584,7 @@ _08143A5C:
bl sub_81438E8
b _08143BE6
.align 2, 0
_08143A7C: .4byte gUnknown_30030F0
_08143A7C: .4byte gMain
_08143A80:
bl GetLinkPlayerCount_2
lsls r0, 24
@@ -842,13 +842,13 @@ _08143CA4:
lsls r0, 24
cmp r0, 0
beq _08143D1A
ldr r0, _08143CB8 @ =gUnknown_30030F0
ldr r0, _08143CB8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
b _08143CC6
.align 2, 0
_08143CB8: .4byte gUnknown_30030F0
_08143CB8: .4byte gMain
_08143CBC:
adds r0, r4, 0
adds r0, 0x9
@@ -912,7 +912,7 @@ sub_8143D24: @ 8143D24
sub sp, 0x4
movs r0, 0
str r0, [sp]
ldr r0, _08143D4C @ =gUnknown_3005008
ldr r0, _08143D4C @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, _08143D50 @ =0x00003120
adds r1, r0
@@ -925,68 +925,68 @@ sub_8143D24: @ 8143D24
pop {r0}
bx r0
.align 2, 0
_08143D4C: .4byte gUnknown_3005008
_08143D4C: .4byte gSaveBlock1Ptr
_08143D50: .4byte 0x00003120
_08143D54: .4byte 0x050000db
thumb_func_end sub_8143D24
thumb_func_start sub_8143D58
sub_8143D58: @ 8143D58
ldr r0, _08143D64 @ =gUnknown_3005008
ldr r0, _08143D64 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08143D68 @ =0x00003124
adds r0, r1
bx lr
.align 2, 0
_08143D64: .4byte gUnknown_3005008
_08143D64: .4byte gSaveBlock1Ptr
_08143D68: .4byte 0x00003124
thumb_func_end sub_8143D58
thumb_func_start sav1_get_mevent_buffer_1
sav1_get_mevent_buffer_1: @ 8143D6C
ldr r0, _08143D78 @ =gUnknown_3005008
ldr r0, _08143D78 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08143D7C @ =0x000032e4
adds r0, r1
bx lr
.align 2, 0
_08143D78: .4byte gUnknown_3005008
_08143D78: .4byte gSaveBlock1Ptr
_08143D7C: .4byte 0x000032e4
thumb_func_end sav1_get_mevent_buffer_1
thumb_func_start sav1_get_mevent_buffer_2
sav1_get_mevent_buffer_2: @ 8143D80
ldr r0, _08143D8C @ =gUnknown_3005008
ldr r0, _08143D8C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08143D90 @ =0x00003434
adds r0, r1
bx lr
.align 2, 0
_08143D8C: .4byte gUnknown_3005008
_08143D8C: .4byte gSaveBlock1Ptr
_08143D90: .4byte 0x00003434
thumb_func_end sav1_get_mevent_buffer_2
thumb_func_start sub_8143D94
sub_8143D94: @ 8143D94
ldr r0, _08143DA0 @ =gUnknown_3005008
ldr r0, _08143DA0 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08143DA4 @ =0x00003460
adds r0, r1
bx lr
.align 2, 0
_08143DA0: .4byte gUnknown_3005008
_08143DA0: .4byte gSaveBlock1Ptr
_08143DA4: .4byte 0x00003460
thumb_func_end sub_8143D94
thumb_func_start sub_8143DA8
sub_8143DA8: @ 8143DA8
ldr r0, _08143DB4 @ =gUnknown_3005008
ldr r0, _08143DB4 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08143DB8 @ =0x00003458
adds r0, r1
bx lr
.align 2, 0
_08143DB4: .4byte gUnknown_3005008
_08143DB4: .4byte gSaveBlock1Ptr
_08143DB8: .4byte 0x00003458
thumb_func_end sub_8143DA8
@@ -1006,7 +1006,7 @@ sub_8143DC8: @ 8143DC8
cmp r0, 0
beq _08143E14
bl sub_8143E9C
ldr r4, _08143E08 @ =gUnknown_3005008
ldr r4, _08143E08 @ =gSaveBlock1Ptr
ldr r0, [r4]
ldr r5, _08143E0C @ =0x00003124
adds r0, r5
@@ -1028,7 +1028,7 @@ sub_8143DC8: @ 8143DC8
movs r0, 0x1
b _08143E16
.align 2, 0
_08143E08: .4byte gUnknown_3005008
_08143E08: .4byte gSaveBlock1Ptr
_08143E0C: .4byte 0x00003124
_08143E10: .4byte 0x00003120
_08143E14:
@@ -1042,7 +1042,7 @@ _08143E16:
thumb_func_start sub_8143E1C
sub_8143E1C: @ 8143E1C
push {r4,lr}
ldr r4, _08143E50 @ =gUnknown_3005008
ldr r4, _08143E50 @ =gSaveBlock1Ptr
ldr r0, [r4]
ldr r1, _08143E54 @ =0x00003124
adds r0, r1
@@ -1065,7 +1065,7 @@ sub_8143E1C: @ 8143E1C
movs r0, 0x1
b _08143E5E
.align 2, 0
_08143E50: .4byte gUnknown_3005008
_08143E50: .4byte gSaveBlock1Ptr
_08143E54: .4byte 0x00003124
_08143E58: .4byte 0x00003120
_08143E5C:
@@ -1094,7 +1094,7 @@ _08143E72:
thumb_func_start sub_8143E78
sub_8143E78: @ 8143E78
push {lr}
ldr r0, _08143E8C @ =gUnknown_3005008
ldr r0, _08143E8C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08143E90 @ =0x00003124
adds r0, r1
@@ -1104,7 +1104,7 @@ sub_8143E78: @ 8143E78
movs r0, 0x1
b _08143E96
.align 2, 0
_08143E8C: .4byte gUnknown_3005008
_08143E8C: .4byte gSaveBlock1Ptr
_08143E90: .4byte 0x00003124
_08143E94:
movs r0, 0
@@ -1124,7 +1124,7 @@ sub_8143E9C: @ 8143E9C
ldr r2, _08143EC4 @ =0x0500006f
mov r0, sp
bl CpuSet
ldr r0, _08143EC8 @ =gUnknown_3005008
ldr r0, _08143EC8 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08143ECC @ =0x00003120
adds r0, r1
@@ -1135,7 +1135,7 @@ sub_8143E9C: @ 8143E9C
bx r0
.align 2, 0
_08143EC4: .4byte 0x0500006f
_08143EC8: .4byte gUnknown_3005008
_08143EC8: .4byte gSaveBlock1Ptr
_08143ECC: .4byte 0x00003120
thumb_func_end sub_8143E9C
@@ -1162,7 +1162,7 @@ _08143EF0: .4byte 0x05000001
sub_8143EF4: @ 8143EF4
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, _08143F0C @ =gUnknown_3005008
ldr r0, _08143F0C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08143F10 @ =0x00003124
adds r4, r0, r1
@@ -1173,7 +1173,7 @@ _08143F08:
movs r0, 0
b _08143F2C
.align 2, 0
_08143F0C: .4byte gUnknown_3005008
_08143F0C: .4byte gSaveBlock1Ptr
_08143F10: .4byte 0x00003124
_08143F14:
movs r2, 0
@@ -1206,7 +1206,7 @@ sub_8143F38: @ 8143F38
bl ClearRamScript
bl sub_806E2D0
bl sub_806E370
ldr r0, _08143F64 @ =gUnknown_300500C
ldr r0, _08143F64 @ =gSaveBlock2Ptr
ldr r0, [r0]
movs r1, 0x94
lsls r1, 3
@@ -1215,7 +1215,7 @@ sub_8143F38: @ 8143F38
pop {r0}
bx r0
.align 2, 0
_08143F64: .4byte gUnknown_300500C
_08143F64: .4byte gSaveBlock2Ptr
thumb_func_end sub_8143F38
thumb_func_start sub_8143F68
@@ -1226,7 +1226,7 @@ sub_8143F68: @ 8143F68
cmp r0, 0
beq _08143FC0
bl sub_8143F38
ldr r4, _08143FB0 @ =gUnknown_3005008
ldr r4, _08143FB0 @ =gSaveBlock1Ptr
ldr r0, [r4]
ldr r5, _08143FB4 @ =0x000032e4
adds r0, r5
@@ -1253,7 +1253,7 @@ sub_8143F68: @ 8143F68
movs r0, 0x1
b _08143FC2
.align 2, 0
_08143FB0: .4byte gUnknown_3005008
_08143FB0: .4byte gSaveBlock1Ptr
_08143FB4: .4byte 0x000032e4
_08143FB8: .4byte 0x000032e0
_08143FBC: .4byte 0x00003434
@@ -1268,7 +1268,7 @@ _08143FC2:
thumb_func_start sub_8143FC8
sub_8143FC8: @ 8143FC8
push {r4,r5,lr}
ldr r5, _08144004 @ =gUnknown_3005008
ldr r5, _08144004 @ =gSaveBlock1Ptr
ldr r0, [r5]
ldr r1, _08144008 @ =0x000032e0
adds r4, r0, r1
@@ -1294,7 +1294,7 @@ sub_8143FC8: @ 8143FC8
movs r0, 0x1
b _08144012
.align 2, 0
_08144004: .4byte gUnknown_3005008
_08144004: .4byte gSaveBlock1Ptr
_08144008: .4byte 0x000032e0
_0814400C: .4byte 0x000032e4
_08144010:
@@ -1345,7 +1345,7 @@ _08144050:
thumb_func_start sub_8144054
sub_8144054: @ 8144054
push {lr}
ldr r0, _0814406C @ =gUnknown_3005008
ldr r0, _0814406C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08144070 @ =0x000032e4
adds r0, r1
@@ -1357,7 +1357,7 @@ sub_8144054: @ 8144054
movs r0, 0x1
b _08144076
.align 2, 0
_0814406C: .4byte gUnknown_3005008
_0814406C: .4byte gSaveBlock1Ptr
_08144070: .4byte 0x000032e4
_08144074:
movs r0, 0
@@ -1372,7 +1372,7 @@ sub_814407C: @ 814407C
sub sp, 0x4
movs r5, 0
str r5, [sp]
ldr r4, _081440A4 @ =gUnknown_3005008
ldr r4, _081440A4 @ =gSaveBlock1Ptr
ldr r1, [r4]
ldr r0, _081440A8 @ =0x000032e4
adds r1, r0
@@ -1388,7 +1388,7 @@ sub_814407C: @ 814407C
pop {r0}
bx r0
.align 2, 0
_081440A4: .4byte gUnknown_3005008
_081440A4: .4byte gSaveBlock1Ptr
_081440A8: .4byte 0x000032e4
_081440AC: .4byte 0x05000053
_081440B0: .4byte 0x000032e0
@@ -1405,7 +1405,7 @@ sub_81440B4: @ 81440B4
ldr r2, _081440DC @ =0x05000009
mov r0, sp
bl CpuSet
ldr r0, _081440E0 @ =gUnknown_3005008
ldr r0, _081440E0 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _081440E4 @ =0x00003430
adds r0, r1
@@ -1416,7 +1416,7 @@ sub_81440B4: @ 81440B4
bx r0
.align 2, 0
_081440DC: .4byte 0x05000009
_081440E0: .4byte gUnknown_3005008
_081440E0: .4byte gSaveBlock1Ptr
_081440E4: .4byte 0x00003430
thumb_func_end sub_81440B4
@@ -1429,7 +1429,7 @@ sub_81440E8: @ 81440E8
movs r0, 0
b _08144100
_081440F6:
ldr r0, _08144104 @ =gUnknown_3005008
ldr r0, _08144104 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08144108 @ =0x000032e4
adds r0, r1
@@ -1438,7 +1438,7 @@ _08144100:
pop {r1}
bx r1
.align 2, 0
_08144104: .4byte gUnknown_3005008
_08144104: .4byte gSaveBlock1Ptr
_08144108: .4byte 0x000032e4
thumb_func_end sub_81440E8
@@ -1612,7 +1612,7 @@ sub_8144218: @ 8144218
bl sub_8143FC8
cmp r0, 0
beq _0814424C
ldr r0, _08144240 @ =gUnknown_3005008
ldr r0, _08144240 @ =gSaveBlock1Ptr
ldr r3, [r0]
ldr r0, _08144244 @ =0x000032e4
adds r2, r3, r0
@@ -1627,7 +1627,7 @@ sub_8144218: @ 8144218
bl sub_8144184
b _0814424E
.align 2, 0
_08144240: .4byte gUnknown_3005008
_08144240: .4byte gSaveBlock1Ptr
_08144244: .4byte 0x000032e4
_08144248: .4byte 0x00003434
_0814424C:
@@ -1641,7 +1641,7 @@ _0814424E:
sub_8144254: @ 8144254
push {r4-r6,lr}
adds r5, r0, 0
ldr r6, _08144280 @ =gUnknown_3005008
ldr r6, _08144280 @ =gSaveBlock1Ptr
ldr r0, [r6]
ldr r1, _08144284 @ =0x000032e4
adds r0, r1
@@ -1660,7 +1660,7 @@ sub_8144254: @ 8144254
beq _08144298
b _081442BE
.align 2, 0
_08144280: .4byte gUnknown_3005008
_08144280: .4byte gSaveBlock1Ptr
_08144284: .4byte 0x000032e4
_08144288: .4byte 0x00003434
_0814428C:
@@ -1753,7 +1753,7 @@ _08144330:
_08144332:
adds r5, r4, 0
adds r5, 0x4C
ldr r0, _081443BC @ =gUnknown_300500C
ldr r0, _081443BC @ =gSaveBlock2Ptr
mov r8, r0
adds r6, r4, 0
adds r6, 0x45
@@ -1765,7 +1765,7 @@ _08144332:
movs r2, 0x60
adds r2, r4
mov r10, r2
ldr r0, _081443C0 @ =gUnknown_3005008
ldr r0, _081443C0 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r3, _081443C4 @ =0x00003458
adds r2, r0, r3
@@ -1789,7 +1789,7 @@ _0814435C:
ldr r1, [r2]
adds r0, r6, 0
bl StringCopy
ldr r0, _081443C0 @ =gUnknown_3005008
ldr r0, _081443C0 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r3, _081443C8 @ =0x00002ca0
adds r2, r0, r3
@@ -1820,8 +1820,8 @@ _0814438C:
pop {r0}
bx r0
.align 2, 0
_081443BC: .4byte gUnknown_300500C
_081443C0: .4byte gUnknown_3005008
_081443BC: .4byte gSaveBlock2Ptr
_081443C0: .4byte gSaveBlock1Ptr
_081443C4: .4byte 0x00003458
_081443C8: .4byte 0x00002ca0
_081443CC: .4byte RomHeaderGameCode
@@ -2025,7 +2025,7 @@ _08144518: .4byte gUnknown_8466F5C
sub_814451C: @ 814451C
push {r4,lr}
adds r4, r0, 0
ldr r2, _08144544 @ =gUnknown_3005008
ldr r2, _08144544 @ =gSaveBlock1Ptr
ldr r0, [r2]
ldr r1, _08144548 @ =0x000032e4
adds r0, r1
@@ -2044,7 +2044,7 @@ sub_814451C: @ 814451C
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08144544: .4byte gUnknown_3005008
_08144544: .4byte gSaveBlock1Ptr
_08144548: .4byte 0x000032e4
_0814454C: .4byte _08144550
.align 2, 0
@@ -2123,7 +2123,7 @@ _081445D4:
.4byte _08144660
.4byte _08144684
_081445E8:
ldr r0, _08144604 @ =gUnknown_3005008
ldr r0, _08144604 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldr r1, _08144608 @ =0x000032e4
adds r0, r2, r1
@@ -2137,11 +2137,11 @@ _081445E8:
ldrh r0, [r0]
b _081446B2
.align 2, 0
_08144604: .4byte gUnknown_3005008
_08144604: .4byte gSaveBlock1Ptr
_08144608: .4byte 0x000032e4
_0814460C: .4byte 0x00003434
_08144610:
ldr r0, _0814462C @ =gUnknown_3005008
ldr r0, _0814462C @ =gSaveBlock1Ptr
ldr r2, [r0]
ldr r1, _08144630 @ =0x000032e4
adds r0, r2, r1
@@ -2155,11 +2155,11 @@ _08144610:
ldrh r0, [r0, 0x2]
b _081446B2
.align 2, 0
_0814462C: .4byte gUnknown_3005008
_0814462C: .4byte gSaveBlock1Ptr
_08144630: .4byte 0x000032e4
_08144634: .4byte 0x00003434
_08144638:
ldr r0, _08144654 @ =gUnknown_3005008
ldr r0, _08144654 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldr r1, _08144658 @ =0x000032e4
adds r0, r2, r1
@@ -2173,11 +2173,11 @@ _08144638:
ldrh r0, [r0, 0x4]
b _081446B2
.align 2, 0
_08144654: .4byte gUnknown_3005008
_08144654: .4byte gSaveBlock1Ptr
_08144658: .4byte 0x000032e4
_0814465C: .4byte 0x00003434
_08144660:
ldr r0, _0814467C @ =gUnknown_3005008
ldr r0, _0814467C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08144680 @ =0x000032e4
adds r0, r1
@@ -2191,10 +2191,10 @@ _08144660:
lsrs r0, 16
b _081446B2
.align 2, 0
_0814467C: .4byte gUnknown_3005008
_0814467C: .4byte gSaveBlock1Ptr
_08144680: .4byte 0x000032e4
_08144684:
ldr r0, _0814469C @ =gUnknown_3005008
ldr r0, _0814469C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _081446A0 @ =0x000032e4
adds r2, r0, r1
@@ -2206,7 +2206,7 @@ _08144684:
ldrb r0, [r2, 0x9]
b _081446B2
.align 2, 0
_0814469C: .4byte gUnknown_3005008
_0814469C: .4byte gSaveBlock1Ptr
_081446A0: .4byte 0x000032e4
_081446A4:
ldr r0, _081446B8 @ =gUnknown_8466F28
@@ -2248,7 +2248,7 @@ sub_81446D0: @ 81446D0
bl sub_8143FC8
cmp r0, 0
beq _0814470C
ldr r0, _08144704 @ =gUnknown_3005008
ldr r0, _08144704 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08144708 @ =0x000032e4
adds r0, r1
@@ -2260,7 +2260,7 @@ sub_81446D0: @ 81446D0
b _0814470E
.align 2, 0
_08144700: .4byte gUnknown_203F3BC
_08144704: .4byte gUnknown_3005008
_08144704: .4byte gSaveBlock1Ptr
_08144708: .4byte 0x000032e4
_0814470C:
movs r0, 0
@@ -2284,7 +2284,7 @@ sub_8144714: @ 8144714
bcc _08144744
cmp r2, 0x2
bne _08144774
ldr r0, _0814473C @ =gUnknown_3005008
ldr r0, _0814473C @ =gSaveBlock1Ptr
ldr r2, [r0]
ldr r0, _08144740 @ =0x00003478
adds r2, r0
@@ -2292,20 +2292,20 @@ sub_8144714: @ 8144714
b _08144762
.align 2, 0
_08144738: .4byte gUnknown_203F3BC
_0814473C: .4byte gUnknown_3005008
_0814473C: .4byte gSaveBlock1Ptr
_08144740: .4byte 0x00003478
_08144744:
ldr r0, _08144750 @ =gUnknown_3005008
ldr r0, _08144750 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldr r0, _08144754 @ =0x00003464
adds r2, r0
movs r0, 0
b _08144762
.align 2, 0
_08144750: .4byte gUnknown_3005008
_08144750: .4byte gSaveBlock1Ptr
_08144754: .4byte 0x00003464
_08144758:
ldr r0, _0814476C @ =gUnknown_3005008
ldr r0, _0814476C @ =gSaveBlock1Ptr
ldr r2, [r0]
ldr r0, _08144770 @ =0x00003464
adds r2, r0
@@ -2315,7 +2315,7 @@ _08144762:
bl sub_8144824
b _08144782
.align 2, 0
_0814476C: .4byte gUnknown_3005008
_0814476C: .4byte gSaveBlock1Ptr
_08144770: .4byte 0x00003464
_08144774:
ldr r0, _08144788 @ =gUnknown_8466F28
@@ -2338,7 +2338,7 @@ sub_8144790: @ 8144790
sub sp, 0x4
movs r0, 0
str r0, [sp]
ldr r0, _081447B0 @ =gUnknown_3005008
ldr r0, _081447B0 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, _081447B4 @ =0x00003464
adds r1, r0
@@ -2349,7 +2349,7 @@ sub_8144790: @ 8144790
pop {r0}
bx r0
.align 2, 0
_081447B0: .4byte gUnknown_3005008
_081447B0: .4byte gSaveBlock1Ptr
_081447B4: .4byte 0x00003464
_081447B8: .4byte 0x0500000a
thumb_func_end sub_8144790
asm/mevent_server.s
+6 -6
View File
@@ -807,7 +807,7 @@ _08144E24:
bl sub_8069EA4
b _08144E60
_08144E30:
ldr r0, _08144E48 @ =gUnknown_300500C
ldr r0, _08144E48 @ =gSaveBlock2Ptr
ldr r0, [r0]
movs r1, 0x94
lsls r1, 3
@@ -818,7 +818,7 @@ _08144E30:
bl sub_80E7490
b _08144E60
.align 2, 0
_08144E48: .4byte gUnknown_300500C
_08144E48: .4byte gSaveBlock2Ptr
_08144E4C:
ldr r0, _08144E68 @ =gUnknown_201C000
ldr r1, [r4, 0x18]
@@ -896,9 +896,9 @@ sub_8144EBC: @ 8144EBC
adds r4, r0, 0
ldr r3, _08144EE4 @ =gUnknown_201C000
adds r0, r4, 0x4
ldr r1, _08144EE8 @ =gUnknown_300500C
ldr r1, _08144EE8 @ =gSaveBlock2Ptr
ldr r1, [r1]
ldr r2, _08144EEC @ =gUnknown_3005008
ldr r2, _08144EEC @ =gSaveBlock1Ptr
ldr r2, [r2]
bl _call_via_r3
cmp r0, 0x1
@@ -914,8 +914,8 @@ _08144EDC:
bx r1
.align 2, 0
_08144EE4: .4byte gUnknown_201C000
_08144EE8: .4byte gUnknown_300500C
_08144EEC: .4byte gUnknown_3005008
_08144EE8: .4byte gSaveBlock2Ptr
_08144EEC: .4byte gSaveBlock1Ptr
thumb_func_end sub_8144EBC
thumb_func_start mevent_srv_ish_exec
asm/mon_markings.s
+4 -4
View File
@@ -18,7 +18,7 @@ _080BE474: .4byte gUnknown_20399C0
sub_80BE478: @ 80BE478
push {lr}
sub sp, 0x4
ldr r0, _080BE4B0 @ =gUnknown_300500C
ldr r0, _080BE4B0 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x14]
lsrs r0, 3
@@ -43,7 +43,7 @@ sub_80BE478: @ 80BE478
pop {r0}
bx r0
.align 2, 0
_080BE4B0: .4byte gUnknown_300500C
_080BE4B0: .4byte gSaveBlock2Ptr
_080BE4B4: .4byte gUnknown_20399C0
_080BE4B8: .4byte 0x000010b4
_080BE4BC: .4byte 0x01000800
@@ -341,7 +341,7 @@ _080BE6EC: .4byte gUnknown_20399C0
thumb_func_start sub_80BE6F0
sub_80BE6F0: @ 80BE6F0
push {r4,r5,lr}
ldr r0, _080BE720 @ =gUnknown_30030F0
ldr r0, _080BE720 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -364,7 +364,7 @@ sub_80BE6F0: @ 80BE6F0
strb r0, [r1, 0x5]
b _080BE7B0
.align 2, 0
_080BE720: .4byte gUnknown_30030F0
_080BE720: .4byte gMain
_080BE724: .4byte gUnknown_20399C0
_080BE728:
movs r0, 0x80
asm/money.s
+8 -8
View File
@@ -7,7 +7,7 @@
thumb_func_start sub_809FD58
sub_809FD58: @ 809FD58
ldr r1, _0809FD6C @ =gUnknown_300500C
ldr r1, _0809FD6C @ =gSaveBlock2Ptr
ldr r1, [r1]
movs r2, 0xF2
lsls r2, 4
@@ -17,12 +17,12 @@ sub_809FD58: @ 809FD58
eors r0, r1
bx lr
.align 2, 0
_0809FD6C: .4byte gUnknown_300500C
_0809FD6C: .4byte gSaveBlock2Ptr
thumb_func_end sub_809FD58
thumb_func_start sub_809FD70
sub_809FD70: @ 809FD70
ldr r2, _0809FD84 @ =gUnknown_300500C
ldr r2, _0809FD84 @ =gSaveBlock2Ptr
ldr r2, [r2]
movs r3, 0xF2
lsls r3, 4
@@ -32,7 +32,7 @@ sub_809FD70: @ 809FD70
str r2, [r0]
bx lr
.align 2, 0
_0809FD84: .4byte gUnknown_300500C
_0809FD84: .4byte gSaveBlock2Ptr
thumb_func_end sub_809FD70
thumb_func_start IsEnoughMoney
@@ -105,7 +105,7 @@ _0809FDEE:
thumb_func_start IsEnoughForCostInVar0x8005
IsEnoughForCostInVar0x8005: @ 809FDFC
push {lr}
ldr r0, _0809FE18 @ =gUnknown_3005008
ldr r0, _0809FE18 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xA4
lsls r1, 2
@@ -118,14 +118,14 @@ IsEnoughForCostInVar0x8005: @ 809FDFC
pop {r1}
bx r1
.align 2, 0
_0809FE18: .4byte gUnknown_3005008
_0809FE18: .4byte gSaveBlock1Ptr
_0809FE1C: .4byte gUnknown_20370C2
thumb_func_end IsEnoughForCostInVar0x8005
thumb_func_start sub_809FE20
sub_809FE20: @ 809FE20
push {lr}
ldr r0, _0809FE38 @ =gUnknown_3005008
ldr r0, _0809FE38 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xA4
lsls r1, 2
@@ -136,7 +136,7 @@ sub_809FE20: @ 809FE20
pop {r0}
bx r0
.align 2, 0
_0809FE38: .4byte gUnknown_3005008
_0809FE38: .4byte gSaveBlock1Ptr
_0809FE3C: .4byte gUnknown_20370C2
thumb_func_end sub_809FE20
asm/mystery_event_script.s
+4 -4
View File
@@ -278,7 +278,7 @@ MEScrCmd_setenigmaberry: @ 80DA9B8
adds r4, r0
ldr r0, _080DAA0C @ =gUnknown_2021CD0
mov r9, r0
ldr r6, _080DAA10 @ =gUnknown_3005008
ldr r6, _080DAA10 @ =gSaveBlock1Ptr
ldr r1, [r6]
ldr r5, _080DAA14 @ =0x000030ec
adds r1, r5
@@ -300,7 +300,7 @@ MEScrCmd_setenigmaberry: @ 80DA9B8
b _080DAA44
.align 2, 0
_080DAA0C: .4byte gUnknown_2021CD0
_080DAA10: .4byte gUnknown_3005008
_080DAA10: .4byte gSaveBlock1Ptr
_080DAA14: .4byte 0x000030ec
_080DAA18: .4byte gUnknown_2021CF0
_080DAA1C: .4byte gUnknown_2021D18
@@ -609,7 +609,7 @@ sub_80DAC8C: @ 80DAC8C
subs r1, r0
ldr r0, [r4, 0x64]
adds r1, r0
ldr r0, _080DACC8 @ =gUnknown_300500C
ldr r0, _080DACC8 @ =gSaveBlock2Ptr
ldr r0, [r0]
movs r2, 0x94
lsls r2, 3
@@ -627,7 +627,7 @@ sub_80DAC8C: @ 80DAC8C
pop {r1}
bx r1
.align 2, 0
_080DACC8: .4byte gUnknown_300500C
_080DACC8: .4byte gSaveBlock2Ptr
_080DACCC: .4byte gUnknown_2021D18
_080DACD0: .4byte gUnknown_8488DBD
thumb_func_end sub_80DAC8C
asm/mystery_gift_menu.s
+2 -2
View File
@@ -31,7 +31,7 @@ sub_81420A4: @ 81420A4
push {r4-r7,lr}
sub sp, 0xC
adds r7, r0, 0
ldr r0, _081420C4 @ =gUnknown_30030F0
ldr r0, _081420C4 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r6, r0, r1
@@ -46,7 +46,7 @@ _081420BA:
beq _081420D6
b _081422A0
.align 2, 0
_081420C4: .4byte gUnknown_30030F0
_081420C4: .4byte gMain
_081420C8:
cmp r5, 0x2
bne _081420CE
asm/naming_screen.s
+22 -22
View File
@@ -76,7 +76,7 @@ _0809D9DC: .4byte c2_choose_name_or_words_screen
thumb_func_start c2_choose_name_or_words_screen
c2_choose_name_or_words_screen: @ 809D9E0
push {lr}
ldr r0, _0809D9FC @ =gUnknown_30030F0
ldr r0, _0809D9FC @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -89,7 +89,7 @@ c2_choose_name_or_words_screen: @ 809D9E0
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0809D9FC: .4byte gUnknown_30030F0
_0809D9FC: .4byte gMain
_0809DA00: .4byte _0809DA04
.align 2, 0
_0809DA04:
@@ -129,7 +129,7 @@ _0809DA56:
bl UpdatePaletteFade
bl sub_809FC34
_0809DA62:
ldr r1, _0809DA74 @ =gUnknown_30030F0
ldr r1, _0809DA74 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -138,7 +138,7 @@ _0809DA62:
strb r0, [r1]
b _0809DA80
.align 2, 0
_0809DA74: .4byte gUnknown_30030F0
_0809DA74: .4byte gMain
_0809DA78:
bl sub_809F8C0
bl sub_809DD60
@@ -208,7 +208,7 @@ sub_809DA84: @ 809DA84
ldr r3, _0809DB60 @ =0x00001e16
adds r1, r2, r3
strh r0, [r1]
ldr r6, _0809DB64 @ =gUnknown_30030E0
ldr r6, _0809DB64 @ =gKeyRepeatStartDelay
ldrh r0, [r6]
ldr r1, _0809DB68 @ =0x00001e25
adds r2, r1
@@ -250,7 +250,7 @@ _0809DB54: .4byte 0x00001e28
_0809DB58: .4byte gUnknown_83E248C
_0809DB5C: .4byte 0x00001e22
_0809DB60: .4byte 0x00001e16
_0809DB64: .4byte gUnknown_30030E0
_0809DB64: .4byte gKeyRepeatStartDelay
_0809DB68: .4byte 0x00001e25
_0809DB6C: .4byte 0x00001e30
thumb_func_end sub_809DA84
@@ -1010,7 +1010,7 @@ sub_809E1D4: @ 809E1D4
lsls r0, 16
cmp r0, 0
bne _0809E1FE
ldr r0, _0809E204 @ =gUnknown_30030F0
ldr r0, _0809E204 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1027,7 +1027,7 @@ _0809E1FE:
pop {r1}
bx r1
.align 2, 0
_0809E204: .4byte gUnknown_30030F0
_0809E204: .4byte gMain
_0809E208: .4byte gUnknown_203998C
_0809E20C: .4byte 0x00001e10
thumb_func_end sub_809E1D4
@@ -3215,7 +3215,7 @@ InputState_Enabled: @ 809F2A4
adds r2, r0, 0
movs r0, 0
strh r0, [r2, 0xA]
ldr r0, _0809F2C0 @ =gUnknown_30030F0
ldr r0, _0809F2C0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3225,7 +3225,7 @@ InputState_Enabled: @ 809F2A4
strh r0, [r2, 0xA]
b _0809F2F4
.align 2, 0
_0809F2C0: .4byte gUnknown_30030F0
_0809F2C0: .4byte gMain
_0809F2C4:
movs r0, 0x2
ands r0, r1
@@ -3296,7 +3296,7 @@ sub_809F2F8: @ 809F2F8
adds r0, r4, 0
adds r1, r5, 0
bl sub_809E9CC
ldr r0, _0809F3F4 @ =gUnknown_30030F0
ldr r0, _0809F3F4 @ =gMain
ldrh r2, [r0, 0x30]
movs r0, 0x40
ands r0, r2
@@ -3380,7 +3380,7 @@ _0809F3E4: .4byte gUnknown_83E23E8
_0809F3E8: .4byte gUnknown_83E23F2
_0809F3EC: .4byte gUnknown_83E23FC
_0809F3F0: .4byte gUnknown_83E2404
_0809F3F4: .4byte gUnknown_30030F0
_0809F3F4: .4byte gMain
_0809F3F8:
mov r2, r8
lsls r4, r2, 16
@@ -4485,7 +4485,7 @@ _0809FC88:
sub_809FC90: @ 809FC90
push {lr}
sub sp, 0x8
ldr r0, _0809FCB0 @ =gUnknown_300500C
ldr r0, _0809FCB0 @ =gSaveBlock2Ptr
ldr r1, [r0]
ldrb r2, [r1, 0x8]
movs r0, 0
@@ -4499,7 +4499,7 @@ sub_809FC90: @ 809FC90
pop {r0}
bx r0
.align 2, 0
_0809FCB0: .4byte gUnknown_300500C
_0809FCB0: .4byte gSaveBlock2Ptr
_0809FCB4: .4byte sub_80568A8
thumb_func_end sub_809FC90
@@ -4507,7 +4507,7 @@ _0809FCB4: .4byte sub_80568A8
sub_809FCB8: @ 809FCB8
push {lr}
sub sp, 0x8
ldr r0, _0809FCD8 @ =gUnknown_300500C
ldr r0, _0809FCD8 @ =gSaveBlock2Ptr
ldr r1, [r0]
ldrb r2, [r1, 0x8]
movs r0, 0
@@ -4521,7 +4521,7 @@ sub_809FCB8: @ 809FCB8
pop {r0}
bx r0
.align 2, 0
_0809FCD8: .4byte gUnknown_300500C
_0809FCD8: .4byte gSaveBlock2Ptr
_0809FCDC: .4byte sub_80568A8
thumb_func_end sub_809FCB8
@@ -4529,7 +4529,7 @@ _0809FCDC: .4byte sub_80568A8
sub_809FCE0: @ 809FCE0
push {lr}
sub sp, 0x8
ldr r0, _0809FD00 @ =gUnknown_300500C
ldr r0, _0809FD00 @ =gSaveBlock2Ptr
ldr r1, [r0]
ldrb r2, [r1, 0x8]
movs r0, 0
@@ -4543,7 +4543,7 @@ sub_809FCE0: @ 809FCE0
pop {r0}
bx r0
.align 2, 0
_0809FD00: .4byte gUnknown_300500C
_0809FD00: .4byte gSaveBlock2Ptr
_0809FD04: .4byte sub_80568A8
thumb_func_end sub_809FCE0
@@ -4551,7 +4551,7 @@ _0809FD04: .4byte sub_80568A8
sub_809FD08: @ 809FD08
push {lr}
sub sp, 0x8
ldr r0, _0809FD28 @ =gUnknown_300500C
ldr r0, _0809FD28 @ =gSaveBlock2Ptr
ldr r1, [r0]
ldrb r2, [r1, 0x8]
movs r0, 0
@@ -4565,7 +4565,7 @@ sub_809FD08: @ 809FD08
pop {r0}
bx r0
.align 2, 0
_0809FD28: .4byte gUnknown_300500C
_0809FD28: .4byte gSaveBlock2Ptr
_0809FD2C: .4byte sub_80568A8
thumb_func_end sub_809FD08
@@ -4573,7 +4573,7 @@ _0809FD2C: .4byte sub_80568A8
sub_809FD30: @ 809FD30
push {lr}
sub sp, 0x8
ldr r0, _0809FD50 @ =gUnknown_300500C
ldr r0, _0809FD50 @ =gSaveBlock2Ptr
ldr r1, [r0]
ldrb r2, [r1, 0x8]
movs r0, 0
@@ -4587,7 +4587,7 @@ sub_809FD30: @ 809FD30
pop {r0}
bx r0
.align 2, 0
_0809FD50: .4byte gUnknown_300500C
_0809FD50: .4byte gSaveBlock2Ptr
_0809FD54: .4byte sub_80568A8
thumb_func_end sub_809FD30
asm/new_game.s
+14 -14
View File
@@ -46,7 +46,7 @@ InitPlayerTrainerId: @ 8054928
lsls r0, 16
lsrs r0, 16
orrs r4, r0
ldr r0, _08054950 @ =gUnknown_300500C
ldr r0, _08054950 @ =gSaveBlock2Ptr
ldr r1, [r0]
adds r1, 0xA
adds r0, r4, 0
@@ -55,12 +55,12 @@ InitPlayerTrainerId: @ 8054928
pop {r0}
bx r0
.align 2, 0
_08054950: .4byte gUnknown_300500C
_08054950: .4byte gSaveBlock2Ptr
thumb_func_end InitPlayerTrainerId
thumb_func_start SetDefaultOptions
SetDefaultOptions: @ 8054954
ldr r3, _080549A8 @ =gUnknown_300500C
ldr r3, _080549A8 @ =gSaveBlock2Ptr
ldr r2, [r3]
ldrb r1, [r2, 0x14]
movs r0, 0x8
@@ -103,13 +103,13 @@ SetDefaultOptions: @ 8054954
strb r0, [r1, 0x13]
bx lr
.align 2, 0
_080549A8: .4byte gUnknown_300500C
_080549A8: .4byte gSaveBlock2Ptr
thumb_func_end SetDefaultOptions
thumb_func_start sub_80549AC
sub_80549AC: @ 80549AC
push {r4,lr}
ldr r4, _080549D0 @ =gUnknown_300500C
ldr r4, _080549D0 @ =gSaveBlock2Ptr
ldr r0, [r4]
adds r0, 0x28
movs r1, 0
@@ -124,7 +124,7 @@ sub_80549AC: @ 80549AC
pop {r0}
bx r0
.align 2, 0
_080549D0: .4byte gUnknown_300500C
_080549D0: .4byte gSaveBlock2Ptr
thumb_func_end sub_80549AC
thumb_func_start sub_80549D4
@@ -133,7 +133,7 @@ sub_80549D4: @ 80549D4
sub sp, 0x4
movs r0, 0
str r0, [sp]
ldr r0, _080549F0 @ =gUnknown_300500C
ldr r0, _080549F0 @ =gSaveBlock2Ptr
ldr r1, [r0]
adds r1, 0xB0
ldr r2, _080549F4 @ =0x050001fa
@@ -143,7 +143,7 @@ sub_80549D4: @ 80549D4
pop {r0}
bx r0
.align 2, 0
_080549F0: .4byte gUnknown_300500C
_080549F0: .4byte gSaveBlock2Ptr
_080549F4: .4byte 0x050001fa
thumb_func_end sub_80549D4
@@ -203,7 +203,7 @@ sub_8054A60: @ 8054A60
mov r6, r8
push {r6}
sub sp, 0x8
ldr r6, _08054B50 @ =gUnknown_3005008
ldr r6, _08054B50 @ =gSaveBlock1Ptr
ldr r1, [r6]
ldr r0, _08054B54 @ =0x00003a4c
mov r8, r0
@@ -213,7 +213,7 @@ sub_8054A60: @ 8054A60
ldr r1, _08054B58 @ =gUnknown_2031DB0
movs r0, 0x1
strb r0, [r1]
ldr r4, _08054B5C @ =gUnknown_300500C
ldr r4, _08054B5C @ =gSaveBlock2Ptr
ldr r0, [r4]
movs r1, 0xF2
lsls r1, 4
@@ -286,10 +286,10 @@ sub_8054A60: @ 8054A60
pop {r0}
bx r0
.align 2, 0
_08054B50: .4byte gUnknown_3005008
_08054B50: .4byte gSaveBlock1Ptr
_08054B54: .4byte 0x00003a4c
_08054B58: .4byte gUnknown_2031DB0
_08054B5C: .4byte gUnknown_300500C
_08054B5C: .4byte gSaveBlock2Ptr
_08054B60: .4byte 0x00000bb8
_08054B64: .4byte gUnknown_2024029
_08054B68: .4byte 0x00000296
@@ -303,7 +303,7 @@ sub_8054B70: @ 8054B70
mov r0, sp
movs r5, 0
strh r5, [r0]
ldr r4, _08054BBC @ =gUnknown_300500C
ldr r4, _08054BBC @ =gSaveBlock2Ptr
ldr r1, [r4]
movs r0, 0xAF
lsls r0, 4
@@ -332,7 +332,7 @@ sub_8054B70: @ 8054B70
pop {r0}
bx r0
.align 2, 0
_08054BBC: .4byte gUnknown_300500C
_08054BBC: .4byte gSaveBlock2Ptr
_08054BC0: .4byte 0x01000008
_08054BC4: .4byte 0x00000af8
thumb_func_end sub_8054B70
asm/new_menu_helpers.s
+2 -2
View File
@@ -2190,7 +2190,7 @@ _080F78A4: .4byte gUnknown_841F43C
thumb_func_start sub_80F78A8
sub_80F78A8: @ 80F78A8
push {lr}
ldr r3, _080F78D8 @ =gUnknown_300500C
ldr r3, _080F78D8 @ =gSaveBlock2Ptr
ldr r2, [r3]
ldrb r1, [r2, 0x14]
lsls r0, r1, 29
@@ -2214,7 +2214,7 @@ _080F78C4:
pop {r1}
bx r1
.align 2, 0
_080F78D8: .4byte gUnknown_300500C
_080F78D8: .4byte gSaveBlock2Ptr
_080F78DC: .4byte gUnknown_841F428
thumb_func_end sub_80F78A8
asm/oak_speech.s
+42 -42
View File
@@ -294,7 +294,7 @@ sub_812EB58: @ 812EB58
sub sp, 0x10
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _0812EB7C @ =gUnknown_30030F0
ldr r0, _0812EB7C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -309,7 +309,7 @@ _0812EB70:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0812EB7C: .4byte gUnknown_30030F0
_0812EB7C: .4byte gMain
_0812EB80: .4byte _0812EB84
.align 2, 0
_0812EB84:
@@ -620,7 +620,7 @@ _0812EE30:
adds r0, r1
ldr r1, _0812EE8C @ =sub_812F0B0
str r1, [r0]
ldr r0, _0812EE90 @ =gUnknown_30030F0
ldr r0, _0812EE90 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -631,9 +631,9 @@ _0812EE80: .4byte sub_812EAFC
_0812EE84: .4byte 0x00000143
_0812EE88: .4byte gUnknown_3005090
_0812EE8C: .4byte sub_812F0B0
_0812EE90: .4byte gUnknown_30030F0
_0812EE90: .4byte gMain
_0812EE94:
ldr r1, _0812EEAC @ =gUnknown_30030F0
ldr r1, _0812EEAC @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -646,7 +646,7 @@ _0812EEA2:
pop {r0}
bx r0
.align 2, 0
_0812EEAC: .4byte gUnknown_30030F0
_0812EEAC: .4byte gMain
thumb_func_end sub_812EB58
thumb_func_start sub_812EEB0
@@ -896,7 +896,7 @@ sub_812F0B0: @ 812F0B0
ands r0, r1
cmp r0, 0
bne _0812F162
ldr r0, _0812F110 @ =gUnknown_30030F0
ldr r0, _0812F110 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -932,7 +932,7 @@ sub_812F0B0: @ 812F0B0
b _0812F150
.align 2, 0
_0812F10C: .4byte gUnknown_2037AB8
_0812F110: .4byte gUnknown_30030F0
_0812F110: .4byte gMain
_0812F114: .4byte gUnknown_3005090
_0812F118: .4byte gUnknown_203B108
_0812F11C: .4byte 0xffffdfff
@@ -1275,7 +1275,7 @@ _0812F374:
ldr r0, [r4]
movs r1, 0
strh r6, [r0, 0x12]
ldr r0, _0812F494 @ =gUnknown_30030F0
ldr r0, _0812F494 @ =gMain
movs r2, 0x87
lsls r2, 3
adds r0, r2
@@ -1357,7 +1357,7 @@ _0812F484: .4byte gUnknown_8415D48
_0812F488: .4byte gUnknown_8460BA8
_0812F48C: .4byte gUnknown_203B108
_0812F490: .4byte gUnknown_8462EC0
_0812F494: .4byte gUnknown_30030F0
_0812F494: .4byte gMain
_0812F498: .4byte gUnknown_8462EEC
_0812F49C: .4byte gUnknown_8462EF0
_0812F4A0: .4byte gUnknown_202063C
@@ -1375,7 +1375,7 @@ sub_812F4A8: @ 812F4A8
lsls r6, r0, 3
ldr r7, _0812F4D8 @ =gUnknown_3005098
adds r5, r6, r7
ldr r0, _0812F4DC @ =gUnknown_30030F0
ldr r0, _0812F4DC @ =gMain
movs r1, 0x87
lsls r1, 3
adds r3, r0, r1
@@ -1392,7 +1392,7 @@ _0812F4CC:
mov pc, r0
.align 2, 0
_0812F4D8: .4byte gUnknown_3005098
_0812F4DC: .4byte gUnknown_30030F0
_0812F4DC: .4byte gMain
_0812F4E0: .4byte _0812F4E4
.align 2, 0
_0812F4E4:
@@ -1467,7 +1467,7 @@ _0812F56A:
ldrh r0, [r0, 0x12]
cmp r0, 0x3
bne _0812F594
ldr r0, _0812F590 @ =gUnknown_30030F0
ldr r0, _0812F590 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -1476,7 +1476,7 @@ _0812F56A:
b _0812F71C
.align 2, 0
_0812F58C: .4byte gUnknown_203B108
_0812F590: .4byte gUnknown_30030F0
_0812F590: .4byte gMain
_0812F594:
ldr r1, _0812F5B0 @ =0x00000241
movs r0, 0x50
@@ -1581,7 +1581,7 @@ _0812F644:
movs r1, 0
bl SetGpuReg
_0812F676:
ldr r0, _0812F684 @ =gUnknown_30030F0
ldr r0, _0812F684 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -1589,7 +1589,7 @@ _0812F676:
strb r1, [r0]
b _0812F71C
.align 2, 0
_0812F684: .4byte gUnknown_30030F0
_0812F684: .4byte gMain
_0812F688:
ldr r1, _0812F6B4 @ =gUnknown_3005090
lsls r0, r2, 2
@@ -1603,7 +1603,7 @@ _0812F688:
movs r0, 0x18
strh r0, [r5, 0x1E]
_0812F6A2:
ldr r1, _0812F6BC @ =gUnknown_30030F0
ldr r1, _0812F6BC @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -1614,7 +1614,7 @@ _0812F6A2:
.align 2, 0
_0812F6B4: .4byte gUnknown_3005090
_0812F6B8: .4byte 0x00000145
_0812F6BC: .4byte gUnknown_30030F0
_0812F6BC: .4byte gMain
_0812F6C0:
ldrh r0, [r5, 0x1E]
movs r1, 0x1E
@@ -2720,7 +2720,7 @@ _0812FFC4:
cmp r1, 0x1
bne _0812FFCE
_0812FFC8:
ldr r0, _0812FFE4 @ =gUnknown_300500C
ldr r0, _0812FFE4 @ =gSaveBlock2Ptr
ldr r0, [r0]
strb r1, [r0, 0x8]
_0812FFCE:
@@ -2736,7 +2736,7 @@ _0812FFDC:
pop {r0}
bx r0
.align 2, 0
_0812FFE4: .4byte gUnknown_300500C
_0812FFE4: .4byte gSaveBlock2Ptr
_0812FFE8: .4byte gUnknown_3005090
_0812FFEC: .4byte sub_812FFF0
thumb_func_end sub_812FFA4
@@ -2791,7 +2791,7 @@ sub_8130050: @ 8130050
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0813006C @ =gUnknown_300500C
ldr r0, _0813006C @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -2801,7 +2801,7 @@ sub_8130050: @ 8130050
bl sub_81311F4
b _08130078
.align 2, 0
_0813006C: .4byte gUnknown_300500C
_0813006C: .4byte gSaveBlock2Ptr
_08130070:
movs r0, 0x1
movs r1, 0
@@ -3232,7 +3232,7 @@ sub_81303B4: @ 81303B4
ldrh r0, [r0, 0x10]
cmp r0, 0
bne _08130408
ldr r0, _08130400 @ =gUnknown_300500C
ldr r0, _08130400 @ =gSaveBlock2Ptr
ldr r1, [r0]
ldrb r2, [r1, 0x8]
str r5, [sp]
@@ -3245,7 +3245,7 @@ sub_81303B4: @ 81303B4
.align 2, 0
_081303F8: .4byte gUnknown_2037AB8
_081303FC: .4byte gUnknown_203B108
_08130400: .4byte gUnknown_300500C
_08130400: .4byte gSaveBlock2Ptr
_08130404: .4byte sub_8130C64
_08130408:
ldr r0, _08130454 @ =gUnknown_3005090
@@ -3262,7 +3262,7 @@ _08130408:
lsls r0, 24
lsrs r0, 24
bl RemoveWindow
ldr r0, _08130458 @ =gUnknown_3005008
ldr r0, _08130458 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, _0813045C @ =0x00003a4c
adds r1, r0
@@ -3285,7 +3285,7 @@ _0813044C:
bx r0
.align 2, 0
_08130454: .4byte gUnknown_3005090
_08130458: .4byte gUnknown_3005008
_08130458: .4byte gSaveBlock1Ptr
_0813045C: .4byte 0x00003a4c
_08130460: .4byte sub_8130C64
thumb_func_end sub_81303B4
@@ -3741,7 +3741,7 @@ sub_81307D0: @ 81307D0
.align 2, 0
_081307FC: .4byte gUnknown_3005098
_08130800:
ldr r0, _08130814 @ =gUnknown_300500C
ldr r0, _08130814 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -3751,7 +3751,7 @@ _08130800:
bl sub_81311F4
b _08130820
.align 2, 0
_08130814: .4byte gUnknown_300500C
_08130814: .4byte gSaveBlock2Ptr
_08130818:
movs r0, 0x1
movs r1, 0
@@ -4317,7 +4317,7 @@ _08130C60: .4byte CB2_NewGame
sub_8130C64: @ 8130C64
push {r4,r5,lr}
sub sp, 0x10
ldr r0, _08130C84 @ =gUnknown_30030F0
ldr r0, _08130C84 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -4332,7 +4332,7 @@ _08130C78:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08130C84: .4byte gUnknown_30030F0
_08130C84: .4byte gMain
_08130C88: .4byte _08130C8C
.align 2, 0
_08130C8C:
@@ -4520,7 +4520,7 @@ _08130E38:
ldrh r0, [r0, 0x10]
cmp r0, 0
bne _08130E72
ldr r0, _08130E64 @ =gUnknown_300500C
ldr r0, _08130E64 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -4530,7 +4530,7 @@ _08130E38:
.align 2, 0
_08130E5C: .4byte sub_8130464
_08130E60: .4byte gUnknown_203B108
_08130E64: .4byte gUnknown_300500C
_08130E64: .4byte gSaveBlock2Ptr
_08130E68:
movs r0, 0x1
_08130E6A:
@@ -4603,7 +4603,7 @@ _08130F04: .4byte sub_812EAFC
_08130F08: .4byte gUnknown_3003E50
_08130F0C: .4byte sub_812EB10
_08130F10:
ldr r1, _08130F28 @ =gUnknown_30030F0
ldr r1, _08130F28 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -4616,7 +4616,7 @@ _08130F1E:
pop {r0}
bx r0
.align 2, 0
_08130F28: .4byte gUnknown_30030F0
_08130F28: .4byte gMain
thumb_func_end sub_8130C64
thumb_func_start sub_8130F2C
@@ -5575,7 +5575,7 @@ sub_8131660: @ 8131660
mov r0, r8
cmp r0, 0
bne _081316F4
ldr r0, _081316E8 @ =gUnknown_300500C
ldr r0, _081316E8 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
ldr r6, _081316EC @ =gUnknown_84630D8
@@ -5587,7 +5587,7 @@ sub_8131660: @ 8131660
_081316DC: .4byte gUnknown_3005098
_081316E0: .4byte gUnknown_8462ED8
_081316E4: .4byte gUnknown_81C574F
_081316E8: .4byte gUnknown_300500C
_081316E8: .4byte gSaveBlock2Ptr
_081316EC: .4byte gUnknown_84630D8
_081316F0: .4byte gUnknown_846308C
_081316F4:
@@ -5647,7 +5647,7 @@ sub_8131754: @ 8131754
lsrs r2, r1, 24
cmp r0, 0
bne _081317A0
ldr r0, _08131770 @ =gUnknown_300500C
ldr r0, _08131770 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -5655,7 +5655,7 @@ sub_8131754: @ 8131754
ldr r4, _08131774 @ =gUnknown_846308C
b _0813177A
.align 2, 0
_08131770: .4byte gUnknown_300500C
_08131770: .4byte gSaveBlock2Ptr
_08131774: .4byte gUnknown_846308C
_08131778:
ldr r4, _08131798 @ =gUnknown_84630D8
@@ -5669,18 +5669,18 @@ _0813177A:
lsrs r0, 14
adds r0, r4
ldr r3, [r0]
ldr r0, _0813179C @ =gUnknown_300500C
ldr r0, _0813179C @ =gSaveBlock2Ptr
ldr r4, [r0]
b _081317B0
.align 2, 0
_08131798: .4byte gUnknown_84630D8
_0813179C: .4byte gUnknown_300500C
_0813179C: .4byte gSaveBlock2Ptr
_081317A0:
ldr r1, _081317EC @ =gUnknown_8463124
lsls r0, r2, 2
adds r0, r1
ldr r3, [r0]
ldr r0, _081317F0 @ =gUnknown_3005008
ldr r0, _081317F0 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _081317F4 @ =0x00003a4c
adds r4, r0, r1
@@ -5721,7 +5721,7 @@ _081317E6:
bx r0
.align 2, 0
_081317EC: .4byte gUnknown_8463124
_081317F0: .4byte gUnknown_3005008
_081317F0: .4byte gSaveBlock1Ptr
_081317F4: .4byte 0x00003a4c
thumb_func_end sub_8131754
asm/option_menu.s
+10 -10
View File
@@ -29,7 +29,7 @@ sub_8088374: @ 8088374
thumb_func_start sub_8088388
sub_8088388: @ 8088388
push {r4-r6,lr}
ldr r1, _08088418 @ =gUnknown_30030F0
ldr r1, _08088418 @ =gMain
ldr r0, [r1, 0x8]
cmp r0, 0
bne _08088396
@@ -48,7 +48,7 @@ _08088396:
strb r1, [r0, 0x11]
ldr r2, [r4]
strh r1, [r2, 0xE]
ldr r0, _08088424 @ =gUnknown_300500C
ldr r0, _08088424 @ =gSaveBlock2Ptr
ldr r1, [r0]
ldrb r0, [r1, 0x14]
lsls r0, 29
@@ -100,10 +100,10 @@ _080883FA:
pop {r0}
bx r0
.align 2, 0
_08088418: .4byte gUnknown_30030F0
_08088418: .4byte gMain
_0808841C: .4byte sub_80568A8
_08088420: .4byte gUnknown_2039620
_08088424: .4byte gUnknown_300500C
_08088424: .4byte gSaveBlock2Ptr
_08088428: .4byte gUnknown_83CC304
_0808842C: .4byte sub_8088454
thumb_func_end sub_8088388
@@ -667,7 +667,7 @@ _080888B6:
thumb_func_start sub_80888C0
sub_80888C0: @ 80888C0
push {r4,lr}
ldr r3, _080888EC @ =gUnknown_30030F0
ldr r3, _080888EC @ =gMain
ldrh r1, [r3, 0x30]
movs r0, 0x10
ands r0, r1
@@ -688,7 +688,7 @@ sub_80888C0: @ 80888C0
movs r0, 0
b _080888FA
.align 2, 0
_080888EC: .4byte gUnknown_30030F0
_080888EC: .4byte gMain
_080888F0: .4byte gUnknown_2039620
_080888F4: .4byte gUnknown_83CC304
_080888F8:
@@ -970,11 +970,11 @@ sub_8088B00: @ 8088B00
ldr r1, _08088BBC @ =gUnknown_3005020
ldr r0, _08088BC0 @ =sub_807DF64
str r0, [r1]
ldr r0, _08088BC4 @ =gUnknown_30030F0
ldr r0, _08088BC4 @ =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
bl FreeAllWindowBuffers
ldr r3, _08088BC8 @ =gUnknown_300500C
ldr r3, _08088BC8 @ =gSaveBlock2Ptr
ldr r5, [r3]
ldr r4, _08088BCC @ =gUnknown_2039620
ldr r0, [r4]
@@ -1052,8 +1052,8 @@ sub_8088B00: @ 8088B00
.align 2, 0
_08088BBC: .4byte gUnknown_3005020
_08088BC0: .4byte sub_807DF64
_08088BC4: .4byte gUnknown_30030F0
_08088BC8: .4byte gUnknown_300500C
_08088BC4: .4byte gMain
_08088BC8: .4byte gSaveBlock2Ptr
_08088BCC: .4byte gUnknown_2039620
thumb_func_end sub_8088B00
asm/overworld.s
+128 -128
View File
@@ -10,7 +10,7 @@ sub_8054BC8: @ 8054BC8
push {r4,lr}
ldr r0, _08054BFC @ =gUnknown_81A654B
bl ScriptContext2_RunNewScript
ldr r0, _08054C00 @ =gUnknown_3005008
ldr r0, _08054C00 @ =gSaveBlock1Ptr
ldr r4, [r0]
movs r0, 0xA4
lsls r0, 2
@@ -28,7 +28,7 @@ sub_8054BC8: @ 8054BC8
bx r0
.align 2, 0
_08054BFC: .4byte gUnknown_81A654B
_08054C00: .4byte gUnknown_3005008
_08054C00: .4byte gSaveBlock1Ptr
thumb_func_end sub_8054BC8
thumb_func_start sub_8054C04
@@ -47,7 +47,7 @@ sub_8054C04: @ 8054C04
lsls r1, 2
adds r4, r0, 0
muls r4, r1
ldr r0, _08054C44 @ =gUnknown_3005008
ldr r0, _08054C44 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xA4
lsls r1, 2
@@ -63,7 +63,7 @@ _08054C38:
bx r1
.align 2, 0
_08054C40: .4byte gUnknown_826D294
_08054C44: .4byte gUnknown_3005008
_08054C44: .4byte gSaveBlock1Ptr
thumb_func_end sub_8054C04
thumb_func_start sub_8054C48
@@ -293,7 +293,7 @@ _08054E64: .4byte 0x0000406e
sub_8054E68: @ 8054E68
push {r4,r5,lr}
movs r2, 0
ldr r5, _08054E8C @ =gUnknown_3005008
ldr r5, _08054E8C @ =gSaveBlock1Ptr
movs r4, 0x90
lsls r4, 5
movs r3, 0
@@ -310,7 +310,7 @@ _08054E74:
pop {r0}
bx r0
.align 2, 0
_08054E8C: .4byte gUnknown_3005008
_08054E8C: .4byte gSaveBlock1Ptr
thumb_func_end sub_8054E68
thumb_func_start IncrementGameStat
@@ -350,14 +350,14 @@ GetGameStat: @ 8054EC4
lsrs r1, r0, 24
cmp r1, 0x33
bhi _08054EF8
ldr r0, _08054EF0 @ =gUnknown_3005008
ldr r0, _08054EF0 @ =gSaveBlock1Ptr
ldr r2, [r0]
lsls r0, r1, 2
movs r1, 0x90
lsls r1, 5
adds r2, r1
adds r2, r0
ldr r0, _08054EF4 @ =gUnknown_300500C
ldr r0, _08054EF4 @ =gSaveBlock2Ptr
ldr r1, [r0]
movs r0, 0xF2
lsls r0, 4
@@ -367,8 +367,8 @@ GetGameStat: @ 8054EC4
eors r0, r1
b _08054EFA
.align 2, 0
_08054EF0: .4byte gUnknown_3005008
_08054EF4: .4byte gUnknown_300500C
_08054EF0: .4byte gSaveBlock1Ptr
_08054EF4: .4byte gSaveBlock2Ptr
_08054EF8:
movs r0, 0
_08054EFA:
@@ -384,14 +384,14 @@ sub_8054F00: @ 8054F00
lsrs r2, r0, 24
cmp r2, 0x33
bhi _08054F2A
ldr r0, _08054F30 @ =gUnknown_3005008
ldr r0, _08054F30 @ =gSaveBlock1Ptr
ldr r1, [r0]
lsls r0, r2, 2
movs r2, 0x90
lsls r2, 5
adds r1, r2
adds r1, r0
ldr r0, _08054F34 @ =gUnknown_300500C
ldr r0, _08054F34 @ =gSaveBlock2Ptr
ldr r0, [r0]
movs r2, 0xF2
lsls r2, 4
@@ -403,8 +403,8 @@ _08054F2A:
pop {r0}
bx r0
.align 2, 0
_08054F30: .4byte gUnknown_3005008
_08054F34: .4byte gUnknown_300500C
_08054F30: .4byte gSaveBlock1Ptr
_08054F34: .4byte gSaveBlock2Ptr
thumb_func_end sub_8054F00
thumb_func_start sub_8054F38
@@ -412,7 +412,7 @@ sub_8054F38: @ 8054F38
push {r4-r6,lr}
adds r5, r0, 0
movs r4, 0
ldr r6, _08054F64 @ =gUnknown_3005008
ldr r6, _08054F64 @ =gSaveBlock1Ptr
_08054F40:
lsls r1, r4, 2
movs r0, 0x90
@@ -431,7 +431,7 @@ _08054F40:
pop {r0}
bx r0
.align 2, 0
_08054F64: .4byte gUnknown_3005008
_08054F64: .4byte gSaveBlock1Ptr
thumb_func_end sub_8054F38
thumb_func_start sub_8054F68
@@ -452,7 +452,7 @@ sub_8054F68: @ 8054F68
bcc _08054F86
b _08055092
_08054F86:
ldr r2, _08055044 @ =gUnknown_3005008
ldr r2, _08055044 @ =gSaveBlock1Ptr
mov r10, r2
_08054F8A:
ldr r3, _08055040 @ =gUnknown_2036DFC
@@ -547,7 +547,7 @@ _08054F8A:
b _08055072
.align 2, 0
_08055040: .4byte gUnknown_2036DFC
_08055044: .4byte gUnknown_3005008
_08055044: .4byte gSaveBlock1Ptr
_08055048: .4byte 0x000008e4
_0805504C: .4byte 0x000008ec
_08055050: .4byte 0x000008ee
@@ -602,7 +602,7 @@ sub_80550A8: @ 80550A8
push {lr}
ldr r0, _080550D0 @ =gUnknown_2036DFC
ldr r1, [r0, 0x4]
ldr r0, _080550D4 @ =gUnknown_3005008
ldr r0, _080550D4 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, [r1, 0x4]
movs r3, 0x8E
@@ -621,7 +621,7 @@ _080550BC:
bx r0
.align 2, 0
_080550D0: .4byte gUnknown_2036DFC
_080550D4: .4byte gUnknown_3005008
_080550D4: .4byte gSaveBlock1Ptr
thumb_func_end sub_80550A8
thumb_func_start Overworld_SetMapObjTemplateCoords
@@ -633,7 +633,7 @@ Overworld_SetMapObjTemplateCoords: @ 80550D8
lsrs r4, r1, 16
lsls r2, 16
lsrs r2, 16
ldr r0, _08055100 @ =gUnknown_3005008
ldr r0, _08055100 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0
movs r6, 0x8E
@@ -647,7 +647,7 @@ _080550F2:
strh r2, [r3, 0x6]
b _0805510C
.align 2, 0
_08055100: .4byte gUnknown_3005008
_08055100: .4byte gSaveBlock1Ptr
_08055104:
adds r3, 0x18
adds r1, 0x1
@@ -666,7 +666,7 @@ Overworld_SetMapObjTemplateMovementType: @ 8055114
lsrs r4, r0, 24
lsls r1, 24
lsrs r1, 24
ldr r0, _08055134 @ =gUnknown_3005008
ldr r0, _08055134 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r3, 0
movs r5, 0x8E
@@ -679,7 +679,7 @@ _0805512A:
strb r1, [r2, 0x9]
b _08055140
.align 2, 0
_08055134: .4byte gUnknown_3005008
_08055134: .4byte gSaveBlock1Ptr
_08055138:
adds r2, 0x18
adds r3, 0x1
@@ -712,7 +712,7 @@ _0805516C: .4byte gUnknown_2036DFC
thumb_func_start get_mapdata_header
get_mapdata_header: @ 8055170
push {lr}
ldr r0, _08055180 @ =gUnknown_3005008
ldr r0, _08055180 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x32]
cmp r1, 0
@@ -720,7 +720,7 @@ get_mapdata_header: @ 8055170
movs r0, 0
b _0805518E
.align 2, 0
_08055180: .4byte gUnknown_3005008
_08055180: .4byte gSaveBlock1Ptr
_08055184:
ldr r0, _08055194 @ =gUnknown_834EB8C
subs r1, 0x1
@@ -737,7 +737,7 @@ _08055194: .4byte gUnknown_834EB8C
thumb_func_start warp_shift
warp_shift: @ 8055198
ldr r3, _080551C4 @ =gUnknown_2031DB4
ldr r0, _080551C8 @ =gUnknown_3005008
ldr r0, _080551C8 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldr r0, [r2, 0x4]
ldr r1, [r2, 0x8]
@@ -760,7 +760,7 @@ warp_shift: @ 8055198
bx lr
.align 2, 0
_080551C4: .4byte gUnknown_2031DB4
_080551C8: .4byte gUnknown_3005008
_080551C8: .4byte gSaveBlock1Ptr
_080551CC: .4byte gUnknown_2031DBC
_080551D0: .4byte gUnknown_2031DC4
_080551D4: .4byte gUnknown_826D2B0
@@ -861,7 +861,7 @@ _08055270: .4byte gUnknown_2031DBC
set_current_map_header_from_sav1_save_old_name: @ 8055274
push {r4-r6,lr}
ldr r4, _080552B4 @ =gUnknown_2036DFC
ldr r5, _080552B8 @ =gUnknown_3005008
ldr r5, _080552B8 @ =gSaveBlock1Ptr
ldr r1, [r5]
movs r0, 0x4
ldrsb r0, [r1, r0]
@@ -890,14 +890,14 @@ set_current_map_header_from_sav1_save_old_name: @ 8055274
bx r0
.align 2, 0
_080552B4: .4byte gUnknown_2036DFC
_080552B8: .4byte gUnknown_3005008
_080552B8: .4byte gSaveBlock1Ptr
thumb_func_end set_current_map_header_from_sav1_save_old_name
thumb_func_start set_current_map_header_from_sav1
set_current_map_header_from_sav1: @ 80552BC
push {r4,r5,lr}
ldr r4, _080552F4 @ =gUnknown_2036DFC
ldr r0, _080552F8 @ =gUnknown_3005008
ldr r0, _080552F8 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x4
ldrsb r0, [r1, r0]
@@ -923,13 +923,13 @@ set_current_map_header_from_sav1: @ 80552BC
bx r0
.align 2, 0
_080552F4: .4byte gUnknown_2036DFC
_080552F8: .4byte gUnknown_3005008
_080552F8: .4byte gSaveBlock1Ptr
thumb_func_end set_current_map_header_from_sav1
thumb_func_start update_camera_pos_from_warpid
update_camera_pos_from_warpid: @ 80552FC
push {r4,r5,lr}
ldr r0, _0805532C @ =gUnknown_3005008
ldr r0, _0805532C @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r1, 0x6
ldrsb r1, [r2, r1]
@@ -953,7 +953,7 @@ update_camera_pos_from_warpid: @ 80552FC
strh r0, [r2, 0x2]
b _0805536C
.align 2, 0
_0805532C: .4byte gUnknown_3005008
_0805532C: .4byte gSaveBlock1Ptr
_08055330: .4byte gUnknown_2036DFC
_08055334:
ldr r1, [r4]
@@ -1059,7 +1059,7 @@ warp1_set_2: @ 80553C8
saved_warp2_set: @ 80553E8
push {r4,r5,lr}
sub sp, 0x8
ldr r0, _08055418 @ =gUnknown_3005008
ldr r0, _08055418 @ =gSaveBlock1Ptr
ldr r5, [r0]
adds r0, r5, 0
adds r0, 0x14
@@ -1081,7 +1081,7 @@ saved_warp2_set: @ 80553E8
pop {r0}
bx r0
.align 2, 0
_08055418: .4byte gUnknown_3005008
_08055418: .4byte gSaveBlock1Ptr
thumb_func_end saved_warp2_set
thumb_func_start saved_warp2_set_2
@@ -1090,7 +1090,7 @@ saved_warp2_set_2: @ 805541C
sub sp, 0x8
ldr r4, [sp, 0x14]
ldr r5, [sp, 0x18]
ldr r0, _08055450 @ =gUnknown_3005008
ldr r0, _08055450 @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x14
lsls r1, 24
@@ -1111,13 +1111,13 @@ saved_warp2_set_2: @ 805541C
pop {r0}
bx r0
.align 2, 0
_08055450: .4byte gUnknown_3005008
_08055450: .4byte gSaveBlock1Ptr
thumb_func_end saved_warp2_set_2
thumb_func_start copy_saved_warp2_bank_and_enter_x_to_warp1
copy_saved_warp2_bank_and_enter_x_to_warp1: @ 8055454
ldr r2, _08055464 @ =gUnknown_2031DBC
ldr r0, _08055468 @ =gUnknown_3005008
ldr r0, _08055468 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, [r0, 0x18]
ldr r0, [r0, 0x14]
@@ -1126,7 +1126,7 @@ copy_saved_warp2_bank_and_enter_x_to_warp1: @ 8055454
bx lr
.align 2, 0
_08055464: .4byte gUnknown_2031DBC
_08055468: .4byte gUnknown_3005008
_08055468: .4byte gSaveBlock1Ptr
thumb_func_end copy_saved_warp2_bank_and_enter_x_to_warp1
thumb_func_start sub_805546C
@@ -1162,7 +1162,7 @@ _0805549A:
thumb_func_start copy_saved_warp3_bank_and_enter_x_to_warp1
copy_saved_warp3_bank_and_enter_x_to_warp1: @ 80554A4
ldr r2, _080554B4 @ =gUnknown_2031DBC
ldr r0, _080554B8 @ =gUnknown_3005008
ldr r0, _080554B8 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, [r0, 0x20]
ldr r0, [r0, 0x1C]
@@ -1171,7 +1171,7 @@ copy_saved_warp3_bank_and_enter_x_to_warp1: @ 80554A4
bx lr
.align 2, 0
_080554B4: .4byte gUnknown_2031DBC
_080554B8: .4byte gUnknown_3005008
_080554B8: .4byte gSaveBlock1Ptr
thumb_func_end copy_saved_warp3_bank_and_enter_x_to_warp1
thumb_func_start sub_80554BC
@@ -1195,7 +1195,7 @@ sub_80554CC: @ 80554CC
adds r5, r0, 0
cmp r5, 0
beq _08055500
ldr r0, _08055508 @ =gUnknown_3005008
ldr r0, _08055508 @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x1C
movs r1, 0
@@ -1217,7 +1217,7 @@ _08055500:
pop {r0}
bx r0
.align 2, 0
_08055508: .4byte gUnknown_3005008
_08055508: .4byte gSaveBlock1Ptr
thumb_func_end sub_80554CC
thumb_func_start sub_805550C
@@ -1252,7 +1252,7 @@ sub_805550C: @ 805550C
lsrs r0, 24
cmp r0, 0x1
beq _08055590
ldr r5, _0805559C @ =gUnknown_3005008
ldr r5, _0805559C @ =gSaveBlock1Ptr
ldr r0, [r5]
ldrh r0, [r0, 0x4]
cmp r0, 0x1
@@ -1289,7 +1289,7 @@ _08055590:
bx r0
.align 2, 0
_08055598: .4byte gUnknown_2031DBC
_0805559C: .4byte gUnknown_3005008
_0805559C: .4byte gSaveBlock1Ptr
thumb_func_end sub_805550C
thumb_func_start sub_80555A0
@@ -1300,7 +1300,7 @@ sub_80555A0: @ 80555A0
adds r5, r1, 0
adds r6, r2, 0
ldr r1, [sp, 0x18]
ldr r0, _080555DC @ =gUnknown_3005008
ldr r0, _080555DC @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x24
lsls r4, 24
@@ -1324,13 +1324,13 @@ sub_80555A0: @ 80555A0
pop {r0}
bx r0
.align 2, 0
_080555DC: .4byte gUnknown_3005008
_080555DC: .4byte gSaveBlock1Ptr
thumb_func_end sub_80555A0
thumb_func_start sub_80555E0
sub_80555E0: @ 80555E0
ldr r2, _080555F0 @ =gUnknown_2031DBC
ldr r0, _080555F4 @ =gUnknown_3005008
ldr r0, _080555F4 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, [r0, 0x28]
ldr r0, [r0, 0x24]
@@ -1339,7 +1339,7 @@ sub_80555E0: @ 80555E0
bx lr
.align 2, 0
_080555F0: .4byte gUnknown_2031DBC
_080555F4: .4byte gUnknown_3005008
_080555F4: .4byte gSaveBlock1Ptr
thumb_func_end sub_80555E0
thumb_func_start sub_80555F8
@@ -1469,7 +1469,7 @@ _080556D6:
thumb_func_start warp1_set_to_sav1w
warp1_set_to_sav1w: @ 80556E0
ldr r2, _080556F0 @ =gUnknown_2031DBC
ldr r0, _080556F4 @ =gUnknown_3005008
ldr r0, _080556F4 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, [r0, 0x10]
ldr r0, [r0, 0xC]
@@ -1478,7 +1478,7 @@ warp1_set_to_sav1w: @ 80556E0
bx lr
.align 2, 0
_080556F0: .4byte gUnknown_2031DBC
_080556F4: .4byte gUnknown_3005008
_080556F4: .4byte gSaveBlock1Ptr
thumb_func_end warp1_set_to_sav1w
thumb_func_start sub_80556F8
@@ -1489,7 +1489,7 @@ sub_80556F8: @ 80556F8
adds r5, r1, 0
adds r6, r2, 0
ldr r1, [sp, 0x18]
ldr r0, _08055734 @ =gUnknown_3005008
ldr r0, _08055734 @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0xC
lsls r4, 24
@@ -1513,7 +1513,7 @@ sub_80556F8: @ 80556F8
pop {r0}
bx r0
.align 2, 0
_08055734: .4byte gUnknown_3005008
_08055734: .4byte gSaveBlock1Ptr
thumb_func_end sub_80556F8
thumb_func_start sub_8055738
@@ -1526,7 +1526,7 @@ sub_8055738: @ 8055738
adds r5, r0, 0
cmp r5, 0
beq _0805576C
ldr r0, _08055774 @ =gUnknown_3005008
ldr r0, _08055774 @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0xC
movs r1, 0
@@ -1548,12 +1548,12 @@ _0805576C:
pop {r0}
bx r0
.align 2, 0
_08055774: .4byte gUnknown_3005008
_08055774: .4byte gSaveBlock1Ptr
thumb_func_end sub_8055738
thumb_func_start sub_8055778
sub_8055778: @ 8055778
ldr r0, _08055788 @ =gUnknown_3005008
ldr r0, _08055788 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldr r0, [r2, 0x14]
ldr r1, [r2, 0x18]
@@ -1561,7 +1561,7 @@ sub_8055778: @ 8055778
str r1, [r2, 0x10]
bx lr
.align 2, 0
_08055788: .4byte gUnknown_3005008
_08055788: .4byte gSaveBlock1Ptr
thumb_func_end sub_8055778
thumb_func_start GetMapConnection
@@ -1772,7 +1772,7 @@ sub_8055920: @ 8055920
bl sub_806E110
bl nullsub_74
bl sub_806D7E8
ldr r0, _080559A0 @ =gUnknown_3005008
ldr r0, _080559A0 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x4
ldrsb r0, [r1, r0]
@@ -1804,7 +1804,7 @@ _08055974:
bx r0
.align 2, 0
_0805599C: .4byte gUnknown_2036DFC
_080559A0: .4byte gUnknown_3005008
_080559A0: .4byte gSaveBlock1Ptr
_080559A4: .4byte 0x00000806
thumb_func_end sub_8055920
@@ -2023,7 +2023,7 @@ sub_8055B38: @ 8055B38
lsrs r0, 24
cmp r0, 0x1
bne _08055B6C
ldr r0, _08055B60 @ =gUnknown_3005008
ldr r0, _08055B60 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, _08055B64 @ =0x00005601
@@ -2036,7 +2036,7 @@ _08055B5C:
movs r0, 0x1
b _08055B6E
.align 2, 0
_08055B60: .4byte gUnknown_3005008
_08055B60: .4byte gSaveBlock1Ptr
_08055B64: .4byte 0x00005601
_08055B68: .4byte 0x00005701
_08055B6C:
@@ -2180,7 +2180,7 @@ _08055C6E:
thumb_func_start sub_8055C74
sub_8055C74: @ 8055C74
push {lr}
ldr r0, _08055C98 @ =gUnknown_3005008
ldr r0, _08055C98 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldrh r0, [r1]
adds r0, 0x7
@@ -2196,7 +2196,7 @@ sub_8055C74: @ 8055C74
pop {r1}
bx r1
.align 2, 0
_08055C98: .4byte gUnknown_3005008
_08055C98: .4byte gSaveBlock1Ptr
thumb_func_end sub_8055C74
thumb_func_start sub_8055C9C
@@ -2224,28 +2224,28 @@ sub_8055CB8: @ 8055CB8
ldrb r1, [r0, 0x15]
cmp r1, 0
bne _08055CD0
ldr r0, _08055CCC @ =gUnknown_3005008
ldr r0, _08055CCC @ =gSaveBlock1Ptr
ldr r0, [r0]
b _08055CF8
.align 2, 0
_08055CC8: .4byte gUnknown_2036DFC
_08055CCC: .4byte gUnknown_3005008
_08055CCC: .4byte gSaveBlock1Ptr
_08055CD0:
ldr r0, _08055CE8 @ =0x00000806
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _08055CF0
ldr r0, _08055CEC @ =gUnknown_3005008
ldr r0, _08055CEC @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x30
movs r1, 0
b _08055CFA
.align 2, 0
_08055CE8: .4byte 0x00000806
_08055CEC: .4byte gUnknown_3005008
_08055CEC: .4byte gSaveBlock1Ptr
_08055CF0:
ldr r0, _08055D00 @ =gUnknown_3005008
ldr r0, _08055D00 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08055D04 @ =gUnknown_83C68E0
ldr r1, [r1]
@@ -2256,7 +2256,7 @@ _08055CFA:
pop {r0}
bx r0
.align 2, 0
_08055D00: .4byte gUnknown_3005008
_08055D00: .4byte gSaveBlock1Ptr
_08055D04: .4byte gUnknown_83C68E0
thumb_func_end sub_8055CB8
@@ -2273,7 +2273,7 @@ Overworld_SetFlashLevel: @ 8055D08
_08055D18:
movs r1, 0
_08055D1A:
ldr r0, _08055D2C @ =gUnknown_3005008
ldr r0, _08055D2C @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x30
strb r1, [r0]
@@ -2281,24 +2281,24 @@ _08055D1A:
bx r0
.align 2, 0
_08055D28: .4byte gUnknown_83C68E0
_08055D2C: .4byte gUnknown_3005008
_08055D2C: .4byte gSaveBlock1Ptr
thumb_func_end Overworld_SetFlashLevel
thumb_func_start sav1_get_flash_used_on_map
sav1_get_flash_used_on_map: @ 8055D30
ldr r0, _08055D3C @ =gUnknown_3005008
ldr r0, _08055D3C @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x30
ldrb r0, [r0]
bx lr
.align 2, 0
_08055D3C: .4byte gUnknown_3005008
_08055D3C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_get_flash_used_on_map
thumb_func_start sub_8055D40
sub_8055D40: @ 8055D40
push {lr}
ldr r1, _08055D54 @ =gUnknown_3005008
ldr r1, _08055D54 @ =gSaveBlock1Ptr
ldr r1, [r1]
strh r0, [r1, 0x32]
bl get_mapdata_header
@@ -2307,7 +2307,7 @@ sub_8055D40: @ 8055D40
pop {r0}
bx r0
.align 2, 0
_08055D54: .4byte gUnknown_3005008
_08055D54: .4byte gSaveBlock1Ptr
_08055D58: .4byte gUnknown_2036DFC
thumb_func_end sub_8055D40
@@ -2345,7 +2345,7 @@ sub_8055D6C: @ 8055D6C
thumb_func_start sub_8055D8C
sub_8055D8C: @ 8055D8C
push {lr}
ldr r0, _08055DA0 @ =gUnknown_3005008
ldr r0, _08055DA0 @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x4
bl sub_8055D6C
@@ -2354,7 +2354,7 @@ sub_8055D8C: @ 8055D8C
pop {r1}
bx r1
.align 2, 0
_08055DA0: .4byte gUnknown_3005008
_08055DA0: .4byte gSaveBlock1Ptr
thumb_func_end sub_8055D8C
thumb_func_start sub_8055DA4
@@ -2393,7 +2393,7 @@ _08055DD8: .4byte gUnknown_2031DD8
_08055DDC:
cmp r0, 0x2
beq _08055E6C
ldr r0, _08055E14 @ =gUnknown_3005008
ldr r0, _08055E14 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, _08055E18 @ =0x00004f01
@@ -2418,7 +2418,7 @@ _08055DDC:
bl FadeInBGM
b _08055E6C
.align 2, 0
_08055E14: .4byte gUnknown_3005008
_08055E14: .4byte gSaveBlock1Ptr
_08055E18: .4byte 0x00004f01
_08055E1C: .4byte gMPlay_BGM
_08055E20: .4byte gUnknown_86E6B0C
@@ -2426,7 +2426,7 @@ _08055E24:
bl sub_8055D8C
lsls r0, 16
lsrs r4, r0, 16
ldr r0, _08055E3C @ =gUnknown_3005008
ldr r0, _08055E3C @ =gSaveBlock1Ptr
ldr r1, [r0]
ldrh r0, [r1, 0x2C]
cmp r0, 0
@@ -2434,7 +2434,7 @@ _08055E24:
adds r4, r0, 0
b _08055E5A
.align 2, 0
_08055E3C: .4byte gUnknown_3005008
_08055E3C: .4byte gSaveBlock1Ptr
_08055E40:
movs r0, 0x8
bl TestPlayerAvatarFlags
@@ -2466,23 +2466,23 @@ _08055E74: .4byte 0x00000131
thumb_func_start sub_8055E78
sub_8055E78: @ 8055E78
ldr r1, _08055E80 @ =gUnknown_3005008
ldr r1, _08055E80 @ =gSaveBlock1Ptr
ldr r1, [r1]
strh r0, [r1, 0x2C]
bx lr
.align 2, 0
_08055E80: .4byte gUnknown_3005008
_08055E80: .4byte gSaveBlock1Ptr
thumb_func_end sub_8055E78
thumb_func_start sav1_reset_battle_music_maybe
sav1_reset_battle_music_maybe: @ 8055E84
ldr r0, _08055E90 @ =gUnknown_3005008
ldr r0, _08055E90 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0
strh r0, [r1, 0x2C]
bx lr
.align 2, 0
_08055E90: .4byte gUnknown_3005008
_08055E90: .4byte gSaveBlock1Ptr
thumb_func_end sav1_reset_battle_music_maybe
thumb_func_start sub_8055E94
@@ -2887,7 +2887,7 @@ get_map_light_level_from_warp: @ 8056170
thumb_func_start sav1_map_get_light_level
sav1_map_get_light_level: @ 8056188
push {lr}
ldr r0, _0805619C @ =gUnknown_3005008
ldr r0, _0805619C @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x4
bl get_map_light_level_from_warp
@@ -2896,7 +2896,7 @@ sav1_map_get_light_level: @ 8056188
pop {r1}
bx r1
.align 2, 0
_0805619C: .4byte gUnknown_3005008
_0805619C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_map_get_light_level
thumb_func_start get_map_light_from_warp0
@@ -3003,7 +3003,7 @@ _08056232:
thumb_func_start sav1_saved_warp2_map_get_name
sav1_saved_warp2_map_get_name: @ 8056238
push {lr}
ldr r0, _0805625C @ =gUnknown_3005008
ldr r0, _0805625C @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x14
ldrsb r0, [r1, r0]
@@ -3019,13 +3019,13 @@ sav1_saved_warp2_map_get_name: @ 8056238
pop {r1}
bx r1
.align 2, 0
_0805625C: .4byte gUnknown_3005008
_0805625C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_saved_warp2_map_get_name
thumb_func_start sav1_map_get_name
sav1_map_get_name: @ 8056260
push {lr}
ldr r0, _08056284 @ =gUnknown_3005008
ldr r0, _08056284 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x4
ldrsb r0, [r1, r0]
@@ -3041,13 +3041,13 @@ sav1_map_get_name: @ 8056260
pop {r1}
bx r1
.align 2, 0
_08056284: .4byte gUnknown_3005008
_08056284: .4byte gSaveBlock1Ptr
thumb_func_end sav1_map_get_name
thumb_func_start sav1_map_get_battletype
sav1_map_get_battletype: @ 8056288
push {lr}
ldr r0, _080562AC @ =gUnknown_3005008
ldr r0, _080562AC @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x4
ldrsb r0, [r1, r0]
@@ -3063,7 +3063,7 @@ sav1_map_get_battletype: @ 8056288
pop {r1}
bx r1
.align 2, 0
_080562AC: .4byte gUnknown_3005008
_080562AC: .4byte gSaveBlock1Ptr
thumb_func_end sav1_map_get_battletype
thumb_func_start sub_80562B0
@@ -3228,7 +3228,7 @@ sub_8056420: @ 8056420
thumb_func_start sub_805642C
sub_805642C: @ 805642C
push {lr}
ldr r0, _0805643C @ =gUnknown_30030F0
ldr r0, _0805643C @ =gMain
ldr r1, [r0]
ldr r0, _08056440 @ =c1_link_related
cmp r1, r0
@@ -3236,7 +3236,7 @@ sub_805642C: @ 805642C
movs r0, 0
b _08056446
.align 2, 0
_0805643C: .4byte gUnknown_30030F0
_0805643C: .4byte gMain
_08056440: .4byte c1_link_related
_08056444:
movs r0, 0x1
@@ -3350,7 +3350,7 @@ _08056530: .4byte gUnknown_3005E90
thumb_func_start sub_8056534
sub_8056534: @ 8056534
push {r4,lr}
ldr r4, _0805655C @ =gUnknown_30030F0
ldr r4, _0805655C @ =gMain
ldr r1, [r4, 0x4]
ldr r0, _08056560 @ =sub_80565B4
cmp r1, r0
@@ -3368,7 +3368,7 @@ _08056554:
bl sub_80564C8
b _08056570
.align 2, 0
_0805655C: .4byte gUnknown_30030F0
_0805655C: .4byte gMain
_08056560: .4byte sub_80565B4
_08056564: .4byte gUnknown_203ADFA
_08056568:
@@ -3432,11 +3432,11 @@ _080565DC: .4byte gUnknown_2037AB8
thumb_func_start sub_80565E0
sub_80565E0: @ 80565E0
ldr r1, _080565E8 @ =gUnknown_30030F0
ldr r1, _080565E8 @ =gMain
str r0, [r1]
bx lr
.align 2, 0
_080565E8: .4byte gUnknown_30030F0
_080565E8: .4byte gMain
thumb_func_end sub_80565E0
thumb_func_start map_post_load_hook_exec
@@ -3504,7 +3504,7 @@ CB2_NewGame: @ 8056644
ldr r1, _08056694 @ =gUnknown_3005024
movs r0, 0
str r0, [r1]
ldr r0, _08056698 @ =gUnknown_3003528
ldr r0, _08056698 @ =gMain + 0x438
bl do_load_map_stuff_loop
bl SetFieldVBlankCallback
ldr r0, _0805669C @ =sub_8056534
@@ -3517,7 +3517,7 @@ CB2_NewGame: @ 8056644
_0805668C: .4byte gUnknown_3005020
_08056690: .4byte sub_807DF7C
_08056694: .4byte gUnknown_3005024
_08056698: .4byte gUnknown_3003528
_08056698: .4byte gMain + 0x438
_0805669C: .4byte sub_8056534
_080566A0: .4byte sub_80565B4
thumb_func_end CB2_NewGame
@@ -3526,7 +3526,7 @@ _080566A0: .4byte sub_80565B4
c2_whiteout: @ 80566A4
push {lr}
sub sp, 0x4
ldr r1, _08056708 @ =gUnknown_30030F0
ldr r1, _08056708 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -3564,7 +3564,7 @@ _08056702:
pop {r0}
bx r0
.align 2, 0
_08056708: .4byte gUnknown_30030F0
_08056708: .4byte gMain
_0805670C: .4byte gUnknown_3005020
_08056710: .4byte sub_807F5F0
_08056714: .4byte sub_8056534
@@ -3581,21 +3581,21 @@ sub_805671C: @ 805671C
bl sub_80565E0
ldr r0, _08056740 @ =sub_80C9BFC
bl SetMainCallback2
ldr r1, _08056744 @ =gUnknown_30030F0
ldr r1, _08056744 @ =gMain
ldr r0, _08056748 @ =sub_805674C
str r0, [r1, 0x8]
pop {r0}
bx r0
.align 2, 0
_08056740: .4byte sub_80C9BFC
_08056744: .4byte gUnknown_30030F0
_08056744: .4byte gMain
_08056748: .4byte sub_805674C
thumb_func_end sub_805671C
thumb_func_start sub_805674C
sub_805674C: @ 805674C
push {lr}
ldr r0, _08056768 @ =gUnknown_3003528
ldr r0, _08056768 @ =gMain + 0x438
bl do_load_map_stuff_loop
bl sub_8113748
lsls r0, 24
@@ -3605,7 +3605,7 @@ sub_805674C: @ 805674C
bl sub_81119C8
b _0805677C
.align 2, 0
_08056768: .4byte gUnknown_3003528
_08056768: .4byte gMain + 0x438
_0805676C:
bl SetFieldVBlankCallback
ldr r0, _08056780 @ =sub_8056534
@@ -3640,7 +3640,7 @@ _080567A8: .4byte c2_80567AC
thumb_func_start c2_80567AC
c2_80567AC: @ 80567AC
push {lr}
ldr r0, _080567D0 @ =gUnknown_3003528
ldr r0, _080567D0 @ =gMain + 0x438
bl sub_8056A5C
cmp r0, 0
beq _080567CC
@@ -3654,7 +3654,7 @@ _080567CC:
pop {r0}
bx r0
.align 2, 0
_080567D0: .4byte gUnknown_3003528
_080567D0: .4byte gMain + 0x438
_080567D4: .4byte c1_link_related
_080567D8: .4byte sub_80565B4
thumb_func_end c2_80567AC
@@ -3684,7 +3684,7 @@ _08056804: .4byte c2_exit_to_overworld_2_local
thumb_func_start c2_exit_to_overworld_2_local
c2_exit_to_overworld_2_local: @ 8056808
push {lr}
ldr r0, _08056824 @ =gUnknown_3003528
ldr r0, _08056824 @ =gMain + 0x438
bl sub_8056CD8
cmp r0, 0
beq _0805681E
@@ -3695,7 +3695,7 @@ _0805681E:
pop {r0}
bx r0
.align 2, 0
_08056824: .4byte gUnknown_3003528
_08056824: .4byte gMain + 0x438
_08056828: .4byte sub_80565B4
thumb_func_end c2_exit_to_overworld_2_local
@@ -3705,7 +3705,7 @@ c2_exit_to_overworld_2_link: @ 805682C
bl sub_8058244
cmp r0, 0
bne _08056846
ldr r0, _0805684C @ =gUnknown_3003528
ldr r0, _0805684C @ =gMain + 0x438
bl map_loading_iteration_2_link
cmp r0, 0
beq _08056846
@@ -3715,7 +3715,7 @@ _08056846:
pop {r0}
bx r0
.align 2, 0
_0805684C: .4byte gUnknown_3003528
_0805684C: .4byte gMain + 0x438
_08056850: .4byte sub_80565B4
thumb_func_end c2_exit_to_overworld_2_link
@@ -4699,7 +4699,7 @@ mli4_mapscripts_and_other: @ 805709C
movs r2, 0
ldrsh r1, [r4, r2]
ldrb r2, [r5, 0x1]
ldr r3, _080570FC @ =gUnknown_300500C
ldr r3, _080570FC @ =gSaveBlock2Ptr
ldr r3, [r3]
ldrb r3, [r3, 0x8]
bl InitPlayerAvatar
@@ -4717,7 +4717,7 @@ mli4_mapscripts_and_other: @ 805709C
.align 2, 0
_080570F4: .4byte gUnknown_300506C
_080570F8: .4byte gUnknown_3005068
_080570FC: .4byte gUnknown_300500C
_080570FC: .4byte gSaveBlock2Ptr
thumb_func_end mli4_mapscripts_and_other
thumb_func_start sub_8057100
@@ -4924,7 +4924,7 @@ sub_805726C: @ 805726C
bl sub_80565E0
ldr r0, _0805729C @ =sub_80C9BFC
bl SetMainCallback2
ldr r1, _080572A0 @ =gUnknown_30030F0
ldr r1, _080572A0 @ =gMain
ldr r0, _080572A4 @ =sub_80572D8
str r0, [r1, 0x8]
pop {r0}
@@ -4932,7 +4932,7 @@ sub_805726C: @ 805726C
.align 2, 0
_08057298: .4byte gUnknown_2036E28
_0805729C: .4byte sub_80C9BFC
_080572A0: .4byte gUnknown_30030F0
_080572A0: .4byte gMain
_080572A4: .4byte sub_80572D8
thumb_func_end sub_805726C
@@ -4960,7 +4960,7 @@ _080572D4: .4byte sub_80572D8
thumb_func_start sub_80572D8
sub_80572D8: @ 80572D8
push {lr}
ldr r0, _080572F4 @ =gUnknown_3003528
ldr r0, _080572F4 @ =gMain + 0x438
bl sub_8057300
bl SetFieldVBlankCallback
ldr r0, _080572F8 @ =sub_8056534
@@ -4970,7 +4970,7 @@ sub_80572D8: @ 80572D8
pop {r0}
bx r0
.align 2, 0
_080572F4: .4byte gUnknown_3003528
_080572F4: .4byte gMain + 0x438
_080572F8: .4byte sub_8056534
_080572FC: .4byte sub_80565B4
thumb_func_end sub_80572D8
@@ -5317,7 +5317,7 @@ _08057560:
ldr r1, _08057614 @ =gUnknown_3005024
ldr r0, _08057618 @ =sub_80574EC
str r0, [r1]
ldr r0, _0805761C @ =gUnknown_30030F0
ldr r0, _0805761C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -5336,7 +5336,7 @@ _0805760C: .4byte gUnknown_2031DE8
_08057610: .4byte gUnknown_2037AB8
_08057614: .4byte gUnknown_3005024
_08057618: .4byte sub_80574EC
_0805761C: .4byte gUnknown_30030F0
_0805761C: .4byte gMain
_08057620:
bl sub_8057650
lsls r0, 24
@@ -5366,7 +5366,7 @@ _0805764A:
thumb_func_start sub_8057650
sub_8057650: @ 8057650
push {r4,lr}
ldr r4, _08057664 @ =gUnknown_3003528
ldr r4, _08057664 @ =gMain + 0x438
ldrb r0, [r4]
cmp r0, 0x8
bhi _0805773C
@@ -5376,7 +5376,7 @@ sub_8057650: @ 8057650
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08057664: .4byte gUnknown_3003528
_08057664: .4byte gMain + 0x438
_08057668: .4byte _0805766C
.align 2, 0
_0805766C:
@@ -6174,7 +6174,7 @@ _08057CB4: .4byte gUnknown_3003F3C
thumb_func_start sub_8057CB8
sub_8057CB8: @ 8057CB8
push {lr}
ldr r2, _08057CCC @ =gUnknown_30030F0
ldr r2, _08057CCC @ =gMain
ldrh r1, [r2, 0x2C]
movs r0, 0x40
ands r0, r1
@@ -6183,7 +6183,7 @@ sub_8057CB8: @ 8057CB8
movs r0, 0x13
b _08057D10
.align 2, 0
_08057CCC: .4byte gUnknown_30030F0
_08057CCC: .4byte gMain
_08057CD0:
movs r0, 0x80
ands r0, r1
@@ -6398,7 +6398,7 @@ sub_8057E1C: @ 8057E1C
ldrb r0, [r0]
cmp r0, 0x82
bne _08057E4C
ldr r0, _08057E44 @ =gUnknown_30030F0
ldr r0, _08057E44 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -6410,7 +6410,7 @@ sub_8057E1C: @ 8057E1C
b _08057E52
.align 2, 0
_08057E40: .4byte gUnknown_3000E80
_08057E44: .4byte gUnknown_30030F0
_08057E44: .4byte gMain
_08057E48: .4byte sub_8057E10
_08057E4C:
bl sub_8057910
asm/party_menu.s
+56 -56
View File
@@ -233,7 +233,7 @@ _0811EBF6:
sub_811EBFC: @ 811EBFC
push {r4,lr}
sub sp, 0x4
ldr r0, _0811EC1C @ =gUnknown_30030F0
ldr r0, _0811EC1C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -248,7 +248,7 @@ _0811EC10:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0811EC1C: .4byte gUnknown_30030F0
_0811EC1C: .4byte gMain
_0811EC20: .4byte _0811EC24
.align 2, 0
_0811EC24:
@@ -459,7 +459,7 @@ _0811EDDE:
_0811EDFA:
strb r0, [r2, 0x8]
_0811EDFC:
ldr r1, _0811EE10 @ =gUnknown_30030F0
ldr r1, _0811EE10 @ =gMain
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -469,7 +469,7 @@ _0811EDFC:
b _0811EE2C
.align 2, 0
_0811EE0C: .4byte gUnknown_2037AB8
_0811EE10: .4byte gUnknown_30030F0
_0811EE10: .4byte gMain
_0811EE14:
ldr r0, _0811EE24 @ =sub_811EBBC
bl SetVBlankCallback
@@ -2630,7 +2630,7 @@ _0811FEF4:
sub_811FEFC: @ 811FEFC
push {r4,lr}
adds r4, r0, 0
ldr r0, _0811FF14 @ =gUnknown_30030F0
ldr r0, _0811FF14 @ =gMain
ldrh r1, [r0, 0x30]
adds r3, r0, 0
cmp r1, 0x20
@@ -2641,7 +2641,7 @@ sub_811FEFC: @ 811FEFC
beq _0811FF2E
b _0811FF32
.align 2, 0
_0811FF14: .4byte gUnknown_30030F0
_0811FF14: .4byte gMain
_0811FF18:
cmp r1, 0x40
beq _0811FF22
@@ -2676,7 +2676,7 @@ _0811FF46:
_0811FF4A:
movs r1, 0x1
_0811FF4C:
ldr r3, _0811FF5C @ =gUnknown_30030F0
ldr r3, _0811FF5C @ =gMain
_0811FF4E:
ldrh r2, [r3, 0x2E]
movs r0, 0x8
@@ -2686,7 +2686,7 @@ _0811FF4E:
movs r0, 0x8
b _0811FF8C
.align 2, 0
_0811FF5C: .4byte gUnknown_30030F0
_0811FF5C: .4byte gMain
_0811FF60:
lsls r0, r1, 24
asrs r1, r0, 24
@@ -4847,7 +4847,7 @@ sub_8120F78: @ 8120F78
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _08120F90 @ =gUnknown_30030F0
ldr r0, _08120F90 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -4856,7 +4856,7 @@ sub_8120F78: @ 8120F78
movs r0, 0
b _08120FA4
.align 2, 0
_08120F90: .4byte gUnknown_30030F0
_08120F90: .4byte gMain
_08120F94:
ldr r0, _08120FA8 @ =gUnknown_203B09C
ldr r1, [r0]
@@ -7150,7 +7150,7 @@ party_menu_icon_anim: @ 81221D4
lsrs r0, 24
cmp r0, 0x1
bne _0812220A
ldr r0, _08122240 @ =gUnknown_30030F0
ldr r0, _08122240 @ =gMain
ldr r1, _08122244 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -7189,7 +7189,7 @@ _0812220A:
pop {r0}
bx r0
.align 2, 0
_08122240: .4byte gUnknown_30030F0
_08122240: .4byte gMain
_08122244: .4byte 0x00000439
_08122248: .4byte gUnknown_845A59C
thumb_func_end party_menu_icon_anim
@@ -10277,7 +10277,7 @@ sub_8123A80: @ 8123A80
bl GetMonData
lsls r0, 24
lsrs r0, 24
ldr r1, _08123AC0 @ =gUnknown_3005008
ldr r1, _08123AC0 @ =gSaveBlock1Ptr
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
@@ -10293,7 +10293,7 @@ sub_8123A80: @ 8123A80
.align 2, 0
_08123AB8: .4byte gUnknown_203B0A0
_08123ABC: .4byte gUnknown_2024284
_08123AC0: .4byte gUnknown_3005008
_08123AC0: .4byte gSaveBlock1Ptr
_08123AC4: .4byte 0x00002cd0
_08123AC8: .4byte sub_8123ACC
thumb_func_end sub_8123A80
@@ -10632,7 +10632,7 @@ sub_8123D84: @ 8123D84
adds r0, r1
movs r1, 0x40
bl GetMonData
ldr r2, _08123DC0 @ =gUnknown_3005008
ldr r2, _08123DC0 @ =gSaveBlock1Ptr
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -10648,7 +10648,7 @@ sub_8123D84: @ 8123D84
.align 2, 0
_08123DB8: .4byte gUnknown_203B0A0
_08123DBC: .4byte gUnknown_2024284
_08123DC0: .4byte gUnknown_3005008
_08123DC0: .4byte gSaveBlock1Ptr
_08123DC4: .4byte 0x00002cd0
_08123DC8: .4byte sub_8123DCC
thumb_func_end sub_8123D84
@@ -11716,7 +11716,7 @@ _081246AC:
bl sub_80E56DC
b _081247B4
_081246B4:
ldr r0, _081246E0 @ =gUnknown_3005008
ldr r0, _081246E0 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x1C
ldrsb r0, [r1, r0]
@@ -11736,12 +11736,12 @@ _081246B4:
ldr r1, _081246EC @ =gUnknown_8417640
b _08124720
.align 2, 0
_081246E0: .4byte gUnknown_3005008
_081246E0: .4byte gSaveBlock1Ptr
_081246E4: .4byte gUnknown_2021CD0
_081246E8: .4byte gUnknown_2021D18
_081246EC: .4byte gUnknown_8417640
_081246F0:
ldr r0, _08124738 @ =gUnknown_3005008
ldr r0, _08124738 @ =gSaveBlock1Ptr
ldr r1, [r0]
adds r0, r1, 0
adds r0, 0x24
@@ -11775,7 +11775,7 @@ _08124720:
strh r4, [r0]
b _081247B4
.align 2, 0
_08124738: .4byte gUnknown_3005008
_08124738: .4byte gSaveBlock1Ptr
_0812473C: .4byte gUnknown_2021CD0
_08124740: .4byte gUnknown_2021D18
_08124744: .4byte gUnknown_8417615
@@ -12028,7 +12028,7 @@ task_brm_cancel_1_on_keypad_a_or_b: @ 812492C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _08124950 @ =gUnknown_30030F0
ldr r0, _08124950 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -12045,7 +12045,7 @@ _0812494C:
pop {r0}
bx r0
.align 2, 0
_08124950: .4byte gUnknown_30030F0
_08124950: .4byte gMain
thumb_func_end task_brm_cancel_1_on_keypad_a_or_b
thumb_func_start sub_8124954
@@ -12175,7 +12175,7 @@ _08124A24:
bl sub_8121D0C
b _08124A82
_08124A56:
ldr r0, _08124A78 @ =gUnknown_3005008
ldr r0, _08124A78 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x4
ldrsb r0, [r1, r0]
@@ -12191,7 +12191,7 @@ _08124A56:
bl sub_8121D0C
b _08124A82
.align 2, 0
_08124A78: .4byte gUnknown_3005008
_08124A78: .4byte gSaveBlock1Ptr
_08124A7C:
movs r0, 0x8
bl sub_8121D0C
@@ -12374,7 +12374,7 @@ sub_8124BB0: @ 8124BB0
movs r0, 0xFF
b _08124C00
_08124BDA:
ldr r0, _08124BF8 @ =gUnknown_3005008
ldr r0, _08124BF8 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x1C
ldrsb r0, [r1, r0]
@@ -12388,7 +12388,7 @@ _08124BDA:
bl get_mapheader_by_bank_and_number
b _08124BFE
.align 2, 0
_08124BF8: .4byte gUnknown_3005008
_08124BF8: .4byte gSaveBlock1Ptr
_08124BFC:
ldr r0, _08124C18 @ =gUnknown_2036DFC
_08124BFE:
@@ -12466,7 +12466,7 @@ sub_8124C8C: @ 8124C8C
push {r7}
sub sp, 0xC
ldr r6, _08124CB4 @ =sub_8124D90
ldr r0, _08124CB8 @ =gUnknown_30030F0
ldr r0, _08124CB8 @ =gMain
ldr r1, _08124CBC @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -12482,7 +12482,7 @@ sub_8124C8C: @ 8124C8C
b _08124CD2
.align 2, 0
_08124CB4: .4byte sub_8124D90
_08124CB8: .4byte gUnknown_30030F0
_08124CB8: .4byte gMain
_08124CBC: .4byte 0x00000439
_08124CC0:
ldr r0, _08124CC8 @ =gUnknown_203B0A0
@@ -12911,13 +12911,13 @@ IsHPRecoveryItem: @ 8125018
lsrs r0, 16
cmp r0, 0xAF
bne _08125034
ldr r0, _0812502C @ =gUnknown_3005008
ldr r0, _0812502C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08125030 @ =0x00003108
adds r0, r1
b _0812503E
.align 2, 0
_0812502C: .4byte gUnknown_3005008
_0812502C: .4byte gSaveBlock1Ptr
_08125030: .4byte 0x00003108
_08125034:
ldr r1, _0812504C @ =gUnknown_82528BC
@@ -13183,7 +13183,7 @@ ExecuteTableBasedItemEffect__: @ 8125268
lsrs r5, r1, 16
lsls r2, 24
lsrs r6, r2, 24
ldr r0, _08125294 @ =gUnknown_30030F0
ldr r0, _08125294 @ =gMain
ldr r1, _08125298 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -13199,7 +13199,7 @@ ExecuteTableBasedItemEffect__: @ 8125268
adds r2, r3, 0
b _081252BA
.align 2, 0
_08125294: .4byte gUnknown_30030F0
_08125294: .4byte gMain
_08125298: .4byte 0x00000439
_0812529C: .4byte gUnknown_2024284
_081252A0:
@@ -13739,14 +13739,14 @@ sub_81256F8: @ 81256F8
ldrh r0, [r0]
cmp r0, 0xAF
bne _0812571C
ldr r0, _08125714 @ =gUnknown_3005008
ldr r0, _08125714 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08125718 @ =0x00003108
adds r0, r1
b _08125726
.align 2, 0
_08125710: .4byte gUnknown_203AD30
_08125714: .4byte gUnknown_3005008
_08125714: .4byte gSaveBlock1Ptr
_08125718: .4byte 0x00003108
_0812571C:
ldr r1, _0812574C @ =gUnknown_82528BC
@@ -14490,7 +14490,7 @@ sub_8125D2C: @ 8125D2C
lsls r0, 24
cmp r0, 0
beq _08125D7E
ldr r0, _08125D68 @ =gUnknown_30030F0
ldr r0, _08125D68 @ =gMain
ldrh r1, [r0, 0x2E]
movs r2, 0x1
adds r0, r2, 0
@@ -14511,7 +14511,7 @@ _08125D54:
bl sub_81266A0
b _08125D7E
.align 2, 0
_08125D68: .4byte gUnknown_30030F0
_08125D68: .4byte gMain
_08125D6C: .4byte gUnknown_203B0A0
_08125D70:
cmp r0, 0x2
@@ -15405,7 +15405,7 @@ sub_81264C8: @ 81264C8
lsrs r0, 24
cmp r0, 0x1
beq _08126514
ldr r0, _0812651C @ =gUnknown_30030F0
ldr r0, _0812651C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -15432,7 +15432,7 @@ _08126514:
pop {r0}
bx r0
.align 2, 0
_0812651C: .4byte gUnknown_30030F0
_0812651C: .4byte gMain
_08126520: .4byte gUnknown_3005090
_08126524: .4byte sub_8126528
thumb_func_end sub_81264C8
@@ -15442,7 +15442,7 @@ sub_8126528: @ 8126528
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08126564 @ =gUnknown_30030F0
ldr r0, _08126564 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -15469,7 +15469,7 @@ _0812655C:
pop {r0}
bx r0
.align 2, 0
_08126564: .4byte gUnknown_30030F0
_08126564: .4byte gMain
_08126568: .4byte gUnknown_3005090
_0812656C: .4byte sub_81265F8
thumb_func_end sub_8126528
@@ -15552,7 +15552,7 @@ sub_81265F8: @ 81265F8
lsls r0, 24
cmp r0, 0
beq _0812669A
ldr r0, _08126650 @ =gUnknown_30030F0
ldr r0, _08126650 @ =gMain
ldrh r1, [r0, 0x2E]
movs r6, 0x1
adds r0, r6, 0
@@ -15586,7 +15586,7 @@ _08126620:
beq _0812666C
b _08126694
.align 2, 0
_08126650: .4byte gUnknown_30030F0
_08126650: .4byte gMain
_08126654: .4byte gUnknown_203B0A0
_08126658: .4byte gUnknown_2024284
_0812665C: .4byte 0x0000fffe
@@ -16330,13 +16330,13 @@ GetItemEffectType: @ 8126C68
_08126C7C:
cmp r1, 0xAF
bne _08126C94
ldr r0, _08126C8C @ =gUnknown_3005008
ldr r0, _08126C8C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08126C90 @ =0x00003108
adds r4, r0, r1
b _08126C9C
.align 2, 0
_08126C8C: .4byte gUnknown_3005008
_08126C8C: .4byte gSaveBlock1Ptr
_08126C90: .4byte 0x00003108
_08126C94:
ldr r1, _08126CC4 @ =gUnknown_82528BC
@@ -16920,7 +16920,7 @@ sub_81270E0: @ 81270E0
bl GetMonData
lsls r0, 24
lsrs r0, 24
ldr r1, _08127130 @ =gUnknown_3005008
ldr r1, _08127130 @ =gSaveBlock1Ptr
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
@@ -16937,7 +16937,7 @@ sub_81270E0: @ 81270E0
.align 2, 0
_08127128: .4byte gUnknown_203B0A0
_0812712C: .4byte gUnknown_2024284
_08127130: .4byte gUnknown_3005008
_08127130: .4byte gSaveBlock1Ptr
_08127134: .4byte 0x00002cd0
_08127138: .4byte sub_812713C
thumb_func_end sub_81270E0
@@ -17310,7 +17310,7 @@ sub_8127404: @ 8127404
ldr r1, _08127458 @ =gUnknown_203B0C0
movs r0, 0
strb r0, [r1]
ldr r2, _0812745C @ =gUnknown_3005008
ldr r2, _0812745C @ =gSaveBlock1Ptr
ldr r0, _08127460 @ =gUnknown_203AAC4
ldrh r1, [r0]
adds r1, 0x6
@@ -17336,7 +17336,7 @@ sub_8127404: @ 8127404
_08127450: .4byte gUnknown_203B0A0
_08127454: .4byte gUnknown_2024284
_08127458: .4byte gUnknown_203B0C0
_0812745C: .4byte gUnknown_3005008
_0812745C: .4byte gSaveBlock1Ptr
_08127460: .4byte gUnknown_203AAC4
_08127464: .4byte 0x00002cd0
_08127468: .4byte gUnknown_8416D17
@@ -17380,7 +17380,7 @@ sub_81274A8: @ 81274A8
str r0, [sp]
ldr r0, _081274EC @ =sub_811FB28
str r0, [sp, 0x4]
ldr r0, _081274F0 @ =gUnknown_30030F0
ldr r0, _081274F0 @ =gMain
ldr r0, [r0, 0x8]
str r0, [sp, 0x8]
movs r0, 0x4
@@ -17403,7 +17403,7 @@ sub_81274A8: @ 81274A8
bx r0
.align 2, 0
_081274EC: .4byte sub_811FB28
_081274F0: .4byte gUnknown_30030F0
_081274F0: .4byte gMain
_081274F4: .4byte gUnknown_203B0A0
_081274F8: .4byte sub_812773C
thumb_func_end sub_81274A8
@@ -17491,7 +17491,7 @@ _08127584:
bne _081275E0
b _0812757A
_08127592:
ldr r0, _081275E8 @ =gUnknown_300500C
ldr r0, _081275E8 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, _081275EC @ =0x0000055c
adds r0, r2
@@ -17537,7 +17537,7 @@ _081275E2:
pop {r1}
bx r1
.align 2, 0
_081275E8: .4byte gUnknown_300500C
_081275E8: .4byte gSaveBlock2Ptr
_081275EC: .4byte 0x0000055c
_081275F0: .4byte gUnknown_84020C4
_081275F4: .4byte 0x0000ffff
@@ -17778,7 +17778,7 @@ sub_81277AC: @ 81277AC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _081277E8 @ =gUnknown_30030F0
ldr r0, _081277E8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -17805,7 +17805,7 @@ _081277E0:
pop {r0}
bx r0
.align 2, 0
_081277E8: .4byte gUnknown_30030F0
_081277E8: .4byte gMain
_081277EC: .4byte gUnknown_3005090
_081277F0: .4byte sub_811FB28
thumb_func_end sub_81277AC
@@ -19062,7 +19062,7 @@ sub_8128198: @ 8128198
str r0, [sp]
ldr r0, _081281BC @ =sub_81281C4
str r0, [sp, 0x4]
ldr r0, _081281C0 @ =gUnknown_30030F0
ldr r0, _081281C0 @ =gMain
ldr r0, [r0, 0x8]
str r0, [sp, 0x8]
movs r0, 0x5
@@ -19075,7 +19075,7 @@ sub_8128198: @ 8128198
bx r0
.align 2, 0
_081281BC: .4byte sub_81281C4
_081281C0: .4byte gUnknown_30030F0
_081281C0: .4byte gMain
thumb_func_end sub_8128198
thumb_func_start sub_81281C4
asm/play_time.s
+8 -8
View File
@@ -10,7 +10,7 @@ PlayTimeCounter_Reset: @ 8054814
ldr r1, _08054830 @ =gUnknown_3000E7C
movs r0, 0
strb r0, [r1]
ldr r2, _08054834 @ =gUnknown_300500C
ldr r2, _08054834 @ =gSaveBlock2Ptr
ldr r3, [r2]
movs r1, 0
movs r0, 0
@@ -23,7 +23,7 @@ PlayTimeCounter_Reset: @ 8054814
bx lr
.align 2, 0
_08054830: .4byte gUnknown_3000E7C
_08054834: .4byte gUnknown_300500C
_08054834: .4byte gSaveBlock2Ptr
thumb_func_end PlayTimeCounter_Reset
thumb_func_start PlayTimeCounter_Start
@@ -32,7 +32,7 @@ PlayTimeCounter_Start: @ 8054838
ldr r1, _08054854 @ =gUnknown_3000E7C
movs r0, 0x1
strb r0, [r1]
ldr r0, _08054858 @ =gUnknown_300500C
ldr r0, _08054858 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrh r1, [r0, 0xE]
ldr r0, _0805485C @ =0x000003e7
@@ -44,7 +44,7 @@ _08054850:
bx r0
.align 2, 0
_08054854: .4byte gUnknown_3000E7C
_08054858: .4byte gUnknown_300500C
_08054858: .4byte gSaveBlock2Ptr
_0805485C: .4byte 0x000003e7
thumb_func_end PlayTimeCounter_Start
@@ -65,7 +65,7 @@ PlayTimeCounter_Update: @ 805486C
ldrb r0, [r0]
cmp r0, 0x1
bne _080548C4
ldr r2, _080548CC @ =gUnknown_300500C
ldr r2, _080548CC @ =gSaveBlock2Ptr
ldr r0, [r2]
ldrb r1, [r0, 0x12]
adds r1, 0x1
@@ -108,7 +108,7 @@ _080548C4:
bx r0
.align 2, 0
_080548C8: .4byte gUnknown_3000E7C
_080548CC: .4byte gUnknown_300500C
_080548CC: .4byte gSaveBlock2Ptr
_080548D0: .4byte 0x03e70000
thumb_func_end PlayTimeCounter_Update
@@ -117,7 +117,7 @@ PlayTimeCounter_SetToMax: @ 80548D4
ldr r1, _080548F0 @ =gUnknown_3000E7C
movs r0, 0x2
strb r0, [r1]
ldr r2, _080548F4 @ =gUnknown_300500C
ldr r2, _080548F4 @ =gSaveBlock2Ptr
ldr r3, [r2]
ldr r0, _080548F8 @ =0x000003e7
strh r0, [r3, 0xE]
@@ -130,7 +130,7 @@ PlayTimeCounter_SetToMax: @ 80548D4
bx lr
.align 2, 0
_080548F0: .4byte gUnknown_3000E7C
_080548F4: .4byte gUnknown_300500C
_080548F4: .4byte gSaveBlock2Ptr
_080548F8: .4byte 0x000003e7
thumb_func_end PlayTimeCounter_SetToMax
asm/player_pc.s
+12 -12
View File
@@ -535,7 +535,7 @@ sub_80EBAB8: @ 80EBAB8
lsls r0, 24
lsrs r5, r0, 24
adds r4, r5, 0
ldr r2, _080EBAE4 @ =gUnknown_30030F0
ldr r2, _080EBAE4 @ =gMain
ldrh r1, [r2, 0x30]
movs r0, 0x40
ands r0, r1
@@ -551,7 +551,7 @@ sub_80EBAB8: @ 80EBAB8
negs r0, r0
b _080EBB04
.align 2, 0
_080EBAE4: .4byte gUnknown_30030F0
_080EBAE4: .4byte gMain
_080EBAE8:
movs r0, 0x80
ands r0, r1
@@ -922,7 +922,7 @@ sub_80EBDC8: @ 80EBDC8
push {r4,lr}
movs r2, 0
movs r1, 0x6
ldr r0, _080EBDFC @ =gUnknown_3005008
ldr r0, _080EBDFC @ =gSaveBlock1Ptr
ldr r3, [r0]
ldr r4, _080EBE00 @ =0x00002cf0
_080EBDD4:
@@ -948,7 +948,7 @@ _080EBDEA:
pop {r1}
bx r1
.align 2, 0
_080EBDFC: .4byte gUnknown_3005008
_080EBDFC: .4byte gSaveBlock1Ptr
_080EBE00: .4byte 0x00002cf0
thumb_func_end sub_80EBDC8
@@ -968,7 +968,7 @@ _080EBE12:
mov r8, r1
cmp r4, 0xF
bhi _080EBE8A
ldr r0, _080EBEA4 @ =gUnknown_3005008
ldr r0, _080EBEA4 @ =gSaveBlock1Ptr
mov r10, r0
lsls r0, r2, 3
adds r0, r2
@@ -1039,7 +1039,7 @@ _080EBE8A:
pop {r0}
bx r0
.align 2, 0
_080EBEA4: .4byte gUnknown_3005008
_080EBEA4: .4byte gSaveBlock1Ptr
_080EBEA8: .4byte 0x00002cd0
_080EBEAC: .4byte 0x00002cf0
thumb_func_end sub_80EBE04
@@ -1203,7 +1203,7 @@ sub_80EBFFC: @ 80EBFFC
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _080EC054 @ =gUnknown_2021CD0
ldr r2, _080EC058 @ =gUnknown_3005008
ldr r2, _080EC058 @ =gSaveBlock1Ptr
ldr r1, _080EC05C @ =gUnknown_203AAC4
ldrh r0, [r1]
adds r0, 0x6
@@ -1244,7 +1244,7 @@ _080EC044:
b _080EC06C
.align 2, 0
_080EC054: .4byte gUnknown_2021CD0
_080EC058: .4byte gUnknown_3005008
_080EC058: .4byte gSaveBlock1Ptr
_080EC05C: .4byte gUnknown_203AAC4
_080EC060: .4byte 0x00002ce2
_080EC064:
@@ -1439,7 +1439,7 @@ sub_80EC1D4: @ 80EC1D4
bne _080EC216
bl sub_810EDB0
bl sub_80563F0
ldr r2, _080EC220 @ =gUnknown_3005008
ldr r2, _080EC220 @ =gSaveBlock1Ptr
ldr r1, _080EC224 @ =gUnknown_203AAC4
ldrh r0, [r1]
adds r0, 0x6
@@ -1463,7 +1463,7 @@ _080EC216:
bx r0
.align 2, 0
_080EC21C: .4byte gUnknown_2037AB8
_080EC220: .4byte gUnknown_3005008
_080EC220: .4byte gSaveBlock1Ptr
_080EC224: .4byte gUnknown_203AAC4
_080EC228: .4byte 0x00002cd0
_080EC22C: .4byte sub_80EC2C0
@@ -1634,7 +1634,7 @@ sub_80EC364: @ 80EC364
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r2, _080EC3A0 @ =gUnknown_3005008
ldr r2, _080EC3A0 @ =gSaveBlock1Ptr
ldr r4, _080EC3A4 @ =gUnknown_203AAC4
ldrh r1, [r4]
adds r1, 0x6
@@ -1660,7 +1660,7 @@ sub_80EC364: @ 80EC364
bl DisplayItemMessageOnField
b _080EC3EA
.align 2, 0
_080EC3A0: .4byte gUnknown_3005008
_080EC3A0: .4byte gSaveBlock1Ptr
_080EC3A4: .4byte gUnknown_203AAC4
_080EC3A8: .4byte 0x00002cd0
_080EC3AC: .4byte gUnknown_8417858
asm/pokeball.s
+6 -6
View File
@@ -146,7 +146,7 @@ _0804AA54: .4byte gUnknown_2024284
_0804AA58: .4byte gUnknown_2022B4C
_0804AA5C: .4byte gUnknown_202273C
_0804AA60:
ldr r0, _0804AAB8 @ =gUnknown_300500C
ldr r0, _0804AAB8 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
mov r10, r0
@@ -190,7 +190,7 @@ _0804AA68:
movs r4, 0x40
b _0804AACE
.align 2, 0
_0804AAB8: .4byte gUnknown_300500C
_0804AAB8: .4byte gSaveBlock2Ptr
_0804AABC: .4byte gUnknown_82606F4
_0804AAC0: .4byte gUnknown_202063C
_0804AAC4: .4byte gUnknown_2022B4C
@@ -1202,7 +1202,7 @@ sub_804B268: @ 804B268
strh r0, [r6, 0x2E]
ldr r0, _0804B2FC @ =HandleBallAnimEnd
str r0, [r6, 0x1C]
ldr r0, _0804B300 @ =gUnknown_30030F0
ldr r0, _0804B300 @ =gMain
ldr r1, _0804B304 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -1230,7 +1230,7 @@ _0804B2DA:
b _0804B324
.align 2, 0
_0804B2FC: .4byte HandleBallAnimEnd
_0804B300: .4byte gUnknown_30030F0
_0804B300: .4byte gMain
_0804B304: .4byte 0x00000439
_0804B308: .4byte gUnknown_2023BCE
_0804B30C: .4byte gUnknown_202402C
@@ -1631,7 +1631,7 @@ _0804B600:
bl DestroySprite
adds r0, r6, 0
bl DestroySpriteAndFreeResources
ldr r0, _0804B678 @ =gUnknown_30030F0
ldr r0, _0804B678 @ =gMain
ldr r1, _0804B67C @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -1659,7 +1659,7 @@ _0804B666:
_0804B66C: .4byte 0x0000013b
_0804B670: .4byte gUnknown_202063C
_0804B674: .4byte gUnknown_2023D44
_0804B678: .4byte gUnknown_30030F0
_0804B678: .4byte gMain
_0804B67C: .4byte 0x00000439
_0804B680: .4byte gUnknown_2024018
thumb_func_end sub_804B5C8
asm/pokedex_screen.s
+54 -54
View File
@@ -320,7 +320,7 @@ _08102794: .4byte sub_81024D4
sub_8102798: @ 8102798
push {r4,lr}
sub sp, 0x4
ldr r0, _081027B4 @ =gUnknown_30030F0
ldr r0, _081027B4 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r4, r0, r1
@@ -333,7 +333,7 @@ sub_8102798: @ 8102798
beq _081027BE
b _0810284A
.align 2, 0
_081027B4: .4byte gUnknown_30030F0
_081027B4: .4byte gMain
_081027B8:
cmp r1, 0x2
beq _081027F2
@@ -628,7 +628,7 @@ _08102A14:
adds r1, 0x62
movs r2, 0
bl get_coro_args_x18_x1A
ldr r0, _08102A4C @ =gUnknown_30030F0
ldr r0, _08102A4C @ =gMain
ldrh r1, [r0, 0x2E]
movs r3, 0x1
movs r0, 0x1
@@ -645,7 +645,7 @@ _08102A14:
bls _08102A62
b _08102AA4
.align 2, 0
_08102A4C: .4byte gUnknown_30030F0
_08102A4C: .4byte gMain
_08102A50:
cmp r1, 0xE
beq _08102AA4
@@ -1386,7 +1386,7 @@ _08103098:
adds r1, 0x62
movs r2, 0
bl get_coro_args_x18_x1A
ldr r0, _081030F0 @ =gUnknown_30030F0
ldr r0, _081030F0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r3, 0x1
adds r0, r3, 0
@@ -1416,7 +1416,7 @@ _08103098:
movs r0, 0x7
b _0810316A
.align 2, 0
_081030F0: .4byte gUnknown_30030F0
_081030F0: .4byte gMain
_081030F4: .4byte 0xffff7fff
_081030F8: .4byte 0x0000ffff
_081030FC:
@@ -1707,7 +1707,7 @@ _08103362:
adds r1, 0x62
movs r2, 0
bl get_coro_args_x18_x1A
ldr r0, _081033C4 @ =gUnknown_30030F0
ldr r0, _081033C4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r2, 0x1
adds r0, r2, 0
@@ -1742,7 +1742,7 @@ _08103362:
strb r0, [r1, 0x1]
b _0810344C
.align 2, 0
_081033C4: .4byte gUnknown_30030F0
_081033C4: .4byte gMain
_081033C8: .4byte 0xffff7fff
_081033CC: .4byte 0x0000ffff
_081033D0:
@@ -2811,7 +2811,7 @@ _08103C84:
adds r1, 0x62
strh r0, [r1]
movs r4, 0
ldr r0, _08103CF8 @ =gUnknown_30030F0
ldr r0, _08103CF8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -2843,9 +2843,9 @@ _08103C84:
movs r0, 0xC
b _08104226
.align 2, 0
_08103CF8: .4byte gUnknown_30030F0
_08103CF8: .4byte gMain
_08103CFC:
ldr r2, _08103D28 @ =gUnknown_30030F0
ldr r2, _08103D28 @ =gMain
ldrh r1, [r2, 0x2C]
movs r0, 0x80
lsls r0, 1
@@ -2868,7 +2868,7 @@ _08103CFC:
strb r0, [r1]
b _08103D60
.align 2, 0
_08103D28: .4byte gUnknown_30030F0
_08103D28: .4byte gMain
_08103D2C: .4byte gUnknown_203ACF0
_08103D30:
movs r4, 0x1
@@ -3024,7 +3024,7 @@ _08103E4A:
movs r0, 0x6
strb r0, [r1, 0x1]
_08103E4E:
ldr r0, _08103E68 @ =gUnknown_30030F0
ldr r0, _08103E68 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -3038,7 +3038,7 @@ _08103E5C:
b _08104226
.align 2, 0
_08103E64: .4byte gUnknown_203ACF0
_08103E68: .4byte gUnknown_30030F0
_08103E68: .4byte gMain
_08103E6C:
ldr r0, [r5]
adds r0, 0x60
@@ -3224,7 +3224,7 @@ _08103FA8:
movs r0, 0x11
b _08104226
_08103FF0:
ldr r0, _08104024 @ =gUnknown_30030F0
ldr r0, _08104024 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3247,7 +3247,7 @@ _08103FF0:
movs r0, 0x15
b _08104226
.align 2, 0
_08104024: .4byte gUnknown_30030F0
_08104024: .4byte gMain
_08104028: .4byte gUnknown_203ACF0
_0810402C:
movs r0, 0x2
@@ -3361,7 +3361,7 @@ _081040F4:
.align 2, 0
_08104114: .4byte gUnknown_203ACF0
_08104118:
ldr r0, _08104174 @ =gUnknown_30030F0
ldr r0, _08104174 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3401,7 +3401,7 @@ _08104118:
movs r0, 0x1A
b _08104226
.align 2, 0
_08104174: .4byte gUnknown_30030F0
_08104174: .4byte gMain
_08104178: .4byte gUnknown_203ACF0
_0810417C:
movs r0, 0x2
@@ -3532,7 +3532,7 @@ _08104280: .4byte gUnknown_203ACF0
thumb_func_start sub_8104284
sub_8104284: @ 8104284
push {lr}
ldr r0, _081042B0 @ =gUnknown_300500C
ldr r0, _081042B0 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x1
@@ -3541,7 +3541,7 @@ sub_8104284: @ 8104284
ble _081042E6
cmp r0, 0x2
bne _081042E6
ldr r0, _081042B4 @ =gUnknown_30030F0
ldr r0, _081042B4 @ =gMain
ldr r2, [r0, 0x2C]
ldr r1, _081042B8 @ =0x00200100
adds r0, r2, 0
@@ -3554,12 +3554,12 @@ sub_8104284: @ 8104284
beq _081042E2
b _081042E6
.align 2, 0
_081042B0: .4byte gUnknown_300500C
_081042B4: .4byte gUnknown_30030F0
_081042B0: .4byte gSaveBlock2Ptr
_081042B4: .4byte gMain
_081042B8: .4byte 0x00200100
_081042BC: .4byte 0x00100100
_081042C0:
ldr r0, _081042D4 @ =gUnknown_30030F0
ldr r0, _081042D4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x80
lsls r0, 2
@@ -3570,7 +3570,7 @@ _081042CE:
movs r0, 0x1
b _081042E8
.align 2, 0
_081042D4: .4byte gUnknown_30030F0
_081042D4: .4byte gMain
_081042D8:
movs r0, 0x80
lsls r0, 1
@@ -3712,7 +3712,7 @@ _0810440C: .4byte 0xffff7fff
_08104410: .4byte 0x0000ffff
_08104414: .4byte gUnknown_203ACF0
_08104418:
ldr r0, _0810444C @ =gUnknown_30030F0
ldr r0, _0810444C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3735,7 +3735,7 @@ _08104418:
movs r0, 0x7
b _08104654
.align 2, 0
_0810444C: .4byte gUnknown_30030F0
_0810444C: .4byte gMain
_08104450: .4byte gUnknown_203ACF0
_08104454:
movs r0, 0x2
@@ -3784,7 +3784,7 @@ _081044B4: .4byte 0xffff7fff
_081044B8: .4byte 0x0000ffff
_081044BC: .4byte gUnknown_203ACF0
_081044C0:
ldr r0, _081044F8 @ =gUnknown_30030F0
ldr r0, _081044F8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x80
ands r0, r1
@@ -3811,7 +3811,7 @@ _081044DA:
movs r0, 0x6
b _08104654
.align 2, 0
_081044F8: .4byte gUnknown_30030F0
_081044F8: .4byte gMain
_081044FC: .4byte 0xffff7fff
_08104500: .4byte 0x0000ffff
_08104504: .4byte gUnknown_203ACF0
@@ -3854,7 +3854,7 @@ _08104538:
.align 2, 0
_08104558: .4byte gUnknown_203ACF0
_0810455C:
ldr r0, _08104580 @ =gUnknown_30030F0
ldr r0, _08104580 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3872,7 +3872,7 @@ _0810455C:
movs r0, 0xC
b _08104654
.align 2, 0
_08104580: .4byte gUnknown_30030F0
_08104580: .4byte gMain
_08104584: .4byte 0xffff7fff
_08104588: .4byte 0x0000ffff
_0810458C: .4byte gUnknown_203ACF0
@@ -4448,19 +4448,19 @@ sub_81049CC: @ 81049CC
lsls r0, 1
cmp r1, r0
bne _081049F4
ldr r0, _081049E4 @ =gUnknown_300500C
ldr r0, _081049E4 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r0, [r0, 0x20]
b _081049F6
.align 2, 0
_081049E4: .4byte gUnknown_300500C
_081049E4: .4byte gSaveBlock2Ptr
_081049E8:
ldr r0, _081049F0 @ =gUnknown_300500C
ldr r0, _081049F0 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r0, [r0, 0x1C]
b _081049F6
.align 2, 0
_081049F0: .4byte gUnknown_300500C
_081049F0: .4byte gSaveBlock2Ptr
_081049F4:
movs r0, 0
_081049F6:
@@ -4604,7 +4604,7 @@ _08104AF4:
beq _08104BA0
b _08104BB0
_08104AFE:
ldr r0, _08104B10 @ =gUnknown_300500C
ldr r0, _08104B10 @ =gSaveBlock2Ptr
ldr r0, [r0]
adds r0, 0x5C
adds r0, r4
@@ -4614,9 +4614,9 @@ _08104AFE:
beq _08104BB0
b _08104B34
.align 2, 0
_08104B10: .4byte gUnknown_300500C
_08104B10: .4byte gSaveBlock2Ptr
_08104B14:
ldr r0, _08104B5C @ =gUnknown_300500C
ldr r0, _08104B5C @ =gSaveBlock2Ptr
ldr r2, [r0]
adds r0, r2, 0
adds r0, 0x28
@@ -4633,7 +4633,7 @@ _08104B14:
cmp r1, r0
bne _08104BB0
_08104B34:
ldr r0, _08104B60 @ =gUnknown_3005008
ldr r0, _08104B60 @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r3, 0xBF
lsls r3, 3
@@ -4654,11 +4654,11 @@ _08104B34:
mov r12, r0
b _08104BB0
.align 2, 0
_08104B5C: .4byte gUnknown_300500C
_08104B60: .4byte gUnknown_3005008
_08104B5C: .4byte gSaveBlock2Ptr
_08104B60: .4byte gSaveBlock1Ptr
_08104B64: .4byte 0x00003a18
_08104B68:
ldr r0, _08104B94 @ =gUnknown_300500C
ldr r0, _08104B94 @ =gSaveBlock2Ptr
ldr r1, [r0]
adds r1, 0x5C
adds r1, r4
@@ -4666,7 +4666,7 @@ _08104B68:
adds r0, r6, 0
orrs r0, r2
strb r0, [r1]
ldr r3, _08104B98 @ =gUnknown_3005008
ldr r3, _08104B98 @ =gSaveBlock1Ptr
ldr r1, [r3]
movs r0, 0xBF
lsls r0, 3
@@ -4681,11 +4681,11 @@ _08104B68:
adds r1, r3
b _08104BA6
.align 2, 0
_08104B94: .4byte gUnknown_300500C
_08104B98: .4byte gUnknown_3005008
_08104B94: .4byte gSaveBlock2Ptr
_08104B98: .4byte gSaveBlock1Ptr
_08104B9C: .4byte 0x00003a18
_08104BA0:
ldr r0, _08104BB8 @ =gUnknown_300500C
ldr r0, _08104BB8 @ =gSaveBlock2Ptr
ldr r1, [r0]
adds r1, 0x28
_08104BA6:
@@ -4700,7 +4700,7 @@ _08104BB0:
pop {r1}
bx r1
.align 2, 0
_08104BB8: .4byte gUnknown_300500C
_08104BB8: .4byte gSaveBlock2Ptr
thumb_func_end sub_8104AB0
thumb_func_start sub_8104BBC
@@ -7888,7 +7888,7 @@ _08106534:
movs r2, 0
movs r3, 0
bl SetOamMatrix
ldr r0, _081066CC @ =gUnknown_300500C
ldr r0, _081066CC @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
movs r1, 0x1
@@ -7980,7 +7980,7 @@ _081066BC: .4byte gUnknown_8452368
_081066C0: .4byte 0x0000ffff
_081066C4: .4byte gUnknown_202063C
_081066C8: .4byte gUnknown_844E850
_081066CC: .4byte gUnknown_300500C
_081066CC: .4byte gSaveBlock2Ptr
_081066D0:
ldr r0, [r7]
adds r0, 0x58
@@ -8574,7 +8574,7 @@ _08106B30: .4byte gUnknown_203ACF0
thumb_func_start sub_8106B34
sub_8106B34: @ 8106B34
push {lr}
ldr r0, _08106B58 @ =gUnknown_30030F0
ldr r0, _08106B58 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x8
ands r0, r1
@@ -8592,7 +8592,7 @@ _08106B54:
pop {r0}
bx r0
.align 2, 0
_08106B58: .4byte gUnknown_30030F0
_08106B58: .4byte gMain
_08106B5C: .4byte gUnknown_203ACF0
thumb_func_end sub_8106B34
@@ -8719,7 +8719,7 @@ _08106C5C:
_08106C62:
bl sub_8106014
bl sub_8104E90
ldr r0, _08106C7C @ =gUnknown_30030F0
ldr r0, _08106C7C @ =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -8729,7 +8729,7 @@ _08106C62:
ldr r1, [r0]
b _08106E66
.align 2, 0
_08106C7C: .4byte gUnknown_30030F0
_08106C7C: .4byte gMain
_08106C80: .4byte gUnknown_203ACF0
_08106C84:
bl sub_8102798
@@ -8946,7 +8946,7 @@ _08106E10:
movs r0, 0xB
b _08106E68
_08106E58:
ldr r0, _08106E74 @ =gUnknown_30030F0
ldr r0, _08106E74 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -8963,7 +8963,7 @@ _08106E6A:
pop {r0}
bx r0
.align 2, 0
_08106E74: .4byte gUnknown_30030F0
_08106E74: .4byte gMain
thumb_func_end sub_8106BE8
thumb_func_start sub_8106E78
asm/pokemon_1.s
+7 -7
View File
@@ -262,7 +262,7 @@ _0803DB6C:
str r0, [sp, 0x18]
b _0803DB92
_0803DB78:
ldr r0, _0803DCBC @ =gUnknown_300500C
ldr r0, _0803DCBC @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r1, [r2, 0xA]
ldrb r0, [r2, 0xB]
@@ -296,11 +296,11 @@ _0803DB92:
movs r1, 0x2
mov r2, sp
bl sub_80404D0
ldr r2, _0803DCC0 @ =gUnknown_81E9F11
ldr r2, _0803DCC0 @ =gGameLanguage
adds r0, r7, 0
movs r1, 0x3
bl sub_80404D0
ldr r5, _0803DCBC @ =gUnknown_300500C
ldr r5, _0803DCBC @ =gSaveBlock2Ptr
ldr r2, [r5]
adds r0, r7, 0
movs r1, 0x7
@@ -353,7 +353,7 @@ _0803DB92:
movs r1, 0x24
add r2, sp, 0x10
bl sub_80404D0
ldr r2, _0803DCCC @ =gUnknown_81E9F10
ldr r2, _0803DCCC @ =gGameVersion
adds r0, r7, 0
movs r1, 0x25
bl sub_80404D0
@@ -403,11 +403,11 @@ _0803DB92:
bl sub_80404D0
b _0803DD58
.align 2, 0
_0803DCBC: .4byte gUnknown_300500C
_0803DCC0: .4byte gUnknown_81E9F11
_0803DCBC: .4byte gSaveBlock2Ptr
_0803DCC0: .4byte gGameLanguage
_0803DCC4: .4byte gUnknown_8254784
_0803DCC8: .4byte gUnknown_8253AE4
_0803DCCC: .4byte gUnknown_81E9F10
_0803DCCC: .4byte gGameVersion
_0803DCD0:
bl Random
lsls r0, 16
asm/pokemon_2.s
+2 -2
View File
@@ -2797,7 +2797,7 @@ CopyMon: @ 8040B08
GiveMonToPlayer: @ 8040B14
push {r4-r6,lr}
adds r6, r0, 0
ldr r4, _08040B40 @ =gUnknown_300500C
ldr r4, _08040B40 @ =gSaveBlock2Ptr
ldr r2, [r4]
movs r1, 0x7
bl sub_804037C
@@ -2814,7 +2814,7 @@ GiveMonToPlayer: @ 8040B14
movs r5, 0
b _08040B46
.align 2, 0
_08040B40: .4byte gUnknown_300500C
_08040B40: .4byte gSaveBlock2Ptr
_08040B44:
adds r5, 0x1
_08040B46:
asm/pokemon_3.s
+39 -39
View File
@@ -28,7 +28,7 @@ sub_80423A4: @ 80423A4
movs r1, 0x37
mov r2, sp
bl sub_804037C
ldr r0, _080423FC @ =gUnknown_30030F0
ldr r0, _080423FC @ =gMain
ldr r1, _08042400 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -50,7 +50,7 @@ _080423F6:
movs r0, 0
b _0804240A
.align 2, 0
_080423FC: .4byte gUnknown_30030F0
_080423FC: .4byte gMain
_08042400: .4byte 0x00000439
_08042404: .4byte gUnknown_2023BE4
_08042408:
@@ -101,7 +101,7 @@ _08042458:
ldr r0, _080424B4 @ =gUnknown_2024004
ldrb r2, [r0]
strb r2, [r1]
ldr r0, _080424B8 @ =gUnknown_30030F0
ldr r0, _080424B8 @ =gMain
ldr r1, _080424BC @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -143,7 +143,7 @@ _08042458:
.align 2, 0
_080424B0: .4byte gUnknown_2023D6F
_080424B4: .4byte gUnknown_2024004
_080424B8: .4byte gUnknown_30030F0
_080424B8: .4byte gMain
_080424BC: .4byte 0x00000439
_080424C0: .4byte gUnknown_2023BC4
_080424C4: .4byte gUnknown_2023BCC
@@ -200,7 +200,7 @@ _08042528:
cmp r2, 0xAF
bne _0804257C
_0804252E:
ldr r0, _08042550 @ =gUnknown_30030F0
ldr r0, _08042550 @ =gMain
ldr r1, _08042554 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -217,19 +217,19 @@ _0804252E:
adds r0, r1
b _0804257C
.align 2, 0
_08042550: .4byte gUnknown_30030F0
_08042550: .4byte gMain
_08042554: .4byte 0x00000439
_08042558: .4byte gUnknown_2023BC4
_0804255C: .4byte gUnknown_2023F5C
_08042560:
ldr r0, _0804256C @ =gUnknown_3005008
ldr r0, _0804256C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, _08042570 @ =0x00003108
adds r2, r0, r2
str r2, [sp, 0x14]
b _0804257E
.align 2, 0
_0804256C: .4byte gUnknown_3005008
_0804256C: .4byte gSaveBlock1Ptr
_08042570: .4byte 0x00003108
_08042574:
movs r0, 0
@@ -273,7 +273,7 @@ _080425B0:
adds r5, r2, 0
cmp r0, 0
beq _080425F4
ldr r0, _0804263C @ =gUnknown_30030F0
ldr r0, _0804263C @ =gMain
ldr r2, _08042640 @ =0x00000439
adds r0, r2
ldrb r1, [r0]
@@ -338,7 +338,7 @@ _08042628:
asrs r0, 24
b _080426F2
.align 2, 0
_0804263C: .4byte gUnknown_30030F0
_0804263C: .4byte gMain
_08042640: .4byte 0x00000439
_08042644: .4byte gUnknown_2023BE4
_08042648: .4byte gUnknown_2023BC4
@@ -568,7 +568,7 @@ _080427F6:
bne _08042802
b _08042BCA
_08042802:
ldr r0, _08042844 @ =gUnknown_30030F0
ldr r0, _08042844 @ =gMain
ldr r1, _08042848 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -602,7 +602,7 @@ _08042832:
_08042838: .4byte gUnknown_2023DE4
_0804283C: .4byte gUnknown_2023BC4
_08042840: .4byte 0x00000f88
_08042844: .4byte gUnknown_30030F0
_08042844: .4byte gMain
_08042848: .4byte 0x00000439
_0804284C: .4byte gUnknown_2023BE4
_08042850:
@@ -1306,7 +1306,7 @@ sub_8042DA4: @ 8042DA4
lsrs r0, 16
cmp r0, 0xAF
bne _08042DF8
ldr r0, _08042DD4 @ =gUnknown_30030F0
ldr r0, _08042DD4 @ =gMain
ldr r1, _08042DD8 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -1323,18 +1323,18 @@ sub_8042DA4: @ 8042DA4
adds r7, r0, r1
b _08042E04
.align 2, 0
_08042DD4: .4byte gUnknown_30030F0
_08042DD4: .4byte gMain
_08042DD8: .4byte 0x00000439
_08042DDC: .4byte gUnknown_2024004
_08042DE0: .4byte gUnknown_2023F5C
_08042DE4:
ldr r0, _08042DF0 @ =gUnknown_3005008
ldr r0, _08042DF0 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08042DF4 @ =0x00003108
adds r7, r0, r1
b _08042E02
.align 2, 0
_08042DF0: .4byte gUnknown_3005008
_08042DF0: .4byte gSaveBlock1Ptr
_08042DF4: .4byte 0x00003108
_08042DF8:
ldr r1, _08042E3C @ =gUnknown_82528BC
@@ -1486,14 +1486,14 @@ sub_8042EC4: @ 8042EC4
ldrh r0, [r0]
cmp r0, 0xAF
bne _08042F38
ldr r0, _08042F30 @ =gUnknown_3005008
ldr r0, _08042F30 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08042F34 @ =0x0000311a
adds r0, r1
ldrb r0, [r0]
b _08042F40
.align 2, 0
_08042F30: .4byte gUnknown_3005008
_08042F30: .4byte gSaveBlock1Ptr
_08042F34: .4byte 0x0000311a
_08042F38:
bl ItemId_GetHoldEffect
@@ -2598,7 +2598,7 @@ sub_80436F8: @ 80436F8
lsrs r0, 16
cmp r0, 0xAF
bne _08043758
ldr r0, _08043738 @ =gUnknown_30030F0
ldr r0, _08043738 @ =gMain
ldr r1, _0804373C @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -2610,18 +2610,18 @@ sub_80436F8: @ 80436F8
ldrb r4, [r0, 0x7]
b _08043760
.align 2, 0
_08043738: .4byte gUnknown_30030F0
_08043738: .4byte gMain
_0804373C: .4byte 0x00000439
_08043740: .4byte gUnknown_2023F54
_08043744:
ldr r0, _08043750 @ =gUnknown_3005008
ldr r0, _08043750 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08043754 @ =0x0000311a
adds r0, r1
ldrb r4, [r0]
b _08043760
.align 2, 0
_08043750: .4byte gUnknown_3005008
_08043750: .4byte gSaveBlock1Ptr
_08043754: .4byte 0x0000311a
_08043758:
bl ItemId_GetHoldEffect
@@ -2917,7 +2917,7 @@ _0804397C:
lsrs r0, 16
cmp r0, 0xAF
bne _080439C8
ldr r0, _080439A8 @ =gUnknown_30030F0
ldr r0, _080439A8 @ =gMain
ldr r1, _080439AC @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -2930,18 +2930,18 @@ _0804397C:
b _080439D0
.align 2, 0
_080439A4: .4byte gUnknown_8254784
_080439A8: .4byte gUnknown_30030F0
_080439A8: .4byte gMain
_080439AC: .4byte 0x00000439
_080439B0: .4byte gUnknown_2023F54
_080439B4:
ldr r0, _080439C0 @ =gUnknown_3005008
ldr r0, _080439C0 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, _080439C4 @ =0x0000311a
adds r0, r2
ldrb r0, [r0]
b _080439D0
.align 2, 0
_080439C0: .4byte gUnknown_3005008
_080439C0: .4byte gSaveBlock1Ptr
_080439C4: .4byte 0x0000311a
_080439C8:
bl ItemId_GetHoldEffect
@@ -4155,7 +4155,7 @@ IsTradedMon: @ 804425C
IsOtherTrainer: @ 8044288
push {r4,r5,lr}
adds r5, r1, 0
ldr r1, _080442CC @ =gUnknown_300500C
ldr r1, _080442CC @ =gSaveBlock2Ptr
ldr r3, [r1]
ldrb r2, [r3, 0xA]
ldrb r1, [r3, 0xB]
@@ -4189,7 +4189,7 @@ _080442C6:
movs r0, 0
b _080442D2
.align 2, 0
_080442CC: .4byte gUnknown_300500C
_080442CC: .4byte gSaveBlock2Ptr
_080442D0:
movs r0, 0x1
_080442D2:
@@ -4557,7 +4557,7 @@ _08044590:
ands r0, r1
cmp r0, 0
beq _08044632
ldr r0, _080445B4 @ =gUnknown_30030F0
ldr r0, _080445B4 @ =gMain
ldr r1, _080445B8 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -4568,7 +4568,7 @@ _08044590:
b _0804461A
.align 2, 0
_080445B0: .4byte gUnknown_2022B4C
_080445B4: .4byte gUnknown_30030F0
_080445B4: .4byte gMain
_080445B8: .4byte 0x00000439
_080445BC:
ldr r0, _080445E8 @ =gUnknown_2022B4C
@@ -4577,7 +4577,7 @@ _080445BC:
ands r0, r1
cmp r0, 0
beq _08044632
ldr r0, _080445EC @ =gUnknown_30030F0
ldr r0, _080445EC @ =gMain
ldr r1, _080445F0 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -4594,7 +4594,7 @@ _080445BC:
b _08044632
.align 2, 0
_080445E8: .4byte gUnknown_2022B4C
_080445EC: .4byte gUnknown_30030F0
_080445EC: .4byte gMain
_080445F0: .4byte 0x00000439
_080445F4:
ldr r0, _08044638 @ =gUnknown_2022B4C
@@ -4604,7 +4604,7 @@ _080445F4:
ands r0, r3
cmp r0, 0
beq _08044648
ldr r0, _0804463C @ =gUnknown_30030F0
ldr r0, _0804463C @ =gMain
ldr r1, _08044640 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -4633,11 +4633,11 @@ _08044632:
b _08044666
.align 2, 0
_08044638: .4byte gUnknown_2022B4C
_0804463C: .4byte gUnknown_30030F0
_0804463C: .4byte gMain
_08044640: .4byte 0x00000439
_08044644: .4byte gUnknown_202273C
_08044648:
ldr r0, _0804466C @ =gUnknown_30030F0
ldr r0, _0804466C @ =gMain
ldr r1, _08044670 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -4658,7 +4658,7 @@ _08044666:
pop {r1}
bx r1
.align 2, 0
_0804466C: .4byte gUnknown_30030F0
_0804466C: .4byte gMain
_08044670: .4byte 0x00000439
thumb_func_end sub_804455C
@@ -4960,7 +4960,7 @@ sub_8044898: @ 8044898
lsrs r0, 16
cmp r0, 0xC9
bne _080448D8
ldr r0, _080448F4 @ =gUnknown_300500C
ldr r0, _080448F4 @ =gSaveBlock2Ptr
ldr r0, [r0]
str r7, [r0, 0x1C]
_080448D8:
@@ -4971,7 +4971,7 @@ _080448D8:
lsls r1, 17
cmp r0, r1
bne _080448EE
ldr r0, _080448F4 @ =gUnknown_300500C
ldr r0, _080448F4 @ =gSaveBlock2Ptr
ldr r0, [r0]
str r7, [r0, 0x20]
_080448EE:
@@ -4979,7 +4979,7 @@ _080448EE:
pop {r0}
bx r0
.align 2, 0
_080448F4: .4byte gUnknown_300500C
_080448F4: .4byte gSaveBlock2Ptr
thumb_func_end sub_8044898
thumb_func_start sub_80448F8
asm/pokemon_item_effect.s
+22 -22
View File
@@ -63,7 +63,7 @@ sub_80413E4: @ 80413E4
lsrs r0, 16
cmp r0, 0xAF
bne _08041474
ldr r0, _08041450 @ =gUnknown_30030F0
ldr r0, _08041450 @ =gMain
ldr r4, _08041454 @ =0x00000439
adds r0, r4
ldrb r1, [r0]
@@ -81,19 +81,19 @@ sub_80413E4: @ 80413E4
ldrb r0, [r0, 0x7]
b _0804147C
.align 2, 0
_08041450: .4byte gUnknown_30030F0
_08041450: .4byte gMain
_08041454: .4byte 0x00000439
_08041458: .4byte gUnknown_2023F54
_0804145C: .4byte gUnknown_2024004
_08041460:
ldr r0, _0804146C @ =gUnknown_3005008
ldr r0, _0804146C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r5, _08041470 @ =0x0000311a
adds r0, r5
ldrb r0, [r0]
b _0804147C
.align 2, 0
_0804146C: .4byte gUnknown_3005008
_0804146C: .4byte gSaveBlock1Ptr
_08041470: .4byte 0x0000311a
_08041474:
bl ItemId_GetHoldEffect
@@ -105,7 +105,7 @@ _0804147C:
ldr r0, _080414DC @ =gUnknown_2024004
ldrb r2, [r0]
strb r2, [r1]
ldr r0, _080414E0 @ =gUnknown_30030F0
ldr r0, _080414E0 @ =gMain
ldr r1, _080414E4 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -147,7 +147,7 @@ _0804147C:
.align 2, 0
_080414D8: .4byte gUnknown_2023D6F
_080414DC: .4byte gUnknown_2024004
_080414E0: .4byte gUnknown_30030F0
_080414E0: .4byte gMain
_080414E4: .4byte 0x00000439
_080414E8: .4byte gUnknown_2023BC4
_080414EC: .4byte gUnknown_2023BCC
@@ -203,7 +203,7 @@ _0804154C:
cmp r5, 0xAF
bne _080415AE
_08041552:
ldr r0, _08041574 @ =gUnknown_30030F0
ldr r0, _08041574 @ =gMain
ldr r1, _08041578 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -220,19 +220,19 @@ _08041552:
adds r0, r1
b _080415AE
.align 2, 0
_08041574: .4byte gUnknown_30030F0
_08041574: .4byte gMain
_08041578: .4byte 0x00000439
_0804157C: .4byte gUnknown_2023BC4
_08041580: .4byte gUnknown_2023F5C
_08041584:
ldr r0, _08041590 @ =gUnknown_3005008
ldr r0, _08041590 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, _08041594 @ =0x00003108
adds r2, r0, r2
str r2, [sp, 0x20]
b _080415B0
.align 2, 0
_08041590: .4byte gUnknown_3005008
_08041590: .4byte gSaveBlock1Ptr
_08041594: .4byte 0x00003108
_08041598:
mov r0, r8
@@ -280,7 +280,7 @@ _080415E4:
adds r6, r2, 0
cmp r0, 0
beq _0804162C
ldr r0, _0804169C @ =gUnknown_30030F0
ldr r0, _0804169C @ =gMain
ldr r1, _080416A0 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -367,7 +367,7 @@ _08041696:
strb r0, [r1, 0x19]
b _0804198A
.align 2, 0
_0804169C: .4byte gUnknown_30030F0
_0804169C: .4byte gMain
_080416A0: .4byte 0x00000439
_080416A4: .4byte gUnknown_2023BE4
_080416A8: .4byte 0xfff0ffff
@@ -707,7 +707,7 @@ _0804193E:
bne _0804194C
bl _08042384
_0804194C:
ldr r0, _080419B0 @ =gUnknown_30030F0
ldr r0, _080419B0 @ =gMain
ldr r3, _080419B4 @ =0x00000439
adds r0, r3
ldrb r1, [r0]
@@ -750,7 +750,7 @@ _080419A0: .4byte gUnknown_8254784
_080419A4: .4byte gUnknown_2023BE4
_080419A8: .4byte 0xf7ffffff
_080419AC: .4byte 0x00000f88
_080419B0: .4byte gUnknown_30030F0
_080419B0: .4byte gMain
_080419B4: .4byte 0x00000439
_080419B8:
ldr r1, [sp, 0x20]
@@ -976,7 +976,7 @@ _08041B70:
lsls r0, 24
b _08041ED6
_08041B90:
ldr r0, _08041BD8 @ =gUnknown_30030F0
ldr r0, _08041BD8 @ =gMain
ldr r1, _08041BDC @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -1011,7 +1011,7 @@ _08041B90:
ldrb r0, [r0]
b _08041C08
.align 2, 0
_08041BD8: .4byte gUnknown_30030F0
_08041BD8: .4byte gMain
_08041BDC: .4byte 0x00000439
_08041BE0: .4byte gUnknown_2023D70
_08041BE4: .4byte gUnknown_825E45C
@@ -1147,7 +1147,7 @@ _08041CF2:
movs r1, 0x39
mov r2, sp
bl sub_804037C
ldr r0, _08041D64 @ =gUnknown_30030F0
ldr r0, _08041D64 @ =gMain
ldr r1, _08041D68 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -1196,7 +1196,7 @@ _08041D42:
b _08041D80
.align 2, 0
_08041D60: .4byte gUnknown_2023FC4
_08041D64: .4byte gUnknown_30030F0
_08041D64: .4byte gMain
_08041D68: .4byte 0x00000439
_08041D6C: .4byte gUnknown_2023BE4
_08041D70: .4byte gUnknown_2023BC4
@@ -1317,7 +1317,7 @@ _08041E60:
mov r1, r9
mov r2, sp
bl sub_804037C
ldr r0, _08041EDC @ =gUnknown_30030F0
ldr r0, _08041EDC @ =gMain
ldr r4, _08041EE0 @ =0x00000439
adds r0, r4
ldrb r1, [r0]
@@ -1379,7 +1379,7 @@ _08041ED6:
str r0, [sp, 0x24]
b _08042042
.align 2, 0
_08041EDC: .4byte gUnknown_30030F0
_08041EDC: .4byte gMain
_08041EE0: .4byte 0x00000439
_08041EE4: .4byte gUnknown_2023BE4
_08041EE8: .4byte gUnknown_2023E0C
@@ -1475,7 +1475,7 @@ _08041FAC:
adds r1, r6, 0
mov r2, sp
bl sub_804037C
ldr r0, _08042018 @ =gUnknown_30030F0
ldr r0, _08042018 @ =gMain
ldr r1, _0804201C @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -1525,7 +1525,7 @@ _08042010:
str r0, [sp, 0x1C]
b _08042042
.align 2, 0
_08042018: .4byte gUnknown_30030F0
_08042018: .4byte gMain
_0804201C: .4byte 0x00000439
_08042020: .4byte gUnknown_2023BE4
_08042024: .4byte gUnknown_2023E0C
asm/pokemon_size_record.s
+2 -2
View File
@@ -426,7 +426,7 @@ GiveGiftRibbonToParty: @ 80A09AC
bhi _080A0A28
cmp r5, 0x40
bhi _080A0A28
ldr r0, _080A0A38 @ =gUnknown_3005008
ldr r0, _080A0A38 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _080A0A3C @ =0x0000309c
adds r0, r1
@@ -473,7 +473,7 @@ _080A0A28:
bx r0
.align 2, 0
_080A0A34: .4byte gUnknown_83E27AC
_080A0A38: .4byte gUnknown_3005008
_080A0A38: .4byte gSaveBlock1Ptr
_080A0A3C: .4byte 0x0000309c
_080A0A40: .4byte gUnknown_2024284
_080A0A44: .4byte 0x0000083b
asm/pokemon_special_anim.s
+14 -14
View File
@@ -97,7 +97,7 @@ sub_811C5D4: @ 811C5D4
mov r8, r0
lsls r1, 16
lsrs r6, r1, 16
ldr r0, _0811C61C @ =gUnknown_30030F0
ldr r0, _0811C61C @ =gMain
ldr r1, _0811C620 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -119,7 +119,7 @@ _0811C5FC:
movs r0, 0
b _0811C6D2
.align 2, 0
_0811C61C: .4byte gUnknown_30030F0
_0811C61C: .4byte gMain
_0811C620: .4byte 0x00000439
_0811C624: .4byte 0x000028dc
_0811C628:
@@ -392,7 +392,7 @@ sub_811C834: @ 811C834
ldrb r0, [r0]
cmp r0, 0
bne _0811C870
ldr r0, _0811C868 @ =gUnknown_30030F0
ldr r0, _0811C868 @ =gMain
ldrh r1, [r0, 0x2C]
movs r0, 0x3
ands r0, r1
@@ -404,7 +404,7 @@ sub_811C834: @ 811C834
bl sub_811C718
b _0811CA16
.align 2, 0
_0811C868: .4byte gUnknown_30030F0
_0811C868: .4byte gMain
_0811C86C: .4byte sub_811CF88
_0811C870:
adds r0, r4, 0
@@ -549,7 +549,7 @@ _0811C996:
strb r0, [r1]
b _0811C9F4
_0811C9AA:
ldr r0, _0811C9DC @ =gUnknown_30030F0
ldr r0, _0811C9DC @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -573,7 +573,7 @@ _0811C9AA:
bl BeginNormalPaletteFade
b _0811C9F4
.align 2, 0
_0811C9DC: .4byte gUnknown_30030F0
_0811C9DC: .4byte gMain
_0811C9E0:
ldrh r0, [r5]
adds r0, 0x2
@@ -833,7 +833,7 @@ sub_811CBE4: @ 811CBE4
ldrb r0, [r0]
cmp r0, 0
bne _0811CC1C
ldr r0, _0811CC14 @ =gUnknown_30030F0
ldr r0, _0811CC14 @ =gMain
ldrh r1, [r0, 0x2C]
movs r0, 0x2
ands r0, r1
@@ -844,7 +844,7 @@ sub_811CBE4: @ 811CBE4
bl sub_811C718
b _0811CD5A
.align 2, 0
_0811CC14: .4byte gUnknown_30030F0
_0811CC14: .4byte gMain
_0811CC18: .4byte sub_811CF88
_0811CC1C:
adds r0, r5, 0
@@ -955,7 +955,7 @@ _0811CCF8:
strb r0, [r1]
b _0811CD2A
_0811CD0C:
ldr r0, _0811CD34 @ =gUnknown_30030F0
ldr r0, _0811CD34 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -975,7 +975,7 @@ _0811CD2A:
strh r0, [r4]
b _0811CD5A
.align 2, 0
_0811CD34: .4byte gUnknown_30030F0
_0811CD34: .4byte gMain
_0811CD38:
ldr r0, _0811CD64 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
@@ -1009,7 +1009,7 @@ sub_811CD68: @ 811CD68
movs r1, 0
bl GetWordTaskArg
adds r5, r0, 0
ldr r0, _0811CD90 @ =gUnknown_30030F0
ldr r0, _0811CD90 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -1020,7 +1020,7 @@ sub_811CD68: @ 811CD68
bl sub_811C718
b _0811CE3E
.align 2, 0
_0811CD90: .4byte gUnknown_30030F0
_0811CD90: .4byte gMain
_0811CD94: .4byte sub_811CF88
_0811CD98:
adds r4, r5, 0
@@ -1126,7 +1126,7 @@ sub_811CE4C: @ 811CE4C
ldrb r0, [r0]
cmp r0, 0
bne _0811CE88
ldr r0, _0811CE80 @ =gUnknown_30030F0
ldr r0, _0811CE80 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -1138,7 +1138,7 @@ sub_811CE4C: @ 811CE4C
bl sub_811C718
b _0811CF7E
.align 2, 0
_0811CE80: .4byte gUnknown_30030F0
_0811CE80: .4byte gMain
_0811CE84: .4byte sub_811CF88
_0811CE88:
adds r0, r5, 0
asm/pokemon_storage_system.s
+74 -74
View File
@@ -1489,7 +1489,7 @@ _0808C47E:
_0808C484:
ldrh r3, [r5, 0xA]
strh r3, [r5, 0xE]
ldr r2, _0808C504 @ =gUnknown_30030F0
ldr r2, _0808C504 @ =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -1552,7 +1552,7 @@ _0808C4CE:
bl AddTextPrinterParametrized
b _0808C69C
.align 2, 0
_0808C504: .4byte gUnknown_30030F0
_0808C504: .4byte gMain
_0808C508: .4byte gUnknown_83CDA20
_0808C50C:
movs r0, 0
@@ -1624,7 +1624,7 @@ _0808C598:
strh r0, [r5, 0x8]
b _0808C69C
_0808C5A6:
ldr r0, _0808C5D0 @ =gUnknown_30030F0
ldr r0, _0808C5D0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r7, 0x3
adds r4, r7, 0
@@ -1645,7 +1645,7 @@ _0808C5A6:
str r0, [sp]
b _0808C664
.align 2, 0
_0808C5D0: .4byte gUnknown_30030F0
_0808C5D0: .4byte gMain
_0808C5D4: .4byte gUnknown_83CDA20
_0808C5D8:
movs r0, 0x40
@@ -1778,7 +1778,7 @@ _0808C6D4: .4byte gUnknown_3005090
thumb_func_start mapldr_0808C6D8
mapldr_0808C6D8: @ 808C6D8
push {r4,r5,lr}
ldr r0, _0808C71C @ =gUnknown_30030F0
ldr r0, _0808C71C @ =gMain
ldr r5, [r0, 0xC]
movs r0, 0
bl SetVBlankCallback
@@ -1806,7 +1806,7 @@ mapldr_0808C6D8: @ 808C6D8
pop {r0}
bx r0
.align 2, 0
_0808C71C: .4byte gUnknown_30030F0
_0808C71C: .4byte gMain
_0808C720: .4byte c3_0808C39C
_0808C724: .4byte gUnknown_3005090
_0808C728: .4byte gUnknown_20397A8
@@ -2095,7 +2095,7 @@ sub_808C950: @ 808C950
thumb_func_start sub_808C95C
sub_808C95C: @ 808C95C
push {lr}
ldr r0, _0808C974 @ =gUnknown_30030F0
ldr r0, _0808C974 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -2106,7 +2106,7 @@ sub_808C95C: @ 808C95C
movs r0, 0xC9
b _0808C9C0
.align 2, 0
_0808C974: .4byte gUnknown_30030F0
_0808C974: .4byte gMain
_0808C978:
movs r0, 0x1
ands r0, r1
@@ -2832,7 +2832,7 @@ sub_808CF10: @ 808CF10
adds r1, 0x10
movs r2, 0x8
bl sub_8096BE4
ldr r1, _0808CF88 @ =gUnknown_30030E0
ldr r1, _0808CF88 @ =gKeyRepeatStartDelay
movs r0, 0x14
strh r0, [r1]
bl clear_scheduled_bg_copies_to_vram
@@ -2861,7 +2861,7 @@ sub_808CF10: @ 808CF10
.align 2, 0
_0808CF80: .4byte gUnknown_2021B46
_0808CF84: .4byte gUnknown_20397B0
_0808CF88: .4byte gUnknown_30030E0
_0808CF88: .4byte gKeyRepeatStartDelay
_0808CF8C: .4byte gUnknown_83CE6F8
_0808CF90: .4byte 0x000002c7
thumb_func_end sub_808CF10
@@ -3704,7 +3704,7 @@ _0808D6BC: .4byte gUnknown_20397B0
_0808D6C0: .4byte 0x000002ca
_0808D6C4: .4byte gUnknown_20397B4
_0808D6C8:
ldr r0, _0808D6E4 @ =gUnknown_30030F0
ldr r0, _0808D6E4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -3718,7 +3718,7 @@ _0808D6DC:
strb r0, [r1]
b _0808D7B2
.align 2, 0
_0808D6E4: .4byte gUnknown_30030F0
_0808D6E4: .4byte gMain
_0808D6E8: .4byte gUnknown_20397B0
_0808D6EC:
movs r0, 0x1A
@@ -3739,7 +3739,7 @@ _0808D6FE:
.align 2, 0
_0808D70C: .4byte gUnknown_20397B0
_0808D710:
ldr r0, _0808D728 @ =gUnknown_30030F0
ldr r0, _0808D728 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -3750,7 +3750,7 @@ _0808D710:
bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D728: .4byte gUnknown_30030F0
_0808D728: .4byte gMain
_0808D72C: .4byte sub_808D2BC
_0808D730:
bl sub_80950D0
@@ -4253,7 +4253,7 @@ _0808DB5C:
.align 2, 0
_0808DB6C: .4byte gUnknown_20397B0
_0808DB70:
ldr r0, _0808DB8C @ =gUnknown_30030F0
ldr r0, _0808DB8C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -4267,7 +4267,7 @@ _0808DB86:
pop {r0}
bx r0
.align 2, 0
_0808DB8C: .4byte gUnknown_30030F0
_0808DB8C: .4byte gMain
_0808DB90: .4byte sub_808D2BC
thumb_func_end sub_808D878
@@ -4457,7 +4457,7 @@ _0808DCF4:
.align 2, 0
_0808DD08: .4byte gUnknown_20397B0
_0808DD0C:
ldr r0, _0808DD24 @ =gUnknown_30030F0
ldr r0, _0808DD24 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -4468,7 +4468,7 @@ _0808DD0C:
bl add_to_c3_somehow
b _0808DD7E
.align 2, 0
_0808DD24: .4byte gUnknown_30030F0
_0808DD24: .4byte gMain
_0808DD28: .4byte sub_808D2BC
_0808DD2C:
bl sub_8092BF8
@@ -4632,7 +4632,7 @@ _0808DE92:
.align 2, 0
_0808DE9C: .4byte sub_808D2BC
_0808DEA0:
ldr r0, _0808DEC4 @ =gUnknown_30030F0
ldr r0, _0808DEC4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -4651,7 +4651,7 @@ _0808DEBA:
pop {r0}
bx r0
.align 2, 0
_0808DEC4: .4byte gUnknown_30030F0
_0808DEC4: .4byte gMain
_0808DEC8: .4byte gUnknown_20397B0
thumb_func_end sub_808DD88
@@ -4752,7 +4752,7 @@ _0808DF98:
movs r0, 0xA
b _0808E070
_0808DFA4:
ldr r0, _0808DFB8 @ =gUnknown_30030F0
ldr r0, _0808DFB8 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -4763,9 +4763,9 @@ _0808DFB2:
movs r0, 0xB
b _0808E070
.align 2, 0
_0808DFB8: .4byte gUnknown_30030F0
_0808DFB8: .4byte gMain
_0808DFBC:
ldr r0, _0808DFE0 @ =gUnknown_30030F0
ldr r0, _0808DFE0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -4780,7 +4780,7 @@ _0808DFBC:
bl sub_80909F4
b _0808E074
.align 2, 0
_0808DFE0: .4byte gUnknown_30030F0
_0808DFE0: .4byte gMain
_0808DFE4: .4byte gUnknown_20397B4
_0808DFE8:
ldr r0, _0808DFF4 @ =gUnknown_20397B0
@@ -4809,7 +4809,7 @@ _0808E01C:
movs r0, 0xA
b _0808E070
_0808E020:
ldr r0, _0808E030 @ =gUnknown_30030F0
ldr r0, _0808E030 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -4818,9 +4818,9 @@ _0808E020:
movs r0, 0x15
b _0808E070
.align 2, 0
_0808E030: .4byte gUnknown_30030F0
_0808E030: .4byte gMain
_0808E034:
ldr r0, _0808E04C @ =gUnknown_30030F0
ldr r0, _0808E04C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -4830,7 +4830,7 @@ _0808E034:
bl sub_8091114
b _0808E074
.align 2, 0
_0808E04C: .4byte gUnknown_30030F0
_0808E04C: .4byte gMain
_0808E050:
bl sub_8091150
lsls r0, 24
@@ -4840,7 +4840,7 @@ _0808E050:
movs r0, 0x13
b _0808E070
_0808E062:
ldr r0, _0808E080 @ =gUnknown_30030F0
ldr r0, _0808E080 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -4857,7 +4857,7 @@ _0808E074:
strb r0, [r1]
b _0808E0AE
.align 2, 0
_0808E080: .4byte gUnknown_30030F0
_0808E080: .4byte gMain
_0808E084: .4byte gUnknown_20397B0
_0808E088:
ldr r0, _0808E094 @ =gUnknown_20397B0
@@ -4868,7 +4868,7 @@ _0808E088:
.align 2, 0
_0808E094: .4byte gUnknown_20397B0
_0808E098:
ldr r0, _0808E0B4 @ =gUnknown_30030F0
ldr r0, _0808E0B4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -4881,7 +4881,7 @@ _0808E0AE:
pop {r0}
bx r0
.align 2, 0
_0808E0B4: .4byte gUnknown_30030F0
_0808E0B4: .4byte gMain
_0808E0B8: .4byte sub_808D2BC
thumb_func_end sub_808DECC
@@ -5086,7 +5086,7 @@ _0808E250:
bl sub_808FBA4
b _0808E280
_0808E270:
ldr r0, _0808E28C @ =gUnknown_30030F0
ldr r0, _0808E28C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -5102,7 +5102,7 @@ _0808E280:
strb r0, [r1]
b _0808E2A4
.align 2, 0
_0808E28C: .4byte gUnknown_30030F0
_0808E28C: .4byte gMain
_0808E290: .4byte gUnknown_20397B0
_0808E294:
bl IsDma3ManagerBusyWithBgCopy
@@ -5200,7 +5200,7 @@ _0808E340:
.align 2, 0
_0808E35C: .4byte gUnknown_20397B0
_0808E360:
ldr r0, _0808E384 @ =gUnknown_30030F0
ldr r0, _0808E384 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -5215,7 +5215,7 @@ _0808E360:
strb r0, [r1]
b _0808E3BA
.align 2, 0
_0808E384: .4byte gUnknown_30030F0
_0808E384: .4byte gMain
_0808E388: .4byte gUnknown_20397B0
_0808E38C:
bl IsDma3ManagerBusyWithBgCopy
@@ -5228,7 +5228,7 @@ _0808E38C:
.align 2, 0
_0808E3A0: .4byte sub_808D2BC
_0808E3A4:
ldr r0, _0808E3C0 @ =gUnknown_30030F0
ldr r0, _0808E3C0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -5242,7 +5242,7 @@ _0808E3BA:
pop {r0}
bx r0
.align 2, 0
_0808E3C0: .4byte gUnknown_30030F0
_0808E3C0: .4byte gMain
_0808E3C4: .4byte sub_808D2BC
thumb_func_end sub_808E2B0
@@ -5320,7 +5320,7 @@ _0808E450:
bl sub_808FBA4
b _0808E480
_0808E470:
ldr r0, _0808E48C @ =gUnknown_30030F0
ldr r0, _0808E48C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -5336,7 +5336,7 @@ _0808E484:
strb r0, [r1]
b _0808E4A4
.align 2, 0
_0808E48C: .4byte gUnknown_30030F0
_0808E48C: .4byte gMain
_0808E490: .4byte gUnknown_20397B0
_0808E494:
bl IsDma3ManagerBusyWithBgCopy
@@ -5398,7 +5398,7 @@ _0808E512:
bl IsDma3ManagerBusyWithBgCopy
b _0808E534
_0808E518:
ldr r0, _0808E52C @ =gUnknown_30030F0
ldr r0, _0808E52C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -5408,7 +5408,7 @@ _0808E518:
bl sub_80722CC
b _0808E53A
.align 2, 0
_0808E52C: .4byte gUnknown_30030F0
_0808E52C: .4byte gMain
_0808E530:
bl sub_80967C0
_0808E534:
@@ -5525,7 +5525,7 @@ _0808E60C:
strb r0, [r1]
b _0808E67C
_0808E61A:
ldr r0, _0808E634 @ =gUnknown_30030F0
ldr r0, _0808E634 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -5538,7 +5538,7 @@ _0808E61A:
strb r0, [r1]
b _0808E67C
.align 2, 0
_0808E634: .4byte gUnknown_30030F0
_0808E634: .4byte gMain
_0808E638: .4byte gUnknown_20397B0
_0808E63C:
bl sub_8096088
@@ -5646,7 +5646,7 @@ _0808E6FE:
bne _0808E738
b _0808E71A
_0808E70A:
ldr r0, _0808E724 @ =gUnknown_30030F0
ldr r0, _0808E724 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -5660,7 +5660,7 @@ _0808E71A:
strb r0, [r1]
b _0808E738
.align 2, 0
_0808E724: .4byte gUnknown_30030F0
_0808E724: .4byte gMain
_0808E728:
bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
@@ -6274,7 +6274,7 @@ _0808EC20:
.align 2, 0
_0808EC3C: .4byte gUnknown_20397B0
_0808EC40:
ldr r0, _0808EC50 @ =gUnknown_30030F0
ldr r0, _0808EC50 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -6282,7 +6282,7 @@ _0808EC40:
beq _0808ECD0
b _0808EC72
.align 2, 0
_0808EC50: .4byte gUnknown_30030F0
_0808EC50: .4byte gMain
_0808EC54:
bl ProcessMenuInputNoWrap_
lsls r0, 24
@@ -6416,7 +6416,7 @@ _0808ED54:
.align 2, 0
_0808ED70: .4byte gUnknown_20397B0
_0808ED74:
ldr r0, _0808ED84 @ =gUnknown_30030F0
ldr r0, _0808ED84 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF3
ands r0, r1
@@ -6424,7 +6424,7 @@ _0808ED74:
beq _0808EE04
b _0808EDA8
.align 2, 0
_0808ED84: .4byte gUnknown_30030F0
_0808ED84: .4byte gMain
_0808ED88:
bl ProcessMenuInputNoWrap_
lsls r0, 24
@@ -16968,7 +16968,7 @@ sub_8093FD4: @ 8093FD4
mov r9, r3
add r0, r9
strb r1, [r0]
ldr r6, _08094070 @ =gUnknown_30030F0
ldr r6, _08094070 @ =gMain
ldrh r1, [r6, 0x30]
movs r0, 0x40
ands r0, r1
@@ -17015,7 +17015,7 @@ _08094060: .4byte gUnknown_20397B0
_08094064: .4byte 0x00000cce
_08094068: .4byte 0x00000ccf
_0809406C: .4byte 0x00000cd3
_08094070: .4byte gUnknown_30030F0
_08094070: .4byte gMain
_08094074:
movs r0, 0x20
ands r0, r1
@@ -17172,7 +17172,7 @@ _080941A0:
.align 2, 0
_080941AC: .4byte 0x000021ef
_080941B0:
ldr r2, _080941C0 @ =gUnknown_30030F0
ldr r2, _080941C0 @ =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -17181,9 +17181,9 @@ _080941B0:
movs r0, 0x13
b _08094232
.align 2, 0
_080941C0: .4byte gUnknown_30030F0
_080941C0: .4byte gMain
_080941C4:
ldr r0, _080941E0 @ =gUnknown_300500C
ldr r0, _080941E0 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x1
@@ -17197,7 +17197,7 @@ _080941C4:
movs r0, 0xA
b _08094232
.align 2, 0
_080941E0: .4byte gUnknown_300500C
_080941E0: .4byte gSaveBlock2Ptr
_080941E4:
movs r0, 0x80
lsls r0, 1
@@ -17256,7 +17256,7 @@ _08094232:
thumb_func_start sub_8094240
sub_8094240: @ 8094240
push {r4,lr}
ldr r1, _08094270 @ =gUnknown_30030F0
ldr r1, _08094270 @ =gMain
ldrh r0, [r1, 0x2C]
movs r4, 0x1
ands r4, r0
@@ -17279,7 +17279,7 @@ sub_8094240: @ 8094240
subs r1, 0x6
b _080942DA
.align 2, 0
_08094270: .4byte gUnknown_30030F0
_08094270: .4byte gMain
_08094274: .4byte gUnknown_2039821
_08094278:
movs r0, 0x80
@@ -17410,7 +17410,7 @@ _08094374: .4byte 0x00000cb4
thumb_func_start sub_8094378
sub_8094378: @ 8094378
push {r4,lr}
ldr r2, _0809439C @ =gUnknown_30030F0
ldr r2, _0809439C @ =gMain
ldrh r1, [r2, 0x30]
movs r0, 0x40
ands r0, r1
@@ -17426,7 +17426,7 @@ sub_8094378: @ 8094378
subs r1, 0x6
b _08094402
.align 2, 0
_0809439C: .4byte gUnknown_30030F0
_0809439C: .4byte gMain
_080943A0: .4byte gUnknown_2039821
_080943A4:
movs r0, 0x80
@@ -17516,7 +17516,7 @@ _08094450:
movs r0, 0x18
b _08094484
_08094454:
ldr r0, _08094470 @ =gUnknown_300500C
ldr r0, _08094470 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x1
@@ -17531,7 +17531,7 @@ _0809446A:
movs r0, 0xA
b _08094484
.align 2, 0
_08094470: .4byte gUnknown_300500C
_08094470: .4byte gSaveBlock2Ptr
_08094474:
movs r0, 0x80
lsls r0, 1
@@ -17576,7 +17576,7 @@ sub_809448C: @ 809448C
strb r1, [r0]
mov r8, r1
movs r7, 0
ldr r1, _08094510 @ =gUnknown_30030F0
ldr r1, _08094510 @ =gMain
ldrh r3, [r1, 0x30]
movs r0, 0x40
ands r0, r3
@@ -17616,7 +17616,7 @@ _08094500: .4byte gUnknown_2039821
_08094504: .4byte gUnknown_20397B0
_08094508: .4byte 0x00000ccf
_0809450C: .4byte 0x00000cce
_08094510: .4byte gUnknown_30030F0
_08094510: .4byte gMain
_08094514:
movs r0, 0x20
ands r0, r3
@@ -17752,7 +17752,7 @@ _08094620:
movs r0, 0x12
b _080946A0
_08094624:
ldr r2, _08094640 @ =gUnknown_30030F0
ldr r2, _08094640 @ =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -17767,7 +17767,7 @@ _08094624:
movs r0, 0x13
b _080946A0
.align 2, 0
_08094640: .4byte gUnknown_30030F0
_08094640: .4byte gMain
_08094644: .4byte gUnknown_20397B0
_08094648:
movs r1, 0x1
@@ -17845,7 +17845,7 @@ sub_80946AC: @ 80946AC
ldr r5, _080946F4 @ =0x00000cd3
adds r0, r5
strb r1, [r0]
ldr r1, _080946F8 @ =gUnknown_30030F0
ldr r1, _080946F8 @ =gMain
ldrh r2, [r1, 0x30]
movs r0, 0x40
ands r0, r2
@@ -17864,7 +17864,7 @@ _080946E8: .4byte gUnknown_20397B0
_080946EC: .4byte 0x00000ccf
_080946F0: .4byte 0x00000cce
_080946F4: .4byte 0x00000cd3
_080946F8: .4byte gUnknown_30030F0
_080946F8: .4byte gMain
_080946FC:
ldrh r2, [r1, 0x2C]
movs r0, 0x20
@@ -17875,7 +17875,7 @@ _080946FC:
ands r0, r2
cmp r0, 0
bne _08094736
ldr r0, _08094728 @ =gUnknown_300500C
ldr r0, _08094728 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x1
@@ -17889,7 +17889,7 @@ _08094722:
movs r0, 0xA
b _0809479A
.align 2, 0
_08094728: .4byte gUnknown_300500C
_08094728: .4byte gSaveBlock2Ptr
_0809472C:
movs r0, 0x80
lsls r0, 1
@@ -17981,7 +17981,7 @@ sub_80947A0: @ 80947A0
ldr r5, _08094804 @ =0x00000cd3
adds r0, r5
strb r1, [r0]
ldr r7, _08094808 @ =gUnknown_30030F0
ldr r7, _08094808 @ =gMain
ldrh r1, [r7, 0x30]
movs r0, 0x40
ands r0, r1
@@ -18005,7 +18005,7 @@ _080947F8: .4byte gUnknown_20397B0
_080947FC: .4byte 0x00000ccf
_08094800: .4byte 0x00000cce
_08094804: .4byte 0x00000cd3
_08094808: .4byte gUnknown_30030F0
_08094808: .4byte gMain
_0809480C:
movs r0, 0x20
ands r0, r1
@@ -19000,7 +19000,7 @@ sub_8094F94: @ 8094F94
push {r4,r5,lr}
movs r5, 0x2
negs r5, r5
ldr r4, _08094FD0 @ =gUnknown_30030F0
ldr r4, _08094FD0 @ =gMain
ldrh r1, [r4, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -19026,7 +19026,7 @@ _08094FB6:
bl MoveMenuCursor
b _08094FF2
.align 2, 0
_08094FD0: .4byte gUnknown_30030F0
_08094FD0: .4byte gMain
_08094FD4:
movs r0, 0x80
ands r0, r1
asm/pokemon_summary_screen.s
+20 -20
View File
@@ -367,13 +367,13 @@ _081347D8:
beq _08134810
cmp r4, 0x1
bne _08134830
ldr r0, _08134808 @ =gUnknown_30030F0
ldr r0, _08134808 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x10
ands r0, r1
cmp r0, 0
bne _081347D0
ldr r0, _0813480C @ =gUnknown_300500C
ldr r0, _0813480C @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x1
@@ -382,16 +382,16 @@ _081347D8:
lsls r0, 1
b _0813482A
.align 2, 0
_08134808: .4byte gUnknown_30030F0
_0813480C: .4byte gUnknown_300500C
_08134808: .4byte gMain
_0813480C: .4byte gSaveBlock2Ptr
_08134810:
ldr r0, _08134838 @ =gUnknown_30030F0
ldr r0, _08134838 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x20
ands r0, r1
cmp r0, 0
bne _081347D0
ldr r0, _0813483C @ =gUnknown_300500C
ldr r0, _0813483C @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x1
@@ -409,8 +409,8 @@ _08134832:
pop {r1}
bx r1
.align 2, 0
_08134838: .4byte gUnknown_30030F0
_0813483C: .4byte gUnknown_300500C
_08134838: .4byte gMain
_0813483C: .4byte gSaveBlock2Ptr
thumb_func_end sub_81347A4
thumb_func_start sub_8134840
@@ -631,7 +631,7 @@ _081349F8:
bne _08134A12
b _08134B9A
_08134A12:
ldr r0, _08134A34 @ =gUnknown_30030F0
ldr r0, _08134A34 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -645,7 +645,7 @@ _08134A12:
.align 2, 0
_08134A2C: .4byte sub_8134BAC
_08134A30: .4byte sub_813B3F0
_08134A34: .4byte gUnknown_30030F0
_08134A34: .4byte gMain
_08134A38:
movs r0, 0x80
ands r0, r1
@@ -1285,7 +1285,7 @@ _08134FC4: .4byte 0x00003214
_08134FC8:
ldr r0, _08134FF0 @ =gUnknown_8419C39
bl sub_8136DA4
ldr r0, _08134FF4 @ =gUnknown_30030F0
ldr r0, _08134FF4 @ =gMain
ldr r2, _08134FF8 @ =0x00000439
adds r0, r2
ldrb r1, [r0]
@@ -1302,7 +1302,7 @@ _08134FC8:
b _08135180
.align 2, 0
_08134FF0: .4byte gUnknown_8419C39
_08134FF4: .4byte gUnknown_30030F0
_08134FF4: .4byte gMain
_08134FF8: .4byte 0x00000439
_08134FFC: .4byte gUnknown_3003F64
_08135000: .4byte gUnknown_8419C92
@@ -6739,7 +6739,7 @@ _08137DB8: .4byte gUnknown_8419C82
_08137DBC:
ldr r0, _08137DDC @ =gUnknown_8419C39
bl sub_8136DA4
ldr r0, _08137DE0 @ =gUnknown_30030F0
ldr r0, _08137DE0 @ =gMain
ldr r1, _08137DE4 @ =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -6752,7 +6752,7 @@ _08137DBC:
b _08137DF2
.align 2, 0
_08137DDC: .4byte gUnknown_8419C39
_08137DE0: .4byte gUnknown_30030F0
_08137DE0: .4byte gMain
_08137DE4: .4byte 0x00000439
_08137DE8: .4byte gUnknown_8419C92
_08137DEC:
@@ -7659,7 +7659,7 @@ _081384D0:
ldr r0, [r5]
ldr r1, _08138520 @ =0x0000304c
adds r0, r1
ldr r1, _08138524 @ =gUnknown_300500C
ldr r1, _08138524 @ =gSaveBlock2Ptr
ldr r1, [r1]
bl StringCopy
_081384E8:
@@ -7690,7 +7690,7 @@ _08138518:
.align 2, 0
_0813851C: .4byte 0x0000ffff
_08138520: .4byte 0x0000304c
_08138524: .4byte gUnknown_300500C
_08138524: .4byte gSaveBlock2Ptr
_08138528: .4byte gUnknown_203B140
_0813852C: .4byte 0x00003058
_08138530:
@@ -8699,7 +8699,7 @@ _08138D20:
bne _08138D2A
b _08139094
_08138D2A:
ldr r0, _08138D78 @ =gUnknown_30030F0
ldr r0, _08138D78 @ =gMain
mov r9, r0
ldrh r1, [r0, 0x2E]
movs r0, 0x40
@@ -8741,7 +8741,7 @@ _08138D6E:
bne _08138D60
b _08139094
.align 2, 0
_08138D78: .4byte gUnknown_30030F0
_08138D78: .4byte gMain
_08138D7C: .4byte gUnknown_203B16D
_08138D80: .4byte 0x00003258
_08138D84:
@@ -9585,7 +9585,7 @@ _08139460: .4byte gUnknown_2037AB8
_08139464: .4byte gUnknown_203B140
_08139468: .4byte 0x00003288
_0813946C:
ldr r0, _081394BC @ =gUnknown_30030F0
ldr r0, _081394BC @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -9627,7 +9627,7 @@ _081394B0:
bne _081394A2
b _0813975A
.align 2, 0
_081394BC: .4byte gUnknown_30030F0
_081394BC: .4byte gMain
_081394C0: .4byte gUnknown_203B16D
_081394C4: .4byte 0x00003288
_081394C8: .4byte 0x00003258
asm/post_battle_event_funcs.s
+2 -2
View File
@@ -34,7 +34,7 @@ _080CA318:
bl GetGameStat
cmp r0, 0
bne _080CA33A
ldr r0, _080CA3B4 @ =gUnknown_300500C
ldr r0, _080CA3B4 @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrh r1, [r2, 0xE]
lsls r1, 16
@@ -100,7 +100,7 @@ _080CA39E:
bx r1
.align 2, 0
_080CA3B0: .4byte gUnknown_203AB44
_080CA3B4: .4byte gUnknown_300500C
_080CA3B4: .4byte gSaveBlock2Ptr
_080CA3B8: .4byte gUnknown_2024284
_080CA3BC: .4byte 0x0000083b
_080CA3C0: .4byte CB2_DoHallOfFameScreen
asm/quest_log.s
+79 -79
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_8110840
sub_8110840: @ 8110840
push {lr}
ldr r1, _08110888 @ =gUnknown_3005008
ldr r1, _08110888 @ =gSaveBlock1Ptr
ldr r1, [r1]
subs r1, r0
ldr r2, _0811088C @ =gUnknown_203AE04
@@ -48,7 +48,7 @@ _08110882:
pop {r0}
bx r0
.align 2, 0
_08110888: .4byte gUnknown_3005008
_08110888: .4byte gSaveBlock1Ptr
_0811088C: .4byte gUnknown_203AE04
_08110890: .4byte gUnknown_203ADFA
_08110894: .4byte gUnknown_203AE08
@@ -58,7 +58,7 @@ _08110898: .4byte gUnknown_203AE0C
thumb_func_start sub_811089C
sub_811089C: @ 811089C
push {lr}
ldr r0, _081108D8 @ =gUnknown_3005008
ldr r0, _081108D8 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x98
lsls r1, 5
@@ -84,7 +84,7 @@ sub_811089C: @ 811089C
pop {r0}
bx r0
.align 2, 0
_081108D8: .4byte gUnknown_3005008
_081108D8: .4byte gSaveBlock1Ptr
_081108DC: .4byte gUnknown_203ADF8
_081108E0: .4byte gUnknown_203ADFA
_081108E4: .4byte gUnknown_203AE8C
@@ -97,7 +97,7 @@ sub_81108F0: @ 81108F0
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, _08110918 @ =gUnknown_3005008
ldr r1, _08110918 @ =gSaveBlock1Ptr
ldr r1, [r1]
movs r2, 0xCD
lsls r2, 3
@@ -114,7 +114,7 @@ sub_81108F0: @ 81108F0
pop {r0}
bx r0
.align 2, 0
_08110918: .4byte gUnknown_3005008
_08110918: .4byte gSaveBlock1Ptr
_0811091C: .4byte gUnknown_203AE04
thumb_func_end sub_81108F0
@@ -147,7 +147,7 @@ _08110940: .4byte gUnknown_203AE8C
sub_8110944: @ 8110944
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, _08110978 @ =gUnknown_3005008
ldr r4, _08110978 @ =gSaveBlock1Ptr
ldr r0, _0811097C @ =gUnknown_203ADF8
ldrb r0, [r0]
movs r3, 0xCD
@@ -172,7 +172,7 @@ _08110972:
movs r0, 0
b _08110982
.align 2, 0
_08110978: .4byte gUnknown_3005008
_08110978: .4byte gSaveBlock1Ptr
_0811097C: .4byte gUnknown_203ADF8
_08110980:
movs r0, 0x1
@@ -186,7 +186,7 @@ _08110982:
sub_8110988: @ 8110988
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, _081109BC @ =gUnknown_3005008
ldr r4, _081109BC @ =gSaveBlock1Ptr
ldr r0, _081109C0 @ =gUnknown_203ADF8
ldrb r0, [r0]
movs r3, 0xCD
@@ -211,7 +211,7 @@ _081109B6:
movs r0, 0
b _081109C6
.align 2, 0
_081109BC: .4byte gUnknown_3005008
_081109BC: .4byte gSaveBlock1Ptr
_081109C0: .4byte gUnknown_203ADF8
_081109C4:
movs r0, 0x1
@@ -354,7 +354,7 @@ _08110AC4: .4byte gUnknown_203ADFA
thumb_func_start sub_8110AC8
sub_8110AC8: @ 8110AC8
ldr r0, _08110AE4 @ =gUnknown_3005008
ldr r0, _08110AE4 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, _08110AE8 @ =gUnknown_203ADF8
ldrb r2, [r0]
@@ -368,7 +368,7 @@ sub_8110AC8: @ 8110AC8
ldrb r0, [r1]
bx lr
.align 2, 0
_08110AE4: .4byte gUnknown_3005008
_08110AE4: .4byte gSaveBlock1Ptr
_08110AE8: .4byte gUnknown_203ADF8
thumb_func_end sub_8110AC8
@@ -388,7 +388,7 @@ _08110AFE:
bl sub_81108F0
bl sub_8113B88
ldr r2, _08110B48 @ =gUnknown_203AE08
ldr r1, _08110B4C @ =gUnknown_3005008
ldr r1, _08110B4C @ =gSaveBlock1Ptr
ldrb r0, [r4]
movs r3, 0xCD
lsls r3, 3
@@ -420,7 +420,7 @@ _08110B36:
.align 2, 0
_08110B44: .4byte gUnknown_203ADF8
_08110B48: .4byte gUnknown_203AE08
_08110B4C: .4byte gUnknown_3005008
_08110B4C: .4byte gSaveBlock1Ptr
_08110B50:
ldrb r0, [r4]
muls r0, r3
@@ -465,7 +465,7 @@ _08110BAC: .4byte gUnknown_203AE98
sub_8110BB0: @ 8110BB0
lsls r0, 24
lsrs r0, 24
ldr r2, _08110BE4 @ =gUnknown_3005008
ldr r2, _08110BE4 @ =gSaveBlock1Ptr
movs r1, 0xCD
lsls r1, 3
muls r1, r0
@@ -489,7 +489,7 @@ sub_8110BB0: @ 8110BB0
strh r0, [r1, 0x6]
bx lr
.align 2, 0
_08110BE4: .4byte gUnknown_3005008
_08110BE4: .4byte gSaveBlock1Ptr
thumb_func_end sub_8110BB0
thumb_func_start sub_8110BE8
@@ -501,7 +501,7 @@ sub_8110BE8: @ 8110BE8
push {r5-r7}
lsls r0, 24
lsrs r0, 24
ldr r4, _08110C54 @ =gUnknown_3005008
ldr r4, _08110C54 @ =gSaveBlock1Ptr
movs r1, 0xCD
lsls r1, 3
muls r0, r1
@@ -548,7 +548,7 @@ _08110C1C:
strb r0, [r2]
b _08110C7C
.align 2, 0
_08110C54: .4byte gUnknown_3005008
_08110C54: .4byte gSaveBlock1Ptr
_08110C58: .4byte 0x0000046a
_08110C5C: .4byte 0x000008e4
_08110C60: .4byte 0x00000469
@@ -672,7 +672,7 @@ sub_8110D48: @ 8110D48
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r4, _08110D90 @ =gUnknown_3005008
ldr r4, _08110D90 @ =gSaveBlock1Ptr
movs r1, 0xCD
lsls r1, 3
muls r1, r0
@@ -703,7 +703,7 @@ sub_8110D48: @ 8110D48
pop {r0}
bx r0
.align 2, 0
_08110D90: .4byte gUnknown_3005008
_08110D90: .4byte gSaveBlock1Ptr
thumb_func_end sub_8110D48
thumb_func_start sub_8110D94
@@ -715,7 +715,7 @@ sub_8110D94: @ 8110D94
push {r5-r7}
sub sp, 0xC
movs r4, 0
ldr r0, _08110E14 @ =gUnknown_3005008
ldr r0, _08110E14 @ =gSaveBlock1Ptr
mov r10, r0
ldr r1, _08110E18 @ =0x0000063a
mov r9, r1
@@ -775,7 +775,7 @@ _08110DDE:
pop {r0}
bx r0
.align 2, 0
_08110E14: .4byte gUnknown_3005008
_08110E14: .4byte gSaveBlock1Ptr
_08110E18: .4byte 0x0000063a
_08110E1C: .4byte 0x000040aa
thumb_func_end sub_8110D94
@@ -784,7 +784,7 @@ _08110E1C: .4byte 0x000040aa
sub_8110E20: @ 8110E20
push {lr}
ldr r0, _08110E34 @ =0x000040ae
ldr r1, _08110E38 @ =gUnknown_3005008
ldr r1, _08110E38 @ =gSaveBlock1Ptr
ldr r1, [r1]
ldrh r1, [r1, 0x32]
bl VarSet
@@ -792,7 +792,7 @@ sub_8110E20: @ 8110E20
bx r0
.align 2, 0
_08110E34: .4byte 0x000040ae
_08110E38: .4byte gUnknown_3005008
_08110E38: .4byte gSaveBlock1Ptr
thumb_func_end sub_8110E20
thumb_func_start sub_8110E3C
@@ -916,7 +916,7 @@ sub_8110F14: @ 8110F14
movs r0, 0
strb r0, [r1]
movs r2, 0
ldr r0, _08110F70 @ =gUnknown_3005008
ldr r0, _08110F70 @ =gSaveBlock1Ptr
ldr r5, [r0]
movs r7, 0xCD
lsls r7, 3
@@ -953,7 +953,7 @@ _08110F48:
b _08110F84
.align 2, 0
_08110F6C: .4byte gUnknown_203ADF9
_08110F70: .4byte gUnknown_3005008
_08110F70: .4byte gSaveBlock1Ptr
_08110F74: .4byte gUnknown_3005ECC
_08110F78:
ldr r0, _08110F8C @ =sub_8056938
@@ -971,7 +971,7 @@ _08110F8C: .4byte sub_8056938
thumb_func_start sub_8110F90
sub_8110F90: @ 8110F90
push {lr}
ldr r1, _08110FC0 @ =gUnknown_3005008
ldr r1, _08110FC0 @ =gSaveBlock1Ptr
ldr r2, [r1]
movs r3, 0
movs r0, 0x3
@@ -993,7 +993,7 @@ sub_8110F90: @ 8110F90
pop {r0}
bx r0
.align 2, 0
_08110FC0: .4byte gUnknown_3005008
_08110FC0: .4byte gSaveBlock1Ptr
_08110FC4: .4byte gUnknown_203ADF8
_08110FC8: .4byte gUnknown_2031DD8
thumb_func_end sub_8110F90
@@ -1189,7 +1189,7 @@ sub_8111150: @ 8111150
push {r5-r7}
lsls r0, 24
lsrs r0, 24
ldr r2, _081111A8 @ =gUnknown_3005008
ldr r2, _081111A8 @ =gSaveBlock1Ptr
movs r1, 0xCD
lsls r1, 3
muls r0, r1
@@ -1227,7 +1227,7 @@ _08111180:
negs r0, r0
b _081111C4
.align 2, 0
_081111A8: .4byte gUnknown_3005008
_081111A8: .4byte gSaveBlock1Ptr
_081111AC: .4byte 0x000008e4
_081111B0: .4byte 0x00000469
_081111B4:
@@ -1335,7 +1335,7 @@ sub_8111274: @ 8111274
lsls r1, 24
cmp r1, 0
bne _081112D4
ldr r3, _081112C8 @ =gUnknown_3005008
ldr r3, _081112C8 @ =gSaveBlock1Ptr
ldr r2, [r3]
movs r0, 0xCD
lsls r0, 3
@@ -1370,11 +1370,11 @@ sub_8111274: @ 8111274
strh r0, [r2, 0x2]
b _08111336
.align 2, 0
_081112C8: .4byte gUnknown_3005008
_081112C8: .4byte gSaveBlock1Ptr
_081112CC: .4byte 0x00001301
_081112D0: .4byte 0x00001304
_081112D4:
ldr r0, _08111340 @ =gUnknown_3005008
ldr r0, _08111340 @ =gSaveBlock1Ptr
ldr r3, [r0]
movs r0, 0xCD
lsls r0, 3
@@ -1428,7 +1428,7 @@ _08111336:
pop {r0}
bx r0
.align 2, 0
_08111340: .4byte gUnknown_3005008
_08111340: .4byte gSaveBlock1Ptr
_08111344: .4byte 0x00001301
_08111348: .4byte 0xffffff00
_0811134C: .4byte 0x00001302
@@ -1494,7 +1494,7 @@ _081113E0: .4byte sub_805726C
thumb_func_start sub_81113E4
sub_81113E4: @ 81113E4
push {r4,r5,lr}
ldr r4, _08111430 @ =gUnknown_3005008
ldr r4, _08111430 @ =gSaveBlock1Ptr
ldr r0, _08111434 @ =gUnknown_203ADF8
ldrb r1, [r0]
movs r0, 0xCD
@@ -1528,7 +1528,7 @@ sub_81113E4: @ 81113E4
pop {r0}
bx r0
.align 2, 0
_08111430: .4byte gUnknown_3005008
_08111430: .4byte gSaveBlock1Ptr
_08111434: .4byte gUnknown_203ADF8
thumb_func_end sub_81113E4
@@ -1845,7 +1845,7 @@ sub_8111688: @ 8111688
push {r7}
sub sp, 0x8
movs r5, 0
ldr r0, _081116CC @ =gUnknown_3005008
ldr r0, _081116CC @ =gSaveBlock1Ptr
mov r8, r0
ldr r7, _081116D0 @ =0x0000063a
_08111698:
@@ -1876,7 +1876,7 @@ _081116B2:
strb r1, [r0]
b _081116E4
.align 2, 0
_081116CC: .4byte gUnknown_3005008
_081116CC: .4byte gSaveBlock1Ptr
_081116D0: .4byte 0x0000063a
_081116D4: .4byte 0x000040aa
_081116D8:
@@ -1913,7 +1913,7 @@ sub_8111708: @ 8111708
sub sp, 0x1C
ldr r0, _08111754 @ =0x000040ae
bl VarGet
ldr r4, _08111758 @ =gUnknown_3005008
ldr r4, _08111758 @ =gSaveBlock1Ptr
ldr r1, [r4]
strh r0, [r1, 0x32]
lsls r0, 16
@@ -1947,7 +1947,7 @@ _0811174A:
bx r0
.align 2, 0
_08111754: .4byte 0x000040ae
_08111758: .4byte gUnknown_3005008
_08111758: .4byte gSaveBlock1Ptr
thumb_func_end sub_8111708
thumb_func_start sub_811175C
@@ -1978,7 +1978,7 @@ _08111780:
lsrs r7, r0, 16
cmp r7, 0x1F
bls _08111780
ldr r1, _081117BC @ =gUnknown_3005008
ldr r1, _081117BC @ =gSaveBlock1Ptr
movs r0, 0xCD
lsls r0, 3
muls r0, r4
@@ -2002,7 +2002,7 @@ _081117AE:
mov pc, r0
.align 2, 0
_081117B8: .4byte gUnknown_203AE0C
_081117BC: .4byte gUnknown_3005008
_081117BC: .4byte gSaveBlock1Ptr
_081117C0: .4byte 0x00001868
_081117C4: .4byte 0x00000fff
_081117C8: .4byte _081117CC
@@ -2154,7 +2154,7 @@ sub_8111914: @ 8111914
lsrs r0, 24
cmp r0, 0x3
bhi _08111970
ldr r0, _08111968 @ =gUnknown_3005008
ldr r0, _08111968 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r2, [r1]
movs r1, 0xCD
@@ -2176,7 +2176,7 @@ sub_8111914: @ 8111914
.align 2, 0
_08111960: .4byte gUnknown_2037AB8
_08111964: .4byte gUnknown_203ADF8
_08111968: .4byte gUnknown_3005008
_08111968: .4byte gSaveBlock1Ptr
_0811196C: .4byte gUnknown_203ADF9
_08111970:
ldr r1, _08111980 @ =gUnknown_3005E88
@@ -2584,7 +2584,7 @@ sub_8111C68: @ 8111C68
ands r4, r2
cmp r4, 0
bne _08111CC6
ldr r0, _08111CA0 @ =gUnknown_30030F0
ldr r0, _08111CA0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r3, 0x1
ands r3, r1
@@ -2603,7 +2603,7 @@ sub_8111C68: @ 8111C68
b _08111CC6
.align 2, 0
_08111C9C: .4byte gUnknown_203AE94
_08111CA0: .4byte gUnknown_30030F0
_08111CA0: .4byte gMain
_08111CA4: .4byte gUnknown_3005E88
_08111CA8:
movs r0, 0x2
@@ -2872,7 +2872,7 @@ sub_8111E84: @ 8111E84
lsrs r0, 24
cmp r0, 0x3
bhi _08111EEE
ldr r0, _08111F08 @ =gUnknown_3005008
ldr r0, _08111F08 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r2, [r3]
movs r1, 0xCD
@@ -2897,7 +2897,7 @@ _08111EBE:
lsrs r0, 24
cmp r0, 0x3
bhi _08111EEE
ldr r0, _08111F08 @ =gUnknown_3005008
ldr r0, _08111F08 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldrb r2, [r4]
movs r0, 0xCD
@@ -2922,7 +2922,7 @@ _08111EF8:
.align 2, 0
_08111F00: .4byte gUnknown_2037AB8
_08111F04: .4byte gUnknown_203ADF8
_08111F08: .4byte gUnknown_3005008
_08111F08: .4byte gSaveBlock1Ptr
_08111F0C: .4byte gUnknown_203AE98
_08111F10: .4byte gUnknown_3005E88
thumb_func_end sub_8111E84
@@ -3085,7 +3085,7 @@ sub_8112044: @ 8112044
lsls r1, 3
ldr r0, _0811208C @ =gUnknown_3005090
adds r4, r1, r0
ldr r0, _08112090 @ =gUnknown_30030F0
ldr r0, _08112090 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -3114,7 +3114,7 @@ _08112076:
b _081120A4
.align 2, 0
_0811208C: .4byte gUnknown_3005090
_08112090: .4byte gUnknown_30030F0
_08112090: .4byte gMain
_08112094: .4byte gUnknown_203AE94
_08112098: .4byte sub_81120AC
_0811209C: .4byte gUnknown_203ADFA
@@ -3511,7 +3511,7 @@ _081123D6:
bls _081123DC
movs r4, 0
_081123DC:
ldr r3, _0811244C @ =gUnknown_3005008
ldr r3, _0811244C @ =gSaveBlock1Ptr
ldr r0, [r3]
movs r2, 0xCD
lsls r2, 3
@@ -3564,7 +3564,7 @@ _0811240A:
bx r0
.align 2, 0
_08112448: .4byte gUnknown_203ADF8
_0811244C: .4byte gUnknown_3005008
_0811244C: .4byte gSaveBlock1Ptr
thumb_func_end sub_81123BC
thumb_func_start sub_8112450
@@ -5192,7 +5192,7 @@ sub_8113078: @ 8113078
adds r0, r4, 0
bl sub_81132E0
ldr r0, _081130A0 @ =0x00004039
ldr r1, _081130A4 @ =gUnknown_300500C
ldr r1, _081130A4 @ =gSaveBlock2Ptr
ldr r1, [r1]
ldrh r1, [r1, 0xE]
bl VarSet
@@ -5202,7 +5202,7 @@ _08113098:
bx r0
.align 2, 0
_081130A0: .4byte 0x00004039
_081130A4: .4byte gUnknown_300500C
_081130A4: .4byte gSaveBlock2Ptr
thumb_func_end sub_8113078
thumb_func_start sub_81130A8
@@ -5231,7 +5231,7 @@ sub_81130BC: @ 81130BC
adds r0, r4, 0
bl sub_8113390
ldr r0, _08113108 @ =0x00004039
ldr r1, _0811310C @ =gUnknown_300500C
ldr r1, _0811310C @ =gSaveBlock2Ptr
ldr r1, [r1]
ldrh r1, [r1, 0xE]
bl VarSet
@@ -5252,7 +5252,7 @@ _08113102:
bx r0
.align 2, 0
_08113108: .4byte 0x00004039
_0811310C: .4byte gUnknown_300500C
_0811310C: .4byte gSaveBlock2Ptr
_08113110: .4byte 0x00004073
thumb_func_end sub_81130BC
@@ -5517,7 +5517,7 @@ sub_81132E0: @ 81132E0
push {r4-r6,lr}
adds r4, r0, 0
movs r5, 0
ldr r2, _081132F8 @ =gUnknown_300500C
ldr r2, _081132F8 @ =gSaveBlock2Ptr
ldr r0, [r2]
ldrh r1, [r0, 0xE]
ldr r0, _081132FC @ =0x000003e6
@@ -5526,7 +5526,7 @@ sub_81132E0: @ 81132E0
adds r6, r2, 0
b _08113338
.align 2, 0
_081132F8: .4byte gUnknown_300500C
_081132F8: .4byte gSaveBlock2Ptr
_081132FC: .4byte 0x000003e6
_08113300:
ldr r0, _08113354 @ =0x00004039
@@ -5659,7 +5659,7 @@ _081133F4:
_081133F6:
movs r3, 0x1
_081133F8:
ldr r0, _0811340C @ =gUnknown_300500C
ldr r0, _0811340C @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, _08113410 @ =0x00000a98
adds r0, r1
@@ -5668,7 +5668,7 @@ _081133F8:
pop {r0}
bx r0
.align 2, 0
_0811340C: .4byte gUnknown_300500C
_0811340C: .4byte gSaveBlock2Ptr
_08113410: .4byte 0x00000a98
thumb_func_end sub_81133A4
@@ -5709,7 +5709,7 @@ _08113454: .4byte gUnknown_2021CD0
_08113458: .4byte gUnknown_84178DA
_0811345C:
ldr r0, _0811346C @ =gUnknown_2021CD0
ldr r1, _08113470 @ =gUnknown_3005008
ldr r1, _08113470 @ =gSaveBlock1Ptr
ldr r1, [r1]
ldr r2, _08113474 @ =0x00003a4c
adds r1, r2
@@ -5717,7 +5717,7 @@ _0811345C:
b _081134B2
.align 2, 0
_0811346C: .4byte gUnknown_2021CD0
_08113470: .4byte gUnknown_3005008
_08113470: .4byte gSaveBlock1Ptr
_08113474: .4byte 0x00003a4c
_08113478:
ldr r4, _08113498 @ =gUnknown_2021CD0
@@ -6030,7 +6030,7 @@ _081136D0: .4byte gUnknown_203B048
thumb_func_start sub_81136D4
sub_81136D4: @ 81136D4
push {lr}
ldr r0, _08113728 @ =gUnknown_3005008
ldr r0, _08113728 @ =gSaveBlock1Ptr
ldr r2, [r0]
movs r1, 0x4
ldrsb r1, [r2, r1]
@@ -6075,7 +6075,7 @@ _08113724:
movs r0, 0x1
b _08113742
.align 2, 0
_08113728: .4byte gUnknown_3005008
_08113728: .4byte gSaveBlock1Ptr
_0811372C: .4byte 0x0000090e
_08113730: .4byte 0x00002e01
_08113734: .4byte 0x00003a01
@@ -8112,7 +8112,7 @@ sub_811464C: @ 811464C
bl sub_8115834
adds r0, r5, 0
bl sub_8115834
ldr r0, _08114700 @ =gUnknown_300500C
ldr r0, _08114700 @ =gSaveBlock2Ptr
ldr r1, [r0]
movs r0, 0
bl UnkTextUtil_SetPtrI
@@ -8146,7 +8146,7 @@ sub_811464C: @ 811464C
_081146F4: .4byte gUnknown_2021CD0
_081146F8: .4byte gUnknown_2021CF0
_081146FC: .4byte gUnknown_2021D04
_08114700: .4byte gUnknown_300500C
_08114700: .4byte gSaveBlock2Ptr
_08114704: .4byte gUnknown_8456AE4
_08114708: .4byte gUnknown_2021D18
_0811470C: .4byte gUnknown_841A4C6
@@ -9166,7 +9166,7 @@ _08114E84:
movs r0, 0x4
adds r1, r4, 0
bl UnkTextUtil_SetPtrI
ldr r0, _08114F0C @ =gUnknown_300500C
ldr r0, _08114F0C @ =gSaveBlock2Ptr
ldr r1, [r0]
movs r0, 0x5
bl UnkTextUtil_SetPtrI
@@ -9184,7 +9184,7 @@ _08114E84:
_08114F00: .4byte gUnknown_2021CD0
_08114F04: .4byte gUnknown_2021CF0
_08114F08: .4byte gUnknown_2021D04
_08114F0C: .4byte gUnknown_300500C
_08114F0C: .4byte gSaveBlock2Ptr
_08114F10: .4byte gUnknown_2021D18
_08114F14: .4byte gUnknown_841AA01
_08114F18:
@@ -9439,11 +9439,11 @@ _0811510C:
beq _08115194
b _081151AC
_08115112:
ldr r0, _08115134 @ =gUnknown_300500C
ldr r0, _08115134 @ =gSaveBlock2Ptr
ldr r1, [r0]
movs r0, 0
bl UnkTextUtil_SetPtrI
ldr r0, _08115138 @ =gUnknown_3005008
ldr r0, _08115138 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, _0811513C @ =0x00003a4c
adds r1, r0
@@ -9454,13 +9454,13 @@ _08115112:
bl UnkTextUtil_StringExpandPlaceholders
b _081151AC
.align 2, 0
_08115134: .4byte gUnknown_300500C
_08115138: .4byte gUnknown_3005008
_08115134: .4byte gSaveBlock2Ptr
_08115138: .4byte gSaveBlock1Ptr
_0811513C: .4byte 0x00003a4c
_08115140: .4byte gUnknown_2021D18
_08115144: .4byte gUnknown_841A2E1
_08115148:
ldr r0, _08115180 @ =gUnknown_3005008
ldr r0, _08115180 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, _08115184 @ =0x00003a4c
adds r1, r0
@@ -9470,7 +9470,7 @@ _08115148:
movs r1, 0
movs r2, 0x1
bl sub_8113EAC
ldr r0, _08115188 @ =gUnknown_300500C
ldr r0, _08115188 @ =gSaveBlock2Ptr
ldr r1, [r0]
movs r0, 0x2
bl UnkTextUtil_SetPtrI
@@ -9483,9 +9483,9 @@ _08115148:
bl UnkTextUtil_StringExpandPlaceholders
b _081151AC
.align 2, 0
_08115180: .4byte gUnknown_3005008
_08115180: .4byte gSaveBlock1Ptr
_08115184: .4byte 0x00003a4c
_08115188: .4byte gUnknown_300500C
_08115188: .4byte gSaveBlock2Ptr
_0811518C: .4byte gUnknown_2021D18
_08115190: .4byte gUnknown_841A312
_08115194:
@@ -10062,7 +10062,7 @@ sub_81155E0: @ 81155E0
ldrb r0, [r7, 0x1]
cmp r0, 0
bne _08115690
ldr r0, _08115640 @ =gUnknown_300500C
ldr r0, _08115640 @ =gSaveBlock2Ptr
ldr r1, [r0]
movs r0, 0
bl UnkTextUtil_SetPtrI
@@ -10083,7 +10083,7 @@ sub_81155E0: @ 81155E0
b _08115670
.align 2, 0
_0811563C: .4byte gUnknown_2021CD0
_08115640: .4byte gUnknown_300500C
_08115640: .4byte gSaveBlock2Ptr
_08115644: .4byte gUnknown_841A8D4
_08115648:
ldr r4, _0811567C @ =gUnknown_2021CF0

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