diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/rom3.s | 6 | ||||
| -rw-r--r-- | asm/rom4.s | 10 | ||||
| -rw-r--r-- | asm/rom5.s | 32 | ||||
| -rw-r--r-- | asm/rom_8040EB4.s | 26 | ||||
| -rw-r--r-- | asm/rom_8065394.s | 2 |
5 files changed, 38 insertions, 38 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index a7cbd50dd..f88bd19a4 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -1519,7 +1519,7 @@ _0800C458: bx r0 .align 2, 0 _0800C468: .4byte gBitTable -_0800C46C: .4byte gUnknown_03002B84 +_0800C46C: .4byte gBlockRecvBuffer + 0x4 _0800C470: .4byte gTasks _0800C474: .4byte gUnknown_020238C5 _0800C478: .4byte 0x02015000 @@ -5077,7 +5077,7 @@ _0800DF84: .4byte 0x02000000 _0800DF88: .4byte 0x000160cb _0800DF8C: .4byte gLinkPlayers _0800DF90: .4byte gUnknown_081F9680 -_0800DF94: .4byte gUnknown_03002978 +_0800DF94: .4byte gLinkPlayers + 0x8 _0800DF98: .4byte gTasks _0800DF9C: ldr r0, _0800E010 @@ -6584,7 +6584,7 @@ _0800EC28: bx r0 .align 2, 0 _0800EC38: .4byte gEnigmaBerries -_0800EC3C: .4byte gUnknown_03002B84 +_0800EC3C: .4byte gBlockRecvBuffer + 0x4 _0800EC40: .4byte gLinkPlayers thumb_func_end sub_800EB08 diff --git a/asm/rom4.s b/asm/rom4.s index f71078d96..ae77e879c 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -3156,7 +3156,7 @@ CB2_NewGame: @ 8054410 .align 2, 0 _08054454: .4byte gUnknown_0300485C _08054458: .4byte sub_80C76A0 -_0805445C: .4byte gUnknown_03001BAC +_0805445C: .4byte gMain + 0x43C _08054460: .4byte c1_overworld _08054464: .4byte c2_overworld thumb_func_end CB2_NewGame @@ -3242,7 +3242,7 @@ CB2_LoadMap2: @ 805450C pop {r0} bx r0 .align 2, 0 -_08054528: .4byte gUnknown_03001BAC +_08054528: .4byte gMain + 0x43C _0805452C: .4byte c1_overworld _08054530: .4byte c2_overworld thumb_func_end CB2_LoadMap2 @@ -3318,7 +3318,7 @@ _080545CE: pop {r0} bx r0 .align 2, 0 -_080545D4: .4byte gUnknown_03001BAC +_080545D4: .4byte gMain + 0x43C _080545D8: .4byte sub_8055354 _080545DC: .4byte sub_8055390 _080545E0: .4byte c2_overworld @@ -3360,7 +3360,7 @@ _08054626: pop {r0} bx r0 .align 2, 0 -_0805462C: .4byte gUnknown_03001BAC +_0805462C: .4byte gMain + 0x43C _08054630: .4byte c2_overworld thumb_func_end c2_exit_to_overworld_2_local @@ -3380,7 +3380,7 @@ _0805464E: pop {r0} bx r0 .align 2, 0 -_08054654: .4byte gUnknown_03001BAC +_08054654: .4byte gMain + 0x43C _08054658: .4byte c2_overworld thumb_func_end c2_exit_to_overworld_2_link 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 diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index 51a4d8345..83ff8da4a 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -14207,7 +14207,7 @@ sub_8047CE8: @ 8047CE8 _08047D44: .4byte gWindowConfig_81E725C _08047D48: .4byte gUnknown_020296CC _08047D4C: .4byte gSaveBlock2 -_08047D50: .4byte gUnknown_03002978 +_08047D50: .4byte gLinkPlayers + 0x8 _08047D54: .4byte gUnknown_0820C14C thumb_func_end sub_8047CE8 @@ -14323,7 +14323,7 @@ _08047DEE: _08047E30: .4byte gSaveBlock2 _08047E34: .4byte gTradeUnknownSpriteCoords _08047E38: .4byte gSpriteTemplate_820C0EC -_08047E3C: .4byte gUnknown_03002978 +_08047E3C: .4byte gLinkPlayers + 0x8 _08047E40: .4byte gTradeUnknownSpriteCoords + 0x3 thumb_func_end sub_8047D58 @@ -21553,7 +21553,7 @@ _0804B7F4: .align 2, 0 _0804B8E0: .4byte gUnknown_020297D8 _0804B8E4: .4byte gUnknown_0202E8CE -_0804B8E8: .4byte gUnknown_03002978 +_0804B8E8: .4byte gLinkPlayers + 0x8 _0804B8EC: .4byte gSaveBlock2 _0804B8F0: .4byte gEnemyParty _0804B8F4: .4byte gUnknown_03004828 @@ -22633,7 +22633,7 @@ sub_804C1A8: @ 804C1A8 .align 2, 0 _0804C21C: .4byte gUnknown_03004828 _0804C220: .4byte gStringVar1 -_0804C224: .4byte gUnknown_03002978 +_0804C224: .4byte gLinkPlayers + 0x8 _0804C228: .4byte gUnknown_020297D8 _0804C22C: .4byte gEnemyParty _0804C230: .4byte gStringVar3 @@ -27068,7 +27068,7 @@ _0804E8C4: .align 2, 0 _0804E8E4: .4byte gUnknown_03004834 _0804E8E8: .4byte gUnknown_03004854 -_0804E8EC: .4byte gUnknown_03002978 +_0804E8EC: .4byte gLinkPlayers + 0x8 _0804E8F0: .4byte gSaveBlock2 _0804E8F4: .4byte gUnknown_082162B8 _0804E8F8: @@ -27097,7 +27097,7 @@ _0804E920: .align 2, 0 _0804E928: .4byte gUnknown_03004834 _0804E92C: .4byte gUnknown_03004854 -_0804E930: .4byte gUnknown_03002978 +_0804E930: .4byte gLinkPlayers + 0x8 _0804E934: .4byte gSaveBlock2 _0804E938: .4byte gUnknown_082162B8 _0804E93C: @@ -27132,7 +27132,7 @@ _0804E974: .align 2, 0 _0804E97C: .4byte gUnknown_03004834 _0804E980: .4byte gUnknown_03004854 -_0804E984: .4byte gUnknown_03002978 +_0804E984: .4byte gLinkPlayers + 0x8 _0804E988: .4byte gSaveBlock2 _0804E98C: .4byte gUnknown_082162B8 thumb_func_end sub_804E884 @@ -28289,7 +28289,7 @@ _0804F364: .4byte gUnknown_082162D4 _0804F368: .4byte gStringVar1 _0804F36C: .4byte gSprites _0804F370: .4byte gUnknown_082162C4 -_0804F374: .4byte gUnknown_03002978 +_0804F374: .4byte gLinkPlayers + 0x8 thumb_func_end BuyMenuDrawFieldObjects thumb_func_start sub_804F378 @@ -31795,7 +31795,7 @@ _08050ED8: b _08050F4C .align 2, 0 _08050F0C: .4byte gStringVar4 -_08050F10: .4byte gUnknown_03002978 +_08050F10: .4byte gLinkPlayers + 0x8 _08050F14: .4byte gOtherText_OtherCaseIsFull _08050F18: ldr r1, [r5] @@ -31831,7 +31831,7 @@ _08050F4C: b _080510C4 .align 2, 0 _08050F60: .4byte gStringVar4 -_08050F64: .4byte gUnknown_03002978 +_08050F64: .4byte gLinkPlayers + 0x8 _08050F68: .4byte gOtherText_NoBerriesForBlend _08050F6C: bl MenuUpdateWindowText @@ -32896,7 +32896,7 @@ _080517A0: _080517B8: .4byte gTasks _080517BC: .4byte gReceivedRemoteLinkPlayers _080517C0: .4byte gUnknown_03004854 -_080517C4: .4byte gUnknown_03002974 +_080517C4: .4byte gLinkPlayers + 0x4 _080517C8: .4byte gUnknown_08216284 _080517CC: .4byte gOtherText_PressAToStart _080517D0: .4byte gMain @@ -33862,7 +33862,7 @@ _08051F14: .4byte gOtherText_ResultsOfBlending _08051F18: .4byte gUnknown_03004854 _08051F1C: .4byte gLinkPlayers _08051F20: .4byte gOtherText_Berry -_08051F24: .4byte gUnknown_03002978 +_08051F24: .4byte gLinkPlayers + 0x8 _08051F28: .4byte gUnknown_082165E9 _08051F2C: .4byte gUnknown_082165EE _08051F30: .4byte gOtherText_MaxSpeed @@ -34504,7 +34504,7 @@ _0805243C: str r0, [r2] b _08052494 .align 2, 0 -_08052458: .4byte gUnknown_03002978 +_08052458: .4byte gLinkPlayers + 0x8 _0805245C: .4byte gUnknown_082165F3 _08052460: .4byte gUnknown_03004854 _08052464: diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s index e94d9b09e..f44a05351 100644 --- a/asm/rom_8065394.s +++ b/asm/rom_8065394.s @@ -20027,7 +20027,7 @@ _08071B42: pop {r0} bx r0 .align 2, 0 -_08071B48: .4byte gUnknown_03001BAC +_08071B48: .4byte gMain + 0x43C _08071B4C: .4byte sub_8071B64 _08071B50: .4byte sub_8071B54 thumb_func_end sub_8071B28 |