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

Rename most special vars

Browse Source
This commit is contained in:
PikalaxALT
2018-12-05 08:43:55 -05:00
parent d08f95be8a
commit c14c6d36f8
62 changed files with 893 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_2.s
+4 -4
View File
@@ -2375,7 +2375,7 @@ sub_8011100: @ 8011100
ands r0, r1
cmp r0, 0
beq _08011158
ldr r2, _08011168 @ =gUnknown_20370D0
ldr r2, _08011168 @ =gSpecialVar_Result
ldr r1, _0801116C @ =gUnknown_2023E8A
movs r0, 0x3
strb r0, [r1]
@@ -2398,7 +2398,7 @@ _08011158:
.align 2, 0
_08011160: .4byte gMain
_08011164: .4byte gBattleTypeFlags
_08011168: .4byte gUnknown_20370D0
_08011168: .4byte gSpecialVar_Result
_0801116C: .4byte gUnknown_2023E8A
_08011170: .4byte CB2_QuitRecordedBattle
thumb_func_end sub_8011100
@@ -11652,7 +11652,7 @@ _08015B74:
cmp r0, 0
bne _08015BD4
_08015B86:
ldr r1, _08015BE8 @ =gUnknown_20370D0
ldr r1, _08015BE8 @ =gSpecialVar_Result
ldr r5, _08015BEC @ =gUnknown_2023E8A
ldrb r0, [r5]
strh r0, [r1]
@@ -11697,7 +11697,7 @@ _08015BD4:
_08015BDC: .4byte gBattleTypeFlags
_08015BE0: .4byte gPlayerParty
_08015BE4: .4byte gUnknown_3003F64
_08015BE8: .4byte gUnknown_20370D0
_08015BE8: .4byte gSpecialVar_Result
_08015BEC: .4byte gUnknown_2023E8A
_08015BF0: .4byte gMain
_08015BF4: .4byte 0x00000439
asm/battle_controller_oak.s
+6 -6
View File
@@ -677,7 +677,7 @@ sub_80E7AC4: @ 80E7AC4
lsls r0, 24
cmp r0, 0
bne _080E7B34
ldr r0, _080E7B20 @ =gUnknown_203AD30
ldr r0, _080E7B20 @ =gSpecialVar_ItemId
ldrh r0, [r0]
cmp r0, 0xD
bne _080E7B34
@@ -701,13 +701,13 @@ sub_80E7AC4: @ 80E7AC4
_080E7B14: .4byte gMain
_080E7B18: .4byte sub_8011100
_080E7B1C: .4byte gPaletteFade
_080E7B20: .4byte gUnknown_203AD30
_080E7B20: .4byte gSpecialVar_ItemId
_080E7B24: .4byte gBattleTypeFlags
_080E7B28: .4byte gUnknown_3004FE0
_080E7B2C: .4byte gActiveBattler
_080E7B30: .4byte sub_80E8704
_080E7B34:
ldr r0, _080E7B48 @ =gUnknown_203AD30
ldr r0, _080E7B48 @ =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0x1
bl EmitOneReturnValue
@@ -716,7 +716,7 @@ _080E7B42:
pop {r0}
bx r0
.align 2, 0
_080E7B48: .4byte gUnknown_203AD30
_080E7B48: .4byte gSpecialVar_ItemId
thumb_func_end sub_80E7AC4
thumb_func_start sub_80E7B4C
@@ -2341,7 +2341,7 @@ _080E8880:
cmp r4, 0
bne _080E88AA
bl sub_80EB524
ldr r0, _080E88B8 @ =gUnknown_203AD30
ldr r0, _080E88B8 @ =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0x1
bl EmitOneReturnValue
@@ -2357,7 +2357,7 @@ _080E88AA:
bx r0
.align 2, 0
_080E88B4: .4byte gPaletteFade
_080E88B8: .4byte gUnknown_203AD30
_080E88B8: .4byte gSpecialVar_ItemId
_080E88BC: .4byte gBattleStruct
thumb_func_end sub_80E8704
asm/battle_controller_player.s
+2 -2
View File
@@ -4435,7 +4435,7 @@ CompleteWhenChoseItem: @ 803073C
ands r0, r1
cmp r0, 0
bne _08030762
ldr r0, _08030774 @ =gUnknown_203AD30
ldr r0, _08030774 @ =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0x1
bl EmitOneReturnValue
@@ -4447,7 +4447,7 @@ _08030762:
_08030768: .4byte gMain
_0803076C: .4byte sub_8011100
_08030770: .4byte gPaletteFade
_08030774: .4byte gUnknown_203AD30
_08030774: .4byte gSpecialVar_ItemId
thumb_func_end CompleteWhenChoseItem
thumb_func_start CompleteOnSpecialAnimDone
asm/battle_controller_pokedude.s
+6 -6
View File
@@ -22,7 +22,7 @@ sub_81560A4: @ 81560A4
ldr r2, _081560D4 @ =gBattleStruct
ldr r0, [r2]
adds r0, 0x96
ldr r1, _081560D8 @ =gUnknown_20370C0
ldr r1, _081560D8 @ =gSpecialVar_0x8004
ldrh r1, [r1]
strb r1, [r0]
ldr r0, [r2]
@@ -35,7 +35,7 @@ _081560C8: .4byte gUnknown_3004FE0
_081560CC: .4byte gActiveBattler
_081560D0: .4byte sub_81560DC
_081560D4: .4byte gBattleStruct
_081560D8: .4byte gUnknown_20370C0
_081560D8: .4byte gSpecialVar_0x8004
thumb_func_end sub_81560A4
thumb_func_start sub_81560DC
@@ -642,7 +642,7 @@ sub_8156594: @ 8156594
str r1, [r0]
bl nullsub_44
bl FreeAllWindowBuffers
ldr r0, _081565D8 @ =gUnknown_20370C0
ldr r0, _081565D8 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x1
beq _081565C4
@@ -656,7 +656,7 @@ _081565C8: .4byte gPaletteFade
_081565CC: .4byte gUnknown_3004FE0
_081565D0: .4byte gActiveBattler
_081565D4: .4byte sub_81565E8
_081565D8: .4byte gUnknown_20370C0
_081565D8: .4byte gSpecialVar_0x8004
_081565DC:
movs r0, 0x8
_081565DE:
@@ -680,7 +680,7 @@ sub_81565E8: @ 81565E8
ands r0, r1
cmp r0, 0
bne _0815660E
ldr r0, _08156620 @ =gUnknown_203AD30
ldr r0, _08156620 @ =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0x1
bl EmitOneReturnValue
@@ -692,7 +692,7 @@ _0815660E:
_08156614: .4byte gMain
_08156618: .4byte sub_8011100
_0815661C: .4byte gPaletteFade
_08156620: .4byte gUnknown_203AD30
_08156620: .4byte gSpecialVar_ItemId
thumb_func_end sub_81565E8
thumb_func_start sub_8156624
asm/battle_controller_safari.s
+2 -2
View File
@@ -431,7 +431,7 @@ CompleteWhenChosePokeblock: @ 80DD85C
ands r0, r1
cmp r0, 0
bne _080DD882
ldr r0, _080DD894 @ =gUnknown_203AD30
ldr r0, _080DD894 @ =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0x1
bl EmitOneReturnValue
@@ -443,7 +443,7 @@ _080DD882:
_080DD888: .4byte gMain
_080DD88C: .4byte sub_8011100
_080DD890: .4byte gPaletteFade
_080DD894: .4byte gUnknown_203AD30
_080DD894: .4byte gSpecialVar_ItemId
thumb_func_end CompleteWhenChosePokeblock
thumb_func_start CompleteOnFinishedBattleAnimation_3
asm/battle_records.s
+2 -2
View File
@@ -129,7 +129,7 @@ _080CD338:
bl sub_80CD628
ldr r0, _080CD350 @ =sub_80CD38C
bl SetVBlankCallback
ldr r0, _080CD354 @ =gUnknown_20370C0
ldr r0, _080CD354 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
beq _080CD358
@@ -137,7 +137,7 @@ _080CD338:
b _080CD35C
.align 2, 0
_080CD350: .4byte sub_80CD38C
_080CD354: .4byte gUnknown_20370C0
_080CD354: .4byte gSpecialVar_0x8004
_080CD358:
bl sub_80CDBE4
_080CD35C:
asm/battle_setup.s
+12 -12
View File
@@ -721,13 +721,13 @@ _0807FC30:
ldrb r0, [r4]
cmp r0, 0x1
bne _0807FC40
ldr r0, _0807FC3C @ =gUnknown_20370D0
ldr r0, _0807FC3C @ =gSpecialVar_Result
strh r1, [r0]
b _0807FC46
.align 2, 0
_0807FC3C: .4byte gUnknown_20370D0
_0807FC3C: .4byte gSpecialVar_Result
_0807FC40:
ldr r1, _0807FC54 @ =gUnknown_20370D0
ldr r1, _0807FC54 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_0807FC46:
@@ -739,7 +739,7 @@ _0807FC4C:
pop {r0}
bx r0
.align 2, 0
_0807FC54: .4byte gUnknown_20370D0
_0807FC54: .4byte gSpecialVar_Result
_0807FC58: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_807FBF0
@@ -1503,7 +1503,7 @@ battle_80801F0: @ 80801F0
ldrh r1, [r0]
cmp r1, 0
beq _08080212
ldr r0, _0808021C @ =gUnknown_20370D2
ldr r0, _0808021C @ =gSpecialVar_LastTalked
strh r1, [r0]
lsls r0, r1, 24
lsrs r0, 24
@@ -1519,7 +1519,7 @@ _08080212:
bx r0
.align 2, 0
_08080218: .4byte gUnknown_20386B0
_0808021C: .4byte gUnknown_20370D2
_0808021C: .4byte gSpecialVar_LastTalked
_08080220: .4byte gSaveBlock1Ptr
_08080224: .4byte gUnknown_3005074
thumb_func_end battle_80801F0
@@ -1649,7 +1649,7 @@ TrainerWantsBattle: @ 8080334
lsrs r0, 24
ldr r2, _08080368 @ =gUnknown_3005074
strb r0, [r2]
ldr r4, _0808036C @ =gUnknown_20370D2
ldr r4, _0808036C @ =gSpecialVar_LastTalked
ldr r3, _08080370 @ =gMapObjects
lsls r2, r0, 3
adds r2, r0
@@ -1668,7 +1668,7 @@ TrainerWantsBattle: @ 8080334
bx r0
.align 2, 0
_08080368: .4byte gUnknown_3005074
_0808036C: .4byte gUnknown_20370D2
_0808036C: .4byte gSpecialVar_LastTalked
_08080370: .4byte gMapObjects
_08080374: .4byte gUnknown_81A4EB4
thumb_func_end TrainerWantsBattle
@@ -1859,7 +1859,7 @@ sub_80804AC: @ 80804AC
adds r1, r0, 0
cmp r1, 0x1
bne _080804E8
ldr r0, _080804E0 @ =gUnknown_20370D0
ldr r0, _080804E0 @ =gSpecialVar_Result
strh r1, [r0]
ldr r0, _080804E4 @ =gUnknown_20386CC
ldrh r0, [r0]
@@ -1871,10 +1871,10 @@ sub_80804AC: @ 80804AC
.align 2, 0
_080804D8: .4byte gUnknown_20386AC
_080804DC: .4byte gUnknown_2023E8A
_080804E0: .4byte gUnknown_20370D0
_080804E0: .4byte gSpecialVar_Result
_080804E4: .4byte gUnknown_20386CC
_080804E8:
ldr r0, _08080500 @ =gUnknown_20370D0
ldr r0, _08080500 @ =gSpecialVar_Result
movs r1, 0
strh r1, [r0]
_080804EE:
@@ -1884,7 +1884,7 @@ _080804EE:
bl sub_81139BC
b _0808054E
.align 2, 0
_08080500: .4byte gUnknown_20370D0
_08080500: .4byte gSpecialVar_Result
_08080504: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080508:
ldr r0, _0808051C @ =gTrainerBattleOpponent_A
asm/battle_tower.s
+46 -46
View File
@@ -144,7 +144,7 @@ sub_80E5A70: @ 80E5A70
movs r0, 0
strb r0, [r4]
bl ValidateEReaderTrainer
ldr r0, _080E5AA4 @ =gUnknown_20370D0
ldr r0, _080E5AA4 @ =gSpecialVar_Result
ldrh r0, [r0]
adds r7, r4, 0
cmp r0, 0
@@ -160,7 +160,7 @@ _080E5A9E:
movs r0, 0
b _080E5B02
.align 2, 0
_080E5AA4: .4byte gUnknown_20370D0
_080E5AA4: .4byte gSpecialVar_Result
_080E5AA8: .4byte gSaveBlock2Ptr
_080E5AAC: .4byte 0x000004a2
_080E5AB0:
@@ -1747,7 +1747,7 @@ _080E6662:
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
ldr r5, _080E6728 @ =gUnknown_20370D0
ldr r5, _080E6728 @ =gSpecialVar_Result
ldrb r3, [r5]
str r4, [sp]
add r0, sp, 0x10
@@ -1769,7 +1769,7 @@ _080E6662:
ldr r1, _080E672C @ =gStringVar1
movs r0, 0xFF
strb r0, [r1]
ldr r1, _080E6730 @ =gUnknown_20370C0
ldr r1, _080E6730 @ =gSpecialVar_0x8004
movs r0, 0x1
strh r0, [r1]
movs r0, 0
@@ -1810,9 +1810,9 @@ _080E6704:
b _080E6742
.align 2, 0
_080E6724: .4byte gPlayerParty
_080E6728: .4byte gUnknown_20370D0
_080E6728: .4byte gSpecialVar_Result
_080E672C: .4byte gStringVar1
_080E6730: .4byte gUnknown_20370C0
_080E6730: .4byte gSpecialVar_0x8004
_080E6734: .4byte gUnknown_84020C4
_080E6738: .4byte 0x0000ffff
_080E673C: .4byte gUnknown_83FE860
@@ -1825,7 +1825,7 @@ _080E6742:
.align 2, 0
_080E674C: .4byte gUnknown_83FE864
_080E6750:
ldr r1, _080E6780 @ =gUnknown_20370C0
ldr r1, _080E6780 @ =gSpecialVar_0x8004
movs r0, 0
strh r0, [r1]
ldr r0, _080E6784 @ =gSaveBlock2Ptr
@@ -1851,7 +1851,7 @@ _080E6770:
pop {r0}
bx r0
.align 2, 0
_080E6780: .4byte gUnknown_20370C0
_080E6780: .4byte gSpecialVar_0x8004
_080E6784: .4byte gSaveBlock2Ptr
_080E6788: .4byte 0x0000055c
thumb_func_end sub_80E6648
@@ -2053,7 +2053,7 @@ sub_80E6900: @ 80E6900
push {r4-r6,lr}
sub sp, 0x4
ldr r0, _080E691C @ =gUnknown_203AAB8
ldr r1, _080E6920 @ =gUnknown_20370C0
ldr r1, _080E6920 @ =gSpecialVar_0x8004
ldrh r1, [r1]
strh r1, [r0]
ldrh r2, [r0]
@@ -2066,7 +2066,7 @@ sub_80E6900: @ 80E6900
b _080E69E6
.align 2, 0
_080E691C: .4byte gUnknown_203AAB8
_080E6920: .4byte gUnknown_20370C0
_080E6920: .4byte gSpecialVar_0x8004
_080E6924:
cmp r2, 0x2
beq _080E6998
@@ -2180,7 +2180,7 @@ sub_80E6A0C: @ 80E6A0C
ldrb r0, [r0]
lsls r0, 31
lsrs r5, r0, 31
ldr r0, _080E6A3C @ =gUnknown_20370C0
ldr r0, _080E6A3C @ =gSpecialVar_0x8004
ldrh r0, [r0]
adds r6, r1, 0
cmp r0, 0xE
@@ -2195,7 +2195,7 @@ _080E6A28:
.align 2, 0
_080E6A34: .4byte gSaveBlock2Ptr
_080E6A38: .4byte 0x0000055c
_080E6A3C: .4byte gUnknown_20370C0
_080E6A3C: .4byte gSpecialVar_0x8004
_080E6A40: .4byte _080E6A44
.align 2, 0
_080E6A44:
@@ -2339,7 +2339,7 @@ _080E6B66:
adds r0, 0x1
strh r0, [r1]
bl sub_80E6E48
ldr r1, _080E6B9C @ =gUnknown_20370D0
ldr r1, _080E6B9C @ =gSpecialVar_Result
ldr r0, [r6]
adds r0, r4
adds r0, r5
@@ -2354,7 +2354,7 @@ _080E6B66:
.align 2, 0
_080E6B94: .4byte 0x0000056c
_080E6B98: .4byte 0x0000270e
_080E6B9C: .4byte gUnknown_20370D0
_080E6B9C: .4byte gSpecialVar_Result
_080E6BA0: .4byte gStringVar1
_080E6BA4:
ldr r0, [r6]
@@ -2370,7 +2370,7 @@ _080E6BA4:
strh r0, [r2]
_080E6BBA:
bl sub_80E6E48
ldr r0, _080E6BD4 @ =gUnknown_20370D0
ldr r0, _080E6BD4 @ =gSpecialVar_Result
ldr r1, [r6]
adds r1, r4
adds r1, r5
@@ -2381,7 +2381,7 @@ _080E6BC6:
.align 2, 0
_080E6BCC: .4byte 0x00000564
_080E6BD0: .4byte 0x00000595
_080E6BD4: .4byte gUnknown_20370D0
_080E6BD4: .4byte gSpecialVar_Result
_080E6BD8:
ldr r3, [r6]
ldr r0, _080E6BF8 @ =gSpecialVar_0x8005
@@ -2481,7 +2481,7 @@ sub_80E6C8C: @ 80E6C8C
ldrb r0, [r0]
lsls r0, 31
lsrs r4, r0, 31
ldr r0, _080E6CBC @ =gUnknown_20370C0
ldr r0, _080E6CBC @ =gSpecialVar_0x8004
ldrh r0, [r0]
adds r3, r1, 0
cmp r0, 0xE
@@ -2496,7 +2496,7 @@ _080E6CA8:
.align 2, 0
_080E6CB4: .4byte gSaveBlock2Ptr
_080E6CB8: .4byte 0x0000055c
_080E6CBC: .4byte gUnknown_20370C0
_080E6CBC: .4byte gSpecialVar_0x8004
_080E6CC0: .4byte _080E6CC4
.align 2, 0
_080E6CC4:
@@ -2516,17 +2516,17 @@ _080E6CC4:
.4byte _080E6DD4
.4byte _080E6DF4
_080E6D00:
ldr r0, _080E6D0C @ =gUnknown_20370D0
ldr r0, _080E6D0C @ =gSpecialVar_Result
ldr r1, [r3]
ldr r3, _080E6D10 @ =0x0000055e
adds r1, r3
adds r1, r4
b _080E6D60
.align 2, 0
_080E6D0C: .4byte gUnknown_20370D0
_080E6D0C: .4byte gSpecialVar_Result
_080E6D10: .4byte 0x0000055e
_080E6D14:
ldr r0, _080E6D24 @ =gUnknown_20370D0
ldr r0, _080E6D24 @ =gSpecialVar_Result
ldr r1, [r3]
ldr r2, _080E6D28 @ =0x0000055c
adds r1, r2
@@ -2534,19 +2534,19 @@ _080E6D14:
lsls r1, 31
b _080E6D7C
.align 2, 0
_080E6D24: .4byte gUnknown_20370D0
_080E6D24: .4byte gSpecialVar_Result
_080E6D28: .4byte 0x0000055c
_080E6D2C:
ldr r2, _080E6D38 @ =gUnknown_20370D0
ldr r2, _080E6D38 @ =gSpecialVar_Result
ldr r0, [r3]
lsls r1, r4, 1
movs r3, 0xAC
lsls r3, 3
b _080E6D44
.align 2, 0
_080E6D38: .4byte gUnknown_20370D0
_080E6D38: .4byte gSpecialVar_Result
_080E6D3C:
ldr r2, _080E6D50 @ =gUnknown_20370D0
ldr r2, _080E6D50 @ =gSpecialVar_Result
ldr r0, [r3]
lsls r1, r4, 1
ldr r3, _080E6D54 @ =0x00000564
@@ -2557,10 +2557,10 @@ _080E6D44:
strh r0, [r2]
b _080E6E08
.align 2, 0
_080E6D50: .4byte gUnknown_20370D0
_080E6D50: .4byte gSpecialVar_Result
_080E6D54: .4byte 0x00000564
_080E6D58:
ldr r0, _080E6D68 @ =gUnknown_20370D0
ldr r0, _080E6D68 @ =gSpecialVar_Result
ldr r1, [r3]
ldr r2, _080E6D6C @ =0x0000056c
adds r1, r2
@@ -2569,10 +2569,10 @@ _080E6D60:
strh r1, [r0]
b _080E6E08
.align 2, 0
_080E6D68: .4byte gUnknown_20370D0
_080E6D68: .4byte gSpecialVar_Result
_080E6D6C: .4byte 0x0000056c
_080E6D70:
ldr r0, _080E6D84 @ =gUnknown_20370D0
ldr r0, _080E6D84 @ =gSpecialVar_Result
ldr r1, [r3]
ldr r3, _080E6D88 @ =0x0000055c
adds r1, r3
@@ -2583,16 +2583,16 @@ _080E6D7C:
strh r1, [r0]
b _080E6E08
.align 2, 0
_080E6D84: .4byte gUnknown_20370D0
_080E6D84: .4byte gSpecialVar_Result
_080E6D88: .4byte 0x0000055c
_080E6D8C:
adds r0, r4, 0
bl sub_80E7188
ldr r1, _080E6D98 @ =gUnknown_20370D0
ldr r1, _080E6D98 @ =gSpecialVar_Result
strh r0, [r1]
b _080E6E08
.align 2, 0
_080E6D98: .4byte gUnknown_20370D0
_080E6D98: .4byte gSpecialVar_Result
_080E6D9C:
ldr r0, [r3]
ldr r1, _080E6DAC @ =0x0000057a
@@ -2868,7 +2868,7 @@ sub_80E6FB8: @ 80E6FB8
ldrb r0, [r0]
lsls r0, 31
lsrs r5, r0, 31
ldr r0, _080E7044 @ =gUnknown_20370C0
ldr r0, _080E7044 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x3
beq _080E6FD4
@@ -2899,7 +2899,7 @@ _080E6FF2:
ldr r2, _080E7050 @ =0x0000055d
adds r0, r2
strb r1, [r0]
ldr r0, _080E7044 @ =gUnknown_20370C0
ldr r0, _080E7044 @ =gSpecialVar_0x8004
ldrh r1, [r0]
cmp r1, 0x3
beq _080E7016
@@ -2928,7 +2928,7 @@ _080E7016:
.align 2, 0
_080E703C: .4byte gSaveBlock2Ptr
_080E7040: .4byte 0x0000055c
_080E7044: .4byte gUnknown_20370C0
_080E7044: .4byte gSpecialVar_0x8004
_080E7048: .4byte 0x00000564
_080E704C: .4byte gUnknown_2023E8A
_080E7050: .4byte 0x0000055d
@@ -3230,16 +3230,16 @@ sub_80E724C: @ 80E724C
ldrh r0, [r0]
ldr r1, _080E7290 @ =gStringVar1
bl sub_8099E90
ldr r0, _080E7294 @ =gUnknown_20370D0
ldr r0, _080E7294 @ =gSpecialVar_Result
strh r4, [r0]
b _080E72AA
.align 2, 0
_080E7288: .4byte gSaveBlock2Ptr
_080E728C: .4byte 0x0000055c
_080E7290: .4byte gStringVar1
_080E7294: .4byte gUnknown_20370D0
_080E7294: .4byte gSpecialVar_Result
_080E7298:
ldr r1, _080E72B0 @ =gUnknown_20370D0
ldr r1, _080E72B0 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r0, [r5]
@@ -3253,7 +3253,7 @@ _080E72AA:
pop {r0}
bx r0
.align 2, 0
_080E72B0: .4byte gUnknown_20370D0
_080E72B0: .4byte gSpecialVar_Result
_080E72B4: .4byte 0x0000055e
thumb_func_end sub_80E724C
@@ -3273,7 +3273,7 @@ sub_80E72B8: @ 80E72B8
beq _080E72D2
movs r7, 0x45
_080E72D2:
ldr r4, _080E733C @ =gUnknown_20370D0
ldr r4, _080E733C @ =gSpecialVar_Result
movs r0, 0
strh r0, [r4]
adds r0, r1, 0
@@ -3312,7 +3312,7 @@ _080E731A:
cmp r5, 0x2
ble _080E72EA
_080E7320:
ldr r0, _080E733C @ =gUnknown_20370D0
ldr r0, _080E733C @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0
beq _080E732E
@@ -3325,7 +3325,7 @@ _080E732E:
.align 2, 0
_080E7334: .4byte gSaveBlock2Ptr
_080E7338: .4byte 0x0000055c
_080E733C: .4byte gUnknown_20370D0
_080E733C: .4byte gSpecialVar_Result
_080E7340: .4byte 0x0000056d
_080E7344: .4byte gPlayerParty
thumb_func_end sub_80E72B8
@@ -3500,7 +3500,7 @@ _080E748C: .4byte 0x000004a4
thumb_func_start ValidateEReaderTrainer
ValidateEReaderTrainer: @ 80E7490
push {r4-r6,lr}
ldr r2, _080E74C0 @ =gUnknown_20370D0
ldr r2, _080E74C0 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r2]
ldr r1, _080E74C4 @ =gSaveBlock2Ptr
@@ -3524,7 +3524,7 @@ _080E74AA:
strh r0, [r2]
b _080E74F6
.align 2, 0
_080E74C0: .4byte gUnknown_20370D0
_080E74C0: .4byte gSpecialVar_Result
_080E74C4: .4byte gSaveBlock2Ptr
_080E74C8:
movs r4, 0
@@ -3547,7 +3547,7 @@ _080E74CE:
lsls r3, 3
adds r0, r1, r3
bl sub_80E7524
ldr r1, _080E74FC @ =gUnknown_20370D0
ldr r1, _080E74FC @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_080E74F6:
@@ -3555,7 +3555,7 @@ _080E74F6:
pop {r0}
bx r0
.align 2, 0
_080E74FC: .4byte gUnknown_20370D0
_080E74FC: .4byte gSpecialVar_Result
thumb_func_end ValidateEReaderTrainer
thumb_func_start sub_80E7500
asm/berry_pouch.s
+26 -26
View File
@@ -52,7 +52,7 @@ _0813CD98:
strb r0, [r1, 0x6]
movs r2, 0
ldr r6, _0813CDF0 @ =gTextFlags
ldr r0, _0813CDF4 @ =gUnknown_203AD30
ldr r0, _0813CDF4 @ =gSpecialVar_ItemId
mov r12, r0
ldr r1, _0813CDF8 @ =sub_813CE30
mov r8, r1
@@ -89,7 +89,7 @@ _0813CDE2:
.align 2, 0
_0813CDEC: .4byte gUnknown_203F370
_0813CDF0: .4byte gTextFlags
_0813CDF4: .4byte gUnknown_203AD30
_0813CDF4: .4byte gSpecialVar_ItemId
_0813CDF8: .4byte sub_813CE30
_0813CDFC: .4byte 0x0000080c
thumb_func_end sub_813CD50
@@ -1708,7 +1708,7 @@ _0813DA9E:
bne _0813DAEC
movs r0, 0x5
bl PlaySE
ldr r0, _0813DAE8 @ =gUnknown_203AD30
ldr r0, _0813DAE8 @ =gSpecialVar_ItemId
mov r1, r8
strh r1, [r0]
b _0813DB48
@@ -1717,7 +1717,7 @@ _0813DAD8: .4byte gTasks+0x8
_0813DADC: .4byte gPaletteFade
_0813DAE0: .4byte gUnknown_203F37A
_0813DAE4: .4byte gMain
_0813DAE8: .4byte gUnknown_203AD30
_0813DAE8: .4byte gSpecialVar_ItemId
_0813DAEC:
movs r0, 0x2
negs r0, r0
@@ -1749,11 +1749,11 @@ _0813DB10:
lsrs r1, 16
movs r0, 0x5
bl sub_809A798
ldr r1, _0813DB34 @ =gUnknown_203AD30
ldr r1, _0813DB34 @ =gSpecialVar_ItemId
b _0813DB46
.align 2, 0
_0813DB30: .4byte gUnknown_203F370
_0813DB34: .4byte gUnknown_203AD30
_0813DB34: .4byte gSpecialVar_ItemId
_0813DB38:
ldr r0, _0813DB50 @ =gUnknown_203F36C
ldr r0, [r0]
@@ -1761,7 +1761,7 @@ _0813DB38:
cmp r5, r0
bne _0813DB58
_0813DB42:
ldr r1, _0813DB54 @ =gUnknown_203AD30
ldr r1, _0813DB54 @ =gSpecialVar_ItemId
movs r0, 0
_0813DB46:
strh r0, [r1]
@@ -1771,7 +1771,7 @@ _0813DB48:
b _0813DB9E
.align 2, 0
_0813DB50: .4byte gUnknown_203F36C
_0813DB54: .4byte gUnknown_203AD30
_0813DB54: .4byte gSpecialVar_ItemId
_0813DB58:
bl sub_813D684
movs r0, 0x1
@@ -1789,7 +1789,7 @@ _0813DB58:
movs r0, 0x5
adds r1, r4, 0
bl sub_809A798
ldr r1, _0813DBA8 @ =gUnknown_203AD30
ldr r1, _0813DBA8 @ =gSpecialVar_ItemId
strh r0, [r1]
ldr r0, _0813DBAC @ =gTasks
lsls r1, r6, 2
@@ -1810,7 +1810,7 @@ _0813DB9E:
pop {r0}
bx r0
.align 2, 0
_0813DBA8: .4byte gUnknown_203AD30
_0813DBA8: .4byte gSpecialVar_ItemId
_0813DBAC: .4byte gTasks
_0813DBB0: .4byte gUnknown_8464358
thumb_func_end sub_813DA68
@@ -1878,7 +1878,7 @@ _0813DC24:
cmp r0, 0x1
bne _0813DC7C
_0813DC38:
ldr r0, _0813DC54 @ =gUnknown_203AD30
ldr r0, _0813DC54 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl sub_80BF6A8
lsls r0, 24
@@ -1891,7 +1891,7 @@ _0813DC38:
movs r0, 0x1
b _0813DC86
.align 2, 0
_0813DC54: .4byte gUnknown_203AD30
_0813DC54: .4byte gSpecialVar_ItemId
_0813DC58: .4byte gUnknown_203F384
_0813DC5C: .4byte gUnknown_84643AC
_0813DC60: .4byte gUnknown_203F388
@@ -2118,7 +2118,7 @@ sub_813DE0C: @ 813DE0C
ldrb r0, [r0, 0x4]
cmp r0, 0x4
bne _0813DE78
ldr r4, _0813DE64 @ =gUnknown_203AD30
ldr r4, _0813DE64 @ =gSpecialVar_ItemId
ldrh r0, [r4]
bl ItemId_GetBattleFunc
cmp r0, 0
@@ -2129,7 +2129,7 @@ sub_813DE0C: @ 813DE0C
.align 2, 0
_0813DE5C: .4byte gUnknown_203F388
_0813DE60: .4byte gUnknown_203F370
_0813DE64: .4byte gUnknown_203AD30
_0813DE64: .4byte gSpecialVar_ItemId
_0813DE68:
ldrh r0, [r4]
bl ItemId_GetBattleFunc
@@ -2142,7 +2142,7 @@ _0813DE78:
lsls r0, 24
cmp r0, 0
bne _0813DEA0
ldr r0, _0813DE9C @ =gUnknown_203AD30
ldr r0, _0813DE9C @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetType
lsls r0, 24
@@ -2153,9 +2153,9 @@ _0813DE78:
bl sub_813E274
b _0813DEB0
.align 2, 0
_0813DE9C: .4byte gUnknown_203AD30
_0813DE9C: .4byte gSpecialVar_ItemId
_0813DEA0:
ldr r0, _0813DEB8 @ =gUnknown_203AD30
ldr r0, _0813DEB8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetFieldFunc
adds r1, r0, 0
@@ -2166,7 +2166,7 @@ _0813DEB0:
pop {r0}
bx r0
.align 2, 0
_0813DEB8: .4byte gUnknown_203AD30
_0813DEB8: .4byte gSpecialVar_ItemId
thumb_func_end sub_813DE0C
thumb_func_start sub_813DEBC
@@ -2494,7 +2494,7 @@ sub_813E164: @ 813E164
_0813E18A:
movs r0, 0x5
bl PlaySE
ldr r0, _0813E1F4 @ =gUnknown_203AD30
ldr r0, _0813E1F4 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r5, 0x10]
bl sub_809A1D8
@@ -2532,7 +2532,7 @@ _0813E1E4:
.align 2, 0
_0813E1EC: .4byte gTasks+0x8
_0813E1F0: .4byte gMain
_0813E1F4: .4byte gUnknown_203AD30
_0813E1F4: .4byte gSpecialVar_ItemId
_0813E1F8: .4byte gUnknown_203F37A
_0813E1FC: .4byte gUnknown_3005E70
thumb_func_end sub_813E164
@@ -2807,7 +2807,7 @@ sub_813E428: @ 813E428
lsls r0, 3
ldr r1, _0813E470 @ =gTasks+0x8
adds r4, r0, r1
ldr r6, _0813E474 @ =gUnknown_203AD30
ldr r6, _0813E474 @ =gSpecialVar_ItemId
ldrh r0, [r6]
bl itemid_get_market_price
lsls r0, 16
@@ -2831,7 +2831,7 @@ sub_813E428: @ 813E428
b _0813E4CE
.align 2, 0
_0813E470: .4byte gTasks+0x8
_0813E474: .4byte gUnknown_203AD30
_0813E474: .4byte gSpecialVar_ItemId
_0813E478: .4byte gStringVar1
_0813E47C: .4byte gStringVar4
_0813E480: .4byte gUnknown_84168F1
@@ -3185,7 +3185,7 @@ sub_813E768: @ 813E768
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0813E7D8 @ =gUnknown_203AD30
ldr r0, _0813E7D8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _0813E7DC @ =gStringVar1
bl sub_8099E90
@@ -3219,7 +3219,7 @@ sub_813E768: @ 813E768
bx r0
.align 2, 0
_0813E7D4: .4byte gTasks+0x8
_0813E7D8: .4byte gUnknown_203AD30
_0813E7D8: .4byte gSpecialVar_ItemId
_0813E7DC: .4byte gStringVar1
_0813E7E0: .4byte gStringVar3
_0813E7E4: .4byte gStringVar4
@@ -3246,7 +3246,7 @@ sub_813E7F0: @ 813E7F0
mov r8, r1
movs r0, 0xF8
bl PlaySE
ldr r5, _0813E8C0 @ =gUnknown_203AD30
ldr r5, _0813E8C0 @ =gSpecialVar_ItemId
ldrh r0, [r5]
mov r2, r8
ldrh r1, [r2, 0x10]
@@ -3319,7 +3319,7 @@ sub_813E7F0: @ 813E7F0
bx r0
.align 2, 0
_0813E8BC: .4byte gTasks+0x8
_0813E8C0: .4byte gUnknown_203AD30
_0813E8C0: .4byte gSpecialVar_ItemId
_0813E8C4: .4byte gSaveBlock1Ptr
_0813E8C8: .4byte gUnknown_203F37A
_0813E8CC: .4byte gUnknown_3005E70
asm/cable_club.s
+30 -30
View File
@@ -696,7 +696,7 @@ sub_8080C6C: @ 8080C6C
_08080CB0: .4byte gTasks
_08080CB4: .4byte sub_8080FF0
_08080CB8:
ldr r4, _08080CD4 @ =gUnknown_20370D0
ldr r4, _08080CD4 @ =gSpecialVar_Result
adds r0, r7, 0
adds r1, r6, 0
bl sub_8080844
@@ -712,7 +712,7 @@ _08080CCE:
pop {r0}
bx r0
.align 2, 0
_08080CD4: .4byte gUnknown_20370D0
_08080CD4: .4byte gSpecialVar_Result
_08080CD8: .4byte sub_8080DC0
thumb_func_end sub_8080C6C
@@ -736,7 +736,7 @@ sub_8080CDC: @ 8080CDC
bl sub_80808BC
cmp r0, 0x1
beq _08080D74
ldr r4, _08080D34 @ =gUnknown_20370D0
ldr r4, _08080D34 @ =gSpecialVar_Result
adds r0, r7, 0
adds r1, r6, 0
bl sub_8080844
@@ -757,7 +757,7 @@ sub_8080CDC: @ 8080CDC
b _08080D72
.align 2, 0
_08080D30: .4byte gTasks
_08080D34: .4byte gUnknown_20370D0
_08080D34: .4byte gSpecialVar_Result
_08080D38: .4byte sub_8080F78
_08080D3C:
cmp r2, 0x7
@@ -838,7 +838,7 @@ sub_8080DC0: @ 8080DC0
bl sub_80808BC
cmp r0, 0x1
beq _08080E50
ldr r0, _08080DE8 @ =gUnknown_20370D0
ldr r0, _08080DE8 @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x4
bne _08080DEC
@@ -848,7 +848,7 @@ sub_8080DC0: @ 8080DC0
bl sub_800AAC0
b _08080E02
.align 2, 0
_08080DE8: .4byte gUnknown_20370D0
_08080DE8: .4byte gSpecialVar_Result
_08080DEC:
cmp r0, 0x3
bne _08080DF6
@@ -984,7 +984,7 @@ _08080EF8:
bl SetSuppressLinkErrorMessage
bl ResetBlockReceivedFlags
bl HideFieldMessageBox
ldr r0, _08080F44 @ =gUnknown_20370D0
ldr r0, _08080F44 @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x1
bne _08080F54
@@ -1005,7 +1005,7 @@ _08080EF8:
.align 2, 0
_08080F3C: .4byte gBlockRecvBuffer
_08080F40: .4byte gUnknown_2039624
_08080F44: .4byte gUnknown_20370D0
_08080F44: .4byte gSpecialVar_Result
_08080F48: .4byte gLinkType
_08080F4C: .4byte 0x00004411
_08080F50: .4byte gTasks
@@ -1065,7 +1065,7 @@ sub_8080FB4: @ 8080FB4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, _08080FE8 @ =gUnknown_20370D0
ldr r1, _08080FE8 @ =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
ldr r1, _08080FEC @ =gTasks
@@ -1083,7 +1083,7 @@ sub_8080FB4: @ 8080FB4
pop {r0}
bx r0
.align 2, 0
_08080FE8: .4byte gUnknown_20370D0
_08080FE8: .4byte gSpecialVar_Result
_08080FEC: .4byte gTasks
thumb_func_end sub_8080FB4
@@ -1093,7 +1093,7 @@ sub_8080FF0: @ 8080FF0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, _08081024 @ =gUnknown_20370D0
ldr r1, _08081024 @ =gSpecialVar_Result
movs r0, 0x6
strh r0, [r1]
ldr r1, _08081028 @ =gTasks
@@ -1111,7 +1111,7 @@ sub_8080FF0: @ 8080FF0
pop {r0}
bx r0
.align 2, 0
_08081024: .4byte gUnknown_20370D0
_08081024: .4byte gSpecialVar_Result
_08081028: .4byte gTasks
thumb_func_end sub_8080FF0
@@ -1153,7 +1153,7 @@ sub_8081064: @ 8081064
push {r4,lr}
movs r3, 0x2
movs r2, 0x2
ldr r0, _0808107C @ =gUnknown_20370C0
ldr r0, _0808107C @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x2
beq _08081098
@@ -1163,7 +1163,7 @@ sub_8081064: @ 8081064
beq _08081086
b _080810B4
.align 2, 0
_0808107C: .4byte gUnknown_20370C0
_0808107C: .4byte gSpecialVar_0x8004
_08081080:
cmp r0, 0x5
beq _080810A8
@@ -1228,7 +1228,7 @@ _080810F0: .4byte gBattleTypeFlags
thumb_func_start sub_80810F4
sub_80810F4: @ 80810F4
push {lr}
ldr r1, _08081118 @ =gUnknown_20370D0
ldr r1, _08081118 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r1, _0808111C @ =gLinkType
@@ -1244,7 +1244,7 @@ sub_80810F4: @ 80810F4
pop {r0}
bx r0
.align 2, 0
_08081118: .4byte gUnknown_20370D0
_08081118: .4byte gSpecialVar_Result
_0808111C: .4byte gLinkType
_08081120: .4byte 0x00003311
_08081124: .4byte gBattleTypeFlags
@@ -1284,7 +1284,7 @@ sub_8081150: @ 8081150
.align 2, 0
_08081164: .4byte sub_80811FC
_08081168:
ldr r0, _0808117C @ =gUnknown_20370C0
ldr r0, _0808117C @ =gSpecialVar_0x8004
ldrh r0, [r0]
subs r0, 0x1
cmp r0, 0x4
@@ -1295,7 +1295,7 @@ _08081168:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0808117C: .4byte gUnknown_20370C0
_0808117C: .4byte gSpecialVar_0x8004
_08081180: .4byte _08081184
.align 2, 0
_08081184:
@@ -1597,7 +1597,7 @@ _080813D4:
lsls r0, 1
bl PlayMapChosenOrBattleBGM
_080813DC:
ldr r0, _080813F0 @ =gUnknown_20370C0
ldr r0, _080813F0 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x2
beq _08081404
@@ -1607,7 +1607,7 @@ _080813DC:
beq _080813FA
b _0808141A
.align 2, 0
_080813F0: .4byte gUnknown_20370C0
_080813F0: .4byte gSpecialVar_0x8004
_080813F4:
cmp r0, 0x5
beq _08081410
@@ -1818,7 +1818,7 @@ _080815A0:
ldr r0, _080815B8 @ =gLinkPlayers
ldr r1, _080815BC @ =0x00002211
str r1, [r0, 0x14]
ldr r0, _080815C0 @ =gUnknown_20370C0
ldr r0, _080815C0 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x2
beq _080815D4
@@ -1830,7 +1830,7 @@ _080815A0:
.align 2, 0
_080815B8: .4byte gLinkPlayers
_080815BC: .4byte 0x00002211
_080815C0: .4byte gUnknown_20370C0
_080815C0: .4byte gSpecialVar_0x8004
_080815C4:
cmp r0, 0x5
beq _080815E0
@@ -1927,7 +1927,7 @@ sub_8081668: @ 8081668
bl LoadPlayerParty
bl SavePlayerBag
bl sub_81134B8
ldr r0, _080816B8 @ =gUnknown_20370C0
ldr r0, _080816B8 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x5
beq _0808170A
@@ -1950,7 +1950,7 @@ sub_8081668: @ 8081668
.align 2, 0
_080816B0: .4byte gBattleTypeFlags
_080816B4: .4byte 0x0000ffdf
_080816B8: .4byte gUnknown_20370C0
_080816B8: .4byte gSpecialVar_0x8004
_080816BC: .4byte gUnknown_300502C
_080816C0: .4byte gUnknown_3003F3C
_080816C4: .4byte gUnknown_2023E8A
@@ -2015,7 +2015,7 @@ _08081740: .4byte sub_806FB7C
thumb_func_start sub_8081744
sub_8081744: @ 8081744
push {lr}
ldr r0, _0808176C @ =gUnknown_20370C0
ldr r0, _0808176C @ =gSpecialVar_0x8004
ldrh r1, [r0]
subs r0, r1, 0x1
lsls r0, 16
@@ -2033,7 +2033,7 @@ _08081760:
pop {r0}
bx r0
.align 2, 0
_0808176C: .4byte gUnknown_20370C0
_0808176C: .4byte gSpecialVar_0x8004
thumb_func_end sub_8081744
thumb_func_start sub_8081770
@@ -2385,14 +2385,14 @@ _08081A18: .4byte sub_808177C
thumb_func_start sp02A_crash_sound
sp02A_crash_sound: @ 8081A1C
push {lr}
ldr r0, _08081A2C @ =gUnknown_20370C4
ldr r0, _08081A2C @ =gSpecialVar_0x8006
ldrb r0, [r0]
ldr r1, _08081A30 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
bl sub_808B700
pop {r0}
bx r0
.align 2, 0
_08081A2C: .4byte gUnknown_20370C4
_08081A2C: .4byte gSpecialVar_0x8006
_08081A30: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sp02A_crash_sound
@@ -2402,7 +2402,7 @@ sub_8081A34: @ 8081A34
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _08081A74 @ =gUnknown_20370C4
ldr r0, _08081A74 @ =gSpecialVar_0x8006
strh r4, [r0]
ldr r0, _08081A78 @ =gStringVar1
lsls r1, r4, 3
@@ -2427,7 +2427,7 @@ sub_8081A34: @ 8081A34
movs r0, 0x1
b _08081A8A
.align 2, 0
_08081A74: .4byte gUnknown_20370C4
_08081A74: .4byte gSpecialVar_0x8006
_08081A78: .4byte gStringVar1
_08081A7C: .4byte gLinkPlayers + 8
_08081A80: .4byte gStringVar2
asm/daycare.s
+14 -14
View File
@@ -458,7 +458,7 @@ TakePokemonFromDaycare: @ 8045728
movs r1, 0xBE
lsls r1, 6
adds r0, r1
ldr r1, _08045748 @ =gUnknown_20370C0
ldr r1, _08045748 @ =gSpecialVar_0x8004
ldrb r1, [r1]
bl TakeSelectedPokemonMonFromDaycareShiftSlots
lsls r0, 16
@@ -467,7 +467,7 @@ TakePokemonFromDaycare: @ 8045728
bx r1
.align 2, 0
_08045744: .4byte gSaveBlock1Ptr
_08045748: .4byte gUnknown_20370C0
_08045748: .4byte gSpecialVar_0x8004
thumb_func_end TakePokemonFromDaycare
thumb_func_start GetLevelAfterDaycareSteps
@@ -598,7 +598,7 @@ GetDaycareCost: @ 8045838
movs r1, 0xBE
lsls r1, 6
adds r0, r1
ldr r1, _08045858 @ =gUnknown_20370C0
ldr r1, _08045858 @ =gSpecialVar_0x8004
ldrb r1, [r1]
bl GetDaycareCostForMon
ldr r1, _0804585C @ =gSpecialVar_0x8005
@@ -607,7 +607,7 @@ GetDaycareCost: @ 8045838
bx r0
.align 2, 0
_08045854: .4byte gSaveBlock1Ptr
_08045858: .4byte gUnknown_20370C0
_08045858: .4byte gSpecialVar_0x8004
_0804585C: .4byte gSpecialVar_0x8005
thumb_func_end GetDaycareCost
@@ -644,7 +644,7 @@ _08045894: .4byte 0x00003d20
GetNumLevelsGainedFromDaycare: @ 8045898
push {r4-r6,lr}
ldr r6, _080458C0 @ =gSaveBlock1Ptr
ldr r5, _080458C4 @ =gUnknown_20370C0
ldr r5, _080458C4 @ =gSpecialVar_0x8004
ldrh r0, [r5]
movs r4, 0x8C
adds r1, r0, 0
@@ -662,7 +662,7 @@ GetNumLevelsGainedFromDaycare: @ 8045898
b _080458E0
.align 2, 0
_080458C0: .4byte gSaveBlock1Ptr
_080458C4: .4byte gUnknown_20370C0
_080458C4: .4byte gSpecialVar_0x8004
_080458C8:
ldrh r0, [r5]
adds r1, r0, 0
@@ -2076,13 +2076,13 @@ _08046350:
str r0, [sp]
cmp r0, 0
bne _08046390
ldr r0, _0804638C @ =gUnknown_20370C0
ldr r0, _0804638C @ =gSpecialVar_0x8004
strh r5, [r0]
movs r0, 0x1
b _080463AA
.align 2, 0
_08046388: .4byte gPlayerParty
_0804638C: .4byte gUnknown_20370C0
_0804638C: .4byte gSpecialVar_0x8004
_08046390:
subs r0, 0x1
str r0, [sp]
@@ -2990,13 +2990,13 @@ Task_HandleDaycareLevelMenuInput: @ 80469FC
_08046A2C: .4byte gTasks
_08046A30: .4byte gMain
_08046A34:
ldr r0, _08046A3C @ =gUnknown_20370D0
ldr r0, _08046A3C @ =gSpecialVar_Result
strh r1, [r0]
b _08046A46
.align 2, 0
_08046A3C: .4byte gUnknown_20370D0
_08046A3C: .4byte gSpecialVar_Result
_08046A40:
ldr r1, _08046A74 @ =gUnknown_20370D0
ldr r1, _08046A74 @ =gSpecialVar_Result
movs r0, 0x2
strh r0, [r1]
_08046A46:
@@ -3019,7 +3019,7 @@ _08046A46:
bl EnableBothScriptContexts
b _08046AAC
.align 2, 0
_08046A74: .4byte gUnknown_20370D0
_08046A74: .4byte gSpecialVar_Result
_08046A78: .4byte gTasks
_08046A7C:
movs r1, 0x2
@@ -3027,7 +3027,7 @@ _08046A7C:
ands r0, r2
cmp r0, 0
beq _08046AAC
ldr r0, _08046AB4 @ =gUnknown_20370D0
ldr r0, _08046AB4 @ =gSpecialVar_Result
strh r1, [r0]
ldrb r0, [r4, 0x8]
movs r1, 0
@@ -3046,7 +3046,7 @@ _08046AAC:
pop {r0}
bx r0
.align 2, 0
_08046AB4: .4byte gUnknown_20370D0
_08046AB4: .4byte gSpecialVar_Result
thumb_func_end Task_HandleDaycareLevelMenuInput
thumb_func_start ShowDaycareLevelMenu
asm/easy_chat.s
+2 -2
View File
@@ -495,7 +495,7 @@ _080BDA74:
thumb_func_start sub_80BDA7C
sub_80BDA7C: @ 80BDA7C
push {r4,r5,lr}
ldr r0, _080BDA90 @ =gUnknown_20370C0
ldr r0, _080BDA90 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x1
beq _080BDAB4
@@ -505,7 +505,7 @@ sub_80BDA7C: @ 80BDA7C
beq _080BDA9E
b _080BDB08
.align 2, 0
_080BDA90: .4byte gUnknown_20370C0
_080BDA90: .4byte gSpecialVar_0x8004
_080BDA94:
cmp r0, 0x2
beq _080BDADC
asm/egg_hatch.s
+8 -8
View File
@@ -258,13 +258,13 @@ _08046E1C: .4byte gStringVar1
thumb_func_start ScriptHatchMon
ScriptHatchMon: @ 8046E20
push {lr}
ldr r0, _08046E30 @ =gUnknown_20370C0
ldr r0, _08046E30 @ =gSpecialVar_0x8004
ldrb r0, [r0]
bl AddHatchedMonToParty
pop {r0}
bx r0
.align 2, 0
_08046E30: .4byte gUnknown_20370C0
_08046E30: .4byte gSpecialVar_0x8004
thumb_func_end ScriptHatchMon
thumb_func_start sub_8046E34
@@ -332,7 +332,7 @@ sub_8046EAC: @ 8046EAC
movs r1, 0xBE
lsls r1, 6
adds r0, r1
ldr r1, _08046ECC @ =gUnknown_20370C0
ldr r1, _08046ECC @ =gSpecialVar_0x8004
ldrb r1, [r1]
bl sub_8046E34
lsls r0, 24
@@ -341,7 +341,7 @@ sub_8046EAC: @ 8046EAC
bx r1
.align 2, 0
_08046EC8: .4byte gSaveBlock1Ptr
_08046ECC: .4byte gUnknown_20370C0
_08046ECC: .4byte gSpecialVar_0x8004
thumb_func_end sub_8046EAC
thumb_func_start sub_8046ED0
@@ -566,7 +566,7 @@ _08047090:
str r0, [r4]
bl AllocateMonSpritesGfx
ldr r2, [r4]
ldr r0, _0804714C @ =gUnknown_20370C0
ldr r0, _0804714C @ =gSpecialVar_0x8004
ldrh r0, [r0]
movs r1, 0
strb r0, [r2, 0x4]
@@ -626,7 +626,7 @@ _08047090:
b _0804724A
.align 2, 0
_08047148: .4byte gUnknown_3000E74
_0804714C: .4byte gUnknown_20370C0
_0804714C: .4byte gSpecialVar_0x8004
_08047150: .4byte sub_8046FC0
_08047154: .4byte gSpecialVar_0x8005
_08047158: .4byte gUnknown_826019C
@@ -770,7 +770,7 @@ _0804729C: .4byte gUnknown_3000E74
thumb_func_start EggHatchSetMonNickname
EggHatchSetMonNickname: @ 80472A0
push {lr}
ldr r0, _080472D0 @ =gUnknown_20370C0
ldr r0, _080472D0 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -789,7 +789,7 @@ EggHatchSetMonNickname: @ 80472A0
pop {r0}
bx r0
.align 2, 0
_080472D0: .4byte gUnknown_20370C0
_080472D0: .4byte gSpecialVar_0x8004
_080472D4: .4byte gPlayerParty
_080472D8: .4byte gStringVar3
_080472DC: .4byte gUnknown_3000E74
asm/event_data.s
+30 -30
View File
@@ -796,38 +796,38 @@ _0806E6F6:
thumb_func_start sub_806E6FC
sub_806E6FC: @ 806E6FC
ldr r1, _0806E754 @ =gUnknown_20370B8
ldr r1, _0806E754 @ =gSpecialVar_0x8000
movs r0, 0
strh r0, [r1]
ldr r1, _0806E758 @ =gUnknown_20370BA
ldr r1, _0806E758 @ =gSpecialVar_0x8001
strh r0, [r1]
ldr r1, _0806E75C @ =gUnknown_20370BC
ldr r1, _0806E75C @ =gSpecialVar_0x8002
strh r0, [r1]
ldr r1, _0806E760 @ =gUnknown_20370BE
ldr r1, _0806E760 @ =gSpecialVar_0x8003
strh r0, [r1]
ldr r1, _0806E764 @ =gUnknown_20370C0
ldr r1, _0806E764 @ =gSpecialVar_0x8004
strh r0, [r1]
ldr r1, _0806E768 @ =gSpecialVar_0x8005
strh r0, [r1]
ldr r1, _0806E76C @ =gUnknown_20370C4
ldr r1, _0806E76C @ =gSpecialVar_0x8006
strh r0, [r1]
ldr r1, _0806E770 @ =gUnknown_20370C6
ldr r1, _0806E770 @ =gSpecialVar_0x8007
strh r0, [r1]
ldr r1, _0806E774 @ =gUnknown_20370C8
ldr r1, _0806E774 @ =gSpecialVar_0x8008
strh r0, [r1]
ldr r1, _0806E778 @ =gUnknown_20370CA
ldr r1, _0806E778 @ =gSpecialVar_0x8009
strh r0, [r1]
ldr r1, _0806E77C @ =gUnknown_20370CC
ldr r1, _0806E77C @ =gSpecialVar_0x800A
strh r0, [r1]
ldr r1, _0806E780 @ =gUnknown_20370CE
ldr r1, _0806E780 @ =gSpecialVar_0x800B
strh r0, [r1]
ldr r1, _0806E784 @ =gUnknown_20370D4
ldr r1, _0806E784 @ =gSpecialVar_Facing
strh r0, [r1]
ldr r1, _0806E788 @ =gUnknown_20370D0
ldr r1, _0806E788 @ =gSpecialVar_Result
strh r0, [r1]
ldr r1, _0806E78C @ =gUnknown_203AD30
ldr r1, _0806E78C @ =gSpecialVar_ItemId
strh r0, [r1]
ldr r1, _0806E790 @ =gUnknown_20370D2
ldr r1, _0806E790 @ =gSpecialVar_LastTalked
strh r0, [r1]
ldr r1, _0806E794 @ =gSpecialVar_MonBoxId
strh r0, [r1]
@@ -841,22 +841,22 @@ sub_806E6FC: @ 806E6FC
strh r0, [r1]
bx lr
.align 2, 0
_0806E754: .4byte gUnknown_20370B8
_0806E758: .4byte gUnknown_20370BA
_0806E75C: .4byte gUnknown_20370BC
_0806E760: .4byte gUnknown_20370BE
_0806E764: .4byte gUnknown_20370C0
_0806E754: .4byte gSpecialVar_0x8000
_0806E758: .4byte gSpecialVar_0x8001
_0806E75C: .4byte gSpecialVar_0x8002
_0806E760: .4byte gSpecialVar_0x8003
_0806E764: .4byte gSpecialVar_0x8004
_0806E768: .4byte gSpecialVar_0x8005
_0806E76C: .4byte gUnknown_20370C4
_0806E770: .4byte gUnknown_20370C6
_0806E774: .4byte gUnknown_20370C8
_0806E778: .4byte gUnknown_20370CA
_0806E77C: .4byte gUnknown_20370CC
_0806E780: .4byte gUnknown_20370CE
_0806E784: .4byte gUnknown_20370D4
_0806E788: .4byte gUnknown_20370D0
_0806E78C: .4byte gUnknown_203AD30
_0806E790: .4byte gUnknown_20370D2
_0806E76C: .4byte gSpecialVar_0x8006
_0806E770: .4byte gSpecialVar_0x8007
_0806E774: .4byte gSpecialVar_0x8008
_0806E778: .4byte gSpecialVar_0x8009
_0806E77C: .4byte gSpecialVar_0x800A
_0806E780: .4byte gSpecialVar_0x800B
_0806E784: .4byte gSpecialVar_Facing
_0806E788: .4byte gSpecialVar_Result
_0806E78C: .4byte gSpecialVar_ItemId
_0806E790: .4byte gSpecialVar_LastTalked
_0806E794: .4byte gSpecialVar_MonBoxId
_0806E798: .4byte gSpecialVar_MonBoxPos
_0806E79C: .4byte gUnknown_20370DA
asm/field_control_avatar.s
+20 -20
View File
@@ -938,13 +938,13 @@ _0806CFBC:
ble _0806CFB0
ldr r0, _0806CFE8 @ =gUnknown_3005074
strb r3, [r0]
ldr r1, _0806CFEC @ =gUnknown_20370D2
ldr r1, _0806CFEC @ =gSpecialVar_LastTalked
adds r0, r2, r3
lsls r0, 2
adds r0, r5
ldrb r0, [r0, 0x8]
strh r0, [r1]
ldr r0, _0806CFF0 @ =gUnknown_20370D4
ldr r0, _0806CFF0 @ =gSpecialVar_Facing
strh r6, [r0]
adds r0, r3, 0
bl GetFieldObjectScriptPointerByFieldObjectId
@@ -955,8 +955,8 @@ _0806CFDE:
.align 2, 0
_0806CFE4: .4byte gUnknown_2031DEC
_0806CFE8: .4byte gUnknown_3005074
_0806CFEC: .4byte gUnknown_20370D2
_0806CFF0: .4byte gUnknown_20370D4
_0806CFEC: .4byte gSpecialVar_LastTalked
_0806CFF0: .4byte gSpecialVar_Facing
thumb_func_end sub_806CF38
thumb_func_start sub_806CFF4
@@ -1046,14 +1046,14 @@ _0806D09C: .4byte gUnknown_826D2D8
_0806D0A0:
ldr r0, _0806D0D4 @ =gUnknown_3005074
strb r5, [r0]
ldr r4, _0806D0D8 @ =gUnknown_20370D2
ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked
ldr r1, _0806D0DC @ =gMapObjects
adds r0, r6, r5
lsls r0, 2
adds r0, r1
ldrb r0, [r0, 0x8]
strh r0, [r4]
ldr r0, _0806D0E0 @ =gUnknown_20370D4
ldr r0, _0806D0E0 @ =gSpecialVar_Facing
mov r1, r8
strh r1, [r0]
adds r0, r5, 0
@@ -1070,9 +1070,9 @@ _0806D0C8:
bx r1
.align 2, 0
_0806D0D4: .4byte gUnknown_3005074
_0806D0D8: .4byte gUnknown_20370D2
_0806D0D8: .4byte gSpecialVar_LastTalked
_0806D0DC: .4byte gMapObjects
_0806D0E0: .4byte gUnknown_20370D4
_0806D0E0: .4byte gSpecialVar_Facing
thumb_func_end sub_806CFF4
thumb_func_start sub_806D0E4
@@ -1165,12 +1165,12 @@ _0806D17A:
ldr r0, [r5, 0x8]
movs r1, 0x1
bl sub_80CC44C
ldr r4, _0806D1C8 @ =gUnknown_20370C0
ldr r4, _0806D1C8 @ =gSpecialVar_0x8004
strh r0, [r4]
ldr r0, [r5, 0x8]
movs r1, 0x2
bl sub_80CC44C
ldr r1, _0806D1CC @ =gUnknown_20370C4
ldr r1, _0806D1CC @ =gSpecialVar_0x8006
strh r0, [r1]
ldrh r0, [r4]
bl FlagGet
@@ -1178,22 +1178,22 @@ _0806D17A:
lsrs r0, 24
cmp r0, 0x1
beq _0806D164
ldr r0, _0806D1D0 @ =gUnknown_20370D4
ldr r0, _0806D1D0 @ =gSpecialVar_Facing
strh r6, [r0]
ldr r0, _0806D1D4 @ =gUnknown_81A6843
b _0806D1E6
.align 2, 0
_0806D1C4: .4byte gSpecialVar_0x8005
_0806D1C8: .4byte gUnknown_20370C0
_0806D1CC: .4byte gUnknown_20370C4
_0806D1D0: .4byte gUnknown_20370D4
_0806D1C8: .4byte gSpecialVar_0x8004
_0806D1CC: .4byte gSpecialVar_0x8006
_0806D1D0: .4byte gSpecialVar_Facing
_0806D1D4: .4byte gUnknown_81A6843
_0806D1D8:
cmp r2, 0xFF
beq _0806D1E0
bl sub_8069A20
_0806D1E0:
ldr r0, _0806D1EC @ =gUnknown_20370D4
ldr r0, _0806D1EC @ =gSpecialVar_Facing
strh r6, [r0]
ldr r0, [r5, 0x8]
_0806D1E6:
@@ -1201,7 +1201,7 @@ _0806D1E6:
pop {r1}
bx r1
.align 2, 0
_0806D1EC: .4byte gUnknown_20370D4
_0806D1EC: .4byte gSpecialVar_Facing
thumb_func_end sub_806D0E4
thumb_func_start sub_806D1F0
@@ -1211,7 +1211,7 @@ sub_806D1F0: @ 806D1F0
lsrs r4, r1, 24
lsls r2, 24
lsrs r5, r2, 24
ldr r0, _0806D210 @ =gUnknown_20370D4
ldr r0, _0806D210 @ =gSpecialVar_Facing
strh r5, [r0]
adds r0, r4, 0
bl MetatileBehavior_IsPC
@@ -1222,7 +1222,7 @@ sub_806D1F0: @ 806D1F0
ldr r0, _0806D214 @ =gUnknown_81A6955
b _0806D53E
.align 2, 0
_0806D210: .4byte gUnknown_20370D4
_0806D210: .4byte gSpecialVar_Facing
_0806D214: .4byte gUnknown_81A6955
_0806D218:
adds r0, r4, 0
@@ -2114,7 +2114,7 @@ sub_806D908: @ 806D908
push {lr}
lsls r1, 24
lsrs r1, 24
ldr r2, _0806D924 @ =gUnknown_20370D4
ldr r2, _0806D924 @ =gSpecialVar_Facing
strh r1, [r2]
bl ScriptContext1_SetupScript
bl sub_80699E0
@@ -2122,7 +2122,7 @@ sub_806D908: @ 806D908
pop {r0}
bx r0
.align 2, 0
_0806D924: .4byte gUnknown_20370D4
_0806D924: .4byte gSpecialVar_Facing
thumb_func_end sub_806D908
thumb_func_start sub_806D928
asm/field_poison.s
+4 -4
View File
@@ -196,12 +196,12 @@ _080A05B8:
adds r1, r0, 0
cmp r1, 0
beq _080A05E8
ldr r1, _080A05CC @ =gUnknown_20370D0
ldr r1, _080A05CC @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _080A05EC
.align 2, 0
_080A05CC: .4byte gUnknown_20370D0
_080A05CC: .4byte gSpecialVar_Result
_080A05D0:
ldrb r0, [r4, 0x2]
bl MonFaintFromPoisonOnField
@@ -214,7 +214,7 @@ _080A05D0:
.align 2, 0
_080A05E4: .4byte gUnknown_81A5476
_080A05E8:
ldr r0, _080A05FC @ =gUnknown_20370D0
ldr r0, _080A05FC @ =gSpecialVar_Result
strh r1, [r0]
_080A05EC:
bl EnableBothScriptContexts
@@ -225,7 +225,7 @@ _080A05F6:
pop {r0}
bx r0
.align 2, 0
_080A05FC: .4byte gUnknown_20370D0
_080A05FC: .4byte gSpecialVar_Result
thumb_func_end Task_WhiteOut
thumb_func_start ExecuteWhiteOut
asm/field_specials.s
+96 -96
View File
@@ -86,7 +86,7 @@ _080CA698: .4byte gStringVar4
thumb_func_start sub_80CA69C
sub_80CA69C: @ 80CA69C
ldr r1, _080CA6B0 @ =gUnknown_20370C0
ldr r1, _080CA6B0 @ =gSpecialVar_0x8004
ldr r0, _080CA6B4 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldrh r0, [r2]
@@ -96,7 +96,7 @@ sub_80CA69C: @ 80CA69C
strh r0, [r1]
bx lr
.align 2, 0
_080CA6B0: .4byte gUnknown_20370C0
_080CA6B0: .4byte gSpecialVar_0x8004
_080CA6B4: .4byte gSaveBlock1Ptr
_080CA6B8: .4byte gSpecialVar_0x8005
thumb_func_end sub_80CA69C
@@ -188,13 +188,13 @@ _080CA754: .4byte gUnknown_2023E8A
thumb_func_start sub_80CA758
sub_80CA758: @ 80CA758
push {lr}
ldr r0, _080CA768 @ =gUnknown_20370C0
ldr r0, _080CA768 @ =gSpecialVar_0x8004
ldrh r0, [r0]
bl FlagSet
pop {r0}
bx r0
.align 2, 0
_080CA768: .4byte gUnknown_20370C0
_080CA768: .4byte gSpecialVar_0x8004
thumb_func_end sub_80CA758
thumb_func_start sub_80CA76C
@@ -441,14 +441,14 @@ _080CA92C:
_080CA92E:
cmp r6, 0
beq _080CA954
ldr r0, _080CA940 @ =gUnknown_20370C0
ldr r0, _080CA940 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
bne _080CA944
movs r4, 0x62
b _080CA96E
.align 2, 0
_080CA940: .4byte gUnknown_20370C0
_080CA940: .4byte gSpecialVar_0x8004
_080CA944:
cmp r0, 0x1
beq _080CA94C
@@ -460,14 +460,14 @@ _080CA94C:
.align 2, 0
_080CA950: .4byte 0x0000028f
_080CA954:
ldr r0, _080CA960 @ =gUnknown_20370C0
ldr r0, _080CA960 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
bne _080CA964
movs r4, 0x63
b _080CA96E
.align 2, 0
_080CA960: .4byte gUnknown_20370C0
_080CA960: .4byte gSpecialVar_0x8004
_080CA964:
cmp r0, 0x1
beq _080CA96C
@@ -536,14 +536,14 @@ _080CA9D6:
_080CA9D8:
movs r5, 0xFF
_080CA9DA:
ldr r0, _080CA9E8 @ =gUnknown_20370C0
ldr r0, _080CA9E8 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
bne _080CA9EC
movs r4, 0x62
b _080CA9F6
.align 2, 0
_080CA9E8: .4byte gUnknown_20370C0
_080CA9E8: .4byte gSpecialVar_0x8004
_080CA9EC:
cmp r0, 0x1
beq _080CA9F4
@@ -867,13 +867,13 @@ sub_80CAC28: @ 80CAC28
movs r2, 0
strh r0, [r1, 0x8]
strh r2, [r1, 0xA]
ldr r0, _080CAC78 @ =gUnknown_20370C4
ldr r0, _080CAC78 @ =gSpecialVar_0x8006
ldrh r0, [r0]
strh r0, [r1, 0xC]
ldr r0, _080CAC7C @ =gUnknown_20370C6
ldr r0, _080CAC7C @ =gSpecialVar_0x8007
ldrh r0, [r0]
strh r0, [r1, 0xE]
ldr r0, _080CAC80 @ =gUnknown_20370C0
ldr r0, _080CAC80 @ =gSpecialVar_0x8004
ldrh r0, [r0]
strh r0, [r1, 0x10]
movs r0, 0
@@ -886,9 +886,9 @@ sub_80CAC28: @ 80CAC28
_080CAC6C: .4byte sub_80CAC84
_080CAC70: .4byte gTasks
_080CAC74: .4byte gSpecialVar_0x8005
_080CAC78: .4byte gUnknown_20370C4
_080CAC7C: .4byte gUnknown_20370C6
_080CAC80: .4byte gUnknown_20370C0
_080CAC78: .4byte gSpecialVar_0x8006
_080CAC7C: .4byte gSpecialVar_0x8007
_080CAC80: .4byte gSpecialVar_0x8004
thumb_func_end sub_80CAC28
thumb_func_start sub_80CAC84
@@ -1002,7 +1002,7 @@ _080CAD4C:
thumb_func_start sub_80CAD54
sub_80CAD54: @ 80CAD54
push {lr}
ldr r0, _080CAD74 @ =gUnknown_20370C0
ldr r0, _080CAD74 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -1016,14 +1016,14 @@ sub_80CAD54: @ 80CAD54
pop {r1}
bx r1
.align 2, 0
_080CAD74: .4byte gUnknown_20370C0
_080CAD74: .4byte gSpecialVar_0x8004
_080CAD78: .4byte gPlayerParty
thumb_func_end sub_80CAD54
thumb_func_start sub_80CAD7C
sub_80CAD7C: @ 80CAD7C
push {r4,lr}
ldr r0, _080CADA8 @ =gUnknown_20370C0
ldr r0, _080CADA8 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -1042,7 +1042,7 @@ sub_80CAD7C: @ 80CAD7C
movs r0, 0x1
b _080CADBA
.align 2, 0
_080CADA8: .4byte gUnknown_20370C0
_080CADA8: .4byte gSpecialVar_0x8004
_080CADAC: .4byte gPlayerParty
_080CADB0: .4byte gStringVar1
_080CADB4: .4byte gSaveBlock2Ptr
@@ -1092,7 +1092,7 @@ sub_80CADEC: @ 80CADEC
adds r0, 0x1
lsls r0, 16
lsrs r2, r0, 16
ldr r1, _080CAE20 @ =gUnknown_20370C0
ldr r1, _080CAE20 @ =gSpecialVar_0x8004
strh r2, [r1]
ldr r0, _080CAE24 @ =gSpecialVar_0x8005
strh r2, [r0]
@@ -1108,7 +1108,7 @@ _080CAE14:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080CAE20: .4byte gUnknown_20370C0
_080CAE20: .4byte gSpecialVar_0x8004
_080CAE24: .4byte gSpecialVar_0x8005
_080CAE28: .4byte _080CAE2C
.align 2, 0
@@ -1353,7 +1353,7 @@ _080CB01C:
ldrh r0, [r5]
cmp r0, 0xF
bls _080CB04C
ldr r0, _080CB044 @ =gUnknown_20370C0
ldr r0, _080CB044 @ =gSpecialVar_0x8004
ldrh r4, [r0]
adds r0, r4, 0
movs r1, 0x5
@@ -1368,7 +1368,7 @@ _080CB01C:
b _080CB04A
.align 2, 0
_080CB040: .4byte gSpecialVar_0x8005
_080CB044: .4byte gUnknown_20370C0
_080CB044: .4byte gSpecialVar_0x8004
_080CB048:
adds r0, r4, 0x1
_080CB04A:
@@ -1569,9 +1569,9 @@ _080CB1D2:
thumb_func_start sub_80CB1D8
sub_80CB1D8: @ 80CB1D8
push {lr}
ldr r0, _080CB1F0 @ =gUnknown_20370D0
ldr r0, _080CB1F0 @ =gSpecialVar_Result
ldrh r1, [r0]
ldr r0, _080CB1F4 @ =gUnknown_20370C4
ldr r0, _080CB1F4 @ =gSpecialVar_0x8006
ldrh r0, [r0]
adds r1, r0
ldr r0, _080CB1F8 @ =0x0000270f
@@ -1580,8 +1580,8 @@ sub_80CB1D8: @ 80CB1D8
movs r0, 0x1
b _080CB1FE
.align 2, 0
_080CB1F0: .4byte gUnknown_20370D0
_080CB1F4: .4byte gUnknown_20370C4
_080CB1F0: .4byte gSpecialVar_Result
_080CB1F4: .4byte gSpecialVar_0x8006
_080CB1F8: .4byte 0x0000270f
_080CB1FC:
movs r0, 0
@@ -1956,7 +1956,7 @@ sub_80CB498: @ 80CB498
movs r6, 0x1
strh r6, [r4, 0x8]
ldr r0, _080CB4D8 @ =gSpecialVar_0x8005
ldr r1, _080CB4DC @ =gUnknown_20370C4
ldr r1, _080CB4DC @ =gSpecialVar_0x8006
ldrh r2, [r0]
ldrh r0, [r1]
cmp r2, r0
@@ -1970,7 +1970,7 @@ sub_80CB498: @ 80CB498
_080CB4D0: .4byte sub_80CB514
_080CB4D4: .4byte gTasks+0x8
_080CB4D8: .4byte gSpecialVar_0x8005
_080CB4DC: .4byte gUnknown_20370C4
_080CB4DC: .4byte gSpecialVar_0x8006
_080CB4E0:
subs r0, r2
lsls r0, 16
@@ -2357,7 +2357,7 @@ _080CB7D6:
lsls r0, 3
ldr r1, _080CB810 @ =gTasks
adds r3, r0, r1
ldr r0, _080CB814 @ =gUnknown_20370C0
ldr r0, _080CB814 @ =gSpecialVar_0x8004
ldrh r4, [r0]
cmp r4, 0x3
beq _080CB886
@@ -2374,7 +2374,7 @@ _080CB7D6:
_080CB808: .4byte sub_809D6D4
_080CB80C: .4byte sub_80CB904
_080CB810: .4byte gTasks
_080CB814: .4byte gUnknown_20370C0
_080CB814: .4byte gSpecialVar_0x8004
_080CB818:
cmp r4, 0x5
beq _080CB8B4
@@ -2490,7 +2490,7 @@ _080CB8E6:
strh r5, [r3, 0x26]
b _080CB8F8
_080CB8EC:
ldr r1, _080CB900 @ =gUnknown_20370D0
ldr r1, _080CB900 @ =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
adds r0, r5, 0
@@ -2500,7 +2500,7 @@ _080CB8F8:
pop {r0}
bx r0
.align 2, 0
_080CB900: .4byte gUnknown_20370D0
_080CB900: .4byte gSpecialVar_Result
thumb_func_end sub_80CB7C4
thumb_func_start sub_80CB904
@@ -2519,7 +2519,7 @@ sub_80CB904: @ 80CB904
ldr r1, _080CB934 @ =gTasks
adds r5, r0, r1
bl ScriptContext2_Enable
ldr r0, _080CB938 @ =gUnknown_20370C0
ldr r0, _080CB938 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x1
bne _080CB944
@@ -2530,7 +2530,7 @@ sub_80CB904: @ 80CB904
b _080CB94A
.align 2, 0
_080CB934: .4byte gTasks
_080CB938: .4byte gUnknown_20370C0
_080CB938: .4byte gSpecialVar_0x8004
_080CB93C: .4byte gUnknown_2039A18
_080CB940: .4byte gUnknown_2039A0E
_080CB944:
@@ -2563,7 +2563,7 @@ _080CB974:
lsls r3, r4, 3
adds r3, r0
lsls r2, r4, 2
ldr r0, _080CBA6C @ =gUnknown_20370C0
ldr r0, _080CBA6C @ =gSpecialVar_0x8004
ldrh r1, [r0]
lsls r0, r1, 1
adds r0, r1
@@ -2676,7 +2676,7 @@ _080CB9D2:
_080CBA60: .4byte gUnknown_2039A18
_080CBA64: .4byte gUnknown_2039A14
_080CBA68: .4byte gUnknown_83F5BCC
_080CBA6C: .4byte gUnknown_20370C0
_080CBA6C: .4byte gSpecialVar_0x8004
_080CBA70: .4byte gUnknown_3005360
_080CBA74: .4byte gTasks
_080CBA78: .4byte sub_80CBB28
@@ -2794,16 +2794,16 @@ sub_80CBB28: @ 80CBB28
.align 2, 0
_080CBB54: .4byte gTasks
_080CBB58:
ldr r1, _080CBB68 @ =gUnknown_20370D0
ldr r1, _080CBB68 @ =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
movs r0, 0x5
bl PlaySE
b _080CBB88
.align 2, 0
_080CBB68: .4byte gUnknown_20370D0
_080CBB68: .4byte gSpecialVar_Result
_080CBB6C:
ldr r0, _080CBB90 @ =gUnknown_20370D0
ldr r0, _080CBB90 @ =gSpecialVar_Result
strh r4, [r0]
movs r0, 0x5
bl PlaySE
@@ -2821,7 +2821,7 @@ _080CBB88:
bl sub_80CBBAC
b _080CBBA2
.align 2, 0
_080CBB90: .4byte gUnknown_20370D0
_080CBB90: .4byte gSpecialVar_Result
_080CBB94:
adds r0, r5, 0
bl sub_80CBD50
@@ -3123,7 +3123,7 @@ _080CBDC8: .4byte 0x00004031
thumb_func_start sub_80CBDCC
sub_80CBDCC: @ 80CBDCC
push {lr}
ldr r0, _080CBDE4 @ =gUnknown_20370C0
ldr r0, _080CBDE4 @ =gSpecialVar_0x8004
ldrh r0, [r0]
bl SpeciesToNationalPokedexNum
lsls r0, 16
@@ -3133,7 +3133,7 @@ sub_80CBDCC: @ 80CBDCC
pop {r0}
bx r0
.align 2, 0
_080CBDE4: .4byte gUnknown_20370C0
_080CBDE4: .4byte gSpecialVar_0x8004
thumb_func_end sub_80CBDCC
thumb_func_start sub_80CBDE8
@@ -3371,7 +3371,7 @@ _080CBF9A:
thumb_func_start sub_80CBFA0
sub_80CBFA0: @ 80CBFA0
push {r4,lr}
ldr r0, _080CBFC8 @ =gUnknown_20370C0
ldr r0, _080CBFC8 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -3389,7 +3389,7 @@ sub_80CBFA0: @ 80CBFA0
movs r0, 0x1
b _080CBFDA
.align 2, 0
_080CBFC8: .4byte gUnknown_20370C0
_080CBFC8: .4byte gSpecialVar_0x8004
_080CBFCC: .4byte gPlayerParty
_080CBFD0: .4byte gStringVar1
_080CBFD4: .4byte gStringVar3
@@ -3486,7 +3486,7 @@ ChangePokemonNickname: @ 80CC088
mov r4, r8
push {r4-r6}
sub sp, 0x8
ldr r0, _080CC130 @ =gUnknown_20370C0
ldr r0, _080CC130 @ =gSpecialVar_0x8004
mov r9, r0
ldrh r0, [r0]
movs r1, 0x64
@@ -3558,7 +3558,7 @@ ChangePokemonNickname: @ 80CC088
pop {r0}
bx r0
.align 2, 0
_080CC130: .4byte gUnknown_20370C0
_080CC130: .4byte gSpecialVar_0x8004
_080CC134: .4byte gPlayerParty
_080CC138: .4byte gStringVar3
_080CC13C: .4byte gStringVar2
@@ -3568,7 +3568,7 @@ _080CC140: .4byte ChangePokemonNickname_CB
thumb_func_start ChangePokemonNickname_CB
ChangePokemonNickname_CB: @ 80CC144
push {lr}
ldr r0, _080CC164 @ =gUnknown_20370C0
ldr r0, _080CC164 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -3581,7 +3581,7 @@ ChangePokemonNickname_CB: @ 80CC144
pop {r0}
bx r0
.align 2, 0
_080CC164: .4byte gUnknown_20370C0
_080CC164: .4byte gSpecialVar_0x8004
_080CC168: .4byte gPlayerParty
_080CC16C: .4byte gStringVar2
thumb_func_end ChangePokemonNickname_CB
@@ -3589,7 +3589,7 @@ _080CC16C: .4byte gStringVar2
thumb_func_start TV_CopyNicknameToStringVar1AndEnsureTerminated
TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170
push {r4,lr}
ldr r0, _080CC194 @ =gUnknown_20370C0
ldr r0, _080CC194 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -3605,7 +3605,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170
pop {r0}
bx r0
.align 2, 0
_080CC194: .4byte gUnknown_20370C0
_080CC194: .4byte gSpecialVar_0x8004
_080CC198: .4byte gPlayerParty
_080CC19C: .4byte gStringVar1
thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated
@@ -3615,7 +3615,7 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0
push {r4,lr}
bl sub_80CC1E4
adds r4, r0, 0
ldr r0, _080CC1C8 @ =gUnknown_20370C0
ldr r0, _080CC1C8 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -3626,15 +3626,15 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0
bl GetMonData
cmp r4, r0
bne _080CC1D4
ldr r1, _080CC1D0 @ =gUnknown_20370D0
ldr r1, _080CC1D0 @ =gSpecialVar_Result
movs r0, 0
b _080CC1D8
.align 2, 0
_080CC1C8: .4byte gUnknown_20370C0
_080CC1C8: .4byte gSpecialVar_0x8004
_080CC1CC: .4byte gPlayerParty
_080CC1D0: .4byte gUnknown_20370D0
_080CC1D0: .4byte gSpecialVar_Result
_080CC1D4:
ldr r1, _080CC1E0 @ =gUnknown_20370D0
ldr r1, _080CC1E0 @ =gSpecialVar_Result
movs r0, 0x1
_080CC1D8:
strh r0, [r1]
@@ -3642,7 +3642,7 @@ _080CC1D8:
pop {r0}
bx r0
.align 2, 0
_080CC1E0: .4byte gUnknown_20370D0
_080CC1E0: .4byte gSpecialVar_Result
thumb_func_end TV_CheckMonOTIDEqualsPlayerID
thumb_func_start sub_80CC1E4
@@ -3863,7 +3863,7 @@ _080CC318:
adds r0, r4, 0
bl VarSet
ldr r0, _080CC3C4 @ =0x00004042
ldr r1, _080CC3C8 @ =gUnknown_20370C0
ldr r1, _080CC3C8 @ =gSpecialVar_0x8004
ldrh r1, [r1]
bl VarSet
add sp, 0x24
@@ -3874,21 +3874,21 @@ _080CC318:
_080CC3BC: .4byte gPlayerParty
_080CC3C0: .4byte 0x00004043
_080CC3C4: .4byte 0x00004042
_080CC3C8: .4byte gUnknown_20370C0
_080CC3C8: .4byte gSpecialVar_0x8004
thumb_func_end sub_80CC2BC
thumb_func_start sub_80CC3CC
sub_80CC3CC: @ 80CC3CC
push {r4-r6,lr}
movs r5, 0
ldr r4, _080CC3F8 @ =gUnknown_20370C0
ldr r4, _080CC3F8 @ =gSpecialVar_0x8004
movs r0, 0xA
bl GetGameStat
strh r0, [r4]
movs r0, 0xD
bl GetGameStat
adds r6, r0, 0
ldr r4, _080CC3FC @ =gUnknown_20370C4
ldr r4, _080CC3FC @ =gSpecialVar_0x8006
movs r0, 0x17
bl GetGameStat
strh r0, [r4]
@@ -3899,8 +3899,8 @@ sub_80CC3CC: @ 80CC3CC
strh r1, [r0]
b _080CC40C
.align 2, 0
_080CC3F8: .4byte gUnknown_20370C0
_080CC3FC: .4byte gUnknown_20370C4
_080CC3F8: .4byte gSpecialVar_0x8004
_080CC3FC: .4byte gSpecialVar_0x8006
_080CC400: .4byte 0x0000ffff
_080CC404: .4byte gSpecialVar_0x8005
_080CC408:
@@ -3908,7 +3908,7 @@ _080CC408:
strh r6, [r0]
_080CC40C:
adds r1, r0, 0
ldr r0, _080CC444 @ =gUnknown_20370C0
ldr r0, _080CC444 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
beq _080CC41A
@@ -3923,7 +3923,7 @@ _080CC41A:
lsls r0, r5, 16
lsrs r5, r0, 16
_080CC428:
ldr r0, _080CC448 @ =gUnknown_20370C4
ldr r0, _080CC448 @ =gSpecialVar_0x8006
ldrh r0, [r0]
cmp r0, 0
beq _080CC438
@@ -3938,8 +3938,8 @@ _080CC438:
bx r1
.align 2, 0
_080CC440: .4byte gSpecialVar_0x8005
_080CC444: .4byte gUnknown_20370C0
_080CC448: .4byte gUnknown_20370C4
_080CC444: .4byte gSpecialVar_0x8004
_080CC448: .4byte gSpecialVar_0x8006
thumb_func_end sub_80CC3CC
thumb_func_start sub_80CC44C
@@ -3999,7 +3999,7 @@ _080CC49C:
movs r1, 0x41
movs r2, 0
bl GetMonData
ldr r1, _080CC4BC @ =gUnknown_20370C0
ldr r1, _080CC4BC @ =gSpecialVar_0x8004
ldrh r1, [r1]
cmp r0, r1
bne _080CC4C0
@@ -4007,7 +4007,7 @@ _080CC49C:
b _080CC4CC
.align 2, 0
_080CC4B8: .4byte gPlayerParty
_080CC4BC: .4byte gUnknown_20370C0
_080CC4BC: .4byte gSpecialVar_0x8004
_080CC4C0:
adds r0, r4, 0x1
lsls r0, 24
@@ -4331,7 +4331,7 @@ _080CC72C: .4byte 0x0000404d
thumb_func_start sub_80CC730
sub_80CC730: @ 80CC730
push {lr}
ldr r0, _080CC744 @ =gUnknown_20370D0
ldr r0, _080CC744 @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x4
bhi _080CC77C
@@ -4341,7 +4341,7 @@ sub_80CC730: @ 80CC730
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080CC744: .4byte gUnknown_20370D0
_080CC744: .4byte gSpecialVar_Result
_080CC748: .4byte _080CC74C
.align 2, 0
_080CC74C:
@@ -4548,7 +4548,7 @@ _080CC8C4:
thumb_func_start sub_80CC8CC
sub_80CC8CC: @ 80CC8CC
push {r4,lr}
ldr r1, _080CC8E4 @ =gUnknown_20370C0
ldr r1, _080CC8E4 @ =gSpecialVar_0x8004
ldr r2, _080CC8E8 @ =0xfffffedf
adds r0, r2, 0
ldrh r2, [r1]
@@ -4560,7 +4560,7 @@ sub_80CC8CC: @ 80CC8CC
movs r0, 0
b _080CC908
.align 2, 0
_080CC8E4: .4byte gUnknown_20370C0
_080CC8E4: .4byte gSpecialVar_0x8004
_080CC8E8: .4byte 0xfffffedf
_080CC8EC:
ldr r4, _080CC910 @ =gStringVar1
@@ -4612,7 +4612,7 @@ _080CC944: .4byte 0x000001f3
thumb_func_start sub_80CC948
sub_80CC948: @ 80CC948
push {lr}
ldr r0, _080CC968 @ =gUnknown_20370C0
ldr r0, _080CC968 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -4626,7 +4626,7 @@ sub_80CC948: @ 80CC948
pop {r0}
bx r0
.align 2, 0
_080CC968: .4byte gUnknown_20370C0
_080CC968: .4byte gSpecialVar_0x8004
_080CC96C: .4byte gPlayerParty
_080CC970: .4byte 0x00004025
thumb_func_end sub_80CC948
@@ -4904,7 +4904,7 @@ sub_80CCB94: @ 80CCB94
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, _080CCBC0 @ =gUnknown_20370C6
ldr r0, _080CCBC0 @ =gSpecialVar_0x8007
mov r1, r8
strh r1, [r0]
movs r4, 0
@@ -4915,7 +4915,7 @@ sub_80CCB94: @ 80CCB94
mov r9, r0
b _080CCBCE
.align 2, 0
_080CCBC0: .4byte gUnknown_20370C6
_080CCBC0: .4byte gSpecialVar_0x8007
_080CCBC4: .4byte gPlayerParty
_080CCBC8:
adds r0, r4, 0x1
@@ -5045,7 +5045,7 @@ _080CCCCC:
lsls r0, 24
lsrs r6, r0, 24
_080CCCDE:
ldr r0, _080CCCF4 @ =gUnknown_20370C4
ldr r0, _080CCCF4 @ =gSpecialVar_0x8006
strh r6, [r0]
movs r0, 0x1
_080CCCE4:
@@ -5057,7 +5057,7 @@ _080CCCE4:
bx r1
.align 2, 0
_080CCCF0: .4byte gPlayerParty
_080CCCF4: .4byte gUnknown_20370C4
_080CCCF4: .4byte gSpecialVar_0x8006
thumb_func_end sub_80CCB94
thumb_func_start sub_80CCCF8
@@ -5216,12 +5216,12 @@ task_deoxys_sound: @ 80CCE10
lsrs r0, 24
cmp r0, 0x1
bne _080CCE38
ldr r1, _080CCE34 @ =gUnknown_20370D0
ldr r1, _080CCE34 @ =gSpecialVar_Result
movs r0, 0x3
b _080CCE9E
.align 2, 0
_080CCE30: .4byte 0x00000848
_080CCE34: .4byte gUnknown_20370D0
_080CCE34: .4byte gSpecialVar_Result
_080CCE38:
ldr r0, _080CCE80 @ =0x0000403e
mov r8, r0
@@ -5249,7 +5249,7 @@ _080CCE38:
mov r0, r8
movs r1, 0
bl VarSet
ldr r1, _080CCE8C @ =gUnknown_20370D0
ldr r1, _080CCE8C @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _080CCEA4
@@ -5257,13 +5257,13 @@ _080CCE38:
_080CCE80: .4byte 0x0000403e
_080CCE84: .4byte 0x00004026
_080CCE88: .4byte gUnknown_83F637C
_080CCE8C: .4byte gUnknown_20370D0
_080CCE8C: .4byte gSpecialVar_Result
_080CCE90:
cmp r5, 0xA
bne _080CCEB4
ldr r0, _080CCEAC @ =0x00000848
bl FlagSet
ldr r1, _080CCEB0 @ =gUnknown_20370D0
ldr r1, _080CCEB0 @ =gSpecialVar_Result
movs r0, 0x2
_080CCE9E:
strh r0, [r1]
@@ -5274,7 +5274,7 @@ _080CCEA4:
b _080CCED6
.align 2, 0
_080CCEAC: .4byte 0x00000848
_080CCEB0: .4byte gUnknown_20370D0
_080CCEB0: .4byte gSpecialVar_Result
_080CCEB4:
adds r0, r5, 0x1
lsls r0, 16
@@ -5285,7 +5285,7 @@ _080CCEB4:
ldr r0, _080CCEE0 @ =0x0000403e
adds r1, r5, 0
bl VarSet
ldr r1, _080CCEE4 @ =gUnknown_20370D0
ldr r1, _080CCEE4 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
adds r0, r7, 0
@@ -5298,7 +5298,7 @@ _080CCED6:
bx r0
.align 2, 0
_080CCEE0: .4byte 0x0000403e
_080CCEE4: .4byte gUnknown_20370D0
_080CCEE4: .4byte gSpecialVar_Result
thumb_func_end task_deoxys_sound
thumb_func_start sub_80CCEE8
@@ -5528,12 +5528,12 @@ sub_80CD098: @ 80CD098
ldrb r0, [r0]
cmp r0, 0x2
beq _080CD0E8
ldr r0, _080CD0D0 @ =gUnknown_20370C0
ldr r0, _080CD0D0 @ =gSpecialVar_0x8004
ldrh r0, [r0]
adds r0, 0x1B
lsls r0, 16
lsrs r1, r0, 16
ldr r0, _080CD0D4 @ =gUnknown_20370C4
ldr r0, _080CD0D4 @ =gSpecialVar_0x8006
ldrh r3, [r0]
cmp r3, 0
bne _080CD0E0
@@ -5548,8 +5548,8 @@ sub_80CD098: @ 80CD098
b _080CD0E8
.align 2, 0
_080CD0CC: .4byte gUnknown_203ADFA
_080CD0D0: .4byte gUnknown_20370C0
_080CD0D4: .4byte gUnknown_20370C4
_080CD0D0: .4byte gSpecialVar_0x8004
_080CD0D4: .4byte gSpecialVar_0x8006
_080CD0D8: .4byte gSpecialVar_0x8005
_080CD0DC: .4byte gUnknown_2039A1B
_080CD0E0:
@@ -5583,7 +5583,7 @@ _080CD104:
movs r1, 0x41
movs r2, 0
bl GetMonData
ldr r1, _080CD13C @ =gUnknown_20370C0
ldr r1, _080CD13C @ =gSpecialVar_0x8004
ldrh r1, [r1]
cmp r0, r1
bne _080CD140
@@ -5599,7 +5599,7 @@ _080CD104:
b _080CD14C
.align 2, 0
_080CD138: .4byte gPlayerParty
_080CD13C: .4byte gUnknown_20370C0
_080CD13C: .4byte gSpecialVar_0x8004
_080CD140:
adds r0, r6, 0x1
lsls r0, 24
@@ -5708,7 +5708,7 @@ sub_80CD1CC: @ 80CD1CC
_080CD200:
movs r0, 0
ldrsh r1, [r4, r0]
ldr r0, _080CD224 @ =gUnknown_20370C0
ldr r0, _080CD224 @ =gSpecialVar_0x8004
ldrh r0, [r0]
subs r0, 0x1
cmp r1, r0
@@ -5722,7 +5722,7 @@ _080CD214:
.align 2, 0
_080CD21C: .4byte gTasks+0x8
_080CD220: .4byte gSpecialVar_0x8005
_080CD224: .4byte gUnknown_20370C0
_080CD224: .4byte gSpecialVar_0x8004
thumb_func_end sub_80CD1CC
.align 2, 0 @ Don't pad with nop.
asm/fldeff_strength.s
+2 -2
View File
@@ -23,7 +23,7 @@ _080D0808:
movs r0, 0
b _080D0826
_080D080C:
ldr r4, _080D082C @ =gUnknown_20370D0
ldr r4, _080D082C @ =gSpecialVar_Result
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
@@ -40,7 +40,7 @@ _080D0826:
pop {r1}
bx r1
.align 2, 0
_080D082C: .4byte gUnknown_20370D0
_080D082C: .4byte gSpecialVar_Result
_080D0830: .4byte gUnknown_3005024
_080D0834: .4byte hm_add_c3_launch_phase_2
_080D0838: .4byte gUnknown_203B0C4
asm/heal_location.s
+4 -4
View File
@@ -112,7 +112,7 @@ sub_80BFCD0: @ 80BFCD0
movs r1, 0
bl VarSet
_080BFD0A:
ldr r0, _080BFD34 @ =gUnknown_20370D2
ldr r0, _080BFD34 @ =gSpecialVar_LastTalked
strh r5, [r0]
movs r0, 0x4
strh r0, [r4, 0x4]
@@ -130,7 +130,7 @@ _080BFD24: .4byte 0x00004082
_080BFD28: .4byte gSaveBlock1Ptr
_080BFD2C: .4byte 0x00003d34
_080BFD30: .4byte 0x00003d42
_080BFD34: .4byte gUnknown_20370D2
_080BFD34: .4byte gSpecialVar_LastTalked
_080BFD38:
ldr r0, _080BFD7C @ =gSaveBlock1Ptr
ldr r1, [r0]
@@ -239,7 +239,7 @@ _080BFDFA:
thumb_func_start sub_80BFE00
sub_80BFE00: @ 80BFE00
ldr r2, _080BFE10 @ =gUnknown_20370D2
ldr r2, _080BFE10 @ =gSpecialVar_LastTalked
ldr r1, _080BFE14 @ =gUnknown_83EECE8
subs r0, 0x1
adds r0, r1
@@ -247,7 +247,7 @@ sub_80BFE00: @ 80BFE00
strh r0, [r2]
bx lr
.align 2, 0
_080BFE10: .4byte gUnknown_20370D2
_080BFE10: .4byte gSpecialVar_LastTalked
_080BFE14: .4byte gUnknown_83EECE8
thumb_func_end sub_80BFE00
asm/help_system_812B1E0.s
+2 -2
View File
@@ -49,13 +49,13 @@ _0812B21C: .4byte gUnknown_203B0EC
thumb_func_start sub_812B220
sub_812B220: @ 812B220
ldr r0, _0812B22C @ =gUnknown_203B0EC
ldr r1, _0812B230 @ =gUnknown_20370C0
ldr r1, _0812B230 @ =gSpecialVar_0x8004
ldrh r1, [r1]
strh r1, [r0]
bx lr
.align 2, 0
_0812B22C: .4byte gUnknown_203B0EC
_0812B230: .4byte gUnknown_20370C0
_0812B230: .4byte gSpecialVar_0x8004
thumb_func_end sub_812B220
thumb_func_start sub_812B234
asm/item.s
+4 -4
View File
@@ -326,13 +326,13 @@ sub_8099FAC: @ 8099FAC
.align 2, 0
_08099FC0: .4byte 0x0000016d
_08099FC4:
ldr r1, _08099FD0 @ =gUnknown_20370D0
ldr r1, _08099FD0 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
movs r0, 0x1
b _08099FF6
.align 2, 0
_08099FD0: .4byte gUnknown_20370D0
_08099FD0: .4byte gSpecialVar_Result
_08099FD4:
movs r4, 0x85
_08099FD6:
@@ -349,7 +349,7 @@ _08099FD6:
cmp r4, 0xAF
bls _08099FD6
_08099FF0:
ldr r0, _08099FFC @ =gUnknown_20370D0
ldr r0, _08099FFC @ =gSpecialVar_Result
strh r1, [r0]
movs r0, 0
_08099FF6:
@@ -357,7 +357,7 @@ _08099FF6:
pop {r1}
bx r1
.align 2, 0
_08099FFC: .4byte gUnknown_20370D0
_08099FFC: .4byte gSpecialVar_Result
thumb_func_end sub_8099FAC
thumb_func_start sub_809A000
asm/item_menu.s
+50 -50
View File
@@ -94,7 +94,7 @@ _08107E5A:
strb r0, [r2, 0x5]
movs r1, 0
ldr r4, _08107EA4 @ =gTextFlags
ldr r5, _08107EA8 @ =gUnknown_203AD30
ldr r5, _08107EA8 @ =gSpecialVar_ItemId
ldr r6, _08107EAC @ =sub_8107F10
ldr r3, _08107EB0 @ =gUnknown_203AD10
movs r2, 0
@@ -132,7 +132,7 @@ _08107E9A:
bx r0
.align 2, 0
_08107EA4: .4byte gTextFlags
_08107EA8: .4byte gUnknown_203AD30
_08107EA8: .4byte gSpecialVar_ItemId
_08107EAC: .4byte sub_8107F10
_08107EB0: .4byte gUnknown_203AD10
_08107EB4: .4byte gUnknown_203ACFC
@@ -2367,7 +2367,7 @@ _08109014: .4byte gUnknown_203ACFC
_08109018:
movs r0, 0x5
bl PlaySE
ldr r1, _08109038 @ =gUnknown_203AD30
ldr r1, _08109038 @ =gSpecialVar_ItemId
movs r0, 0
strh r0, [r1]
bl sub_8108CB4
@@ -2379,7 +2379,7 @@ _08109018:
ldr r1, _08109040 @ =sub_8108B50
b _081090C4
.align 2, 0
_08109038: .4byte gUnknown_203AD30
_08109038: .4byte gSpecialVar_ItemId
_0810903C: .4byte gTasks
_08109040: .4byte sub_8108B50
_08109044:
@@ -2393,7 +2393,7 @@ _08109044:
ldrb r0, [r0]
cmp r4, r0
bne _08109084
ldr r1, _08109078 @ =gUnknown_203AD30
ldr r1, _08109078 @ =gSpecialVar_ItemId
movs r0, 0
strh r0, [r1]
bl sub_8108CB4
@@ -2406,7 +2406,7 @@ _08109044:
b _081090C4
.align 2, 0
_08109074: .4byte gUnknown_203AD10
_08109078: .4byte gUnknown_203AD30
_08109078: .4byte gSpecialVar_ItemId
_0810907C: .4byte gTasks
_08109080: .4byte sub_8108B50
_08109084:
@@ -2430,7 +2430,7 @@ _08109084:
lsrs r0, 24
adds r1, r4, 0
bl sub_809A798
ldr r1, _081090D0 @ =gUnknown_203AD30
ldr r1, _081090D0 @ =gSpecialVar_ItemId
strh r0, [r1]
ldr r1, _081090D4 @ =gTasks
lsls r0, r6, 2
@@ -2446,7 +2446,7 @@ _081090C6:
pop {r0}
bx r0
.align 2, 0
_081090D0: .4byte gUnknown_203AD30
_081090D0: .4byte gSpecialVar_ItemId
_081090D4: .4byte gTasks
_081090D8: .4byte sub_81090DC
thumb_func_end sub_8108F0C
@@ -3404,7 +3404,7 @@ _081098AC:
beq _08109924
b _0810993C
_081098B6:
ldr r2, _081098D4 @ =gUnknown_203AD30
ldr r2, _081098D4 @ =gSpecialVar_ItemId
ldrh r1, [r2]
ldr r0, _081098D8 @ =0x0000016d
cmp r1, r0
@@ -3420,7 +3420,7 @@ _081098B6:
movs r0, 0x2
b _08109AD0
.align 2, 0
_081098D4: .4byte gUnknown_203AD30
_081098D4: .4byte gSpecialVar_ItemId
_081098D8: .4byte 0x0000016d
_081098DC: .4byte gUnknown_203AD20
_081098E0: .4byte gUnknown_203AD24
@@ -3473,7 +3473,7 @@ _0810993C:
cmp r0, 0x1
bne _081099C4
_08109950:
ldr r1, _08109970 @ =gUnknown_203AD30
ldr r1, _08109970 @ =gSpecialVar_ItemId
ldr r2, _08109974 @ =0xfffffe94
adds r0, r2, 0
ldrh r1, [r1]
@@ -3489,7 +3489,7 @@ _08109950:
movs r0, 0x2
b _08109AD0
.align 2, 0
_08109970: .4byte gUnknown_203AD30
_08109970: .4byte gSpecialVar_ItemId
_08109974: .4byte 0xfffffe94
_08109978: .4byte gUnknown_203AD24
_0810997C: .4byte gUnknown_8452F2E
@@ -3549,7 +3549,7 @@ _081099EC:
ldr r4, _08109A0C @ =gUnknown_203AD28
movs r0, 0x4
strb r0, [r4]
ldr r0, _08109A10 @ =gUnknown_203AD30
ldr r0, _08109A10 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl itemid_is_mail
lsls r0, 24
@@ -3563,7 +3563,7 @@ _081099EC:
b _08109AD4
.align 2, 0
_08109A0C: .4byte gUnknown_203AD28
_08109A10: .4byte gUnknown_203AD30
_08109A10: .4byte gSpecialVar_ItemId
_08109A14: .4byte gUnknown_203AD24
_08109A18: .4byte gUnknown_8452F24
_08109A1C:
@@ -3591,7 +3591,7 @@ _08109A34:
ldr r0, [r0]
ldr r1, _08109A6C @ =0x00000296
adds r0, r1
ldr r1, _08109A70 @ =gUnknown_203AD30
ldr r1, _08109A70 @ =gSpecialVar_ItemId
ldrh r0, [r0]
adds r7, r3, 0
ldrh r3, [r1]
@@ -3605,7 +3605,7 @@ _08109A60: .4byte gUnknown_203AD20
_08109A64: .4byte gUnknown_203AD28
_08109A68: .4byte gSaveBlock1Ptr
_08109A6C: .4byte 0x00000296
_08109A70: .4byte gUnknown_203AD30
_08109A70: .4byte gSpecialVar_ItemId
_08109A74:
movs r0, 0x2
_08109A76:
@@ -3722,7 +3722,7 @@ _08109AD4:
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _08109BA8 @ =gUnknown_203AD30
ldr r0, _08109BA8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _08109BAC @ =gStringVar1
bl sub_8099E90
@@ -3751,7 +3751,7 @@ _08109B98: .4byte gUnknown_203AD24
_08109B9C: .4byte gUnknown_8452F18
_08109BA0: .4byte gUnknown_203AD28
_08109BA4: .4byte gUnknown_8452EB8
_08109BA8: .4byte gUnknown_203AD30
_08109BA8: .4byte gSpecialVar_ItemId
_08109BAC: .4byte gStringVar1
_08109BB0: .4byte gStringVar4
_08109BB4: .4byte gUnknown_84162FF
@@ -3838,7 +3838,7 @@ sub_8109C50: @ 8109C50
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r5, _08109CA0 @ =gUnknown_203AD30
ldr r5, _08109CA0 @ =gSpecialVar_ItemId
ldrh r0, [r5]
bl ItemId_GetFieldFunc
cmp r0, 0
@@ -3867,9 +3867,9 @@ sub_8109C50: @ 8109C50
bl sub_810A170
b _08109CB4
.align 2, 0
_08109CA0: .4byte gUnknown_203AD30
_08109CA0: .4byte gSpecialVar_ItemId
_08109CA4:
ldr r0, _08109CBC @ =gUnknown_203AD30
ldr r0, _08109CBC @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetFieldFunc
adds r1, r0, 0
@@ -3880,7 +3880,7 @@ _08109CB4:
pop {r0}
bx r0
.align 2, 0
_08109CBC: .4byte gUnknown_203AD30
_08109CBC: .4byte gSpecialVar_ItemId
thumb_func_end sub_8109C50
thumb_func_start sub_8109CC0
@@ -4197,7 +4197,7 @@ sub_8109F44: @ 8109F44
_08109F6E:
movs r0, 0x5
bl PlaySE
ldr r0, _08109FF4 @ =gUnknown_203AD30
ldr r0, _08109FF4 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r7, 0x10]
bl sub_809A1D8
@@ -4249,7 +4249,7 @@ _08109FE0:
.align 2, 0
_08109FEC: .4byte gTasks+0x8
_08109FF0: .4byte gMain
_08109FF4: .4byte gUnknown_203AD30
_08109FF4: .4byte gSpecialVar_ItemId
_08109FF8: .4byte gUnknown_203ACFC
_08109FFC: .4byte gUnknown_3005E70
thumb_func_end sub_8109F44
@@ -4444,7 +4444,7 @@ sub_810A18C: @ 810A18C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _0810A1BC @ =gUnknown_203AD30
ldr r0, _0810A1BC @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _0810A1C0 @ =gStringVar1
bl sub_8099E90
@@ -4461,7 +4461,7 @@ sub_810A18C: @ 810A18C
pop {r0}
bx r0
.align 2, 0
_0810A1BC: .4byte gUnknown_203AD30
_0810A1BC: .4byte gSpecialVar_ItemId
_0810A1C0: .4byte gStringVar1
_0810A1C4: .4byte gStringVar4
_0810A1C8: .4byte gUnknown_841635E
@@ -4634,7 +4634,7 @@ sub_810A324: @ 810A324
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r5, _0810A36C @ =gUnknown_203AD30
ldr r5, _0810A36C @ =gSpecialVar_ItemId
ldrh r0, [r5]
bl ItemId_GetBattleFunc
cmp r0, 0
@@ -4660,7 +4660,7 @@ _0810A364:
pop {r0}
bx r0
.align 2, 0
_0810A36C: .4byte gUnknown_203AD30
_0810A36C: .4byte gSpecialVar_ItemId
thumb_func_end sub_810A324
thumb_func_start sub_810A370
@@ -4936,7 +4936,7 @@ sub_810A568: @ 810A568
lsls r0, 3
ldr r1, _0810A58C @ =gTasks+0x8
adds r4, r0, r1
ldr r6, _0810A590 @ =gUnknown_203AD30
ldr r6, _0810A590 @ =gSpecialVar_ItemId
ldrh r1, [r6]
movs r0, 0xB6
lsls r0, 1
@@ -4946,7 +4946,7 @@ sub_810A568: @ 810A568
b _0810A5A0
.align 2, 0
_0810A58C: .4byte gTasks+0x8
_0810A590: .4byte gUnknown_203AD30
_0810A590: .4byte gSpecialVar_ItemId
_0810A594: .4byte sub_810A654
_0810A598:
ldr r0, _0810A5AC @ =0x0000016d
@@ -5394,7 +5394,7 @@ sub_810A940: @ 810A940
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0810A9B8 @ =gUnknown_203AD30
ldr r0, _0810A9B8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _0810A9BC @ =gStringVar1
bl sub_8099E90
@@ -5432,7 +5432,7 @@ sub_810A940: @ 810A940
bx r0
.align 2, 0
_0810A9B4: .4byte gTasks+0x8
_0810A9B8: .4byte gUnknown_203AD30
_0810A9B8: .4byte gSpecialVar_ItemId
_0810A9BC: .4byte gStringVar1
_0810A9C0: .4byte gStringVar3
_0810A9C4: .4byte gUnknown_203ACFC
@@ -5460,7 +5460,7 @@ sub_810A9D4: @ 810A9D4
mov r8, r1
movs r0, 0xF8
bl PlaySE
ldr r5, _0810AADC @ =gUnknown_203AD30
ldr r5, _0810AADC @ =gSpecialVar_ItemId
ldrh r0, [r5]
mov r2, r8
ldrh r1, [r2, 0x10]
@@ -5559,7 +5559,7 @@ sub_810A9D4: @ 810A9D4
bx r0
.align 2, 0
_0810AAD8: .4byte gTasks+0x8
_0810AADC: .4byte gUnknown_203AD30
_0810AADC: .4byte gSpecialVar_ItemId
_0810AAE0: .4byte gSaveBlock1Ptr
_0810AAE4: .4byte gUnknown_203ACFC
_0810AAE8: .4byte gUnknown_203AD10
@@ -5741,7 +5741,7 @@ sub_810AC40: @ 810AC40
mov r9, r0
mov r7, r8
add r7, r9
ldr r5, _0810ACD0 @ =gUnknown_203AD30
ldr r5, _0810ACD0 @ =gSpecialVar_ItemId
ldrh r0, [r5]
ldrh r1, [r7, 0x10]
bl sub_809A3C8
@@ -5791,7 +5791,7 @@ sub_810AC40: @ 810AC40
b _0810ACF8
.align 2, 0
_0810ACCC: .4byte gTasks+0x8
_0810ACD0: .4byte gUnknown_203AD30
_0810ACD0: .4byte gSpecialVar_ItemId
_0810ACD4: .4byte 0x0000ffff
_0810ACD8: .4byte gStringVar1
_0810ACDC: .4byte gStringVar2
@@ -5848,7 +5848,7 @@ _0810AD1E:
bl player_bitmagic
bl sub_805C270
bl sub_805C780
ldr r2, _0810AD88 @ =gUnknown_203AD30
ldr r2, _0810AD88 @ =gSpecialVar_ItemId
ldr r0, [r4]
adds r0, r5
ldrh r1, [r0]
@@ -5869,7 +5869,7 @@ _0810AD1E:
.align 2, 0
_0810AD80: .4byte gSaveBlock1Ptr
_0810AD84: .4byte 0x00000296
_0810AD88: .4byte gUnknown_203AD30
_0810AD88: .4byte gSpecialVar_ItemId
_0810AD8C: .4byte gTasks
_0810AD90:
ldr r0, [r4]
@@ -6187,14 +6187,14 @@ _0810AFF6:
bl bag_menu_print_cursor_
movs r0, 0x1
bl sub_8109140
ldr r1, _0810B018 @ =gUnknown_203AD30
ldr r1, _0810B018 @ =gSpecialVar_ItemId
movs r0, 0x4
strh r0, [r1]
adds r0, r4, 0
bl sub_8109890
b _0810B064
.align 2, 0
_0810B018: .4byte gUnknown_203AD30
_0810B018: .4byte gSpecialVar_ItemId
_0810B01C:
movs r0, 0x5
bl PlaySE
@@ -6493,7 +6493,7 @@ _0810B266:
bl bag_menu_print_cursor_
movs r0, 0x1
bl sub_8109140
ldr r1, _0810B28C @ =gUnknown_203AD30
ldr r1, _0810B28C @ =gSpecialVar_ItemId
movs r2, 0xB7
lsls r2, 1
adds r0, r2, 0
@@ -6502,7 +6502,7 @@ _0810B266:
bl sub_8109890
b _0810B36C
.align 2, 0
_0810B28C: .4byte gUnknown_203AD30
_0810B28C: .4byte gSpecialVar_ItemId
_0810B290:
movs r0, 0x5
bl PlaySE
@@ -6514,7 +6514,7 @@ _0810B29E:
bl PlaySE
ldr r0, _0810B318 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _0810B31C @ =gUnknown_203AD30
ldr r1, _0810B31C @ =gSpecialVar_ItemId
ldrh r1, [r1]
ldr r2, _0810B320 @ =0x00000296
adds r0, r2
@@ -6562,7 +6562,7 @@ _0810B29E:
b _0810B36C
.align 2, 0
_0810B318: .4byte gSaveBlock1Ptr
_0810B31C: .4byte gUnknown_203AD30
_0810B31C: .4byte gSpecialVar_ItemId
_0810B320: .4byte 0x00000296
_0810B324: .4byte gUnknown_203ACFC
_0810B328: .4byte gUnknown_3005E70
@@ -6713,14 +6713,14 @@ _0810B440:
bl bag_menu_print_cursor_
movs r0, 0x1
bl sub_8109140
ldr r1, _0810B464 @ =gUnknown_203AD30
ldr r1, _0810B464 @ =gSpecialVar_ItemId
movs r0, 0x4
strh r0, [r1]
adds r0, r5, 0
bl sub_8109890
b _0810B4B0
.align 2, 0
_0810B464: .4byte gUnknown_203AD30
_0810B464: .4byte gSpecialVar_ItemId
_0810B468:
movs r0, 0x5
bl PlaySE
@@ -6829,14 +6829,14 @@ _0810B53C:
bl bag_menu_print_cursor_
movs r0, 0x1
bl sub_8109140
ldr r1, _0810B560 @ =gUnknown_203AD30
ldr r1, _0810B560 @ =gSpecialVar_ItemId
movs r0, 0xE
strh r0, [r1]
adds r0, r4, 0
bl sub_8109890
b _0810B5C0
.align 2, 0
_0810B560: .4byte gUnknown_203AD30
_0810B560: .4byte gSpecialVar_ItemId
_0810B564:
movs r0, 0x5
bl PlaySE
@@ -6962,7 +6962,7 @@ _0810B660:
bl bag_menu_print_cursor_
movs r0, 0x1
bl sub_8109140
ldr r1, _0810B688 @ =gUnknown_203AD30
ldr r1, _0810B688 @ =gSpecialVar_ItemId
movs r2, 0xB6
lsls r2, 1
adds r0, r2, 0
@@ -6971,7 +6971,7 @@ _0810B660:
bl sub_8109890
b _0810B6E0
.align 2, 0
_0810B688: .4byte gUnknown_203AD30
_0810B688: .4byte gSpecialVar_ItemId
_0810B68C:
movs r0, 0x5
bl PlaySE
asm/item_use.s
+42 -42
View File
@@ -10,7 +10,7 @@ sub_80A0FBC: @ 80A0FBC
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _080A0FD8 @ =gUnknown_203AD30
ldr r1, _080A0FD8 @ =gSpecialVar_ItemId
ldrh r0, [r1]
cmp r0, 0xAF
bne _080A0FE0
@@ -22,7 +22,7 @@ sub_80A0FBC: @ 80A0FBC
ldrb r0, [r1, 0x10]
b _080A0FE6
.align 2, 0
_080A0FD8: .4byte gUnknown_203AD30
_080A0FD8: .4byte gSpecialVar_ItemId
_080A0FDC: .4byte gTasks
_080A0FE0:
ldrh r0, [r1]
@@ -31,7 +31,7 @@ _080A0FE6:
subs r0, 0x1
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1010 @ =gUnknown_203AD30
ldr r0, _080A1010 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetPocketByItemId
lsls r0, 24
@@ -47,7 +47,7 @@ _080A0FE6:
bl sub_813D808
b _080A1032
.align 2, 0
_080A1010: .4byte gUnknown_203AD30
_080A1010: .4byte gSpecialVar_ItemId
_080A1014: .4byte gUnknown_83E2954
_080A1018:
ldr r0, _080A1038 @ =gUnknown_83E2954
@@ -317,7 +317,7 @@ sub_80A1208: @ 80A1208
push {lr}
sub sp, 0x24
mov r1, sp
ldr r0, _080A1224 @ =gUnknown_203AD30
ldr r0, _080A1224 @ =gSpecialVar_ItemId
ldrh r0, [r0]
strh r0, [r1, 0x20]
ldr r1, _080A1228 @ =UseFameCheckerFromMenu
@@ -328,7 +328,7 @@ sub_80A1208: @ 80A1208
pop {r0}
bx r0
.align 2, 0
_080A1224: .4byte gUnknown_203AD30
_080A1224: .4byte gSpecialVar_ItemId
_080A1228: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A1208
@@ -571,7 +571,7 @@ ItemUseOnFieldCB_Rod: @ 80A1410
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080A1434 @ =gUnknown_203AD30
ldr r0, _080A1434 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetSecondaryId
lsls r0, 24
@@ -583,7 +583,7 @@ ItemUseOnFieldCB_Rod: @ 80A1410
pop {r0}
bx r0
.align 2, 0
_080A1434: .4byte gUnknown_203AD30
_080A1434: .4byte gSpecialVar_ItemId
thumb_func_end ItemUseOnFieldCB_Rod
thumb_func_start ItemUseOutOfBattle_Itemfinder
@@ -625,7 +625,7 @@ sub_80A1460: @ 80A1460
ldr r1, _080A14BC @ =gUnknown_8416537
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r0, _080A14C0 @ =gUnknown_203AD30
ldr r0, _080A14C0 @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _080A14C4 @ =0x0000ffff
movs r0, 0x4
@@ -650,7 +650,7 @@ sub_80A1460: @ 80A1460
_080A14B4: .4byte gStringVar1
_080A14B8: .4byte gStringVar4
_080A14BC: .4byte gUnknown_8416537
_080A14C0: .4byte gUnknown_203AD30
_080A14C0: .4byte gSpecialVar_ItemId
_080A14C4: .4byte 0x0000ffff
_080A14C8: .4byte gTasks
_080A14CC: .4byte sub_810A1F8
@@ -684,7 +684,7 @@ sub_80A14E8: @ 80A14E8
ldr r1, _080A1540 @ =gUnknown_8416644
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r0, _080A1544 @ =gUnknown_203AD30
ldr r0, _080A1544 @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _080A1548 @ =0x0000ffff
movs r0, 0x4
@@ -709,7 +709,7 @@ sub_80A14E8: @ 80A14E8
_080A1538: .4byte gStringVar1
_080A153C: .4byte gStringVar4
_080A1540: .4byte gUnknown_8416644
_080A1544: .4byte gUnknown_203AD30
_080A1544: .4byte gSpecialVar_ItemId
_080A1548: .4byte 0x0000ffff
_080A154C: .4byte gTasks
_080A1550: .4byte sub_810A1F8
@@ -760,7 +760,7 @@ _080A1598:
bcc _080A1578
cmp r6, 0
beq _080A1600
ldr r0, _080A15D4 @ =gUnknown_203AD30
ldr r0, _080A15D4 @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _080A15D8 @ =0x0000ffff
movs r0, 0x4
@@ -780,7 +780,7 @@ _080A1598:
b _080A1616
.align 2, 0
_080A15D0: .4byte gPlayerParty
_080A15D4: .4byte gUnknown_203AD30
_080A15D4: .4byte gSpecialVar_ItemId
_080A15D8: .4byte 0x0000ffff
_080A15DC: .4byte gTasks
_080A15E0: .4byte gUnknown_8416690
@@ -1196,7 +1196,7 @@ sub_80A18EC: @ 80A18EC
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1920 @ =gUnknown_203AD30
ldr r0, _080A1920 @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _080A1924 @ =0x0000ffff
movs r0, 0x4
@@ -1217,7 +1217,7 @@ sub_80A18EC: @ 80A18EC
bl sub_8108B50
b _080A1940
.align 2, 0
_080A1920: .4byte gUnknown_203AD30
_080A1920: .4byte gSpecialVar_ItemId
_080A1924: .4byte 0x0000ffff
_080A1928: .4byte gTasks
_080A192C: .4byte sub_80A194C
@@ -1323,7 +1323,7 @@ sub_80A19E8: @ 80A19E8
lsls r0, 24
cmp r0, 0
bne _080A1A2A
ldr r4, _080A1A30 @ =gUnknown_203AD30
ldr r4, _080A1A30 @ =gSpecialVar_ItemId
ldrh r2, [r4]
ldr r3, _080A1A34 @ =0x0000ffff
movs r0, 0x4
@@ -1348,7 +1348,7 @@ _080A1A2A:
pop {r0}
bx r0
.align 2, 0
_080A1A30: .4byte gUnknown_203AD30
_080A1A30: .4byte gSpecialVar_ItemId
_080A1A34: .4byte 0x0000ffff
_080A1A38: .4byte 0x00004020
_080A1A3C: .4byte gStringVar4
@@ -1358,7 +1358,7 @@ _080A1A40: .4byte sub_810A1F8
thumb_func_start sub_80A1A44
sub_80A1A44: @ 80A1A44
push {r4,lr}
ldr r4, _080A1A84 @ =gUnknown_203AD30
ldr r4, _080A1A84 @ =gSpecialVar_ItemId
ldrh r0, [r4]
movs r1, 0x1
bl sub_809A1D8
@@ -1382,7 +1382,7 @@ sub_80A1A44: @ 80A1A44
pop {r0}
bx r0
.align 2, 0
_080A1A84: .4byte gUnknown_203AD30
_080A1A84: .4byte gSpecialVar_ItemId
_080A1A88: .4byte gStringVar2
_080A1A8C: .4byte gStringVar4
_080A1A90: .4byte gUnknown_841658C
@@ -1394,7 +1394,7 @@ sub_80A1A94: @ 80A1A94
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r5, _080A1AD4 @ =gUnknown_203AD30
ldr r5, _080A1AD4 @ =gSpecialVar_ItemId
ldrh r2, [r5]
ldr r3, _080A1AD8 @ =0x0000ffff
movs r0, 0x4
@@ -1418,7 +1418,7 @@ sub_80A1A94: @ 80A1A94
adds r0, r4
b _080A1B1A
.align 2, 0
_080A1AD4: .4byte gUnknown_203AD30
_080A1AD4: .4byte gSpecialVar_ItemId
_080A1AD8: .4byte 0x0000ffff
_080A1ADC: .4byte 0x00000803
_080A1AE0: .4byte 0x00000804
@@ -1527,7 +1527,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80A1BAC
lsrs r0, 24
cmp r0, 0x1
bne _080A1BEC
ldr r0, _080A1BDC @ =gUnknown_203AD30
ldr r0, _080A1BDC @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r0, _080A1BE0 @ =gMapHeader
ldrb r3, [r0, 0x14]
@@ -1541,7 +1541,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80A1BAC
bl sub_80A103C
b _080A1BFE
.align 2, 0
_080A1BDC: .4byte gUnknown_203AD30
_080A1BDC: .4byte gSpecialVar_ItemId
_080A1BE0: .4byte gMapHeader
_080A1BE4: .4byte gUnknown_2039998
_080A1BE8: .4byte sub_80A1C08
@@ -1687,7 +1687,7 @@ sub_80A1CF8: @ 80A1CF8
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1D2C @ =gUnknown_203AD30
ldr r0, _080A1D2C @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _080A1D30 @ =0x0000ffff
movs r0, 0x4
@@ -1708,7 +1708,7 @@ sub_80A1CF8: @ 80A1CF8
bl sub_8108B50
b _080A1D4C
.align 2, 0
_080A1D2C: .4byte gUnknown_203AD30
_080A1D2C: .4byte gSpecialVar_ItemId
_080A1D30: .4byte 0x0000ffff
_080A1D34: .4byte gTasks
_080A1D38: .4byte sub_80A1D58
@@ -1841,7 +1841,7 @@ sub_80A1E1C: @ 80A1E1C
lsls r0, 24
cmp r0, 0
bne _080A1E48
ldr r0, _080A1E44 @ =gUnknown_203AD30
ldr r0, _080A1E44 @ =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl sub_809A1D8
@@ -1850,7 +1850,7 @@ sub_80A1E1C: @ 80A1E1C
bl sub_8108B50
b _080A1E54
.align 2, 0
_080A1E44: .4byte gUnknown_203AD30
_080A1E44: .4byte gSpecialVar_ItemId
_080A1E48:
ldr r2, _080A1E5C @ =gUnknown_8416631
ldr r3, _080A1E60 @ =sub_810A1F8
@@ -1895,7 +1895,7 @@ sub_80A1E7C: @ 80A1E7C
muls r0, r2
ldr r1, _080A1EC4 @ =gPlayerParty
adds r0, r1
ldr r1, _080A1EC8 @ =gUnknown_203AD30
ldr r1, _080A1EC8 @ =gSpecialVar_ItemId
ldrh r1, [r1]
lsls r2, 24
lsrs r2, 24
@@ -1915,7 +1915,7 @@ sub_80A1E7C: @ 80A1E7C
_080A1EBC: .4byte gBattlerPartyIndexes
_080A1EC0: .4byte gBattlerInMenuId
_080A1EC4: .4byte gPlayerParty
_080A1EC8: .4byte gUnknown_203AD30
_080A1EC8: .4byte gSpecialVar_ItemId
_080A1ECC: .4byte gUnknown_84169DC
_080A1ED0: .4byte sub_810A1F8
_080A1ED4:
@@ -1953,7 +1953,7 @@ sub_80A1EF4: @ 80A1EF4
asrs r0, 16
cmp r0, 0x7
ble _080A1F36
ldr r0, _080A1F40 @ =gUnknown_203AD30
ldr r0, _080A1F40 @ =gSpecialVar_ItemId
ldrh r4, [r0]
movs r0, 0x1
bl PlaySE
@@ -1973,7 +1973,7 @@ _080A1F36:
bx r0
.align 2, 0
_080A1F3C: .4byte gTasks+0x8
_080A1F40: .4byte gUnknown_203AD30
_080A1F40: .4byte gSpecialVar_ItemId
_080A1F44: .4byte sub_80A1F48
thumb_func_end sub_80A1EF4
@@ -2009,7 +2009,7 @@ sub_80A1F78: @ 80A1F78
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1F9C @ =gUnknown_203AD30
ldr r0, _080A1F9C @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetPocketByItemId
lsls r0, 24
@@ -2022,7 +2022,7 @@ sub_80A1F78: @ 80A1F78
bl sub_813D808
b _080A1FB0
.align 2, 0
_080A1F9C: .4byte gUnknown_203AD30
_080A1F9C: .4byte gSpecialVar_ItemId
_080A1FA0: .4byte sub_81279E0
_080A1FA4:
ldr r0, _080A1FB8 @ =sub_81279E0
@@ -2097,7 +2097,7 @@ sub_80A2010: @ 80A2010
cmp r0, 0
bne _080A2058
bl sub_80A1A44
ldr r0, _080A2048 @ =gUnknown_203AD30
ldr r0, _080A2048 @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _080A204C @ =0x0000ffff
movs r0, 0x4
@@ -2111,7 +2111,7 @@ sub_80A2010: @ 80A2010
b _080A2060
.align 2, 0
_080A2044: .4byte gBattleTypeFlags
_080A2048: .4byte gUnknown_203AD30
_080A2048: .4byte gSpecialVar_ItemId
_080A204C: .4byte 0x0000ffff
_080A2050: .4byte gStringVar4
_080A2054: .4byte sub_8108B50
@@ -2130,7 +2130,7 @@ ItemUseOutOfBattle_EnigmaBerry: @ 80A2068
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A208C @ =gUnknown_203AD30
ldr r0, _080A208C @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetItemEffectType
lsls r0, 24
@@ -2146,7 +2146,7 @@ _080A2082:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080A208C: .4byte gUnknown_203AD30
_080A208C: .4byte gSpecialVar_ItemId
_080A2090: .4byte _080A2094
.align 2, 0
_080A2094:
@@ -2259,7 +2259,7 @@ ItemUseInBattle_EnigmaBerry: @ 80A2194
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A21B4 @ =gUnknown_203AD30
ldr r0, _080A21B4 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetItemEffectType
lsls r0, 24
@@ -2272,7 +2272,7 @@ ItemUseInBattle_EnigmaBerry: @ 80A2194
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080A21B4: .4byte gUnknown_203AD30
_080A21B4: .4byte gSpecialVar_ItemId
_080A21B8: .4byte _080A21BC
.align 2, 0
_080A21BC:
@@ -2324,7 +2324,7 @@ sub_80A2238: @ 80A2238
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080A2268 @ =gUnknown_203AD30
ldr r0, _080A2268 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetPocketByItemId
lsls r0, 24
@@ -2342,7 +2342,7 @@ sub_80A2238: @ 80A2238
bl sub_813EB20
b _080A228A
.align 2, 0
_080A2268: .4byte gUnknown_203AD30
_080A2268: .4byte gSpecialVar_ItemId
_080A226C: .4byte gStringVar4
_080A2270: .4byte gUnknown_8416425
_080A2274: .4byte sub_813E2B8
asm/itemfinder.s
+4 -4
View File
@@ -369,14 +369,14 @@ sub_813EF40: @ 813EF40
adds r0, r5, 0
movs r1, 0x1
bl sub_80CC44C
ldr r1, _0813EF90 @ =gUnknown_20370C0
ldr r1, _0813EF90 @ =gSpecialVar_0x8004
strh r0, [r1]
adds r0, r5, 0
movs r1, 0
bl sub_80CC44C
ldr r1, _0813EF94 @ =gSpecialVar_0x8005
strh r0, [r1]
ldr r0, _0813EF98 @ =gUnknown_20370C4
ldr r0, _0813EF98 @ =gSpecialVar_0x8006
movs r5, 0x1
strh r5, [r0]
ldrh r1, [r1]
@@ -394,9 +394,9 @@ sub_813EF40: @ 813EF40
bx r0
.align 2, 0
_0813EF8C: .4byte gTasks+0x8
_0813EF90: .4byte gUnknown_20370C0
_0813EF90: .4byte gSpecialVar_0x8004
_0813EF94: .4byte gSpecialVar_0x8005
_0813EF98: .4byte gUnknown_20370C4
_0813EF98: .4byte gSpecialVar_0x8006
thumb_func_end sub_813EF40
thumb_func_start sub_813EF9C
asm/learn_move.s
+8 -8
View File
@@ -182,7 +182,7 @@ sub_80E478C: @ 80E478C
str r0, [r4]
bl sub_80E4F54
ldr r0, [r4]
ldr r1, _080E47F4 @ =gUnknown_20370C0
ldr r1, _080E47F4 @ =gSpecialVar_0x8004
ldrh r1, [r1]
movs r2, 0x98
lsls r2, 2
@@ -205,7 +205,7 @@ sub_80E478C: @ 80E478C
.align 2, 0
_080E47EC: .4byte gUnknown_203AAB4
_080E47F0: .4byte 0x00000a6c
_080E47F4: .4byte gUnknown_20370C0
_080E47F4: .4byte gSpecialVar_0x8004
_080E47F8: .4byte sub_80E4620
_080E47FC: .4byte sub_80E4870
thumb_func_end sub_80E478C
@@ -505,7 +505,7 @@ _080E4A88:
beq _080E4AE0
ldr r0, _080E4AD8 @ =gUnknown_841E405
bl sub_80E48C0
ldr r1, _080E4ADC @ =gUnknown_20370C0
ldr r1, _080E4ADC @ =gSpecialVar_0x8004
movs r0, 0x1
strh r0, [r1]
ldr r1, [r4]
@@ -517,7 +517,7 @@ _080E4ACC: .4byte gPlayerParty
_080E4AD0: .4byte 0x00000a67
_080E4AD4: .4byte 0xffff0000
_080E4AD8: .4byte gUnknown_841E405
_080E4ADC: .4byte gUnknown_20370C0
_080E4ADC: .4byte gSpecialVar_0x8004
_080E4AE0:
ldr r1, [r4]
movs r0, 0x10
@@ -567,11 +567,11 @@ _080E4B3A:
beq _080E4B4C
b _080E4EDA
_080E4B40:
ldr r0, _080E4B48 @ =gUnknown_20370C0
ldr r0, _080E4B48 @ =gSpecialVar_0x8004
strh r1, [r0]
b _080E4ED2
.align 2, 0
_080E4B48: .4byte gUnknown_20370C0
_080E4B48: .4byte gSpecialVar_0x8004
_080E4B4C:
ldr r0, _080E4B54 @ =gUnknown_203AAB4
ldr r1, [r0]
@@ -931,7 +931,7 @@ _080E4DB4:
ldr r1, [r7]
movs r0, 0x1E
strb r0, [r1]
ldr r1, _080E4E6C @ =gUnknown_20370C0
ldr r1, _080E4E6C @ =gSpecialVar_0x8004
movs r0, 0x1
strh r0, [r1]
b _080E4EDA
@@ -943,7 +943,7 @@ _080E4E5C: .4byte 0x00000261
_080E4E60: .4byte 0x00000a67
_080E4E64: .4byte gStringVar2
_080E4E68: .4byte gUnknown_841E493
_080E4E6C: .4byte gUnknown_20370C0
_080E4E6C: .4byte gSpecialVar_0x8004
_080E4E70:
ldr r0, _080E4E88 @ =gUnknown_841E4C0
bl sub_80E48C0
asm/link.s
+2 -2
View File
@@ -1373,12 +1373,12 @@ _08009F74: .4byte gUnknown_3000E08
_08009F78:
ldr r0, _08009F84 @ =gUnknown_3003F50
strh r2, [r0]
ldr r1, _08009F88 @ =gUnknown_203AD30
ldr r1, _08009F88 @ =gSpecialVar_ItemId
ldrh r1, [r1]
b _08009FD4
.align 2, 0
_08009F84: .4byte gUnknown_3003F50
_08009F88: .4byte gUnknown_203AD30
_08009F88: .4byte gSpecialVar_ItemId
_08009F8C:
ldr r0, _08009F98 @ =gUnknown_3003F50
strh r2, [r0]
asm/link_rfu.s
+12 -12
View File
@@ -3504,7 +3504,7 @@ sub_80FEE24: @ 80FEE24
thumb_func_start sub_80FEE44
sub_80FEE44: @ 80FEE44
push {lr}
ldr r0, _080FEE58 @ =gUnknown_20370C0
ldr r0, _080FEE58 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0xE
bhi _080FEF12
@@ -3514,7 +3514,7 @@ sub_80FEE44: @ 80FEE44
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080FEE58: .4byte gUnknown_20370C0
_080FEE58: .4byte gSpecialVar_0x8004
_080FEE5C: .4byte _080FEE60
.align 2, 0
_080FEE60:
@@ -3585,7 +3585,7 @@ _080FEEF4:
ldr r1, [r2]
adds r1, r0
_080FEF08:
ldr r0, _080FEF24 @ =gUnknown_20370C0
ldr r0, _080FEF24 @ =gSpecialVar_0x8004
ldrb r0, [r0]
ldr r2, _080FEF28 @ =sub_80568C4
bl sub_80FEBAC
@@ -3596,14 +3596,14 @@ _080FEF12:
_080FEF18: .4byte gSaveBlock1Ptr
_080FEF1C: .4byte gSpecialVar_0x8005
_080FEF20: .4byte 0x00002cd0
_080FEF24: .4byte gUnknown_20370C0
_080FEF24: .4byte gSpecialVar_0x8004
_080FEF28: .4byte sub_80568C4
thumb_func_end sub_80FEE44
thumb_func_start sub_80FEF2C
sub_80FEF2C: @ 80FEF2C
push {r4,lr}
ldr r4, _080FEF44 @ =gUnknown_20370C0
ldr r4, _080FEF44 @ =gSpecialVar_0x8004
ldr r0, _080FEF48 @ =gUnknown_843F29C
movs r1, 0x4
bl sub_80FFEDC
@@ -3614,14 +3614,14 @@ sub_80FEF2C: @ 80FEF2C
pop {r0}
bx r0
.align 2, 0
_080FEF44: .4byte gUnknown_20370C0
_080FEF44: .4byte gSpecialVar_0x8004
_080FEF48: .4byte gUnknown_843F29C
thumb_func_end sub_80FEF2C
thumb_func_start sub_80FEF4C
sub_80FEF4C: @ 80FEF4C
push {r4,lr}
ldr r4, _080FEF64 @ =gUnknown_20370C0
ldr r4, _080FEF64 @ =gSpecialVar_0x8004
ldr r0, _080FEF68 @ =gUnknown_843F2A4
movs r1, 0x4
bl sub_80FFEDC
@@ -3632,7 +3632,7 @@ sub_80FEF4C: @ 80FEF4C
pop {r0}
bx r0
.align 2, 0
_080FEF64: .4byte gUnknown_20370C0
_080FEF64: .4byte gSpecialVar_0x8004
_080FEF68: .4byte gUnknown_843F2A4
thumb_func_end sub_80FEF4C
@@ -4384,12 +4384,12 @@ _080FF4C8:
.align 2, 0
_080FF4D8: .4byte gUnknown_203ACE8
_080FF4DC:
ldr r0, _080FF4E4 @ =gUnknown_20370D0
ldr r0, _080FF4E4 @ =gSpecialVar_Result
strh r1, [r0]
movs r0, 0x17
b _080FF4EA
.align 2, 0
_080FF4E4: .4byte gUnknown_20370D0
_080FF4E4: .4byte gSpecialVar_Result
_080FF4E8:
movs r0, 0
_080FF4EA:
@@ -4425,7 +4425,7 @@ _080FF510:
.align 2, 0
_080FF520: .4byte gUnknown_203ACE8
_080FF524:
ldr r4, _080FF538 @ =gUnknown_20370D0
ldr r4, _080FF538 @ =gSpecialVar_Result
bl sub_80FF78C
lsls r0, 24
lsrs r0, 24
@@ -4434,7 +4434,7 @@ _080FF524:
movs r0, 0x17
b _080FF53E
.align 2, 0
_080FF538: .4byte gUnknown_20370D0
_080FF538: .4byte gSpecialVar_Result
_080FF53C:
movs r0, 0
_080FF53E:
asm/link_rfu_3.s
+50 -50
View File
@@ -230,7 +230,7 @@ sub_8115A24: @ 8115A24
movs r0, 0
strb r0, [r1, 0xC]
strb r0, [r1, 0xD]
ldr r1, _08115A64 @ =gUnknown_20370D0
ldr r1, _08115A64 @ =gSpecialVar_Result
strh r0, [r1]
pop {r0}
bx r0
@@ -239,7 +239,7 @@ _08115A54: .4byte sub_8115A68
_08115A58: .4byte gUnknown_203B05C
_08115A5C: .4byte gTasks+0x8
_08115A60: .4byte gUnknown_3002024
_08115A64: .4byte gUnknown_20370D0
_08115A64: .4byte gSpecialVar_Result
thumb_func_end sub_8115A24
thumb_func_start sub_8115A68
@@ -299,7 +299,7 @@ _08115A90:
_08115B0C:
ldr r3, _08115B4C @ =gUnknown_203B058
ldr r2, _08115B50 @ =gUnknown_8456CD8
ldr r1, _08115B54 @ =gUnknown_20370C0
ldr r1, _08115B54 @ =gSpecialVar_0x8004
ldrh r0, [r1]
lsls r0, 2
adds r0, r2
@@ -328,7 +328,7 @@ _08115B0C:
.align 2, 0
_08115B4C: .4byte gUnknown_203B058
_08115B50: .4byte gUnknown_8456CD8
_08115B54: .4byte gUnknown_20370C0
_08115B54: .4byte gSpecialVar_0x8004
_08115B58: .4byte gUnknown_203B059
_08115B5C:
movs r0, 0x70
@@ -1083,22 +1083,22 @@ _0811617E:
bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
ldr r1, _08116190 @ =gUnknown_20370D0
ldr r1, _08116190 @ =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _081161D8
.align 2, 0
_08116190: .4byte gUnknown_20370D0
_08116190: .4byte gSpecialVar_Result
_08116194:
bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
ldr r1, _081161A8 @ =gUnknown_20370D0
ldr r1, _081161A8 @ =gSpecialVar_Result
movs r0, 0x8
strh r0, [r1]
b _081161D8
.align 2, 0
_081161A8: .4byte gUnknown_20370D0
_081161A8: .4byte gSpecialVar_Result
_081161AC:
bl sub_80FBA00
cmp r0, 0
@@ -1767,7 +1767,7 @@ BerryBlenderLinkJoinGroup: @ 81166F4
movs r0, 0
strb r0, [r1, 0x8]
strb r0, [r1, 0x9]
ldr r1, _08116734 @ =gUnknown_20370D0
ldr r1, _08116734 @ =gSpecialVar_Result
strh r0, [r1]
pop {r0}
bx r0
@@ -1776,7 +1776,7 @@ _08116724: .4byte sub_8116738
_08116728: .4byte gUnknown_203B05C
_0811672C: .4byte gTasks+0x8
_08116730: .4byte gUnknown_3002028
_08116734: .4byte gUnknown_20370D0
_08116734: .4byte gSpecialVar_Result
thumb_func_end BerryBlenderLinkJoinGroup
thumb_func_start sub_8116738
@@ -1828,7 +1828,7 @@ _08116760:
.4byte _08116CEC
_081167C0:
ldr r5, _08116800 @ =gUnknown_84570C8
ldr r4, _08116804 @ =gUnknown_20370C0
ldr r4, _08116804 @ =gSpecialVar_0x8004
ldrh r0, [r4]
adds r0, r5
ldrb r0, [r0]
@@ -1855,13 +1855,13 @@ _081167C0:
b _08116D06
.align 2, 0
_08116800: .4byte gUnknown_84570C8
_08116804: .4byte gUnknown_20370C0
_08116804: .4byte gSpecialVar_0x8004
_08116808: .4byte gUnknown_203B058
_0811680C:
adds r0, r6, 0
adds r0, 0x9
ldr r2, _08116830 @ =gUnknown_84591B8
ldr r1, _08116834 @ =gUnknown_20370C0
ldr r1, _08116834 @ =gSpecialVar_0x8004
ldrh r1, [r1]
lsls r1, 2
adds r1, r2
@@ -1877,7 +1877,7 @@ _08116828:
b _08116D06
.align 2, 0
_08116830: .4byte gUnknown_84591B8
_08116834: .4byte gUnknown_20370C0
_08116834: .4byte gSpecialVar_0x8004
_08116838:
ldr r0, [r6, 0x4]
movs r1, 0x4
@@ -1886,7 +1886,7 @@ _08116838:
movs r1, 0x10
bl sub_811A5E4
ldr r0, [r6, 0x4]
ldr r1, _081168E8 @ =gUnknown_20370C0
ldr r1, _081168E8 @ =gSpecialVar_0x8004
ldrh r1, [r1]
bl sub_811A054
movs r4, 0
@@ -1950,7 +1950,7 @@ _08116838:
strb r0, [r6, 0x8]
b _08116D06
.align 2, 0
_081168E8: .4byte gUnknown_20370C0
_081168E8: .4byte gSpecialVar_0x8004
_081168EC: .4byte gUnknown_8456CD0
_081168F0: .4byte gUnknown_8456D4C
_081168F4: .4byte gUnknown_8456D54
@@ -2361,19 +2361,19 @@ _08116C68:
lsls r0, 24
cmp r0, 0
beq _08116D06
ldr r0, _08116C94 @ =gUnknown_20370D0
ldr r0, _08116C94 @ =gSpecialVar_Result
movs r1, 0x6
b _08116CDC
.align 2, 0
_08116C90: .4byte gUnknown_8457754
_08116C94: .4byte gUnknown_20370D0
_08116C94: .4byte gSpecialVar_Result
_08116C98:
bl sub_80FCE44
ldr r0, _08116CA4 @ =gUnknown_20370D0
ldr r0, _08116CA4 @ =gSpecialVar_Result
movs r1, 0x5
b _08116CDC
.align 2, 0
_08116CA4: .4byte gUnknown_20370D0
_08116CA4: .4byte gSpecialVar_Result
_08116CA8:
bl sub_80FCE44
adds r5, r6, 0
@@ -2397,7 +2397,7 @@ _08116CCE:
lsls r0, 24
cmp r0, 0
beq _08116D06
ldr r0, _08116CE8 @ =gUnknown_20370D0
ldr r0, _08116CE8 @ =gSpecialVar_Result
movs r1, 0x8
_08116CDC:
strh r1, [r0]
@@ -2406,7 +2406,7 @@ _08116CDC:
b _08116D06
.align 2, 0
_08116CE4: .4byte gStringVar4
_08116CE8: .4byte gUnknown_20370D0
_08116CE8: .4byte gSpecialVar_Result
_08116CEC:
adds r0, r4, 0
bl DestroyTask
@@ -2499,7 +2499,7 @@ sub_8116D60: @ 8116D60
adds r0, r5, 0
bl ConvertInternationalString
ldr r1, _08116DD8 @ =gUnknown_84570C8
ldr r0, _08116DDC @ =gUnknown_20370C0
ldr r0, _08116DDC @ =gSpecialVar_0x8004
ldrh r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -2525,7 +2525,7 @@ sub_8116D60: @ 8116D60
.align 2, 0
_08116DD4: .4byte gStringVar1
_08116DD8: .4byte gUnknown_84570C8
_08116DDC: .4byte gUnknown_20370C0
_08116DDC: .4byte gSpecialVar_0x8004
thumb_func_end sub_8116D60
thumb_func_start sub_8116DE0
@@ -3396,7 +3396,7 @@ sub_81174B4: @ 81174B4
lsrs r5, 24
lsls r1, 16
lsrs r1, 16
ldr r0, _08117524 @ =gUnknown_20370C0
ldr r0, _08117524 @ =gSpecialVar_0x8004
strh r1, [r0]
ldr r0, _08117528 @ =0x0000406f
bl VarSet
@@ -3432,7 +3432,7 @@ sub_81174B4: @ 81174B4
pop {r0}
bx r0
.align 2, 0
_08117524: .4byte gUnknown_20370C0
_08117524: .4byte gSpecialVar_0x8004
_08117528: .4byte 0x0000406f
_0811752C: .4byte gUnknown_3005030
_08117530: .4byte gUnknown_300502C
@@ -3791,7 +3791,7 @@ _081178C8:
_081178E0:
adds r0, r4, 0
bl DestroyTask
ldr r1, _081178FC @ =gUnknown_20370D0
ldr r1, _081178FC @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
bl ScriptContext2_Disable
@@ -3801,7 +3801,7 @@ _081178E0:
bx r0
.align 2, 0
_081178F8: .4byte sub_805671C
_081178FC: .4byte gUnknown_20370D0
_081178FC: .4byte gSpecialVar_Result
thumb_func_end sub_81175BC
thumb_func_start sub_8117900
@@ -3832,13 +3832,13 @@ _08117928:
beq _08117974
b _08117988
_08117932:
ldr r1, _08117940 @ =gUnknown_20370D0
ldr r1, _08117940 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
bl EnableBothScriptContexts
b _08117968
.align 2, 0
_08117940: .4byte gUnknown_20370D0
_08117940: .4byte gSpecialVar_Result
_08117944:
bl ScriptContext1_IsScriptSetUp
lsls r0, 24
@@ -3931,7 +3931,7 @@ sub_81179CC: @ 81179CC
strb r2, [r1, 0xC]
strb r2, [r1, 0xD]
strb r4, [r1, 0x18]
ldr r0, _08117A08 @ =gUnknown_20370D0
ldr r0, _08117A08 @ =gSpecialVar_Result
strh r2, [r0]
pop {r4}
pop {r0}
@@ -3940,7 +3940,7 @@ sub_81179CC: @ 81179CC
_081179FC: .4byte sub_8117A0C
_08117A00: .4byte gUnknown_203B05C
_08117A04: .4byte gTasks+0x8
_08117A08: .4byte gUnknown_20370D0
_08117A08: .4byte gSpecialVar_Result
thumb_func_end sub_81179CC
thumb_func_start sub_8117A0C
@@ -4421,13 +4421,13 @@ _08117E26:
beq _08117ECA
adds r0, r4, 0
bl DestroyTask
ldr r1, _08117E48 @ =gUnknown_20370D0
ldr r1, _08117E48 @ =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _08117ECA
.align 2, 0
_08117E44: .4byte gUnknown_84571B8
_08117E48: .4byte gUnknown_20370D0
_08117E48: .4byte gSpecialVar_Result
_08117E4C:
bl sub_80FB9F4
lsls r0, 24
@@ -4513,7 +4513,7 @@ sub_8117ED4: @ 8117ED4
strb r2, [r1, 0x9]
subs r4, 0x15
strb r4, [r1, 0x12]
ldr r0, _08117F1C @ =gUnknown_20370D0
ldr r0, _08117F1C @ =gSpecialVar_Result
strh r2, [r0]
pop {r4}
pop {r0}
@@ -4523,7 +4523,7 @@ _08117F0C: .4byte sub_8117F20
_08117F10: .4byte gUnknown_203B05C
_08117F14: .4byte gTasks+0x8
_08117F18: .4byte gUnknown_3002028
_08117F1C: .4byte gUnknown_20370D0
_08117F1C: .4byte gSpecialVar_Result
thumb_func_end sub_8117ED4
thumb_func_start sub_8117F20
@@ -4883,13 +4883,13 @@ _08118252:
adds r0, r6, 0
bl DestroyTask
bl sub_80F8DC0
ldr r1, _08118268 @ =gUnknown_20370D0
ldr r1, _08118268 @ =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _08118288
.align 2, 0
_08118264: .4byte gUnknown_84571B8
_08118268: .4byte gUnknown_20370D0
_08118268: .4byte gSpecialVar_Result
_0811826C:
ldrb r0, [r5, 0x8]
adds r0, 0x1
@@ -4933,7 +4933,7 @@ sub_8118290: @ 8118290
strb r2, [r1, 0x9]
subs r4, 0x15
strb r4, [r1, 0x12]
ldr r0, _081182D8 @ =gUnknown_20370D0
ldr r0, _081182D8 @ =gSpecialVar_Result
strh r2, [r0]
pop {r4}
pop {r0}
@@ -4943,7 +4943,7 @@ _081182C8: .4byte sub_81182DC
_081182CC: .4byte gUnknown_203B05C
_081182D0: .4byte gTasks+0x8
_081182D4: .4byte gUnknown_3002028
_081182D8: .4byte gUnknown_20370D0
_081182D8: .4byte gSpecialVar_Result
thumb_func_end sub_8118290
thumb_func_start sub_81182DC
@@ -5288,13 +5288,13 @@ _081185C2:
adds r0, r4, 0
bl DestroyTask
bl sub_80F8DC0
ldr r1, _081185E4 @ =gUnknown_20370D0
ldr r1, _081185E4 @ =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _08118604
.align 2, 0
_081185E0: .4byte gUnknown_845933C
_081185E4: .4byte gUnknown_20370D0
_081185E4: .4byte gSpecialVar_Result
_081185E8:
ldrb r0, [r5, 0x8]
adds r0, 0x1
@@ -5334,7 +5334,7 @@ UnionRoomSpecial: @ 811860C
strb r1, [r0, 0x16]
strh r1, [r0, 0x10]
strh r1, [r0, 0x12]
ldr r0, _08118654 @ =gUnknown_20370D0
ldr r0, _08118654 @ =gSpecialVar_Result
strh r1, [r0]
movs r0, 0xD0
movs r1, 0x1
@@ -5346,7 +5346,7 @@ UnionRoomSpecial: @ 811860C
_08118648: .4byte sub_81186E0
_0811864C: .4byte gUnknown_203B05C
_08118650: .4byte gUnknown_300202C
_08118654: .4byte gUnknown_20370D0
_08118654: .4byte gSpecialVar_Result
thumb_func_end UnionRoomSpecial
thumb_func_start sub_8118658
@@ -5593,14 +5593,14 @@ _0811887C:
ldr r0, [r6, 0xC]
movs r1, 0x4
bl sub_811A650
ldr r1, _081188C8 @ =gUnknown_20370D0
ldr r1, _081188C8 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r0, 0x3
bl _081198DA
.align 2, 0
_081188C4: .4byte gUnknown_203B06C
_081188C8: .4byte gUnknown_20370D0
_081188C8: .4byte gSpecialVar_Result
_081188CC:
bl sub_811FB18
lsls r0, 24
@@ -5703,7 +5703,7 @@ _081189A4:
movs r0, 0x4
bl _081198DA
_081189AA:
ldr r4, _081189D8 @ =gUnknown_20370D0
ldr r4, _081189D8 @ =gSpecialVar_Result
ldrh r0, [r4]
cmp r0, 0
beq _08118A0E
@@ -5723,7 +5723,7 @@ _081189AA:
movs r0, 0x2A
b _08118A06
.align 2, 0
_081189D8: .4byte gUnknown_20370D0
_081189D8: .4byte gSpecialVar_Result
_081189DC: .4byte gStringVar1
_081189E0: .4byte gSaveBlock2Ptr
_081189E4:
@@ -7463,14 +7463,14 @@ var_800D_set_xB: @ 81198EC
bl InUnionRoom
cmp r0, 0x1
bne _081198FC
ldr r1, _08119900 @ =gUnknown_20370D0
ldr r1, _08119900 @ =gSpecialVar_Result
movs r0, 0xB
strh r0, [r1]
_081198FC:
pop {r0}
bx r0
.align 2, 0
_08119900: .4byte gUnknown_20370D0
_08119900: .4byte gSpecialVar_Result
thumb_func_end var_800D_set_xB
thumb_func_start sub_8119904
asm/link_rfu_4.s
+4 -4
View File
@@ -1662,7 +1662,7 @@ _081430B8:
.align 2, 0
_081430D0: .4byte gUnknown_3003F64
_081430D4:
ldr r0, _081430E8 @ =gUnknown_20370D0
ldr r0, _081430E8 @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x5
beq _081430DE
@@ -1672,7 +1672,7 @@ _081430DE:
bl sub_81424B8
b _08143464
.align 2, 0
_081430E8: .4byte gUnknown_20370D0
_081430E8: .4byte gSpecialVar_Result
_081430EC:
ldr r0, _081430F8 @ =gUnknown_841E794
bl sub_8142504
@@ -2172,7 +2172,7 @@ _0814349C:
.align 2, 0
_081434B0: .4byte gUnknown_3003F64
_081434B4:
ldr r0, _081434CC @ =gUnknown_20370D0
ldr r0, _081434CC @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x5
beq _081434BE
@@ -2185,7 +2185,7 @@ _081434C4:
strb r0, [r5, 0x8]
b _081435C6
.align 2, 0
_081434CC: .4byte gUnknown_20370D0
_081434CC: .4byte gSpecialVar_Result
_081434D0:
ldr r0, _081434F0 @ =gStringVar1
movs r1, 0xFF
asm/map_obj_lock.s
+2 -2
View File
@@ -270,7 +270,7 @@ sub_8069740: @ 8069740
lsls r0, 2
ldr r1, _08069760 @ =gMapObjects
adds r0, r1
ldr r1, _08069764 @ =gUnknown_20370D4
ldr r1, _08069764 @ =gSpecialVar_Facing
ldrb r1, [r1]
bl FieldObjectFaceOppositeDirection
pop {r0}
@@ -278,7 +278,7 @@ sub_8069740: @ 8069740
.align 2, 0
_0806975C: .4byte gUnknown_3005074
_08069760: .4byte gMapObjects
_08069764: .4byte gUnknown_20370D4
_08069764: .4byte gSpecialVar_Facing
thumb_func_end sub_8069740
thumb_func_start sub_8069768
asm/party_menu.s
+84 -84
View File
@@ -1245,13 +1245,13 @@ sub_811F430: @ 811F430
muls r1, r0
ldr r0, _0811F468 @ =gPlayerParty
adds r6, r1, r0
ldr r0, _0811F46C @ =gUnknown_203AD30
ldr r0, _0811F46C @ =gSpecialVar_ItemId
ldrh r4, [r0]
ldr r0, _0811F470 @ =gUnknown_203B0A0
ldrb r0, [r0, 0xB]
cmp r0, 0xC
bne _0811F47C
ldr r0, _0811F474 @ =gUnknown_20370D0
ldr r0, _0811F474 @ =gSpecialVar_Result
movs r1, 0
strh r1, [r0]
ldr r0, _0811F478 @ =gSpecialVar_0x8005
@@ -1266,9 +1266,9 @@ sub_811F430: @ 811F430
b _0811F4C6
.align 2, 0
_0811F468: .4byte gPlayerParty
_0811F46C: .4byte gUnknown_203AD30
_0811F46C: .4byte gSpecialVar_ItemId
_0811F470: .4byte gUnknown_203B0A0
_0811F474: .4byte gUnknown_20370D0
_0811F474: .4byte gSpecialVar_Result
_0811F478: .4byte gSpecialVar_0x8005
_0811F47C:
cmp r0, 0x3
@@ -2364,7 +2364,7 @@ _0811FCDA:
_0811FCE8:
movs r0, 0x5
bl PlaySE
ldr r1, _0811FD24 @ =gUnknown_20370C0
ldr r1, _0811FD24 @ =gSpecialVar_0x8004
movs r0, 0
ldrsb r0, [r5, r0]
strh r0, [r1]
@@ -2390,7 +2390,7 @@ _0811FD1A:
bl sub_811FA78
b _0811FD56
.align 2, 0
_0811FD24: .4byte gUnknown_20370C0
_0811FD24: .4byte gSpecialVar_0x8004
_0811FD28: .4byte gUnknown_203B0A0
_0811FD2C: .4byte gSpecialVar_0x8005
_0811FD30: .4byte gPlayerParty
@@ -2498,7 +2498,7 @@ _0811FDF4:
lsls r0, 24
cmp r0, 0
bne _0811FE04
ldr r1, _0811FE1C @ =gUnknown_20370C0
ldr r1, _0811FE1C @ =gSpecialVar_0x8004
movs r0, 0x7
strh r0, [r1]
_0811FE04:
@@ -2514,7 +2514,7 @@ _0811FE14:
pop {r0}
bx r0
.align 2, 0
_0811FE1C: .4byte gUnknown_20370C0
_0811FE1C: .4byte gSpecialVar_0x8004
_0811FE20: .4byte gUnknown_203B0C0
thumb_func_end sub_811FD88
@@ -4107,13 +4107,13 @@ sub_81209F4: @ 81209F4
bne _08120A24
movs r0, 0x5
bl PlaySE
ldr r0, _08120A20 @ =gUnknown_20370C0
ldr r0, _08120A20 @ =gSpecialVar_0x8004
strh r5, [r0]
adds r0, r4, 0
bl sub_811FA78
b _08120A46
.align 2, 0
_08120A20: .4byte gUnknown_20370C0
_08120A20: .4byte gSpecialVar_0x8004
_08120A24:
movs r0, 0x1A
bl PlaySE
@@ -4215,14 +4215,14 @@ _08120AE4:
beq _08120B02
b _08120B10
_08120AEA:
ldr r1, _08120AF8 @ =gUnknown_20370C0
ldr r1, _08120AF8 @ =gSpecialVar_0x8004
movs r0, 0x7
strh r0, [r1]
adds r0, r4, 0
bl sub_811FA78
b _08120B10
.align 2, 0
_08120AF8: .4byte gUnknown_20370C0
_08120AF8: .4byte gSpecialVar_0x8004
_08120AFC:
movs r0, 0x5
bl PlaySE
@@ -9878,7 +9878,7 @@ c2_8123744: @ 8123744
mov r7, r8
push {r7}
sub sp, 0xC
ldr r6, _0812376C @ =gUnknown_203AD30
ldr r6, _0812376C @ =gSpecialVar_ItemId
ldrh r0, [r6]
cmp r0, 0
bne _08123778
@@ -9894,7 +9894,7 @@ c2_8123744: @ 8123744
ldr r1, [r3]
b _081237AE
.align 2, 0
_0812376C: .4byte gUnknown_203AD30
_0812376C: .4byte gSpecialVar_ItemId
_08123770: .4byte gUnknown_203B0A0
_08123774: .4byte sub_8122C30
_08123778:
@@ -9992,7 +9992,7 @@ sub_8123824: @ 8123824
ands r0, r1
cmp r0, 0
bne _08123880
ldr r0, _08123890 @ =gUnknown_203AD30
ldr r0, _08123890 @ =gSpecialVar_ItemId
ldrh r4, [r0]
ldr r0, _08123894 @ =gUnknown_203B0A0
mov r8, r0
@@ -10032,7 +10032,7 @@ _08123880:
bx r0
.align 2, 0
_0812388C: .4byte gPaletteFade
_08123890: .4byte gUnknown_203AD30
_08123890: .4byte gSpecialVar_ItemId
_08123894: .4byte gUnknown_203B0A0
_08123898: .4byte gPlayerParty
_0812389C: .4byte gTasks
@@ -10130,7 +10130,7 @@ _08123950:
beq _08123A32
b _08123A40
_08123956:
ldr r5, _08123998 @ =gUnknown_203AD30
ldr r5, _08123998 @ =gSpecialVar_ItemId
ldrh r0, [r5]
movs r1, 0x1
bl sub_809A1D8
@@ -10158,7 +10158,7 @@ _08123956:
str r1, [r0]
b _08123A40
.align 2, 0
_08123998: .4byte gUnknown_203AD30
_08123998: .4byte gSpecialVar_ItemId
_0812399C: .4byte gUnknown_203B0D8
_081239A0: .4byte gStringVar4
_081239A4: .4byte gTasks
@@ -10317,7 +10317,7 @@ sub_8123ACC: @ 8123ACC
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, _08123B40 @ =gUnknown_20370D0
ldr r0, _08123B40 @ =gSpecialVar_Result
ldrh r7, [r0]
cmp r7, 0
bne _08123B4C
@@ -10350,7 +10350,7 @@ sub_8123ACC: @ 8123ACC
.align 2, 0
_08123B38: .4byte gUnknown_203B0A0
_08123B3C: .4byte gPlayerParty
_08123B40: .4byte gUnknown_20370D0
_08123B40: .4byte gSpecialVar_Result
_08123B44: .4byte gUnknown_203B0D8
_08123B48: .4byte sub_8122C30
_08123B4C:
@@ -10400,7 +10400,7 @@ sub_8123B78: @ 8123B78
muls r0, r1
ldr r1, _08123BBC @ =gPlayerParty
adds r0, r1
ldr r1, _08123BC0 @ =gUnknown_203AD30
ldr r1, _08123BC0 @ =gSpecialVar_ItemId
ldrh r1, [r1]
movs r2, 0
movs r3, 0
@@ -10411,9 +10411,9 @@ _08123BB0: .4byte gPaletteFade
_08123BB4: .4byte gUnknown_203B0D8
_08123BB8: .4byte gUnknown_203B0A0
_08123BBC: .4byte gPlayerParty
_08123BC0: .4byte gUnknown_203AD30
_08123BC0: .4byte gSpecialVar_ItemId
_08123BC4:
ldr r0, _08123BE4 @ =gUnknown_203AD30
ldr r0, _08123BE4 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r1]
movs r2, 0
@@ -10431,7 +10431,7 @@ _08123BDE:
pop {r0}
bx r0
.align 2, 0
_08123BE4: .4byte gUnknown_203AD30
_08123BE4: .4byte gSpecialVar_ItemId
_08123BE8: .4byte gTasks
_08123BEC: .4byte sub_8123BF0
thumb_func_end sub_8123B78
@@ -11337,7 +11337,7 @@ sub_8124354: @ 8124354
lsrs r4, 24
movs r0, 0x5
bl PlaySE
ldr r1, _0812437C @ =gUnknown_20370C0
ldr r1, _0812437C @ =gSpecialVar_0x8004
ldr r0, _08124380 @ =gUnknown_203B0A0
ldrb r0, [r0, 0x9]
lsls r0, 24
@@ -11349,7 +11349,7 @@ sub_8124354: @ 8124354
pop {r0}
bx r0
.align 2, 0
_0812437C: .4byte gUnknown_20370C0
_0812437C: .4byte gSpecialVar_0x8004
_08124380: .4byte gUnknown_203B0A0
thumb_func_end sub_8124354
@@ -12495,7 +12495,7 @@ _08124CCC:
mov r8, r1
movs r7, 0
_08124CD2:
ldr r4, _08124D30 @ =gUnknown_203AD30
ldr r4, _08124D30 @ =gSpecialVar_ItemId
ldrh r0, [r4]
bl GetItemEffectType
lsls r0, 24
@@ -12529,7 +12529,7 @@ _08124D0C:
cmp r5, 0x5
bls _08124CEA
_08124D16:
ldr r0, _08124D30 @ =gUnknown_203AD30
ldr r0, _08124D30 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetPocketByItemId
lsls r0, 24
@@ -12542,7 +12542,7 @@ _08124D28:
movs r0, 0x7F
b _08124D6A
.align 2, 0
_08124D30: .4byte gUnknown_203AD30
_08124D30: .4byte gSpecialVar_ItemId
_08124D34: .4byte gUnknown_203B0A0
_08124D38: .4byte gPlayerParty
_08124D3C: .4byte sub_8124DB0
@@ -12642,7 +12642,7 @@ _08124DDC: .4byte sub_8124DE0
thumb_func_start sub_8124DE0
sub_8124DE0: @ 8124DE0
push {r4,lr}
ldr r4, _08124E0C @ =gUnknown_203AD30
ldr r4, _08124E0C @ =gSpecialVar_ItemId
ldrh r0, [r4]
bl sub_80A1150
lsls r0, 24
@@ -12661,7 +12661,7 @@ sub_8124DE0: @ 8124DE0
bl sub_811C540
b _08124E38
.align 2, 0
_08124E0C: .4byte gUnknown_203AD30
_08124E0C: .4byte gSpecialVar_ItemId
_08124E10: .4byte gUnknown_203B0A0
_08124E14: .4byte sub_8126BD4
_08124E18:
@@ -12694,7 +12694,7 @@ sub_8124E48: @ 8124E48
mov r7, r8
push {r7}
sub sp, 0xC
ldr r7, _08124EBC @ =gUnknown_203AD30
ldr r7, _08124EBC @ =gSpecialVar_ItemId
ldrh r0, [r7]
bl ItemId_GetPocket
lsls r0, 24
@@ -12742,7 +12742,7 @@ _08124EB0:
bl SetMainCallback2
b _08124EE6
.align 2, 0
_08124EBC: .4byte gUnknown_203AD30
_08124EBC: .4byte gSpecialVar_ItemId
_08124EC0: .4byte gUnknown_203B0A0
_08124EC4: .4byte gPlayerParty
_08124EC8:
@@ -12804,7 +12804,7 @@ sub_8124EFC: @ 8124EFC
adds r0, r5, 0
adds r1, r4, 0
bl RemoveMonPPBonus
ldr r7, _08124F90 @ =gUnknown_203AD30
ldr r7, _08124F90 @ =gSpecialVar_ItemId
ldrh r0, [r7]
bl ItemIdToBattleMoveId
adds r1, r0, 0
@@ -12837,7 +12837,7 @@ _08124F7C:
.align 2, 0
_08124F88: .4byte gUnknown_203B0A0
_08124F8C: .4byte gPlayerParty
_08124F90: .4byte gUnknown_203AD30
_08124F90: .4byte gSpecialVar_ItemId
_08124F94:
ldr r4, _08124FC0 @ =gUnknown_203B0A0
ldrb r0, [r4, 0x8]
@@ -13242,7 +13242,7 @@ sub_81252D0: @ 81252D0
muls r1, r0
ldr r0, _08125304 @ =gPlayerParty
adds r5, r1, r0
ldr r0, _08125308 @ =gUnknown_203AD30
ldr r0, _08125308 @ =gSpecialVar_ItemId
ldrh r6, [r0]
adds r0, r5, 0
adds r1, r6, 0
@@ -13255,7 +13255,7 @@ sub_81252D0: @ 81252D0
.align 2, 0
_08125300: .4byte gUnknown_203B0A0
_08125304: .4byte gPlayerParty
_08125308: .4byte gUnknown_203AD30
_08125308: .4byte gSpecialVar_ItemId
_0812530C:
adds r0, r6, 0
bl IsHPRecoveryItem
@@ -13351,7 +13351,7 @@ ItemUseCB_Medicine: @ 81253B0
muls r1, r0
ldr r0, _0812543C @ =gPlayerParty
adds r5, r1, r0
ldr r0, _08125440 @ =gUnknown_203AD30
ldr r0, _08125440 @ =gSpecialVar_ItemId
ldrh r6, [r0]
adds r0, r5, 0
adds r1, r6, 0
@@ -13399,7 +13399,7 @@ _08125428:
.align 2, 0
_08125438: .4byte gUnknown_203B0A0
_0812543C: .4byte gPlayerParty
_08125440: .4byte gUnknown_203AD30
_08125440: .4byte gSpecialVar_ItemId
_08125444: .4byte gUnknown_203B0C0
_08125448: .4byte gUnknown_84169DC
_0812544C:
@@ -13735,7 +13735,7 @@ sub_81256F8: @ 81256F8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08125710 @ =gUnknown_203AD30
ldr r0, _08125710 @ =gSpecialVar_ItemId
ldrh r0, [r0]
cmp r0, 0xAF
bne _0812571C
@@ -13745,7 +13745,7 @@ sub_81256F8: @ 81256F8
adds r0, r1
b _08125726
.align 2, 0
_08125710: .4byte gUnknown_203AD30
_08125710: .4byte gSpecialVar_ItemId
_08125714: .4byte gSaveBlock1Ptr
_08125718: .4byte 0x00003108
_0812571C:
@@ -13878,7 +13878,7 @@ sub_812580C: @ 812580C
muls r0, r1
ldr r1, _08125864 @ =gPlayerParty
adds r0, r1
ldr r1, _08125868 @ =gUnknown_203AD30
ldr r1, _08125868 @ =gSpecialVar_ItemId
ldrh r1, [r1]
ldrb r2, [r3, 0x9]
ldrb r3, [r3, 0xE]
@@ -13909,7 +13909,7 @@ sub_812580C: @ 812580C
.align 2, 0
_08125860: .4byte gUnknown_203B0A0
_08125864: .4byte gPlayerParty
_08125868: .4byte gUnknown_203AD30
_08125868: .4byte gSpecialVar_ItemId
_0812586C: .4byte gUnknown_203B0C0
_08125870: .4byte gUnknown_84169DC
_08125874: .4byte gTasks
@@ -13947,7 +13947,7 @@ sub_8125898: @ 8125898
ldr r0, _08125934 @ =gPlayerParty
adds r4, r0
ldrb r0, [r5, 0x9]
ldr r6, _08125938 @ =gUnknown_203AD30
ldr r6, _08125938 @ =gSpecialVar_ItemId
ldrh r1, [r6]
ldrb r2, [r5, 0xE]
bl ExecuteTableBasedItemEffect__
@@ -14001,7 +14001,7 @@ sub_8125898: @ 8125898
.align 2, 0
_08125930: .4byte gUnknown_203B0A0
_08125934: .4byte gPlayerParty
_08125938: .4byte gUnknown_203AD30
_08125938: .4byte gSpecialVar_ItemId
_0812593C: .4byte gUnknown_203B0C0
_08125940: .4byte 0x0000ffff
_08125944: .4byte gStringVar1
@@ -14020,7 +14020,7 @@ sub_8125958: @ 8125958
lsrs r6, r0, 24
movs r4, 0
ldr r7, _08125990 @ =gUnknown_203B0AE
ldr r0, _08125994 @ =gUnknown_203AD30
ldr r0, _08125994 @ =gSpecialVar_ItemId
ldrh r5, [r0]
movs r0, 0xE
negs r0, r0
@@ -14041,7 +14041,7 @@ sub_8125958: @ 8125958
b _081259F6
.align 2, 0
_08125990: .4byte gUnknown_203B0AE
_08125994: .4byte gUnknown_203AD30
_08125994: .4byte gSpecialVar_ItemId
_08125998: .4byte gUnknown_203B0C0
_0812599C: .4byte gUnknown_84169DC
_081259A0:
@@ -14275,7 +14275,7 @@ sub_8125B40: @ 8125B40
movs r0, 0xE
adds r0, r7
mov r8, r0
ldr r0, _08125BD8 @ =gUnknown_203AD30
ldr r0, _08125BD8 @ =gSpecialVar_ItemId
ldrh r5, [r0]
ldr r1, _08125BDC @ =gStringVar1
adds r0, r4, 0
@@ -14325,7 +14325,7 @@ sub_8125B40: @ 8125B40
.align 2, 0
_08125BD0: .4byte gUnknown_203B0A0
_08125BD4: .4byte gPlayerParty
_08125BD8: .4byte gUnknown_203AD30
_08125BD8: .4byte gSpecialVar_ItemId
_08125BDC: .4byte gStringVar1
_08125BE0: .4byte gStringVar2
_08125BE4: .4byte gMoveNames
@@ -14391,7 +14391,7 @@ sub_8125C48: @ 8125C48
adds r5, r1, r0
adds r6, r2, 0
adds r6, 0xE
ldr r0, _08125CD4 @ =gUnknown_203AD30
ldr r0, _08125CD4 @ =gSpecialVar_ItemId
ldrh r4, [r0]
movs r1, 0x2
ldrsh r0, [r6, r1]
@@ -14441,7 +14441,7 @@ _08125C84:
.align 2, 0
_08125CCC: .4byte gUnknown_203B0A0
_08125CD0: .4byte gPlayerParty
_08125CD4: .4byte gUnknown_203AD30
_08125CD4: .4byte gSpecialVar_ItemId
_08125CD8: .4byte gStringVar1
_08125CDC: .4byte gStringVar2
_08125CE0: .4byte gMoveNames
@@ -14516,7 +14516,7 @@ _08125D6C: .4byte gUnknown_203B0A0
_08125D70:
cmp r0, 0x2
bne _08125D78
ldr r0, _08125D84 @ =gUnknown_20370D0
ldr r0, _08125D84 @ =gSpecialVar_Result
strh r2, [r0]
_08125D78:
adds r0, r5, 0
@@ -14526,7 +14526,7 @@ _08125D7E:
pop {r0}
bx r0
.align 2, 0
_08125D84: .4byte gUnknown_20370D0
_08125D84: .4byte gSpecialVar_Result
thumb_func_end sub_8125D2C
thumb_func_start sub_8125D88
@@ -14684,7 +14684,7 @@ sub_8125E84: @ 8125E84
lsls r2, 16
lsrs r2, 16
ldrb r0, [r4, 0x9]
ldr r1, _08125ED8 @ =gUnknown_203AD30
ldr r1, _08125ED8 @ =gSpecialVar_ItemId
ldrh r1, [r1]
ldr r3, _08125EDC @ =sub_8124EFC
bl sub_811C568
@@ -14696,7 +14696,7 @@ sub_8125E84: @ 8125E84
.align 2, 0
_08125ED0: .4byte gUnknown_203B0A0
_08125ED4: .4byte gPlayerParty
_08125ED8: .4byte gUnknown_203AD30
_08125ED8: .4byte gSpecialVar_ItemId
_08125EDC: .4byte sub_8124EFC
_08125EE0: .4byte gUnknown_3005E98
_08125EE4: .4byte sub_8125F4C
@@ -14794,7 +14794,7 @@ sub_8125F5C: @ 8125F5C
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r0, _08125FEC @ =gUnknown_203AD30
ldr r0, _08125FEC @ =gSpecialVar_ItemId
ldrh r2, [r0]
movs r0, 0x4
adds r1, r6, 0
@@ -14828,7 +14828,7 @@ sub_8125F5C: @ 8125F5C
.align 2, 0
_08125FE4: .4byte gUnknown_203B0A0
_08125FE8: .4byte gPlayerParty
_08125FEC: .4byte gUnknown_203AD30
_08125FEC: .4byte gSpecialVar_ItemId
_08125FF0: .4byte gStringVar1
_08125FF4: .4byte gStringVar2
_08125FF8: .4byte gMoveNames
@@ -15077,7 +15077,7 @@ _0812620C: .4byte sub_812628C
_08126210:
cmp r0, 0x2
bne _08126218
ldr r0, _08126228 @ =gUnknown_20370D0
ldr r0, _08126228 @ =gSpecialVar_Result
strh r5, [r0]
_08126218:
ldr r0, _0812622C @ =gTasks
@@ -15089,7 +15089,7 @@ _08126218:
str r0, [r1]
b _0812626A
.align 2, 0
_08126228: .4byte gUnknown_20370D0
_08126228: .4byte gSpecialVar_Result
_0812622C: .4byte gTasks
_08126230: .4byte sub_81255BC
_08126234:
@@ -15164,7 +15164,7 @@ dp05_rare_candy: @ 81262AC
muls r1, r0
ldr r0, _081262EC @ =gPlayerParty
adds r4, r1, r0
ldr r0, _081262F0 @ =gUnknown_203AD30
ldr r0, _081262F0 @ =gSpecialVar_ItemId
ldrh r5, [r0]
adds r0, r4, 0
movs r1, 0x38
@@ -15182,7 +15182,7 @@ dp05_rare_candy: @ 81262AC
.align 2, 0
_081262E8: .4byte gUnknown_203B0A0
_081262EC: .4byte gPlayerParty
_081262F0: .4byte gUnknown_203AD30
_081262F0: .4byte gSpecialVar_ItemId
_081262F4:
movs r4, 0x1
_081262F6:
@@ -15252,7 +15252,7 @@ sub_8126350: @ 8126350
adds r0, r4, 0
bl sub_811D130
ldrb r0, [r6, 0x9]
ldr r5, _0812641C @ =gUnknown_203AD30
ldr r5, _0812641C @ =gSpecialVar_ItemId
ldrh r1, [r5]
movs r2, 0
bl ExecuteTableBasedItemEffect__
@@ -15316,7 +15316,7 @@ sub_8126350: @ 8126350
_08126410: .4byte gUnknown_203B0A0
_08126414: .4byte gPlayerParty
_08126418: .4byte gUnknown_203B09C
_0812641C: .4byte gUnknown_203AD30
_0812641C: .4byte gSpecialVar_ItemId
_08126420: .4byte gUnknown_203B0C0
_08126424: .4byte 0x0000ffff
_08126428: .4byte gStringVar1
@@ -15919,7 +15919,7 @@ sub_81268D4: @ 81268D4
lsrs r0, 16
mov r8, r0
ldrb r0, [r6, 0x9]
ldr r1, _08126938 @ =gUnknown_203AD30
ldr r1, _08126938 @ =gSpecialVar_ItemId
ldrh r1, [r1]
movs r2, 0
bl ExecuteTableBasedItemEffect__
@@ -15938,7 +15938,7 @@ _08126920:
.align 2, 0
_08126930: .4byte gUnknown_203B0A0
_08126934: .4byte gPlayerParty
_08126938: .4byte gUnknown_203AD30
_08126938: .4byte gSpecialVar_ItemId
_0812693C: .4byte gTasks
_08126940: .4byte sub_8126A18
_08126944:
@@ -16108,13 +16108,13 @@ _08126A94:
beq _08126AB4
ldr r0, _08126AD8 @ =gUnknown_203B0D0
ldr r1, [r0]
ldr r0, _08126ADC @ =gUnknown_203AD30
ldr r0, _08126ADC @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _08126AE0 @ =0x0000ffff
movs r0, 0x4
bl sub_80A2294
_08126AB4:
ldr r0, _08126ADC @ =gUnknown_203AD30
ldr r0, _08126ADC @ =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl sub_809A1D8
@@ -16133,7 +16133,7 @@ _08126ABE:
.align 2, 0
_08126AD4: .4byte gUnknown_203B0C0
_08126AD8: .4byte gUnknown_203B0D0
_08126ADC: .4byte gUnknown_203AD30
_08126ADC: .4byte gSpecialVar_ItemId
_08126AE0: .4byte 0x0000ffff
_08126AE4: .4byte gTasks
_08126AE8: .4byte sub_81255BC
@@ -16206,7 +16206,7 @@ sub_8126B60: @ 8126B60
muls r0, r1
ldr r1, _08126BB4 @ =gPlayerParty
adds r0, r1
ldr r1, _08126BB8 @ =gUnknown_203AD30
ldr r1, _08126BB8 @ =gSpecialVar_ItemId
ldrh r1, [r1]
ldrb r2, [r2, 0x9]
movs r3, 0
@@ -16232,7 +16232,7 @@ sub_8126B60: @ 8126B60
.align 2, 0
_08126BB0: .4byte gUnknown_203B0A0
_08126BB4: .4byte gPlayerParty
_08126BB8: .4byte gUnknown_203AD30
_08126BB8: .4byte gSpecialVar_ItemId
_08126BBC: .4byte gUnknown_203B0C0
_08126BC0: .4byte gUnknown_84169DC
_08126BC4: .4byte gTasks
@@ -16253,7 +16253,7 @@ sub_8126BD4: @ 8126BD4
ldr r0, [r4]
str r0, [r1]
ldrb r0, [r4, 0x9]
ldr r5, _08126C18 @ =gUnknown_203AD30
ldr r5, _08126C18 @ =gSpecialVar_ItemId
ldrh r1, [r5]
movs r2, 0
bl ExecuteTableBasedItemEffect__
@@ -16276,7 +16276,7 @@ sub_8126BD4: @ 8126BD4
.align 2, 0
_08126C10: .4byte gUnknown_300537C
_08126C14: .4byte gUnknown_203B0A0
_08126C18: .4byte gUnknown_203AD30
_08126C18: .4byte gSpecialVar_ItemId
_08126C1C: .4byte gPlayerParty
_08126C20: .4byte 0x0000ffff
thumb_func_end sub_8126BD4
@@ -16294,7 +16294,7 @@ sub_8126C24: @ 8126C24
muls r0, r1
ldr r1, _08126C58 @ =gPlayerParty
adds r0, r1
ldr r1, _08126C5C @ =gUnknown_203AD30
ldr r1, _08126C5C @ =gSpecialVar_ItemId
ldrh r2, [r1]
movs r1, 0x2
bl GetEvolutionTargetSpecies
@@ -16307,7 +16307,7 @@ sub_8126C24: @ 8126C24
.align 2, 0
_08126C54: .4byte gUnknown_203B0A0
_08126C58: .4byte gPlayerParty
_08126C5C: .4byte gUnknown_203AD30
_08126C5C: .4byte gSpecialVar_ItemId
_08126C60:
movs r0, 0x1
_08126C62:
@@ -16653,7 +16653,7 @@ _08126ED8: .4byte sub_80568A8
sub_8126EDC: @ 8126EDC
push {lr}
sub sp, 0xC
ldr r0, _08126EF8 @ =gUnknown_203AD30
ldr r0, _08126EF8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetPocketByItemId
lsls r0, 24
@@ -16665,7 +16665,7 @@ sub_8126EDC: @ 8126EDC
ldr r1, _08126EFC @ =sub_8124D90
b _08126F0A
.align 2, 0
_08126EF8: .4byte gUnknown_203AD30
_08126EF8: .4byte gSpecialVar_ItemId
_08126EFC: .4byte sub_8124D90
_08126F00:
ldr r1, _08126F04 @ =sub_8124DA0
@@ -16686,7 +16686,7 @@ _08126F0A:
movs r3, 0
bl sub_811EA44
ldr r1, _08126F38 @ =gUnknown_203B0A0
ldr r0, _08126F3C @ =gUnknown_203AD30
ldr r0, _08126F3C @ =gSpecialVar_ItemId
ldrh r0, [r0]
strh r0, [r1, 0xC]
add sp, 0xC
@@ -16696,7 +16696,7 @@ _08126F0A:
_08126F30: .4byte sub_8124DB0
_08126F34: .4byte sub_811FB28
_08126F38: .4byte gUnknown_203B0A0
_08126F3C: .4byte gUnknown_203AD30
_08126F3C: .4byte gSpecialVar_ItemId
thumb_func_end sub_8126EDC
thumb_func_start sub_8126F40
@@ -16958,7 +16958,7 @@ sub_812713C: @ 812713C
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
ldr r0, _08127194 @ =gUnknown_20370D0
ldr r0, _08127194 @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0
bne _0812719C
@@ -16980,7 +16980,7 @@ sub_812713C: @ 812713C
.align 2, 0
_0812718C: .4byte gUnknown_203B0A0
_08127190: .4byte gPlayerParty
_08127194: .4byte gUnknown_20370D0
_08127194: .4byte gSpecialVar_Result
_08127198: .4byte gUnknown_203B0D8
_0812719C:
ldrb r0, [r6, 0x8]
@@ -17869,7 +17869,7 @@ _08127850:
movs r3, 0
bl sub_811EA44
ldr r1, _08127880 @ =gUnknown_203B0A0
ldr r0, _08127884 @ =gUnknown_20370C6
ldr r0, _08127884 @ =gSpecialVar_0x8007
ldrh r0, [r0]
strb r0, [r1, 0x9]
_08127870:
@@ -17880,7 +17880,7 @@ _08127870:
_08127878: .4byte sub_8126DC8
_0812787C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08127880: .4byte gUnknown_203B0A0
_08127884: .4byte gUnknown_20370C6
_08127884: .4byte gSpecialVar_0x8007
thumb_func_end sub_812781C
thumb_func_start sub_8127888
@@ -18088,7 +18088,7 @@ _08127A24: .4byte gBattleTypeFlags
_08127A28: .4byte sub_8120C3C
_08127A2C: .4byte sub_8107ECC
_08127A30:
ldr r0, _08127A74 @ =gUnknown_203AD30
ldr r0, _08127A74 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetPocketByItemId
lsls r0, 24
@@ -18119,7 +18119,7 @@ _08127A62:
pop {r0}
bx r0
.align 2, 0
_08127A74: .4byte gUnknown_203AD30
_08127A74: .4byte gSpecialVar_ItemId
_08127A78: .4byte sub_8107ECC
_08127A7C: .4byte sub_8124DB0
_08127A80: .4byte sub_811FB28
asm/pokemon_3.s
+4 -4
View File
@@ -424,11 +424,11 @@ _08044834: .4byte gUnknown_825E032
sub_8044838: @ 8044838
push {r4-r7,lr}
sub sp, 0x14
ldr r0, _08044888 @ =gUnknown_20370C0
ldr r0, _08044888 @ =gSpecialVar_0x8004
ldrh r5, [r0]
ldr r0, _0804488C @ =gSpecialVar_0x8005
ldrh r4, [r0]
ldr r0, _08044890 @ =gUnknown_20370C4
ldr r0, _08044890 @ =gSpecialVar_0x8006
ldrh r6, [r0]
bl ZeroEnemyPartyMons
ldr r7, _08044894 @ =gEnemyParty
@@ -461,9 +461,9 @@ _08044880:
pop {r0}
bx r0
.align 2, 0
_08044888: .4byte gUnknown_20370C0
_08044888: .4byte gSpecialVar_0x8004
_0804488C: .4byte gSpecialVar_0x8005
_08044890: .4byte gUnknown_20370C4
_08044890: .4byte gSpecialVar_0x8006
_08044894: .4byte gEnemyParty
thumb_func_end sub_8044838
asm/pokemon_size_record.s
+6 -6
View File
@@ -211,14 +211,14 @@ sub_80A082C: @ 80A082C
adds r7, r1, 0
lsls r0, 16
lsrs r6, r0, 16
ldr r1, _080A0844 @ =gUnknown_20370D0
ldr r1, _080A0844 @ =gSpecialVar_Result
ldrh r0, [r1]
cmp r0, 0x5
bls _080A0848
movs r0, 0
b _080A08C4
.align 2, 0
_080A0844: .4byte gUnknown_20370D0
_080A0844: .4byte gSpecialVar_Result
_080A0848:
ldrh r1, [r1]
movs r0, 0x64
@@ -343,7 +343,7 @@ sub_80A0930: @ 80A0930
ldr r0, _080A0950 @ =0x0000403d
bl GetVarPointer
adds r1, r0, 0
ldr r4, _080A0954 @ =gUnknown_20370D0
ldr r4, _080A0954 @ =gSpecialVar_Result
movs r0, 0xD6
bl sub_80A082C
lsls r0, 24
@@ -354,7 +354,7 @@ sub_80A0930: @ 80A0930
bx r0
.align 2, 0
_080A0950: .4byte 0x0000403d
_080A0954: .4byte gUnknown_20370D0
_080A0954: .4byte gSpecialVar_Result
thumb_func_end sub_80A0930
thumb_func_start sub_80A0958
@@ -389,7 +389,7 @@ sub_80A0984: @ 80A0984
ldr r0, _080A09A4 @ =0x00004040
bl GetVarPointer
adds r1, r0, 0
ldr r4, _080A09A8 @ =gUnknown_20370D0
ldr r4, _080A09A8 @ =gSpecialVar_Result
movs r0, 0x81
bl sub_80A082C
lsls r0, 24
@@ -400,7 +400,7 @@ sub_80A0984: @ 80A0984
bx r0
.align 2, 0
_080A09A4: .4byte 0x00004040
_080A09A8: .4byte gUnknown_20370D0
_080A09A8: .4byte gSpecialVar_Result
thumb_func_end sub_80A0984
thumb_func_start GiveGiftRibbonToParty
asm/pokemon_storage_system.s
+4 -4
View File
@@ -1139,7 +1139,7 @@ _0808C1DC: .4byte gPlayerParty
thumb_func_start CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
CountPartyAliveNonEggMons_IgnoreVar0x8004Slot: @ 808C1E0
push {lr}
ldr r0, _0808C1F4 @ =gUnknown_20370C0
ldr r0, _0808C1F4 @ =gSpecialVar_0x8004
ldrb r0, [r0]
bl CountPartyAliveNonEggMonsExcept
lsls r0, 24
@@ -1147,7 +1147,7 @@ CountPartyAliveNonEggMons_IgnoreVar0x8004Slot: @ 808C1E0
pop {r1}
bx r1
.align 2, 0
_0808C1F4: .4byte gUnknown_20370C0
_0808C1F4: .4byte gSpecialVar_0x8004
thumb_func_end CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
thumb_func_start CountPartyMons
@@ -6609,7 +6609,7 @@ _0808EF08: .4byte sub_808CE60
sub_808EF0C: @ 808EF0C
push {lr}
sub sp, 0x4
ldr r0, _0808EF40 @ =gUnknown_203AD30
ldr r0, _0808EF40 @ =gSpecialVar_ItemId
ldrh r1, [r0]
mov r0, sp
strh r1, [r0]
@@ -6631,7 +6631,7 @@ sub_808EF0C: @ 808EF0C
bl SetMonData
b _0808EF56
.align 2, 0
_0808EF40: .4byte gUnknown_203AD30
_0808EF40: .4byte gSpecialVar_ItemId
_0808EF44: .4byte gUnknown_20397B4
_0808EF48: .4byte gPlayerParty
_0808EF4C:
asm/prof_pc.s
+10 -10
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_80CA3D8
sub_80CA3D8: @ 80CA3D8
push {lr}
ldr r0, _080CA3F4 @ =gUnknown_20370C0
ldr r0, _080CA3F4 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
bne _080CA3FC
@@ -20,7 +20,7 @@ sub_80CA3D8: @ 80CA3D8
bl sub_8088EDC
b _080CA40C
.align 2, 0
_080CA3F4: .4byte gUnknown_20370C0
_080CA3F4: .4byte gSpecialVar_0x8004
_080CA3F8: .4byte gSpecialVar_0x8005
_080CA3FC:
movs r0, 0
@@ -30,7 +30,7 @@ _080CA3FC:
movs r0, 0x1
bl pokedex_count
_080CA40C:
ldr r1, _080CA420 @ =gUnknown_20370C4
ldr r1, _080CA420 @ =gSpecialVar_0x8006
strh r0, [r1]
bl sub_806E25C
lsls r0, 16
@@ -39,7 +39,7 @@ _080CA40C:
bx r1
.align 2, 0
_080CA41C: .4byte gSpecialVar_0x8005
_080CA420: .4byte gUnknown_20370C4
_080CA420: .4byte gSpecialVar_0x8006
thumb_func_end sub_80CA3D8
thumb_func_start sub_80CA424
@@ -47,7 +47,7 @@ sub_80CA424: @ 80CA424
push {lr}
lsls r0, 16
lsrs r2, r0, 16
ldr r1, _080CA440 @ =gUnknown_20370D0
ldr r1, _080CA440 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
cmp r2, 0x9
@@ -59,7 +59,7 @@ _080CA436:
ldr r0, _080CA444 @ =gUnknown_81A6D6D
b _080CA51A
.align 2, 0
_080CA440: .4byte gUnknown_20370D0
_080CA440: .4byte gSpecialVar_Result
_080CA444: .4byte gUnknown_81A6D6D
_080CA448:
cmp r2, 0x1D
@@ -165,10 +165,10 @@ _080CA4F6:
.align 2, 0
_080CA4FC: .4byte gUnknown_81A7137
_080CA500:
ldr r1, _080CA504 @ =gUnknown_20370D0
ldr r1, _080CA504 @ =gSpecialVar_Result
b _080CA514
.align 2, 0
_080CA504: .4byte gUnknown_20370D0
_080CA504: .4byte gSpecialVar_Result
_080CA508:
cmp r2, 0x97
beq _080CA514
@@ -191,14 +191,14 @@ _080CA520: .4byte gUnknown_81A7175
thumb_func_start sub_80CA524
sub_80CA524: @ 80CA524
push {lr}
ldr r0, _080CA538 @ =gUnknown_20370C0
ldr r0, _080CA538 @ =gSpecialVar_0x8004
ldrh r0, [r0]
bl sub_80CA424
bl ShowFieldMessage
pop {r0}
bx r0
.align 2, 0
_080CA538: .4byte gUnknown_20370C0
_080CA538: .4byte gSpecialVar_0x8004
thumb_func_end sub_80CA524
.align 2, 0 @ Don't pad with nop.
asm/rom6.s
+2 -2
View File
@@ -31,7 +31,7 @@ npc_before_player_of_type: @ 80C97A8
ldrb r0, [r2, 0x5]
cmp r0, r5
bne _080C97F4
ldr r1, _080C97F0 @ =gUnknown_20370D2
ldr r1, _080C97F0 @ =gSpecialVar_LastTalked
ldrb r0, [r2, 0x8]
strh r0, [r1]
movs r0, 0x1
@@ -39,7 +39,7 @@ npc_before_player_of_type: @ 80C97A8
.align 2, 0
_080C97E8: .4byte gUnknown_2039A04
_080C97EC: .4byte gMapObjects
_080C97F0: .4byte gUnknown_20370D2
_080C97F0: .4byte gSpecialVar_LastTalked
_080C97F4:
movs r0, 0
_080C97F6:
asm/scrcmd.s
+58 -58
View File
@@ -1003,7 +1003,7 @@ ScrCmd_random: @ 806A5DC
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r5, _0806A60C @ =gUnknown_20370D0
ldr r5, _0806A60C @ =gSpecialVar_Result
bl Random
lsls r0, 16
lsrs r0, 16
@@ -1015,7 +1015,7 @@ ScrCmd_random: @ 806A5DC
pop {r1}
bx r1
.align 2, 0
_0806A60C: .4byte gUnknown_20370D0
_0806A60C: .4byte gSpecialVar_Result
thumb_func_end ScrCmd_random
thumb_func_start sub_806A610
@@ -1035,7 +1035,7 @@ sub_806A610: @ 806A610
lsrs r0, 16
bl VarGet
adds r1, r0, 0
ldr r5, _0806A658 @ =gUnknown_20370D0
ldr r5, _0806A658 @ =gSpecialVar_Result
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
@@ -1050,7 +1050,7 @@ sub_806A610: @ 806A610
pop {r1}
bx r1
.align 2, 0
_0806A658: .4byte gUnknown_20370D0
_0806A658: .4byte gSpecialVar_Result
thumb_func_end sub_806A610
thumb_func_start ScrCmd_takeitem
@@ -1070,7 +1070,7 @@ ScrCmd_takeitem: @ 806A65C
lsrs r0, 16
bl VarGet
adds r1, r0, 0
ldr r5, _0806A69C @ =gUnknown_20370D0
ldr r5, _0806A69C @ =gSpecialVar_Result
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
@@ -1083,7 +1083,7 @@ ScrCmd_takeitem: @ 806A65C
pop {r1}
bx r1
.align 2, 0
_0806A69C: .4byte gUnknown_20370D0
_0806A69C: .4byte gSpecialVar_Result
thumb_func_end ScrCmd_takeitem
thumb_func_start sub_806A6A0
@@ -1103,7 +1103,7 @@ sub_806A6A0: @ 806A6A0
lsrs r0, 16
bl VarGet
adds r1, r0, 0
ldr r5, _0806A6E0 @ =gUnknown_20370D0
ldr r5, _0806A6E0 @ =gSpecialVar_Result
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
@@ -1116,7 +1116,7 @@ sub_806A6A0: @ 806A6A0
pop {r1}
bx r1
.align 2, 0
_0806A6E0: .4byte gUnknown_20370D0
_0806A6E0: .4byte gSpecialVar_Result
thumb_func_end sub_806A6A0
thumb_func_start sub_806A6E4
@@ -1136,7 +1136,7 @@ sub_806A6E4: @ 806A6E4
lsrs r0, 16
bl VarGet
adds r1, r0, 0
ldr r5, _0806A724 @ =gUnknown_20370D0
ldr r5, _0806A724 @ =gSpecialVar_Result
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
@@ -1149,7 +1149,7 @@ sub_806A6E4: @ 806A6E4
pop {r1}
bx r1
.align 2, 0
_0806A724: .4byte gUnknown_20370D0
_0806A724: .4byte gSpecialVar_Result
thumb_func_end sub_806A6E4
thumb_func_start ScrCmd_checkitemtype
@@ -1161,7 +1161,7 @@ ScrCmd_checkitemtype: @ 806A728
bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r4, _0806A750 @ =gUnknown_20370D0
ldr r4, _0806A750 @ =gSpecialVar_Result
bl GetPocketByItemId
lsls r0, 24
lsrs r0, 24
@@ -1171,7 +1171,7 @@ ScrCmd_checkitemtype: @ 806A728
pop {r1}
bx r1
.align 2, 0
_0806A750: .4byte gUnknown_20370D0
_0806A750: .4byte gSpecialVar_Result
thumb_func_end ScrCmd_checkitemtype
thumb_func_start ScrCmd_givepcitem
@@ -1193,7 +1193,7 @@ ScrCmd_givepcitem: @ 806A754
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
ldr r5, _0806A794 @ =gUnknown_20370D0
ldr r5, _0806A794 @ =gSpecialVar_Result
adds r0, r4, 0
bl sub_809A3C8
lsls r0, 24
@@ -1204,7 +1204,7 @@ ScrCmd_givepcitem: @ 806A754
pop {r1}
bx r1
.align 2, 0
_0806A794: .4byte gUnknown_20370D0
_0806A794: .4byte gSpecialVar_Result
thumb_func_end ScrCmd_givepcitem
thumb_func_start ScrCmd_checkpcitem
@@ -1226,7 +1226,7 @@ ScrCmd_checkpcitem: @ 806A798
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
ldr r5, _0806A7D8 @ =gUnknown_20370D0
ldr r5, _0806A7D8 @ =gSpecialVar_Result
adds r0, r4, 0
bl sub_809A374
lsls r0, 24
@@ -1237,7 +1237,7 @@ ScrCmd_checkpcitem: @ 806A798
pop {r1}
bx r1
.align 2, 0
_0806A7D8: .4byte gUnknown_20370D0
_0806A7D8: .4byte gSpecialVar_Result
thumb_func_end ScrCmd_checkpcitem
thumb_func_start sub_806A7DC
@@ -1540,19 +1540,19 @@ sub_806A9D8: @ 806A9D8
thumb_func_start sub_806A9DC
sub_806A9DC: @ 806A9DC
ldr r0, _0806A9F0 @ =gUnknown_20370B8
ldr r0, _0806A9F0 @ =gSpecialVar_0x8000
movs r1, 0
strh r1, [r0]
ldr r0, _0806A9F4 @ =gUnknown_20370BA
ldr r0, _0806A9F4 @ =gSpecialVar_0x8001
strh r1, [r0]
ldr r0, _0806A9F8 @ =gUnknown_20370BC
ldr r0, _0806A9F8 @ =gSpecialVar_0x8002
strh r1, [r0]
movs r0, 0
bx lr
.align 2, 0
_0806A9F0: .4byte gUnknown_20370B8
_0806A9F4: .4byte gUnknown_20370BA
_0806A9F8: .4byte gUnknown_20370BC
_0806A9F0: .4byte gSpecialVar_0x8000
_0806A9F4: .4byte gSpecialVar_0x8001
_0806A9F8: .4byte gSpecialVar_0x8002
thumb_func_end sub_806A9DC
thumb_func_start ScrCmd_setweather
@@ -2344,7 +2344,7 @@ _0806B048: .4byte gSaveBlock1Ptr
thumb_func_start ScrCmd_getpartysize
ScrCmd_getpartysize: @ 806B04C
push {r4,lr}
ldr r4, _0806B064 @ =gUnknown_20370D0
ldr r4, _0806B064 @ =gSpecialVar_Result
bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r0, 24
@@ -2354,7 +2354,7 @@ ScrCmd_getpartysize: @ 806B04C
pop {r1}
bx r1
.align 2, 0
_0806B064: .4byte gUnknown_20370D0
_0806B064: .4byte gSpecialVar_Result
thumb_func_end ScrCmd_getpartysize
thumb_func_start ScrCmd_playse
@@ -3569,7 +3569,7 @@ sub_806B96C: @ 806B96C
ands r0, r1
cmp r0, 0
beq _0806B990
ldr r0, _0806B98C @ =gUnknown_20370D4
ldr r0, _0806B98C @ =gSpecialVar_Facing
ldrh r0, [r0]
cmp r0, 0x2
beq _0806B990
@@ -3577,49 +3577,49 @@ sub_806B96C: @ 806B96C
b _0806BA36
.align 2, 0
_0806B988: .4byte gMain
_0806B98C: .4byte gUnknown_20370D4
_0806B98C: .4byte gSpecialVar_Facing
_0806B990:
ldrh r1, [r2, 0x2C]
movs r0, 0x80
ands r0, r1
cmp r0, 0
beq _0806B9AC
ldr r0, _0806B9A8 @ =gUnknown_20370D4
ldr r0, _0806B9A8 @ =gSpecialVar_Facing
ldrh r0, [r0]
cmp r0, 0x1
beq _0806B9AC
movs r0, 0x2
b _0806BA36
.align 2, 0
_0806B9A8: .4byte gUnknown_20370D4
_0806B9A8: .4byte gSpecialVar_Facing
_0806B9AC:
ldrh r1, [r2, 0x2C]
movs r0, 0x20
ands r0, r1
cmp r0, 0
beq _0806B9C8
ldr r0, _0806B9C4 @ =gUnknown_20370D4
ldr r0, _0806B9C4 @ =gSpecialVar_Facing
ldrh r0, [r0]
cmp r0, 0x3
beq _0806B9C8
movs r0, 0x3
b _0806BA36
.align 2, 0
_0806B9C4: .4byte gUnknown_20370D4
_0806B9C4: .4byte gSpecialVar_Facing
_0806B9C8:
ldrh r1, [r2, 0x2C]
movs r0, 0x10
ands r0, r1
cmp r0, 0
beq _0806B9E4
ldr r0, _0806B9E0 @ =gUnknown_20370D4
ldr r0, _0806B9E0 @ =gSpecialVar_Facing
ldrh r0, [r0]
cmp r0, 0x4
beq _0806B9E4
movs r0, 0x4
b _0806BA36
.align 2, 0
_0806B9E0: .4byte gUnknown_20370D4
_0806B9E0: .4byte gSpecialVar_Facing
_0806B9E4:
ldrh r1, [r2, 0x2E]
movs r0, 0x80
@@ -3974,7 +3974,7 @@ sub_806BC40: @ 806BC40
bne _0806BC50
ldr r1, [r4, 0x64]
_0806BC50:
ldr r4, _0806BC68 @ =gUnknown_20370C0
ldr r4, _0806BC68 @ =gSpecialVar_0x8004
movs r2, 0x1
negs r2, r2
movs r0, 0x6
@@ -3985,7 +3985,7 @@ _0806BC50:
pop {r1}
bx r1
.align 2, 0
_0806BC68: .4byte gUnknown_20370C0
_0806BC68: .4byte gSpecialVar_0x8004
thumb_func_end sub_806BC40
thumb_func_start ScrCmd_vmessage
@@ -4453,7 +4453,7 @@ ScrCmd_givemon: @ 806BFD0
ldrb r2, [r1]
adds r1, 0x1
str r1, [r4, 0x8]
ldr r4, _0806C04C @ =gUnknown_20370D0
ldr r4, _0806C04C @ =gSpecialVar_Result
str r0, [sp]
str r2, [sp, 0x4]
adds r0, r6, 0
@@ -4473,7 +4473,7 @@ ScrCmd_givemon: @ 806BFD0
pop {r1}
bx r1
.align 2, 0
_0806C04C: .4byte gUnknown_20370D0
_0806C04C: .4byte gSpecialVar_Result
thumb_func_end ScrCmd_givemon
thumb_func_start ScrCmd_giveegg
@@ -4485,7 +4485,7 @@ ScrCmd_giveegg: @ 806C050
bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r4, _0806C078 @ =gUnknown_20370D0
ldr r4, _0806C078 @ =gSpecialVar_Result
bl sub_80A01AC
lsls r0, 24
lsrs r0, 24
@@ -4495,7 +4495,7 @@ ScrCmd_giveegg: @ 806C050
pop {r1}
bx r1
.align 2, 0
_0806C078: .4byte gUnknown_20370D0
_0806C078: .4byte gSpecialVar_Result
thumb_func_end ScrCmd_giveegg
thumb_func_start ScrCmd_setmonmove
@@ -4527,13 +4527,13 @@ ScrCmd_checkpartymove: @ 806C0A8
bl ScriptReadHalfword
lsls r0, 16
lsrs r7, r0, 16
ldr r1, _0806C0BC @ =gUnknown_20370D0
ldr r1, _0806C0BC @ =gSpecialVar_Result
movs r0, 0x6
strh r0, [r1]
movs r6, 0
b _0806C0F6
.align 2, 0
_0806C0BC: .4byte gUnknown_20370D0
_0806C0BC: .4byte gSpecialVar_Result
_0806C0C0:
adds r0, r4, 0
movs r1, 0x2D
@@ -4547,14 +4547,14 @@ _0806C0C0:
lsrs r0, 24
cmp r0, 0x1
bne _0806C0F0
ldr r0, _0806C0E8 @ =gUnknown_20370D0
ldr r0, _0806C0E8 @ =gSpecialVar_Result
strh r6, [r0]
ldr r0, _0806C0EC @ =gUnknown_20370C0
ldr r0, _0806C0EC @ =gSpecialVar_0x8004
strh r5, [r0]
b _0806C116
.align 2, 0
_0806C0E8: .4byte gUnknown_20370D0
_0806C0EC: .4byte gUnknown_20370C0
_0806C0E8: .4byte gSpecialVar_Result
_0806C0EC: .4byte gSpecialVar_0x8004
_0806C0F0:
adds r0, r6, 0x1
lsls r0, 24
@@ -4652,7 +4652,7 @@ ScrCmd_checkmoney: @ 806C18C
str r0, [r4, 0x8]
cmp r1, 0
bne _0806C1BA
ldr r4, _0806C1C4 @ =gUnknown_20370D0
ldr r4, _0806C1C4 @ =gSpecialVar_Result
ldr r0, _0806C1C8 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xA4
@@ -4669,7 +4669,7 @@ _0806C1BA:
pop {r1}
bx r1
.align 2, 0
_0806C1C4: .4byte gUnknown_20370D0
_0806C1C4: .4byte gSpecialVar_Result
_0806C1C8: .4byte gSaveBlock1Ptr
thumb_func_end ScrCmd_checkmoney
@@ -5133,7 +5133,7 @@ ScrCmd_setrespawn: @ 806C4D4
thumb_func_start ScrCmd_checkplayergender
ScrCmd_checkplayergender: @ 806C4F0
ldr r1, _0806C500 @ =gUnknown_20370D0
ldr r1, _0806C500 @ =gSpecialVar_Result
ldr r0, _0806C504 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
@@ -5141,7 +5141,7 @@ ScrCmd_checkplayergender: @ 806C4F0
movs r0, 0
bx lr
.align 2, 0
_0806C500: .4byte gUnknown_20370D0
_0806C500: .4byte gSpecialVar_Result
_0806C504: .4byte gSaveBlock2Ptr
thumb_func_end ScrCmd_checkplayergender
@@ -5452,13 +5452,13 @@ ScrCmd_givecoins: @ 806C74C
lsrs r0, 24
cmp r0, 0x1
bne _0806C774
ldr r1, _0806C770 @ =gUnknown_20370D0
ldr r1, _0806C770 @ =gSpecialVar_Result
movs r0, 0
b _0806C778
.align 2, 0
_0806C770: .4byte gUnknown_20370D0
_0806C770: .4byte gSpecialVar_Result
_0806C774:
ldr r1, _0806C780 @ =gUnknown_20370D0
ldr r1, _0806C780 @ =gSpecialVar_Result
movs r0, 0x1
_0806C778:
strh r0, [r1]
@@ -5466,7 +5466,7 @@ _0806C778:
pop {r1}
bx r1
.align 2, 0
_0806C780: .4byte gUnknown_20370D0
_0806C780: .4byte gSpecialVar_Result
thumb_func_end ScrCmd_givecoins
thumb_func_start ScrCmd_takecoins
@@ -5483,13 +5483,13 @@ ScrCmd_takecoins: @ 806C784
lsrs r0, 24
cmp r0, 0x1
bne _0806C7AC
ldr r1, _0806C7A8 @ =gUnknown_20370D0
ldr r1, _0806C7A8 @ =gSpecialVar_Result
movs r0, 0
b _0806C7B0
.align 2, 0
_0806C7A8: .4byte gUnknown_20370D0
_0806C7A8: .4byte gSpecialVar_Result
_0806C7AC:
ldr r1, _0806C7B8 @ =gUnknown_20370D0
ldr r1, _0806C7B8 @ =gSpecialVar_Result
movs r0, 0x1
_0806C7B0:
strh r0, [r1]
@@ -5497,7 +5497,7 @@ _0806C7B0:
pop {r1}
bx r1
.align 2, 0
_0806C7B8: .4byte gUnknown_20370D0
_0806C7B8: .4byte gSpecialVar_Result
thumb_func_end ScrCmd_takecoins
thumb_func_start sub_806C7BC
@@ -5555,7 +5555,7 @@ ScrCmd_checkmonobedience: @ 806C80C
bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r4, _0806C83C @ =gUnknown_20370D0
ldr r4, _0806C83C @ =gSpecialVar_Result
movs r1, 0x64
muls r0, r1
ldr r1, _0806C840 @ =gPlayerParty
@@ -5569,7 +5569,7 @@ ScrCmd_checkmonobedience: @ 806C80C
pop {r1}
bx r1
.align 2, 0
_0806C83C: .4byte gUnknown_20370D0
_0806C83C: .4byte gSpecialVar_Result
_0806C840: .4byte gPlayerParty
thumb_func_end ScrCmd_checkmonobedience
asm/script_menu.s
+44 -44
View File
@@ -78,7 +78,7 @@ ScriptMenu_Multichoice: @ 809C9B4
lsrs r0, 24
cmp r0, 0x1
beq _0809C9F8
ldr r0, _0809C9F4 @ =gUnknown_20370D0
ldr r0, _0809C9F4 @ =gSpecialVar_Result
movs r1, 0xFF
strh r1, [r0]
movs r0, 0
@@ -92,7 +92,7 @@ ScriptMenu_Multichoice: @ 809C9B4
b _0809C9FA
.align 2, 0
_0809C9F0: .4byte sub_809CC98
_0809C9F4: .4byte gUnknown_20370D0
_0809C9F4: .4byte gSpecialVar_Result
_0809C9F8:
movs r0, 0
_0809C9FA:
@@ -126,7 +126,7 @@ ScriptMenu_MultichoiceWithDefault: @ 809CA04
lsrs r0, 24
cmp r0, 0x1
beq _0809CA54
ldr r1, _0809CA50 @ =gUnknown_20370D0
ldr r1, _0809CA50 @ =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
str r4, [sp]
@@ -139,7 +139,7 @@ ScriptMenu_MultichoiceWithDefault: @ 809CA04
b _0809CA56
.align 2, 0
_0809CA4C: .4byte sub_809CC98
_0809CA50: .4byte gUnknown_20370D0
_0809CA50: .4byte gSpecialVar_Result
_0809CA54:
movs r0, 0
_0809CA56:
@@ -506,15 +506,15 @@ _0809CCF8:
bne _0809CD3C
movs r0, 0x5
bl PlaySE
ldr r1, _0809CD24 @ =gUnknown_20370D0
ldr r1, _0809CD24 @ =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
b _0809CD2C
.align 2, 0
_0809CD20: .4byte gMain
_0809CD24: .4byte gUnknown_20370D0
_0809CD24: .4byte gSpecialVar_Result
_0809CD28:
ldr r0, _0809CD44 @ =gUnknown_20370D0
ldr r0, _0809CD44 @ =gSpecialVar_Result
strh r1, [r0]
_0809CD2C:
ldrb r0, [r5, 0xC]
@@ -527,7 +527,7 @@ _0809CD3C:
pop {r0}
bx r0
.align 2, 0
_0809CD44: .4byte gUnknown_20370D0
_0809CD44: .4byte gSpecialVar_Result
thumb_func_end sub_809CC98
thumb_func_start sub_809CD48
@@ -628,7 +628,7 @@ sub_809CDEC: @ 809CDEC
.align 2, 0
_0809CE04: .4byte task_yes_no_maybe
_0809CE08:
ldr r1, _0809CE30 @ =gUnknown_20370D0
ldr r1, _0809CE30 @ =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
ldr r0, _0809CE34 @ =sub_809D6D4
@@ -647,21 +647,21 @@ _0809CE28:
pop {r1}
bx r1
.align 2, 0
_0809CE30: .4byte gUnknown_20370D0
_0809CE30: .4byte gSpecialVar_Result
_0809CE34: .4byte sub_809D6D4
thumb_func_end sub_809CDEC
thumb_func_start sub_809CE38
sub_809CE38: @ 809CE38
push {lr}
ldr r0, _0809CE48 @ =gUnknown_20370D0
ldr r0, _0809CE48 @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0xFF
beq _0809CE4C
movs r0, 0x1
b _0809CE4E
.align 2, 0
_0809CE48: .4byte gUnknown_20370D0
_0809CE48: .4byte gSpecialVar_Result
_0809CE4C:
movs r0, 0
_0809CE4E:
@@ -711,13 +711,13 @@ _0809CE94:
_0809CE9C:
movs r0, 0x5
bl PlaySE
ldr r1, _0809CEA8 @ =gUnknown_20370D0
ldr r1, _0809CEA8 @ =gSpecialVar_Result
movs r0, 0
b _0809CEB0
.align 2, 0
_0809CEA8: .4byte gUnknown_20370D0
_0809CEA8: .4byte gSpecialVar_Result
_0809CEAC:
ldr r1, _0809CEC4 @ =gUnknown_20370D0
ldr r1, _0809CEC4 @ =gSpecialVar_Result
movs r0, 0x1
_0809CEB0:
strh r0, [r1]
@@ -730,7 +730,7 @@ _0809CEBC:
pop {r0}
bx r0
.align 2, 0
_0809CEC4: .4byte gUnknown_20370D0
_0809CEC4: .4byte gSpecialVar_Result
thumb_func_end task_yes_no_maybe
thumb_func_start sub_809CEC8
@@ -767,7 +767,7 @@ sub_809CEC8: @ 809CEC8
.align 2, 0
_0809CF04: .4byte sub_809CFDC
_0809CF08:
ldr r1, _0809CFCC @ =gUnknown_20370D0
ldr r1, _0809CFCC @ =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
ldr r0, _0809CFD0 @ =sub_809D6D4
@@ -858,7 +858,7 @@ _0809CFBA:
pop {r1}
bx r1
.align 2, 0
_0809CFCC: .4byte gUnknown_20370D0
_0809CFCC: .4byte gSpecialVar_Result
_0809CFD0: .4byte sub_809D6D4
_0809CFD4: .4byte gUnknown_83E04B0
_0809CFD8: .4byte gTasks
@@ -890,15 +890,15 @@ sub_809CFDC: @ 809CFDC
bne _0809D034
movs r0, 0x5
bl PlaySE
ldr r1, _0809D01C @ =gUnknown_20370D0
ldr r1, _0809D01C @ =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
b _0809D024
.align 2, 0
_0809D018: .4byte gTasks+0x8
_0809D01C: .4byte gUnknown_20370D0
_0809D01C: .4byte gSpecialVar_Result
_0809D020:
ldr r0, _0809D03C @ =gUnknown_20370D0
ldr r0, _0809D03C @ =gSpecialVar_Result
strh r1, [r0]
_0809D024:
ldrb r0, [r5, 0xC]
@@ -911,7 +911,7 @@ _0809D034:
pop {r0}
bx r0
.align 2, 0
_0809D03C: .4byte gUnknown_20370D0
_0809D03C: .4byte gSpecialVar_Result
thumb_func_end sub_809CFDC
thumb_func_start sp109_CreatePCMenu
@@ -923,7 +923,7 @@ sp109_CreatePCMenu: @ 809D040
lsrs r0, 24
cmp r0, 0x1
beq _0809D068
ldr r1, _0809D064 @ =gUnknown_20370D0
ldr r1, _0809D064 @ =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
bl sub_809D070
@@ -931,7 +931,7 @@ sp109_CreatePCMenu: @ 809D040
b _0809D06A
.align 2, 0
_0809D060: .4byte sub_809CC98
_0809D064: .4byte gUnknown_20370D0
_0809D064: .4byte gSpecialVar_Result
_0809D068:
movs r0, 0
_0809D06A:
@@ -1524,7 +1524,7 @@ sub_809D504: @ 809D504
lsrs r0, 24
cmp r0, 0xFF
bne _0809D55C
ldr r0, _0809D54C @ =gUnknown_20370C0
ldr r0, _0809D54C @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x8D
bne _0809D558
@@ -1539,7 +1539,7 @@ sub_809D504: @ 809D504
.align 2, 0
_0809D544: .4byte sub_809D6D4
_0809D548: .4byte sub_809D494
_0809D54C: .4byte gUnknown_20370C0
_0809D54C: .4byte gSpecialVar_0x8004
_0809D550: .4byte gUnknown_83E17C0
_0809D554: .4byte gUnknown_83E17A0
_0809D558:
@@ -1566,7 +1566,7 @@ _0809D572:
lsls r2, 14
adds r1, r2
asrs r1, 16
ldr r6, _0809D610 @ =gUnknown_20370C4
ldr r6, _0809D610 @ =gSpecialVar_0x8006
ldrh r2, [r6]
lsls r2, 19
movs r3, 0xA0
@@ -1629,7 +1629,7 @@ _0809D600: .4byte gUnknown_83E17D0
_0809D604: .4byte gUnknown_83E0F80
_0809D608: .4byte gUnknown_83E0768
_0809D60C: .4byte gSpecialVar_0x8005
_0809D610: .4byte gUnknown_20370C4
_0809D610: .4byte gSpecialVar_0x8006
_0809D614: .4byte gSprites
_0809D618: .4byte sub_809D494
_0809D61C: .4byte gTasks
@@ -1803,7 +1803,7 @@ sub_809D764: @ 809D764
mov r6, r8
push {r6,r7}
sub sp, 0xC
ldr r1, _0809D7A0 @ =gUnknown_20370D0
ldr r1, _0809D7A0 @ =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
ldr r0, _0809D7A4 @ =sub_809D6D4
@@ -1818,7 +1818,7 @@ _0809D784:
ldrh r0, [r0]
cmp r0, 0x1
bne _0809D7B0
ldr r0, _0809D7AC @ =gUnknown_20370C0
ldr r0, _0809D7AC @ =gSpecialVar_0x8004
ldrh r0, [r0]
movs r4, 0x4
cmp r0, 0x4
@@ -1830,10 +1830,10 @@ _0809D798:
movs r5, 0x2
b _0809D7B8
.align 2, 0
_0809D7A0: .4byte gUnknown_20370D0
_0809D7A0: .4byte gSpecialVar_Result
_0809D7A4: .4byte sub_809D6D4
_0809D7A8: .4byte gSpecialVar_0x8005
_0809D7AC: .4byte gUnknown_20370C0
_0809D7AC: .4byte gSpecialVar_0x8004
_0809D7B0:
movs r4, 0
movs r0, 0x6
@@ -1866,7 +1866,7 @@ _0809D7B8:
cmp r6, r5
bge _0809D844
_0809D7F2:
ldr r0, _0809D820 @ =gUnknown_20370C0
ldr r0, _0809D820 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r4, r0
beq _0809D828
@@ -1889,7 +1889,7 @@ _0809D7F2:
bl AddTextPrinterParameterized
b _0809D82E
.align 2, 0
_0809D820: .4byte gUnknown_20370C0
_0809D820: .4byte gSpecialVar_0x8004
_0809D824: .4byte gUnknown_83E17E0
_0809D828:
subs r0, r6, 0x1
@@ -1970,7 +1970,7 @@ _0809D8BC: .4byte gUnknown_84161C8
thumb_func_start sub_809D8C0
sub_809D8C0: @ 809D8C0
push {lr}
ldr r3, _0809D8EC @ =gUnknown_20370D0
ldr r3, _0809D8EC @ =gSpecialVar_Result
ldrh r2, [r3]
adds r1, r2, 0
cmp r1, 0x7F
@@ -1985,20 +1985,20 @@ sub_809D8C0: @ 809D8C0
beq _0809D930
cmp r1, 0
bne _0809D8F8
ldr r0, _0809D8F4 @ =gUnknown_20370C0
ldr r0, _0809D8F4 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x4
bls _0809D904
movs r0, 0x4
b _0809D94E
.align 2, 0
_0809D8EC: .4byte gUnknown_20370D0
_0809D8EC: .4byte gSpecialVar_Result
_0809D8F0: .4byte gSpecialVar_0x8005
_0809D8F4: .4byte gUnknown_20370C0
_0809D8F4: .4byte gSpecialVar_0x8004
_0809D8F8:
cmp r1, 0x1
bne _0809D90C
ldr r0, _0809D908 @ =gUnknown_20370C0
ldr r0, _0809D908 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x5
bls _0809D918
@@ -2006,11 +2006,11 @@ _0809D904:
movs r0, 0x5
b _0809D94E
.align 2, 0
_0809D908: .4byte gUnknown_20370C0
_0809D908: .4byte gSpecialVar_0x8004
_0809D90C:
cmp r1, 0x2
bne _0809D94C
ldr r0, _0809D91C @ =gUnknown_20370C0
ldr r0, _0809D91C @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x6
bls _0809D920
@@ -2018,7 +2018,7 @@ _0809D918:
movs r0, 0x6
b _0809D94E
.align 2, 0
_0809D91C: .4byte gUnknown_20370C0
_0809D91C: .4byte gSpecialVar_0x8004
_0809D920:
movs r0, 0x7
b _0809D94E
@@ -2035,7 +2035,7 @@ _0809D930:
movs r0, 0x7F
b _0809D94E
_0809D934:
ldr r0, _0809D944 @ =gUnknown_20370C0
ldr r0, _0809D944 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r1, r0
bcc _0809D948
@@ -2044,7 +2044,7 @@ _0809D934:
lsrs r0, 16
b _0809D94E
.align 2, 0
_0809D944: .4byte gUnknown_20370C0
_0809D944: .4byte gSpecialVar_0x8004
_0809D948:
ldrh r0, [r3]
b _0809D94E
asm/script_pokemon_util_80A0058.s
+10 -10
View File
@@ -221,13 +221,13 @@ _080A020C:
cmp r1, 0x2
bne _080A0214
_080A0210:
ldr r0, _080A0218 @ =gUnknown_20370D0
ldr r0, _080A0218 @ =gSpecialVar_Result
strh r1, [r0]
_080A0214:
pop {r0}
bx r0
.align 2, 0
_080A0218: .4byte gUnknown_20370D0
_080A0218: .4byte gSpecialVar_Result
thumb_func_end CheckForAlivePartyMons
thumb_func_start CheckPartyMonHasHeldItem
@@ -400,14 +400,14 @@ sub_80A0350: @ 80A0350
ldrb r1, [r0]
cmp r1, 0
bne _080A0368
ldr r0, _080A0364 @ =gUnknown_20370D0
ldr r0, _080A0364 @ =gSpecialVar_Result
strh r1, [r0]
b _080A036E
.align 2, 0
_080A0360: .4byte gUnknown_203B0D4
_080A0364: .4byte gUnknown_20370D0
_080A0364: .4byte gSpecialVar_Result
_080A0368:
ldr r1, _080A0378 @ =gUnknown_20370D0
ldr r1, _080A0378 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_080A036E:
@@ -416,7 +416,7 @@ _080A036E:
pop {r0}
bx r0
.align 2, 0
_080A0378: .4byte gUnknown_20370D0
_080A0378: .4byte gSpecialVar_Result
_080A037C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_80A0350
@@ -443,15 +443,15 @@ sub_80A039C: @ 80A039C
cmp r4, 0
bne _080A03B8
bl LoadPlayerParty
ldr r0, _080A03B4 @ =gUnknown_20370D0
ldr r0, _080A03B4 @ =gSpecialVar_Result
strh r4, [r0]
b _080A03C2
.align 2, 0
_080A03B0: .4byte gUnknown_203B0D4
_080A03B4: .4byte gUnknown_20370D0
_080A03B4: .4byte gSpecialVar_Result
_080A03B8:
bl sub_80A03D8
ldr r1, _080A03D0 @ =gUnknown_20370D0
ldr r1, _080A03D0 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_080A03C2:
@@ -461,7 +461,7 @@ _080A03C2:
pop {r0}
bx r0
.align 2, 0
_080A03D0: .4byte gUnknown_20370D0
_080A03D0: .4byte gSpecialVar_Result
_080A03D4: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_80A039C
asm/script_pokemon_util_80BF8FC.s
+17 -17
View File
@@ -105,7 +105,7 @@ sub_80BF9BC: @ 80BF9BC
push {r4,lr}
sub sp, 0x4
ldr r0, _080BF9F0 @ =gPlayerParty
ldr r1, _080BF9F4 @ =gUnknown_20370C0
ldr r1, _080BF9F4 @ =gSpecialVar_0x8004
ldrb r1, [r1]
ldr r2, _080BF9F8 @ =gPlayerPartyCount
ldrb r2, [r2]
@@ -127,7 +127,7 @@ sub_80BF9BC: @ 80BF9BC
bx r0
.align 2, 0
_080BF9F0: .4byte gPlayerParty
_080BF9F4: .4byte gUnknown_20370C0
_080BF9F4: .4byte gSpecialVar_0x8004
_080BF9F8: .4byte gPlayerPartyCount
_080BF9FC: .4byte c2_exit_to_overworld_2_switch
_080BFA00: .4byte gUnknown_3005020
@@ -137,13 +137,13 @@ _080BFA04: .4byte sub_807DD24
thumb_func_start ScrSpecial_CountPokemonMoves
ScrSpecial_CountPokemonMoves: @ 80BFA08
push {r4,r5,lr}
ldr r1, _080BFA44 @ =gUnknown_20370D0
ldr r1, _080BFA44 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r4, 0
adds r5, r1, 0
_080BFA14:
ldr r0, _080BFA48 @ =gUnknown_20370C0
ldr r0, _080BFA48 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -167,15 +167,15 @@ _080BFA32:
pop {r0}
bx r0
.align 2, 0
_080BFA44: .4byte gUnknown_20370D0
_080BFA48: .4byte gUnknown_20370C0
_080BFA44: .4byte gSpecialVar_Result
_080BFA48: .4byte gSpecialVar_0x8004
_080BFA4C: .4byte gPlayerParty
thumb_func_end ScrSpecial_CountPokemonMoves
thumb_func_start ScrSpecial_GetPokemonNicknameAndMoveName
ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50
push {r4,r5,lr}
ldr r0, _080BFA90 @ =gUnknown_20370C0
ldr r0, _080BFA90 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
adds r5, r1, 0
@@ -203,7 +203,7 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50
pop {r0}
bx r0
.align 2, 0
_080BFA90: .4byte gUnknown_20370C0
_080BFA90: .4byte gSpecialVar_0x8004
_080BFA94: .4byte gPlayerParty
_080BFA98: .4byte gSpecialVar_0x8005
_080BFA9C: .4byte gStringVar1
@@ -338,7 +338,7 @@ sub_80BFBA8: @ 80BFBA8
push {r4-r6,lr}
mov r6, r8
push {r6}
ldr r0, _080BFC08 @ =gUnknown_20370C0
ldr r0, _080BFC08 @ =gSpecialVar_0x8004
mov r8, r0
ldrh r0, [r0]
movs r6, 0x64
@@ -359,7 +359,7 @@ sub_80BFBA8: @ 80BFBA8
cmp r4, 0x2
bhi _080BFBFC
_080BFBDA:
ldr r0, _080BFC08 @ =gUnknown_20370C0
ldr r0, _080BFC08 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -382,7 +382,7 @@ _080BFBFC:
pop {r0}
bx r0
.align 2, 0
_080BFC08: .4byte gUnknown_20370C0
_080BFC08: .4byte gSpecialVar_0x8004
_080BFC0C: .4byte gPlayerParty
_080BFC10: .4byte gSpecialVar_0x8005
thumb_func_end sub_80BFBA8
@@ -390,7 +390,7 @@ _080BFC10: .4byte gSpecialVar_0x8005
thumb_func_start sub_80BFC14
sub_80BFC14: @ 80BFC14
push {lr}
ldr r0, _080BFC38 @ =gUnknown_20370C0
ldr r0, _080BFC38 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -401,22 +401,22 @@ sub_80BFC14: @ 80BFC14
adds r1, r0, 0
cmp r1, 0
beq _080BFC44
ldr r1, _080BFC40 @ =gUnknown_20370D0
ldr r1, _080BFC40 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _080BFC48
.align 2, 0
_080BFC38: .4byte gUnknown_20370C0
_080BFC38: .4byte gSpecialVar_0x8004
_080BFC3C: .4byte gPlayerParty
_080BFC40: .4byte gUnknown_20370D0
_080BFC40: .4byte gSpecialVar_Result
_080BFC44:
ldr r0, _080BFC4C @ =gUnknown_20370D0
ldr r0, _080BFC4C @ =gSpecialVar_Result
strh r1, [r0]
_080BFC48:
pop {r0}
bx r0
.align 2, 0
_080BFC4C: .4byte gUnknown_20370D0
_080BFC4C: .4byte gSpecialVar_Result
thumb_func_end sub_80BFC14
.align 2, 0 @ Don't pad with nop.
asm/seagallop.s
+6 -6
View File
@@ -338,7 +338,7 @@ _0814713C: .4byte gPaletteFade
sub_8147140: @ 8147140
push {r4,lr}
sub sp, 0x4
ldr r1, _081471AC @ =gUnknown_20370C4
ldr r1, _081471AC @ =gSpecialVar_0x8006
ldrh r0, [r1]
cmp r0, 0xA
bls _08147150
@@ -382,7 +382,7 @@ _08147150:
pop {r0}
bx r0
.align 2, 0
_081471AC: .4byte gUnknown_20370C4
_081471AC: .4byte gSpecialVar_0x8006
_081471B0: .4byte gUnknown_846AEFC
_081471B4: .4byte gUnknown_3005020
_081471B8: .4byte sub_807DF64
@@ -767,7 +767,7 @@ _081474C6:
thumb_func_start sub_81474CC
sub_81474CC: @ 81474CC
push {lr}
ldr r2, _081474EC @ =gUnknown_20370C0
ldr r2, _081474EC @ =gSpecialVar_0x8004
ldrh r0, [r2]
cmp r0, 0xA
bhi _081474F8
@@ -775,16 +775,16 @@ sub_81474CC: @ 81474CC
lsls r0, 1
adds r0, r1
ldrh r0, [r0]
ldr r1, _081474F4 @ =gUnknown_20370C4
ldr r1, _081474F4 @ =gSpecialVar_0x8006
ldrh r1, [r1]
asrs r0, r1
movs r1, 0x1
ands r0, r1
b _081474FA
.align 2, 0
_081474EC: .4byte gUnknown_20370C0
_081474EC: .4byte gSpecialVar_0x8004
_081474F0: .4byte gUnknown_846AF28
_081474F4: .4byte gUnknown_20370C4
_081474F4: .4byte gSpecialVar_0x8006
_081474F8:
movs r0, 0x1
_081474FA:
asm/shop.s
+2 -2
View File
@@ -3280,7 +3280,7 @@ sub_809C4A8: @ 809C4A8
adds r0, r1, 0x4
adds r1, 0x6
bl PlayerGetDestCoords
ldr r0, _0809C4E8 @ =gUnknown_20370C0
ldr r0, _0809C4E8 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
bne _0809C4EC
@@ -3290,7 +3290,7 @@ sub_809C4A8: @ 809C4A8
.align 2, 0
_0809C4E0: .4byte sub_809C500
_0809C4E4: .4byte gTasks
_0809C4E8: .4byte gUnknown_20370C0
_0809C4E8: .4byte gSpecialVar_0x8004
_0809C4EC:
ldrh r0, [r4, 0xC]
subs r0, 0x1
asm/start_menu.s
+4 -4
View File
@@ -1212,14 +1212,14 @@ task50_save_game: @ 806F6D4
_0806F6F0:
cmp r1, 0x3
bgt _0806F704
ldr r1, _0806F6FC @ =gUnknown_20370D0
ldr r1, _0806F6FC @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _0806F704
.align 2, 0
_0806F6FC: .4byte gUnknown_20370D0
_0806F6FC: .4byte gSpecialVar_Result
_0806F700:
ldr r0, _0806F718 @ =gUnknown_20370D0
ldr r0, _0806F718 @ =gSpecialVar_Result
strh r1, [r0]
_0806F704:
adds r0, r4, 0
@@ -1231,7 +1231,7 @@ _0806F712:
pop {r0}
bx r0
.align 2, 0
_0806F718: .4byte gUnknown_20370D0
_0806F718: .4byte gSpecialVar_Result
thumb_func_end task50_save_game
thumb_func_start sub_806F71C
asm/teachy_tv.s
+2 -2
View File
@@ -2154,7 +2154,7 @@ sub_815BC90: @ 815BC90
ldr r1, _0815BCCC @ =gTasks+0x8
adds r5, r0, r1
bl sub_815B220
ldr r1, _0815BCD0 @ =gUnknown_20370C0
ldr r1, _0815BCD0 @ =gSpecialVar_0x8004
ldr r4, _0815BCD4 @ =gUnknown_203F444
ldrb r0, [r4, 0x5]
strh r0, [r1]
@@ -2172,7 +2172,7 @@ sub_815BC90: @ 815BC90
b _0815BCE2
.align 2, 0
_0815BCCC: .4byte gTasks+0x8
_0815BCD0: .4byte gUnknown_20370C0
_0815BCD0: .4byte gSpecialVar_0x8004
_0815BCD4: .4byte gUnknown_203F444
_0815BCD8: .4byte gMain
_0815BCDC: .4byte sub_815BD58
asm/tm_case.s
+16 -16
View File
@@ -1400,7 +1400,7 @@ sub_81322D4: @ 81322D4
bne _08132354
movs r0, 0x5
bl PlaySE
ldr r0, _08132350 @ =gUnknown_203AD30
ldr r0, _08132350 @ =gSpecialVar_ItemId
mov r1, r8
strh r1, [r0]
b _08132370
@@ -1409,7 +1409,7 @@ _08132340: .4byte gTasks+0x8
_08132344: .4byte gPaletteFade
_08132348: .4byte gUnknown_203B116
_0813234C: .4byte gMain
_08132350: .4byte gUnknown_203AD30
_08132350: .4byte gSpecialVar_ItemId
_08132354:
movs r0, 0x2
negs r0, r0
@@ -1422,7 +1422,7 @@ _08132354:
_08132364:
movs r0, 0x5
bl PlaySE
ldr r1, _08132378 @ =gUnknown_203AD30
ldr r1, _08132378 @ =gSpecialVar_ItemId
movs r0, 0
strh r0, [r1]
_08132370:
@@ -1430,7 +1430,7 @@ _08132370:
bl sub_8132230
b _081323C8
.align 2, 0
_08132378: .4byte gUnknown_203AD30
_08132378: .4byte gSpecialVar_ItemId
_0813237C:
movs r0, 0x5
bl PlaySE
@@ -1450,7 +1450,7 @@ _0813237C:
movs r0, 0x4
adds r1, r4, 0
bl sub_809A798
ldr r1, _081323D4 @ =gUnknown_203AD30
ldr r1, _081323D4 @ =gSpecialVar_ItemId
strh r0, [r1]
ldr r0, _081323D8 @ =gTasks
lsls r1, r7, 2
@@ -1471,7 +1471,7 @@ _081323C8:
pop {r0}
bx r0
.align 2, 0
_081323D4: .4byte gUnknown_203AD30
_081323D4: .4byte gSpecialVar_ItemId
_081323D8: .4byte gTasks
_081323DC: .4byte gUnknown_8463140
_081323E0: .4byte gUnknown_203B10C
@@ -1591,7 +1591,7 @@ _08132468:
lsls r0, 1
bl Alloc
adds r4, r0, 0
ldr r6, _08132558 @ =gUnknown_203AD30
ldr r6, _08132558 @ =gSpecialVar_ItemId
ldrh r1, [r6]
bl sub_8131D48
ldr r1, _0813255C @ =gUnknown_8416301
@@ -1643,7 +1643,7 @@ _08132528:
_0813254C: .4byte gUnknown_203B118
_08132550: .4byte gUnknown_846316B
_08132554: .4byte gUnknown_8463150
_08132558: .4byte gUnknown_203AD30
_08132558: .4byte gSpecialVar_ItemId
_0813255C: .4byte gUnknown_8416301
_08132560: .4byte gTasks
_08132564: .4byte sub_8132568
@@ -1852,7 +1852,7 @@ sub_8132714: @ 8132714
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _08132744 @ =gUnknown_203AD30
ldr r0, _08132744 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _08132748 @ =gStringVar1
bl sub_8099E90
@@ -1869,7 +1869,7 @@ sub_8132714: @ 8132714
pop {r0}
bx r0
.align 2, 0
_08132744: .4byte gUnknown_203AD30
_08132744: .4byte gSpecialVar_ItemId
_08132748: .4byte gStringVar1
_0813274C: .4byte gStringVar4
_08132750: .4byte gUnknown_841635E
@@ -2085,7 +2085,7 @@ sub_8132908: @ 8132908
lsls r0, 3
ldr r1, _08132950 @ =gTasks+0x8
adds r4, r0, r1
ldr r6, _08132954 @ =gUnknown_203AD30
ldr r6, _08132954 @ =gSpecialVar_ItemId
ldrh r0, [r6]
bl itemid_get_market_price
lsls r0, 16
@@ -2109,7 +2109,7 @@ sub_8132908: @ 8132908
b _081329AE
.align 2, 0
_08132950: .4byte gTasks+0x8
_08132954: .4byte gUnknown_203AD30
_08132954: .4byte gSpecialVar_ItemId
_08132958: .4byte gStringVar1
_0813295C: .4byte gStringVar4
_08132960: .4byte gUnknown_84168F1
@@ -2503,7 +2503,7 @@ sub_8132CAC: @ 8132CAC
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, _08132D1C @ =gUnknown_203AD30
ldr r0, _08132D1C @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _08132D20 @ =gStringVar1
bl sub_8099E90
@@ -2537,7 +2537,7 @@ sub_8132CAC: @ 8132CAC
bx r0
.align 2, 0
_08132D18: .4byte gTasks+0x8
_08132D1C: .4byte gUnknown_203AD30
_08132D1C: .4byte gSpecialVar_ItemId
_08132D20: .4byte gStringVar1
_08132D24: .4byte gStringVar3
_08132D28: .4byte gStringVar4
@@ -2564,7 +2564,7 @@ sub_8132D34: @ 8132D34
mov r8, r1
movs r0, 0xF8
bl PlaySE
ldr r5, _08132DF8 @ =gUnknown_203AD30
ldr r5, _08132DF8 @ =gSpecialVar_ItemId
ldrh r0, [r5]
mov r2, r8
ldrh r1, [r2, 0x10]
@@ -2632,7 +2632,7 @@ sub_8132D34: @ 8132D34
bx r0
.align 2, 0
_08132DF4: .4byte gTasks+0x8
_08132DF8: .4byte gUnknown_203AD30
_08132DF8: .4byte gSpecialVar_ItemId
_08132DFC: .4byte gSaveBlock1Ptr
_08132E00: .4byte gUnknown_203B116
_08132E04: .4byte gUnknown_3005E70
asm/trade.s
+8 -8
View File
@@ -8912,7 +8912,7 @@ _08050EA8: .4byte gStringVar3
_08050EAC: .4byte gPlayerParty
_08050EB0: .4byte gStringVar2
_08050EB4:
ldr r0, _08050EF8 @ =gUnknown_20370C0
ldr r0, _08050EF8 @ =gSpecialVar_0x8004
ldrh r0, [r0]
lsls r4, r0, 4
subs r4, r0
@@ -8944,7 +8944,7 @@ _08050EF0:
pop {r0}
bx r0
.align 2, 0
_08050EF8: .4byte gUnknown_20370C0
_08050EF8: .4byte gSpecialVar_0x8004
_08050EFC: .4byte gUnknown_826CF8C
_08050F00: .4byte gStringVar1
_08050F04: .4byte gStringVar3
@@ -13782,7 +13782,7 @@ _08053A98: .4byte SpriteCallbackDummy
thumb_func_start sub_8053A9C
sub_8053A9C: @ 8053A9C
push {r4-r6,lr}
ldr r0, _08053AD0 @ =gUnknown_20370C0
ldr r0, _08053AD0 @ =gSpecialVar_0x8004
ldrh r0, [r0]
lsls r4, r0, 4
subs r4, r0
@@ -13806,7 +13806,7 @@ sub_8053A9C: @ 8053A9C
pop {r1}
bx r1
.align 2, 0
_08053AD0: .4byte gUnknown_20370C0
_08053AD0: .4byte gSpecialVar_0x8004
_08053AD4: .4byte gUnknown_826CF8C
_08053AD8: .4byte gStringVar1
_08053ADC: .4byte gSpeciesNames
@@ -13817,7 +13817,7 @@ _08053AE0: .4byte gStringVar2
sub_8053AE4: @ 8053AE4
push {r4,lr}
sub sp, 0x20
ldr r0, _08053B2C @ =gUnknown_20370C0
ldr r0, _08053B2C @ =gSpecialVar_0x8004
ldrh r0, [r0]
lsls r4, r0, 4
subs r4, r0
@@ -13848,7 +13848,7 @@ sub_8053AE4: @ 8053AE4
pop {r0}
bx r0
.align 2, 0
_08053B2C: .4byte gUnknown_20370C0
_08053B2C: .4byte gSpecialVar_0x8004
_08053B30: .4byte gUnknown_826CF8C
_08053B34: .4byte gSpecialVar_0x8005
_08053B38: .4byte gPlayerParty
@@ -14115,14 +14115,14 @@ sub_8053D68: @ 8053D68
push {lr}
ldr r0, _08053D7C @ =gSpecialVar_0x8005
ldrb r0, [r0]
ldr r1, _08053D80 @ =gUnknown_20370C0
ldr r1, _08053D80 @ =gSpecialVar_0x8004
ldrb r1, [r1]
bl sub_8053B48
pop {r0}
bx r0
.align 2, 0
_08053D7C: .4byte gSpecialVar_0x8005
_08053D80: .4byte gUnknown_20370C0
_08053D80: .4byte gSpecialVar_0x8004
thumb_func_end sub_8053D68
thumb_func_start sub_8053D84
asm/trainer_tower.s
+46 -46
View File
@@ -303,7 +303,7 @@ sub_815D9E8: @ 815D9E8
push {lr}
bl sub_815DC8C
ldr r1, _0815DA08 @ =gUnknown_847A230
ldr r0, _0815DA0C @ =gUnknown_20370C0
ldr r0, _0815DA0C @ =gSpecialVar_0x8004
ldrh r0, [r0]
lsls r0, 2
adds r0, r1
@@ -314,7 +314,7 @@ sub_815D9E8: @ 815D9E8
bx r0
.align 2, 0
_0815DA08: .4byte gUnknown_847A230
_0815DA0C: .4byte gUnknown_20370C0
_0815DA0C: .4byte gSpecialVar_0x8004
thumb_func_end sub_815D9E8
thumb_func_start sub_815DA10
@@ -741,7 +741,7 @@ sub_815DD44: @ 815DD44
ldrb r1, [r4, 0x4]
cmp r0, r1
ble _0815DD78
ldr r0, _0815DD74 @ =gUnknown_20370D0
ldr r0, _0815DD74 @ =gSpecialVar_Result
movs r1, 0x3
strh r1, [r0]
movs r0, 0x99
@@ -752,9 +752,9 @@ sub_815DD44: @ 815DD44
_0815DD68: .4byte gMapHeader
_0815DD6C: .4byte 0xfffffed7
_0815DD70: .4byte gUnknown_203F458
_0815DD74: .4byte gUnknown_20370D0
_0815DD74: .4byte gSpecialVar_Result
_0815DD78:
ldr r3, _0815DDA8 @ =gUnknown_20370D0
ldr r3, _0815DDA8 @ =gSpecialVar_Result
ldrb r1, [r4]
lsls r0, r1, 5
subs r0, r1
@@ -778,7 +778,7 @@ _0815DDA2:
pop {r0}
bx r0
.align 2, 0
_0815DDA8: .4byte gUnknown_20370D0
_0815DDA8: .4byte gSpecialVar_Result
_0815DDAC: .4byte gUnknown_847A284
thumb_func_end sub_815DD44
@@ -1015,7 +1015,7 @@ _0815DF4E:
thumb_func_start sub_815DF54
sub_815DF54: @ 815DF54
push {r4,r5,lr}
ldr r0, _0815DF90 @ =gUnknown_20370C4
ldr r0, _0815DF90 @ =gSpecialVar_0x8006
ldrh r4, [r0]
ldr r2, _0815DF94 @ =gUnknown_203F458
ldr r3, [r2]
@@ -1046,7 +1046,7 @@ _0815DF7C:
beq _0815DFA6
b _0815E05C
.align 2, 0
_0815DF90: .4byte gUnknown_20370C4
_0815DF90: .4byte gSpecialVar_0x8006
_0815DF94: .4byte gUnknown_203F458
_0815DF98: .4byte gSpecialVar_0x8005
_0815DF9C:
@@ -1335,7 +1335,7 @@ sub_815E1C0: @ 815E1C0
ldrh r0, [r0]
cmp r0, 0
bne _0815E1DE
ldr r3, _0815E1E8 @ =gUnknown_20370D0
ldr r3, _0815E1E8 @ =gSpecialVar_Result
ldr r0, _0815E1EC @ =gUnknown_203F458
ldr r1, [r0]
ldrb r2, [r1]
@@ -1350,7 +1350,7 @@ _0815E1DE:
bx r0
.align 2, 0
_0815E1E4: .4byte gSpecialVar_0x8005
_0815E1E8: .4byte gUnknown_20370D0
_0815E1E8: .4byte gSpecialVar_Result
_0815E1EC: .4byte gUnknown_203F458
thumb_func_end sub_815E1C0
@@ -1412,7 +1412,7 @@ sub_815E218: @ 815E218
ldrb r1, [r1, 0xD]
cmp r3, r1
bgt _0815E27C
ldr r1, _0815E278 @ =gUnknown_20370D0
ldr r1, _0815E278 @ =gSpecialVar_Result
movs r0, 0
b _0815E280
.align 2, 0
@@ -1422,16 +1422,16 @@ _0815E268: .4byte gSaveBlock1Ptr
_0815E26C: .4byte 0x00003d34
_0815E270: .4byte 0xfffffed7
_0815E274: .4byte gUnknown_203F458
_0815E278: .4byte gUnknown_20370D0
_0815E278: .4byte gSpecialVar_Result
_0815E27C:
ldr r1, _0815E288 @ =gUnknown_20370D0
ldr r1, _0815E288 @ =gSpecialVar_Result
movs r0, 0x1
_0815E280:
strh r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0815E288: .4byte gUnknown_20370D0
_0815E288: .4byte gSpecialVar_Result
thumb_func_end sub_815E218
thumb_func_start sub_815E28C
@@ -1566,7 +1566,7 @@ _0815E390: .4byte 0x00003d38
sub_815E394: @ 815E394
push {lr}
bl DisableVBlankCounter1
ldr r3, _0815E3F8 @ =gUnknown_20370D0
ldr r3, _0815E3F8 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r3]
ldr r0, _0815E3FC @ =gSaveBlock1Ptr
@@ -1616,7 +1616,7 @@ _0815E3D6:
pop {r0}
bx r0
.align 2, 0
_0815E3F8: .4byte gUnknown_20370D0
_0815E3F8: .4byte gSpecialVar_Result
_0815E3FC: .4byte gSaveBlock1Ptr
_0815E400: .4byte 0x00003d34
_0815E404: .4byte 0x00003d42
@@ -1651,7 +1651,7 @@ sub_815E408: @ 815E408
lsrs r5, r0, 31
cmp r5, 0
beq _0815E45C
ldr r1, _0815E458 @ =gUnknown_20370D0
ldr r1, _0815E458 @ =gSpecialVar_Result
movs r0, 0x2
b _0815E4A0
.align 2, 0
@@ -1660,7 +1660,7 @@ _0815E448: .4byte gUnknown_203F458
_0815E44C: .4byte gSaveBlock1Ptr
_0815E450: .4byte 0x00003d34
_0815E454: .4byte 0x00003d42
_0815E458: .4byte gUnknown_20370D0
_0815E458: .4byte gSpecialVar_Result
_0815E45C:
adds r0, r4, 0
movs r1, 0x1
@@ -1685,14 +1685,14 @@ _0815E45C:
movs r2, 0x1
orrs r0, r2
strb r0, [r1]
ldr r0, _0815E498 @ =gUnknown_20370D0
ldr r0, _0815E498 @ =gSpecialVar_Result
strh r5, [r0]
b _0815E4A2
.align 2, 0
_0815E494: .4byte gStringVar2
_0815E498: .4byte gUnknown_20370D0
_0815E498: .4byte gSpecialVar_Result
_0815E49C:
ldr r1, _0815E4AC @ =gUnknown_20370D0
ldr r1, _0815E4AC @ =gSpecialVar_Result
movs r0, 0x1
_0815E4A0:
strh r0, [r1]
@@ -1703,7 +1703,7 @@ _0815E4A2:
pop {r0}
bx r0
.align 2, 0
_0815E4AC: .4byte gUnknown_20370D0
_0815E4AC: .4byte gSpecialVar_Result
thumb_func_end sub_815E408
thumb_func_start sub_815E4B0
@@ -1725,14 +1725,14 @@ sub_815E4B0: @ 815E4B0
lsrs r5, r0, 31
cmp r5, 0
beq _0815E4E8
ldr r1, _0815E4E4 @ =gUnknown_20370D0
ldr r1, _0815E4E4 @ =gSpecialVar_Result
movs r0, 0x2
b _0815E534
.align 2, 0
_0815E4D8: .4byte gSaveBlock1Ptr
_0815E4DC: .4byte 0x00003d34
_0815E4E0: .4byte 0x00003d42
_0815E4E4: .4byte gUnknown_20370D0
_0815E4E4: .4byte gSpecialVar_Result
_0815E4E8:
ldr r4, _0815E520 @ =0x00003d38
adds r0, r1, r4
@@ -1756,16 +1756,16 @@ _0815E4E8:
adds r0, r3
adds r1, r4, 0
bl sub_815EDF4
ldr r0, _0815E52C @ =gUnknown_20370D0
ldr r0, _0815E52C @ =gSpecialVar_Result
strh r5, [r0]
b _0815E536
.align 2, 0
_0815E520: .4byte 0x00003d38
_0815E524: .4byte 0x00003d34
_0815E528: .4byte 0x00003d3c
_0815E52C: .4byte gUnknown_20370D0
_0815E52C: .4byte gSpecialVar_Result
_0815E530:
ldr r1, _0815E55C @ =gUnknown_20370D0
ldr r1, _0815E55C @ =gSpecialVar_Result
movs r0, 0x1
_0815E534:
strh r0, [r1]
@@ -1789,7 +1789,7 @@ _0815E536:
pop {r0}
bx r0
.align 2, 0
_0815E55C: .4byte gUnknown_20370D0
_0815E55C: .4byte gSpecialVar_Result
_0815E560: .4byte gSaveBlock1Ptr
_0815E564: .4byte 0x00003d34
_0815E568: .4byte 0x00003d42
@@ -1887,14 +1887,14 @@ sub_815E5F0: @ 815E5F0
negs r0, r0
ands r0, r1
strb r0, [r2]
ldr r1, _0815E62C @ =gUnknown_20370D0
ldr r1, _0815E62C @ =gSpecialVar_Result
movs r0, 0
b _0815E64C
.align 2, 0
_0815E620: .4byte gSaveBlock1Ptr
_0815E624: .4byte 0x00003d34
_0815E628: .4byte 0x00003d42
_0815E62C: .4byte gUnknown_20370D0
_0815E62C: .4byte gSpecialVar_Result
_0815E630:
lsls r0, r1, 27
cmp r0, 0
@@ -1903,20 +1903,20 @@ _0815E630:
negs r0, r0
ands r0, r1
strb r0, [r2]
ldr r1, _0815E644 @ =gUnknown_20370D0
ldr r1, _0815E644 @ =gSpecialVar_Result
movs r0, 0x1
b _0815E64C
.align 2, 0
_0815E644: .4byte gUnknown_20370D0
_0815E644: .4byte gSpecialVar_Result
_0815E648:
ldr r1, _0815E654 @ =gUnknown_20370D0
ldr r1, _0815E654 @ =gSpecialVar_Result
movs r0, 0x2
_0815E64C:
strh r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0815E654: .4byte gUnknown_20370D0
_0815E654: .4byte gSpecialVar_Result
thumb_func_end sub_815E5F0
thumb_func_start sub_815E658
@@ -2187,7 +2187,7 @@ _0815E8B0: .4byte 0x00004001
thumb_func_start sub_815E8B4
sub_815E8B4: @ 815E8B4
push {r4,lr}
ldr r4, _0815E8C8 @ =gUnknown_20370D0
ldr r4, _0815E8C8 @ =gSpecialVar_Result
bl GetMonsStateToDoubles
lsls r0, 24
lsrs r0, 24
@@ -2196,7 +2196,7 @@ sub_815E8B4: @ 815E8B4
pop {r0}
bx r0
.align 2, 0
_0815E8C8: .4byte gUnknown_20370D0
_0815E8C8: .4byte gSpecialVar_Result
thumb_func_end sub_815E8B4
thumb_func_start sub_815E8CC
@@ -2213,22 +2213,22 @@ sub_815E8CC: @ 815E8CC
movs r2, 0
movs r3, 0x1
bl ConvertIntToDecimalStringN
ldr r1, _0815E8F4 @ =gUnknown_20370D0
ldr r1, _0815E8F4 @ =gSpecialVar_Result
movs r0, 0x1
b _0815E8FC
.align 2, 0
_0815E8EC: .4byte gUnknown_203F458
_0815E8F0: .4byte gStringVar1
_0815E8F4: .4byte gUnknown_20370D0
_0815E8F4: .4byte gSpecialVar_Result
_0815E8F8:
ldr r1, _0815E904 @ =gUnknown_20370D0
ldr r1, _0815E904 @ =gSpecialVar_Result
movs r0, 0
_0815E8FC:
strh r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0815E904: .4byte gUnknown_20370D0
_0815E904: .4byte gSpecialVar_Result
thumb_func_end sub_815E8CC
thumb_func_start sub_815E908
@@ -2245,23 +2245,23 @@ sub_815E908: @ 815E908
lsrs r1, r0, 16
cmp r1, 0
bne _0815E938
ldr r0, _0815E934 @ =gUnknown_20370D0
ldr r0, _0815E934 @ =gSpecialVar_Result
strh r1, [r0]
b _0815E93E
.align 2, 0
_0815E928: .4byte gMapHeader
_0815E92C: .4byte 0x00000129
_0815E930: .4byte 0x00004082
_0815E934: .4byte gUnknown_20370D0
_0815E934: .4byte gSpecialVar_Result
_0815E938:
ldr r1, _0815E944 @ =gUnknown_20370D0
ldr r1, _0815E944 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_0815E93E:
pop {r0}
bx r0
.align 2, 0
_0815E944: .4byte gUnknown_20370D0
_0815E944: .4byte gSpecialVar_Result
thumb_func_end sub_815E908
thumb_func_start sub_815E948
@@ -2332,7 +2332,7 @@ _0815E9C4: .4byte gUnknown_847A2D2
thumb_func_start sub_815E9C8
sub_815E9C8: @ 815E9C8
ldr r3, _0815E9EC @ =gUnknown_20370D0
ldr r3, _0815E9EC @ =gSpecialVar_Result
ldr r0, _0815E9F0 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, _0815E9F4 @ =0x00003d34
@@ -2350,7 +2350,7 @@ sub_815E9C8: @ 815E9C8
strh r0, [r3]
bx lr
.align 2, 0
_0815E9EC: .4byte gUnknown_20370D0
_0815E9EC: .4byte gSpecialVar_Result
_0815E9F0: .4byte gSaveBlock1Ptr
_0815E9F4: .4byte 0x00003d34
_0815E9F8: .4byte 0x00003d42
asm/unk_8147500.s
+4 -4
View File
@@ -8,9 +8,9 @@
thumb_func_start sub_8147500
sub_8147500: @ 8147500
push {lr}
ldr r0, _08147518 @ =gUnknown_20370C0
ldr r0, _08147518 @ =gSpecialVar_0x8004
ldrh r1, [r0]
ldr r0, _0814751C @ =gUnknown_20370C4
ldr r0, _0814751C @ =gSpecialVar_0x8006
ldrh r2, [r0]
cmp r1, 0x8
beq _08147512
@@ -20,8 +20,8 @@ _08147512:
movs r0, 0x1
b _0814758E
.align 2, 0
_08147518: .4byte gUnknown_20370C0
_0814751C: .4byte gUnknown_20370C4
_08147518: .4byte gSpecialVar_0x8004
_0814751C: .4byte gSpecialVar_0x8006
_08147520:
cmp r1, 0
beq _08147528
asm/unk_8147AA8.s
+4 -4
View File
@@ -4267,17 +4267,17 @@ _08149A1C:
bl sub_8149A00
cmp r0, 0
beq _08149A54
ldr r1, _08149A50 @ =gUnknown_20370D0
ldr r1, _08149A50 @ =gSpecialVar_Result
movs r0, 0x1
b _08149A5E
.align 2, 0
_08149A4C: .4byte gPlayerParty
_08149A50: .4byte gUnknown_20370D0
_08149A50: .4byte gSpecialVar_Result
_08149A54:
adds r5, 0x1
cmp r5, 0x5
ble _08149A1C
ldr r1, _08149A68 @ =gUnknown_20370D0
ldr r1, _08149A68 @ =gSpecialVar_Result
movs r0, 0
_08149A5E:
strh r0, [r1]
@@ -4285,7 +4285,7 @@ _08149A5E:
pop {r0}
bx r0
.align 2, 0
_08149A68: .4byte gUnknown_20370D0
_08149A68: .4byte gSpecialVar_Result
thumb_func_end sub_8149A18
thumb_func_start sub_8149A6C
asm/unk_814B6F0.s
+4 -4
View File
@@ -189,7 +189,7 @@ _0814B85C: .4byte sub_814BA98
sub_814B860: @ 814B860
push {r4,lr}
sub sp, 0xC
ldr r1, _0814B878 @ =gUnknown_203AD30
ldr r1, _0814B878 @ =gSpecialVar_ItemId
ldrh r0, [r1]
subs r0, 0x85
lsls r0, 16
@@ -200,7 +200,7 @@ sub_814B860: @ 814B860
strh r0, [r1]
b _0814B884
.align 2, 0
_0814B878: .4byte gUnknown_203AD30
_0814B878: .4byte gSpecialVar_ItemId
_0814B87C:
ldrh r0, [r1]
movs r1, 0x1
@@ -211,7 +211,7 @@ _0814B884:
ldrb r0, [r2, 0x8]
lsls r0, 5
adds r0, r2, r0
ldr r1, _0814B8E4 @ =gUnknown_203AD30
ldr r1, _0814B8E4 @ =gSpecialVar_ItemId
ldrh r1, [r1]
subs r1, 0x85
adds r0, 0xA4
@@ -250,7 +250,7 @@ _0814B884:
bx r0
.align 2, 0
_0814B8E0: .4byte gUnknown_203F3DC
_0814B8E4: .4byte gUnknown_203AD30
_0814B8E4: .4byte gSpecialVar_ItemId
_0814B8E8: .4byte sub_814BA98
_0814B8EC: .4byte sub_814BA80
thumb_func_end sub_814B860
asm/unk_81507FC.s
+4 -4
View File
@@ -6310,7 +6310,7 @@ _081537BC: .4byte gUnknown_203F3E0
sub_81537C0: @ 81537C0
push {r4-r6,lr}
movs r5, 0
ldr r6, _081537F0 @ =gUnknown_20370D0
ldr r6, _081537F0 @ =gSpecialVar_Result
_081537C6:
movs r0, 0x64
adds r1, r5, 0
@@ -6331,13 +6331,13 @@ _081537C6:
strh r0, [r6]
b _08153804
.align 2, 0
_081537F0: .4byte gUnknown_20370D0
_081537F0: .4byte gSpecialVar_Result
_081537F4: .4byte gPlayerParty
_081537F8:
adds r5, 0x1
cmp r5, 0x5
ble _081537C6
ldr r1, _0815380C @ =gUnknown_20370D0
ldr r1, _0815380C @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_08153804:
@@ -6345,7 +6345,7 @@ _08153804:
pop {r0}
bx r0
.align 2, 0
_0815380C: .4byte gUnknown_20370D0
_0815380C: .4byte gSpecialVar_Result
thumb_func_end sub_81537C0
thumb_func_start sub_8153810
asm/unk_8159F40.s
+2 -2
View File
@@ -23,7 +23,7 @@ sub_8159F40: @ 8159F40
bl ZeroPlayerPartyMons
bl ZeroEnemyPartyMons
ldr r1, _08159F94 @ =gUnknown_84792D0
ldr r0, _08159F98 @ =gUnknown_20370C0
ldr r0, _08159F98 @ =gSpecialVar_0x8004
ldrh r0, [r0]
lsls r0, 2
adds r0, r1
@@ -49,7 +49,7 @@ _08159F72:
.align 2, 0
_08159F90: .4byte gBattleTypeFlags
_08159F94: .4byte gUnknown_84792D0
_08159F98: .4byte gUnknown_20370C0
_08159F98: .4byte gSpecialVar_0x8004
_08159F9C: .4byte gPlayerParty
_08159FA0:
movs r0, 0x64
asm/unk_815EDDC.s
+4 -4
View File
@@ -138,7 +138,7 @@ sub_815EEB0: @ 815EEB0
ldr r1, _0815EED0 @ =0x00000af8
adds r0, r1
bl sub_815EE3C
ldr r1, _0815EED4 @ =gUnknown_20370C0
ldr r1, _0815EED4 @ =gSpecialVar_0x8004
ldrh r1, [r1]
cmp r0, r1
bcc _0815EED8
@@ -147,7 +147,7 @@ sub_815EEB0: @ 815EEB0
.align 2, 0
_0815EECC: .4byte gSaveBlock2Ptr
_0815EED0: .4byte 0x00000af8
_0815EED4: .4byte gUnknown_20370C0
_0815EED4: .4byte gSpecialVar_0x8004
_0815EED8:
movs r0, 0
_0815EEDA:
@@ -227,7 +227,7 @@ sub_815EF5C: @ 815EF5C
ldr r0, [r0]
ldr r1, _0815EF90 @ =0x00000af8
adds r4, r0, r1
ldr r5, _0815EF94 @ =gUnknown_20370C0
ldr r5, _0815EF94 @ =gSpecialVar_0x8004
ldrh r0, [r5]
bl sub_815EE88
lsls r0, 24
@@ -245,7 +245,7 @@ sub_815EF5C: @ 815EF5C
.align 2, 0
_0815EF8C: .4byte gSaveBlock2Ptr
_0815EF90: .4byte 0x00000af8
_0815EF94: .4byte gUnknown_20370C0
_0815EF94: .4byte gSpecialVar_0x8004
_0815EF98:
movs r0, 0
_0815EF9A:
asm/wild_encounter.s
+4 -4
View File
@@ -1001,15 +1001,15 @@ sub_8082E54: @ 8082E54
bne _08082EB0
bl sub_807F704
_08082E9C:
ldr r0, _08082EAC @ =gUnknown_20370D0
ldr r0, _08082EAC @ =gSpecialVar_Result
strh r4, [r0]
b _08082EB6
.align 2, 0
_08082EA4: .4byte 0x0000ffff
_08082EA8: .4byte gUnknown_83C9CB8
_08082EAC: .4byte gUnknown_20370D0
_08082EAC: .4byte gSpecialVar_Result
_08082EB0:
ldr r1, _08082EBC @ =gUnknown_20370D0
ldr r1, _08082EBC @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_08082EB6:
@@ -1017,7 +1017,7 @@ _08082EB6:
pop {r0}
bx r0
.align 2, 0
_08082EBC: .4byte gUnknown_20370D0
_08082EBC: .4byte gSpecialVar_Result
thumb_func_end sub_8082E54
thumb_func_start sub_8082EC0
data/event_scripts.s
+15 -15
View File
@@ -4,22 +4,22 @@
.align 2
gSpecialVars:: @ 815FD0C
.4byte gUnknown_20370B8
.4byte gUnknown_20370BA
.4byte gUnknown_20370BC
.4byte gUnknown_20370BE
.4byte gUnknown_20370C0
.4byte gSpecialVar_0x8000
.4byte gSpecialVar_0x8001
.4byte gSpecialVar_0x8002
.4byte gSpecialVar_0x8003
.4byte gSpecialVar_0x8004
.4byte gSpecialVar_0x8005
.4byte gUnknown_20370C4
.4byte gUnknown_20370C6
.4byte gUnknown_20370C8
.4byte gUnknown_20370CA
.4byte gUnknown_20370CC
.4byte gUnknown_20370CE
.4byte gUnknown_20370D4
.4byte gUnknown_20370D0
.4byte gUnknown_203AD30
.4byte gUnknown_20370D2
.4byte gSpecialVar_0x8006
.4byte gSpecialVar_0x8007
.4byte gSpecialVar_0x8008
.4byte gSpecialVar_0x8009
.4byte gSpecialVar_0x800A
.4byte gSpecialVar_0x800B
.4byte gSpecialVar_Facing
.4byte gSpecialVar_Result
.4byte gSpecialVar_ItemId
.4byte gSpecialVar_LastTalked
.4byte gSpecialVar_MonBoxId
.4byte gSpecialVar_MonBoxPos
.4byte gUnknown_20370DA
include/event_data.h
+2 -2
View File
@@ -56,7 +56,7 @@ extern u16 gSpecialVar_MonBoxId;
extern u16 gSpecialVar_MonBoxPos;
extern u16 gSpecialVar_0x8014;
extern u16 gUnknown_20370D0;
extern u16 gUnknown_20370C0;
extern u16 gSpecialVar_Result;
extern u16 gSpecialVar_0x8004;
#endif // GUARD_EVENT_DATA_H
include/item_menu.h
+1 -1
View File
@@ -7,7 +7,7 @@
// Exported RAM declarations
extern u16 gUnknown_203AD30;
extern u16 gSpecialVar_ItemId;
// Exported ROM declarations
void sub_81AAC50(void);
src/fame_checker.c
+5 -5
View File
@@ -1038,9 +1038,9 @@ static void FCSetup_ResetBGCoords(void)
void SetFlavorTextFlagFromSpecialVars(void)
{
if (gUnknown_20370C0 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 6)
if (gSpecialVar_0x8004 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 6)
{
gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].flavorTextFlags |= (1 << gSpecialVar_0x8005);
gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].flavorTextFlags |= (1 << gSpecialVar_0x8005);
gSpecialVar_0x8005 = FCPICKSTATE_SILHOUETTE;
UpdatePickStateFromSpecialVar8005();
}
@@ -1048,15 +1048,15 @@ void SetFlavorTextFlagFromSpecialVars(void)
void UpdatePickStateFromSpecialVar8005(void)
{
if (gUnknown_20370C0 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 3)
if (gSpecialVar_0x8004 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 3)
{
if (gSpecialVar_0x8005 == FCPICKSTATE_NO_DRAW)
return;
if ( gSpecialVar_0x8005 == FCPICKSTATE_SILHOUETTE
&& gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].pickState == FCPICKSTATE_COLORED
&& gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].pickState == FCPICKSTATE_COLORED
)
return;
gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].pickState = gSpecialVar_0x8005;
gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].pickState = gSpecialVar_0x8005;
}
}
src/menews_jisan.c
+1 -1
View File
@@ -107,7 +107,7 @@ void sub_8146CA4(void)
u16 sub_8146CE8(void)
{
u16 *r6 = &gUnknown_20370D0;
u16 *r6 = &gSpecialVar_Result;
struct MysteryEventStruct *r4 = sub_8143D94();
u16 r5;
src/quest_log.c
+4 -4
View File
@@ -523,7 +523,7 @@ void sub_8110A3C(void)
void sub_8110AB4(void)
{
gUnknown_20370D0 = gUnknown_203ADFA;
gSpecialVar_Result = gUnknown_203ADFA;
}
u8 sub_8110AC8(void)
@@ -2654,7 +2654,7 @@ bool16 sub_8113364(void)
bool16 sub_811337C(struct Var4038Struct * a0)
{
return (a0->unk_1 >> gUnknown_20370C0) & 1;
return (a0->unk_1 >> gSpecialVar_0x8004) & 1;
}
void sub_8113390(struct Var4038Struct * a0)
@@ -2669,7 +2669,7 @@ void sub_81133A4(void)
u8 r3 = 0;
u8 r2 = 0;
switch (gUnknown_20370C0)
switch (gSpecialVar_0x8004)
{
case 0:
r2 = 0;
@@ -2770,7 +2770,7 @@ void sub_8113524(struct Var4038Struct * a0)
u8 sub_8113530(void)
{
return sub_8113114(VAR_0x4038_STRUCT, gUnknown_20370C0);
return sub_8113114(VAR_0x4038_STRUCT, gSpecialVar_0x8004);
}
static u16 * (*const sQuestLogStorageCBs[])(u16 *, const u16 *) = {
src/vs_seeker.c
+5 -5
View File
@@ -63,7 +63,7 @@ struct VsSeekerStruct
u8 responseCode:5;
};
extern u16 gUnknown_20370D2;
extern u16 gSpecialVar_LastTalked;
extern struct MapObject gMapObjects[MAP_OBJECTS_COUNT];
extern u8 gUnknown_3005074;
@@ -588,7 +588,7 @@ void Task_VsSeeker_0(u8 taskId)
}
else if (respval == 2)
{
sub_80A2294(4, 0, gUnknown_203AD30, 0xffff);
sub_80A2294(4, 0, gSpecialVar_ItemId, 0xffff);
FieldEffectStart(FLDEFF_UNK_41); // TODO: name this enum
gTasks[taskId].func = Task_VsSeeker_1;
gTasks[taskId].data[0] = 15;
@@ -1078,7 +1078,7 @@ static bool8 sub_810CD80(const VsSeekerData *vsSeekerData, u16 trainerBattleOppo
return FALSE;
if (rematchIdx >= 0 && rematchIdx < ARRAY_COUNT(sVsSeekerData))
{
if (IsThisTrainerRematchable(gUnknown_20370D2))
if (IsThisTrainerRematchable(gSpecialVar_LastTalked))
return TRUE;
}
return FALSE;
@@ -1097,7 +1097,7 @@ static bool8 HasRematchTrainerAlreadyBeenFought(const VsSeekerData *vsSeekerData
void sub_810CDE8(void)
{
gSaveBlock1Ptr->trainerRematches[gUnknown_20370D2] = 0;
gSaveBlock1Ptr->trainerRematches[gSpecialVar_LastTalked] = 0;
sub_80803FC();
}
@@ -1148,7 +1148,7 @@ static bool8 sub_810CED0(const VsSeekerData * a0, u16 a1)
return FALSE;
if ((u32)r1 >= ARRAY_COUNT(sVsSeekerData))
return FALSE;
if (!IsThisTrainerRematchable(gUnknown_20370D2))
if (!IsThisTrainerRematchable(gSpecialVar_LastTalked))
return FALSE;
return TRUE;
}
sym_ewram.txt
+15 -15
View File
@@ -656,49 +656,49 @@ gUnknown_20370B4: @ 20370B4
gUnknown_20370B6: @ 20370B6
.space 0x2
gUnknown_20370B8: @ 20370B8
gSpecialVar_0x8000: @ 20370B8
.space 0x2
gUnknown_20370BA: @ 20370BA
gSpecialVar_0x8001: @ 20370BA
.space 0x2
gUnknown_20370BC: @ 20370BC
gSpecialVar_0x8002: @ 20370BC
.space 0x2
gUnknown_20370BE: @ 20370BE
gSpecialVar_0x8003: @ 20370BE
.space 0x2
gUnknown_20370C0: @ 20370C0
gSpecialVar_0x8004: @ 20370C0
.space 0x2
gSpecialVar_0x8005: @ 20370C2
.space 0x2
gUnknown_20370C4: @ 20370C4
gSpecialVar_0x8006: @ 20370C4
.space 0x2
gUnknown_20370C6: @ 20370C6
gSpecialVar_0x8007: @ 20370C6
.space 0x2
gUnknown_20370C8: @ 20370C8
gSpecialVar_0x8008: @ 20370C8
.space 0x2
gUnknown_20370CA: @ 20370CA
gSpecialVar_0x8009: @ 20370CA
.space 0x2
gUnknown_20370CC: @ 20370CC
gSpecialVar_0x800A: @ 20370CC
.space 0x2
gUnknown_20370CE: @ 20370CE
gSpecialVar_0x800B: @ 20370CE
.space 0x2
gUnknown_20370D0: @ 20370D0
gSpecialVar_Result: @ 20370D0
.space 0x2
gUnknown_20370D2: @ 20370D2
gSpecialVar_LastTalked: @ 20370D2
.space 0x2
gUnknown_20370D4: @ 20370D4
gSpecialVar_Facing: @ 20370D4
.space 0x2
gSpecialVar_MonBoxId: @ 20370D6
@@ -1397,7 +1397,7 @@ gUnknown_203AD28: @ 203AD28
gUnknown_203AD2C: @ 203AD2C
.space 0x4
gUnknown_203AD30: @ 203AD30
gSpecialVar_ItemId: @ 203AD30
.space 0x4
gUnknown_203AD34: @ 203AD34