Merge pull request #28 from huderlem/master

5 files changed, 201 insertions, 187 deletions

diff --git a/asm/rom3.s b/asm/rom3.s
index 918df9366..d0604fed6 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -629,7 +629,7 @@ _08009BE0: .4byte 0x04000040
 _08009BE4: .4byte 0x04000048
 _08009BE8: .4byte 0x00001111
 _08009BEC: .4byte 0x04000052
-_08009BF0: .4byte 0x02024ea4
+_08009BF0: .4byte gSaveBlock2
 _08009BF4: .4byte 0x00007e04
 _08009BF8:
 	mov r1, sp
@@ -1301,7 +1301,7 @@ PrintPlayerName: @ 800A120
 	bx r0
 	.align 2, 0
 _0800A13C: .4byte gUnknown_0840DF7C
-_0800A140: .4byte 0x02024ea4
+_0800A140: .4byte gSaveBlock2
 	thumb_func_end PrintPlayerName
 
 	thumb_func_start PrintPlayTime
@@ -1334,7 +1334,7 @@ PrintPlayTime: @ 800A144
 	bx r0
 	.align 2, 0
 _0800A180: .4byte gUnknown_0840DF8B
-_0800A184: .4byte 0x02024ea4
+_0800A184: .4byte gSaveBlock2
 	thumb_func_end PrintPlayTime
 
 	thumb_func_start PrintPokedexCount
@@ -2207,7 +2207,7 @@ _0800A85A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800A860: .4byte 0x02024ea4
+_0800A860: .4byte gSaveBlock2
 _0800A864: .4byte 0x03004b20
 _0800A868: .4byte sub_800A974
 _0800A86C: .4byte 0x02020004
@@ -2530,7 +2530,7 @@ _0800AAD8:
 	bx r0
 	.align 2, 0
 _0800AAE0: .4byte 0x0202f388
-_0800AAE4: .4byte 0x02024ea4
+_0800AAE4: .4byte gSaveBlock2
 _0800AAE8: .4byte new_game_prof_birch_speech_part2_start
 	thumb_func_end sub_800AAAC
 
@@ -2974,7 +2974,7 @@ _0800AE54:
 	ldrb r5, [r4, 0x1E]
 	b _0800AE66
 	.align 2, 0
-_0800AE60: .4byte 0x02024ea4
+_0800AE60: .4byte gSaveBlock2
 _0800AE64:
 	ldrb r5, [r4, 0x1C]
 _0800AE66:
@@ -3337,7 +3337,7 @@ _0800B160: .4byte 0x03004b20
 _0800B164: .4byte 0x0000ffc4
 _0800B168: .4byte gWindowConfig_81E6C3C
 _0800B16C: .4byte gWindowConfig_81E6CE4
-_0800B170: .4byte 0x02024ea4
+_0800B170: .4byte gSaveBlock2
 _0800B174:
 	strh r0, [r4, 0x14]
 	ldrb r3, [r4, 0x1C]
@@ -4154,7 +4154,7 @@ CreateNameMenu: @ 800B770
 	bl PrintStringArray
 	b _0800B7D4
 	.align 2, 0
-_0800B7B8: .4byte 0x02024ea4
+_0800B7B8: .4byte gSaveBlock2
 _0800B7BC: .4byte gUnknown_081E79C0
 _0800B7C0:
 	adds r5, 0x1
@@ -4209,7 +4209,7 @@ set_default_player_name: @ 800B808
 	ldr r1, _0800B820
 	b _0800B826
 	.align 2, 0
-_0800B81C: .4byte 0x02024ea4
+_0800B81C: .4byte gSaveBlock2
 _0800B820: .4byte gUnknown_081E79C0
 _0800B824:
 	ldr r1, _0800B850
@@ -4237,7 +4237,7 @@ _0800B830:
 	bx r0
 	.align 2, 0
 _0800B850: .4byte gUnknown_081E79E8
-_0800B854: .4byte 0x02024ea4
+_0800B854: .4byte gSaveBlock2
 	thumb_func_end set_default_player_name
 
 	thumb_func_start sub_800B858
@@ -14722,7 +14722,7 @@ _08010B04: .4byte 0x02024db8
 _08010B08: .4byte 0x02024dbc
 _08010B0C: .4byte 0x02024c6c
 _08010B10: .4byte 0x020239f8
-_08010B14: .4byte 0x02024ea4
+_08010B14: .4byte gSaveBlock2
 _08010B18: .4byte 0x02000000
 _08010B1C: .4byte 0x00016084
 _08010B20: .4byte 0x02024c0e
@@ -67837,7 +67837,7 @@ _0802BA82:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0802BA88: .4byte 0x02024ea4
+_0802BA88: .4byte gSaveBlock2
 _0802BA8C: .4byte 0x02024c10
 	thumb_func_end sub_802B9E0
 
@@ -70826,7 +70826,7 @@ _0802D2CC: .4byte 0x02020004
 _0802D2D0: .4byte 0x02024be0
 _0802D2D4: .4byte 0x02024a60
 _0802D2D8: .4byte SpriteCallbackDummy
-_0802D2DC: .4byte 0x02024ea4
+_0802D2DC: .4byte gSaveBlock2
 	thumb_func_end sub_802D274
 
 	thumb_func_start sub_802D2E0
@@ -75881,7 +75881,7 @@ _0802FBEA:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0802FCB8: .4byte 0x02024ea4
+_0802FCB8: .4byte gSaveBlock2
 _0802FCBC: .4byte 0x02024a60
 _0802FCC0: .4byte 0x02024e8c
 _0802FCC4: .4byte gTrainerBackPicCoords
@@ -75981,7 +75981,7 @@ sub_802FCE0: @ 802FCE0
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0802FD94: .4byte 0x02024ea4
+_0802FD94: .4byte gSaveBlock2
 _0802FD98: .4byte 0x02024a60
 _0802FD9C: .4byte 0x02024e8c
 _0802FDA0: .4byte gTrainerBackPicCoords
@@ -78009,7 +78009,7 @@ _08030E08: .4byte sub_8078B34
 _08030E0C: .4byte sub_8030E38
 _08030E10: .4byte 0x0000d6f8
 _08030E14: .4byte gTrainerBackPicPaletteTable
-_08030E18: .4byte 0x02024ea4
+_08030E18: .4byte gSaveBlock2
 _08030E1C: .4byte task05_08033660
 _08030E20: .4byte 0x03004b20
 _08030E24: .4byte 0x02017810
@@ -97239,7 +97239,7 @@ _0803A8D4:
 	bl PokemonSetEncryptedField
 	b _0803AA9C
 	.align 2, 0
-_0803AA00: .4byte 0x02024ea4
+_0803AA00: .4byte gSaveBlock2
 _0803AA04: .4byte gGameLanguage
 _0803AA08: .4byte gBaseStats
 _0803AA0C: .4byte gExperienceTables
@@ -103393,7 +103393,7 @@ pokemon_catch: @ 803D91C
 	movs r5, 0
 	b _0803D94E
 	.align 2, 0
-_0803D948: .4byte 0x02024ea4
+_0803D948: .4byte gSaveBlock2
 _0803D94C:
 	adds r5, 0x1
 _0803D94E:
@@ -109852,7 +109852,7 @@ _08040B0C:
 	movs r0, 0
 	b _08040B16
 	.align 2, 0
-_08040B10: .4byte 0x02024ea4
+_08040B10: .4byte gSaveBlock2
 _08040B14:
 	movs r0, 0x1
 _08040B16:
diff --git a/asm/rom4.s b/asm/rom4.s
index e5b0b70c2..706ad6703 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -73,7 +73,7 @@ sub_8052D54: @ 8052D54
 	strb r0, [r2, 0x15]
 	bx lr
 	.align 2, 0
-_08052D74: .4byte 0x02024ea4
+_08052D74: .4byte gSaveBlock2
 	thumb_func_end sub_8052D54
 
 	thumb_func_start sub_8052D78
@@ -182,7 +182,7 @@ ClearSav2: @ 8052E24
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08052E44: .4byte 0x02024ea4
+_08052E44: .4byte gSaveBlock2
 _08052E48: .4byte 0x01000448
 	thumb_func_end ClearSav2
 
@@ -278,7 +278,7 @@ _08052E7E:
 _08052F3C: .4byte 0x03005eb8
 _08052F40: .4byte 0x020297ec
 _08052F44: .4byte 0x02025734
-_08052F48: .4byte 0x02024ea4
+_08052F48: .4byte gSaveBlock2
 _08052F4C: .4byte 0x00000bb8
 _08052F50: .4byte 0x03004350
 _08052F54: .4byte 0x00000496
@@ -4285,7 +4285,7 @@ mli4_mapscripts_and_other: @ 8054DB8
 	.align 2, 0
 _08054E14: .4byte 0x0300489c
 _08054E18: .4byte 0x03004898
-_08054E1C: .4byte 0x02024ea4
+_08054E1C: .4byte gSaveBlock2
 	thumb_func_end mli4_mapscripts_and_other
 
 	thumb_func_start sub_8054E20
@@ -40646,7 +40646,7 @@ sub_8064F08: @ 8064F08
 	bx r0
 	.align 2, 0
 _08064F30: .4byte 0x030005ac
-_08064F34: .4byte 0x02024ea4
+_08064F34: .4byte gSaveBlock2
 	thumb_func_end sub_8064F08
 
 	thumb_func_start sub_8064F38
@@ -40673,7 +40673,7 @@ sub_8064F38: @ 8064F38
 	bx r0
 	.align 2, 0
 _08064F64: .4byte 0x030005ac
-_08064F68: .4byte 0x02024ea4
+_08064F68: .4byte gSaveBlock2
 	thumb_func_end sub_8064F38
 
 	thumb_func_start sub_8064F6C
@@ -46728,7 +46728,7 @@ sub_8067BB0: @ 8067BB0
 	bx lr
 	.align 2, 0
 _08067BBC: .4byte 0x0202e8dc
-_08067BC0: .4byte 0x02024ea4
+_08067BC0: .4byte gSaveBlock2
 	thumb_func_end sub_8067BB0
 
 	thumb_func_start sA1_play_cry
@@ -49487,7 +49487,7 @@ sub_80690C8: @ 80690C8
 	bx r0
 	.align 2, 0
 _080690E4: .4byte 0x00004046
-_080690E8: .4byte 0x02024ea4
+_080690E8: .4byte gSaveBlock2
 _080690EC: .4byte 0x00000836
 	thumb_func_end sub_80690C8
 
@@ -49514,7 +49514,7 @@ sub_80690F0: @ 80690F0
 	bx r0
 	.align 2, 0
 _0806911C: .4byte 0x00004046
-_08069120: .4byte 0x02024ea4
+_08069120: .4byte gSaveBlock2
 _08069124: .4byte 0x00000302
 _08069128: .4byte 0x00000836
 	thumb_func_end sub_80690F0
@@ -49540,7 +49540,7 @@ sub_806912C: @ 806912C
 	movs r0, 0x1
 	b _08069166
 	.align 2, 0
-_08069154: .4byte 0x02024ea4
+_08069154: .4byte gSaveBlock2
 _08069158: .4byte 0x00004046
 _0806915C: .4byte 0x03020000
 _08069160: .4byte 0x00000836
@@ -51986,7 +51986,7 @@ sub_806A328: @ 806A328
 	bx r0
 	.align 2, 0
 _0806A350: .4byte 0x00000835
-_0806A354: .4byte 0x02024ea4
+_0806A354: .4byte gSaveBlock2
 _0806A358: .4byte 0x03004038
 _0806A35C: .4byte 0x00004040
 	thumb_func_end sub_806A328
@@ -53164,7 +53164,7 @@ _0806AC80:
 _0806AC98: .4byte gUnknown_08411804
 _0806AC9C: .4byte 0x03004038
 _0806ACA0: .4byte gUnknown_08411819
-_0806ACA4: .4byte 0x02024ea4
+_0806ACA4: .4byte gSaveBlock2
 _0806ACA8: .4byte gUnknown_084117E3
 _0806ACAC: .4byte 0x03001770
 _0806ACB0:
@@ -53303,7 +53303,7 @@ _0806AD96:
 _0806ADC4: .4byte 0x03004b20
 _0806ADC8: .4byte gUnknown_0841182F
 _0806ADCC: .4byte 0x03004038
-_0806ADD0: .4byte 0x02024ea4
+_0806ADD0: .4byte gSaveBlock2
 _0806ADD4: .4byte sub_806AA64
 _0806ADD8:
 	ldr r2, _0806AE04
@@ -53360,7 +53360,7 @@ _0806AE08:
 	b _0806AEC4
 	.align 2, 0
 _0806AE4C: .4byte 0x03004038
-_0806AE50: .4byte 0x02024ea4
+_0806AE50: .4byte gSaveBlock2
 _0806AE54: .4byte 0x00004040
 _0806AE58: .4byte gUnknown_08411846
 _0806AE5C:
diff --git a/asm/rom5.s b/asm/rom5.s
index 157168d6d..f04ff84fe 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -431,7 +431,7 @@ _0807B0F2:
 	b _0807B122
 	.align 2, 0
 _0807B108: .4byte 0x020239f8
-_0807B10C: .4byte 0x02024ea4
+_0807B10C: .4byte gSaveBlock2
 _0807B110:
 	ldrh r1, [r2]
 	movs r0, 0x80
@@ -687,7 +687,7 @@ _0807B2D8:
 	b _0807B37C
 	.align 2, 0
 _0807B328: .4byte 0x020239f8
-_0807B32C: .4byte 0x02024ea4
+_0807B32C: .4byte gSaveBlock2
 _0807B330: .4byte 0x02024e8c
 _0807B334: .4byte gTrainerBackPicCoords
 _0807B338:
@@ -34596,7 +34596,7 @@ _0808B962:
 	.align 2, 0
 _0808B96C: .4byte sub_808B9C4
 _0808B970: .4byte 0x03004b20
-_0808B974: .4byte 0x02024ea4
+_0808B974: .4byte gSaveBlock2
 _0808B978: .4byte gUnknown_0842C3A6
 _0808B97C: .4byte gUnknown_0842C3B0
 _0808B980: .4byte gUnknown_0842C3BE
@@ -34916,7 +34916,7 @@ sub_808BB80: @ 808BB80
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0808BC04: .4byte 0x02024ea4
+_0808BC04: .4byte gSaveBlock2
 _0808BC08: .4byte 0x03004b20
 _0808BC0C: .4byte sub_808BC10
 	thumb_func_end sub_808BB80
@@ -35544,7 +35544,7 @@ _0808C066:
 _0808C088: .4byte 0x0202ffb8
 _0808C08C: .4byte 0x0202ffba
 _0808C090: .4byte 0x03005ce8
-_0808C094: .4byte 0x02024ea4
+_0808C094: .4byte gSaveBlock2
 _0808C098: .4byte 0x0202606c
 _0808C09C: .4byte 0x00003154
 	thumb_func_end sub_808C02C
@@ -36002,7 +36002,7 @@ _0808C3FA:
 _0808C448: .4byte 0x0202ffb4
 _0808C44C: .4byte 0x02019800
 _0808C450: .4byte sub_808C608
-_0808C454: .4byte 0x02024ea4
+_0808C454: .4byte gSaveBlock2
 _0808C458: .4byte 0x00000612
 _0808C45C: .4byte 0x00000616
 _0808C460: .4byte 0x0202ffb8
@@ -36986,7 +36986,7 @@ _0808CC9C:
 	bx r0
 	.align 2, 0
 _0808CCA4: .4byte 0x0202f388
-_0808CCA8: .4byte 0x02024ea4
+_0808CCA8: .4byte gSaveBlock2
 _0808CCAC: .4byte 0x0202ffb4
 _0808CCB0: .4byte 0x00000612
 _0808CCB4: .4byte 0x00000616
@@ -42365,7 +42365,7 @@ _0808F802:
 	bl audio_play
 	b _0808F874
 	.align 2, 0
-_0808F828: .4byte 0x02024ea4
+_0808F828: .4byte gSaveBlock2
 _0808F82C: .4byte 0x0202ffb4
 _0808F830: .4byte 0x0000064d
 _0808F834:
@@ -42406,7 +42406,7 @@ _0808F874:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0808F87C: .4byte 0x02024ea4
+_0808F87C: .4byte gSaveBlock2
 _0808F880: .4byte 0x0202ffb4
 _0808F884: .4byte 0x0000064d
 	thumb_func_end sub_808F6CC
@@ -43167,7 +43167,7 @@ _0808FEDA:
 	bl audio_play
 	b _0808FF9E
 	.align 2, 0
-_0808FF14: .4byte 0x02024ea4
+_0808FF14: .4byte gSaveBlock2
 _0808FF18: .4byte 0x03007380
 _0808FF1C: .4byte 0x0202ffb4
 _0808FF20: .4byte 0x0000064f
@@ -43200,7 +43200,7 @@ _0808FF48:
 	bl audio_play
 	b _0808FF9E
 	.align 2, 0
-_0808FF60: .4byte 0x02024ea4
+_0808FF60: .4byte gSaveBlock2
 _0808FF64: .4byte 0x0202ffbc
 _0808FF68:
 	movs r0, 0x15
@@ -43466,7 +43466,7 @@ _08090174:
 	.align 2, 0
 _080901AC: .4byte gWindowConfig_81E702C
 _080901B0: .4byte gUnknown_0840E035
-_080901B4: .4byte 0x02024ea4
+_080901B4: .4byte gSaveBlock2
 _080901B8: .4byte 0x03001770
 _080901BC: .4byte 0x0000043c
 _080901C0:
@@ -43544,7 +43544,7 @@ _080901D4:
 	adds r1, r2
 	b _08090368
 	.align 2, 0
-_0809025C: .4byte 0x02024ea4
+_0809025C: .4byte gSaveBlock2
 _08090260: .4byte 0x02020004
 _08090264: .4byte gPokedexEntries
 _08090268: .4byte 0x0202ffbc
@@ -43796,7 +43796,7 @@ _0809047A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08090484: .4byte 0x02024ea4
+_08090484: .4byte gSaveBlock2
 _08090488: .4byte 0x0202ffb4
 _0809048C: .4byte 0x0000064f
 _08090490: .4byte 0x03004b20
@@ -44987,7 +44987,7 @@ _08090E08:
 	mvns r3, r5
 	b _08090E8E
 	.align 2, 0
-_08090E14: .4byte 0x02024ea4
+_08090E14: .4byte gSaveBlock2
 _08090E18: .4byte 0x02025734
 _08090E1C: .4byte 0x00000938
 _08090E20: .4byte 0x00003a8c
@@ -45027,7 +45027,7 @@ _08090E62:
 	movs r6, 0x1
 	b _08090F0A
 	.align 2, 0
-_08090E68: .4byte 0x02024ea4
+_08090E68: .4byte gSaveBlock2
 _08090E6C: .4byte 0x02025734
 _08090E70: .4byte 0x00000938
 _08090E74: .4byte 0x00003a8c
@@ -45091,7 +45091,7 @@ _08090EBC:
 	strb r0, [r1]
 	b _08090F0A
 	.align 2, 0
-_08090EEC: .4byte 0x02024ea4
+_08090EEC: .4byte gSaveBlock2
 _08090EF0: .4byte 0x02025734
 _08090EF4: .4byte 0x00000938
 _08090EF8: .4byte 0x00003a8c
@@ -45109,7 +45109,7 @@ _08090F0A:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08090F14: .4byte 0x02024ea4
+_08090F14: .4byte gSaveBlock2
 	thumb_func_end sub_8090D90
 
 	thumb_func_start pokedex_count
@@ -46501,7 +46501,7 @@ _08091958:
 _0809198C: .4byte gMonFrontPicTable
 _08091990: .4byte gMonFrontPicCoords
 _08091994: .4byte gUnknown_083B5584
-_08091998: .4byte 0x02024ea4
+_08091998: .4byte gSaveBlock2
 _0809199C:
 	lsls r6, r7, 3
 	ldr r0, _08091A30
@@ -46578,7 +46578,7 @@ _080919CE:
 _08091A30: .4byte gMonFrontPicTable
 _08091A34: .4byte gMonFrontPicCoords
 _08091A38: .4byte gUnknown_083B5584
-_08091A3C: .4byte 0x02024ea4
+_08091A3C: .4byte gSaveBlock2
 _08091A40: .4byte gMonPaletteTable
 _08091A44: .4byte 0x02024e8c
 _08091A48: .4byte 0x02020004
@@ -47649,7 +47649,7 @@ _080922B8: .4byte 0x0202ffba
 _080922BC: .4byte 0x0202ffb4
 _080922C0: .4byte 0x0000062a
 _080922C4: .4byte 0x0202ffb8
-_080922C8: .4byte 0x02024ea4
+_080922C8: .4byte gSaveBlock2
 _080922CC: .4byte 0x00000614
 _080922D0: .4byte sub_80927B8
 _080922D4:
@@ -49893,7 +49893,7 @@ _08093484:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080934A4: .4byte 0x02024ea4
+_080934A4: .4byte gSaveBlock2
 _080934A8: .4byte 0x00000801
 _080934AC: .4byte 0x0000270f
 _080934B0: .4byte 0x000003e7
@@ -50438,7 +50438,7 @@ sub_8093864: @ 8093864
 	bx r1
 	.align 2, 0
 _080938A0: .4byte 0x02000000
-_080938A4: .4byte 0x02024ea4
+_080938A4: .4byte gSaveBlock2
 	thumb_func_end sub_8093864
 
 	thumb_func_start sub_80938A8
@@ -51769,7 +51769,7 @@ _08094272:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08094294: .4byte 0x02024ea4
+_08094294: .4byte gSaveBlock2
 _08094298: .4byte 0x02000000
 	thumb_func_end sub_8094250
 
@@ -52192,7 +52192,7 @@ _0809459E:
 	bx r0
 	.align 2, 0
 _080945B4: .4byte gUnknown_0842C979
-_080945B8: .4byte 0x02024ea4
+_080945B8: .4byte gSaveBlock2
 _080945BC: .4byte gUnknown_0842C97D
 	thumb_func_end unref_sub_8094588
 
@@ -52414,7 +52414,7 @@ sub_8094740: @ 8094740
 	bx r0
 	.align 2, 0
 _08094770: .4byte gUnknown_0842C983
-_08094774: .4byte 0x02024ea4
+_08094774: .4byte gSaveBlock2
 	thumb_func_end sub_8094740
 
 	thumb_func_start sub_8094778
@@ -52555,7 +52555,7 @@ sub_8094844: @ 8094844
 	bx r0
 	.align 2, 0
 _08094888: .4byte gUnknown_0842C99A
-_0809488C: .4byte 0x02024ea4
+_0809488C: .4byte gSaveBlock2
 	thumb_func_end sub_8094844
 
 	thumb_func_start GetBadgeCount
@@ -68371,7 +68371,7 @@ _0809C5E8:
 	movs r0, 0xA
 	b _0809C658
 	.align 2, 0
-_0809C600: .4byte 0x02024ea4
+_0809C600: .4byte gSaveBlock2
 _0809C604:
 	movs r0, 0x80
 	lsls r0, 1
@@ -68751,7 +68751,7 @@ _0809C8CC:
 	movs r0, 0xA
 	b _0809C93E
 	.align 2, 0
-_0809C8D0: .4byte 0x02024ea4
+_0809C8D0: .4byte gSaveBlock2
 _0809C8D4:
 	movs r0, 0x80
 	lsls r0, 1
@@ -76600,7 +76600,7 @@ _080A06EA:
 	.align 2, 0
 _080A06F0: .4byte 0x0000ffff
 _080A06F4: .4byte 0x020231cc
-_080A06F8: .4byte 0x02024ea4
+_080A06F8: .4byte gSaveBlock2
 _080A06FC: .4byte 0x020232cc
 _080A0700:
 	movs r0, 0x1
@@ -81551,7 +81551,7 @@ _080A2C88:
 	.align 2, 0
 _080A2D00: .4byte 0x02025734
 _080A2D04: .4byte 0x00002b6c
-_080A2D08: .4byte 0x02024ea4
+_080A2D08: .4byte gSaveBlock2
 _080A2D0C: .4byte 0x02028280
 _080A2D10: .4byte 0x0000ffff
 _080A2D14: .4byte 0x02028292
@@ -82598,7 +82598,7 @@ _080A3598:
 	bl LoadCompressedPalette
 	b _080A35EA
 	.align 2, 0
-_080A35A4: .4byte 0x02024ea4
+_080A35A4: .4byte gSaveBlock2
 _080A35A8: .4byte 0x03000701
 _080A35AC: .4byte gUnknown_08E76F94
 _080A35B0:
@@ -82623,7 +82623,7 @@ _080A35D0:
 	bl LoadCompressedObjectPic
 	b _080A35EA
 	.align 2, 0
-_080A35D8: .4byte 0x02024ea4
+_080A35D8: .4byte gSaveBlock2
 _080A35DC: .4byte 0x03000701
 _080A35E0: .4byte gUnknown_083C1CC8
 _080A35E4:
@@ -104420,7 +104420,7 @@ _080AE0CE:
 	movs r1, 0xD8
 	b _080AE108
 	.align 2, 0
-_080AE0F0: .4byte 0x02024ea4
+_080AE0F0: .4byte gSaveBlock2
 _080AE0F4: .4byte 0x0203869a
 _080AE0F8: .4byte 0x02038695
 _080AE0FC: .4byte 0x0203857d
@@ -132731,7 +132731,7 @@ _080BB950: .4byte 0x00001a08
 _080BB954: .4byte 0x00001a11
 _080BB958: .4byte 0x02024eae
 _080BB95C: .4byte 0x00004054
-_080BB960: .4byte 0x02024ea4
+_080BB960: .4byte gSaveBlock2
 _080BB964: .4byte 0x0202713e
 _080BB968: .4byte 0x00004026
 _080BB96C: .4byte 0x0202e828
@@ -136105,7 +136105,7 @@ _080BD372:
 	movs r0, 0
 	b _080BD3D4
 	.align 2, 0
-_080BD378: .4byte 0x02024ea4
+_080BD378: .4byte gSaveBlock2
 _080BD37C:
 	movs r2, 0
 	adds r3, r5, 0
@@ -137711,7 +137711,7 @@ _080BDF98: .4byte 0x0000ffff
 _080BDF9C: .4byte gSpeciesNames
 _080BDFA0: .4byte 0x02027e6c
 _080BDFA4: .4byte 0x03005d38
-_080BDFA8: .4byte 0x02024ea4
+_080BDFA8: .4byte gSaveBlock2
 _080BDFAC:
 	movs r2, 0
 	ldr r0, _080BE01C
@@ -137770,7 +137770,7 @@ _080BE012:
 	bx r0
 	.align 2, 0
 _080BE01C: .4byte 0x02024c04
-_080BE020: .4byte 0x02024ea4
+_080BE020: .4byte gSaveBlock2
 _080BE024: .4byte 0x0300430a
 	thumb_func_end sub_80BDEC8
 
@@ -137902,7 +137902,7 @@ _080BE124: .4byte 0x02027e6c
 _080BE128: .4byte 0x03005d38
 _080BE12C: .4byte 0x030042e0
 _080BE130: .4byte 0x0202e828
-_080BE134: .4byte 0x02024ea4
+_080BE134: .4byte gSaveBlock2
 	thumb_func_end sub_80BE074
 
 	thumb_func_start sub_80BE138
@@ -138033,7 +138033,7 @@ _080BE224:
 _080BE22C: .4byte 0x020281cc
 _080BE230: .4byte 0x03005d38
 _080BE234: .4byte 0xfffffca0
-_080BE238: .4byte 0x02024ea4
+_080BE238: .4byte gSaveBlock2
 	thumb_func_end sub_80BE188
 
 	thumb_func_start sub_80BE23C
@@ -138196,7 +138196,7 @@ sub_80BE320: @ 80BE320
 	.align 2, 0
 _080BE384: .4byte 0x03005d38
 _080BE388: .4byte 0x02027e6c
-_080BE38C: .4byte 0x02024ea4
+_080BE38C: .4byte gSaveBlock2
 _080BE390: .4byte 0x00000484
 _080BE394: .4byte 0x00000482
 _080BE398: .4byte 0x00000555
@@ -138302,7 +138302,7 @@ _080BE464: .4byte 0x02027e6c
 _080BE468: .4byte 0x03005d38
 _080BE46C: .4byte 0x02038724
 _080BE470: .4byte 0x0202e828
-_080BE474: .4byte 0x02024ea4
+_080BE474: .4byte gSaveBlock2
 	thumb_func_end sub_80BE3BC
 
 	thumb_func_start sub_80BE478
@@ -138409,7 +138409,7 @@ _080BE554: .4byte 0x0202e8dc
 _080BE558: .4byte 0x0202e8cc
 _080BE55C: .4byte 0x03004360
 _080BE560: .4byte 0x020231cc
-_080BE564: .4byte 0x02024ea4
+_080BE564: .4byte gSaveBlock2
 _080BE568: .4byte 0x03005d38
 _080BE56C: .4byte 0x02027e6c
 	thumb_func_end sub_80BE478
@@ -138526,7 +138526,7 @@ sub_80BE5FC: @ 80BE5FC
 	.align 2, 0
 _080BE64C: .4byte 0x03005d38
 _080BE650: .4byte 0x02027e6c
-_080BE654: .4byte 0x02024ea4
+_080BE654: .4byte gSaveBlock2
 _080BE658: .4byte 0x03004360
 	thumb_func_end sub_80BE5FC
 
@@ -138561,7 +138561,7 @@ sub_80BE65C: @ 80BE65C
 	.align 2, 0
 _080BE694: .4byte 0x03005d38
 _080BE698: .4byte 0x02027e6c
-_080BE69C: .4byte 0x02024ea4
+_080BE69C: .4byte gSaveBlock2
 	thumb_func_end sub_80BE65C
 
 	thumb_func_start sub_80BE6A0
@@ -138656,7 +138656,7 @@ _080BE760: .4byte 0x03005d38
 _080BE764: .4byte 0x02027e6c
 _080BE768: .4byte 0x03004360
 _080BE76C: .4byte 0x0202e8d2
-_080BE770: .4byte 0x02024ea4
+_080BE770: .4byte gSaveBlock2
 	thumb_func_end sub_80BE6A0
 
 	thumb_func_start nullsub_21
@@ -139030,7 +139030,7 @@ _080BEA3C: .4byte 0x02027e6c
 _080BEA40: .4byte 0x03005d38
 _080BEA44: .4byte 0x020387e2
 _080BEA48: .4byte 0x020387e0
-_080BEA4C: .4byte 0x02024ea4
+_080BEA4C: .4byte gSaveBlock2
 	thumb_func_end sub_80BE9D4
 
 	thumb_func_start sub_80BEA50
@@ -139134,7 +139134,7 @@ _080BEB0C: .4byte 0x020281cc
 _080BEB10: .4byte 0x0000ffff
 _080BEB14: .4byte 0xfffffca0
 _080BEB18: .4byte 0x03005d38
-_080BEB1C: .4byte 0x02024ea4
+_080BEB1C: .4byte gSaveBlock2
 	thumb_func_end sub_80BEA88
 
 	thumb_func_start sub_80BEB20
@@ -141367,7 +141367,7 @@ sub_80BFB94: @ 80BFB94
 	orrs r0, r1
 	bx lr
 	.align 2, 0
-_080BFBAC: .4byte 0x02024ea4
+_080BFBAC: .4byte gSaveBlock2
 	thumb_func_end sub_80BFB94
 
 	thumb_func_start CheckForBigMovieOrEmergencyNewsOnTV
@@ -141391,7 +141391,7 @@ _080BFBCC:
 	b _080BFC0A
 	.align 2, 0
 _080BFBD0: .4byte 0x02025734
-_080BFBD4: .4byte 0x02024ea4
+_080BFBD4: .4byte gSaveBlock2
 _080BFBD8:
 	movs r0, 0x5
 	ldrsb r0, [r1, r0]
@@ -141448,7 +141448,7 @@ GetMomOrDadStringForTVMessage: @ 80BFC10
 	b _080BFC6C
 	.align 2, 0
 _080BFC40: .4byte 0x02025734
-_080BFC44: .4byte 0x02024ea4
+_080BFC44: .4byte gSaveBlock2
 _080BFC48: .4byte 0x020231cc
 _080BFC4C: .4byte gUnknown_0840FF36
 _080BFC50: .4byte 0x00004003
@@ -153231,7 +153231,7 @@ _080C5B74:
 	bx r0
 	.align 2, 0
 _080C5B7C: .4byte 0x020232cc
-_080C5B80: .4byte 0x02024ea4
+_080C5B80: .4byte gSaveBlock2
 	thumb_func_end sub_80C5B1C
 
 	thumb_func_start sub_80C5B84
@@ -225951,7 +225951,7 @@ _080E8CD0:
 	bx r0
 	.align 2, 0
 _080E8CDC: .4byte gSpriteTemplate_83DBD48
-_080E8CE0: .4byte 0x02024ea4
+_080E8CE0: .4byte gSaveBlock2
 _080E8CE4: .4byte SpriteCallbackDummy
 _080E8CE8: .4byte 0x02020004
 	thumb_func_end sub_80E8BF4
@@ -233170,7 +233170,7 @@ _080EC52C:
 	adds r1, r2
 	b _080EC64C
 	.align 2, 0
-_080EC53C: .4byte 0x02024ea4
+_080EC53C: .4byte gSaveBlock2
 _080EC540: .4byte 0x02000000
 _080EC544:
 	bl sub_80EEF34
@@ -233520,7 +233520,7 @@ _080EC800:
 	bx r0
 	.align 2, 0
 _080EC808: .4byte 0x0202f388
-_080EC80C: .4byte 0x02024ea4
+_080EC80C: .4byte gSaveBlock2
 _080EC810: .4byte 0x02000000
 _080EC814: .4byte 0x00006e90
 _080EC818: .4byte sub_80EC00C
@@ -239531,7 +239531,7 @@ _080EF8FC:
 	.align 2, 0
 _080EF914: .4byte gUnknown_083DFEC4
 _080EF918: .4byte 0x00006e18
-_080EF91C: .4byte 0x02024ea4
+_080EF91C: .4byte gSaveBlock2
 _080EF920:
 	bl sub_80FA940
 	lsls r0, 24
@@ -255049,7 +255049,7 @@ sub_80F728C: @ 80F728C
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080F72C4: .4byte 0x02024ea4
+_080F72C4: .4byte gSaveBlock2
 _080F72C8: .4byte 0x020388b8
 _080F72CC: .4byte 0x000010b0
 _080F72D0: .4byte 0x01000800
@@ -256096,7 +256096,7 @@ sub_80F7AA4: @ 80F7AA4
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
-_080F7AC8: .4byte 0x02024ea4
+_080F7AC8: .4byte gSaveBlock2
 _080F7ACC: .4byte _080F7AD0
 	.align 2, 0
 _080F7AD0:
@@ -256211,7 +256211,7 @@ _080F7B78:
 	bx r0
 	.align 2, 0
 _080F7B98: .4byte 0x020284c8
-_080F7B9C: .4byte 0x02024ea4
+_080F7B9C: .4byte gSaveBlock2
 	thumb_func_end sub_80F7B40
 
 	thumb_func_start sub_80F7BA0
@@ -257607,7 +257607,7 @@ sub_80F8598: @ 80F8598
 	bx r0
 	.align 2, 0
 _080F85EC: .4byte 0x020284c8
-_080F85F0: .4byte 0x02024ea4
+_080F85F0: .4byte gSaveBlock2
 _080F85F4: .4byte 0x020231cc
 _080F85F8: .4byte 0x020232cc
 	thumb_func_end sub_80F8598
@@ -258378,7 +258378,7 @@ _080F8C00: .4byte gMailGraphicsTable
 _080F8C04: .4byte 0x02000000
 _080F8C08: .4byte 0x0202eac8
 _080F8C0C: .4byte gUnknown_083E562C
-_080F8C10: .4byte 0x02024ea4
+_080F8C10: .4byte gSaveBlock2
 _080F8C14:
 	ldr r0, _080F8C28
 	adds r0, 0xF8
@@ -259227,7 +259227,7 @@ sub_80F9284: @ 80F9284
 	movs r0, 0x1
 	b _080F92B8
 	.align 2, 0
-_080F92A0: .4byte 0x02024ea4
+_080F92A0: .4byte gSaveBlock2
 _080F92A4: .4byte 0x03001770
 _080F92A8:
 	movs r0, 0x80
@@ -259261,7 +259261,7 @@ sub_80F92BC: @ 80F92BC
 	movs r0, 0x1
 	b _080F92F0
 	.align 2, 0
-_080F92D8: .4byte 0x02024ea4
+_080F92D8: .4byte gSaveBlock2
 _080F92DC: .4byte 0x03001770
 _080F92E0:
 	movs r0, 0x80
@@ -264886,7 +264886,7 @@ _080FBDA4: .4byte gUnknown_083E7708
 _080FBDA8: .4byte gUnknown_083E7718
 _080FBDAC: .4byte gDummySpriteAffineAnimTable
 _080FBDB0: .4byte SpriteCallbackDummy
-_080FBDB4: .4byte 0x02024ea4
+_080FBDB4: .4byte gSaveBlock2
 _080FBDB8: .4byte gUnknown_083E5CE0
 _080FBDBC: .4byte gUnknown_083E5CC0
 _080FBDC0: .4byte 0x020388cc
@@ -266101,7 +266101,7 @@ _080FC710:
 	movs r1, 0xC
 	b _080FC73A
 	.align 2, 0
-_080FC720: .4byte 0x02024ea4
+_080FC720: .4byte gSaveBlock2
 _080FC724:
 	ldr r0, _080FC744
 	bl FlagGet
@@ -272560,7 +272560,7 @@ _080FF8DE:
 	.align 2, 0
 _080FF8F0: .4byte 0x03004b20
 _080FF8F4: .4byte gUnknown_083EC900
-_080FF8F8: .4byte 0x02024ea4
+_080FF8F8: .4byte gSaveBlock2
 _080FF8FC: .4byte SpriteCallbackDummy
 _080FF900:
 	ldr r1, _080FF94C
@@ -275329,7 +275329,7 @@ _08100DD8: .4byte 0x020391a8
 _08100DDC: .4byte 0x02020004
 _08100DE0: .4byte 0x03004880
 _08100DE4: .4byte gSpriteTemplate_83ECA88
-_08100DE8: .4byte 0x02024ea4
+_08100DE8: .4byte gSaveBlock2
 _08100DEC: .4byte SpriteCallbackDummy
 _08100DF0:
 	ldr r1, _08100E5C
@@ -276501,7 +276501,7 @@ sub_81016C8: @ 81016C8
 	bl LoadSpritePalette
 	b _081016EA
 	.align 2, 0
-_081016DC: .4byte 0x02024ea4
+_081016DC: .4byte gSaveBlock2
 _081016E0: .4byte gUnknown_083ECA5C
 _081016E4:
 	ldr r0, _081016F0
@@ -294588,7 +294588,7 @@ _08109E20: .4byte 0x020284c8
 _08109E24: .4byte 0x0202e8d0
 _08109E28: .4byte 0x0202e8cc
 _08109E2C: .4byte 0x0202e8ce
-_08109E30: .4byte 0x02024ea4
+_08109E30: .4byte gSaveBlock2
 	thumb_func_end sub_8109DE0
 
 	thumb_func_start sub_8109E34
@@ -301119,7 +301119,7 @@ _0810D1D4:
 	b _0810D1F6
 	.align 2, 0
 _0810D1E8: .4byte 0x02039324
-_0810D1EC: .4byte 0x02024ea4
+_0810D1EC: .4byte gSaveBlock2
 _0810D1F0:
 	movs r0, 0x2
 	bl sub_80537CC
@@ -303254,7 +303254,7 @@ sub_810E278: @ 810E278
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0810E294: .4byte 0x02024ea4
+_0810E294: .4byte gSaveBlock2
 	thumb_func_end sub_810E278
 
 	thumb_func_start sub_810E298
@@ -303269,7 +303269,7 @@ sub_810E298: @ 810E298
 	bl StringCopy
 	b _0810E2C0
 	.align 2, 0
-_0810E2AC: .4byte 0x02024ea4
+_0810E2AC: .4byte gSaveBlock2
 _0810E2B0: .4byte 0x020231cc
 _0810E2B4: .4byte gUnknown_084107B2
 _0810E2B8:
@@ -303296,7 +303296,7 @@ sub_810E2CC: @ 810E2CC
 	bl StringCopy
 	b _0810E2F4
 	.align 2, 0
-_0810E2E0: .4byte 0x02024ea4
+_0810E2E0: .4byte gSaveBlock2
 _0810E2E4: .4byte 0x020231cc
 _0810E2E8: .4byte gUnknown_084107C7
 _0810E2EC:
@@ -306292,7 +306292,7 @@ sub_810F96C: @ 810F96C
 _0810F994: .4byte 0x0202e8cc
 _0810F998: .4byte 0x03004360
 _0810F99C: .4byte 0x020231cc
-_0810F9A0: .4byte 0x02024ea4
+_0810F9A0: .4byte gSaveBlock2
 _0810F9A4:
 	movs r0, 0
 _0810F9A6:
@@ -306423,7 +306423,7 @@ _0810FA90:
 	bx r0
 	.align 2, 0
 _0810FA94: .4byte 0x02025734
-_0810FA98: .4byte 0x02024ea4
+_0810FA98: .4byte gSaveBlock2
 _0810FA9C: .4byte 0x000013c4
 	thumb_func_end sub_810FA74
 
@@ -306465,7 +306465,7 @@ _0810FAE8:
 	.align 2, 0
 _0810FAF0: .4byte 0x02025734
 _0810FAF4: .4byte 0x000013c2
-_0810FAF8: .4byte 0x02024ea4
+_0810FAF8: .4byte gSaveBlock2
 _0810FAFC: .4byte 0x000013c4
 _0810FB00: .4byte 0x00000315
 _0810FB04: .4byte 0x00000316
@@ -306736,7 +306736,7 @@ sub_810FCE8: @ 810FCE8
 	mov r8, r0
 	b _0810FD36
 	.align 2, 0
-_0810FD08: .4byte 0x02024ea4
+_0810FD08: .4byte gSaveBlock2
 _0810FD0C: .4byte 0x000003e6
 _0810FD10: .4byte 0x02025734
 _0810FD14: .4byte 0x000013c4
@@ -307844,7 +307844,7 @@ _08110584:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08110588: .4byte 0x02024ea4
+_08110588: .4byte gSaveBlock2
 _0811058C: .4byte 0x00000574
 _08110590: .4byte 0x0000270f
 	thumb_func_end sub_811056C
@@ -309607,7 +309607,7 @@ _08111308:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0811130C: .4byte 0x02024ea4
+_0811130C: .4byte gSaveBlock2
 _08111310: .4byte sub_8111360
 	thumb_func_end sub_81112BC
 
@@ -309974,7 +309974,7 @@ _081115EA:
 	bl audio_play
 	b _0811163C
 	.align 2, 0
-_081115F4: .4byte 0x02024ea4
+_081115F4: .4byte gSaveBlock2
 _081115F8:
 	movs r0, 0x15
 	negs r0, r0
@@ -331417,7 +331417,7 @@ _0811C284: .4byte gUnknown_083FDFF4
 _0811C288: .4byte gUnknown_083FC348
 _0811C28C: .4byte gUnknown_083FDB00
 _0811C290: .4byte gUnknown_083FDB14
-_0811C294: .4byte 0x02024ea4
+_0811C294: .4byte gSaveBlock2
 _0811C298: .4byte sub_811C77C
 _0811C29C: .4byte 0x04000200
 _0811C2A0: .4byte 0x04000004
@@ -332230,7 +332230,7 @@ sub_811C7B0: @ 811C7B0
 _0811C8EC: .4byte gUnknown_083FD850
 _0811C8F0: .4byte gUnknown_083FD86A
 _0811C8F4: .4byte 0x0200c03c
-_0811C8F8: .4byte 0x02024ea4
+_0811C8F8: .4byte gSaveBlock2
 _0811C8FC: .4byte 0x02020004
 _0811C900: .4byte sub_811C90C
 _0811C904: .4byte gUnknown_083FD856
@@ -342159,7 +342159,7 @@ _081218B0:
 	ldr r4, _081218B4
 	b _081219E6
 	.align 2, 0
-_081218B4: .4byte 0x02024ea4
+_081218B4: .4byte gSaveBlock2
 _081218B8:
 	bl sub_8082830
 	adds r4, r0, 0
@@ -343166,7 +343166,7 @@ _0812207C:
 	movs r0, 0
 	b _081220B8
 	.align 2, 0
-_08122080: .4byte 0x02024ea4
+_08122080: .4byte gSaveBlock2
 _08122084: .4byte 0x00000554
 _08122088:
 	adds r0, r4, 0
@@ -347349,7 +347349,7 @@ _08124234: .4byte gUnknown_08401D8E
 _08124238: .4byte gUnknown_08401D96
 _0812423C: .4byte gUnknown_08401D9C
 _08124240: .4byte 0x0202e8cc
-_08124244: .4byte 0x02024ea4
+_08124244: .4byte gSaveBlock2
 _08124248: .4byte sub_8123D98
 _0812424C: .4byte 0x02020004
 _08124250: .4byte gSpriteTemplate_8401D40
@@ -347555,7 +347555,7 @@ _08124322:
 	.align 2, 0
 _081243EC: .4byte 0x02039274
 _081243F0: .4byte 0x02019048
-_081243F4: .4byte 0x02024ea4
+_081243F4: .4byte gSaveBlock2
 _081243F8: .4byte sub_8123D98
 _081243FC: .4byte 0x02020004
 _08124400: .4byte gSpriteTemplate_8401D40
@@ -363366,7 +363366,7 @@ sub_812B8B8: @ 812B8B8
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0812B96C: .4byte 0x02024ea4
+_0812B96C: .4byte gSaveBlock2
 _0812B970: .4byte 0x02024a60
 _0812B974: .4byte 0x02024e8c
 _0812B978: .4byte gTrainerBackPicCoords
@@ -378752,7 +378752,7 @@ _0813312A:
 	bx r1
 	.align 2, 0
 _08133134: .4byte 0x03001770
-_08133138: .4byte 0x02024ea4
+_08133138: .4byte gSaveBlock2
 _0813313C: .4byte 0x030007b0
 	thumb_func_end sub_81330E8
 
@@ -378930,7 +378930,7 @@ _0813328A:
 	bx r1
 	.align 2, 0
 _08133294: .4byte 0x03001770
-_08133298: .4byte 0x02024ea4
+_08133298: .4byte gSaveBlock2
 _0813329C: .4byte 0x030007b0
 	thumb_func_end sub_8133248
 
@@ -381377,7 +381377,7 @@ _0813454E:
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
-_08134568: .4byte 0x02024ea4
+_08134568: .4byte gSaveBlock2
 _0813456C: .4byte 0x00000556
 _08134570: .4byte _08134574
 	.align 2, 0
@@ -381458,7 +381458,7 @@ _08134606:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08134610: .4byte 0x02024ea4
+_08134610: .4byte gSaveBlock2
 _08134614: .4byte 0x00000556
 _08134618: .4byte 0x00000557
 	thumb_func_end sub_8134548
@@ -381486,7 +381486,7 @@ sub_813461C: @ 813461C
 	strh r2, [r0]
 	bx lr
 	.align 2, 0
-_08134644: .4byte 0x02024ea4
+_08134644: .4byte gSaveBlock2
 _08134648: .4byte 0x00000556
 _0813464C: .4byte 0x0000055c
 	thumb_func_end sub_813461C
@@ -381521,7 +381521,7 @@ _08134680:
 	b _081346E2
 	.align 2, 0
 _08134684: .4byte 0x0202e8dc
-_08134688: .4byte 0x02024ea4
+_08134688: .4byte gSaveBlock2
 _0813468C: .4byte 0x0000049a
 _08134690:
 	movs r6, 0x32
@@ -381612,7 +381612,7 @@ sub_81346F4: @ 81346F4
 	strb r0, [r1]
 	b _081347DE
 	.align 2, 0
-_08134738: .4byte 0x02024ea4
+_08134738: .4byte gSaveBlock2
 _0813473C: .4byte 0x00000554
 _08134740: .4byte 0x00000564
 _08134744:
@@ -381677,7 +381677,7 @@ _081347A4:
 	b _081347E0
 	.align 2, 0
 _081347B4: .4byte 0x02024ff0
-_081347B8: .4byte 0x02024ea4
+_081347B8: .4byte gSaveBlock2
 _081347BC: .4byte 0x02025090
 _081347C0:
 	bl Random
@@ -381705,7 +381705,7 @@ _081347E0:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_081347F0: .4byte 0x02024ea4
+_081347F0: .4byte gSaveBlock2
 _081347F4: .4byte 0x00000564
 	thumb_func_end sub_81346F4
 
@@ -381742,7 +381742,7 @@ sub_81347F8: @ 81347F8
 	ldrb r1, [r4]
 	b _081349DC
 	.align 2, 0
-_08134838: .4byte 0x02024ea4
+_08134838: .4byte gSaveBlock2
 _0813483C: .4byte 0x00000554
 _08134840: .4byte 0x00000564
 _08134844: .4byte 0x00000569
@@ -381824,7 +381824,7 @@ _081348C8:
 	.align 2, 0
 _081348D8: .4byte 0x0000055c
 _081348DC: .4byte 0x0000056a
-_081348E0: .4byte 0x02024ea4
+_081348E0: .4byte gSaveBlock2
 _081348E4:
 	adds r6, r5, 0
 	mov r9, r7
@@ -381885,7 +381885,7 @@ _08134942:
 	.align 2, 0
 _08134950: .4byte 0x0000056a
 _08134954: .4byte 0x0000055c
-_08134958: .4byte 0x02024ea4
+_08134958: .4byte gSaveBlock2
 _0813495C:
 	movs r2, 0xAB
 	lsls r2, 3
@@ -381965,7 +381965,7 @@ _081349DE:
 	bx r0
 	.align 2, 0
 _081349EC: .4byte 0x0000056a
-_081349F0: .4byte 0x02024ea4
+_081349F0: .4byte gSaveBlock2
 _081349F4: .4byte 0x00000564
 _081349F8: .4byte 0x00000569
 	thumb_func_end sub_81347F8
@@ -381996,7 +381996,7 @@ _08134A18:
 	ldr r1, _08134A30
 	b _08134A38
 	.align 2, 0
-_08134A2C: .4byte 0x02024ea4
+_08134A2C: .4byte gSaveBlock2
 _08134A30: .4byte 0x0000014d
 _08134A34:
 	ldr r0, _08134A5C
@@ -382023,7 +382023,7 @@ _08134A54:
 	ldr r0, _08134A68
 	b _08134A8A
 	.align 2, 0
-_08134A5C: .4byte 0x02024ea4
+_08134A5C: .4byte gSaveBlock2
 _08134A60: .4byte 0x00000499
 _08134A64: .4byte gUnknown_08405E60
 _08134A68: .4byte gUnknown_08405E92
@@ -382143,7 +382143,7 @@ _08134B32:
 	movs r6, 0x7
 	b _08134B54
 	.align 2, 0
-_08134B3C: .4byte 0x02024ea4
+_08134B3C: .4byte gSaveBlock2
 _08134B40: .4byte 0x02024ffc
 _08134B44: .4byte 0x02024ff4
 _08134B48:
@@ -382245,7 +382245,7 @@ _08134BE0:
 	strh r5, [r2]
 	b _08134C0A
 	.align 2, 0
-_08134BFC: .4byte 0x02024ea4
+_08134BFC: .4byte gSaveBlock2
 _08134C00:
 	cmp r1, r0
 	bhi _08134C0A
@@ -382303,7 +382303,7 @@ _08134C5E:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08134C70: .4byte 0x02024ea4
+_08134C70: .4byte gSaveBlock2
 	thumb_func_end sub_8134AC0
 
 	thumb_func_start get_trainer_class_pic_index
@@ -382322,7 +382322,7 @@ get_trainer_class_pic_index: @ 8134C74
 	adds r0, r1
 	b _08134CD2
 	.align 2, 0
-_08134C90: .4byte 0x02024ea4
+_08134C90: .4byte gSaveBlock2
 _08134C94: .4byte 0x00000564
 _08134C98: .4byte gTrainerClassToPicIndex
 _08134C9C: .4byte 0x00000499
@@ -382377,7 +382377,7 @@ get_trainer_class_name_index: @ 8134CE0
 	adds r0, r1
 	b _08134D40
 	.align 2, 0
-_08134CFC: .4byte 0x02024ea4
+_08134CFC: .4byte gSaveBlock2
 _08134D00: .4byte 0x00000564
 _08134D04: .4byte gTrainerClassToNameIndex
 _08134D08: .4byte 0x00000499
@@ -382439,7 +382439,7 @@ _08134D62:
 	ble _08134D62
 	b _08134DC8
 	.align 2, 0
-_08134D74: .4byte 0x02024ea4
+_08134D74: .4byte gSaveBlock2
 _08134D78: .4byte 0x00000564
 _08134D7C: .4byte 0x0000049c
 _08134D80:
@@ -382517,7 +382517,7 @@ sub_8134DD4: @ 8134DD4
 	str r3, [sp, 0x14]
 	b _08134ED8
 	.align 2, 0
-_08134E04: .4byte 0x02024ea4
+_08134E04: .4byte gSaveBlock2
 _08134E08: .4byte 0x00000564
 _08134E0C:
 	cmp r0, 0x1D
@@ -382642,7 +382642,7 @@ _08134ED8:
 	str r2, [sp, 0x10]
 	b _08134F08
 	.align 2, 0
-_08134EF4: .4byte 0x02024ea4
+_08134EF4: .4byte gSaveBlock2
 _08134EF8: .4byte 0x00000554
 _08134EFC: .4byte gBattleTowerLevel100Mons
 _08134F00:
@@ -383313,7 +383313,7 @@ _0813543E:
 	bx r0
 	.align 2, 0
 _08135450: .4byte 0x0202e8cc
-_08135454: .4byte 0x02024ea4
+_08135454: .4byte gSaveBlock2
 _08135458: .4byte 0x00000554
 	thumb_func_end sub_81352E4
 
@@ -383346,7 +383346,7 @@ sub_8135474: @ 8135474
 	bl sub_813545C
 	b _081354C4
 	.align 2, 0
-_08135490: .4byte 0x02024ea4
+_08135490: .4byte gSaveBlock2
 _08135494: .4byte 0x00000564
 _08135498:
 	cmp r0, 0x63
@@ -383592,7 +383592,7 @@ _08135682:
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
-_0813568C: .4byte 0x02024ea4
+_0813568C: .4byte gSaveBlock2
 _08135690: .4byte 0x00000554
 _08135694: .4byte 0x0202e8cc
 _08135698: .4byte _0813569C
@@ -383819,7 +383819,7 @@ _0813586C:
 	strh r0, [r2]
 	b _0813589A
 	.align 2, 0
-_08135880: .4byte 0x02024ea4
+_08135880: .4byte gSaveBlock2
 _08135884: .4byte 0x00000574
 _08135888:
 	ldr r1, _081358A0
@@ -383862,7 +383862,7 @@ _081358BE:
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
-_081358C8: .4byte 0x02024ea4
+_081358C8: .4byte gSaveBlock2
 _081358CC: .4byte 0x00000554
 _081358D0: .4byte 0x0202e8cc
 _081358D4: .4byte _081358D8
@@ -383993,7 +383993,7 @@ _081359DC:
 	strh r0, [r2]
 	b _08135A0A
 	.align 2, 0
-_081359F0: .4byte 0x02024ea4
+_081359F0: .4byte gSaveBlock2
 _081359F4: .4byte 0x00000574
 _081359F8:
 	ldr r1, _08135A10
@@ -384074,7 +384074,7 @@ _08135A66:
 	bhi _08135AA4
 	b _08135AB4
 	.align 2, 0
-_08135A84: .4byte 0x02024ea4
+_08135A84: .4byte gSaveBlock2
 _08135A88: .4byte 0x00000554
 _08135A8C: .4byte 0x00000562
 _08135A90: .4byte 0x0000270f
@@ -384273,7 +384273,7 @@ _08135BF8:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08135C1C: .4byte 0x02024ea4
+_08135C1C: .4byte gSaveBlock2
 _08135C20: .4byte 0x00000554
 _08135C24: .4byte 0x0202e8cc
 _08135C28: .4byte 0x0000055c
@@ -384356,7 +384356,7 @@ _08135CAA:
 	bx r0
 	.align 2, 0
 _08135CBC: .4byte 0x02024f4c
-_08135CC0: .4byte 0x02024ea4
+_08135CC0: .4byte gSaveBlock2
 	thumb_func_end sub_8135C44
 
 	thumb_func_start sub_8135CC4
@@ -384460,7 +384460,7 @@ _08135D6E:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08135D74: .4byte 0x02024ea4
+_08135D74: .4byte gSaveBlock2
 _08135D78: .4byte 0x0000055c
 _08135D7C: .4byte 0x0000ffff
 _08135D80: .4byte 0x0000270f
@@ -384490,7 +384490,7 @@ sub_8135D84: @ 8135D84
 	movs r1, 0x9
 	b _08135DCC
 	.align 2, 0
-_08135DB0: .4byte 0x02024ea4
+_08135DB0: .4byte gSaveBlock2
 _08135DB4: .4byte 0x00000554
 _08135DB8: .4byte 0x0000055c
 _08135DBC: .4byte gUnknown_08405EE6
@@ -384543,7 +384543,7 @@ sub_8135DEC: @ 8135DEC
 	strh r4, [r0]
 	b _08135E40
 	.align 2, 0
-_08135E20: .4byte 0x02024ea4
+_08135E20: .4byte gSaveBlock2
 _08135E24: .4byte 0x00000554
 _08135E28: .4byte 0x020231cc
 _08135E2C: .4byte 0x0202e8dc
@@ -384634,7 +384634,7 @@ _08135EC8:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08135ED4: .4byte 0x02024ea4
+_08135ED4: .4byte gSaveBlock2
 _08135ED8: .4byte 0x00000554
 _08135EDC: .4byte 0x0202e8dc
 _08135EE0: .4byte 0x00000565
@@ -384754,7 +384754,7 @@ sub_8135FBC: @ 8135FBC
 	bx lr
 	.align 2, 0
 _08135FCC: .4byte gTrainerClassToPicIndex
-_08135FD0: .4byte 0x02024ea4
+_08135FD0: .4byte gSaveBlock2
 _08135FD4: .4byte 0x00000499
 	thumb_func_end sub_8135FBC
 
@@ -384770,7 +384770,7 @@ sub_8135FD8: @ 8135FD8
 	bx lr
 	.align 2, 0
 _08135FE8: .4byte gTrainerClassToNameIndex
-_08135FEC: .4byte 0x02024ea4
+_08135FEC: .4byte gSaveBlock2
 _08135FF0: .4byte 0x00000499
 	thumb_func_end sub_8135FD8
 
@@ -384851,7 +384851,7 @@ _08136078:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08136080: .4byte 0x02024ea4
+_08136080: .4byte gSaveBlock2
 _08136084: .4byte 0x0202e8dc
 	thumb_func_end sub_813601C
 
@@ -392555,7 +392555,7 @@ sub_8139EF8: @ 8139EF8
 	b _08139F4C
 	.align 2, 0
 _08139F24: .4byte 0x030007b4
-_08139F28: .4byte 0x02024ea4
+_08139F28: .4byte gSaveBlock2
 _08139F2C: .4byte gUnknown_08152850
 _08139F30:
 	ldr r0, _08139F38
@@ -395988,7 +395988,7 @@ _0813BA7A:
 	bx r0
 	.align 2, 0
 _0813BA80: .4byte 0x03005eb8
-_0813BA84: .4byte 0x02024ea4
+_0813BA84: .4byte gSaveBlock2
 	thumb_func_end c2_copyright_1
 
 	thumb_func_start sub_813BA88
@@ -409859,7 +409859,7 @@ sub_8142738: @ 8142738
 	bx r0
 	.align 2, 0
 _08142784: .4byte gWindowConfig_81E71B4
-_08142788: .4byte 0x02024ea4
+_08142788: .4byte gSaveBlock2
 _0814278C: .4byte 0x03004b20
 _08142790: .4byte sub_8142794
 	thumb_func_end sub_8142738
@@ -411380,7 +411380,7 @@ sub_8143300: @ 8143300
 	bx r0
 	.align 2, 0
 _081433CC: .4byte gUnknown_0840E559
-_081433D0: .4byte 0x02024ea4
+_081433D0: .4byte gSaveBlock2
 _081433D4: .4byte gUnknown_0840E560
 _081433D8: .4byte 0x020231cc
 _081433DC: .4byte gUnknown_0840DF8B
@@ -414874,7 +414874,7 @@ _08144F5C:
 	bl sub_8149368
 	b _08145034
 	.align 2, 0
-_08144FBC: .4byte 0x02024ea4
+_08144FBC: .4byte gSaveBlock2
 _08144FC0: .4byte gIntro2BrendanSpriteSheet
 _08144FC4: .4byte gUnknown_08416E34
 _08144FC8: .4byte gIntro2BicycleSpriteSheet
@@ -415796,7 +415796,7 @@ _081456EE:
 	ldr r7, [r0, 0x20]
 	b _081456FC
 	.align 2, 0
-_081456F4: .4byte 0x02024ea4
+_081456F4: .4byte gSaveBlock2
 _081456F8:
 	ldr r0, _081457E8
 	ldr r7, [r0, 0x1C]
@@ -415912,7 +415912,7 @@ _081456FC:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_081457E8: .4byte 0x02024ea4
+_081457E8: .4byte gSaveBlock2
 _081457EC: .4byte gMonFrontPicTable
 _081457F0: .4byte gMonFrontPicCoords
 _081457F4: .4byte gUnknown_0840B5A0
@@ -417324,7 +417324,7 @@ _0814634E:
 	.align 2, 0
 _0814635C: .4byte 0x020221cc
 _08146360: .4byte 0x00004042
-_08146364: .4byte 0x02024ea4
+_08146364: .4byte gSaveBlock2
 _08146368: .4byte 0x00005042
 _0814636C: .4byte 0x000003ff
 _08146370:
@@ -419765,7 +419765,7 @@ _08147794:
 	movs r0, 0
 	b _081477AE
 	.align 2, 0
-_081477A4: .4byte 0x02024ea4
+_081477A4: .4byte gSaveBlock2
 _081477A8: .4byte 0x03001770
 _081477AC:
 	movs r0, 0x1
@@ -425419,7 +425419,7 @@ sub_814A4B8: @ 814A4B8
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0814A4FC: .4byte 0x02024ea4
+_0814A4FC: .4byte gSaveBlock2
 _0814A500: .4byte 0x00000556
 _0814A504: .4byte 0x00000557
 _0814A508: .4byte 0x02024d1e
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s
index a4b7d4982..73c65e18c 100644
--- a/asm/rom_8040EB4.s
+++ b/asm/rom_8040EB4.s
@@ -804,7 +804,7 @@ _0804144A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08041490: .4byte 0x02024ea4
+_08041490: .4byte gSaveBlock2
 _08041494: .4byte 0x02025734
 _08041498: .4byte 0x00002b4c
 	thumb_func_end sub_80413C8
@@ -3754,7 +3754,7 @@ _08042B08:
 	movs r0, 0x1
 	b _08042B42
 	.align 2, 0
-_08042B30: .4byte 0x02024ea4
+_08042B30: .4byte gSaveBlock2
 _08042B34: .4byte 0x020231cc
 _08042B38: .4byte 0x020232cc
 _08042B3C: .4byte 0x020233cc
@@ -13746,7 +13746,7 @@ sub_80479F8: @ 80479F8
 	ldrb r0, [r0, 0x9]
 	bx lr
 	.align 2, 0
-_08047A00: .4byte 0x02024ea4
+_08047A00: .4byte gSaveBlock2
 	thumb_func_end sub_80479F8
 
 	thumb_func_start sub_8047A04
@@ -13756,7 +13756,7 @@ sub_8047A04: @ 8047A04
 	strb r0, [r1, 0x9]
 	bx lr
 	.align 2, 0
-_08047A0C: .4byte 0x02024ea4
+_08047A0C: .4byte gSaveBlock2
 	thumb_func_end sub_8047A04
 
 	thumb_func_start sub_8047A10
@@ -13766,7 +13766,7 @@ sub_8047A10: @ 8047A10
 	strb r0, [r1, 0x9]
 	bx lr
 	.align 2, 0
-_08047A18: .4byte 0x02024ea4
+_08047A18: .4byte gSaveBlock2
 	thumb_func_end sub_8047A10
 
 	thumb_func_start sub_8047A1C
@@ -13780,7 +13780,7 @@ sub_8047A1C: @ 8047A1C
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08047A30: .4byte 0x02024ea4
+_08047A30: .4byte gSaveBlock2
 	thumb_func_end sub_8047A1C
 
 	thumb_func_start sub_8047A34
@@ -13790,7 +13790,7 @@ sub_8047A34: @ 8047A34
 	strb r0, [r1, 0x9]
 	bx lr
 	.align 2, 0
-_08047A3C: .4byte 0x02024ea4
+_08047A3C: .4byte gSaveBlock2
 	thumb_func_end sub_8047A34
 
 	thumb_func_start sub_8047A40
@@ -14205,7 +14205,7 @@ sub_8047CE8: @ 8047CE8
 	.align 2, 0
 _08047D44: .4byte gWindowConfig_81E725C
 _08047D48: .4byte 0x020296cc
-_08047D4C: .4byte 0x02024ea4
+_08047D4C: .4byte gSaveBlock2
 _08047D50: .4byte 0x03002978
 _08047D54: .4byte gUnknown_0820C14C
 	thumb_func_end sub_8047CE8
@@ -14319,7 +14319,7 @@ _08047DEE:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08047E30: .4byte 0x02024ea4
+_08047E30: .4byte gSaveBlock2
 _08047E34: .4byte gUnknown_0820C2E6
 _08047E38: .4byte gSpriteTemplate_820C0EC
 _08047E3C: .4byte 0x03002978
@@ -21553,7 +21553,7 @@ _0804B7F4:
 _0804B8E0: .4byte 0x020297d8
 _0804B8E4: .4byte 0x0202e8ce
 _0804B8E8: .4byte 0x03002978
-_0804B8EC: .4byte 0x02024ea4
+_0804B8EC: .4byte gSaveBlock2
 _0804B8F0: .4byte 0x030045c0
 _0804B8F4: .4byte 0x03004828
 _0804B8F8: .4byte 0x0201f000
@@ -27068,7 +27068,7 @@ _0804E8C4:
 _0804E8E4: .4byte 0x03004834
 _0804E8E8: .4byte 0x03004854
 _0804E8EC: .4byte 0x03002978
-_0804E8F0: .4byte 0x02024ea4
+_0804E8F0: .4byte gSaveBlock2
 _0804E8F4: .4byte gUnknown_082162B8
 _0804E8F8:
 	ldr r0, _0804E928
@@ -27097,7 +27097,7 @@ _0804E920:
 _0804E928: .4byte 0x03004834
 _0804E92C: .4byte 0x03004854
 _0804E930: .4byte 0x03002978
-_0804E934: .4byte 0x02024ea4
+_0804E934: .4byte gSaveBlock2
 _0804E938: .4byte gUnknown_082162B8
 _0804E93C:
 	ldr r0, _0804E97C
@@ -27132,7 +27132,7 @@ _0804E974:
 _0804E97C: .4byte 0x03004834
 _0804E980: .4byte 0x03004854
 _0804E984: .4byte 0x03002978
-_0804E988: .4byte 0x02024ea4
+_0804E988: .4byte gSaveBlock2
 _0804E98C: .4byte gUnknown_082162B8
 	thumb_func_end sub_804E884
 
@@ -29960,7 +29960,7 @@ sub_80500A8: @ 80500A8
 	b _0805010A
 	.align 2, 0
 _080500EC: .4byte 0x03004854
-_080500F0: .4byte 0x02024ea4
+_080500F0: .4byte gSaveBlock2
 _080500F4: .4byte 0x03001770
 _080500F8: .4byte 0x00000201
 _080500FC:
diff --git a/include/global.h b/include/global.h
index 5e6bd5bd4..2f47e7ed0 100644
--- a/include/global.h
+++ b/include/global.h
@@ -22,6 +22,20 @@ enum
     FEMALE
 };
 
+enum
+{
+    OPTIONS_BUTTON_MODE_NORMAL,
+    OPTIONS_BUTTON_MODE_LR,
+    OPTIONS_BUTTON_MODE_L_EQUALS_A
+};
+
+enum
+{
+    OPTIONS_TEXT_SPEED_SLOW,
+    OPTIONS_TEXT_SPEED_MID,
+    OPTIONS_TEXT_SPEED_FAST
+};
+
 struct Coords16
 {
     s16 x;
@@ -39,16 +53,16 @@ struct Time
 struct SaveBlock2
 {
     u8 playerName[8];
-    u8 playerGender;
+    u8 playerGender; // MALE, FEMALE
     u8 sb2_field_9;
     u8 playerTrainerId[4];
     u16 playTimeHours;
     u8 playTimeMinutes;
     u8 playTimeSeconds;
     u8 playTimeVBlanks;
-    u8 optionsButtonMode;
-    u8 optionsTextSpeed:3;
-    u8 optionsUnk:5;
+    u8 optionsButtonMode;  // OPTIONS_BUTTON_MODE_[NORMAL/LR/L_EQUALS_A]
+    u8 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST]
+    u8 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes
     u8 filler[0x83];
     struct Time localTimeOffset;
 };