summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_anim_807B69C.s4
-rw-r--r--asm/battle_records.s16
-rw-r--r--asm/berry_blender.s4
-rw-r--r--asm/credits.s783
-rw-r--r--asm/evolution_scene.s4
-rw-r--r--asm/field_control_avatar.s4
-rw-r--r--asm/field_effect.s (renamed from asm/rom_80859BC.s)0
-rw-r--r--asm/fldeff_cut.s4
-rw-r--r--asm/hall_of_fame.s2
-rw-r--r--asm/mauville_old_man.s2
-rw-r--r--asm/pokedex.s6
-rw-r--r--asm/pokemon_storage_system.s60
-rw-r--r--asm/pokenav.s34
-rw-r--r--asm/rom6.s2
-rw-r--r--asm/rom_800D42C.s4
-rw-r--r--asm/rom_810CBB4.s18
-rw-r--r--asm/rom_81258BC.s14
-rw-r--r--asm/roulette.s4
-rw-r--r--asm/secret_base.s4
-rw-r--r--asm/shop.s2
-rw-r--r--asm/slot_machine.s2
-rw-r--r--asm/trade.s2
-rw-r--r--asm/tv.s6
-rw-r--r--asm/weather.s2
24 files changed, 100 insertions, 883 deletions
diff --git a/asm/battle_anim_807B69C.s b/asm/battle_anim_807B69C.s
index faf9f4cf4..cef472d03 100644
--- a/asm/battle_anim_807B69C.s
+++ b/asm/battle_anim_807B69C.s
@@ -393,7 +393,7 @@ _0807B95E:
lsls r0, 2
ldr r1, _0807B9C8 @ =gSprites
adds r0, r1
- ldr r1, _0807B9CC @ =gUnknown_083931D8
+ ldr r1, _0807B9CC @ =gSubspriteTables_83931D8
bl SetSubspriteTables
ldr r1, _0807B9D0 @ =gTasks
lsls r0, r6, 2
@@ -414,7 +414,7 @@ _0807B9BC: .4byte 0xfffa0000
_0807B9C0: .4byte REG_BLDCNT
_0807B9C4: .4byte gSpriteTemplate_83931E0
_0807B9C8: .4byte gSprites
-_0807B9CC: .4byte gUnknown_083931D8
+_0807B9CC: .4byte gSubspriteTables_83931D8
_0807B9D0: .4byte gTasks
_0807B9D4: .4byte sub_807B9D8
thumb_func_end sub_807B920
diff --git a/asm/battle_records.s b/asm/battle_records.s
index b58a6506c..60d7b9b2b 100644
--- a/asm/battle_records.s
+++ b/asm/battle_records.s
@@ -47,13 +47,13 @@ _0810FFAE:
bge _0810FFAE
movs r0, 0x17
movs r1, 0
- bl sav12_xor_set
+ bl SetGameStat
movs r0, 0x18
movs r1, 0
- bl sav12_xor_set
+ bl SetGameStat
movs r0, 0x19
movs r1, 0
- bl sav12_xor_set
+ bl SetGameStat
pop {r4,r5}
pop {r0}
bx r0
@@ -264,12 +264,12 @@ _0811013A:
movs r4, 0x19
_0811013C:
adds r0, r4, 0
- bl sub_8053108
+ bl GetGameStat
ldr r1, _08110154 @ =0x0000270e
cmp r0, r1
bhi _0811014E
adds r0, r4, 0
- bl sav12_xor_increment
+ bl IncrementGameStat
_0811014E:
pop {r4}
pop {r0}
@@ -488,7 +488,7 @@ PrintLinkBattleWinsLossesDraws: @ 81102E8
push {r4,lr}
ldr r4, _08110338 @ =gStringVar1
movs r0, 0x17
- bl sub_8053108
+ bl GetGameStat
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x1
@@ -496,7 +496,7 @@ PrintLinkBattleWinsLossesDraws: @ 81102E8
bl ConvertIntToDecimalStringN_DigitWidth6
ldr r4, _0811033C @ =gStringVar2
movs r0, 0x18
- bl sub_8053108
+ bl GetGameStat
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x1
@@ -504,7 +504,7 @@ PrintLinkBattleWinsLossesDraws: @ 81102E8
bl ConvertIntToDecimalStringN_DigitWidth6
ldr r4, _08110340 @ =gStringVar3
movs r0, 0x19
- bl sub_8053108
+ bl GetGameStat
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x1
diff --git a/asm/berry_blender.s b/asm/berry_blender.s
index def318c24..666882c04 100644
--- a/asm/berry_blender.s
+++ b/asm/berry_blender.s
@@ -4998,13 +4998,13 @@ _08050AEA:
cmp r0, 0
bne _08050B00
movs r0, 0x22
- bl sav12_xor_increment
+ bl IncrementGameStat
b _08050C82
.align 2, 0
_08050AFC: .4byte gUnknown_03004834
_08050B00:
movs r0, 0x21
- bl sav12_xor_increment
+ bl IncrementGameStat
b _08050C82
_08050B08:
ldr r0, _08050B2C @ =gUnknown_03004854
diff --git a/asm/credits.s b/asm/credits.s
index de59cb943..1b16eb16a 100644
--- a/asm/credits.s
+++ b/asm/credits.s
@@ -6,789 +6,6 @@
.text
- thumb_func_start sub_8143948
-sub_8143948: @ 8143948
- push {lr}
- bl LoadOam
- bl ProcessSpriteCopyRequests
- bl TransferPlttBuffer
- pop {r0}
- bx r0
- thumb_func_end sub_8143948
-
- thumb_func_start sub_814395C
-sub_814395C: @ 814395C
- push {lr}
- bl RunTasks
- bl AnimateSprites
- bl BuildOamBuffer
- bl UpdatePaletteFade
- ldr r0, _081439B8 @ =gMain
- ldrh r1, [r0, 0x2C]
- movs r0, 0x2
- ands r0, r1
- cmp r0, 0
- beq _081439B2
- ldr r0, _081439BC @ =gUnknown_02039324
- ldrb r0, [r0]
- cmp r0, 0
- beq _081439B2
- ldr r2, _081439C0 @ =gTasks
- ldr r0, _081439C4 @ =gUnknown_02039322
- ldrh r1, [r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- ldr r1, [r0]
- ldr r0, _081439C8 @ =sub_8143B68
- cmp r1, r0
- bne _081439B2
- bl sub_8143948
- bl RunTasks
- bl AnimateSprites
- bl BuildOamBuffer
- bl UpdatePaletteFade
- ldr r1, _081439CC @ =gUnknown_02039325
- movs r0, 0x1
- strb r0, [r1]
-_081439B2:
- pop {r0}
- bx r0
- .align 2, 0
-_081439B8: .4byte gMain
-_081439BC: .4byte gUnknown_02039324
-_081439C0: .4byte gTasks
-_081439C4: .4byte gUnknown_02039322
-_081439C8: .4byte sub_8143B68
-_081439CC: .4byte gUnknown_02039325
- thumb_func_end sub_814395C
-
- thumb_func_start sub_81439D0
-sub_81439D0: @ 81439D0
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- sub sp, 0x4
- bl sub_8144130
- movs r0, 0
- bl SetVBlankCallback
- bl ResetPaletteFade
- bl ResetTasks
- ldr r0, _08143AF0 @ =sub_8143B38
- movs r1, 0
- bl CreateTask
- lsls r0, 24
- lsrs r7, r0, 24
- ldr r1, _08143AF4 @ =gTasks
- lsls r0, r7, 2
- adds r0, r7
- lsls r0, 3
- adds r0, r1
- movs r1, 0
- strh r1, [r0, 0x10]
- strh r1, [r0, 0x16]
- strh r1, [r0, 0x1E]
- movs r1, 0x1
- strh r1, [r0, 0x22]
-_08143A0E:
- movs r0, 0
- adds r1, r7, 0
- bl sub_8144ECC
- lsls r0, 24
- cmp r0, 0
- beq _08143A0E
- ldr r6, _08143AF4 @ =gTasks
- lsls r5, r7, 2
- adds r5, r7
- lsls r5, 3
- adds r5, r6
- movs r0, 0xA
- ldrsh r1, [r5, r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r6
- movs r1, 0
- mov r9, r1
- movs r2, 0
- mov r8, r2
- movs r1, 0x28
- strh r1, [r0, 0x8]
- ldr r4, _08143AF8 @ =gWindowConfig_81E7208
- adds r0, r4, 0
- bl SetUpWindowConfig
- adds r0, r4, 0
- bl InitMenuWindow
- ldr r0, _08143AFC @ =gUnknown_0840B7BC
- movs r1, 0x80
- movs r2, 0x40
- bl LoadPalette
- ldr r0, _08143B00 @ =gUnknown_0840B7FC
- ldr r1, _08143B04 @ =0x0600bee0
- movs r2, 0x20
- bl CpuSet
- ldr r1, _08143B08 @ =REG_BG0VOFS
- ldr r2, _08143B0C @ =0x0000fffc
- adds r0, r2, 0
- strh r0, [r1]
- ldr r0, _08143B10 @ =sub_81441B8
- movs r1, 0
- bl CreateTask
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r1, r6
- strh r7, [r1, 0xA]
- strh r0, [r5, 0x26]
- movs r0, 0x1
- negs r0, r0
- mov r1, r8
- str r1, [sp]
- movs r1, 0
- movs r2, 0x10
- movs r3, 0
- bl BeginNormalPaletteFade
- ldr r3, _08143B14 @ =0x04000208
- ldrh r2, [r3]
- mov r0, r8
- strh r0, [r3]
- ldr r4, _08143B18 @ =0x04000200
- ldrh r0, [r4]
- movs r1, 0x1
- orrs r0, r1
- strh r0, [r4]
- strh r2, [r3]
- ldr r2, _08143B1C @ =REG_DISPSTAT
- ldrh r0, [r2]
- movs r1, 0x8
- orrs r0, r1
- strh r0, [r2]
- ldr r0, _08143B20 @ =sub_8143948
- bl SetVBlankCallback
- ldr r0, _08143B24 @ =0x000001c7
- bl m4aSongNumStart
- ldr r0, _08143B28 @ =sub_814395C
- bl SetMainCallback2
- ldr r0, _08143B2C @ =gUnknown_02039325
- mov r1, r9
- strb r1, [r0]
- ldr r4, _08143B30 @ =0x0201c000
- bl sub_81458DC
- adds r0, r4, 0
- adds r0, 0x88
- mov r2, r8
- strh r2, [r0]
- adds r0, 0x2
- strh r2, [r0]
- adds r0, 0x2
- strh r2, [r0]
- ldr r0, _08143B34 @ =gUnknown_02039322
- strh r7, [r0]
- add sp, 0x4
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08143AF0: .4byte sub_8143B38
-_08143AF4: .4byte gTasks
-_08143AF8: .4byte gWindowConfig_81E7208
-_08143AFC: .4byte gUnknown_0840B7BC
-_08143B00: .4byte gUnknown_0840B7FC
-_08143B04: .4byte 0x0600bee0
-_08143B08: .4byte REG_BG0VOFS
-_08143B0C: .4byte 0x0000fffc
-_08143B10: .4byte sub_81441B8
-_08143B14: .4byte 0x04000208
-_08143B18: .4byte 0x04000200
-_08143B1C: .4byte REG_DISPSTAT
-_08143B20: .4byte sub_8143948
-_08143B24: .4byte 0x000001c7
-_08143B28: .4byte sub_814395C
-_08143B2C: .4byte gUnknown_02039325
-_08143B30: .4byte 0x0201c000
-_08143B34: .4byte gUnknown_02039322
- thumb_func_end sub_81439D0
-
- thumb_func_start sub_8143B38
-sub_8143B38: @ 8143B38
- push {lr}
- lsls r0, 24
- lsrs r2, r0, 24
- ldr r0, _08143B5C @ =gPaletteFade
- ldrb r1, [r0, 0x7]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- bne _08143B58
- ldr r0, _08143B60 @ =gTasks
- lsls r1, r2, 2
- adds r1, r2
- lsls r1, 3
- adds r1, r0
- ldr r0, _08143B64 @ =sub_8143B68
- str r0, [r1]
-_08143B58:
- pop {r0}
- bx r0
- .align 2, 0
-_08143B5C: .4byte gPaletteFade
-_08143B60: .4byte gTasks
-_08143B64: .4byte sub_8143B68
- thumb_func_end sub_8143B38
-
- thumb_func_start sub_8143B68
-sub_8143B68: @ 8143B68
- push {r4,lr}
- sub sp, 0x4
- lsls r0, 24
- lsrs r0, 24
- ldr r2, _08143B9C @ =gTasks
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r4, r1, r2
- movs r0, 0x10
- ldrsh r1, [r4, r0]
- cmp r1, 0
- beq _08143BA4
- movs r3, 0xA
- ldrsh r1, [r4, r3]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- movs r1, 0x1E
- strh r1, [r0, 0x8]
- movs r0, 0x80
- lsls r0, 1
- strh r0, [r4, 0x20]
- ldr r0, _08143BA0 @ =sub_8143EBC
- b _08143BEE
- .align 2, 0
-_08143B9C: .4byte gTasks
-_08143BA0: .4byte sub_8143EBC
-_08143BA4:
- ldr r0, _08143BCC @ =gUnknown_02039320
- strh r1, [r0]
- ldrh r2, [r4, 0x1E]
- movs r3, 0x1E
- ldrsh r0, [r4, r3]
- cmp r0, 0x1
- bne _08143BD4
- strh r2, [r4, 0x22]
- strh r1, [r4, 0x1E]
- movs r0, 0x1
- negs r0, r0
- str r1, [sp]
- movs r1, 0
- movs r2, 0
- movs r3, 0x10
- bl BeginNormalPaletteFade
- ldr r0, _08143BD0 @ =sub_8143BFC
- b _08143BEE
- .align 2, 0
-_08143BCC: .4byte gUnknown_02039320
-_08143BD0: .4byte sub_8143BFC
-_08143BD4:
- cmp r0, 0x2
- bne _08143BF0
- strh r2, [r4, 0x22]
- strh r1, [r4, 0x1E]
- movs r0, 0x1
- negs r0, r0
- str r1, [sp]
- movs r1, 0
- movs r2, 0
- movs r3, 0x10
- bl BeginNormalPaletteFade
- ldr r0, _08143BF8 @ =sub_8143CC0
-_08143BEE:
- str r0, [r4]
-_08143BF0:
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08143BF8: .4byte sub_8143CC0
- thumb_func_end sub_8143B68
-
- thumb_func_start sub_8143BFC
-sub_8143BFC: @ 8143BFC
- push {r4,lr}
- lsls r0, 24
- lsrs r4, r0, 24
- ldr r0, _08143C34 @ =gPaletteFade
- ldrb r1, [r0, 0x7]
- movs r0, 0x80
- ands r0, r1
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0
- bne _08143C2C
- movs r0, 0x80
- lsls r0, 19
- strh r1, [r0]
- adds r0, r4, 0
- bl sub_81450AC
- ldr r1, _08143C38 @ =gTasks
- lsls r0, r4, 2
- adds r0, r4
- lsls r0, 3
- adds r0, r1
- ldr r1, _08143C3C @ =c2_080C9BFC
- str r1, [r0]
-_08143C2C:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08143C34: .4byte gPaletteFade
-_08143C38: .4byte gTasks
-_08143C3C: .4byte c2_080C9BFC
- thumb_func_end sub_8143BFC
-
- thumb_func_start c2_080C9BFC
-c2_080C9BFC: @ 8143C40
- push {r4,r5,lr}
- sub sp, 0x4
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- movs r0, 0
- bl SetVBlankCallback
- ldr r1, _08143CA8 @ =gTasks
- lsls r0, r4, 2
- adds r0, r4
- lsls r0, 3
- adds r5, r0, r1
- ldrb r0, [r5, 0x16]
- adds r1, r4, 0
- bl sub_8144ECC
- lsls r0, 24
- cmp r0, 0
- beq _08143CA0
- movs r0, 0x1
- negs r0, r0
- movs r4, 0
- str r4, [sp]
- movs r1, 0
- movs r2, 0x10
- movs r3, 0
- bl BeginNormalPaletteFade
- ldr r3, _08143CAC @ =0x04000208
- ldrh r2, [r3]
- strh r4, [r3]
- ldr r4, _08143CB0 @ =0x04000200
- ldrh r0, [r4]
- movs r1, 0x1
- orrs r0, r1
- strh r0, [r4]
- strh r2, [r3]
- ldr r2, _08143CB4 @ =REG_DISPSTAT
- ldrh r0, [r2]
- movs r1, 0x8
- orrs r0, r1
- strh r0, [r2]
- ldr r0, _08143CB8 @ =sub_8143948
- bl SetVBlankCallback
- ldr r0, _08143CBC @ =sub_8143B38
- str r0, [r5]
-_08143CA0:
- add sp, 0x4
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08143CA8: .4byte gTasks
-_08143CAC: .4byte 0x04000208
-_08143CB0: .4byte 0x04000200
-_08143CB4: .4byte REG_DISPSTAT
-_08143CB8: .4byte sub_8143948
-_08143CBC: .4byte sub_8143B38
- thumb_func_end c2_080C9BFC
-
- thumb_func_start sub_8143CC0
-sub_8143CC0: @ 8143CC0
- push {r4,lr}
- lsls r0, 24
- lsrs r4, r0, 24
- ldr r0, _08143CF8 @ =gPaletteFade
- ldrb r1, [r0, 0x7]
- movs r0, 0x80
- ands r0, r1
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0
- bne _08143CF0
- movs r0, 0x80
- lsls r0, 19
- strh r1, [r0]
- adds r0, r4, 0
- bl sub_81450AC
- ldr r1, _08143CFC @ =gTasks
- lsls r0, r4, 2
- adds r0, r4
- lsls r0, 3
- adds r0, r1
- ldr r1, _08143D00 @ =sub_8143D04
- str r1, [r0]
-_08143CF0:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08143CF8: .4byte gPaletteFade
-_08143CFC: .4byte gTasks
-_08143D00: .4byte sub_8143D04
- thumb_func_end sub_8143CC0
-
- thumb_func_start sub_8143D04
-sub_8143D04: @ 8143D04
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- sub sp, 0x4
- lsls r0, 24
- lsrs r6, r0, 24
- ldr r0, _08143DC8 @ =gMain
- ldr r1, _08143DCC @ =0x0000043c
- adds r1, r0
- mov r8, r1
- ldrb r7, [r1]
- cmp r7, 0
- beq _08143D24
- cmp r7, 0x1
- beq _08143E0C
-_08143D24:
- bl ResetSpriteData
- bl FreeAllSpritePalettes
- ldr r1, _08143DD0 @ =gReservedSpritePaletteCount
- movs r0, 0x8
- strb r0, [r1]
- ldr r0, _08143DD4 @ =gBirchHelpGfx
- movs r1, 0xC0
- lsls r1, 19
- bl LZ77UnCompVram
- ldr r0, _08143DD8 @ =gBirchGrassTilemap
- ldr r1, _08143DDC @ =0x06003800
- bl LZ77UnCompVram
- ldr r0, _08143DE0 @ =gBirchBagGrassPal + 0x2
- movs r1, 0x1
- movs r2, 0x3E
- bl LoadPalette
- movs r1, 0
- ldr r4, _08143DE4 @ =0x0201e000
- movs r3, 0x11
- ldr r2, _08143DE8 @ =0x000007ff
-_08143D56:
- adds r0, r1, r4
- strb r3, [r0]
- adds r0, r1, 0x1
- lsls r0, 16
- lsrs r1, r0, 16
- cmp r1, r2
- bls _08143D56
- movs r1, 0
- ldr r2, _08143DEC @ =0x0201f800
- ldr r6, _08143DF0 @ =gUnknown_0840CAA0
- ldr r0, _08143DF4 @ =0xfffff000
- adds r5, r2, r0
- movs r4, 0x22
- ldr r3, _08143DE8 @ =0x000007ff
-_08143D72:
- adds r0, r1, r5
- strb r4, [r0]
- adds r0, r1, 0x1
- lsls r0, 16
- lsrs r1, r0, 16
- cmp r1, r3
- bls _08143D72
- movs r1, 0
- ldr r5, _08143DF8 @ =0x0201f000
- movs r4, 0x33
- ldr r3, _08143DE8 @ =0x000007ff
-_08143D88:
- adds r0, r1, r5
- strb r4, [r0]
- adds r0, r1, 0x1
- lsls r0, 16
- lsrs r1, r0, 16
- cmp r1, r3
- bls _08143D88
- movs r0, 0
- strh r0, [r2]
- ldr r1, _08143DFC @ =0x000053ff
- adds r0, r1, 0
- strh r0, [r2, 0x2]
- ldr r1, _08143E00 @ =0x0000529f
- adds r0, r1, 0
- strh r0, [r2, 0x4]
- ldr r1, _08143E04 @ =0x00007e94
- adds r0, r1, 0
- strh r0, [r2, 0x6]
- adds r0, r6, 0
- bl LoadSpriteSheet
- ldr r0, _08143E08 @ =gUnknown_0840CAB0
- bl LoadSpritePalette
- ldr r1, _08143DC8 @ =gMain
- ldr r2, _08143DCC @ =0x0000043c
- adds r1, r2
- ldrb r0, [r1]
- adds r0, 0x1
- strb r0, [r1]
- b _08143E90
- .align 2, 0
-_08143DC8: .4byte gMain
-_08143DCC: .4byte 0x0000043c
-_08143DD0: .4byte gReservedSpritePaletteCount
-_08143DD4: .4byte gBirchHelpGfx
-_08143DD8: .4byte gBirchGrassTilemap
-_08143DDC: .4byte 0x06003800
-_08143DE0: .4byte gBirchBagGrassPal + 0x2
-_08143DE4: .4byte 0x0201e000
-_08143DE8: .4byte 0x000007ff
-_08143DEC: .4byte 0x0201f800
-_08143DF0: .4byte gUnknown_0840CAA0
-_08143DF4: .4byte 0xfffff000
-_08143DF8: .4byte 0x0201f000
-_08143DFC: .4byte 0x000053ff
-_08143E00: .4byte 0x0000529f
-_08143E04: .4byte 0x00007e94
-_08143E08: .4byte gUnknown_0840CAB0
-_08143E0C:
- ldr r0, _08143EA0 @ =sub_8144514
- movs r1, 0
- bl CreateTask
- ldr r2, _08143EA4 @ =gTasks
- lsls r4, r6, 2
- adds r4, r6
- lsls r4, 3
- adds r4, r2
- lsls r0, 24
- lsrs r0, 24
- movs r1, 0
- mov r9, r1
- movs r5, 0
- strh r0, [r4, 0xE]
- movs r0, 0xE
- ldrsh r1, [r4, r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- strh r7, [r0, 0x8]
- movs r0, 0xE
- ldrsh r1, [r4, r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- strh r6, [r0, 0xA]
- movs r0, 0xE
- ldrsh r1, [r4, r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- ldrh r1, [r4, 0x16]
- strh r1, [r0, 0xC]
- movs r0, 0x1
- negs r0, r0
- str r5, [sp]
- movs r1, 0
- movs r2, 0x10
- movs r3, 0
- bl BeginNormalPaletteFade
- ldr r0, _08143EA8 @ =REG_BG3HOFS
- strh r5, [r0]
- ldr r1, _08143EAC @ =REG_BG3VOFS
- movs r0, 0x20
- strh r0, [r1]
- subs r1, 0x10
- ldr r2, _08143EB0 @ =0x00000703
- adds r0, r2, 0
- strh r0, [r1]
- subs r1, 0xE
- movs r2, 0xCA
- lsls r2, 5
- adds r0, r2, 0
- strh r0, [r1]
- mov r1, r9
- mov r0, r8
- strb r1, [r0]
- ldr r0, _08143EB4 @ =gUnknown_0203935C
- strh r5, [r0]
- ldr r0, _08143EB8 @ =sub_8143B38
- str r0, [r4]
-_08143E90:
- add sp, 0x4
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08143EA0: .4byte sub_8144514
-_08143EA4: .4byte gTasks
-_08143EA8: .4byte REG_BG3HOFS
-_08143EAC: .4byte REG_BG3VOFS
-_08143EB0: .4byte 0x00000703
-_08143EB4: .4byte gUnknown_0203935C
-_08143EB8: .4byte sub_8143B38
- thumb_func_end sub_8143D04
-
- thumb_func_start sub_8143EBC
-sub_8143EBC: @ 8143EBC
- push {r4,lr}
- sub sp, 0x4
- lsls r0, 24
- lsrs r0, 24
- ldr r2, _08143EE0 @ =gTasks
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r4, r1, r2
- ldrh r0, [r4, 0x20]
- movs r2, 0x20
- ldrsh r1, [r4, r2]
- cmp r1, 0
- beq _08143EE4
- subs r0, 0x1
- strh r0, [r4, 0x20]
- b _08143EF8
- .align 2, 0
-_08143EE0: .4byte gTasks
-_08143EE4:
- movs r0, 0x1
- negs r0, r0
- str r1, [sp]
- movs r1, 0xC
- movs r2, 0
- movs r3, 0x10
- bl BeginNormalPaletteFade
- ldr r0, _08143F00 @ =sub_8143F04
- str r0, [r4]
-_08143EF8:
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08143F00: .4byte sub_8143F04
- thumb_func_end sub_8143EBC
-
- thumb_func_start sub_8143F04
-sub_8143F04: @ 8143F04
- push {r4,lr}
- lsls r0, 24
- lsrs r4, r0, 24
- ldr r0, _08143F30 @ =gPaletteFade
- ldrb r1, [r0, 0x7]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- bne _08143F2A
- adds r0, r4, 0
- bl sub_81450AC
- ldr r0, _08143F34 @ =gTasks
- lsls r1, r4, 2
- adds r1, r4
- lsls r1, 3
- adds r1, r0
- ldr r0, _08143F38 @ =sub_8143F3C
- str r0, [r1]
-_08143F2A:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08143F30: .4byte gPaletteFade
-_08143F34: .4byte gTasks
-_08143F38: .4byte sub_8143F3C
- thumb_func_end sub_8143F04
-
- thumb_func_start sub_8143F3C
-sub_8143F3C: @ 8143F3C
- push {r4,r5,lr}
- sub sp, 0x4
- adds r5, r0, 0
- lsls r5, 24
- lsrs r5, 24
- bl sub_8144130
- bl ResetPaletteFade
- movs r1, 0xE0
- lsls r1, 6
- movs r0, 0
- movs r2, 0
- bl sub_8145128
- bl ResetSpriteData
- bl FreeAllSpritePalettes
- movs r0, 0x1
- negs r0, r0
- movs r4, 0
- str r4, [sp]
- movs r1, 0x8
- movs r2, 0x10
- movs r3, 0
- bl BeginNormalPaletteFade
- ldr r1, _08143FC4 @ =REG_BG0CNT
- movs r2, 0xE0
- lsls r2, 3
- adds r0, r2, 0
- strh r0, [r1]
- ldr r3, _08143FC8 @ =0x04000208
- ldrh r2, [r3]
- strh r4, [r3]
- ldr r4, _08143FCC @ =0x04000200
- ldrh r0, [r4]
- movs r1, 0x1
- orrs r0, r1
- strh r0, [r4]
- strh r2, [r3]
- ldr r2, _08143FD0 @ =REG_DISPSTAT
- ldrh r0, [r2]
- movs r1, 0x8
- orrs r0, r1
- strh r0, [r2]
- movs r1, 0x80
- lsls r1, 19
- movs r2, 0xA0
- lsls r2, 1
- adds r0, r2, 0
- strh r0, [r1]
- ldr r1, _08143FD4 @ =gTasks
- lsls r0, r5, 2
- adds r0, r5
- lsls r0, 3
- adds r0, r1
- movs r1, 0x80
- lsls r1, 1
- strh r1, [r0, 0x8]
- ldr r1, _08143FD8 @ =sub_8143FDC
- str r1, [r0]
- add sp, 0x4
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08143FC4: .4byte REG_BG0CNT
-_08143FC8: .4byte 0x04000208
-_08143FCC: .4byte 0x04000200
-_08143FD0: .4byte REG_DISPSTAT
-_08143FD4: .4byte gTasks
-_08143FD8: .4byte sub_8143FDC
- thumb_func_end sub_8143F3C
-
thumb_func_start sub_8143FDC
sub_8143FDC: @ 8143FDC
push {r4,lr}
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index 64144d656..6ecd355c3 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -1747,7 +1747,7 @@ _081127BE:
movs r1, 0x3
bl sub_8090D90
movs r0, 0xE
- bl sav12_xor_increment
+ bl IncrementGameStat
b _08112FD0
.align 2, 0
_08112834: .4byte gPaletteFade
@@ -3055,7 +3055,7 @@ _08113316:
movs r1, 0x3
bl sub_8090D90
movs r0, 0xE
- bl sav12_xor_increment
+ bl IncrementGameStat
b _08113B3A
.align 2, 0
_08113390: .4byte gPaletteFade
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index 7f7c35ce1..e2fd1b54f 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -222,7 +222,7 @@ _08068076:
cmp r0, 0
beq _08068098
movs r0, 0x5
- bl sav12_xor_increment
+ bl IncrementGameStat
mov r0, sp
adds r1, r4, 0
adds r2, r6, 0
@@ -1271,7 +1271,7 @@ _080688B4:
cmp r0, 0
beq _080688CC
movs r0, 0xD
- bl sav12_xor_increment
+ bl IncrementGameStat
ldr r0, _080688C8 @ =Event_EggHatch
b _080688E8
.align 2, 0
diff --git a/asm/rom_80859BC.s b/asm/field_effect.s
index 4bcba42ce..4bcba42ce 100644
--- a/asm/rom_80859BC.s
+++ b/asm/field_effect.s
diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s
index 0033c77cd..a56ad32fa 100644
--- a/asm/fldeff_cut.s
+++ b/asm/fldeff_cut.s
@@ -148,7 +148,7 @@ FldEff_UseCutOnGrass: @ 80A2604
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
movs r0, 0x12
- bl sav12_xor_increment
+ bl IncrementGameStat
movs r0, 0
pop {r1}
bx r1
@@ -190,7 +190,7 @@ FldEff_UseCutOnTree: @ 80A2654
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
movs r0, 0x12
- bl sav12_xor_increment
+ bl IncrementGameStat
movs r0, 0
pop {r1}
bx r1
diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s
index 76846e9c3..c1e93c8b3 100644
--- a/asm/hall_of_fame.s
+++ b/asm/hall_of_fame.s
@@ -1562,7 +1562,7 @@ _08142A98:
_08142AA0:
strh r1, [r0, 0x8]
movs r0, 0xA
- bl sub_8053108
+ bl GetGameStat
ldr r2, _08142AF0 @ =gTasks
adds r1, r6, r5
lsls r1, 3
diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s
index 7dfaa890e..3af0f2b11 100644
--- a/asm/mauville_old_man.s
+++ b/asm/mauville_old_man.s
@@ -1369,7 +1369,7 @@ sub_80F8438: @ 80F8438
bne _080F8444
movs r0, 0
_080F8444:
- bl sub_8053108
+ bl GetGameStat
pop {r1}
bx r1
thumb_func_end sub_80F8438
diff --git a/asm/pokedex.s b/asm/pokedex.s
index 24488fe3f..8fd971840 100644
--- a/asm/pokedex.s
+++ b/asm/pokedex.s
@@ -719,8 +719,8 @@ GetPokemonCategory: @ 8090D3C
_08090D50: .4byte gPokedexEntries
thumb_func_end GetPokemonCategory
- thumb_func_start sub_8090D54
-sub_8090D54: @ 8090D54
+ thumb_func_start GetPokedexHeightWeight
+GetPokedexHeightWeight: @ 8090D54
push {lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -754,7 +754,7 @@ _08090D88:
bx r1
.align 2, 0
_08090D8C: .4byte gPokedexEntries
- thumb_func_end sub_8090D54
+ thumb_func_end GetPokedexHeightWeight
thumb_func_start sub_8090D90
sub_8090D90: @ 8090D90
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index c24d18711..801c941d1 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -270,7 +270,7 @@ _08095AF0:
lsls r0, r4, 2
adds r0, r4
lsls r0, 4
- ldr r1, _08095B20 @ =gUnknown_020300A4
+ ldr r1, _08095B20 @ =gPokemonStorage + 0x4
adds r0, r1
adds r0, r6, r0
movs r1, 0xB
@@ -292,7 +292,7 @@ _08095B0C:
pop {r1}
bx r1
.align 2, 0
-_08095B20: .4byte gUnknown_020300A4
+_08095B20: .4byte gPokemonStorage + 0x4
thumb_func_end sub_8095ADC
thumb_func_start sub_8095B24
@@ -310,7 +310,7 @@ _08095B36:
lsls r0, r4, 2
adds r0, r4
lsls r0, 4
- ldr r1, _08095B54 @ =gUnknown_020300A4
+ ldr r1, _08095B54 @ =gPokemonStorage + 0x4
adds r0, r1
adds r0, r5, r0
movs r1, 0xB
@@ -321,7 +321,7 @@ _08095B36:
asrs r0, 16
b _08095B66
.align 2, 0
-_08095B54: .4byte gUnknown_020300A4
+_08095B54: .4byte gPokemonStorage + 0x4
_08095B58:
adds r0, r4, 0x1
lsls r0, 16
@@ -1222,7 +1222,7 @@ _080961F0:
_08096214:
lsls r0, r5, 3
adds r0, r5
- ldr r6, _0809625C @ =gUnknown_020383E4
+ ldr r6, _0809625C @ =gPokemonStorage + 0x8344
adds r0, r6
ldr r1, _08096260 @ =gPCText_BOX
bl StringCopy
@@ -1254,7 +1254,7 @@ _0809623E:
bx r0
.align 2, 0
_08096258: .4byte gPokemonStorage
-_0809625C: .4byte gUnknown_020383E4
+_0809625C: .4byte gPokemonStorage + 0x8344
_08096260: .4byte gPCText_BOX
thumb_func_end sub_80961D8
@@ -1802,7 +1802,7 @@ sub_809665C: @ 809665C
ldrb r0, [r0]
lsls r1, r0, 3
adds r1, r0
- ldr r0, _080966BC @ =gUnknown_020383E4
+ ldr r0, _080966BC @ =gPokemonStorage + 0x8344
adds r1, r0
adds r0, r2, 0
bl StringCopy
@@ -1819,7 +1819,7 @@ sub_809665C: @ 809665C
.align 2, 0
_080966B4: .4byte gUnknown_02038478
_080966B8: .4byte gStringVar1
-_080966BC: .4byte gUnknown_020383E4
+_080966BC: .4byte gPokemonStorage + 0x8344
_080966C0:
movs r0, 0x22
_080966C2:
@@ -6352,7 +6352,7 @@ sub_8098C48: @ 8098C48
lsls r0, r1, 4
subs r0, r1
lsls r0, 5
- ldr r1, _08098CCC @ =gUnknown_020300A4
+ ldr r1, _08098CCC @ =gPokemonStorage + 0x4
adds r6, r0, r1
movs r0, 0
mov r8, r0
@@ -6406,7 +6406,7 @@ _08098C70:
str r0, [r1]
b _08098CE8
.align 2, 0
-_08098CCC: .4byte gUnknown_020300A4
+_08098CCC: .4byte gPokemonStorage + 0x4
_08098CD0: .4byte gUnknown_083B6DB4
_08098CD4: .4byte 0x00001050
_08098CD8:
@@ -6468,7 +6468,7 @@ sub_8098D20: @ 8098D20
mov r9, r0
adds r0, r4
lsls r0, 4
- ldr r1, _08098DD4 @ =gUnknown_020300A4
+ ldr r1, _08098DD4 @ =gPokemonStorage + 0x4
adds r0, r1
adds r7, r2, r0
adds r0, r7, 0
@@ -6534,7 +6534,7 @@ _08098DC4:
pop {r0}
bx r0
.align 2, 0
-_08098DD4: .4byte gUnknown_020300A4
+_08098DD4: .4byte gPokemonStorage + 0x4
_08098DD8: .4byte gUnknown_083B6DB4
_08098DDC: .4byte 0x00001050
thumb_func_end sub_8098D20
@@ -6746,7 +6746,7 @@ _08098F42:
lsls r7, r6, 2
adds r1, r7, r6
lsls r1, 4
- ldr r2, _08099004 @ =gUnknown_020300A4
+ ldr r2, _08099004 @ =gPokemonStorage + 0x4
adds r4, r1, r2
adds r0, r4
movs r1, 0x41
@@ -6829,7 +6829,7 @@ _08098FC8:
_08098FF8: .4byte gUnknown_083B6DB4
_08098FFC: .4byte 0x0000117d
_08099000: .4byte 0x00001050
-_08099004: .4byte gUnknown_020300A4
+_08099004: .4byte gPokemonStorage + 0x4
_08099008: .4byte sub_8098E24
thumb_func_end sub_8098EE0
@@ -9494,7 +9494,7 @@ _0809A478:
ldr r1, [sp, 0x28]
lsls r5, r1, 3
adds r5, r1
- ldr r4, _0809A57C @ =gUnknown_020383E4
+ ldr r4, _0809A57C @ =gPokemonStorage + 0x8344
adds r5, r4
adds r1, r5, 0
bl sub_809A1BC
@@ -9610,7 +9610,7 @@ _0809A4DE:
_0809A570: .4byte 0x00000cec
_0809A574: .4byte 0x0000dac9
_0809A578: .4byte 0x000008ca
-_0809A57C: .4byte gUnknown_020383E4
+_0809A57C: .4byte gPokemonStorage + 0x8344
_0809A580: .4byte gUnknown_083BB0A8
_0809A584: .4byte gUnknown_083B6DB4
_0809A588: .4byte 0x00000cf8
@@ -10452,7 +10452,7 @@ _0809ABC0:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _0809ABF4 @ =gUnknown_020300A4
+ ldr r2, _0809ABF4 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
movs r1, 0xB
@@ -10463,7 +10463,7 @@ _0809ABEA:
b _0809ABFA
.align 2, 0
_0809ABF0: .4byte gUnknown_020384E5
-_0809ABF4: .4byte gUnknown_020300A4
+_0809ABF4: .4byte gPokemonStorage + 0x4
_0809ABF8:
movs r0, 0
_0809ABFA:
@@ -11603,7 +11603,7 @@ _0809B488:
lsls r1, r5, 2
adds r1, r5
lsls r1, 4
- ldr r2, _0809B4C0 @ =gUnknown_020300A4
+ ldr r2, _0809B4C0 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
ldr r1, _0809B4C4 @ =gUnknown_083B6DB4
@@ -11623,7 +11623,7 @@ _0809B4AA:
pop {r0}
bx r0
.align 2, 0
-_0809B4C0: .4byte gUnknown_020300A4
+_0809B4C0: .4byte gPokemonStorage + 0x4
_0809B4C4: .4byte gUnknown_083B6DB4
_0809B4C8: .4byte 0x000025b4
_0809B4CC: .4byte gUnknown_020384E7
@@ -11712,7 +11712,7 @@ _0809B568:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _0809B588 @ =gUnknown_020300A4
+ ldr r2, _0809B588 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
bl ZeroBoxMonData
@@ -11720,7 +11720,7 @@ _0809B582:
pop {r0}
bx r0
.align 2, 0
-_0809B588: .4byte gUnknown_020300A4
+_0809B588: .4byte gPokemonStorage + 0x4
thumb_func_end sub_809B548
thumb_func_start diegohint1
@@ -11756,7 +11756,7 @@ _0809B5C0:
lsls r1, r6, 2
adds r1, r6
lsls r1, 4
- ldr r2, _0809B614 @ =gUnknown_020300A4
+ ldr r2, _0809B614 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
ldr r1, _0809B618 @ =gUnknown_083B6DB4
@@ -11788,7 +11788,7 @@ _0809B5E2:
pop {r0}
bx r0
.align 2, 0
-_0809B614: .4byte gUnknown_020300A4
+_0809B614: .4byte gPokemonStorage + 0x4
_0809B618: .4byte gUnknown_083B6DB4
_0809B61C: .4byte 0x00002618
_0809B620: .4byte 0x000025b4
@@ -12362,7 +12362,7 @@ _0809BA9A:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _0809BB78 @ =gUnknown_020300A4
+ ldr r2, _0809BB78 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
movs r1, 0x50
@@ -12462,7 +12462,7 @@ _0809BB5C:
_0809BB6C: .4byte 0x0000267f
_0809BB70: .4byte 0x0000ffff
_0809BB74: .4byte 0x00002681
-_0809BB78: .4byte gUnknown_020300A4
+_0809BB78: .4byte gPokemonStorage + 0x4
_0809BB7C: .4byte 0x00002686
_0809BB80: .4byte 0x00002682
_0809BB84: .4byte 0x0000267e
@@ -12817,7 +12817,7 @@ _0809BE34:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _0809BE7C @ =gUnknown_020300A4
+ ldr r2, _0809BE7C @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
movs r1, 0x8
@@ -12832,7 +12832,7 @@ _0809BE68:
_0809BE70: .4byte gUnknown_020384E4
_0809BE74: .4byte gUnknown_020384E5
_0809BE78: .4byte gPlayerParty
-_0809BE7C: .4byte gUnknown_020300A4
+_0809BE7C: .4byte gPokemonStorage + 0x4
thumb_func_end sub_809BDD8
thumb_func_start sub_809BE80
@@ -13045,7 +13045,7 @@ _0809BFEE:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _0809C024 @ =gUnknown_020300A4
+ ldr r2, _0809C024 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
movs r1, 0x1
@@ -13056,7 +13056,7 @@ _0809C018:
bx r0
.align 2, 0
_0809C020: .4byte gUnknown_020384E5
-_0809C024: .4byte gUnknown_020300A4
+_0809C024: .4byte gPokemonStorage + 0x4
thumb_func_end sub_809BF74
thumb_func_start sub_809C028
diff --git a/asm/pokenav.s b/asm/pokenav.s
index ba1079dec..49d627336 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -9571,7 +9571,7 @@ _080F088C:
bne _080F08C6
_080F089A:
movs r0, 0x9
- bl sub_8053108
+ bl GetGameStat
adds r1, r0, 0
ldr r0, _080F08E0 @ =0x0001869f
cmp r1, r0
@@ -17339,7 +17339,7 @@ _080F44FC:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _080F451C @ =gUnknown_020300A4
+ ldr r2, _080F451C @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
adds r1, r4, 0
@@ -17347,7 +17347,7 @@ _080F44FC:
bl GetBoxMonData
b _080F453C
.align 2, 0
-_080F451C: .4byte gUnknown_020300A4
+_080F451C: .4byte gPokemonStorage + 0x4
_080F4520:
lsls r1, r0, 2
adds r1, r0
@@ -17357,7 +17357,7 @@ _080F4520:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _080F4544 @ =gUnknown_020300A4
+ ldr r2, _080F4544 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
adds r1, r4, 0
@@ -17367,7 +17367,7 @@ _080F453C:
pop {r1}
bx r1
.align 2, 0
-_080F4544: .4byte gUnknown_020300A4
+_080F4544: .4byte gPokemonStorage + 0x4
thumb_func_end sub_80F44B0
thumb_func_start sub_80F4548
@@ -17401,7 +17401,7 @@ _080F4574:
lsls r1, r4, 2
adds r1, r4
lsls r1, 4
- ldr r2, _080F459C @ =gUnknown_020300A4
+ ldr r2, _080F459C @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
movs r1, 0x8
@@ -17413,7 +17413,7 @@ _080F4592:
pop {r0}
bx r0
.align 2, 0
-_080F459C: .4byte gUnknown_020300A4
+_080F459C: .4byte gPokemonStorage + 0x4
thumb_func_end sub_80F4548
thumb_func_start sub_80F45A0
@@ -17472,7 +17472,7 @@ _080F4608:
adds r0, r5, r0
lsls r1, r2, 3
adds r1, r2
- ldr r2, _080F4638 @ =gUnknown_020383E4
+ ldr r2, _080F4638 @ =gPokemonStorage + 0x8344
adds r1, r2
movs r2, 0x40
movs r3, 0
@@ -17488,7 +17488,7 @@ _080F4624:
b _080F4676
.align 2, 0
_080F4634: .4byte 0x000088e9
-_080F4638: .4byte gUnknown_020383E4
+_080F4638: .4byte gPokemonStorage + 0x8344
_080F463C: .4byte gUnknown_083DFEC4
_080F4640: .4byte 0x00008937
_080F4644:
@@ -18432,7 +18432,7 @@ _080F4DAA:
ldr r0, _080F4EA4 @ =0x000087d8
adds r0, r4
mov r9, r0
- ldr r1, _080F4EA8 @ =gUnknown_020300A4
+ ldr r1, _080F4EA8 @ =gPokemonStorage + 0x4
mov r8, r1
_080F4DCA:
ldrb r0, [r6]
@@ -18541,7 +18541,7 @@ _080F4E98: .4byte gUnknown_083DFEC4
_080F4E9C: .4byte 0x00008fe6
_080F4EA0: .4byte 0x00008fe7
_080F4EA4: .4byte 0x000087d8
-_080F4EA8: .4byte gUnknown_020300A4
+_080F4EA8: .4byte gPokemonStorage + 0x4
_080F4EAC: .4byte 0xffff00ff
_080F4EB0: .4byte 0xffe0ffff
_080F4EB4: .4byte 0xffffff00
@@ -21141,7 +21141,7 @@ _080F6278:
adds r5, r7, r1
ldr r0, _080F6310 @ =0x00008fe7
adds r4, r7, r0
- ldr r1, _080F6314 @ =gUnknown_020300A4
+ ldr r1, _080F6314 @ =gPokemonStorage + 0x4
mov r8, r1
ldr r0, _080F6318 @ =0x000041a0
add r0, r8
@@ -21205,7 +21205,7 @@ _080F62FE:
.align 2, 0
_080F630C: .4byte 0x00008fe6
_080F6310: .4byte 0x00008fe7
-_080F6314: .4byte gUnknown_020300A4
+_080F6314: .4byte gPokemonStorage + 0x4
_080F6318: .4byte 0x000041a0
_080F631C:
movs r0, 0
@@ -21336,7 +21336,7 @@ _080F63FC:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _080F6488 @ =gUnknown_020300A4
+ ldr r2, _080F6488 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
movs r1, 0x51
@@ -21393,7 +21393,7 @@ _080F646E:
_080F647C: .4byte gUnknown_083DFEC4
_080F6480: .4byte 0x00008fe6
_080F6484: .4byte 0x00008fe7
-_080F6488: .4byte gUnknown_020300A4
+_080F6488: .4byte gPokemonStorage + 0x4
_080F648C: .4byte 0xffff00ff
_080F6490: .4byte 0xffe0ffff
_080F6494: .4byte 0xffffff00
@@ -21544,7 +21544,7 @@ _080F65B4:
lsls r1, r7, 2
adds r1, r7
lsls r1, 4
- ldr r2, _080F6620 @ =gUnknown_020300A4
+ ldr r2, _080F6620 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
bl GetLevelFromBoxMonExp
@@ -21587,7 +21587,7 @@ _080F65FC:
beq _080F663C
b _080F6656
.align 2, 0
-_080F6620: .4byte gUnknown_020300A4
+_080F6620: .4byte gPokemonStorage + 0x4
_080F6624:
strb r1, [r5]
movs r0, 0x1
diff --git a/asm/rom6.s b/asm/rom6.s
index d28085ae2..16899bf2e 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -342,7 +342,7 @@ FldEff_RockSmash: @ 810B55C
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
movs r0, 0x13
- bl sav12_xor_increment
+ bl IncrementGameStat
movs r0, 0
pop {r1}
bx r1
diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s
index fb917fd7e..57a727072 100644
--- a/asm/rom_800D42C.s
+++ b/asm/rom_800D42C.s
@@ -44618,7 +44618,7 @@ atk60_cmd60: @ 8024298
ldr r0, _080242C4 @ =gUnknown_02024C10
ldr r0, [r0]
ldrb r0, [r0, 0x1]
- bl sav12_xor_increment
+ bl IncrementGameStat
_080242B2:
ldr r1, _080242C4 @ =gUnknown_02024C10
ldr r0, [r1]
@@ -57653,7 +57653,7 @@ _0802AA08:
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
- bl sub_8090D54
+ bl GetPokedexHeightWeight
ldrh r1, [r4]
lsls r0, 16
lsrs r0, 16
diff --git a/asm/rom_810CBB4.s b/asm/rom_810CBB4.s
index 9289078b3..78fb7e6ac 100644
--- a/asm/rom_810CBB4.s
+++ b/asm/rom_810CBB4.s
@@ -776,7 +776,7 @@ _0810D1A8:
bl FlagSet
_0810D1B4:
movs r0, 0x1
- bl sub_8053108
+ bl GetGameStat
cmp r0, 0
bne _0810D1D4
ldr r2, _0810D1EC @ =gSaveBlock2
@@ -788,7 +788,7 @@ _0810D1B4:
ldrb r0, [r2, 0x11]
orrs r1, r0
movs r0, 0x1
- bl sav12_xor_set
+ bl SetGameStat
_0810D1D4:
bl SetSecretBase2Field_9
ldr r0, _0810D1EC @ =gSaveBlock2
@@ -843,7 +843,7 @@ _0810D23A:
cmp r6, 0x1
bne _0810D250
movs r0, 0x2A
- bl sav12_xor_increment
+ bl IncrementGameStat
ldr r0, _0810D264 @ =0x0000083b
bl FlagSet
_0810D250:
@@ -863,13 +863,13 @@ _0810D268: .4byte sub_8141F90
thumb_func_start sp0C8_whiteout_maybe
sp0C8_whiteout_maybe: @ 810D26C
push {lr}
- ldr r0, _0810D27C @ =c2_whiteout
+ ldr r0, _0810D27C @ =CB2_WhiteOut
bl SetMainCallback2
movs r0, 0
pop {r1}
bx r1
.align 2, 0
-_0810D27C: .4byte c2_whiteout
+_0810D27C: .4byte CB2_WhiteOut
thumb_func_end sp0C8_whiteout_maybe
thumb_func_start sub_810D280
@@ -5215,7 +5215,7 @@ _0810F400: .4byte 0x00004026
sub_810F404: @ 810F404
push {lr}
movs r0, 0x20
- bl sub_8053108
+ bl GetGameStat
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -5395,7 +5395,7 @@ GivLeadMonEffortRibbon: @ 810F54C
push {lr}
sub sp, 0x4
movs r0, 0x2A
- bl sav12_xor_increment
+ bl IncrementGameStat
ldr r0, _0810F580 @ =0x0000083b
bl FlagSet
movs r1, 0x1
@@ -5616,7 +5616,7 @@ _0810F6FC:
lsls r0, r4, 2
adds r0, r4
lsls r0, 4
- ldr r1, _0810F718 @ =gUnknown_020300A4
+ ldr r1, _0810F718 @ =gPokemonStorage + 0x4
adds r0, r1
adds r0, r6, r0
movs r1, 0xB
@@ -5627,7 +5627,7 @@ _0810F6FC:
movs r0, 0x1
b _0810F732
.align 2, 0
-_0810F718: .4byte gUnknown_020300A4
+_0810F718: .4byte gPokemonStorage + 0x4
_0810F71C:
adds r0, r4, 0x1
lsls r0, 16
diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s
index 28a8de060..a169258ae 100644
--- a/asm/rom_81258BC.s
+++ b/asm/rom_81258BC.s
@@ -21803,7 +21803,7 @@ _08135820:
adds r0, r5, r2
ldrh r1, [r0]
movs r0, 0x20
- bl sav12_xor_set
+ bl SetGameStat
b _0813589A
.align 2, 0
_08135830: .4byte 0x00000572
@@ -21985,7 +21985,7 @@ _081359A0:
adds r0, r3, r1
ldrh r1, [r0]
movs r0, 0x20
- bl sav12_xor_set
+ bl SetGameStat
b _08135A0A
.align 2, 0
_081359B0: .4byte 0x00000572
@@ -22093,7 +22093,7 @@ _08135A66:
adds r5, r0, 0
movs r0, 0x20
adds r1, r5, 0
- bl sav12_xor_set
+ bl SetGameStat
ldr r1, _08135A90 @ =0x0000270f
cmp r5, r1
bhi _08135AA4
@@ -22107,7 +22107,7 @@ _08135A94:
ldrh r5, [r1]
movs r0, 0x20
adds r1, r5, 0
- bl sav12_xor_set
+ bl SetGameStat
ldr r1, _08135AAC @ =0x0000270f
cmp r5, r1
bls _08135AB4
@@ -22179,7 +22179,7 @@ _08135B0E:
adds r0, 0xC
ldr r4, _08135B88 @ =gSaveBlock2 + 0xA
adds r1, r4, 0
- bl sub_8052D10
+ bl copy_word_to_mem
adds r0, r5, 0x4
subs r4, 0xA
adds r1, r4, 0
@@ -22651,7 +22651,7 @@ _08135EBA:
cmp r0, 0
beq _08135EC8
movs r0, 0x2A
- bl sav12_xor_increment
+ bl IncrementGameStat
_08135EC8:
pop {r3}
mov r8, r3
@@ -22708,7 +22708,7 @@ _08135F2A:
adds r0, 0xC
ldr r4, _08135FAC @ =gSaveBlock2 + 0xA
adds r1, r4, 0
- bl sub_8052D10
+ bl copy_word_to_mem
adds r0, r7, 0x4
subs r4, 0xA
adds r1, r4, 0
diff --git a/asm/roulette.s b/asm/roulette.s
index 01ff3ac8f..0704caf7f 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -2555,7 +2555,7 @@ sub_811659C: @ 811659C
cmp r0, 0
beq _08116624
movs r0, 0x1D
- bl sub_8053108
+ bl GetGameStat
ldrh r1, [r4, 0x1E]
adds r1, 0x1
strh r1, [r4, 0x1E]
@@ -2566,7 +2566,7 @@ sub_811659C: @ 811659C
movs r0, 0x1E
ldrsh r1, [r4, r0]
movs r0, 0x1D
- bl sav12_xor_set
+ bl SetGameStat
_081165E4:
ldr r1, _081165F8 @ =sub_811677C
ldr r2, _081165FC @ =0x0000ffff
diff --git a/asm/secret_base.s b/asm/secret_base.s
index 72c467e70..139375998 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -2058,7 +2058,7 @@ _080BC460: .4byte 0x00001a16
SecretBasePC_PackUp: @ 80BC464
push {lr}
movs r0, 0x14
- bl sav12_xor_increment
+ bl IncrementGameStat
bl sub_80BC440
pop {r0}
bx r0
@@ -2149,7 +2149,7 @@ sub_80BC50C: @ 80BC50C
push {r4,r5,lr}
bl sub_80BC474
movs r0, 0x14
- bl sav12_xor_increment
+ bl IncrementGameStat
ldr r4, _080BC530 @ =gSaveBlock1
ldr r0, _080BC534 @ =0x00001a16
adds r4, r0
diff --git a/asm/shop.s b/asm/shop.s
index 94ee3c867..d59f9584e 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -1820,7 +1820,7 @@ sub_80B3B80: @ 80B3B80
lsls r4, 24
lsrs r4, 24
movs r0, 0x26
- bl sav12_xor_increment
+ bl IncrementGameStat
ldr r5, _080B3BC0 @ =gSaveBlock1 + 0x490
ldr r0, _080B3BC4 @ =gUnknown_020386A0
ldr r1, [r0]
diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index ee176211f..1c374b3ea 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -1254,7 +1254,7 @@ sub_81021FC: @ 81021FC
cmp r0, 0
beq _08102220
movs r0, 0x1C
- bl sav12_xor_increment
+ bl IncrementGameStat
_08102220:
ldrh r1, [r4, 0x8]
movs r0, 0x4
diff --git a/asm/trade.s b/asm/trade.s
index 340d95606..d1fe82d6c 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -11767,7 +11767,7 @@ _0804DF50: .4byte gSystemText_Saving
_0804DF54:
bl SetSecretBase2Field_9_AndHideBG
movs r0, 0x15
- bl sav12_xor_increment
+ bl IncrementGameStat
bl sub_8125D80
ldr r1, _0804DF74 @ =gMain
ldr r2, _0804DF78 @ =0x0000043c
diff --git a/asm/tv.s b/asm/tv.s
index 6126631dd..fd5fdeeac 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -638,7 +638,7 @@ sub_80BDC14: @ 80BDC14
adds r4, r1
strb r0, [r4]
movs r0, 0x6
- bl sav12_xor_increment
+ bl IncrementGameStat
pop {r4-r6}
pop {r0}
bx r0
@@ -1136,7 +1136,7 @@ sub_80BE028: @ 80BE028
movs r1, 0x18
bl sub_80BF55C
movs r0, 0x5
- bl sub_8053108
+ bl GetGameStat
strh r0, [r4, 0x6]
movs r0, 0x19
strb r0, [r4]
@@ -1921,7 +1921,7 @@ sub_80BEA88: @ 80BEA88
ldrh r0, [r5, 0x2]
strh r0, [r4, 0x2]
movs r0, 0x5
- bl sub_8053108
+ bl GetGameStat
ldrh r1, [r5, 0x6]
subs r0, r1
strh r0, [r4, 0x6]
diff --git a/asm/weather.s b/asm/weather.s
index 7ede8e818..01190c75e 100644
--- a/asm/weather.s
+++ b/asm/weather.s
@@ -7570,7 +7570,7 @@ UpdateRainCounter: @ 8080854
bne _0808086E
_08080868:
movs r0, 0x28
- bl sav12_xor_increment
+ bl IncrementGameStat
_0808086E:
pop {r0}
bx r0
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 12:50:47 +0000