diff options
author | YamaArashi <shadow962@live.com> | 2016-09-25 01:40:53 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-09-25 01:40:53 -0700 |
commit | e5fd0e3e1b6bbbc4d506be9e450d85281c10c516 (patch) | |
tree | d851f0dc0add79a8dfdda9b687bcc58a1e15dd66 /asm/rom5.s | |
parent | 61ea6194c97fce60d5c8d17e3206156de37f600f (diff) |
begin using common symbols
Diffstat (limited to 'asm/rom5.s')
-rw-r--r-- | asm/rom5.s | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 4d9c16296..106a96d95 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -18432,7 +18432,7 @@ sub_8083BF4: @ 8083BF4 .align 2, 0 _08083C34: .4byte gUnknown_0202E8D0 _08083C38: .4byte gStringVar1 -_08083C3C: .4byte gUnknown_03002978 +_08083C3C: .4byte gLinkPlayers + 0x8 _08083C40: .4byte gStringVar2 _08083C44: .4byte gTrainerCardColorNames _08083C48: @@ -114254,7 +114254,7 @@ _080B2BC4: _080B2C14: .4byte 0x02015de0 _080B2C18: .4byte gUnknown_02038570 _080B2C1C: .4byte gUnknown_0203869A -_080B2C20: .4byte gUnknown_03002978 +_080B2C20: .4byte gLinkPlayers + 0x8 _080B2C24: adds r0, r5, 0 adds r0, 0x16 @@ -129531,7 +129531,7 @@ sub_80B9F3C: @ 80B9F3C .align 2, 0 _080B9FA4: .4byte 0x00004001 _080B9FA8: .4byte gStringVar1 -_080B9FAC: .4byte gUnknown_03002978 +_080B9FAC: .4byte gLinkPlayers + 0x8 _080B9FB0: .4byte 0x00000113 _080B9FB4: .4byte 0x00000853 _080B9FB8: @@ -129559,7 +129559,7 @@ _080B9FC8: .align 2, 0 _080B9FEC: .4byte 0x00004001 _080B9FF0: .4byte gStringVar1 -_080B9FF4: .4byte gUnknown_03002978 +_080B9FF4: .4byte gLinkPlayers + 0x8 _080B9FF8: ldr r0, _080BA008 movs r1, 0 @@ -145956,7 +145956,7 @@ _080C22E8: .4byte gUnknown_020238CC _080C22EC: .4byte gUnknown_02038572 _080C22F0: .4byte gUnknown_083D17E0 _080C22F4: .4byte gUnknown_0203869A -_080C22F8: .4byte gUnknown_03002978 +_080C22F8: .4byte gLinkPlayers + 0x8 _080C22FC: adds r1, r7, 0 adds r1, 0xB @@ -146821,7 +146821,7 @@ _080C29D4: _080C29F4: .4byte gUnknown_02038690 _080C29F8: .4byte gUnknown_0203869A _080C29FC: .4byte gStringVar1 -_080C2A00: .4byte gUnknown_03002978 +_080C2A00: .4byte gLinkPlayers + 0x8 _080C2A04: lsls r4, 6 ldr r1, _080C2A54 @@ -150546,7 +150546,7 @@ sub_80C46EC: @ 80C46EC _080C4710: .4byte gUnknown_0203869A _080C4714: .4byte gStringVar1 _080C4718: .4byte gUnknown_0202E8D0 -_080C471C: .4byte gUnknown_03002978 +_080C471C: .4byte gLinkPlayers + 0x8 _080C4720: ldr r0, _080C4734 ldr r1, _080C4738 @@ -150700,7 +150700,7 @@ _080C4812: _080C4830: .4byte gUnknown_02038690 _080C4834: .4byte gUnknown_0203869A _080C4838: .4byte gStringVar3 -_080C483C: .4byte gUnknown_03002978 +_080C483C: .4byte gLinkPlayers + 0x8 _080C4840: lsls r1, r2, 6 ldr r0, _080C4854 @@ -151582,7 +151582,7 @@ _080C4EA4: .4byte gUnknown_0202E8D0 _080C4EA8: .4byte gStringVar1 _080C4EAC: .4byte gUnknown_0203869A _080C4EB0: .4byte gStringVar2 -_080C4EB4: .4byte gUnknown_03002978 +_080C4EB4: .4byte gLinkPlayers + 0x8 _080C4EB8: ldr r0, _080C4ED8 lsls r1, r6, 6 @@ -154075,7 +154075,7 @@ sub_80C61B0: @ 80C61B0 pop {r0} bx r0 .align 2, 0 -_080C61F0: .4byte gUnknown_03007FF8 +_080C61F0: .4byte INTR_CHECK _080C61F4: .4byte REG_DISPSTAT _080C61F8: .4byte 0x04000208 _080C61FC: .4byte 0x04000200 @@ -154117,7 +154117,7 @@ ClearGpuRegBits: @ 80C6204 pop {r0} bx r0 .align 2, 0 -_080C6248: .4byte gUnknown_03007FF8 +_080C6248: .4byte INTR_CHECK _080C624C: .4byte 0x0000fffd _080C6250: .4byte REG_DISPSTAT _080C6254: .4byte 0x0000ffef @@ -302347,7 +302347,7 @@ _0810DB12: bx r1 .align 2, 0 _0810DB20: .4byte gUnknown_083D1464 -_0810DB24: .4byte gUnknown_03002978 +_0810DB24: .4byte gLinkPlayers + 0x8 thumb_func_end sub_810DAC8 thumb_func_start sub_810DB28 @@ -327008,7 +327008,7 @@ sub_811A0C0: @ 811A0C0 b _0811A0F0 .align 2, 0 _0811A0D0: .4byte gPcmDmaCounter -_0811A0D4: .4byte gUnknown_03006320 +_0811A0D4: .4byte gSoundInfo + 0x350 _0811A0D8: ldr r2, _0811A11C ldrb r1, [r2, 0xB] @@ -342099,7 +342099,7 @@ _08121830: adds r4, r0, r1 b _081219E6 .align 2, 0 -_0812183C: .4byte gUnknown_03002978 +_0812183C: .4byte gLinkPlayers + 0x8 _08121840: ldr r4, _08121850 lsls r0, r7, 3 @@ -342156,7 +342156,7 @@ _0812188C: .align 2, 0 _081218A4: .4byte 0x02000000 _081218A8: .4byte 0x00016003 -_081218AC: .4byte gUnknown_03002978 +_081218AC: .4byte gLinkPlayers + 0x8 _081218B0: ldr r4, _081218B4 b _081219E6 @@ -419260,7 +419260,7 @@ _081472D0: bx r0 .align 2, 0 _081472D8: .4byte 0xfffffc00 -_081472DC: .4byte gUnknown_030017AC +_081472DC: .4byte gMain + 0x3C _081472E0: .4byte gUnknown_0203933E thumb_func_end sub_8147218 |