diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-11 01:01:03 -0500 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-11 01:01:03 -0500 |
commit | 531c8d8fd17b1927e9764d230458878b9eff3d52 (patch) | |
tree | 11fec9df65d1bb99f4394ca6ad439983f1d3eebb | |
parent | 7485560810130fe8bb6a78e4352f3613fdc09653 (diff) |
eliminate remaining RAM pointers in asm/
-rw-r--r-- | asm/battle_1.s | 16 | ||||
-rw-r--r-- | asm/battle_2.s | 148 | ||||
-rw-r--r-- | asm/battle_9.s | 70 | ||||
-rw-r--r-- | asm/battle_anim_80CA710.s | 56 | ||||
-rw-r--r-- | asm/battle_anim_81258BC.s | 8 | ||||
-rw-r--r-- | asm/battle_anim_812C144.s | 38 | ||||
-rw-r--r-- | asm/battle_anim_813F0F4.s | 76 | ||||
-rw-r--r-- | asm/cable_car.s | 42 | ||||
-rw-r--r-- | asm/contest.s | 702 | ||||
-rw-r--r-- | asm/contest_ai.s | 582 | ||||
-rw-r--r-- | asm/contest_effect.s | 266 | ||||
-rw-r--r-- | asm/contest_link_80C2020.s | 184 | ||||
-rw-r--r-- | asm/contest_link_80C857C.s | 36 | ||||
-rw-r--r-- | asm/easy_chat.s | 266 | ||||
-rw-r--r-- | asm/field_weather.s | 16 | ||||
-rw-r--r-- | asm/libagbsyscall.s | 2 | ||||
-rw-r--r-- | asm/pokedex_area_screen.s | 124 | ||||
-rw-r--r-- | asm/pokedex_cry_screen.s | 78 | ||||
-rw-r--r-- | asm/pokemon_item_effect.s | 4 | ||||
-rw-r--r-- | asm/pokemon_storage_system.s | 384 | ||||
-rw-r--r-- | asm/pokemon_summary_screen.s | 448 | ||||
-rw-r--r-- | asm/pokenav.s | 820 | ||||
-rw-r--r-- | asm/roulette.s | 524 | ||||
-rw-r--r-- | asm/slot_machine.s | 660 | ||||
-rw-r--r-- | src/scene/credits.c | 2 |
25 files changed, 2776 insertions, 2776 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index 44d0b245f..a0db27bf5 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -928,7 +928,7 @@ _0800DB8E: .align 2, 0 _0800DBB0: .4byte 0x00006001 _0800DBB4: - ldr r0, _0800DBD0 @ =0x02000000 + ldr r0, _0800DBD0 @ =gSharedMem ldr r1, _0800DBD4 @ =0x000160cb adds r0, r1 ldrb r0, [r0] @@ -942,7 +942,7 @@ _0800DBB4: ldrh r4, [r0, 0xE] b _0800DBE8 .align 2, 0 -_0800DBD0: .4byte 0x02000000 +_0800DBD0: .4byte gSharedMem _0800DBD4: .4byte 0x000160cb _0800DBD8: .4byte gTasks _0800DBDC: @@ -1075,7 +1075,7 @@ _0800DED4: .4byte gLinkPlayers _0800DED8: .4byte gUnknown_081F9680 _0800DEDC: .4byte gUnknown_081F9680 + 0x8 _0800DEE0: - ldr r0, _0800DF84 @ =0x02000000 + ldr r0, _0800DF84 @ =gSharedMem ldr r5, _0800DF88 @ =0x000160cb adds r0, r5 ldrb r7, [r0] @@ -1153,7 +1153,7 @@ _0800DF70: strh r0, [r1, 0x8] b _0800E212 .align 2, 0 -_0800DF84: .4byte 0x02000000 +_0800DF84: .4byte gSharedMem _0800DF88: .4byte 0x000160cb _0800DF8C: .4byte gLinkPlayers _0800DF90: .4byte gUnknown_081F9680 @@ -1178,7 +1178,7 @@ _0800DF9C: movs r2, 0x50 movs r3, 0 bl CreateSprite - ldr r4, _0800E028 @ =0x02000000 + ldr r4, _0800E028 @ =gSharedMem ldr r2, _0800E02C @ =0x0001608a adds r7, r4, r2 strb r0, [r7] @@ -1221,7 +1221,7 @@ _0800E018: .4byte 0x0000021e _0800E01C: .4byte gPlttBufferFaded _0800E020: .4byte 0x00007fff _0800E024: .4byte gSpriteTemplate_81F9574 -_0800E028: .4byte 0x02000000 +_0800E028: .4byte gSharedMem _0800E02C: .4byte 0x0001608a _0800E030: .4byte gSpriteTemplate_81F958C _0800E034: .4byte 0x0001608b @@ -1365,7 +1365,7 @@ _0800E154: mov r0, r9 bl DestroyTask ldr r4, _0800E224 @ =gSprites - ldr r0, _0800E228 @ =0x02000000 + ldr r0, _0800E228 @ =gSharedMem mov r8, r0 ldr r1, _0800E22C @ =0x0001608a add r1, r8 @@ -1464,7 +1464,7 @@ _0800E212: bx r0 .align 2, 0 _0800E224: .4byte gSprites -_0800E228: .4byte 0x02000000 +_0800E228: .4byte gSharedMem _0800E22C: .4byte 0x0001608a _0800E230: .4byte 0x0001608b _0800E234: .4byte 0x000003ff diff --git a/asm/battle_2.s b/asm/battle_2.s index f252e5716..d15bc6826 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -58,7 +58,7 @@ _08012380: .4byte _08012E94 .4byte _08012F38 _0801239C: - ldr r4, _08012434 @ =0x02000000 + ldr r4, _08012434 @ =gSharedMem ldr r0, _08012438 @ =gActiveBank ldrb r0, [r0] ldr r1, _0801243C @ =0x00016068 @@ -102,7 +102,7 @@ _0801239C: beq _080123F8 bl _08012F66 _080123F8: - ldr r0, _08012434 @ =0x02000000 + ldr r0, _08012434 @ =gSharedMem ldr r3, _08012444 @ =0x000160a6 adds r0, r3 ldrb r3, [r0] @@ -132,7 +132,7 @@ _080123F8: strb r0, [r1] bl _08012F66 .align 2, 0 -_08012434: .4byte 0x02000000 +_08012434: .4byte gSharedMem _08012438: .4byte gActiveBank _0801243C: .4byte 0x00016068 _08012440: .4byte gBattleTypeFlags @@ -273,7 +273,7 @@ _0801256C: movs r4, 0 movs r0, 0x5 strb r0, [r1] - ldr r3, _080125BC @ =0x02000000 + ldr r3, _080125BC @ =gSharedMem ldrb r0, [r2] ldr r1, _080125C0 @ =0x00016060 adds r0, r1 @@ -299,7 +299,7 @@ _0801256C: .align 2, 0 _080125B4: .4byte gBattleCommunication _080125B8: .4byte gActiveBank -_080125BC: .4byte 0x02000000 +_080125BC: .4byte gSharedMem _080125C0: .4byte 0x00016060 _080125C4: .4byte 0x00016094 _080125C8: .4byte 0x00016010 @@ -435,7 +435,7 @@ _080126D4: .4byte 0x00000902 _080126D8: .4byte gUnknown_02024C1C _080126DC: .4byte gUnknown_081D9B29 _080126E0: - ldr r3, _08012738 @ =0x02000000 + ldr r3, _08012738 @ =gSharedMem ldr r5, _0801273C @ =gActiveBank ldrb r0, [r5] ldr r4, _08012740 @ =0x00016064 @@ -480,7 +480,7 @@ _08012722: movs r2, 0x6 b _0801286C .align 2, 0 -_08012738: .4byte 0x02000000 +_08012738: .4byte gSharedMem _0801273C: .4byte gActiveBank _08012740: .4byte 0x00016064 _08012744: .4byte gBattlePartyID @@ -568,7 +568,7 @@ _080127E0: ldrb r2, [r0] lsls r0, r2, 1 adds r0, r2 - ldr r2, _08012814 @ =0x0201606c + ldr r2, _08012814 @ =gSharedMem + 0x1606C adds r0, r2 str r0, [sp] movs r0, 0 @@ -579,7 +579,7 @@ _080127E0: _08012808: .4byte gActiveBank _0801280C: .4byte gBattleMons _08012810: .4byte gLastUsedAbility -_08012814: .4byte 0x0201606c +_08012814: .4byte gSharedMem + 0x1606C _08012818: ldr r0, _08012830 @ =gActiveBank ldrb r1, [r0] @@ -590,13 +590,13 @@ _08012818: ldrb r0, [r0] cmp r0, 0x2 bne _08012840 - ldr r3, _08012838 @ =0x02000000 + ldr r3, _08012838 @ =gSharedMem ldr r4, _0801283C @ =0x00016068 b _08012854 .align 2, 0 _08012830: .4byte gActiveBank _08012834: .4byte gActionForBanks -_08012838: .4byte 0x02000000 +_08012838: .4byte gSharedMem _0801283C: .4byte 0x00016068 _08012840: mov r2, r8 @@ -607,7 +607,7 @@ _08012840: ldrb r0, [r0, 0x1] cmp r0, 0x2 bne _08012884 - ldr r3, _08012878 @ =0x02000000 + ldr r3, _08012878 @ =gSharedMem ldr r4, _0801287C @ =0x00016069 _08012854: adds r0, r3, r4 @@ -628,7 +628,7 @@ _0801286C: b _0801289E .align 2, 0 _08012874: .4byte gActionForBanks -_08012878: .4byte 0x02000000 +_08012878: .4byte gSharedMem _0801287C: .4byte 0x00016069 _08012880: .4byte 0x0001606c _08012884: @@ -636,7 +636,7 @@ _08012884: ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 - ldr r1, _080128AC @ =0x0201606c + ldr r1, _080128AC @ =gSharedMem + 0x1606C adds r0, r1 str r0, [sp] movs r0, 0 @@ -651,7 +651,7 @@ _0801289E: b _08012968 .align 2, 0 _080128A8: .4byte gActiveBank -_080128AC: .4byte 0x0201606c +_080128AC: .4byte gSharedMem + 0x1606C _080128B0: bl PlayerPartyAndPokemonStorageFull lsls r0, 24 @@ -670,7 +670,7 @@ _080128B0: movs r3, 0 movs r0, 0x5 strb r0, [r1] - ldr r1, _080128FC @ =0x02000000 + ldr r1, _080128FC @ =gSharedMem ldrb r0, [r2] ldr r4, _08012900 @ =0x00016060 adds r0, r4 @@ -687,7 +687,7 @@ _080128EC: .4byte gUnknown_02024C1C _080128F0: .4byte gActiveBank _080128F4: .4byte gUnknown_081D8E4A _080128F8: .4byte gBattleCommunication -_080128FC: .4byte 0x02000000 +_080128FC: .4byte gSharedMem _08012900: .4byte 0x00016060 _08012904: .4byte 0x00016094 _08012908: @@ -695,7 +695,7 @@ _08012908: ldrb r0, [r4] lsls r1, r0, 1 adds r1, r0 - ldr r0, _08012928 @ =0x0201606c + ldr r0, _08012928 @ =gSharedMem + 0x1606C adds r1, r0 movs r0, 0 bl EmitOpenBag @@ -704,7 +704,7 @@ _08012908: b _08012968 .align 2, 0 _08012924: .4byte gActiveBank -_08012928: .4byte 0x0201606c +_08012928: .4byte gSharedMem + 0x1606C _0801292C: ldr r4, _08012964 @ =gBattleCommunication mov r3, r8 @@ -786,7 +786,7 @@ _080129CC: movs r2, 0 movs r0, 0x5 strb r0, [r1] - ldr r1, _08012A08 @ =0x02000000 + ldr r1, _08012A08 @ =gSharedMem ldrb r0, [r3] ldr r4, _08012A0C @ =0x00016060 adds r0, r4 @@ -804,7 +804,7 @@ _080129F8: .4byte gActiveBank _080129FC: .4byte gUnknown_02024C1C _08012A00: .4byte gUnknown_081D8E44 _08012A04: .4byte gBattleCommunication -_08012A08: .4byte 0x02000000 +_08012A08: .4byte gSharedMem _08012A0C: .4byte 0x00016060 _08012A10: .4byte 0x00016094 _08012A14: @@ -923,7 +923,7 @@ _08012AFC: movs r2, 0 movs r0, 0x5 strb r0, [r1] - ldr r3, _08012B3C @ =0x02000000 + ldr r3, _08012B3C @ =gSharedMem ldrb r0, [r5] ldr r4, _08012B40 @ =0x00016060 adds r0, r4 @@ -943,11 +943,11 @@ _08012AFC: b _08012F90 .align 2, 0 _08012B38: .4byte gBattleCommunication -_08012B3C: .4byte 0x02000000 +_08012B3C: .4byte gSharedMem _08012B40: .4byte 0x00016060 _08012B44: .4byte 0x00016094 _08012B48: - ldr r6, _08012B98 @ =0x02000000 + ldr r6, _08012B98 @ =gSharedMem mov r2, r8 ldrb r0, [r2] ldr r2, _08012B9C @ =0x0001608c @@ -988,7 +988,7 @@ _08012B48: ldrb r1, [r3] b _08012E3C .align 2, 0 -_08012B98: .4byte 0x02000000 +_08012B98: .4byte gSharedMem _08012B9C: .4byte 0x0001608c _08012BA0: .4byte gChosenMovesByBanks _08012BA4: .4byte gBattleMons @@ -1042,7 +1042,7 @@ _08012C04: .4byte gBattleBufferB _08012C08: .4byte gActiveBank _08012C0C: .4byte gBattleCommunication _08012C10: - ldr r0, _08012CC4 @ =0x02000000 + ldr r0, _08012CC4 @ =gSharedMem mov r12, r0 ldr r3, _08012CC8 @ =0x00016068 adds r0, r2, r3 @@ -1134,7 +1134,7 @@ _08012CBE: ldrb r1, [r7] b _08012E3C .align 2, 0 -_08012CC4: .4byte 0x02000000 +_08012CC4: .4byte gSharedMem _08012CC8: .4byte 0x00016068 _08012CCC: .4byte gBattleTypeFlags _08012CD0: .4byte 0x0001606c @@ -1270,7 +1270,7 @@ _08012DD2: adds r0, r5, 0 eors r0, r1 bl GetBankByPlayerAI - ldr r1, _08012E20 @ =0x02000000 + ldr r1, _08012E20 @ =gSharedMem ldr r2, _08012E24 @ =0x000160a6 adds r1, r2 ldrb r1, [r1] @@ -1291,7 +1291,7 @@ _08012E10: .4byte gBattleExecBuffer _08012E14: .4byte gBitTable _08012E18: .4byte gActiveBank _08012E1C: .4byte gBattleTypeFlags -_08012E20: .4byte 0x02000000 +_08012E20: .4byte gSharedMem _08012E24: .4byte 0x000160a6 _08012E28: movs r0, 0 @@ -1346,7 +1346,7 @@ _08012E88: .4byte gBitTable _08012E8C: .4byte gActiveBank _08012E90: .4byte gBattleCommunication _08012E94: - ldr r2, _08012EB8 @ =0x02000000 + ldr r2, _08012EB8 @ =gSharedMem ldr r5, _08012EBC @ =gActiveBank ldrb r1, [r5] ldr r3, _08012EC0 @ =0x00016060 @@ -1364,7 +1364,7 @@ _08012E94: strb r1, [r0] b _08012F66 .align 2, 0 -_08012EB8: .4byte 0x02000000 +_08012EB8: .4byte gSharedMem _08012EBC: .4byte gActiveBank _08012EC0: .4byte 0x00016060 _08012EC4: .4byte gBattleCommunication @@ -1863,7 +1863,7 @@ _08013290: _080132B0: .4byte gActionForBanks _080132B4: .4byte gProtectStructs _080132B8: - ldr r1, _080132D8 @ =0x02000000 + ldr r1, _080132D8 @ =gSharedMem ldr r0, _080132DC @ =0x0001608c add r0, r9 adds r0, r1 @@ -1880,7 +1880,7 @@ _080132B8: ldrh r3, [r0] b _080132E6 .align 2, 0 -_080132D8: .4byte 0x02000000 +_080132D8: .4byte gSharedMem _080132DC: .4byte 0x0001608c _080132E0: .4byte gBattleMons _080132E4: @@ -1903,7 +1903,7 @@ _080132E6: .align 2, 0 _08013304: .4byte gProtectStructs _08013308: - ldr r1, _08013328 @ =0x02000000 + ldr r1, _08013328 @ =gSharedMem ldr r0, _0801332C @ =0x0001608c add r0, r10 adds r0, r1 @@ -1920,7 +1920,7 @@ _08013308: ldrh r2, [r0] b _08013336 .align 2, 0 -_08013328: .4byte 0x02000000 +_08013328: .4byte gSharedMem _0801332C: .4byte 0x0001608c _08013330: .4byte gBattleMons _08013334: @@ -2127,7 +2127,7 @@ _08013494: mov r9, r7 ldr r0, _08013510 @ =bc_80154A0 mov r12, r0 - ldr r1, _08013514 @ =0x02000000 + ldr r1, _08013514 @ =gSharedMem mov r10, r1 ldr r7, _08013518 @ =gNoOfAllBanks ldrb r7, [r7] @@ -2170,7 +2170,7 @@ _08013504: .4byte gUnknown_02024A76 _08013508: .4byte gTurnOrder _0801350C: .4byte gBattleMainFunc _08013510: .4byte bc_80154A0 -_08013514: .4byte 0x02000000 +_08013514: .4byte gSharedMem _08013518: .4byte gNoOfAllBanks _0801351C: .4byte 0x0001601d _08013520: @@ -2312,7 +2312,7 @@ _08013622: ldr r1, _0801364C @ =gBattleMainFunc ldr r0, _08013650 @ =bc_80154A0 str r0, [r1] - ldr r0, _08013654 @ =0x02000000 + ldr r0, _08013654 @ =gSharedMem ldr r7, _08013658 @ =0x0001601d adds r0, r7 movs r1, 0 @@ -2331,7 +2331,7 @@ _08013644: .4byte gTurnOrder _08013648: .4byte gNoOfAllBanks _0801364C: .4byte gBattleMainFunc _08013650: .4byte bc_80154A0 -_08013654: .4byte 0x02000000 +_08013654: .4byte gSharedMem _08013658: .4byte 0x0001601d thumb_func_end sub_80133C8 @@ -2536,7 +2536,7 @@ bc_80154A0: @ 80137CC ands r0, r1 cmp r0, 0 bne _08013884 - ldr r0, _08013854 @ =0x02000000 + ldr r0, _08013854 @ =gSharedMem ldr r1, _08013858 @ =0x0001601d adds r2, r0, r1 ldr r0, _0801385C @ =gNoOfAllBanks @@ -2596,7 +2596,7 @@ _080137FA: b _080138BE .align 2, 0 _08013850: .4byte gHitMarker -_08013854: .4byte 0x02000000 +_08013854: .4byte gSharedMem _08013858: .4byte 0x0001601d _0801385C: .4byte gNoOfAllBanks _08013860: .4byte gActiveBank @@ -2624,7 +2624,7 @@ _08013884: ldr r0, _080138D0 @ =gDynamicBasePower movs r3, 0 strh r2, [r0] - ldr r1, _080138D4 @ =0x02000000 + ldr r1, _080138D4 @ =gSharedMem ldr r2, _080138D8 @ =0x0001601c adds r0, r1, r2 strb r3, [r0] @@ -2649,7 +2649,7 @@ _080138C4: .4byte gCurrentMoveTurn _080138C8: .4byte gFightStateTracker _080138CC: .4byte gUnknown_02024A76 _080138D0: .4byte gDynamicBasePower -_080138D4: .4byte 0x02000000 +_080138D4: .4byte gSharedMem _080138D8: .4byte 0x0001601c _080138DC: .4byte gBattleMainFunc _080138E0: .4byte sub_80138F0 @@ -2669,7 +2669,7 @@ sub_80138F0: @ 80138F0 movs r0, 0xC strb r0, [r2] _08013900: - ldr r1, _0801394C @ =0x02000000 + ldr r1, _0801394C @ =gSharedMem ldr r4, _08013950 @ =gCurrentMoveTurn ldrb r0, [r4] ldr r3, _08013954 @ =0x00016057 @@ -2704,7 +2704,7 @@ _08013900: .align 2, 0 _08013944: .4byte gBattleOutcome _08013948: .4byte gFightStateTracker -_0801394C: .4byte 0x02000000 +_0801394C: .4byte gSharedMem _08013950: .4byte gCurrentMoveTurn _08013954: .4byte 0x00016057 _08013958: .4byte gUnknown_081FA640 @@ -3398,7 +3398,7 @@ sub_8013F54: @ 8013F54 lsrs r0, 24 cmp r0, 0x1 bhi _08013F90 - ldr r2, _08013F88 @ =0x02017140 + ldr r2, _08013F88 @ =gSharedMem + 0x17140 adds r1, r2, 0 adds r1, 0x20 ldrb r0, [r1] @@ -3416,7 +3416,7 @@ _08013F74: b _08013FAA .align 2, 0 _08013F84: .4byte gFightStateTracker -_08013F88: .4byte 0x02017140 +_08013F88: .4byte gSharedMem + 0x17140 _08013F8C: .4byte gBattleMainFunc _08013F90: ldr r0, _08013FB0 @ =gBattleExecBuffer @@ -3481,7 +3481,7 @@ sub_8013FE8: @ 8013FE8 adds r0, r1 ldrb r0, [r0] strb r0, [r7] - ldr r1, _08014034 @ =0x02000000 + ldr r1, _08014034 @ =gSharedMem mov r10, r1 ldr r0, _08014038 @ =0x000160a6 add r0, r10 @@ -3501,7 +3501,7 @@ sub_8013FE8: @ 8013FE8 _08014028: .4byte gBankAttacker _0801402C: .4byte gTurnOrder _08014030: .4byte gCurrentMoveTurn -_08014034: .4byte 0x02000000 +_08014034: .4byte gSharedMem _08014038: .4byte 0x000160a6 _0801403C: .4byte gBitTable _08014040: .4byte gFightStateTracker @@ -3741,7 +3741,7 @@ _08014218: ldrh r0, [r1] movs r1, 0 bl GetMoveTarget - ldr r2, _08014270 @ =0x02000000 + ldr r2, _08014270 @ =gSharedMem ldrb r1, [r4] ldr r3, _08014274 @ =0x00016010 adds r1, r3 @@ -3754,7 +3754,7 @@ _08014260: .4byte gBattleMons _08014264: .4byte gChosenMovesByBanks _08014268: .4byte gCurrentMove _0801426C: .4byte gUnknown_02024BE8 -_08014270: .4byte 0x02000000 +_08014270: .4byte gSharedMem _08014274: .4byte 0x00016010 _08014278: ldr r1, _08014298 @ =gCurrentMove @@ -3875,7 +3875,7 @@ _08014354: b _08014570 _08014370: ldr r3, _08014468 @ =gBattleMons - ldr r0, _0801446C @ =0x02000000 + ldr r0, _0801446C @ =gSharedMem mov r8, r0 ldr r2, _08014458 @ =gBankAttacker ldrb r5, [r2] @@ -3995,7 +3995,7 @@ _0801445C: .4byte gSideTimer _08014460: .4byte gBattleMoves _08014464: .4byte gCurrentMove _08014468: .4byte gBattleMons -_0801446C: .4byte 0x02000000 +_0801446C: .4byte gSharedMem _08014470: .4byte 0x00016010 _08014474: .4byte gActiveBank _08014478: .4byte gNoOfAllBanks @@ -4022,7 +4022,7 @@ _08014496: _080144A0: .4byte gBankTarget _080144A4: ldr r2, _080144EC @ =gBankTarget - ldr r1, _080144F0 @ =0x02000000 + ldr r1, _080144F0 @ =gSharedMem ldr r0, _080144F4 @ =gBankAttacker ldrb r0, [r0] ldr r4, _080144F8 @ =0x00016010 @@ -4059,7 +4059,7 @@ _080144D0: b _0801469A .align 2, 0 _080144EC: .4byte gBankTarget -_080144F0: .4byte 0x02000000 +_080144F0: .4byte gSharedMem _080144F4: .4byte gBankAttacker _080144F8: .4byte 0x00016010 _080144FC: .4byte gAbsentBankFlags @@ -4195,7 +4195,7 @@ _08014614: .4byte gBitTable _08014618: .4byte gBankAttacker _0801461C: ldr r5, _08014660 @ =gBankTarget - ldr r1, _08014664 @ =0x02000000 + ldr r1, _08014664 @ =gSharedMem adds r2, r3, 0 ldrb r0, [r2] ldr r4, _08014668 @ =0x00016010 @@ -4228,7 +4228,7 @@ _0801461C: b _0801469A .align 2, 0 _08014660: .4byte gBankTarget -_08014664: .4byte 0x02000000 +_08014664: .4byte gSharedMem _08014668: .4byte 0x00016010 _0801466C: .4byte gAbsentBankFlags _08014670: .4byte gBitTable @@ -4324,7 +4324,7 @@ sub_80146F4: @ 80146F4 strb r0, [r2, 0x1] ldrb r4, [r3] strb r4, [r2, 0x2] - ldr r1, _08014784 @ =0x02000000 + ldr r1, _08014784 @ =gSharedMem ldrb r0, [r3] ldr r3, _08014788 @ =0x00016064 adds r0, r3 @@ -4361,7 +4361,7 @@ _08014774: .4byte gUnknown_030042A0 _08014778: .4byte gActionSelectionCursor _0801477C: .4byte gMoveSelectionCursor _08014780: .4byte gBattleTextBuff1 -_08014784: .4byte 0x02000000 +_08014784: .4byte gSharedMem _08014788: .4byte 0x00016064 _0801478C: .4byte 0x00016003 _08014790: .4byte gBattlescriptCurrInstr @@ -4462,7 +4462,7 @@ _0801485C: _08014864: .4byte gBattlescriptCurrInstr _08014868: .4byte gUnknown_081D9E7C _0801486C: - ldr r2, _080148A0 @ =0x02000000 + ldr r2, _080148A0 @ =gSharedMem ldrb r0, [r4] ldr r3, _080148A4 @ =0x00016003 adds r1, r2, r3 @@ -4490,7 +4490,7 @@ _08014896: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080148A0: .4byte 0x02000000 +_080148A0: .4byte gSharedMem _080148A4: .4byte 0x00016003 _080148A8: .4byte 0x000160d8 _080148AC: .4byte gBattlescriptCurrInstr @@ -4842,7 +4842,7 @@ _08014B68: ldrh r1, [r2, 0x6] bl __divsi3 adds r4, r0, 0 - ldr r0, _08014BE0 @ =0x02000000 + ldr r0, _08014BE0 @ =gSharedMem ldr r1, _08014BE4 @ =0x00016078 adds r0, r1 ldrb r1, [r0] @@ -4862,7 +4862,7 @@ _08014BB0: lsls r0, 24 lsrs r5, r0, 24 _08014BB6: - ldr r1, _08014BE0 @ =0x02000000 + ldr r1, _08014BE0 @ =gSharedMem ldr r0, _08014BE4 @ =0x00016078 adds r1, r0 ldrb r0, [r1] @@ -4885,7 +4885,7 @@ _08014BD4: bx r1 .align 2, 0 _08014BDC: .4byte gBattleTypeFlags -_08014BE0: .4byte 0x02000000 +_08014BE0: .4byte gSharedMem _08014BE4: .4byte 0x00016078 _08014BE8: .4byte gCurrentMoveTurn _08014BEC: .4byte gNoOfAllBanks @@ -5162,7 +5162,7 @@ sub_8014DF8: @ 8014DF8 adds r0, r2 ldrb r0, [r0] strh r0, [r1] - ldr r2, _08014E88 @ =0x02000000 + ldr r2, _08014E88 @ =gSharedMem ldr r0, _08014E8C @ =0x00016087 adds r1, r2, r0 ldrb r0, [r1] @@ -5198,7 +5198,7 @@ _08014E78: .4byte gUnknown_030042A0 _08014E7C: .4byte gBattleCommunication _08014E80: .4byte gBattleBufferB _08014E84: .4byte gLastUsedItem -_08014E88: .4byte 0x02000000 +_08014E88: .4byte gSharedMem _08014E8C: .4byte 0x00016087 _08014E90: .4byte 0x00016088 _08014E94: .4byte gUnknown_081FA70C @@ -5238,7 +5238,7 @@ sub_8014EBC: @ 8014EBC strh r5, [r0] ldr r0, _08014F38 @ =gUnknown_030042A0 strh r5, [r0] - ldr r3, _08014F3C @ =0x02000000 + ldr r3, _08014F3C @ =gSharedMem ldr r0, _08014F40 @ =0x00016089 adds r2, r3, r0 ldr r1, _08014F44 @ =gUnknown_081FA71B @@ -5287,7 +5287,7 @@ _08014F2C: .4byte gTurnOrder _08014F30: .4byte gCurrentMoveTurn _08014F34: .4byte gUnknown_030042A4 _08014F38: .4byte gUnknown_030042A0 -_08014F3C: .4byte 0x02000000 +_08014F3C: .4byte gSharedMem _08014F40: .4byte 0x00016089 _08014F44: .4byte gUnknown_081FA71B _08014F48: .4byte 0x00016088 @@ -5405,7 +5405,7 @@ bsB_exit_by_move: @ 8015034 lsrs r1, r0, 24 cmp r1, 0 bne _08015050 - ldr r0, _08015054 @ =0x02000000 + ldr r0, _08015054 @ =gSharedMem ldr r2, _08015058 @ =0x00016059 adds r0, r2 strb r1, [r0] @@ -5416,7 +5416,7 @@ _08015050: pop {r0} bx r0 .align 2, 0 -_08015054: .4byte 0x02000000 +_08015054: .4byte gSharedMem _08015058: .4byte 0x00016059 _0801505C: .4byte gFightStateTracker thumb_func_end bsB_exit_by_move @@ -5469,7 +5469,7 @@ bsC_8016D70: @ 8015094 ldr r0, _08015120 @ =gBattleMoveDamage movs r4, 0 str r4, [r0] - ldr r1, _08015124 @ =0x02000000 + ldr r1, _08015124 @ =gSharedMem ldr r2, _08015128 @ =0x00016002 adds r0, r1, r2 strb r4, [r0] @@ -5515,7 +5515,7 @@ _08015114: .4byte gUnknown_02024A76 _08015118: .4byte gHitMarker _0801511C: .4byte 0xf1e892af _08015120: .4byte gBattleMoveDamage -_08015124: .4byte 0x02000000 +_08015124: .4byte gSharedMem _08015128: .4byte 0x00016002 _0801512C: .4byte 0x000160a1 _08015130: .4byte gMoveHitWith @@ -5575,12 +5575,12 @@ _080151B0: movs r2, 0 b _080151C8 _080151B4: - ldr r0, _080151BC @ =0x02000000 + ldr r0, _080151BC @ =gSharedMem ldr r1, _080151C0 @ =0x00016003 adds r0, r1 b _080151C6 .align 2, 0 -_080151BC: .4byte 0x02000000 +_080151BC: .4byte gSharedMem _080151C0: .4byte 0x00016003 _080151C4: ldr r0, _080151D0 @ =gBank1 diff --git a/asm/battle_9.s b/asm/battle_9.s index e92c2db33..8d59770f0 100644 --- a/asm/battle_9.s +++ b/asm/battle_9.s @@ -30,7 +30,7 @@ AI_SwitchIfPerishSong: @ 8035FEC bne _0803604C adds r0, r2, 0 bl GetBankIdentity - ldr r1, _08036044 @ =0x02000000 + ldr r1, _08036044 @ =gSharedMem lsls r0, 24 lsrs r0, 25 ldr r2, _08036048 @ =0x000160c8 @@ -48,7 +48,7 @@ AI_SwitchIfPerishSong: @ 8035FEC _08036038: .4byte gStatuses3 _0803603C: .4byte gActiveBank _08036040: .4byte gDisableStructs -_08036044: .4byte 0x02000000 +_08036044: .4byte gSharedMem _08036048: .4byte 0x000160c8 _0803604C: movs r0, 0 @@ -76,7 +76,7 @@ _08036070: ldr r0, _08036094 @ =gActiveBank ldrb r0, [r0] bl GetBankIdentity - ldr r1, _08036098 @ =0x02000000 + ldr r1, _08036098 @ =gSharedMem lsls r0, 24 lsrs r0, 25 ldr r2, _0803609C @ =0x000160c8 @@ -91,7 +91,7 @@ _08036070: b _080361CA .align 2, 0 _08036094: .4byte gActiveBank -_08036098: .4byte 0x02000000 +_08036098: .4byte gSharedMem _0803609C: .4byte 0x000160c8 _080360A0: ldr r4, _080361D8 @ =gBattleMons @@ -400,7 +400,7 @@ _0803630C: ldr r0, _08036330 @ =gActiveBank ldrb r0, [r0] bl GetBankIdentity - ldr r1, _08036334 @ =0x02000000 + ldr r1, _08036334 @ =gSharedMem lsls r0, 24 lsrs r0, 25 ldr r2, _08036338 @ =0x000160c8 @@ -415,7 +415,7 @@ _0803630C: b _08036402 .align 2, 0 _08036330: .4byte gActiveBank -_08036334: .4byte 0x02000000 +_08036334: .4byte gSharedMem _08036338: .4byte 0x000160c8 _0803633C: movs r6, 0 @@ -456,7 +456,7 @@ _08036342: ldrh r0, [r0] cmp r6, r0 beq _080363FA - ldr r1, _080363D8 @ =0x02000000 + ldr r1, _080363D8 @ =gSharedMem ldr r0, _080363DC @ =0x00016068 add r0, r8 adds r0, r1 @@ -489,7 +489,7 @@ _08036342: _080363CC: .4byte gBaseStats _080363D0: .4byte gEnemyParty _080363D4: .4byte gBattlePartyID -_080363D8: .4byte 0x02000000 +_080363D8: .4byte gSharedMem _080363DC: .4byte 0x00016068 _080363E0: lsls r0, r4, 3 @@ -623,7 +623,7 @@ _080364DC: ldrb r0, [r0] _080364E0: bl GetBankIdentity - ldr r1, _0803650C @ =0x02000000 + ldr r1, _0803650C @ =gSharedMem lsls r0, 24 lsrs r0, 25 ldr r2, _08036510 @ =0x000160c8 @@ -643,7 +643,7 @@ _08036500: bx r1 .align 2, 0 _08036508: .4byte gActiveBank -_0803650C: .4byte 0x02000000 +_0803650C: .4byte gSharedMem _08036510: .4byte 0x000160c8 thumb_func_end AI_SwitchIfNaturalCure @@ -948,7 +948,7 @@ _08036768: ldr r0, _0803678C @ =gActiveBank ldrb r0, [r0] bl GetBankIdentity - ldr r1, _08036790 @ =0x02000000 + ldr r1, _08036790 @ =gSharedMem lsls r0, 24 lsrs r0, 25 ldr r2, _08036794 @ =0x000160c8 @@ -963,7 +963,7 @@ _08036768: b _080368DA .align 2, 0 _0803678C: .4byte gActiveBank -_08036790: .4byte 0x02000000 +_08036790: .4byte gSharedMem _08036794: .4byte 0x000160c8 _08036798: mov r9, r3 @@ -1010,7 +1010,7 @@ _080367C4: ldrh r0, [r0] cmp r6, r0 beq _080368D0 - ldr r1, _08036838 @ =0x02000000 + ldr r1, _08036838 @ =gSharedMem ldr r0, _0803683C @ =0x00016068 add r0, r9 adds r0, r1 @@ -1043,7 +1043,7 @@ _080367C4: .align 2, 0 _08036830: .4byte gEnemyParty _08036834: .4byte gBattlePartyID -_08036838: .4byte 0x02000000 +_08036838: .4byte gSharedMem _0803683C: .4byte 0x00016068 _08036840: .4byte gBaseStats _08036844: @@ -1310,7 +1310,7 @@ _08036A1A: ldrh r0, [r0] cmp r5, r0 beq _08036A7E - ldr r1, _08036AF4 @ =0x02000000 + ldr r1, _08036AF4 @ =gSharedMem ldr r2, _08036AF8 @ =0x00016068 adds r0, r7, r2 adds r0, r1 @@ -1375,7 +1375,7 @@ _08036AE4: _08036AE8: .4byte gActiveBank _08036AEC: .4byte gEnemyParty _08036AF0: .4byte gBattlePartyID -_08036AF4: .4byte 0x02000000 +_08036AF4: .4byte gSharedMem _08036AF8: .4byte 0x00016068 _08036AFC: movs r0, 0 @@ -1405,7 +1405,7 @@ _08036B1C: bne _08036B28 b _08036C24 _08036B28: - ldr r4, _08036B6C @ =0x02000000 + ldr r4, _08036B6C @ =gSharedMem ldr r0, _08036B70 @ =gActiveBank ldrb r0, [r0] bl GetBankIdentity @@ -1435,7 +1435,7 @@ _08036B28: b _08036B8C .align 2, 0 _08036B68: .4byte gBattleTypeFlags -_08036B6C: .4byte 0x02000000 +_08036B6C: .4byte gSharedMem _08036B70: .4byte gActiveBank _08036B74: .4byte 0x000160c8 _08036B78: @@ -1469,7 +1469,7 @@ _08036B8E: ldrh r0, [r0] cmp r4, r0 beq _08036BCE - ldr r1, _08036C14 @ =0x02000000 + ldr r1, _08036C14 @ =gSharedMem ldr r2, _08036C18 @ =0x00016068 adds r0, r6, r2 adds r0, r1 @@ -1489,7 +1489,7 @@ _08036BD4: ldr r0, _08036C1C @ =gActiveBank ldrb r0, [r0] bl GetBankIdentity - ldr r1, _08036C14 @ =0x02000000 + ldr r1, _08036C14 @ =gSharedMem lsls r0, 24 lsrs r0, 25 ldr r3, _08036C20 @ =0x000160c8 @@ -1500,7 +1500,7 @@ _08036BEA: ldr r4, _08036C1C @ =gActiveBank ldrb r0, [r4] bl GetBankIdentity - ldr r2, _08036C14 @ =0x02000000 + ldr r2, _08036C14 @ =gSharedMem ldrb r1, [r4] ldr r3, _08036C18 @ =0x00016068 adds r1, r3 @@ -1516,7 +1516,7 @@ _08036BEA: .align 2, 0 _08036C0C: .4byte gEnemyParty _08036C10: .4byte gBattlePartyID -_08036C14: .4byte 0x02000000 +_08036C14: .4byte gSharedMem _08036C18: .4byte 0x00016068 _08036C1C: .4byte gActiveBank _08036C20: .4byte 0x000160c8 @@ -1751,7 +1751,7 @@ _08036DA2: ldrh r0, [r0] cmp r0, r7 beq _08036E7C - ldr r1, _08036E6C @ =0x02000000 + ldr r1, _08036E6C @ =gSharedMem ldr r2, _08036E70 @ =0x00016068 adds r0, r3, r2 adds r0, r1 @@ -1808,7 +1808,7 @@ _08036E5C: .4byte gActiveBank _08036E60: .4byte gBitTable _08036E64: .4byte gEnemyParty _08036E68: .4byte gBattlePartyID -_08036E6C: .4byte 0x02000000 +_08036E6C: .4byte gSharedMem _08036E70: .4byte 0x00016068 _08036E74: .4byte gBaseStats _08036E78: .4byte gBattleMons @@ -1887,7 +1887,7 @@ _08036F04: ldr r0, _08037000 @ =gDynamicBasePower movs r2, 0 strh r2, [r0] - ldr r0, _08037004 @ =0x02000000 + ldr r0, _08037004 @ =gSharedMem ldr r3, _08037008 @ =0x0001601c adds r1, r0, r3 strb r2, [r1] @@ -1936,7 +1936,7 @@ _08036F2C: ldrh r0, [r0] cmp r0, r7 beq _08036FE8 - ldr r1, _08037004 @ =0x02000000 + ldr r1, _08037004 @ =gSharedMem ldr r3, _08037020 @ =0x00016068 adds r0, r4, r3 adds r0, r1 @@ -2013,7 +2013,7 @@ _08036FEE: bx r1 .align 2, 0 _08037000: .4byte gDynamicBasePower -_08037004: .4byte 0x02000000 +_08037004: .4byte gSharedMem _08037008: .4byte 0x0001601c _0803700C: .4byte 0x0001601f _08037010: .4byte gBattleMoveFlags @@ -2132,7 +2132,7 @@ _080370DC: movs r3, 0 mov r9, r3 _080370EA: - ldr r4, _08037174 @ =0x02016a00 + ldr r4, _08037174 @ =gSharedMem + 0x16A00 mov r0, r9 cmp r0, 0 beq _08037106 @@ -2205,7 +2205,7 @@ _08037166: mov pc, r0 .align 2, 0 _08037170: .4byte gEnemyParty -_08037174: .4byte 0x02016a00 +_08037174: .4byte gSharedMem + 0x16A00 _08037178: .4byte gItemEffectTable _0803717C: .4byte gSaveBlock1 + 0x3676 _08037180: .4byte 0xfffe9600 @@ -2283,7 +2283,7 @@ _08037210: _08037214: .4byte gBattleMons _08037218: .4byte gActiveBank _0803721C: - ldr r2, _08037378 @ =0x02000000 + ldr r2, _08037378 @ =gSharedMem ldr r3, _0803737C @ =gActiveBank ldrb r0, [r3] lsrs r0, 1 @@ -2465,12 +2465,12 @@ _08037362: mov r8, r2 b _080374AE .align 2, 0 -_08037378: .4byte 0x02000000 +_08037378: .4byte gSharedMem _0803737C: .4byte gActiveBank _08037380: .4byte 0x000160da _08037384: .4byte gBattleMons _08037388: - ldr r6, _08037458 @ =0x02000000 + ldr r6, _08037458 @ =gSharedMem ldr r4, _0803745C @ =gActiveBank ldrb r0, [r4] lsrs r0, 1 @@ -2580,7 +2580,7 @@ _08037450: mov r8, r3 b _080374AE .align 2, 0 -_08037458: .4byte 0x02000000 +_08037458: .4byte gSharedMem _0803745C: .4byte gActiveBank _08037460: .4byte 0x000160da _08037464: .4byte gDisableStructs @@ -2624,7 +2624,7 @@ _080374AE: movs r1, 0x1 movs r2, 0 bl Emitcmd33 - ldr r1, _080374DC @ =0x02000000 + ldr r1, _080374DC @ =gSharedMem ldr r0, _080374E0 @ =gActiveBank ldrb r0, [r0] lsrs r0, 1 @@ -2643,7 +2643,7 @@ _080374AE: mov r0, r8 b _080374FA .align 2, 0 -_080374DC: .4byte 0x02000000 +_080374DC: .4byte gSharedMem _080374E0: .4byte gActiveBank _080374E4: .4byte 0x000160d4 _080374E8: .4byte 0x00016a24 diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s index 92ad421bb..1ff3e9681 100644 --- a/asm/battle_anim_80CA710.s +++ b/asm/battle_anim_80CA710.s @@ -15164,7 +15164,7 @@ _080D1AF4: ldr r4, _080D1B3C @ =gBattleAnimSpritePalette_206 bl NotInBattle lsls r0, 24 - ldr r1, _080D1B40 @ =0x02018000 + ldr r1, _080D1B40 @ =gSharedMem + 0x18000 cmp r0, 0 beq _080D1B1C ldr r0, _080D1B44 @ =0xffffc800 @@ -15179,17 +15179,17 @@ _080D1B24: lsls r0, 24 cmp r0, 0 beq _080D1B4C - ldr r0, _080D1B48 @ =0x02014800 + ldr r0, _080D1B48 @ =gSharedMem + 0x14800 b _080D1B4E .align 2, 0 _080D1B34: .4byte 0x000027de _080D1B38: .4byte 0x00002710 _080D1B3C: .4byte gBattleAnimSpritePalette_206 -_080D1B40: .4byte 0x02018000 +_080D1B40: .4byte gSharedMem + 0x18000 _080D1B44: .4byte 0xffffc800 -_080D1B48: .4byte 0x02014800 +_080D1B48: .4byte gSharedMem + 0x14800 _080D1B4C: - ldr r0, _080D1B7C @ =0x02018000 + ldr r0, _080D1B7C @ =gSharedMem + 0x18000 _080D1B4E: adds r2, r4, r0 mov r1, sp @@ -15213,7 +15213,7 @@ _080D1B4E: pop {r0} bx r0 .align 2, 0 -_080D1B7C: .4byte 0x02018000 +_080D1B7C: .4byte gSharedMem + 0x18000 thumb_func_end sub_80D1ADC thumb_func_start sub_80D1B80 @@ -46167,7 +46167,7 @@ _080E0B40: lsls r0, 24 cmp r0, 0 beq _080E0B84 - ldr r0, _080E0B80 @ =0x02019348 + ldr r0, _080E0B80 @ =gSharedMem + 0x19348 ldrh r5, [r0] b _080E0BCC .align 2, 0 @@ -46183,7 +46183,7 @@ _080E0B70: .4byte REG_BG1CNT _080E0B74: .4byte gBattleAnimBankAttacker _080E0B78: .4byte gSprites _080E0B7C: .4byte gObjectBankIDs -_080E0B80: .4byte 0x02019348 +_080E0B80: .4byte gSharedMem + 0x19348 _080E0B84: ldr r4, _080E0BA4 @ =gBattleAnimBankAttacker ldrb r0, [r4] @@ -50955,7 +50955,7 @@ _080E3028: lsls r0, 24 cmp r0, 0 beq _080E306C - ldr r0, _080E3068 @ =0x02019348 + ldr r0, _080E3068 @ =gSharedMem + 0x19348 ldrh r4, [r0] b _080E30B4 .align 2, 0 @@ -50971,7 +50971,7 @@ _080E3058: .4byte REG_BG1CNT _080E305C: .4byte gBattleAnimBankAttacker _080E3060: .4byte gSprites _080E3064: .4byte gObjectBankIDs -_080E3068: .4byte 0x02019348 +_080E3068: .4byte gSharedMem + 0x19348 _080E306C: ldr r4, _080E308C @ =gBattleAnimBankAttacker ldrb r0, [r4] @@ -51491,7 +51491,7 @@ _080E34A4: lsls r0, 24 cmp r0, 0 beq _080E34E4 - ldr r0, _080E34E0 @ =0x02019348 + ldr r0, _080E34E0 @ =gSharedMem + 0x19348 ldrh r4, [r0] b _080E3522 .align 2, 0 @@ -51506,7 +51506,7 @@ _080E34D0: .4byte 0x00003f42 _080E34D4: .4byte REG_BG1CNT _080E34D8: .4byte gSprites _080E34DC: .4byte gObjectBankIDs -_080E34E0: .4byte 0x02019348 +_080E34E0: .4byte gSharedMem + 0x19348 _080E34E4: adds r0, r5, 0 bl GetBankSide @@ -52581,7 +52581,7 @@ _080E3D22: lsls r0, 24 cmp r0, 0 beq _080E3D58 - ldr r0, _080E3D54 @ =0x02019348 + ldr r0, _080E3D54 @ =gSharedMem + 0x19348 ldrh r4, [r0] b _080E3D96 .align 2, 0 @@ -52593,7 +52593,7 @@ _080E3D44: .4byte 0x00003f3d _080E3D48: .4byte REG_BLDCNT _080E3D4C: .4byte 0x00003f42 _080E3D50: .4byte REG_BG1CNT -_080E3D54: .4byte 0x02019348 +_080E3D54: .4byte gSharedMem + 0x19348 _080E3D58: adds r0, r7, 0 bl GetBankSide @@ -53007,14 +53007,14 @@ _080E4084: lsls r0, 24 cmp r0, 0 beq _080E40A8 - ldr r0, _080E40A4 @ =0x02014800 + ldr r0, _080E40A4 @ =gSharedMem + 0x14800 b _080E40AA .align 2, 0 _080E409C: .4byte gBattleAnimBankTarget _080E40A0: .4byte gBattleAnimArgs -_080E40A4: .4byte 0x02014800 +_080E40A4: .4byte gSharedMem + 0x14800 _080E40A8: - ldr r0, _080E40C8 @ =0x02018000 + ldr r0, _080E40C8 @ =gSharedMem + 0x18000 _080E40AA: adds r2, r5, r0 lsls r1, r4, 5 @@ -53030,7 +53030,7 @@ _080E40AA: pop {r0} bx r0 .align 2, 0 -_080E40C8: .4byte 0x02018000 +_080E40C8: .4byte gSharedMem + 0x18000 _080E40CC: .4byte gPlttBufferUnfaded thumb_func_end sub_80E4028 @@ -53097,15 +53097,15 @@ _080E412C: lsls r0, 24 cmp r0, 0 beq _080E4158 - ldr r0, _080E4154 @ =0x02014800 + ldr r0, _080E4154 @ =gSharedMem + 0x14800 b _080E415A .align 2, 0 _080E4148: .4byte gBattleAnimBankTarget _080E414C: .4byte gPlttBufferUnfaded _080E4150: .4byte gBattleAnimArgs -_080E4154: .4byte 0x02014800 +_080E4154: .4byte gSharedMem + 0x14800 _080E4158: - ldr r0, _080E4174 @ =0x02018000 + ldr r0, _080E4174 @ =gSharedMem + 0x18000 _080E415A: adds r1, r4, r0 adds r0, r5, 0 @@ -53118,7 +53118,7 @@ _080E415A: pop {r0} bx r0 .align 2, 0 -_080E4174: .4byte 0x02018000 +_080E4174: .4byte gSharedMem + 0x18000 thumb_func_end sub_80E40D0 thumb_func_start sub_80E4178 @@ -53342,7 +53342,7 @@ _080E4318: ldr r1, _080E4358 @ =gBattleAnimBankAttacker ldrb r0, [r1] lsls r0, 2 - ldr r2, _080E435C @ =0x02017800 + ldr r2, _080E435C @ =gSharedMem + 0x17800 adds r0, r2 ldr r0, [r0] lsls r0, 31 @@ -53368,7 +53368,7 @@ _080E434E: .align 2, 0 _080E4354: .4byte gTasks _080E4358: .4byte gBattleAnimBankAttacker -_080E435C: .4byte 0x02017800 +_080E435C: .4byte gSharedMem + 0x17800 _080E4360: .4byte sub_80E4368 _080E4364: .4byte gAnimVisualTaskCount thumb_func_end sub_80E4300 @@ -53388,7 +53388,7 @@ sub_80E4368: @ 80E4368 ldr r0, _080E43B4 @ =gBattleAnimBankAttacker ldrb r3, [r0] lsls r3, 2 - ldr r0, _080E43B8 @ =0x02017800 + ldr r0, _080E43B8 @ =gSharedMem + 0x17800 adds r3, r0 ldr r1, _080E43BC @ =gTasks lsls r0, r4, 2 @@ -53413,7 +53413,7 @@ _080E43A8: .align 2, 0 _080E43B0: .4byte gBattleAnimArgs _080E43B4: .4byte gBattleAnimBankAttacker -_080E43B8: .4byte 0x02017800 +_080E43B8: .4byte gSharedMem + 0x17800 _080E43BC: .4byte gTasks thumb_func_end sub_80E4368 @@ -54615,7 +54615,7 @@ _080E4D1C: adds r0, 0x1 strh r0, [r1, 0x8] ldr r5, _080E4D8C @ =gSprites - ldr r4, _080E4D90 @ =0x02000000 + ldr r4, _080E4D90 @ =gSharedMem ldr r3, _080E4D94 @ =0x0001608a adds r6, r4, r3 ldrb r0, [r6] @@ -54668,7 +54668,7 @@ _080E4D1C: b _080E4E94 .align 2, 0 _080E4D8C: .4byte gSprites -_080E4D90: .4byte 0x02000000 +_080E4D90: .4byte gSharedMem _080E4D94: .4byte 0x0001608a _080E4D98: .4byte sub_800FE20 _080E4D9C: .4byte 0x0001608b diff --git a/asm/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s index a42f7693e..d59c2f1ca 100644 --- a/asm/battle_anim_81258BC.s +++ b/asm/battle_anim_81258BC.s @@ -386,12 +386,12 @@ sub_812B18C: @ 812B18C ldrsh r0, [r0, r1] cmp r0, 0 bne _0812B1C4 - ldr r0, _0812B1C0 @ =0x02019348 + ldr r0, _0812B1C0 @ =gSharedMem + 0x19348 ldrh r4, [r0] b _0812B272 .align 2, 0 _0812B1BC: .4byte gBattleAnimArgs -_0812B1C0: .4byte 0x02019348 +_0812B1C0: .4byte gSharedMem + 0x19348 _0812B1C4: adds r0, r5, 0 bl DestroyAnimVisualTask @@ -528,10 +528,10 @@ sub_812B2B8: @ 812B2B8 lsls r0, 24 cmp r0, 0 beq _0812B2DC - ldr r0, _0812B2D8 @ =0x02019348 + ldr r0, _0812B2D8 @ =gSharedMem + 0x19348 b _0812B2E6 .align 2, 0 -_0812B2D8: .4byte 0x02019348 +_0812B2D8: .4byte gSharedMem + 0x19348 _0812B2DC: ldr r1, _0812B304 @ =gUnknown_0202F7CA ldr r0, _0812B308 @ =gBattleAnimBankAttacker diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 2ff8bc1ca..cdf70f483 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -3163,7 +3163,7 @@ _0812D906: lsls r0, 24 cmp r0, 0 beq _0812DA20 - ldr r5, _0812D9E0 @ =0x02019348 + ldr r5, _0812D9E0 @ =gSharedMem + 0x19348 ldrh r0, [r5] bl sub_80AEB1C adds r4, r0, 0 @@ -3221,7 +3221,7 @@ _0812D98E: cmp r5, 0x7 ble _0812D986 _0812D9A2: - ldr r0, _0812D9E0 @ =0x02019348 + ldr r0, _0812D9E0 @ =gSharedMem + 0x19348 ldrh r0, [r0, 0x2] bl sub_80AEB1C lsls r0, 24 @@ -3247,7 +3247,7 @@ _0812D9D0: .4byte gBattleMonForms _0812D9D4: .4byte gBattleAnimBankAttacker _0812D9D8: .4byte 0x040000d4 _0812D9DC: .4byte 0x84000200 -_0812D9E0: .4byte 0x02019348 +_0812D9E0: .4byte gSharedMem + 0x19348 _0812D9E4: .4byte gSprites _0812D9E8: .4byte gObjectBankIDs _0812D9EC: .4byte gSpriteAffineAnimTable_81E7C18 @@ -3373,7 +3373,7 @@ _0812DAAE: bne _0812DAF4 ldrb r0, [r4] lsls r1, r0, 2 - ldr r2, _0812DB14 @ =0x02017800 + ldr r2, _0812DB14 @ =gSharedMem + 0x17800 adds r1, r2 ldrh r1, [r1, 0x2] bl sub_8032984 @@ -3392,7 +3392,7 @@ _0812DAFA: _0812DB08: .4byte REG_BG2CNT _0812DB0C: .4byte gBattleAnimBankAttacker _0812DB10: .4byte gTasks -_0812DB14: .4byte 0x02017800 +_0812DB14: .4byte gSharedMem + 0x17800 thumb_func_end sub_812D7E8 thumb_func_start c3_80DFBE4 @@ -6053,7 +6053,7 @@ sub_812EFC8: @ 812EFC8 beq _0812F004 movs r0, 0x1 str r0, [sp, 0x14] - ldr r0, _0812F000 @ =0x02019348 + ldr r0, _0812F000 @ =gSharedMem + 0x19348 ldr r1, [r0, 0x10] mov r9, r1 ldr r2, [r0, 0xC] @@ -6062,7 +6062,7 @@ sub_812EFC8: @ 812EFC8 movs r3, 0x14 b _0812F13C .align 2, 0 -_0812F000: .4byte 0x02019348 +_0812F000: .4byte gSharedMem + 0x19348 _0812F004: ldr r0, _0812F070 @ =gBattleAnimBankAttacker ldrb r0, [r0] @@ -6096,7 +6096,7 @@ _0812F004: mov r8, r0 ldrb r2, [r4] lsls r1, r2, 2 - ldr r0, _0812F080 @ =0x02017800 + ldr r0, _0812F080 @ =gSharedMem + 0x17800 adds r1, r0 ldrh r0, [r1, 0x2] cmp r0, 0 @@ -6118,7 +6118,7 @@ _0812F070: .4byte gBattleAnimBankAttacker _0812F074: .4byte gBattlePartyID _0812F078: .4byte gBattleAnimBankTarget _0812F07C: .4byte gPlayerParty -_0812F080: .4byte 0x02017800 +_0812F080: .4byte gSharedMem + 0x17800 _0812F084: ldrb r0, [r4] lsls r0, 1 @@ -6168,7 +6168,7 @@ _0812F0AC: mov r8, r0 ldrb r2, [r4] lsls r1, r2, 2 - ldr r0, _0812F118 @ =0x02017800 + ldr r0, _0812F118 @ =gSharedMem + 0x17800 adds r1, r0 ldrh r0, [r1, 0x2] cmp r0, 0 @@ -6190,7 +6190,7 @@ _0812F0AC: _0812F10C: .4byte gBattlePartyID _0812F110: .4byte gBattleAnimBankTarget _0812F114: .4byte gEnemyParty -_0812F118: .4byte 0x02017800 +_0812F118: .4byte gSharedMem + 0x17800 _0812F11C: .4byte gPlayerParty _0812F120: ldrb r0, [r4] @@ -11564,7 +11564,7 @@ _08131A44: lsls r0, 24 cmp r0, 0 beq _08131A74 - ldr r0, _08131A6C @ =0x02019348 + ldr r0, _08131A6C @ =gSharedMem + 0x19348 ldr r2, [r0, 0x8] mov r10, r2 ldr r3, [r0, 0xC] @@ -11578,7 +11578,7 @@ _08131A44: movs r7, 0 b _08131B92 .align 2, 0 -_08131A6C: .4byte 0x02019348 +_08131A6C: .4byte gSharedMem + 0x19348 _08131A70: .4byte gBattleAnimBankAttacker _08131A74: ldr r4, _08131AD4 @ =gBattleAnimBankAttacker @@ -11610,7 +11610,7 @@ _08131A74: mov r9, r0 ldrb r2, [r4] lsls r1, r2, 2 - ldr r0, _08131AE0 @ =0x02017800 + ldr r0, _08131AE0 @ =gSharedMem + 0x17800 adds r1, r0 ldrh r0, [r1, 0x2] cmp r0, 0 @@ -11629,7 +11629,7 @@ _08131A74: _08131AD4: .4byte gBattleAnimBankAttacker _08131AD8: .4byte gBattlePartyID _08131ADC: .4byte gPlayerParty -_08131AE0: .4byte 0x02017800 +_08131AE0: .4byte gSharedMem + 0x17800 _08131AE4: ldrh r5, [r1, 0x2] _08131AE6: @@ -11677,7 +11677,7 @@ _08131B10: mov r9, r0 ldrb r2, [r4] lsls r1, r2, 2 - ldr r0, _08131B6C @ =0x02017800 + ldr r0, _08131B6C @ =gSharedMem + 0x17800 adds r1, r0 ldrh r0, [r1, 0x2] cmp r0, 0 @@ -11695,7 +11695,7 @@ _08131B10: .align 2, 0 _08131B64: .4byte gBattlePartyID _08131B68: .4byte gEnemyParty -_08131B6C: .4byte 0x02017800 +_08131B6C: .4byte gSharedMem + 0x17800 _08131B70: ldrh r5, [r1, 0x2] _08131B72: @@ -11740,7 +11740,7 @@ _08131B94: ldr r0, _08131C10 @ =gBattleAnimBankAttacker ldrb r0, [r0] lsls r0, 2 - ldr r1, _08131C14 @ =0x02017800 + ldr r1, _08131C14 @ =gSharedMem + 0x17800 adds r0, r1 ldrh r0, [r0, 0x2] cmp r0, 0 @@ -11775,7 +11775,7 @@ _08131C04: .4byte gSprites _08131C08: .4byte 0x0000ffe0 _08131C0C: .4byte gBattleAnimBankTarget _08131C10: .4byte gBattleAnimBankAttacker -_08131C14: .4byte 0x02017800 +_08131C14: .4byte gSharedMem + 0x17800 _08131C18: .4byte 0x00007fff _08131C1C: .4byte gTasks _08131C20: diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s index 6fa77321f..ef30b0458 100644 --- a/asm/battle_anim_813F0F4.s +++ b/asm/battle_anim_813F0F4.s @@ -1105,7 +1105,7 @@ sub_813F9E0: @ 813F9E0 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0813F9F4 @ =0x02017840 + ldr r0, _0813F9F4 @ =gSharedMem + 0x17840 ldrb r0, [r0, 0x8] cmp r0, 0x5 bne _0813FA00 @@ -1113,7 +1113,7 @@ sub_813F9E0: @ 813F9E0 ldr r0, _0813F9FC @ =0x0000ffff b _0813FA04 .align 2, 0 -_0813F9F4: .4byte 0x02017840 +_0813F9F4: .4byte gSharedMem + 0x17840 _0813F9F8: .4byte gBattleAnimArgs _0813F9FC: .4byte 0x0000ffff _0813FA00: @@ -1256,7 +1256,7 @@ sub_813FA94: @ 813FA94 adds r4, r0 ldr r0, _0813FB68 @ =sub_813FD90 str r0, [r4] - ldr r3, _0813FB6C @ =0x02017840 + ldr r3, _0813FB6C @ =gSharedMem + 0x17840 ldr r1, _0813FB70 @ =gObjectBankIDs mov r2, r8 ldrb r0, [r2] @@ -1299,7 +1299,7 @@ _0813FB5C: .4byte gBallSpriteTemplates _0813FB60: .4byte gSprites _0813FB64: .4byte gBattleAnimBankTarget _0813FB68: .4byte sub_813FD90 -_0813FB6C: .4byte 0x02017840 +_0813FB6C: .4byte gSharedMem + 0x17840 _0813FB70: .4byte gObjectBankIDs _0813FB74: .4byte gTasks _0813FB78: .4byte sub_813FB7C @@ -1593,7 +1593,7 @@ sub_813FDC0: @ 813FDC0 lsls r0, 24 cmp r0, 0 beq _0813FE5A - ldr r0, _0813FDE0 @ =0x02017840 + ldr r0, _0813FDE0 @ =gSharedMem + 0x17840 ldrb r0, [r0, 0x8] cmp r0, 0x5 bne _0813FDE8 @@ -1601,7 +1601,7 @@ sub_813FDC0: @ 813FDC0 str r0, [r4, 0x1C] b _0813FE5A .align 2, 0 -_0813FDE0: .4byte 0x02017840 +_0813FDE0: .4byte gSharedMem + 0x17840 _0813FDE4: .4byte sub_81407B8 _0813FDE8: adds r0, r4, 0 @@ -2018,7 +2018,7 @@ _0814010E: adds r0, r1 strh r0, [r4, 0x22] strh r5, [r4, 0x26] - ldr r0, _0814013C @ =0x02017840 + ldr r0, _0814013C @ =gSharedMem + 0x17840 ldrb r0, [r0, 0x8] cmp r0, 0 bne _08140144 @@ -2028,7 +2028,7 @@ _0814010E: b _0814014E .align 2, 0 _08140138: .4byte 0xffffff00 -_0814013C: .4byte 0x02017840 +_0814013C: .4byte gSharedMem + 0x17840 _08140140: .4byte sub_8140410 _08140144: ldr r0, _08140154 @ =sub_8140158 @@ -2066,7 +2066,7 @@ sub_8140158: @ 8140158 adds r0, r4, 0 movs r1, 0x1 bl StartSpriteAffineAnim - ldr r0, _08140198 @ =0x02017840 + ldr r0, _08140198 @ =gSharedMem + 0x17840 strh r5, [r0, 0xC] ldr r0, _0814019C @ =sub_81401A0 str r0, [r4, 0x1C] @@ -2077,7 +2077,7 @@ _08140190: pop {r0} bx r0 .align 2, 0 -_08140198: .4byte 0x02017840 +_08140198: .4byte gSharedMem + 0x17840 _0814019C: .4byte sub_81401A0 thumb_func_end sub_8140158 @@ -2109,7 +2109,7 @@ _081401C0: .4byte _08140368 .4byte _081403C4 _081401DC: - ldr r0, _081401F8 @ =0x02017840 + ldr r0, _081401F8 @ =gSharedMem + 0x17840 ldrh r2, [r0, 0xC] movs r3, 0xC ldrsh r1, [r0, r3] @@ -2124,7 +2124,7 @@ _081401DC: ands r0, r2 b _08140200 .align 2, 0 -_081401F8: .4byte 0x02017840 +_081401F8: .4byte gSharedMem + 0x17840 _081401FC: adds r0, r2, 0 adds r0, 0xB0 @@ -2185,7 +2185,7 @@ _08140262: bl ChangeSpriteAffineAnim b _0814040A _0814026C: - ldr r0, _08140288 @ =0x02017840 + ldr r0, _08140288 @ =gSharedMem + 0x17840 ldrh r2, [r0, 0xC] movs r3, 0xC ldrsh r1, [r0, r3] @@ -2200,7 +2200,7 @@ _0814026C: ands r0, r2 b _08140290 .align 2, 0 -_08140288: .4byte 0x02017840 +_08140288: .4byte gSharedMem + 0x17840 _0814028C: adds r0, r2, 0 adds r0, 0xB0 @@ -2273,7 +2273,7 @@ _08140308: movs r1, 0x1 bl ChangeSpriteAffineAnim _08140310: - ldr r0, _0814032C @ =0x02017840 + ldr r0, _0814032C @ =gSharedMem + 0x17840 ldrh r2, [r0, 0xC] movs r3, 0xC ldrsh r1, [r0, r3] @@ -2288,7 +2288,7 @@ _08140310: ands r0, r2 b _08140334 .align 2, 0 -_0814032C: .4byte 0x02017840 +_0814032C: .4byte gSharedMem + 0x17840 _08140330: adds r0, r2, 0 adds r0, 0xB0 @@ -2328,7 +2328,7 @@ _08140368: strh r0, [r4, 0x34] lsls r0, 16 asrs r1, r0, 24 - ldr r0, _08140394 @ =0x02017840 + ldr r0, _08140394 @ =gSharedMem + 0x17840 ldrb r0, [r0, 0x8] cmp r1, r0 bne _0814039C @@ -2342,7 +2342,7 @@ _08140368: str r0, [r4, 0x1C] b _0814040A .align 2, 0 -_08140394: .4byte 0x02017840 +_08140394: .4byte gSharedMem + 0x17840 _08140398: .4byte sub_8140410 _0814039C: cmp r0, 0x4 @@ -2842,7 +2842,7 @@ _08140734: adds r2, r0 lsls r2, 2 adds r2, r4 - ldr r0, _081407AC @ =0x02017840 + ldr r0, _081407AC @ =gSharedMem + 0x17840 ldrb r1, [r0, 0x9] lsls r1, 30 adds r2, 0x3E @@ -2870,7 +2870,7 @@ _0814079C: .4byte 0xfffffee0 _081407A0: .4byte gSprites _081407A4: .4byte gObjectBankIDs _081407A8: .4byte gBattleAnimBankTarget -_081407AC: .4byte 0x02017840 +_081407AC: .4byte gSharedMem + 0x17840 _081407B0: .4byte sub_81405C8 _081407B4: .4byte gDoingBattleAnim thumb_func_end sub_81406BC @@ -3041,7 +3041,7 @@ _081408B6: ands r0, r1 cmp r0, 0 beq _08140900 - ldr r1, _0814092C @ =0x02017840 + ldr r1, _0814092C @ =gSharedMem + 0x17840 ldrb r0, [r1, 0xA] adds r0, 0x1 strb r0, [r1, 0xA] @@ -3062,7 +3062,7 @@ _0814091C: .4byte gUnknown_0840B384 _08140920: .4byte gTasks _08140924: .4byte gMain _08140928: .4byte 0x0000043d -_0814092C: .4byte 0x02017840 +_0814092C: .4byte gSharedMem + 0x17840 thumb_func_end sub_814086C thumb_func_start sub_8140930 @@ -4275,7 +4275,7 @@ _081412C0: ldrsh r0, [r5, r1] cmp r0, 0x1 bne _08141308 - ldr r1, _081412FC @ =0x02017840 + ldr r1, _081412FC @ =gSharedMem + 0x17840 ldrb r0, [r1, 0xA] subs r0, 0x1 strb r0, [r1, 0xA] @@ -4300,7 +4300,7 @@ _081412F2: bl DestroySprite b _0814130E .align 2, 0 -_081412FC: .4byte 0x02017840 +_081412FC: .4byte gSharedMem + 0x17840 _08141300: .4byte gUnknown_0840B258 _08141304: .4byte gUnknown_0840B2B8 _08141308: @@ -4934,7 +4934,7 @@ sub_81417D8: @ 81417D8 ldr r1, _08141800 @ =gBattleAnimBankAttacker ldrb r1, [r1] lsls r1, 2 - ldr r2, _08141804 @ =0x02017800 + ldr r2, _08141804 @ =gSharedMem + 0x17800 adds r1, r2 ldr r1, [r1] lsls r1, 29 @@ -4946,7 +4946,7 @@ sub_81417D8: @ 81417D8 .align 2, 0 _081417FC: .4byte gBattleAnimArgs _08141800: .4byte gBattleAnimBankAttacker -_08141804: .4byte 0x02017800 +_08141804: .4byte gSharedMem + 0x17800 thumb_func_end sub_81417D8 thumb_func_start sub_8141808 @@ -4979,7 +4979,7 @@ sub_8141828: @ 8141828 lsls r0, r6, 1 adds r0, r6 lsls r0, 2 - ldr r1, _081418E0 @ =0x02017810 + ldr r1, _081418E0 @ =gSharedMem + 0x17810 adds r0, r1 ldrb r1, [r0] movs r2, 0x80 @@ -5054,7 +5054,7 @@ _081418A2: strh r0, [r1, 0xA] b _0814190E .align 2, 0 -_081418E0: .4byte 0x02017810 +_081418E0: .4byte gSharedMem + 0x17810 _081418E4: .4byte 0x0000ffff _081418E8: .4byte 0x000027f9 _081418EC: .4byte gBattleAnimPicTable + (233 * 8) @@ -5065,7 +5065,7 @@ _081418FC: lsls r0, r6, 1 adds r0, r6 lsls r0, 2 - ldr r1, _08141918 @ =0x02017810 + ldr r1, _08141918 @ =gSharedMem + 0x17810 adds r0, r1 ldrb r1, [r0, 0x1] movs r2, 0x1 @@ -5078,7 +5078,7 @@ _0814190E: pop {r0} bx r0 .align 2, 0 -_08141918: .4byte 0x02017810 +_08141918: .4byte gSharedMem + 0x17810 thumb_func_end sub_8141828 thumb_func_start sub_814191C @@ -5105,7 +5105,7 @@ sub_814191C: @ 814191C .align 2, 0 _08141944: .4byte gTasks _08141948: - ldr r0, _08141998 @ =0x02017840 + ldr r0, _08141998 @ =gSharedMem + 0x17840 ldrb r0, [r0, 0xA] cmp r0, 0 beq _08141952 @@ -5145,7 +5145,7 @@ _08141966: lsrs r5, r0, 24 b _08141A02 .align 2, 0 -_08141998: .4byte 0x02017840 +_08141998: .4byte gSharedMem + 0x17840 _0814199C: .4byte gBattleAnimSpriteTemplate_84024E8 _081419A0: cmp r0, 0 @@ -5320,7 +5320,7 @@ sub_8141AD8: @ 8141AD8 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _08141B1C @ =0x02017810 + ldr r1, _08141B1C @ =gSharedMem + 0x17810 adds r0, r1 ldrb r1, [r0, 0x1] movs r2, 0x1 @@ -5334,7 +5334,7 @@ _08141B14: bx r0 .align 2, 0 _08141B18: .4byte gTasks -_08141B1C: .4byte 0x02017810 +_08141B1C: .4byte gSharedMem + 0x17810 thumb_func_end sub_8141AD8 thumb_func_start sub_8141B20 @@ -5667,7 +5667,7 @@ sub_8141DAC: @ 8141DAC push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08141DC0 @ =0x02017840 + ldr r0, _08141DC0 @ =gSharedMem + 0x17840 ldrh r1, [r0] cmp r1, 0x53 bne _08141DC8 @@ -5675,7 +5675,7 @@ sub_8141DAC: @ 8141DAC movs r0, 0x1 b _08141E00 .align 2, 0 -_08141DC0: .4byte 0x02017840 +_08141DC0: .4byte gSharedMem + 0x17840 _08141DC4: .4byte gBattleAnimArgs _08141DC8: cmp r1, 0xFA @@ -5722,7 +5722,7 @@ sub_8141E10: @ 8141E10 lsls r0, 24 lsrs r0, 24 ldr r2, _08141E2C @ =gBattleAnimBankAttacker - ldr r1, _08141E30 @ =0x02017840 + ldr r1, _08141E30 @ =gSharedMem + 0x17840 ldrh r1, [r1] strb r1, [r2] ldr r2, _08141E34 @ =gBattleAnimBankTarget @@ -5733,7 +5733,7 @@ sub_8141E10: @ 8141E10 bx r0 .align 2, 0 _08141E2C: .4byte gBattleAnimBankAttacker -_08141E30: .4byte 0x02017840 +_08141E30: .4byte gSharedMem + 0x17840 _08141E34: .4byte gBattleAnimBankTarget thumb_func_end sub_8141E10 diff --git a/asm/cable_car.s b/asm/cable_car.s index 385cd404d..8283a58aa 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -154,7 +154,7 @@ _081232C0: str r3, [r2, 0x8] ldr r0, [r2, 0x8] ldr r1, _08123370 @ =gUnknown_02039274 - ldr r0, _08123374 @ =0x02017000 + ldr r0, _08123374 @ =gSharedMem + 0x17000 str r0, [r1] adds r3, r0, 0 ldr r5, _08123378 @ =0x000010fc @@ -195,7 +195,7 @@ _08123338: _08123368: .4byte 0x040000d4 _0812336C: .4byte 0x81000800 _08123370: .4byte gUnknown_02039274 -_08123374: .4byte 0x02017000 +_08123374: .4byte gSharedMem + 0x17000 _08123378: .4byte 0x000010fc _0812337C: .4byte gMain _08123380: .4byte 0x0000043c @@ -254,7 +254,7 @@ _081233EC: ldr r0, _08123458 @ =gUnknown_08401D18 bl LoadSpritePalettes ldr r0, _0812345C @ =gCableCarMtChimneyTilemap - ldr r4, _08123460 @ =0x02019000 + ldr r4, _08123460 @ =gSharedMem + 0x19000 adds r1, r4, 0 bl LZDecompressWram ldr r0, _08123464 @ =gCableCarTreeTilemap @@ -290,7 +290,7 @@ _081233EC: _08123454: .4byte gUnknown_08401CF8 _08123458: .4byte gUnknown_08401D18 _0812345C: .4byte gCableCarMtChimneyTilemap -_08123460: .4byte 0x02019000 +_08123460: .4byte gSharedMem + 0x19000 _08123464: .4byte gCableCarTreeTilemap _08123468: .4byte gCableCarMountainTilemap _0812346C: .4byte gCableCarPylonStemTilemap @@ -365,7 +365,7 @@ _081234FC: .4byte gUnknown_08396FC4 _08123500: .4byte 0x0000043c _08123504: ldr r0, _08123578 @ =0x0600e800 - ldr r5, _0812357C @ =0x02019168 + ldr r5, _0812357C @ =gSharedMem + 0x19168 movs r1, 0x20 str r1, [sp] movs r1, 0xF @@ -420,7 +420,7 @@ _08123504: b _0812370C .align 2, 0 _08123578: .4byte 0x0600e800 -_0812357C: .4byte 0x02019168 +_0812357C: .4byte gSharedMem + 0x19168 _08123580: .4byte 0x0600f000 _08123584: .4byte gUnknown_02039274 _08123588: .4byte 0x000008fc @@ -435,7 +435,7 @@ _08123598: mov r8, r0 ldr r0, [r0] adds r0, 0xFC - ldr r4, _0812366C @ =0x02019090 + ldr r4, _0812366C @ =gSharedMem + 0x19090 movs r6, 0xC str r6, [sp] movs r5, 0x3 @@ -523,7 +523,7 @@ _08123598: .align 2, 0 _08123664: .4byte gSpecialVar_0x8004 _08123668: .4byte gUnknown_02039274 -_0812366C: .4byte 0x02019090 +_0812366C: .4byte gSharedMem + 0x19090 _08123670: .4byte gMain _08123674: .4byte 0x0000043c _08123678: @@ -647,7 +647,7 @@ _08123766: bl ResetTasks bl ResetSpriteData bl ResetPaletteFade - ldr r2, _0812385C @ =0x02000000 + ldr r2, _0812385C @ =gSharedMem movs r3, 0x80 lsls r3, 10 movs r5, 0 @@ -755,7 +755,7 @@ _081237E0: .align 2, 0 _08123854: .4byte gSpriteCoordOffsetX _08123858: .4byte gUnknown_08396FC4 -_0812385C: .4byte 0x02000000 +_0812385C: .4byte gSharedMem _08123860: .4byte 0x040000d4 _08123864: .4byte 0x85000400 _08123868: .4byte gUnknown_02039274 @@ -1059,7 +1059,7 @@ _08123A90: bl sub_8124F08 ldr r0, [r6] adds r0, r5 - ldr r1, _08123AF0 @ =0x020199d8 + ldr r1, _08123AF0 @ =gSharedMem + 0x199D8 str r4, [sp] movs r2, 0x1E str r2, [sp, 0x4] @@ -1092,7 +1092,7 @@ _08123AD6: .align 2, 0 _08123AE8: .4byte 0x000008fc _08123AEC: .4byte gCableCarPylonHookTilemapEntries -_08123AF0: .4byte 0x020199d8 +_08123AF0: .4byte gSharedMem + 0x199D8 _08123AF4: .4byte gSpriteCoordOffsetX thumb_func_end sub_81239E4 @@ -1150,7 +1150,7 @@ _08123B50: bne _08123BEE ldr r1, _08123B70 @ =0x000008fc adds r0, r3, r1 - ldr r1, _08123B74 @ =0x020199d8 + ldr r1, _08123B74 @ =gSharedMem + 0x199D8 movs r2, 0x2 str r2, [sp] movs r2, 0x1E @@ -1161,7 +1161,7 @@ _08123B50: b _08123BEE .align 2, 0 _08123B70: .4byte 0x000008fc -_08123B74: .4byte 0x020199d8 +_08123B74: .4byte gSharedMem + 0x199D8 _08123B78: ldr r5, _08123BAC @ =0x000008fc adds r0, r3, r5 @@ -2014,7 +2014,7 @@ _08124258: ldr r7, _081243EC @ =gUnknown_02039274 ldr r0, [r7] adds r0, 0xFC - ldr r1, _081243F0 @ =0x02019048 + ldr r1, _081243F0 @ =gSharedMem + 0x19048 movs r2, 0xC str r2, [sp] movs r2, 0x3 @@ -2210,7 +2210,7 @@ _08124322: b _08124428 .align 2, 0 _081243EC: .4byte gUnknown_02039274 -_081243F0: .4byte 0x02019048 +_081243F0: .4byte gSharedMem + 0x19048 _081243F4: .4byte gSaveBlock2 _081243F8: .4byte sub_8123D98 _081243FC: .4byte gSprites @@ -2322,7 +2322,7 @@ _081244B0: lsrs r0, 24 mov r12, r0 lsls r1, 1 - ldr r7, _08124534 @ =0x02019000 + ldr r7, _08124534 @ =gSharedMem + 0x19000 adds r1, r7 ldrh r0, [r1] strh r0, [r2] @@ -2331,14 +2331,14 @@ _081244B0: adds r1, r4, r1 mov r7, r9 lsls r2, r7, 1 - ldr r7, _08124534 @ =0x02019000 + ldr r7, _08124534 @ =gSharedMem + 0x19000 adds r0, r2, r7 ldrh r0, [r0] strh r0, [r1] ldr r0, [sp, 0x4] adds r3, r0 adds r4, r3 - ldr r1, _08124538 @ =0x02019048 + ldr r1, _08124538 @ =gSharedMem + 0x19048 adds r2, r1 ldrh r0, [r2] strh r0, [r4] @@ -2372,8 +2372,8 @@ _081244B0: bx r0 .align 2, 0 _08124530: .4byte gUnknown_02039274 -_08124534: .4byte 0x02019000 -_08124538: .4byte 0x02019048 +_08124534: .4byte gSharedMem + 0x19000 +_08124538: .4byte gSharedMem + 0x19048 thumb_func_end sub_812446C thumb_func_start sub_812453C diff --git a/asm/contest.s b/asm/contest.s index c5dfe3e2e..ad3b4fba9 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -148,7 +148,7 @@ sub_80AB2AC: @ 80AB2AC movs r4, 0 movs r5, 0xA0 _080AB2DC: - ldr r0, _080AB318 @ =0x02018004 + ldr r0, _080AB318 @ =gSharedMem + 0x18004 adds r0, r5, r0 ldr r1, _080AB31C @ =gUnknown_02038696 adds r1, r4, r1 @@ -171,7 +171,7 @@ _080AB308: .4byte 0x06002000 _080AB30C: .4byte gUnknown_08D1725C _080AB310: .4byte 0x0600d000 _080AB314: .4byte gUnknown_08D17144 -_080AB318: .4byte 0x02018004 +_080AB318: .4byte gSharedMem + 0x18004 _080AB31C: .4byte gUnknown_02038696 thumb_func_end sub_80AB2AC @@ -234,7 +234,7 @@ _080AB394: .4byte 0x00007e3f thumb_func_start sub_80AB398 sub_80AB398: @ 80AB398 push {r4-r6,lr} - ldr r4, _080AB468 @ =0x02019204 + ldr r4, _080AB468 @ =gSharedMem + 0x19204 adds r0, r4, 0 movs r1, 0 movs r2, 0x5C @@ -250,7 +250,7 @@ _080AB3AC: adds r5, 0x1 cmp r5, 0x3 ble _080AB3AC - ldr r4, _080AB46C @ =0x02019260 + ldr r4, _080AB46C @ =gSharedMem + 0x19260 movs r5, 0x3 _080AB3BE: adds r0, r4, 0 @@ -261,7 +261,7 @@ _080AB3BE: subs r5, 0x1 cmp r5, 0 bge _080AB3BE - ldr r4, _080AB470 @ =0x020192d0 + ldr r4, _080AB470 @ =gSharedMem + 0x192D0 movs r6, 0x4 negs r6, r6 movs r3, 0xFF @@ -335,9 +335,9 @@ _080AB448: pop {r0} bx r0 .align 2, 0 -_080AB468: .4byte 0x02019204 -_080AB46C: .4byte 0x02019260 -_080AB470: .4byte 0x020192d0 +_080AB468: .4byte gSharedMem + 0x19204 +_080AB46C: .4byte gSharedMem + 0x19260 +_080AB470: .4byte gSharedMem + 0x192D0 _080AB474: .4byte gIsLinkContest _080AB478: .4byte gUnknown_02038696 thumb_func_end sub_80AB398 @@ -414,7 +414,7 @@ _080AB4E0: ldr r1, _080AB544 @ =gReservedSpritePaletteCount movs r0, 0x4 strb r0, [r1] - ldr r0, _080AB548 @ =0x02000000 + ldr r0, _080AB548 @ =gSharedMem movs r1, 0xC0 lsls r1, 9 adds r0, r1 @@ -434,14 +434,14 @@ _080AB538: .4byte gPaletteFade _080AB53C: .4byte 0x040000d4 _080AB540: .4byte 0x85000400 _080AB544: .4byte gReservedSpritePaletteCount -_080AB548: .4byte 0x02000000 +_080AB548: .4byte gSharedMem _080AB54C: .4byte gMain _080AB550: .4byte 0x0000043c _080AB554: bl sub_80AB350 b _080AB56C _080AB55A: - ldr r5, _080AB574 @ =0x0201925d + ldr r5, _080AB574 @ =gSharedMem + 0x1925D adds r0, r5, 0 bl sub_80AB70C lsls r0, 24 @@ -455,7 +455,7 @@ _080AB56C: strb r0, [r4] b _080AB5AE .align 2, 0 -_080AB574: .4byte 0x0201925d +_080AB574: .4byte gSharedMem + 0x1925D _080AB578: bl sub_80B2184 ldr r0, _080AB5B8 @ =gUnknown_030042C0 @@ -475,7 +475,7 @@ _080AB578: ldr r0, _080AB5C8 @ =sub_80AB5D4 movs r1, 0xA bl CreateTask - ldr r1, _080AB5CC @ =0x02019204 + ldr r1, _080AB5CC @ =gSharedMem + 0x19204 strb r0, [r1, 0x8] ldr r0, _080AB5D0 @ =sub_80ABAAC bl SetMainCallback2 @@ -490,7 +490,7 @@ _080AB5BC: .4byte gUnknown_030041B4 _080AB5C0: .4byte gPaletteFade _080AB5C4: .4byte sub_80ABAC4 _080AB5C8: .4byte sub_80AB5D4 -_080AB5CC: .4byte 0x02019204 +_080AB5CC: .4byte gSharedMem + 0x19204 _080AB5D0: .4byte sub_80ABAAC thumb_func_end sub_80AB47C @@ -630,7 +630,7 @@ sub_80AB6B4: @ 80AB6B4 bl GetMultiplayerId adds r0, r4, 0 bl DestroyTask - ldr r0, _080AB6FC @ =0x02019204 + ldr r0, _080AB6FC @ =gSharedMem + 0x19204 ldrb r1, [r0, 0x8] lsls r0, r1, 2 adds r0, r1 @@ -648,7 +648,7 @@ _080AB6F2: bx r0 .align 2, 0 _080AB6F8: .4byte gTasks -_080AB6FC: .4byte 0x02019204 +_080AB6FC: .4byte gSharedMem + 0x19204 _080AB700: .4byte sub_80AB960 _080AB704: .4byte gRngValue _080AB708: .4byte gUnknown_03005D28 @@ -739,7 +739,7 @@ _080AB7B0: ldr r4, _080AB7F0 @ =0x06002000 adds r1, r4, 0 bl LZDecompressVram - ldr r3, _080AB7F4 @ =0x02015800 + ldr r3, _080AB7F4 @ =gSharedMem + 0x15800 movs r5, 0x80 lsls r5, 6 ldr r1, _080AB7F8 @ =0x040000d4 @@ -769,7 +769,7 @@ _080AB7E6: .align 2, 0 _080AB7EC: .4byte gContestAudienceGfx _080AB7F0: .4byte 0x06002000 -_080AB7F4: .4byte 0x02015800 +_080AB7F4: .4byte gSharedMem + 0x15800 _080AB7F8: .4byte 0x040000d4 _080AB7FC: .4byte 0x84000400 _080AB800: @@ -785,7 +785,7 @@ _080AB814: ldr r4, _080AB834 @ =0x0600e000 adds r1, r4, 0 bl LZDecompressVram - ldr r1, _080AB838 @ =0x02018a04 + ldr r1, _080AB838 @ =gSharedMem + 0x18A04 ldr r0, _080AB83C @ =0x040000d4 str r4, [r0] str r1, [r0, 0x4] @@ -796,7 +796,7 @@ _080AB814: .align 2, 0 _080AB830: .4byte gUnknown_08D17424 _080AB834: .4byte 0x0600e000 -_080AB838: .4byte 0x02018a04 +_080AB838: .4byte gSharedMem + 0x18A04 _080AB83C: .4byte 0x040000d4 _080AB840: .4byte 0x84000200 _080AB844: @@ -836,7 +836,7 @@ _080AB844: mov r0, sp adds r2, r6, 0 bl CpuSet - ldr r1, _080AB8C0 @ =0x02018004 + ldr r1, _080AB8C0 @ =gSharedMem + 0x18004 ldr r0, _080AB8C4 @ =0x040000d4 mov r2, r8 str r2, [r0] @@ -852,7 +852,7 @@ _080AB8B0: .4byte gPlttBufferUnfaded + 0x100 _080AB8B4: .4byte REG_BG0CNT _080AB8B8: .4byte gContestPlayerMonIndex _080AB8BC: .4byte 0xffffff00 -_080AB8C0: .4byte 0x02018004 +_080AB8C0: .4byte gSharedMem + 0x18004 _080AB8C4: .4byte 0x040000d4 _080AB8C8: .4byte 0x84000080 _080AB8CC: @@ -860,7 +860,7 @@ _080AB8CC: bl sub_80AFA5C bl sub_80AEB30 bl sub_80AE8B4 - ldr r1, _080AB924 @ =0x02019204 + ldr r1, _080AB924 @ =gSharedMem + 0x19204 movs r4, 0 strb r0, [r1, 0x12] bl sub_80AFE30 @@ -890,7 +890,7 @@ _080AB8CC: bl sub_80B292C b _080AB946 .align 2, 0 -_080AB924: .4byte 0x02019204 +_080AB924: .4byte gSharedMem + 0x19204 _080AB928: .4byte gBanksBySide _080AB92C: .4byte gBattleTypeFlags _080AB930: .4byte gBankAttacker @@ -1062,7 +1062,7 @@ _080ABA70: .4byte REG_BG0CNT _080ABA74: .4byte REG_BG2CNT _080ABA78: .4byte gTasks _080ABA7C: - ldr r0, _080ABAA4 @ =0x02019204 + ldr r0, _080ABAA4 @ =gSharedMem + 0x19204 ldrb r1, [r0, 0x6] movs r0, 0x40 ands r0, r1 @@ -1083,7 +1083,7 @@ _080ABA9C: pop {r0} bx r0 .align 2, 0 -_080ABAA4: .4byte 0x02019204 +_080ABAA4: .4byte gSharedMem + 0x19204 _080ABAA8: .4byte sub_80ABB70 thumb_func_end sub_80AB9A0 @@ -1184,7 +1184,7 @@ sub_80ABB70: @ 80ABB70 strh r1, [r0] bl sub_80B0D7C ldr r1, _080ABBB8 @ =gPlttBufferUnfaded - ldr r2, _080ABBBC @ =0x02018204 + ldr r2, _080ABBBC @ =gSharedMem + 0x18204 ldr r0, _080ABBC0 @ =0x040000d4 str r1, [r0] str r2, [r0, 0x4] @@ -1205,7 +1205,7 @@ sub_80ABB70: @ 80ABB70 _080ABBB0: .4byte gUnknown_030042A0 _080ABBB4: .4byte gUnknown_03004280 _080ABBB8: .4byte gPlttBufferUnfaded -_080ABBBC: .4byte 0x02018204 +_080ABBBC: .4byte gSharedMem + 0x18204 _080ABBC0: .4byte 0x040000d4 _080ABBC4: .4byte 0x84000100 _080ABBC8: .4byte gContestPlayerMonIndex @@ -1217,7 +1217,7 @@ _080ABBD4: bl StringCopy _080ABBDC: ldr r5, _080ABC20 @ =gDisplayedStringBattle - ldr r0, _080ABC28 @ =0x02019204 + ldr r0, _080ABC28 @ =gSharedMem + 0x19204 ldrb r1, [r0, 0x1] adds r1, 0x1 adds r0, r5, 0 @@ -1249,7 +1249,7 @@ _080ABBDC: .align 2, 0 _080ABC20: .4byte gDisplayedStringBattle _080ABC24: .4byte gUnknown_083CAFAE -_080ABC28: .4byte 0x02019204 +_080ABC28: .4byte gSharedMem + 0x19204 _080ABC2C: .4byte gStringVar4 _080ABC30: .4byte gMenuWindow _080ABC34: .4byte gTasks @@ -1369,7 +1369,7 @@ sub_80ABCDC: @ 80ABCDC movs r6, 0 ldr r0, _080ABD90 @ =gContestPlayerMonIndex mov r8, r0 - ldr r7, _080ABD94 @ =0x02019260 + ldr r7, _080ABD94 @ =gSharedMem + 0x19260 mov r9, r5 mov r10, r4 _080ABD1C: @@ -1426,7 +1426,7 @@ _080ABD84: .4byte gUnknown_03004280 _080ABD88: .4byte gUnknown_03004210 _080ABD8C: .4byte gUnknown_083CA340 _080ABD90: .4byte gContestPlayerMonIndex -_080ABD94: .4byte 0x02019260 +_080ABD94: .4byte gSharedMem + 0x19260 _080ABD98: .4byte gUnknown_0203858E _080ABD9C: .4byte gUnknownText_UnknownFormatting2 _080ABDA0: @@ -1500,7 +1500,7 @@ _080ABE20: movs r0, 0 movs r2, 0xC bl sub_814A5C0 - ldr r4, _080ABE8C @ =0x02019204 + ldr r4, _080ABE8C @ =gSharedMem + 0x19204 movs r0, 0 ldrsb r0, [r4, r0] bl sub_80AC0AC @@ -1538,7 +1538,7 @@ _080ABE7C: .4byte gMoveNames _080ABE80: .4byte gUnknown_083CA340 + 0x1 _080ABE84: .4byte 0x0000ffff _080ABE88: .4byte 0x00002d9f -_080ABE8C: .4byte 0x02019204 +_080ABE8C: .4byte gSharedMem + 0x19204 _080ABE90: .4byte gContestMons _080ABE94: .4byte gContestPlayerMonIndex _080ABE98: .4byte gTasks @@ -1651,7 +1651,7 @@ _080ABF78: bl StringCopy _080ABF80: ldr r5, _080ABFC8 @ =gDisplayedStringBattle - ldr r0, _080ABFD0 @ =0x02019204 + ldr r0, _080ABFD0 @ =gSharedMem + 0x19204 ldrb r1, [r0, 0x1] adds r1, 0x1 adds r0, r5, 0 @@ -1685,7 +1685,7 @@ _080ABF80: .align 2, 0 _080ABFC8: .4byte gDisplayedStringBattle _080ABFCC: .4byte gUnknown_083CAFAE -_080ABFD0: .4byte 0x02019204 +_080ABFD0: .4byte gSharedMem + 0x19204 _080ABFD4: .4byte gStringVar4 _080ABFD8: .4byte gMenuWindow _080ABFDC: .4byte gUnknown_030042A0 @@ -1693,7 +1693,7 @@ _080ABFE0: .4byte gUnknown_03004280 _080ABFE4: .4byte gTasks _080ABFE8: .4byte sub_80ABC70 _080ABFEC: - ldr r4, _080AC000 @ =0x02019204 + ldr r4, _080AC000 @ =gSharedMem + 0x19204 movs r0, 0 ldrsb r0, [r4, r0] bl nullsub_17 @@ -1703,12 +1703,12 @@ _080ABFEC: subs r0, r6, 0x1 b _080AC006 .align 2, 0 -_080AC000: .4byte 0x02019204 +_080AC000: .4byte gSharedMem + 0x19204 _080AC004: subs r0, 0x1 _080AC006: strb r0, [r4] - ldr r4, _080AC03C @ =0x02019204 + ldr r4, _080AC03C @ =gSharedMem + 0x19204 movs r0, 0 ldrsb r0, [r4, r0] bl sub_80AC0AC @@ -1730,11 +1730,11 @@ _080AC006: bl PlaySE b _080AC098 .align 2, 0 -_080AC03C: .4byte 0x02019204 +_080AC03C: .4byte gSharedMem + 0x19204 _080AC040: .4byte gContestMons _080AC044: .4byte gContestPlayerMonIndex _080AC048: - ldr r4, _080AC060 @ =0x02019204 + ldr r4, _080AC060 @ =gSharedMem + 0x19204 movs r0, 0 ldrsb r0, [r4, r0] bl nullsub_17 @@ -1745,12 +1745,12 @@ _080AC048: strb r5, [r4] b _080AC068 .align 2, 0 -_080AC060: .4byte 0x02019204 +_080AC060: .4byte gSharedMem + 0x19204 _080AC064: adds r0, r1, 0x1 strb r0, [r4] _080AC068: - ldr r4, _080AC0A0 @ =0x02019204 + ldr r4, _080AC0A0 @ =gSharedMem + 0x19204 movs r0, 0 ldrsb r0, [r4, r0] bl sub_80AC0AC @@ -1776,7 +1776,7 @@ _080AC098: pop {r0} bx r0 .align 2, 0 -_080AC0A0: .4byte 0x02019204 +_080AC0A0: .4byte gSharedMem + 0x19204 _080AC0A4: .4byte gContestMons _080AC0A8: .4byte gContestPlayerMonIndex thumb_func_end sub_80ABEA0 @@ -1819,7 +1819,7 @@ sub_80AC0C8: @ 80AC0C8 lsls r1, r2, 3 subs r1, r2 lsls r1, 2 - ldr r2, _080AC128 @ =0x02019260 + ldr r2, _080AC128 @ =gSharedMem + 0x19260 adds r1, r2 strh r0, [r1, 0x6] ldr r4, _080AC12C @ =sub_80C8A38 @@ -1845,7 +1845,7 @@ sub_80AC0C8: @ 80AC0C8 .align 2, 0 _080AC120: .4byte gIsLinkContest _080AC124: .4byte gContestPlayerMonIndex -_080AC128: .4byte 0x02019260 +_080AC128: .4byte gSharedMem + 0x19260 _080AC12C: .4byte sub_80C8A38 _080AC130: .4byte sub_80AC15C _080AC134: .4byte gTasks @@ -1875,7 +1875,7 @@ sub_80AC15C: @ 80AC15C lsrs r0, 24 bl DestroyTask ldr r2, _080AC17C @ =gTasks - ldr r0, _080AC180 @ =0x02019204 + ldr r0, _080AC180 @ =gSharedMem + 0x19204 ldrb r1, [r0, 0x8] lsls r0, r1, 2 adds r0, r1 @@ -1887,7 +1887,7 @@ sub_80AC15C: @ 80AC15C bx r0 .align 2, 0 _080AC17C: .4byte gTasks -_080AC180: .4byte 0x02019204 +_080AC180: .4byte gSharedMem + 0x19204 _080AC184: .4byte sub_80AC188 thumb_func_end sub_80AC15C @@ -1906,7 +1906,7 @@ sub_80AC188: @ 80AC188 movs r0, 0 bl sub_80AFFE0 ldr r1, _080AC1EC @ =gPlttBufferFaded - ldr r0, _080AC1F0 @ =0x02018604 + ldr r0, _080AC1F0 @ =gSharedMem + 0x18604 movs r2, 0x80 lsls r2, 3 ldr r4, _080AC1F4 @ =0x040000d4 @@ -1939,7 +1939,7 @@ sub_80AC188: @ 80AC188 _080AC1E4: .4byte gUnknown_030042A0 _080AC1E8: .4byte gUnknown_03004280 _080AC1EC: .4byte gPlttBufferFaded -_080AC1F0: .4byte 0x02018604 +_080AC1F0: .4byte gSharedMem + 0x18604 _080AC1F4: .4byte 0x040000d4 _080AC1F8: .4byte 0xfffffc00 _080AC1FC: .4byte gTasks @@ -1991,7 +1991,7 @@ sub_80AC250: @ 80AC250 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080AC278 @ =0x02019204 + ldr r0, _080AC278 @ =gSharedMem + 0x19204 ldrh r1, [r0, 0x6] movs r0, 0x90 lsls r0, 2 @@ -2009,7 +2009,7 @@ _080AC272: pop {r0} bx r0 .align 2, 0 -_080AC278: .4byte 0x02019204 +_080AC278: .4byte gSharedMem + 0x19204 _080AC27C: .4byte gTasks _080AC280: .4byte sub_80AC284 thumb_func_end sub_80AC250 @@ -2031,7 +2031,7 @@ sub_80AC284: @ 80AC284 asrs r0, 16 cmp r0, 0x13 ble _080AC2B6 - ldr r1, _080AC2C0 @ =0x02019204 + ldr r1, _080AC2C0 @ =gSharedMem + 0x19204 movs r0, 0 strb r0, [r1, 0x10] ldr r0, _080AC2C4 @ =gRngValue @@ -2046,7 +2046,7 @@ _080AC2B6: bx r0 .align 2, 0 _080AC2BC: .4byte gTasks -_080AC2C0: .4byte 0x02019204 +_080AC2C0: .4byte gSharedMem + 0x19204 _080AC2C4: .4byte gRngValue _080AC2C8: .4byte sub_80AC2CC thumb_func_end sub_80AC284 @@ -2062,7 +2062,7 @@ sub_80AC2CC: @ 80AC2CC lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r2, _080AC308 @ =0x02019204 + ldr r2, _080AC308 @ =gSharedMem + 0x19204 ldrb r7, [r2, 0x11] ldr r1, _080AC30C @ =gTasks lsls r0, 2 @@ -2083,7 +2083,7 @@ _080AC2FC: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AC308: .4byte 0x02019204 +_080AC308: .4byte gSharedMem + 0x19204 _080AC30C: .4byte gTasks _080AC310: .4byte _080AC314 .align 2, 0 @@ -2151,7 +2151,7 @@ _080AC314: _080AC404: bl sub_80B0D7C movs r6, 0 - ldr r0, _080AC484 @ =0x02019204 + ldr r0, _080AC484 @ =gSharedMem + 0x19204 adds r1, r0, 0 adds r1, 0xCC ldrb r0, [r0, 0x10] @@ -2170,7 +2170,7 @@ _080AC422: cmp r1, r0 bne _080AC422 _080AC42C: - ldr r4, _080AC484 @ =0x02019204 + ldr r4, _080AC484 @ =gSharedMem + 0x19204 strb r6, [r4, 0x11] ldrb r7, [r4, 0x11] ldr r0, _080AC488 @ =gIsLinkContest @@ -2209,7 +2209,7 @@ _080AC458: strh r5, [r0, 0x8] bl _080AD8CA .align 2, 0 -_080AC484: .4byte 0x02019204 +_080AC484: .4byte gSharedMem + 0x19204 _080AC488: .4byte gIsLinkContest _080AC48C: .4byte sub_80C8C80 _080AC490: .4byte sub_80AD8DC @@ -2247,7 +2247,7 @@ _080AC4D4: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080AC508 @ =0x02019260 + ldr r1, _080AC508 @ =gSharedMem + 0x19260 adds r2, r0, r1 ldrb r1, [r2, 0xC] movs r0, 0x6 @@ -2271,7 +2271,7 @@ _080AC4F6: strh r1, [r0, 0x8] bl _080AD8CA .align 2, 0 -_080AC508: .4byte 0x02019260 +_080AC508: .4byte gSharedMem + 0x19260 _080AC50C: bl sub_80AF138 adds r0, r7, 0 @@ -2293,7 +2293,7 @@ _080AC534: mov r4, r8 lsls r4, 2 mov r9, r4 - ldr r4, _080AC5C4 @ =0x02019348 + ldr r4, _080AC5C4 @ =gSharedMem + 0x19348 ldr r1, _080AC5C8 @ =gBattleMonForms movs r2, 0 adds r0, r1, 0x3 @@ -2357,7 +2357,7 @@ _080AC542: strh r6, [r4, 0x8] bl _080AD8CA .align 2, 0 -_080AC5C4: .4byte 0x02019348 +_080AC5C4: .4byte gSharedMem + 0x19348 _080AC5C8: .4byte gBattleMonForms _080AC5CC: .4byte 0xfffffebc _080AC5D0: .4byte gContestMons @@ -2387,7 +2387,7 @@ _080AC5E8: bl _080AD8CA _080AC60E: lsls r0, r7, 2 - ldr r1, _080AC634 @ =0x02019338 + ldr r1, _080AC634 @ =gSharedMem + 0x19338 adds r0, r1 ldrb r1, [r0, 0x2] movs r0, 0x2 @@ -2402,12 +2402,12 @@ _080AC622: .align 2, 0 _080AC62C: .4byte gSprites _080AC630: .4byte SpriteCallbackDummy -_080AC634: .4byte 0x02019338 +_080AC634: .4byte gSharedMem + 0x19338 _080AC638: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080AC660 @ =0x02019260 + ldr r1, _080AC660 @ =gSharedMem + 0x19260 adds r5, r0, r1 ldrb r1, [r5, 0xC] movs r0, 0x1 @@ -2423,7 +2423,7 @@ _080AC638: strh r1, [r0, 0x8] bl _080AD8CA .align 2, 0 -_080AC660: .4byte 0x02019260 +_080AC660: .4byte gSharedMem + 0x19260 _080AC664: bl sub_80AF138 ldr r0, _080AC690 @ =gStringVar1 @@ -2494,7 +2494,7 @@ _080AC6F8: bne _080AC708 bl _080AD8CA _080AC708: - ldr r0, _080AC728 @ =0x02019204 + ldr r0, _080AC728 @ =gSharedMem + 0x19204 adds r0, 0x5A movs r1, 0 strb r1, [r0] @@ -2509,7 +2509,7 @@ _080AC708: bl _080AD8CA .align 2, 0 _080AC724: .4byte gMenuWindow -_080AC728: .4byte 0x02019204 +_080AC728: .4byte gSharedMem + 0x19204 _080AC72C: .4byte gTasks _080AC730: ldrb r1, [r6, 0x11] @@ -2555,7 +2555,7 @@ _080AC77C: _080AC790: adds r0, r7, 0 bl sub_80B28CC - ldr r1, _080AC7C0 @ =0x02019204 + ldr r1, _080AC7C0 @ =gSharedMem + 0x19204 adds r0, r1, 0 adds r0, 0x5A ldrb r0, [r0] @@ -2574,7 +2574,7 @@ _080AC790: .align 2, 0 _080AC7B8: .4byte gAnimScriptCallback _080AC7BC: .4byte gAnimScriptActive -_080AC7C0: .4byte 0x02019204 +_080AC7C0: .4byte gSharedMem + 0x19204 _080AC7C4: .4byte gTasks _080AC7C8: lsls r0, r7, 3 @@ -2630,7 +2630,7 @@ _080AC81E: lsls r2, r7, 3 subs r0, r2, r7 lsls r0, 2 - ldr r1, _080AC858 @ =0x02019260 + ldr r1, _080AC858 @ =gSharedMem + 0x19260 adds r6, r0, r1 ldrb r0, [r6, 0x13] mov r9, r3 @@ -2647,7 +2647,7 @@ _080AC81E: strh r0, [r4, 0x8] bl _080AD8CA .align 2, 0 -_080AC858: .4byte 0x02019260 +_080AC858: .4byte gSharedMem + 0x19260 _080AC85C: ldrb r0, [r6, 0x14] cmp r0, 0xFF @@ -2730,7 +2730,7 @@ _080AC8F8: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080AC914 @ =0x02019260 + ldr r1, _080AC914 @ =gSharedMem + 0x19260 adds r0, r1 ldrb r0, [r0, 0x11] movs r3, 0x3 @@ -2741,7 +2741,7 @@ _080AC8F8: bl sub_80B1710 b _080AC934 .align 2, 0 -_080AC914: .4byte 0x02019260 +_080AC914: .4byte gSharedMem + 0x19260 _080AC918: cmp r3, 0x2 bne _080AC924 @@ -2804,7 +2804,7 @@ _080AC98C: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080AC9B8 @ =0x02019260 + ldr r1, _080AC9B8 @ =gSharedMem + 0x19260 adds r0, r1 movs r3, 0x2 ldrsh r1, [r0, r3] @@ -2821,7 +2821,7 @@ _080AC98C: strh r1, [r0, 0x8] bl _080AD8CA .align 2, 0 -_080AC9B8: .4byte 0x02019260 +_080AC9B8: .4byte gSharedMem + 0x19260 _080AC9BC: .4byte gTasks _080AC9C0: ldrb r0, [r6, 0x11] @@ -2849,7 +2849,7 @@ _080AC9EC: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080ACA1C @ =0x02019260 + ldr r1, _080ACA1C @ =gSharedMem + 0x19260 adds r0, r1 ldrb r1, [r0, 0x10] movs r0, 0x30 @@ -2869,7 +2869,7 @@ _080ACA06: strh r0, [r1, 0x8] bl _080AD8CA .align 2, 0 -_080ACA1C: .4byte 0x02019260 +_080ACA1C: .4byte gSharedMem + 0x19260 _080ACA20: .4byte gTasks _080ACA24: ldrb r1, [r6, 0x6] @@ -2984,7 +2984,7 @@ _080ACAEE: cmp r6, 0x3 bgt _080ACB58 ldr r3, _080ACB24 @ =gUnknown_02038696 - ldr r1, _080ACB28 @ =0x02019260 + ldr r1, _080ACB28 @ =gSharedMem + 0x19260 _080ACB0A: movs r4, 0 movs r2, 0 @@ -3000,7 +3000,7 @@ _080ACB0A: b _080ACB60 .align 2, 0 _080ACB24: .4byte gUnknown_02038696 -_080ACB28: .4byte 0x02019260 +_080ACB28: .4byte gSharedMem + 0x19260 _080ACB2C: adds r2, 0x1 cmp r2, 0x3 @@ -3044,7 +3044,7 @@ _080ACB60: lsls r4, r2, 3 subs r4, r2 lsls r4, 2 - ldr r1, _080ACB94 @ =0x02019260 + ldr r1, _080ACB94 @ =gSharedMem + 0x19260 adds r4, r1 ldrb r1, [r4, 0x13] bl sub_80B146C @@ -3055,7 +3055,7 @@ _080ACB60: bl _080AD8CA .align 2, 0 _080ACB90: .4byte gUnknown_02038696 -_080ACB94: .4byte 0x02019260 +_080ACB94: .4byte gSharedMem + 0x19260 _080ACB98: mov r0, r9 add r0, r8 @@ -3098,7 +3098,7 @@ _080ACBDC: ldrsh r2, [r1, r3] ldr r1, _080ACC38 @ =gUnknown_02038696 mov r9, r0 - ldr r3, _080ACC3C @ =0x02019260 + ldr r3, _080ACC3C @ =gSharedMem + 0x19260 adds r5, r1, 0 ldrb r4, [r5] cmp r2, r4 @@ -3135,7 +3135,7 @@ _080ACC08: bl _080AD8CA .align 2, 0 _080ACC38: .4byte gUnknown_02038696 -_080ACC3C: .4byte 0x02019260 +_080ACC3C: .4byte gSharedMem + 0x19260 _080ACC40: .4byte gTasks _080ACC44: movs r6, 0 @@ -3148,7 +3148,7 @@ _080ACC44: ldrsh r3, [r1, r2] ldr r1, _080ACC90 @ =gUnknown_02038696 mov r9, r0 - ldr r2, _080ACC94 @ =0x02019338 + ldr r2, _080ACC94 @ =gSharedMem + 0x19338 adds r5, r1, 0 ldrb r4, [r5] cmp r3, r4 @@ -3178,7 +3178,7 @@ _080ACC7E: bl _080AD8CA .align 2, 0 _080ACC90: .4byte gUnknown_02038696 -_080ACC94: .4byte 0x02019338 +_080ACC94: .4byte gSharedMem + 0x19338 _080ACC98: movs r6, 0 mov r5, r8 @@ -3302,7 +3302,7 @@ _080ACD82: lsls r0, r6, 3 subs r0, r6 lsls r0, 2 - ldr r1, _080ACDC0 @ =0x02019260 + ldr r1, _080ACDC0 @ =gSharedMem + 0x19260 adds r4, r0, r1 ldrb r1, [r4, 0x15] movs r0, 0x20 @@ -3329,7 +3329,7 @@ _080ACDA6: strh r0, [r1, 0x8] bl _080AD8CA .align 2, 0 -_080ACDC0: .4byte 0x02019260 +_080ACDC0: .4byte gSharedMem + 0x19260 _080ACDC4: .4byte gTasks _080ACDC8: mov r5, r8 @@ -3353,7 +3353,7 @@ _080ACDE8: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080ACE48 @ =0x02019260 + ldr r1, _080ACE48 @ =gSharedMem + 0x19260 adds r2, r0, r1 ldrb r1, [r2, 0xC] movs r0, 0x6 @@ -3394,7 +3394,7 @@ _080ACE36: strh r0, [r1, 0x8] bl _080AD8CA .align 2, 0 -_080ACE48: .4byte 0x02019260 +_080ACE48: .4byte gSharedMem + 0x19260 _080ACE4C: .4byte gStringVar1 _080ACE50: .4byte gContestMons + 0x2 _080ACE54: .4byte gStringVar4 @@ -3412,7 +3412,7 @@ _080ACE74: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080ACEA0 @ =0x02019260 + ldr r1, _080ACEA0 @ =gSharedMem + 0x19260 adds r0, r1 ldrb r1, [r0, 0x15] movs r0, 0x40 @@ -3430,7 +3430,7 @@ _080ACE74: bl _080AD8CA .align 2, 0 _080ACE9C: .4byte gMenuWindow -_080ACEA0: .4byte 0x02019260 +_080ACEA0: .4byte gSharedMem + 0x19260 _080ACEA4: .4byte gTasks _080ACEA8: ldr r0, _080ACEBC @ =gTasks @@ -3448,7 +3448,7 @@ _080ACEC0: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080ACEE4 @ =0x02019260 + ldr r1, _080ACEE4 @ =gSharedMem + 0x19260 adds r0, r1 ldrb r4, [r0, 0x16] lsls r4, 24 @@ -3463,7 +3463,7 @@ _080ACEC0: ldr r1, _080ACEEC @ =gUnknown_083CBD79 b _080ACEF8 .align 2, 0 -_080ACEE4: .4byte 0x02019260 +_080ACEE4: .4byte gSharedMem + 0x19260 _080ACEE8: .4byte gMenuWindow _080ACEEC: .4byte gUnknown_083CBD79 _080ACEF0: @@ -3593,7 +3593,7 @@ _080AD002: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080AD03C @ =0x02019260 + ldr r1, _080AD03C @ =gSharedMem + 0x19260 adds r6, r0, r1 ldrb r1, [r6, 0x15] movs r5, 0x10 @@ -3616,10 +3616,10 @@ _080AD02C: .align 2, 0 _080AD034: .4byte gMenuWindow _080AD038: .4byte gTasks -_080AD03C: .4byte 0x02019260 +_080AD03C: .4byte gSharedMem + 0x19260 _080AD040: lsls r0, r7, 2 - ldr r1, _080AD06C @ =0x02019338 + ldr r1, _080AD06C @ =gSharedMem + 0x19338 adds r0, r1 ldrb r1, [r0, 0x2] movs r0, 0x4 @@ -3640,12 +3640,12 @@ _080AD058: strh r1, [r0, 0x8] bl _080AD8CA .align 2, 0 -_080AD06C: .4byte 0x02019338 +_080AD06C: .4byte gSharedMem + 0x19338 _080AD070: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080AD0CC @ =0x02019260 + ldr r1, _080AD0CC @ =gSharedMem + 0x19260 adds r0, r1 ldrb r1, [r0, 0x15] movs r0, 0x1 @@ -3683,7 +3683,7 @@ _080AD070: strh r0, [r4, 0x8] bl _080AD8CA .align 2, 0 -_080AD0CC: .4byte 0x02019260 +_080AD0CC: .4byte gSharedMem + 0x19260 _080AD0D0: .4byte gStringVar1 _080AD0D4: .4byte gContestMons + 0x2 _080AD0D8: .4byte gStringVar4 @@ -3726,7 +3726,7 @@ _080AD12A: lsls r4, r7, 3 subs r4, r7 lsls r4, 2 - ldr r0, _080AD160 @ =0x02019260 + ldr r0, _080AD160 @ =gSharedMem + 0x19260 adds r4, r0 movs r3, 0x2 ldrsh r0, [r4, r3] @@ -3749,12 +3749,12 @@ _080AD12A: b _080AD8CA .align 2, 0 _080AD15C: .4byte gMenuWindow -_080AD160: .4byte 0x02019260 +_080AD160: .4byte gSharedMem + 0x19260 _080AD164: .4byte gTasks _080AD168: bl sub_80B0D7C lsls r0, r7, 2 - ldr r1, _080AD19C @ =0x02019338 + ldr r1, _080AD19C @ =gSharedMem + 0x19338 adds r0, r1 ldrb r1, [r0, 0x2] movs r0, 0x4 @@ -3777,10 +3777,10 @@ _080AD182: strh r0, [r4, 0x8] b _080AD8CA .align 2, 0 -_080AD19C: .4byte 0x02019338 +_080AD19C: .4byte gSharedMem + 0x19338 _080AD1A0: .4byte gTasks _080AD1A4: - ldr r2, _080AD1CC @ =0x02019328 + ldr r2, _080AD1CC @ =gSharedMem + 0x19328 ldrb r1, [r2, 0x1] movs r0, 0x1 ands r0, r1 @@ -3801,7 +3801,7 @@ _080AD1A4: strh r1, [r0, 0x8] b _080AD8CA .align 2, 0 -_080AD1CC: .4byte 0x02019328 +_080AD1CC: .4byte gSharedMem + 0x19328 _080AD1D0: ldrb r4, [r1] lsls r2, r7, 3 @@ -3847,7 +3847,7 @@ _080AD21E: mov r2, r10 subs r0, r2, r7 lsls r0, 2 - ldr r1, _080AD27C @ =0x02019260 + ldr r1, _080AD27C @ =gSharedMem + 0x19260 adds r0, r1 ldrb r1, [r0, 0x15] movs r0, 0x1 @@ -3862,7 +3862,7 @@ _080AD23A: ldr r2, _080AD284 @ =gContestMons + 0x2 adds r1, r2 bl StringCopy - ldr r3, _080AD288 @ =0x02019204 + ldr r3, _080AD288 @ =gSharedMem + 0x19204 ldrb r0, [r3, 0x13] lsls r1, r4, 24 asrs r2, r1, 24 @@ -3885,10 +3885,10 @@ _080AD262: _080AD270: .4byte gStringVar3 _080AD274: .4byte gUnknown_083CC2D8 _080AD278: .4byte gContestMoves -_080AD27C: .4byte 0x02019260 +_080AD27C: .4byte gSharedMem + 0x19260 _080AD280: .4byte gStringVar1 _080AD284: .4byte gContestMons + 0x2 -_080AD288: .4byte 0x02019204 +_080AD288: .4byte gSharedMem + 0x19204 _080AD28C: .4byte gTasks _080AD290: cmp r2, 0 @@ -4156,7 +4156,7 @@ _080AD468: b _080AD8CA _080AD4A0: lsls r0, r7, 2 - ldr r2, _080AD4E0 @ =0x02019338 + ldr r2, _080AD4E0 @ =gSharedMem + 0x19338 adds r0, r2 ldrb r1, [r0, 0x2] movs r0, 0x4 @@ -4190,7 +4190,7 @@ _080AD4CC: strh r0, [r1, 0x1C] b _080AD8CA .align 2, 0 -_080AD4E0: .4byte 0x02019338 +_080AD4E0: .4byte gSharedMem + 0x19338 _080AD4E4: .4byte 0xfffffecc _080AD4E8: .4byte gTasks _080AD4EC: @@ -4217,7 +4217,7 @@ _080AD4FE: _080AD510: .4byte gPaletteFade _080AD514: lsls r0, r7, 2 - ldr r1, _080AD534 @ =0x02019338 + ldr r1, _080AD534 @ =gSharedMem + 0x19338 adds r0, r1 ldrb r1, [r0, 0x2] movs r0, 0x4 @@ -4232,12 +4232,12 @@ _080AD526: lsls r1, r4, 2 b _080AD6EC .align 2, 0 -_080AD534: .4byte 0x02019338 +_080AD534: .4byte gSharedMem + 0x19338 _080AD538: .4byte gTasks _080AD53C: bl sub_80AF138 ldr r0, _080AD5A8 @ =gStringVar3 - ldr r4, _080AD5AC @ =0x02019328 + ldr r4, _080AD5AC @ =gSharedMem + 0x19328 ldr r1, [r4] lsls r1, 20 lsrs r1, 29 @@ -4284,7 +4284,7 @@ _080AD53C: b _080AD8CA .align 2, 0 _080AD5A8: .4byte gStringVar3 -_080AD5AC: .4byte 0x02019328 +_080AD5AC: .4byte gSharedMem + 0x19328 _080AD5B0: .4byte gContestMons + 0x2 _080AD5B4: .4byte gStringVar1 _080AD5B8: .4byte gStringVar2 @@ -4349,7 +4349,7 @@ _080AD648: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080AD6B4 @ =0x02019260 + ldr r1, _080AD6B4 @ =gSharedMem + 0x19260 adds r4, r0, r1 ldrb r1, [r4, 0x15] movs r0, 0x10 @@ -4397,7 +4397,7 @@ _080AD664: strh r1, [r0, 0x8] b _080AD8CA .align 2, 0 -_080AD6B4: .4byte 0x02019260 +_080AD6B4: .4byte gSharedMem + 0x19260 _080AD6B8: .4byte gStringVar1 _080AD6BC: .4byte gContestMons + 0x2 _080AD6C0: .4byte gStringVar2 @@ -4664,7 +4664,7 @@ sub_80AD8DC: @ 80AD8DC push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _080AD8F8 @ =0x02019204 + ldr r3, _080AD8F8 @ =gSharedMem + 0x19204 ldrb r2, [r3, 0x7] movs r1, 0x5 negs r1, r1 @@ -4674,7 +4674,7 @@ sub_80AD8DC: @ 80AD8DC pop {r0} bx r0 .align 2, 0 -_080AD8F8: .4byte 0x02019204 +_080AD8F8: .4byte gSharedMem + 0x19204 thumb_func_end sub_80AD8DC thumb_func_start sub_80AD8FC @@ -4770,7 +4770,7 @@ _080AD98E: ands r0, r1 cmp r0, 0 beq _080AD9E8 - ldr r2, _080AD9DC @ =0x02019204 + ldr r2, _080AD9DC @ =gSharedMem + 0x19204 ldrb r0, [r2, 0x7] movs r1, 0x4 orrs r0, r1 @@ -4796,7 +4796,7 @@ _080AD9B8: b _080ADA10 .align 2, 0 _080AD9D8: .4byte gIsLinkContest -_080AD9DC: .4byte 0x02019204 +_080AD9DC: .4byte gSharedMem + 0x19204 _080AD9E0: .4byte sub_80C8C80 _080AD9E4: .4byte sub_80AD8DC _080AD9E8: @@ -4804,7 +4804,7 @@ _080AD9E8: bl sub_80AF3C0 b _080AD9FE _080AD9F2: - ldr r0, _080ADA04 @ =0x02019204 + ldr r0, _080ADA04 @ =gSharedMem + 0x19204 ldrb r1, [r0, 0x7] movs r0, 0x4 ands r0, r1 @@ -4815,7 +4815,7 @@ _080AD9FE: strh r0, [r5, 0x8] b _080ADA10 .align 2, 0 -_080ADA04: .4byte 0x02019204 +_080ADA04: .4byte gSharedMem + 0x19204 _080ADA08: movs r0, 0 strh r0, [r5, 0x8] @@ -4893,7 +4893,7 @@ _080ADA7A: strh r5, [r4, 0xA] b _080ADAB2 _080ADA92: - ldr r0, _080ADABC @ =0x02019204 + ldr r0, _080ADABC @ =gSharedMem + 0x19204 ldrb r1, [r0, 0x7] movs r0, 0x2 ands r0, r1 @@ -4915,7 +4915,7 @@ _080ADAB2: strh r0, [r4, 0x8] b _080ADACE .align 2, 0 -_080ADABC: .4byte 0x02019204 +_080ADABC: .4byte gSharedMem + 0x19204 _080ADAC0: bl sub_80AFF10 movs r0, 0 @@ -4960,7 +4960,7 @@ _080ADB00: .4byte sub_80ADB04 sub_80ADB04: @ 80ADB04 lsls r0, 24 lsrs r0, 24 - ldr r2, _080ADB30 @ =0x02018204 + ldr r2, _080ADB30 @ =gSharedMem + 0x18204 ldr r3, _080ADB34 @ =gPlttBufferUnfaded ldr r1, _080ADB38 @ =0x040000d4 str r2, [r1] @@ -4981,7 +4981,7 @@ sub_80ADB04: @ 80ADB04 str r0, [r1] bx lr .align 2, 0 -_080ADB30: .4byte 0x02018204 +_080ADB30: .4byte gSharedMem + 0x18204 _080ADB34: .4byte gPlttBufferUnfaded _080ADB38: .4byte 0x040000d4 _080ADB3C: .4byte 0x84000100 @@ -5036,7 +5036,7 @@ sub_80ADB88: @ 80ADB88 lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _080ADBF0 @ =0x02019260 + ldr r1, _080ADBF0 @ =gSharedMem + 0x19260 adds r0, r1 ldrb r4, [r0, 0x1A] bl sub_80AF138 @@ -5074,7 +5074,7 @@ sub_80ADB88: @ 80ADB88 bx r0 .align 2, 0 _080ADBEC: .4byte gContestPlayerMonIndex -_080ADBF0: .4byte 0x02019260 +_080ADBF0: .4byte gSharedMem + 0x19260 _080ADBF4: .4byte gStringVar1 _080ADBF8: .4byte gContestMons + 0x2 _080ADBFC: .4byte gStringVar4 @@ -5233,7 +5233,7 @@ sub_80ADD04: @ 80ADD04 ldrb r0, [r2] ands r1, r0 strb r1, [r2] - ldr r1, _080ADD48 @ =0x02019204 + ldr r1, _080ADD48 @ =gSharedMem + 0x19204 ldrb r0, [r1, 0x1] adds r0, 0x1 strb r0, [r1, 0x1] @@ -5251,7 +5251,7 @@ sub_80ADD04: @ 80ADD04 .align 2, 0 _080ADD40: .4byte REG_BG0CNT _080ADD44: .4byte REG_BG2CNT -_080ADD48: .4byte 0x02019204 +_080ADD48: .4byte gSharedMem + 0x19204 _080ADD4C: .4byte gTasks _080ADD50: .4byte sub_80ADDA4 _080ADD54: @@ -5277,7 +5277,7 @@ sub_80ADD74: @ 80ADD74 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080ADD98 @ =0x02019204 + ldr r0, _080ADD98 @ =gSharedMem + 0x19204 ldrb r1, [r0, 0x6] movs r0, 0x40 ands r0, r1 @@ -5294,7 +5294,7 @@ _080ADD94: pop {r0} bx r0 .align 2, 0 -_080ADD98: .4byte 0x02019204 +_080ADD98: .4byte gSharedMem + 0x19204 _080ADD9C: .4byte gTasks _080ADDA0: .4byte sub_80ABB70 thumb_func_end sub_80ADD74 @@ -5310,7 +5310,7 @@ sub_80ADDA4: @ 80ADDA4 strh r1, [r0] ldr r0, _080ADE28 @ =gUnknown_03004280 strh r1, [r0] - ldr r3, _080ADE2C @ =0x02019260 + ldr r3, _080ADE2C @ =gSharedMem + 0x19260 ldr r2, _080ADE30 @ =gUnknown_02038680 movs r1, 0x3 _080ADDBC: @@ -5329,7 +5329,7 @@ _080ADDBC: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _080ADE2C @ =0x02019260 + ldr r1, _080ADE2C @ =gSharedMem + 0x19260 adds r0, r1 ldrh r0, [r0, 0x8] bl sub_80BE23C @@ -5364,7 +5364,7 @@ _080ADDBC: .align 2, 0 _080ADE24: .4byte gUnknown_030042A0 _080ADE28: .4byte gUnknown_03004280 -_080ADE2C: .4byte 0x02019260 +_080ADE2C: .4byte gSharedMem + 0x19260 _080ADE30: .4byte gUnknown_02038680 _080ADE34: .4byte gContestPlayerMonIndex _080ADE38: .4byte gUnknown_03005D28 @@ -5555,7 +5555,7 @@ sub_80ADF98: @ 80ADF98 movs r3, 0x10 bl BeginNormalPaletteFade ldr r2, _080ADFCC @ =gTasks - ldr r0, _080ADFD0 @ =0x02019204 + ldr r0, _080ADFD0 @ =gSharedMem + 0x19204 ldrb r1, [r0, 0x8] lsls r0, r1, 2 adds r0, r1 @@ -5568,7 +5568,7 @@ sub_80ADF98: @ 80ADF98 bx r0 .align 2, 0 _080ADFCC: .4byte gTasks -_080ADFD0: .4byte 0x02019204 +_080ADFD0: .4byte gSharedMem + 0x19204 _080ADFD4: .4byte sub_80ADFD8 thumb_func_end sub_80ADF98 @@ -7401,7 +7401,7 @@ _080AEE24: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r1, _080AEE48 @ =0x02019260 + ldr r1, _080AEE48 @ =gSharedMem + 0x19260 adds r0, r1 ldrh r0, [r0, 0x6] adds r1, r4, 0 @@ -7415,7 +7415,7 @@ _080AEE24: pop {r0} bx r0 .align 2, 0 -_080AEE48: .4byte 0x02019260 +_080AEE48: .4byte gSharedMem + 0x19260 thumb_func_end unref_sub_80AEE20 thumb_func_start sub_80AEE4C @@ -7442,7 +7442,7 @@ sub_80AEE54: @ 80AEE54 lsls r5, r7, 3 subs r0, r5, r7 lsls r0, 2 - ldr r1, _080AEE84 @ =0x02019260 + ldr r1, _080AEE84 @ =gSharedMem + 0x19260 adds r0, r1 ldrb r0, [r0, 0x10] movs r2, 0x30 @@ -7453,7 +7453,7 @@ sub_80AEE54: @ 80AEE54 movs r0, 0 b _080AEF3C .align 2, 0 -_080AEE84: .4byte 0x02019260 +_080AEE84: .4byte gSharedMem + 0x19260 _080AEE88: ldr r0, _080AEEB0 @ =gUnknown_02038696 adds r0, r7, r0 @@ -7488,7 +7488,7 @@ _080AEEB4: _080AEEC4: subs r0, r6, r7 lsls r0, 2 - ldr r1, _080AEEEC @ =0x02019260 + ldr r1, _080AEEEC @ =gSharedMem + 0x19260 adds r5, r0, r1 movs r0, 0xD ldrsb r0, [r5, r0] @@ -7505,7 +7505,7 @@ _080AEEC4: b _080AEF2C .align 2, 0 _080AEEE8: .4byte 0x0600c026 -_080AEEEC: .4byte 0x02019260 +_080AEEEC: .4byte gSharedMem + 0x19260 _080AEEF0: movs r1, 0 mov r8, r1 @@ -7599,7 +7599,7 @@ _080AEF84: _080AEF92: subs r0, r7, r5 lsls r0, 2 - ldr r1, _080AEFE4 @ =0x02019260 + ldr r1, _080AEFE4 @ =gSharedMem + 0x19260 adds r0, r1 ldrb r0, [r0, 0xD] lsls r0, 24 @@ -7639,7 +7639,7 @@ _080AEFCE: bx r0 .align 2, 0 _080AEFE0: .4byte 0x0600c026 -_080AEFE4: .4byte 0x02019260 +_080AEFE4: .4byte gSharedMem + 0x19260 thumb_func_end sub_80AEF50 thumb_func_start sub_80AEFE8 @@ -7706,7 +7706,7 @@ sub_80AF038: @ 80AF038 lsls r0, r3, 3 subs r0, r3 lsls r0, 2 - ldr r1, _080AF078 @ =0x02019260 + ldr r1, _080AF078 @ =gSharedMem + 0x19260 adds r2, r0, r1 ldr r0, [r2, 0x10] ldr r1, _080AF07C @ =0x00ff0003 @@ -7722,7 +7722,7 @@ _080AF06C: b _080AF0A6 .align 2, 0 _080AF074: .4byte gUnknown_02038696 -_080AF078: .4byte 0x02019260 +_080AF078: .4byte gSharedMem + 0x19260 _080AF07C: .4byte 0x00ff0003 _080AF080: ldrb r1, [r2, 0xC] @@ -7873,7 +7873,7 @@ _080AF190: .4byte gContestPlayerMonIndex _080AF194: .4byte gContestMons _080AF198: ldr r2, _080AF1B0 @ =gContestMons - ldr r0, _080AF1B4 @ =0x02019204 + ldr r0, _080AF1B4 @ =gSharedMem + 0x19204 ldrb r0, [r0] lsls r0, 1 lsls r1, r5, 6 @@ -7888,7 +7888,7 @@ _080AF1AA: bx r1 .align 2, 0 _080AF1B0: .4byte gContestMons -_080AF1B4: .4byte 0x02019204 +_080AF1B4: .4byte gSharedMem + 0x19204 thumb_func_end sub_80AF15C thumb_func_start sub_80AF1B8 @@ -7901,7 +7901,7 @@ _080AF1BC: lsls r1, r4, 3 subs r1, r4 lsls r1, 2 - ldr r2, _080AF1E0 @ =0x02019260 + ldr r2, _080AF1E0 @ =gSharedMem + 0x19260 adds r1, r2 strh r0, [r1, 0x6] adds r0, r4, 0x1 @@ -7913,7 +7913,7 @@ _080AF1BC: pop {r0} bx r0 .align 2, 0 -_080AF1E0: .4byte 0x02019260 +_080AF1E0: .4byte gSharedMem + 0x19260 thumb_func_end sub_80AF1B8 thumb_func_start sub_80AF1E4 @@ -7936,7 +7936,7 @@ _080AF1FE: lsls r0, r5, 3 subs r0, r5 lsls r0, 2 - ldr r1, _080AF21C @ =0x02019260 + ldr r1, _080AF21C @ =gSharedMem + 0x19260 adds r1, r0, r1 ldrh r0, [r1, 0x6] cmp r0, 0 @@ -7947,7 +7947,7 @@ _080AF1FE: bl sub_80AE598 b _080AF23A .align 2, 0 -_080AF21C: .4byte 0x02019260 +_080AF21C: .4byte gSharedMem + 0x19260 _080AF220: .4byte gDisplayedStringBattle _080AF224: .4byte gUnknownText_MissedTurn _080AF228: @@ -8066,7 +8066,7 @@ sub_80AF2FC: @ 80AF2FC push {r4-r7,lr} sub sp, 0x8 movs r4, 0 - ldr r2, _080AF398 @ =0x02019260 + ldr r2, _080AF398 @ =gSharedMem + 0x19260 _080AF304: lsls r0, r4, 3 subs r0, r4 @@ -8118,7 +8118,7 @@ _080AF354: cmp r4, 0x2 bls _080AF326 movs r4, 0 - ldr r0, _080AF398 @ =0x02019260 + ldr r0, _080AF398 @ =gSharedMem + 0x19260 mov r12, r0 movs r7, 0x4 negs r7, r7 @@ -8148,7 +8148,7 @@ _080AF37C: strb r0, [r3, 0xB] b _080AF3A6 .align 2, 0 -_080AF398: .4byte 0x02019260 +_080AF398: .4byte gSharedMem + 0x19260 _080AF39C: adds r0, r2, 0x1 lsls r0, 24 @@ -8172,7 +8172,7 @@ _080AF3A6: thumb_func_start sub_80AF3C0 sub_80AF3C0: @ 80AF3C0 push {lr} - ldr r2, _080AF3D0 @ =0x02019260 + ldr r2, _080AF3D0 @ =gSharedMem + 0x19260 adds r3, r2, 0 _080AF3C6: ldrh r0, [r2, 0x6] @@ -8181,7 +8181,7 @@ _080AF3C6: movs r1, 0x5 b _080AF3F2 .align 2, 0 -_080AF3D0: .4byte 0x02019260 +_080AF3D0: .4byte gSharedMem + 0x19260 _080AF3D4: movs r1, 0x2 ldrsh r0, [r2, r1] @@ -8217,7 +8217,7 @@ sub_80AF404: @ 80AF404 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _080AF42C @ =0x02019260 + ldr r0, _080AF42C @ =gSharedMem + 0x19260 adds r2, r1, r0 ldrb r1, [r2, 0xC] movs r0, 0x6 @@ -8233,7 +8233,7 @@ _080AF428: movs r0, 0 b _080AF432 .align 2, 0 -_080AF42C: .4byte 0x02019260 +_080AF42C: .4byte gSharedMem + 0x19260 _080AF430: movs r0, 0x1 _080AF432: @@ -8249,7 +8249,7 @@ sub_80AF438: @ 80AF438 mov r5, r8 push {r5-r7} movs r5, 0 - ldr r0, _080AF594 @ =0x02019260 + ldr r0, _080AF594 @ =gSharedMem + 0x19260 mov r10, r0 movs r1, 0 mov r12, r1 @@ -8407,7 +8407,7 @@ _080AF53E: lsrs r5, r0, 24 cmp r5, 0x3 bls _080AF53E - ldr r2, _080AF598 @ =0x02019328 + ldr r2, _080AF598 @ =gSharedMem + 0x19328 ldrb r1, [r2, 0x1] movs r0, 0x2 negs r0, r0 @@ -8421,8 +8421,8 @@ _080AF53E: pop {r0} bx r0 .align 2, 0 -_080AF594: .4byte 0x02019260 -_080AF598: .4byte 0x02019328 +_080AF594: .4byte gSharedMem + 0x19260 +_080AF598: .4byte gSharedMem + 0x19328 thumb_func_end sub_80AF438 thumb_func_start sub_80AF59C @@ -8433,7 +8433,7 @@ sub_80AF59C: @ 80AF59C lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _080AF5C4 @ =0x02019260 + ldr r0, _080AF5C4 @ =gSharedMem + 0x19260 adds r2, r1, r0 ldrb r1, [r2, 0xC] movs r0, 0x6 @@ -8449,7 +8449,7 @@ _080AF5C0: movs r0, 0x1 b _080AF5CA .align 2, 0 -_080AF5C4: .4byte 0x02019260 +_080AF5C4: .4byte gSharedMem + 0x19260 _080AF5C8: movs r0, 0 _080AF5CA: @@ -8489,7 +8489,7 @@ _080AF5FC: b _080AF5E2 _080AF600: movs r0, 0 - ldr r4, _080AF62C @ =0x02019204 + ldr r4, _080AF62C @ =gSharedMem + 0x19204 adds r5, r4, 0x2 _080AF606: cmp r3, 0x3 @@ -8513,7 +8513,7 @@ _080AF626: pop {r1} bx r1 .align 2, 0 -_080AF62C: .4byte 0x02019204 +_080AF62C: .4byte gSharedMem + 0x19204 thumb_func_end unref_sub_80AF5D0 thumb_func_start sub_80AF630 @@ -8865,7 +8865,7 @@ unref_sub_80AF89C: @ 80AF89C lsrs r3, 24 mov r9, r3 lsls r2, r3, 2 - ldr r0, _080AF940 @ =0x02019338 + ldr r0, _080AF940 @ =gSharedMem + 0x19338 adds r2, r0 ldrb r0, [r2, 0x2] movs r1, 0x4 @@ -8925,7 +8925,7 @@ _080AF932: pop {r1} bx r1 .align 2, 0 -_080AF940: .4byte 0x02019338 +_080AF940: .4byte gSharedMem + 0x19338 _080AF944: .4byte sub_80AF94C _080AF948: .4byte gTasks thumb_func_end unref_sub_80AF89C @@ -8951,7 +8951,7 @@ sub_80AF94C: @ 80AF94C adds r0, r4, 0 bl DestroyTask lsls r1, r5, 2 - ldr r0, _080AF98C @ =0x02019338 + ldr r0, _080AF98C @ =gSharedMem + 0x19338 adds r1, r0 ldrb r2, [r1, 0x2] movs r0, 0x5 @@ -8961,7 +8961,7 @@ sub_80AF94C: @ 80AF94C b _080AFA56 .align 2, 0 _080AF988: .4byte gTasks -_080AF98C: .4byte 0x02019338 +_080AF98C: .4byte gSharedMem + 0x19338 _080AF990: ldrh r0, [r2, 0x1C] adds r0, 0x1 @@ -9250,7 +9250,7 @@ sub_80AFBA0: @ 80AFBA0 lsls r2, 24 lsrs r7, r2, 24 lsls r2, r7, 2 - ldr r0, _080AFC30 @ =0x02019338 + ldr r0, _080AFC30 @ =gSharedMem + 0x19338 adds r2, r0 ldrb r0, [r2, 0x2] movs r1, 0x4 @@ -9308,7 +9308,7 @@ _080AFC28: strh r0, [r1, 0xC] b _080AFC4A .align 2, 0 -_080AFC30: .4byte 0x02019338 +_080AFC30: .4byte gSharedMem + 0x19338 _080AFC34: .4byte sub_80AFC74 _080AFC38: .4byte gTasks _080AFC3C: @@ -9382,7 +9382,7 @@ _080AFCA6: mov r0, r8 bl DestroyTask lsls r1, r7, 2 - ldr r0, _080AFCD8 @ =0x02019338 + ldr r0, _080AFCD8 @ =gSharedMem + 0x19338 adds r1, r0 ldrb r2, [r1, 0x2] movs r0, 0x5 @@ -9392,7 +9392,7 @@ _080AFCA6: b _080AFE1C .align 2, 0 _080AFCD4: .4byte gTasks -_080AFCD8: .4byte 0x02019338 +_080AFCD8: .4byte gSharedMem + 0x19338 _080AFCDC: cmp r3, 0 bne _080AFD28 @@ -9582,7 +9582,7 @@ _080AFE3C: movs r3, 0x1 bl CreateSprite lsls r1, r4, 2 - ldr r2, _080AFE74 @ =0x02019338 + ldr r2, _080AFE74 @ =gSharedMem + 0x19338 adds r1, r2 strb r0, [r1] adds r4, 0x1 @@ -9596,7 +9596,7 @@ _080AFE64: .4byte gUnknown_083CA350 _080AFE68: .4byte gUnknown_083CA338 _080AFE6C: .4byte gUnknown_02038696 _080AFE70: .4byte gSpriteTemplate_83CA3AC -_080AFE74: .4byte 0x02019338 +_080AFE74: .4byte gSharedMem + 0x19338 thumb_func_end sub_80AFE30 thumb_func_start sub_80AFE78 @@ -9605,7 +9605,7 @@ sub_80AFE78: @ 80AFE78 lsls r0, 24 lsrs r6, r0, 24 lsls r2, r6, 2 - ldr r3, _080AFEB0 @ =0x02019338 + ldr r3, _080AFEB0 @ =gSharedMem + 0x19338 adds r2, r3 ldrb r0, [r2, 0x2] movs r1, 0x1 @@ -9629,7 +9629,7 @@ sub_80AFE78: @ 80AFE78 movs r5, 0x38 b _080AFEBA .align 2, 0 -_080AFEB0: .4byte 0x02019338 +_080AFEB0: .4byte gSharedMem + 0x19338 _080AFEB4: cmp r0, 0 bge _080AFEBA @@ -9700,7 +9700,7 @@ _080AFF14: sub_80AFF28: @ 80AFF28 push {r4,lr} movs r3, 0 - ldr r2, _080AFF54 @ =0x02019338 + ldr r2, _080AFF54 @ =gSharedMem + 0x19338 ldrb r1, [r2, 0x2] movs r0, 0x1 ands r0, r1 @@ -9723,7 +9723,7 @@ _080AFF4C: movs r0, 0 b _080AFF5A .align 2, 0 -_080AFF54: .4byte 0x02019338 +_080AFF54: .4byte gSharedMem + 0x19338 _080AFF58: movs r0, 0x1 _080AFF5A: @@ -9746,7 +9746,7 @@ sub_80AFF60: @ 80AFF60 movs r0, 0x2E ldrsh r1, [r3, r0] lsls r1, 2 - ldr r0, _080AFF8C @ =0x02019338 + ldr r0, _080AFF8C @ =gSharedMem + 0x19338 adds r1, r0 ldrb r2, [r1, 0x2] movs r0, 0x2 @@ -9757,7 +9757,7 @@ sub_80AFF60: @ 80AFF60 str r0, [r3, 0x1C] b _080AFF9A .align 2, 0 -_080AFF8C: .4byte 0x02019338 +_080AFF8C: .4byte gSharedMem + 0x19338 _080AFF90: .4byte SpriteCallbackDummy _080AFF94: ldrh r0, [r3, 0x32] @@ -9775,7 +9775,7 @@ sub_80AFFA0: @ 80AFFA0 movs r2, 0 ldr r6, _080AFFD0 @ =gSprites ldr r5, _080AFFD4 @ =gUnknown_083CA338 - ldr r3, _080AFFD8 @ =0x02019338 + ldr r3, _080AFFD8 @ =gSharedMem + 0x19338 ldr r4, _080AFFDC @ =gUnknown_02038696 _080AFFAC: ldrb r0, [r3] @@ -9798,7 +9798,7 @@ _080AFFAC: .align 2, 0 _080AFFD0: .4byte gSprites _080AFFD4: .4byte gUnknown_083CA338 -_080AFFD8: .4byte 0x02019338 +_080AFFD8: .4byte gSharedMem + 0x19338 _080AFFDC: .4byte gUnknown_02038696 thumb_func_end sub_80AFFA0 @@ -9810,7 +9810,7 @@ sub_80AFFE0: @ 80AFFE0 movs r3, 0 ldr r6, _080B0008 @ =gUnknown_02038696 ldr r4, _080B000C @ =gSprites - ldr r2, _080B0010 @ =0x02019338 + ldr r2, _080B0010 @ =gSharedMem + 0x19338 _080AFFEE: adds r0, r3, r6 ldrb r0, [r0] @@ -9828,7 +9828,7 @@ _080AFFEE: .align 2, 0 _080B0008: .4byte gUnknown_02038696 _080B000C: .4byte gSprites -_080B0010: .4byte 0x02019338 +_080B0010: .4byte gSharedMem + 0x19338 _080B0014: ldrb r0, [r2] lsls r1, r0, 4 @@ -9877,7 +9877,7 @@ _080B004A: movs r3, 0 bl CreateSprite lsls r4, r5, 2 - ldr r1, _080B00C0 @ =0x02019338 + ldr r1, _080B00C0 @ =gSharedMem + 0x19338 adds r4, r1 strb r0, [r4, 0x1] ldrb r1, [r4, 0x1] @@ -9913,7 +9913,7 @@ _080B00B0: .4byte gSprites _080B00B4: .4byte gUnknown_083CA3C4 _080B00B8: .4byte gSpriteTemplate_83CA3F4 _080B00BC: .4byte gUnknown_02038696 -_080B00C0: .4byte 0x02019338 +_080B00C0: .4byte gSharedMem + 0x19338 _080B00C4: .4byte gSubspriteTables_83CA464 thumb_func_end sub_80B0034 @@ -9941,7 +9941,7 @@ sub_80B00C8: @ 80B00C8 movs r3, 0x4 orrs r2, r3 strb r2, [r1] - ldr r1, _080B0114 @ =0x02019204 + ldr r1, _080B0114 @ =gSharedMem + 0x19204 adds r1, 0x58 strb r0, [r1] pop {r0} @@ -9951,7 +9951,7 @@ _080B0104: .4byte gUnknown_083CA46C _080B0108: .4byte gUnknown_083CA474 _080B010C: .4byte gSpriteTemplate_83CA484 _080B0110: .4byte gSprites -_080B0114: .4byte 0x02019204 +_080B0114: .4byte gSharedMem + 0x19204 thumb_func_end sub_80B00C8 thumb_func_start nullsub_18 @@ -9982,7 +9982,7 @@ _080B012C: adds r0, r5, 0x1 mov r8, r0 ldr r7, _080B01A4 @ =gSprites - ldr r6, _080B01A8 @ =0x0201920d + ldr r6, _080B01A8 @ =gSharedMem + 0x1920D _080B014A: lsls r2, r4, 1 adds r0, r2, r4 @@ -10027,7 +10027,7 @@ _080B0198: .4byte gUnknown_083CC3AC _080B019C: .4byte gUnknown_083CC3B4 _080B01A0: .4byte gUnknown_083CA330 _080B01A4: .4byte gSprites -_080B01A8: .4byte 0x0201920d +_080B01A8: .4byte gSharedMem + 0x1920D _080B01AC: .4byte gSpriteTemplate_83CC454 thumb_func_end unref_sub_80B011C @@ -10035,7 +10035,7 @@ _080B01AC: .4byte gSpriteTemplate_83CC454 unref_sub_80B01B0: @ 80B01B0 push {r4,r5,lr} movs r2, 0 - ldr r5, _080B01D4 @ =0x0201920d + ldr r5, _080B01D4 @ =gSharedMem + 0x1920D ldr r4, _080B01D8 @ =gSprites + 0x1C ldr r3, _080B01DC @ =sub_80B0238 _080B01BA: @@ -10053,7 +10053,7 @@ _080B01BA: pop {r0} bx r0 .align 2, 0 -_080B01D4: .4byte 0x0201920d +_080B01D4: .4byte gSharedMem + 0x1920D _080B01D8: .4byte gSprites + 0x1C _080B01DC: .4byte sub_80B0238 thumb_func_end unref_sub_80B01B0 @@ -10063,7 +10063,7 @@ unref_sub_80B01E0: @ 80B01E0 push {r4,r5,lr} movs r3, 0 ldr r2, _080B0224 @ =gSprites - ldr r4, _080B0228 @ =0x02019204 + ldr r4, _080B0228 @ =gSharedMem + 0x19204 ldrb r1, [r4, 0x9] lsls r0, r1, 4 adds r0, r1 @@ -10097,7 +10097,7 @@ _080B021A: b _080B0232 .align 2, 0 _080B0224: .4byte gSprites -_080B0228: .4byte 0x02019204 +_080B0228: .4byte gSharedMem + 0x19204 _080B022C: .4byte SpriteCallbackDummy _080B0230: movs r0, 0x1 @@ -10186,7 +10186,7 @@ sub_80B02A8: @ 80B02A8 lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _080B02EC @ =0x02019260 + ldr r1, _080B02EC @ =gSharedMem + 0x19260 adds r0, r1 ldrb r1, [r0, 0xB] lsls r1, 30 @@ -10204,7 +10204,7 @@ sub_80B02A8: @ 80B02A8 pop {r0} bx r0 .align 2, 0 -_080B02EC: .4byte 0x02019260 +_080B02EC: .4byte gSharedMem + 0x19260 _080B02F0: .4byte sub_80B02F4 thumb_func_end sub_80B02A8 @@ -10243,7 +10243,7 @@ sub_80B0324: @ 80B0324 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r1, _080B0360 @ =0x02019204 + ldr r1, _080B0360 @ =gSharedMem + 0x19204 strb r0, [r1, 0xD] movs r2, 0 lsls r1, r0, 2 @@ -10266,7 +10266,7 @@ _080B0342: bx r0 .align 2, 0 _080B035C: .4byte sub_80B0458 -_080B0360: .4byte 0x02019204 +_080B0360: .4byte gSharedMem + 0x19204 _080B0364: .4byte gTasks + 0x8 thumb_func_end sub_80B0324 @@ -10276,7 +10276,7 @@ sub_80B0368: @ 80B0368 lsls r0, 24 lsrs r0, 24 ldr r3, _080B03A0 @ =gTasks - ldr r5, _080B03A4 @ =0x02019204 + ldr r5, _080B03A4 @ =gSharedMem + 0x19204 ldrb r2, [r5, 0xD] lsls r1, r2, 2 adds r1, r2 @@ -10301,7 +10301,7 @@ sub_80B0368: @ 80B0368 bx r0 .align 2, 0 _080B03A0: .4byte gTasks -_080B03A4: .4byte 0x02019204 +_080B03A4: .4byte gSharedMem + 0x19204 thumb_func_end sub_80B0368 thumb_func_start sub_80B03A8 @@ -10342,7 +10342,7 @@ sub_80B03D8: @ 80B03D8 adds r0, r2 ldrb r0, [r0, 0x8] adds r4, r0, 0 - ldr r6, _080B0450 @ =0x02019204 + ldr r6, _080B0450 @ =gSharedMem + 0x19204 ldrb r1, [r6, 0xD] lsls r0, r1, 2 adds r0, r1 @@ -10390,7 +10390,7 @@ _080B0444: bx r0 .align 2, 0 _080B044C: .4byte gTasks -_080B0450: .4byte 0x02019204 +_080B0450: .4byte gSharedMem + 0x19204 _080B0454: .4byte 0x00004bff thumb_func_end sub_80B03D8 @@ -10466,7 +10466,7 @@ _080B04CC: eors r1, r2 strh r1, [r0] _080B04DA: - ldr r0, _080B0510 @ =0x02019204 + ldr r0, _080B0510 @ =gSharedMem + 0x19204 adds r0, 0x14 adds r0, r6, r0 ldrb r0, [r0] @@ -10493,7 +10493,7 @@ _080B04F6: pop {r0} bx r0 .align 2, 0 -_080B0510: .4byte 0x02019204 +_080B0510: .4byte gSharedMem + 0x19204 _080B0514: .4byte 0x00004bff thumb_func_end sub_80B0458 @@ -10503,7 +10503,7 @@ sub_80B0518: @ 80B0518 ldr r0, _080B0540 @ =sub_80B05FC movs r1, 0x1E bl CreateTask - ldr r1, _080B0544 @ =0x02019204 + ldr r1, _080B0544 @ =gSharedMem + 0x19204 strb r0, [r1, 0xE] movs r4, 0 _080B0528: @@ -10519,7 +10519,7 @@ _080B0528: bx r0 .align 2, 0 _080B0540: .4byte sub_80B05FC -_080B0544: .4byte 0x02019204 +_080B0544: .4byte gSharedMem + 0x19204 thumb_func_end sub_80B0518 thumb_func_start sub_80B0548 @@ -10528,7 +10528,7 @@ sub_80B0548: @ 80B0548 lsls r0, 24 lsrs r0, 24 ldr r3, _080B0580 @ =gTasks - ldr r4, _080B0584 @ =0x02019204 + ldr r4, _080B0584 @ =gSharedMem + 0x19204 ldrb r2, [r4, 0xE] lsls r1, r2, 2 adds r1, r2 @@ -10554,7 +10554,7 @@ sub_80B0548: @ 80B0548 bx r0 .align 2, 0 _080B0580: .4byte gTasks -_080B0584: .4byte 0x02019204 +_080B0584: .4byte gSharedMem + 0x19204 thumb_func_end sub_80B0548 thumb_func_start sub_80B0588 @@ -10757,7 +10757,7 @@ unref_sub_80B06E0: @ 80B06E0 lsls r6, r0, 3 ldr r0, _080B0740 @ =gTasks + 0x8 mov r8, r0 - ldr r1, _080B0744 @ =0x02019338 + ldr r1, _080B0744 @ =gSharedMem + 0x19338 mov r12, r1 _080B0704: lsls r4, r3, 2 @@ -10792,7 +10792,7 @@ _080B0726: .align 2, 0 _080B073C: .4byte sub_80B0748 _080B0740: .4byte gTasks + 0x8 -_080B0744: .4byte 0x02019338 +_080B0744: .4byte gSharedMem + 0x19338 thumb_func_end unref_sub_80B06E0 thumb_func_start sub_80B0748 @@ -11067,7 +11067,7 @@ _080B0958: cmp r4, 0x4 bne _080B0980 movs r4, 0 - ldr r3, _080B0990 @ =0x02019338 + ldr r3, _080B0990 @ =gSharedMem + 0x19338 movs r5, 0x3 negs r5, r5 _080B0964: @@ -11094,7 +11094,7 @@ _080B0980: pop {r0} bx r0 .align 2, 0 -_080B0990: .4byte 0x02019338 +_080B0990: .4byte gSharedMem + 0x19338 thumb_func_end sub_80B0748 thumb_func_start unref_sub_80B0994 @@ -11103,7 +11103,7 @@ unref_sub_80B0994: @ 80B0994 lsls r0, 24 cmp r0, 0 beq _080B09A6 - ldr r0, _080B09AC @ =0x02019204 + ldr r0, _080B09AC @ =gSharedMem + 0x19204 ldrb r1, [r0, 0x6] movs r2, 0x4 orrs r1, r2 @@ -11112,7 +11112,7 @@ _080B09A6: pop {r0} bx r0 .align 2, 0 -_080B09AC: .4byte 0x02019204 +_080B09AC: .4byte gSharedMem + 0x19204 thumb_func_end unref_sub_80B0994 thumb_func_start sub_80B09B0 @@ -11123,7 +11123,7 @@ sub_80B09B0: @ 80B09B0 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 - ldr r1, _080B09D4 @ =0x02019260 + ldr r1, _080B09D4 @ =gSharedMem + 0x19260 adds r0, r1 ldrb r1, [r0, 0x15] movs r0, 0x10 @@ -11134,7 +11134,7 @@ sub_80B09B0: @ 80B09B0 bl sub_80B0368 b _080B09DE .align 2, 0 -_080B09D4: .4byte 0x02019260 +_080B09D4: .4byte gSharedMem + 0x19260 _080B09D8: adds r0, r2, 0 bl sub_80B03A8 @@ -11401,7 +11401,7 @@ sub_80B0BC4: @ 80B0BC4 movs r1, 0x30 ldrsh r2, [r0, r1] lsls r2, 2 - ldr r1, _080B0C3C @ =0x02019338 + ldr r1, _080B0C3C @ =gSharedMem + 0x19338 adds r2, r1 ldrb r1, [r2, 0x2] movs r3, 0x2 @@ -11435,7 +11435,7 @@ sub_80B0BC4: @ 80B0BC4 b _080B0C4E .align 2, 0 _080B0C38: .4byte gSprites -_080B0C3C: .4byte 0x02019338 +_080B0C3C: .4byte gSharedMem + 0x19338 _080B0C40: .4byte sub_80B0C5C _080B0C44: .4byte SpriteCallbackDummy _080B0C48: @@ -11502,7 +11502,7 @@ sub_80B0CB0: @ 80B0CB0 movs r1, 0x30 ldrsh r2, [r0, r1] lsls r2, 2 - ldr r1, _080B0CD8 @ =0x02019338 + ldr r1, _080B0CD8 @ =gSharedMem + 0x19338 adds r2, r1 ldrb r3, [r2, 0x2] movs r1, 0x3 @@ -11517,14 +11517,14 @@ sub_80B0CB0: @ 80B0CB0 pop {r0} bx r0 .align 2, 0 -_080B0CD8: .4byte 0x02019338 +_080B0CD8: .4byte gSharedMem + 0x19338 thumb_func_end sub_80B0CB0 thumb_func_start sub_80B0CDC sub_80B0CDC: @ 80B0CDC lsls r0, 24 lsrs r0, 22 - ldr r1, _080B0CF0 @ =0x02019338 + ldr r1, _080B0CF0 @ =gSharedMem + 0x19338 adds r0, r1 ldrb r2, [r0, 0x2] movs r1, 0x3 @@ -11533,7 +11533,7 @@ sub_80B0CDC: @ 80B0CDC strb r1, [r0, 0x2] bx lr .align 2, 0 -_080B0CF0: .4byte 0x02019338 +_080B0CF0: .4byte gSharedMem + 0x19338 thumb_func_end sub_80B0CDC thumb_func_start unref_sub_80B0CF4 @@ -11542,7 +11542,7 @@ unref_sub_80B0CF4: @ 80B0CF4 mov r7, r8 push {r7} sub sp, 0x8 - ldr r0, _080B0D5C @ =0x02000000 + ldr r0, _080B0D5C @ =gSharedMem movs r1, 0xC0 lsls r1, 9 adds r0, r1 @@ -11589,7 +11589,7 @@ _080B0D1C: bl sub_80AEB30 b _080B0D70 .align 2, 0 -_080B0D5C: .4byte 0x02000000 +_080B0D5C: .4byte gSharedMem _080B0D60: .4byte gUnknown_083CA308 _080B0D64: .4byte gUnknown_083CA310 _080B0D68: .4byte gUnknown_03004210 @@ -11612,7 +11612,7 @@ sub_80B0D7C: @ 80B0D7C push {r6,r7} sub sp, 0x10 movs r5, 0 - ldr r0, _080B0ED0 @ =0x02000000 + ldr r0, _080B0ED0 @ =gSharedMem movs r1, 0xC0 lsls r1, 9 adds r0, r1 @@ -11662,7 +11662,7 @@ _080B0DE2: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r1, _080B0EE0 @ =0x02019260 + ldr r1, _080B0EE0 @ =gSharedMem + 0x19260 adds r0, r1 ldrh r2, [r0, 0x4] movs r1, 0x4 @@ -11718,7 +11718,7 @@ _080B0E52: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r1, _080B0EE0 @ =0x02019260 + ldr r1, _080B0EE0 @ =gSharedMem + 0x19260 adds r0, r1 ldrh r2, [r0, 0x2] movs r1, 0x2 @@ -11778,11 +11778,11 @@ _080B0EC2: pop {r0} bx r0 .align 2, 0 -_080B0ED0: .4byte 0x02000000 +_080B0ED0: .4byte gSharedMem _080B0ED4: .4byte gUnknown_083CA308 _080B0ED8: .4byte gUnknown_083CA310 _080B0EDC: .4byte gUnknown_03004210 -_080B0EE0: .4byte 0x02019260 +_080B0EE0: .4byte gSharedMem + 0x19260 _080B0EE4: .4byte gUnknown_02038696 thumb_func_end sub_80B0D7C @@ -11993,7 +11993,7 @@ _080B1050: ldr r3, _080B1070 @ =gUnknown_02038696 movs r6, 0 _080B1060: - ldr r0, _080B1074 @ =0x02019260 + ldr r0, _080B1074 @ =gSharedMem + 0x19260 adds r0, r6, r0 ldrb r0, [r0, 0xB] lsls r0, 30 @@ -12003,7 +12003,7 @@ _080B1060: b _080B1082 .align 2, 0 _080B1070: .4byte gUnknown_02038696 -_080B1074: .4byte 0x02019260 +_080B1074: .4byte gSharedMem + 0x19260 _080B1078: adds r0, r2, 0x1 lsls r0, 24 @@ -12037,10 +12037,10 @@ _080B10AC: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r6, _080B1110 @ =0x02019244 + ldr r6, _080B1110 @ =gSharedMem + 0x19244 adds r1, r0, r6 ldrb r2, [r1, 0xB] - ldr r7, _080B1114 @ =0x02019260 + ldr r7, _080B1114 @ =gSharedMem + 0x19260 adds r0, r7 ldrb r3, [r0, 0xB] mov r1, r9 @@ -12087,8 +12087,8 @@ _080B10FC: bx r0 .align 2, 0 _080B110C: .4byte gUnknown_02038696 -_080B1110: .4byte 0x02019244 -_080B1114: .4byte 0x02019260 +_080B1110: .4byte gSharedMem + 0x19244 +_080B1114: .4byte gSharedMem + 0x19260 thumb_func_end sub_80B0F28 thumb_func_start sub_80B1118 @@ -12097,7 +12097,7 @@ sub_80B1118: @ 80B1118 movs r4, 0 movs r5, 0xA0 _080B111E: - ldr r0, _080B1144 @ =0x02018004 + ldr r0, _080B1144 @ =gSharedMem + 0x18004 adds r0, r5, r0 ldr r1, _080B1148 @ =gUnknown_02038696 adds r1, r4, r1 @@ -12115,7 +12115,7 @@ _080B111E: pop {r0} bx r0 .align 2, 0 -_080B1144: .4byte 0x02018004 +_080B1144: .4byte gSharedMem + 0x18004 _080B1148: .4byte gUnknown_02038696 thumb_func_end sub_80B1118 @@ -12129,7 +12129,7 @@ sub_80B114C: @ 80B114C lsls r7, r6, 3 subs r0, r7, r6 lsls r0, 2 - ldr r4, _080B11B8 @ =0x02019260 + ldr r4, _080B11B8 @ =gSharedMem + 0x19260 adds r5, r0, r4 movs r0, 0 strh r0, [r5, 0x2] @@ -12176,13 +12176,13 @@ _080B1176: strb r0, [r5, 0xB] b _080B11D8 .align 2, 0 -_080B11B8: .4byte 0x02019260 +_080B11B8: .4byte gSharedMem + 0x19260 _080B11BC: .4byte gContestMoves _080B11C0: lsls r4, r6, 3 subs r1, r4, r6 lsls r1, 2 - ldr r3, _080B1264 @ =0x02019260 + ldr r3, _080B1264 @ =gSharedMem + 0x19260 adds r1, r3 ldrb r2, [r1, 0xB] movs r0, 0x71 @@ -12224,7 +12224,7 @@ _080B1204: ble _080B1204 subs r0, r7, r6 lsls r0, 2 - ldr r1, _080B1264 @ =0x02019260 + ldr r1, _080B1264 @ =gSharedMem + 0x19260 adds r5, r0, r1 ldrb r1, [r5, 0x15] movs r0, 0x10 @@ -12249,7 +12249,7 @@ _080B123C: bl _call_via_r0 subs r0, r7, r6 lsls r0, 2 - ldr r1, _080B1264 @ =0x02019260 + ldr r1, _080B1264 @ =gSharedMem + 0x19260 adds r2, r0, r1 ldrb r1, [r2, 0x10] movs r0, 0x30 @@ -12262,7 +12262,7 @@ _080B123C: ldrsb r0, [r2, r0] b _080B128A .align 2, 0 -_080B1264: .4byte 0x02019260 +_080B1264: .4byte gSharedMem + 0x19260 _080B1268: .4byte gContestEffects _080B126C: .4byte gContestEffectFuncs _080B1270: @@ -12286,7 +12286,7 @@ _080B128A: strh r0, [r2, 0x2] subs r0, r7, r6 lsls r0, 2 - ldr r1, _080B12E8 @ =0x02019260 + ldr r1, _080B12E8 @ =gSharedMem + 0x19260 adds r4, r0, r1 movs r0, 0 strb r0, [r4, 0x16] @@ -12327,12 +12327,12 @@ _080B128A: strb r1, [r4, 0x15] b _080B1322 .align 2, 0 -_080B12E8: .4byte 0x02019260 +_080B12E8: .4byte gSharedMem + 0x19260 _080B12EC: ldr r2, _080B1310 @ =gContestMoves subs r0, r7, r6 lsls r0, 2 - ldr r1, _080B1314 @ =0x02019260 + ldr r1, _080B1314 @ =gSharedMem + 0x19260 adds r3, r0, r1 ldrh r0, [r3, 0x6] lsls r0, 3 @@ -12348,7 +12348,7 @@ _080B12EC: b _080B1320 .align 2, 0 _080B1310: .4byte gContestMoves -_080B1314: .4byte 0x02019260 +_080B1314: .4byte gSharedMem + 0x19260 _080B1318: ldrb r1, [r3, 0x15] movs r0, 0x11 @@ -12359,7 +12359,7 @@ _080B1320: _080B1322: subs r0, r7, r6 lsls r0, 2 - ldr r1, _080B139C @ =0x02019260 + ldr r1, _080B139C @ =gSharedMem + 0x19260 mov r8, r1 adds r4, r0, r1 ldrb r1, [r4, 0x15] @@ -12420,7 +12420,7 @@ _080B137A: movs r0, 0x3C b _080B13A6 .align 2, 0 -_080B139C: .4byte 0x02019260 +_080B139C: .4byte gSharedMem + 0x19260 _080B13A0: movs r0, 0xA b _080B13A6 @@ -12453,7 +12453,7 @@ _080B13CA: _080B13D2: subs r0, r7, r6 lsls r0, 2 - ldr r1, _080B13E8 @ =0x02019260 + ldr r1, _080B13E8 @ =gSharedMem + 0x19260 adds r0, r1 strb r2, [r0, 0x1B] _080B13DC: @@ -12463,7 +12463,7 @@ _080B13DC: pop {r0} bx r0 .align 2, 0 -_080B13E8: .4byte 0x02019260 +_080B13E8: .4byte gSharedMem + 0x19260 thumb_func_end sub_80B114C thumb_func_start sub_80B13EC @@ -12473,12 +12473,12 @@ sub_80B13EC: @ 80B13EC lsls r2, r0, 3 subs r2, r0 lsls r2, 2 - ldr r0, _080B1400 @ =0x02019260 + ldr r0, _080B1400 @ =gSharedMem + 0x19260 adds r2, r0 strb r1, [r2, 0x13] bx lr .align 2, 0 -_080B1400: .4byte 0x02019260 +_080B1400: .4byte gSharedMem + 0x19260 thumb_func_end sub_80B13EC thumb_func_start sub_80B1404 @@ -12488,12 +12488,12 @@ sub_80B1404: @ 80B1404 lsls r2, r0, 3 subs r2, r0 lsls r2, 2 - ldr r0, _080B1418 @ =0x02019260 + ldr r0, _080B1418 @ =gSharedMem + 0x19260 adds r2, r0 strb r1, [r2, 0x14] bx lr .align 2, 0 -_080B1418: .4byte 0x02019260 +_080B1418: .4byte gSharedMem + 0x19260 thumb_func_end sub_80B1404 thumb_func_start sub_80B141C @@ -12557,7 +12557,7 @@ sub_80B146C: @ 80B146C lsls r1, r4, 3 subs r1, r4 lsls r1, 2 - ldr r4, _080B14D4 @ =0x02019260 + ldr r4, _080B14D4 @ =gSharedMem + 0x19260 adds r1, r4 ldrh r2, [r1, 0x6] movs r1, 0xD @@ -12588,7 +12588,7 @@ sub_80B146C: @ 80B146C _080B14C8: .4byte gStringVar1 _080B14CC: .4byte gContestMons + 0x2 _080B14D0: .4byte gStringVar2 -_080B14D4: .4byte 0x02019260 +_080B14D4: .4byte gSharedMem + 0x19260 _080B14D8: .4byte gMoveNames _080B14DC: .4byte gContestMoves _080B14E0: .4byte gStringVar3 @@ -12666,7 +12666,7 @@ sub_80B157C: @ 80B157C lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _080B1598 @ =0x02019260 + ldr r0, _080B1598 @ =gSharedMem + 0x19260 adds r1, r0 ldrb r0, [r1, 0xC] movs r2, 0x1 @@ -12676,7 +12676,7 @@ sub_80B157C: @ 80B157C strh r0, [r1, 0x6] bx lr .align 2, 0 -_080B1598: .4byte 0x02019260 +_080B1598: .4byte gSharedMem + 0x19260 thumb_func_end sub_80B157C thumb_func_start sub_80B159C @@ -12707,7 +12707,7 @@ _080B15B8: cmp r4, 0x3 ble _080B15B8 movs r4, 0 - ldr r7, _080B1604 @ =0x02019260 + ldr r7, _080B1604 @ =gSharedMem + 0x19260 adds r5, r2, 0 movs r1, 0x1 mov r8, r1 @@ -12737,7 +12737,7 @@ _080B15E8: b _080B163A .align 2, 0 _080B1600: .4byte gUnknown_02038696 -_080B1604: .4byte 0x02019260 +_080B1604: .4byte gSharedMem + 0x19260 _080B1608: mov r1, sp adds r0, r1, r2 @@ -12809,7 +12809,7 @@ _080B1680: cmp r4, 0x3 ble _080B15D6 movs r4, 0 - ldr r5, _080B16CC @ =0x020192d0 + ldr r5, _080B16CC @ =gSharedMem + 0x192D0 adds r3, r5, 0 subs r3, 0x60 movs r6, 0xFF @@ -12844,7 +12844,7 @@ _080B1692: bx r0 .align 2, 0 _080B16C8: .4byte gUnknown_02038696 -_080B16CC: .4byte 0x020192d0 +_080B16CC: .4byte gSharedMem + 0x192D0 thumb_func_end sub_80B159C thumb_func_start sub_80B16D0 @@ -12868,7 +12868,7 @@ sub_80B16D0: @ 80B16D0 strb r0, [r3] ldr r0, _080B1708 @ =SpriteCallbackDummy str r0, [r2, 0x1C] - ldr r2, _080B170C @ =0x02019204 + ldr r2, _080B170C @ =gSharedMem + 0x19204 ldrb r1, [r2, 0x6] movs r0, 0x11 negs r0, r0 @@ -12879,7 +12879,7 @@ _080B1702: bx r0 .align 2, 0 _080B1708: .4byte SpriteCallbackDummy -_080B170C: .4byte 0x02019204 +_080B170C: .4byte gSharedMem + 0x19204 thumb_func_end sub_80B16D0 thumb_func_start sub_80B1710 @@ -12887,7 +12887,7 @@ sub_80B1710: @ 80B1710 push {r4,r5,lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _080B172C @ =0x02019204 + ldr r0, _080B172C @ =gSharedMem + 0x19204 ldrb r5, [r0, 0x12] cmp r1, 0x8 bls _080B1720 @@ -12899,7 +12899,7 @@ _080B1720: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B172C: .4byte 0x02019204 +_080B172C: .4byte gSharedMem + 0x19204 _080B1730: .4byte _080B1734 .align 2, 0 _080B1734: @@ -13106,7 +13106,7 @@ _080B18E4: adds r2, r4 ldr r0, _080B1920 @ =sub_80B16D0 str r0, [r2] - ldr r2, _080B1924 @ =0x02019204 + ldr r2, _080B1924 @ =gSharedMem + 0x19204 ldrb r0, [r2, 0x6] movs r1, 0x10 orrs r0, r1 @@ -13119,7 +13119,7 @@ _080B1914: .4byte gSprites _080B1918: .4byte 0x000003ff _080B191C: .4byte 0xfffffc00 _080B1920: .4byte sub_80B16D0 -_080B1924: .4byte 0x02019204 +_080B1924: .4byte gSharedMem + 0x19204 thumb_func_end sub_80B1710 thumb_func_start sub_80B1928 @@ -13130,7 +13130,7 @@ sub_80B1928: @ 80B1928 mov r5, r8 push {r5-r7} movs r5, 0 - ldr r6, _080B19BC @ =0x02019204 + ldr r6, _080B19BC @ =gSharedMem + 0x19204 ldr r0, _080B19C0 @ =gSprites mov r10, r0 movs r1, 0x58 @@ -13199,7 +13199,7 @@ _080B19A8: pop {r0} bx r0 .align 2, 0 -_080B19BC: .4byte 0x02019204 +_080B19BC: .4byte gSharedMem + 0x19204 _080B19C0: .4byte gSprites _080B19C4: .4byte 0x06010000 _080B19C8: .4byte REG_BG0CNT @@ -13346,7 +13346,7 @@ _080B1AD6: movs r1, 0x1 eors r0, r1 strh r0, [r4, 0xE] - ldr r0, _080B1B10 @ =0x02019204 + ldr r0, _080B1B10 @ =gSharedMem + 0x19204 ldrb r0, [r0, 0x13] lsls r0, 24 asrs r0, 24 @@ -13370,7 +13370,7 @@ _080B1B06: bx r0 .align 2, 0 _080B1B0C: .4byte 0x00007fff -_080B1B10: .4byte 0x02019204 +_080B1B10: .4byte gSharedMem + 0x19204 thumb_func_end c3_08130B10 thumb_func_start sub_80B1B14 @@ -13380,7 +13380,7 @@ sub_80B1B14: @ 80B1B14 movs r1, 0xA bl CreateTask ldr r4, _080B1B5C @ =gSprites - ldr r3, _080B1B60 @ =0x02019204 + ldr r3, _080B1B60 @ =gSharedMem + 0x19204 adds r2, r3, 0 adds r2, 0x58 ldrb r1, [r2] @@ -13411,7 +13411,7 @@ sub_80B1B14: @ 80B1B14 .align 2, 0 _080B1B58: .4byte sub_80B1B68 _080B1B5C: .4byte gSprites -_080B1B60: .4byte 0x02019204 +_080B1B60: .4byte gSharedMem + 0x19204 _080B1B64: .4byte 0x0000ffba thumb_func_end sub_80B1B14 @@ -13421,7 +13421,7 @@ sub_80B1B68: @ 80B1B68 lsls r0, 24 lsrs r0, 24 adds r3, r0, 0 - ldr r4, _080B1BD0 @ =0x02019204 + ldr r4, _080B1BD0 @ =gSharedMem + 0x19204 adds r0, r4, 0 adds r0, 0x58 ldrb r1, [r0] @@ -13471,7 +13471,7 @@ _080B1BCA: pop {r0} bx r0 .align 2, 0 -_080B1BD0: .4byte 0x02019204 +_080B1BD0: .4byte gSharedMem + 0x19204 _080B1BD4: .4byte gSprites _080B1BD8: .4byte gTasks thumb_func_end sub_80B1B68 @@ -13480,7 +13480,7 @@ _080B1BD8: .4byte gTasks sub_80B1BDC: @ 80B1BDC push {r4-r6,lr} ldr r6, _080B1C04 @ =gSprites - ldr r4, _080B1C08 @ =0x02019204 + ldr r4, _080B1C08 @ =gSharedMem + 0x19204 adds r5, r4, 0 adds r5, 0x58 ldrb r0, [r5] @@ -13500,7 +13500,7 @@ sub_80B1BDC: @ 80B1BDC b _080B1C28 .align 2, 0 _080B1C04: .4byte gSprites -_080B1C08: .4byte 0x02019204 +_080B1C08: .4byte gSharedMem + 0x19204 _080B1C0C: ldr r0, _080B1C30 @ =sub_80B1C34 movs r1, 0xA @@ -13530,7 +13530,7 @@ sub_80B1C34: @ 80B1C34 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r5, _080B1CAC @ =0x02019204 + ldr r5, _080B1CAC @ =gSharedMem + 0x19204 adds r0, r5, 0 adds r0, 0x58 ldrb r1, [r0] @@ -13588,7 +13588,7 @@ _080B1CA6: pop {r0} bx r0 .align 2, 0 -_080B1CAC: .4byte 0x02019204 +_080B1CAC: .4byte gSharedMem + 0x19204 _080B1CB0: .4byte gSprites _080B1CB4: .4byte gTasks _080B1CB8: .4byte 0x0000ffba @@ -13613,7 +13613,7 @@ sub_80B1CBC: @ 80B1CBC lsls r4, 24 asrs r4, 24 strh r4, [r1, 0x8] - ldr r2, _080B1CF8 @ =0x02019204 + ldr r2, _080B1CF8 @ =gSharedMem + 0x19204 ldrb r0, [r2, 0x6] movs r1, 0x20 orrs r0, r1 @@ -13624,7 +13624,7 @@ sub_80B1CBC: @ 80B1CBC .align 2, 0 _080B1CF0: .4byte sub_80B1CFC _080B1CF4: .4byte gTasks -_080B1CF8: .4byte 0x02019204 +_080B1CF8: .4byte gSharedMem + 0x19204 thumb_func_end sub_80B1CBC thumb_func_start sub_80B1CFC @@ -13656,7 +13656,7 @@ _080B1D2A: bl sub_80B1B14 b _080B1D44 _080B1D30: - ldr r0, _080B1D4C @ =0x02019204 + ldr r0, _080B1D4C @ =gSharedMem + 0x19204 ldrb r1, [r0, 0x6] movs r0, 0x40 ands r0, r1 @@ -13671,7 +13671,7 @@ _080B1D44: strh r0, [r4, 0x1C] b _080B1D78 .align 2, 0 -_080B1D4C: .4byte 0x02019204 +_080B1D4C: .4byte gSharedMem + 0x19204 _080B1D50: ldrh r0, [r4, 0x1E] adds r1, r0, 0x1 @@ -13683,7 +13683,7 @@ _080B1D50: movs r0, 0 strh r0, [r4, 0x1E] bl sub_80B1928 - ldr r2, _080B1D80 @ =0x02019204 + ldr r2, _080B1D80 @ =gSharedMem + 0x19204 ldrb r1, [r2, 0x6] movs r0, 0x21 negs r0, r0 @@ -13696,13 +13696,13 @@ _080B1D78: pop {r0} bx r0 .align 2, 0 -_080B1D80: .4byte 0x02019204 +_080B1D80: .4byte gSharedMem + 0x19204 thumb_func_end sub_80B1CFC thumb_func_start unref_sub_80B1D84 unref_sub_80B1D84: @ 80B1D84 ldr r3, _080B1DB0 @ =gSprites - ldr r2, _080B1DB4 @ =0x02019204 + ldr r2, _080B1DB4 @ =gSharedMem + 0x19204 adds r2, 0x58 ldrb r1, [r2] lsls r0, r1, 4 @@ -13725,13 +13725,13 @@ unref_sub_80B1D84: @ 80B1D84 bx lr .align 2, 0 _080B1DB0: .4byte gSprites -_080B1DB4: .4byte 0x02019204 +_080B1DB4: .4byte gSharedMem + 0x19204 thumb_func_end unref_sub_80B1D84 thumb_func_start unref_sub_80B1DB8 unref_sub_80B1DB8: @ 80B1DB8 ldr r2, _080B1DD4 @ =gSprites - ldr r0, _080B1DD8 @ =0x02019204 + ldr r0, _080B1DD8 @ =gSharedMem + 0x19204 adds r0, 0x58 ldrb r1, [r0] lsls r0, r1, 4 @@ -13746,7 +13746,7 @@ unref_sub_80B1DB8: @ 80B1DB8 bx lr .align 2, 0 _080B1DD4: .4byte gSprites -_080B1DD8: .4byte 0x02019204 +_080B1DD8: .4byte gSharedMem + 0x19204 thumb_func_end unref_sub_80B1DB8 thumb_func_start sub_80B1DDC @@ -13755,7 +13755,7 @@ sub_80B1DDC: @ 80B1DDC ldr r0, _080B1DF4 @ =sub_80B1DFC movs r1, 0xF bl CreateTask - ldr r2, _080B1DF8 @ =0x02019204 + ldr r2, _080B1DF8 @ =gSharedMem + 0x19204 ldrb r0, [r2, 0x6] movs r1, 0x80 orrs r0, r1 @@ -13764,7 +13764,7 @@ sub_80B1DDC: @ 80B1DDC bx r0 .align 2, 0 _080B1DF4: .4byte sub_80B1DFC -_080B1DF8: .4byte 0x02019204 +_080B1DF8: .4byte gSharedMem + 0x19204 thumb_func_end sub_80B1DDC thumb_func_start sub_80B1DFC @@ -13791,7 +13791,7 @@ sub_80B1DFC: @ 80B1DFC ldrsh r0, [r3, r1] cmp r0, 0 bne _080B1E50 - ldr r1, _080B1E40 @ =0x02016800 + ldr r1, _080B1E40 @ =gSharedMem + 0x16800 ldr r2, _080B1E44 @ =0x06002000 ldr r0, _080B1E48 @ =0x040000d4 str r1, [r0] @@ -13802,12 +13802,12 @@ sub_80B1DFC: @ 80B1DFC b _080B1E66 .align 2, 0 _080B1E3C: .4byte gTasks -_080B1E40: .4byte 0x02016800 +_080B1E40: .4byte gSharedMem + 0x16800 _080B1E44: .4byte 0x06002000 _080B1E48: .4byte 0x040000d4 _080B1E4C: .4byte 0x84000400 _080B1E50: - ldr r1, _080B1E94 @ =0x02015800 + ldr r1, _080B1E94 @ =gSharedMem + 0x15800 ldr r2, _080B1E98 @ =0x06002000 ldr r0, _080B1E9C @ =0x040000d4 str r1, [r0] @@ -13831,7 +13831,7 @@ _080B1E66: ldrsh r0, [r0, r1] cmp r0, 0x9 bne _080B1E8E - ldr r2, _080B1EA4 @ =0x02019204 + ldr r2, _080B1EA4 @ =gSharedMem + 0x19204 ldrb r1, [r2, 0x6] movs r0, 0x7F ands r0, r1 @@ -13843,11 +13843,11 @@ _080B1E8E: pop {r0} bx r0 .align 2, 0 -_080B1E94: .4byte 0x02015800 +_080B1E94: .4byte gSharedMem + 0x15800 _080B1E98: .4byte 0x06002000 _080B1E9C: .4byte 0x040000d4 _080B1EA0: .4byte 0x84000400 -_080B1EA4: .4byte 0x02019204 +_080B1EA4: .4byte gSharedMem + 0x19204 thumb_func_end sub_80B1DFC thumb_func_start sub_80B1EA8 @@ -13872,7 +13872,7 @@ sub_80B1EA8: @ 80B1EA8 cmp r4, 0 ble _080B1EF0 movs r5, 0 - ldr r2, _080B1EEC @ =0x02019204 + ldr r2, _080B1EEC @ =gSharedMem + 0x19204 movs r1, 0x13 ldrsb r1, [r2, r1] lsls r0, r1, 1 @@ -13883,9 +13883,9 @@ sub_80B1EA8: @ 80B1EA8 .align 2, 0 _080B1EE4: .4byte sub_80B1F4C _080B1EE8: .4byte 0x0000237e -_080B1EEC: .4byte 0x02019204 +_080B1EEC: .4byte gSharedMem + 0x19204 _080B1EF0: - ldr r2, _080B1F04 @ =0x02019204 + ldr r2, _080B1F04 @ =gSharedMem + 0x19204 movs r1, 0x13 ldrsb r1, [r2, r1] lsls r0, r1, 1 @@ -13895,7 +13895,7 @@ _080B1EF0: movs r3, 0 b _080B1F1E .align 2, 0 -_080B1F04: .4byte 0x02019204 +_080B1F04: .4byte gSharedMem + 0x19204 _080B1F08: movs r7, 0 lsls r0, r5, 24 @@ -13909,7 +13909,7 @@ _080B1F18: movs r5, 0xC movs r3, 0 _080B1F1C: - ldr r2, _080B1F44 @ =0x02019204 + ldr r2, _080B1F44 @ =gSharedMem + 0x19204 _080B1F1E: ldr r1, _080B1F48 @ =gTasks lsls r0, r6, 2 @@ -13930,7 +13930,7 @@ _080B1F1E: pop {r0} bx r0 .align 2, 0 -_080B1F44: .4byte 0x02019204 +_080B1F44: .4byte gSharedMem + 0x19204 _080B1F48: .4byte gTasks thumb_func_end sub_80B1EA8 @@ -13988,7 +13988,7 @@ _080B1F84: bne _080B1FC4 adds r0, r5, 0 bl DestroyTask - ldr r2, _080B1FCC @ =0x02019204 + ldr r2, _080B1FCC @ =gSharedMem + 0x19204 ldrb r1, [r2, 0x7] movs r0, 0x2 negs r0, r0 @@ -13999,7 +13999,7 @@ _080B1FC4: pop {r0} bx r0 .align 2, 0 -_080B1FCC: .4byte 0x02019204 +_080B1FCC: .4byte gSharedMem + 0x19204 thumb_func_end sub_80B1F4C thumb_func_start sub_80B1FD0 @@ -14011,7 +14011,7 @@ sub_80B1FD0: @ 80B1FD0 lsrs r0, 24 mov r8, r0 movs r5, 0 - ldr r0, _080B204C @ =0x02019260 + ldr r0, _080B204C @ =gSharedMem + 0x19260 ldr r6, _080B2050 @ =gSprites adds r4, r0, 0 adds r4, 0xD8 @@ -14065,7 +14065,7 @@ _080B1FE8: ands r1, r2 b _080B2076 .align 2, 0 -_080B204C: .4byte 0x02019260 +_080B204C: .4byte gSharedMem + 0x19260 _080B2050: .4byte gSprites _080B2054: .4byte 0x060100a0 _080B2058: .4byte REG_BG0HOFS @@ -14103,7 +14103,7 @@ sub_80B208C: @ 80B208C lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _080B20B0 @ =0x02019260 + ldr r0, _080B20B0 @ =gSharedMem + 0x19260 adds r2, r1, r0 ldrb r1, [r2, 0x10] movs r0, 0xC0 @@ -14116,7 +14116,7 @@ sub_80B208C: @ 80B208C adds r0, r1 b _080B20BA .align 2, 0 -_080B20B0: .4byte 0x02019260 +_080B20B0: .4byte gSharedMem + 0x19260 _080B20B4: .4byte gContestNextTurnNumbersGfx _080B20B8: ldr r0, _080B20C0 @ =gContestNextTurnRandomGfx @@ -14131,7 +14131,7 @@ _080B20C0: .4byte gContestNextTurnRandomGfx sub_80B20C4: @ 80B20C4 push {r4-r7,lr} movs r6, 0 - ldr r7, _080B2134 @ =0x020192dd + ldr r7, _080B2134 @ =gSharedMem + 0x192DD _080B20CA: adds r0, r6, r7 ldrb r0, [r0] @@ -14184,7 +14184,7 @@ _080B2126: pop {r0} bx r0 .align 2, 0 -_080B2134: .4byte 0x020192dd +_080B2134: .4byte gSharedMem + 0x192DD _080B2138: .4byte gUnknown_02038696 _080B213C: .4byte 0x0600c028 _080B2140: .4byte 0x0600c02a @@ -14200,7 +14200,7 @@ sub_80B214C: @ 80B214C lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _080B2178 @ =0x02019260 + ldr r0, _080B2178 @ =gSharedMem + 0x19260 adds r2, r1, r0 ldrb r1, [r2, 0x15] movs r3, 0x1 @@ -14217,7 +14217,7 @@ _080B2172: movs r0, 0 b _080B217E .align 2, 0 -_080B2178: .4byte 0x02019260 +_080B2178: .4byte gSharedMem + 0x19260 _080B217C: movs r0, 0x1 _080B217E: @@ -14278,7 +14278,7 @@ sub_80B2184: @ 80B2184 ldr r6, _080B2270 @ =gSprites adds r7, r2, 0 movs r5, 0x4 - ldr r3, _080B2274 @ =0x02019338 + ldr r3, _080B2274 @ =gSharedMem + 0x19338 _080B21EE: ldrb r0, [r3] lsls r1, r0, 4 @@ -14339,7 +14339,7 @@ _080B2264: .4byte 0x040000d4 _080B2268: .4byte 0x85000400 _080B226C: .4byte gUnknown_08D17C3C _080B2270: .4byte gSprites -_080B2274: .4byte 0x02019338 +_080B2274: .4byte gSharedMem + 0x19338 _080B2278: .4byte REG_BG2CNT _080B227C: .4byte REG_BG0CNT thumb_func_end sub_80B2184 @@ -14425,7 +14425,7 @@ _080B22A4: movs r4, 0 ldr r5, _080B2374 @ =gSprites adds r6, r3, 0 - ldr r3, _080B2378 @ =0x02019338 + ldr r3, _080B2378 @ =gSharedMem + 0x19338 _080B231E: ldrb r0, [r3] lsls r1, r0, 4 @@ -14464,7 +14464,7 @@ _080B2368: .4byte 0x85000400 _080B236C: .4byte 0x0600f000 _080B2370: .4byte REG_BG1CNT _080B2374: .4byte gSprites -_080B2378: .4byte 0x02019338 +_080B2378: .4byte gSharedMem + 0x19338 thumb_func_end sub_80B2280 thumb_func_start sub_80B237C @@ -14566,7 +14566,7 @@ _080B2428: _080B2432: movs r2, 0 adds r6, r3, 0 - ldr r5, _080B2470 @ =0x02019218 + ldr r5, _080B2470 @ =gSharedMem + 0x19218 ldr r3, _080B2474 @ =gUnknown_02038696 _080B243A: adds r0, r2, r5 @@ -14591,7 +14591,7 @@ _080B243A: strh r0, [r1, 0x8] b _080B24FC .align 2, 0 -_080B2470: .4byte 0x02019218 +_080B2470: .4byte gSharedMem + 0x19218 _080B2474: .4byte gUnknown_02038696 _080B2478: .4byte gTasks _080B247C: @@ -14600,7 +14600,7 @@ _080B247C: ands r1, r0 cmp r1, 0 beq _080B24D0 - ldr r2, _080B24C4 @ =0x02019204 + ldr r2, _080B24C4 @ =gSharedMem + 0x19204 ldrb r0, [r2, 0x7] movs r1, 0x4 orrs r0, r1 @@ -14626,14 +14626,14 @@ _080B249E: b _080B24FC .align 2, 0 _080B24C0: .4byte gIsLinkContest -_080B24C4: .4byte 0x02019204 +_080B24C4: .4byte gSharedMem + 0x19204 _080B24C8: .4byte sub_80C8C80 _080B24CC: .4byte sub_80AD8DC _080B24D0: bl sub_80AF438 b _080B24E2 _080B24D6: - ldr r0, _080B24E8 @ =0x02019204 + ldr r0, _080B24E8 @ =gSharedMem + 0x19204 ldrb r1, [r0, 0x7] movs r0, 0x4 ands r0, r1 @@ -14644,7 +14644,7 @@ _080B24E2: strh r0, [r5, 0x8] b _080B24FC .align 2, 0 -_080B24E8: .4byte 0x02019204 +_080B24E8: .4byte gSharedMem + 0x19204 _080B24EC: bl sub_80AF120 bl sub_80AEB30 @@ -14799,7 +14799,7 @@ sub_80B25E4: @ 80B25E4 _080B25F6: bl AllocOamMatrix lsls r1, r6, 2 - ldr r2, _080B26B8 @ =0x02019338 + ldr r2, _080B26B8 @ =gSharedMem + 0x19338 mov r8, r2 adds r4, r1, r2 ldrb r1, [r4] @@ -14890,7 +14890,7 @@ _080B267A: bx r0 .align 2, 0 _080B26B4: .4byte gSprites -_080B26B8: .4byte 0x02019338 +_080B26B8: .4byte gSharedMem + 0x19338 _080B26BC: .4byte sub_80B26C8 _080B26C0: .4byte gTasks _080B26C4: .4byte 0xfffffecc @@ -14902,7 +14902,7 @@ sub_80B26C8: @ 80B26C8 lsls r0, 24 lsrs r6, r0, 24 ldr r2, _080B2750 @ =gSprites - ldr r4, _080B2754 @ =0x02019338 + ldr r4, _080B2754 @ =gSharedMem + 0x19338 ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -14943,7 +14943,7 @@ _080B2718: movs r4, 0 _080B271A: lsls r0, r4, 2 - ldr r5, _080B2754 @ =0x02019338 + ldr r5, _080B2754 @ =gSharedMem + 0x19338 adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 @@ -14970,7 +14970,7 @@ _080B274A: bx r0 .align 2, 0 _080B2750: .4byte gSprites -_080B2754: .4byte 0x02019338 +_080B2754: .4byte gSharedMem + 0x19338 _080B2758: .4byte gTasks _080B275C: .4byte 0xfffffecc thumb_func_end sub_80B26C8 @@ -15016,7 +15016,7 @@ sub_80B2790: @ 80B2790 lsls r0, r6, 3 subs r0, r6 lsls r0, 2 - ldr r4, _080B27F0 @ =0x02019260 + ldr r4, _080B27F0 @ =gSharedMem + 0x19260 adds r0, r4 ldrh r0, [r0, 0x6] bl sub_80B2760 @@ -15055,7 +15055,7 @@ _080B27D0: beq _080B2898 b _080B28BE .align 2, 0 -_080B27F0: .4byte 0x02019260 +_080B27F0: .4byte gSharedMem + 0x19260 _080B27F4: .4byte gContestMons _080B27F8: .4byte gBattleMonForms _080B27FC: @@ -15103,7 +15103,7 @@ _080B2848: lsls r0, r6, 3 subs r0, r6 lsls r0, 2 - ldr r4, _080B2878 @ =0x02019260 + ldr r4, _080B2878 @ =gSharedMem + 0x19260 adds r0, r4 ldrb r5, [r0, 0x1B] ldr r6, _080B287C @ =gContestMons @@ -15123,7 +15123,7 @@ _080B2848: strb r0, [r4, 0x4] b _080B28BE .align 2, 0 -_080B2878: .4byte 0x02019260 +_080B2878: .4byte gSharedMem + 0x19260 _080B287C: .4byte gContestMons _080B2880: ldr r1, _080B2888 @ =gHappinessMoveAnim @@ -15138,7 +15138,7 @@ _080B288C: .align 2, 0 _080B2894: .4byte gHappinessMoveAnim _080B2898: - ldr r0, _080B28B0 @ =0x02019204 + ldr r0, _080B28B0 @ =gSharedMem + 0x19204 adds r2, r0, 0 adds r2, 0x5A ldrb r1, [r2] @@ -15150,7 +15150,7 @@ _080B2898: strb r1, [r0] b _080B28BE .align 2, 0 -_080B28B0: .4byte 0x02019204 +_080B28B0: .4byte gSharedMem + 0x19204 _080B28B4: .4byte gUnknown_0202F7C4 _080B28B8: ldr r1, _080B28C8 @ =gUnknown_0202F7C4 @@ -15169,7 +15169,7 @@ _080B28C8: .4byte gUnknown_0202F7C4 thumb_func_start sub_80B28CC sub_80B28CC: @ 80B28CC push {r4,lr} - ldr r4, _080B28EC @ =0x02019348 + ldr r4, _080B28EC @ =gSharedMem + 0x19348 adds r0, r4, 0 movs r1, 0 movs r2, 0x14 @@ -15185,7 +15185,7 @@ _080B28E6: pop {r0} bx r0 .align 2, 0 -_080B28EC: .4byte 0x02019348 +_080B28EC: .4byte gSharedMem + 0x19348 thumb_func_end sub_80B28CC thumb_func_start sub_80B28F0 @@ -15194,7 +15194,7 @@ sub_80B28F0: @ 80B28F0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r6, _080B2924 @ =0x02019348 + ldr r6, _080B2924 @ =gSharedMem + 0x19348 strb r4, [r6, 0x5] ldr r5, _080B2928 @ =gContestMons lsls r4, 6 @@ -15215,7 +15215,7 @@ sub_80B28F0: @ 80B28F0 pop {r0} bx r0 .align 2, 0 -_080B2924: .4byte 0x02019348 +_080B2924: .4byte gSharedMem + 0x19348 _080B2928: .4byte gContestMons thumb_func_end sub_80B28F0 @@ -15515,7 +15515,7 @@ _080B2BB8: .align 2, 0 _080B2BC0: .4byte 0x00002e06 _080B2BC4: - ldr r5, _080B2C14 @ =0x02015de0 + ldr r5, _080B2C14 @ =gSharedMem + 0x15DE0 ldr r2, _080B2C18 @ =gContestMons lsls r4, r6, 6 adds r0, r2, 0 @@ -15554,7 +15554,7 @@ _080B2BC4: bl StringCopy b _080B2C32 .align 2, 0 -_080B2C14: .4byte 0x02015de0 +_080B2C14: .4byte gSharedMem + 0x15DE0 _080B2C18: .4byte gContestMons _080B2C1C: .4byte gIsLinkContest _080B2C20: .4byte gLinkPlayers + 0x8 @@ -15566,7 +15566,7 @@ _080B2C24: adds r1, r4, r1 bl StringCopy _080B2C32: - ldr r0, _080B2C48 @ =0x02015de0 + ldr r0, _080B2C48 @ =gSharedMem + 0x15DE0 strb r7, [r0, 0xA] _080B2C36: movs r0, 0x1 @@ -15579,7 +15579,7 @@ _080B2C38: pop {r1} bx r1 .align 2, 0 -_080B2C48: .4byte 0x02015de0 +_080B2C48: .4byte gSharedMem + 0x15DE0 thumb_func_end sub_80B2A7C thumb_func_start sub_80B2C4C diff --git a/asm/contest_ai.s b/asm/contest_ai.s index c7a67fed9..ae5d8c03e 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -11,7 +11,7 @@ sub_81288F4: @ 81288F4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _0812893C @ =0x020192e4 + ldr r4, _0812893C @ =gSharedMem + 0x192E4 adds r0, r4, 0 movs r1, 0 movs r2, 0x44 @@ -45,14 +45,14 @@ _08128910: pop {r0} bx r0 .align 2, 0 -_0812893C: .4byte 0x020192e4 +_0812893C: .4byte gSharedMem + 0x192E4 _08128940: .4byte gContestMons thumb_func_end sub_81288F4 thumb_func_start sub_8128944 sub_8128944: @ 8128944 push {r4-r6,lr} - ldr r1, _081289A8 @ =0x020192e4 + ldr r1, _081289A8 @ =gSharedMem + 0x192E4 ldr r0, [r1, 0x14] cmp r0, 0 beq _08128974 @@ -78,7 +78,7 @@ _08128962: bne _08128952 _08128974: movs r6, 0x3 - ldr r5, _081289A8 @ =0x020192e4 + ldr r5, _081289A8 @ =gSharedMem + 0x192E4 _08128978: bl Random adds r4, r0, 0 @@ -106,13 +106,13 @@ _0812899C: pop {r1} bx r1 .align 2, 0 -_081289A8: .4byte 0x020192e4 +_081289A8: .4byte gSharedMem + 0x192E4 thumb_func_end sub_8128944 thumb_func_start sub_81289AC sub_81289AC: @ 81289AC push {r4-r6,lr} - ldr r1, _081289F4 @ =0x020192e4 + ldr r1, _081289F4 @ =gSharedMem + 0x192E4 ldrb r0, [r1] adds r2, r1, 0 cmp r0, 0x2 @@ -149,7 +149,7 @@ _081289BE: strh r0, [r4, 0x2] b _08128A06 .align 2, 0 -_081289F4: .4byte 0x020192e4 +_081289F4: .4byte gSharedMem + 0x192E4 _081289F8: .4byte gAIScriptPtr _081289FC: .4byte gUnknown_0203858E _08128A00: .4byte gContestAIs @@ -184,7 +184,7 @@ _08128A2C: orrs r0, r1 strb r0, [r4, 0x9] _08128A3C: - ldr r2, _08128A5C @ =0x020192e4 + ldr r2, _08128A5C @ =gSharedMem + 0x192E4 ldrb r1, [r2, 0x9] movs r0, 0x1 ands r0, r1 @@ -201,7 +201,7 @@ _08128A3C: strb r1, [r2] b _08128A66 .align 2, 0 -_08128A5C: .4byte 0x020192e4 +_08128A5C: .4byte gSharedMem + 0x192E4 _08128A60: ldrb r0, [r2] adds r0, 0x1 @@ -228,7 +228,7 @@ sub_8128A7C: @ 8128A7C lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, _08128AA4 @ =0x020192d0 + ldr r3, _08128AA4 @ =gSharedMem + 0x192D0 ldrb r0, [r3] cmp r0, r2 beq _08128A9A @@ -246,13 +246,13 @@ _08128A9A: pop {r1} bx r1 .align 2, 0 -_08128AA4: .4byte 0x020192d0 +_08128AA4: .4byte gSharedMem + 0x192D0 thumb_func_end sub_8128A7C thumb_func_start ContestAICmd_unk_00 ContestAICmd_unk_00: @ 8128AA8 push {lr} - ldr r2, _08128AD0 @ =0x020192e4 + ldr r2, _08128AD0 @ =gSharedMem + 0x192E4 adds r1, r2, 0x5 ldrb r0, [r2, 0x4] adds r1, r0 @@ -271,7 +271,7 @@ ContestAICmd_unk_00: @ 8128AA8 movs r1, 0xFF b _08128ADE .align 2, 0 -_08128AD0: .4byte 0x020192e4 +_08128AD0: .4byte gSharedMem + 0x192E4 _08128AD4: .4byte gAIScriptPtr _08128AD8: cmp r0, 0 @@ -291,7 +291,7 @@ _08128ADE: thumb_func_start ContestAICmd_get_turn ContestAICmd_get_turn: @ 8128AF0 - ldr r1, _08128B04 @ =0x020192e4 + ldr r1, _08128B04 @ =gSharedMem + 0x192E4 adds r0, r1, 0 subs r0, 0xE0 ldrb r0, [r0, 0x1] @@ -302,7 +302,7 @@ ContestAICmd_get_turn: @ 8128AF0 str r0, [r1] bx lr .align 2, 0 -_08128B04: .4byte 0x020192e4 +_08128B04: .4byte gSharedMem + 0x192E4 _08128B08: .4byte gAIScriptPtr thumb_func_end ContestAICmd_get_turn @@ -310,7 +310,7 @@ _08128B08: .4byte gAIScriptPtr ContestAICmd_unk_02: @ 8128B0C push {lr} bl ContestAICmd_get_turn - ldr r0, _08128B3C @ =0x020192e4 + ldr r0, _08128B3C @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128B40 @ =gAIScriptPtr @@ -331,7 +331,7 @@ ContestAICmd_unk_02: @ 8128B0C str r1, [r3] b _08128B48 .align 2, 0 -_08128B3C: .4byte 0x020192e4 +_08128B3C: .4byte gSharedMem + 0x192E4 _08128B40: .4byte gAIScriptPtr _08128B44: adds r0, r2, 0x5 @@ -345,7 +345,7 @@ _08128B48: ContestAICmd_unk_03: @ 8128B4C push {lr} bl ContestAICmd_get_turn - ldr r0, _08128B7C @ =0x020192e4 + ldr r0, _08128B7C @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128B80 @ =gAIScriptPtr @@ -366,7 +366,7 @@ ContestAICmd_unk_03: @ 8128B4C str r1, [r3] b _08128B88 .align 2, 0 -_08128B7C: .4byte 0x020192e4 +_08128B7C: .4byte gSharedMem + 0x192E4 _08128B80: .4byte gAIScriptPtr _08128B84: adds r0, r2, 0x5 @@ -380,7 +380,7 @@ _08128B88: ContestAICmd_unk_04: @ 8128B8C push {lr} bl ContestAICmd_get_turn - ldr r0, _08128BBC @ =0x020192e4 + ldr r0, _08128BBC @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128BC0 @ =gAIScriptPtr @@ -401,7 +401,7 @@ ContestAICmd_unk_04: @ 8128B8C str r1, [r3] b _08128BC8 .align 2, 0 -_08128BBC: .4byte 0x020192e4 +_08128BBC: .4byte gSharedMem + 0x192E4 _08128BC0: .4byte gAIScriptPtr _08128BC4: adds r0, r2, 0x5 @@ -415,7 +415,7 @@ _08128BC8: ContestAICmd_unk_05: @ 8128BCC push {lr} bl ContestAICmd_get_turn - ldr r0, _08128BFC @ =0x020192e4 + ldr r0, _08128BFC @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128C00 @ =gAIScriptPtr @@ -436,7 +436,7 @@ ContestAICmd_unk_05: @ 8128BCC str r1, [r3] b _08128C08 .align 2, 0 -_08128BFC: .4byte 0x020192e4 +_08128BFC: .4byte gSharedMem + 0x192E4 _08128C00: .4byte gAIScriptPtr _08128C04: adds r0, r2, 0x5 @@ -448,7 +448,7 @@ _08128C08: thumb_func_start ContestAICmd_get_excitement ContestAICmd_get_excitement: @ 8128C0C - ldr r1, _08128C24 @ =0x020192e4 + ldr r1, _08128C24 @ =gSharedMem + 0x192E4 adds r0, r1, 0 subs r0, 0xE0 ldrb r0, [r0, 0x13] @@ -461,7 +461,7 @@ ContestAICmd_get_excitement: @ 8128C0C str r0, [r1] bx lr .align 2, 0 -_08128C24: .4byte 0x020192e4 +_08128C24: .4byte gSharedMem + 0x192E4 _08128C28: .4byte gAIScriptPtr thumb_func_end ContestAICmd_get_excitement @@ -469,7 +469,7 @@ _08128C28: .4byte gAIScriptPtr ContestAICmd_unk_07: @ 8128C2C push {lr} bl ContestAICmd_get_excitement - ldr r0, _08128C5C @ =0x020192e4 + ldr r0, _08128C5C @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128C60 @ =gAIScriptPtr @@ -490,7 +490,7 @@ ContestAICmd_unk_07: @ 8128C2C str r1, [r3] b _08128C68 .align 2, 0 -_08128C5C: .4byte 0x020192e4 +_08128C5C: .4byte gSharedMem + 0x192E4 _08128C60: .4byte gAIScriptPtr _08128C64: adds r0, r2, 0x5 @@ -504,7 +504,7 @@ _08128C68: ContestAICmd_unk_08: @ 8128C6C push {lr} bl ContestAICmd_get_excitement - ldr r0, _08128C9C @ =0x020192e4 + ldr r0, _08128C9C @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128CA0 @ =gAIScriptPtr @@ -525,7 +525,7 @@ ContestAICmd_unk_08: @ 8128C6C str r1, [r3] b _08128CA8 .align 2, 0 -_08128C9C: .4byte 0x020192e4 +_08128C9C: .4byte gSharedMem + 0x192E4 _08128CA0: .4byte gAIScriptPtr _08128CA4: adds r0, r2, 0x5 @@ -539,7 +539,7 @@ _08128CA8: ContestAICmd_unk_09: @ 8128CAC push {lr} bl ContestAICmd_get_excitement - ldr r0, _08128CDC @ =0x020192e4 + ldr r0, _08128CDC @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128CE0 @ =gAIScriptPtr @@ -560,7 +560,7 @@ ContestAICmd_unk_09: @ 8128CAC str r1, [r3] b _08128CE8 .align 2, 0 -_08128CDC: .4byte 0x020192e4 +_08128CDC: .4byte gSharedMem + 0x192E4 _08128CE0: .4byte gAIScriptPtr _08128CE4: adds r0, r2, 0x5 @@ -574,7 +574,7 @@ _08128CE8: ContestAICmd_unk_0A: @ 8128CEC push {lr} bl ContestAICmd_get_excitement - ldr r0, _08128D1C @ =0x020192e4 + ldr r0, _08128D1C @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128D20 @ =gAIScriptPtr @@ -595,7 +595,7 @@ ContestAICmd_unk_0A: @ 8128CEC str r1, [r3] b _08128D28 .align 2, 0 -_08128D1C: .4byte 0x020192e4 +_08128D1C: .4byte gSharedMem + 0x192E4 _08128D20: .4byte gAIScriptPtr _08128D24: adds r0, r2, 0x5 @@ -607,7 +607,7 @@ _08128D28: thumb_func_start ContestAICmd_get_user_order ContestAICmd_get_user_order: @ 8128D2C - ldr r1, _08128D48 @ =0x020192e4 + ldr r1, _08128D48 @ =gSharedMem + 0x192E4 adds r2, r1, 0 adds r2, 0x41 adds r0, r1, 0 @@ -622,7 +622,7 @@ ContestAICmd_get_user_order: @ 8128D2C str r0, [r1] bx lr .align 2, 0 -_08128D48: .4byte 0x020192e4 +_08128D48: .4byte gSharedMem + 0x192E4 _08128D4C: .4byte gAIScriptPtr thumb_func_end ContestAICmd_get_user_order @@ -630,7 +630,7 @@ _08128D4C: .4byte gAIScriptPtr ContestAICmd_unk_0C: @ 8128D50 push {lr} bl ContestAICmd_get_user_order - ldr r0, _08128D80 @ =0x020192e4 + ldr r0, _08128D80 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128D84 @ =gAIScriptPtr @@ -651,7 +651,7 @@ ContestAICmd_unk_0C: @ 8128D50 str r1, [r3] b _08128D8C .align 2, 0 -_08128D80: .4byte 0x020192e4 +_08128D80: .4byte gSharedMem + 0x192E4 _08128D84: .4byte gAIScriptPtr _08128D88: adds r0, r2, 0x5 @@ -665,7 +665,7 @@ _08128D8C: ContestAICmd_unk_0D: @ 8128D90 push {lr} bl ContestAICmd_get_user_order - ldr r0, _08128DC0 @ =0x020192e4 + ldr r0, _08128DC0 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128DC4 @ =gAIScriptPtr @@ -686,7 +686,7 @@ ContestAICmd_unk_0D: @ 8128D90 str r1, [r3] b _08128DCC .align 2, 0 -_08128DC0: .4byte 0x020192e4 +_08128DC0: .4byte gSharedMem + 0x192E4 _08128DC4: .4byte gAIScriptPtr _08128DC8: adds r0, r2, 0x5 @@ -700,7 +700,7 @@ _08128DCC: ContestAICmd_unk_0E: @ 8128DD0 push {lr} bl ContestAICmd_get_user_order - ldr r0, _08128E00 @ =0x020192e4 + ldr r0, _08128E00 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128E04 @ =gAIScriptPtr @@ -721,7 +721,7 @@ ContestAICmd_unk_0E: @ 8128DD0 str r1, [r3] b _08128E0C .align 2, 0 -_08128E00: .4byte 0x020192e4 +_08128E00: .4byte gSharedMem + 0x192E4 _08128E04: .4byte gAIScriptPtr _08128E08: adds r0, r2, 0x5 @@ -735,7 +735,7 @@ _08128E0C: ContestAICmd_unk_0F: @ 8128E10 push {lr} bl ContestAICmd_get_user_order - ldr r0, _08128E40 @ =0x020192e4 + ldr r0, _08128E40 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128E44 @ =gAIScriptPtr @@ -756,7 +756,7 @@ ContestAICmd_unk_0F: @ 8128E10 str r1, [r3] b _08128E4C .align 2, 0 -_08128E40: .4byte 0x020192e4 +_08128E40: .4byte gSharedMem + 0x192E4 _08128E44: .4byte gAIScriptPtr _08128E48: adds r0, r2, 0x5 @@ -769,7 +769,7 @@ _08128E4C: thumb_func_start ContestAICmd_get_user_condition_maybe ContestAICmd_get_user_condition_maybe: @ 8128E50 push {r4,lr} - ldr r4, _08128E88 @ =0x020192e4 + ldr r4, _08128E88 @ =gSharedMem + 0x192E4 adds r0, r4, 0 adds r0, 0x41 ldrb r1, [r0] @@ -795,7 +795,7 @@ ContestAICmd_get_user_condition_maybe: @ 8128E50 pop {r0} bx r0 .align 2, 0 -_08128E88: .4byte 0x020192e4 +_08128E88: .4byte gSharedMem + 0x192E4 _08128E8C: .4byte gAIScriptPtr thumb_func_end ContestAICmd_get_user_condition_maybe @@ -803,7 +803,7 @@ _08128E8C: .4byte gAIScriptPtr ContestAICmd_unk_11: @ 8128E90 push {lr} bl ContestAICmd_get_user_condition_maybe - ldr r0, _08128EC0 @ =0x020192e4 + ldr r0, _08128EC0 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128EC4 @ =gAIScriptPtr @@ -824,7 +824,7 @@ ContestAICmd_unk_11: @ 8128E90 str r1, [r3] b _08128ECC .align 2, 0 -_08128EC0: .4byte 0x020192e4 +_08128EC0: .4byte gSharedMem + 0x192E4 _08128EC4: .4byte gAIScriptPtr _08128EC8: adds r0, r2, 0x5 @@ -838,7 +838,7 @@ _08128ECC: ContestAICmd_unk_12: @ 8128ED0 push {lr} bl ContestAICmd_get_user_condition_maybe - ldr r0, _08128F00 @ =0x020192e4 + ldr r0, _08128F00 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128F04 @ =gAIScriptPtr @@ -859,7 +859,7 @@ ContestAICmd_unk_12: @ 8128ED0 str r1, [r3] b _08128F0C .align 2, 0 -_08128F00: .4byte 0x020192e4 +_08128F00: .4byte gSharedMem + 0x192E4 _08128F04: .4byte gAIScriptPtr _08128F08: adds r0, r2, 0x5 @@ -873,7 +873,7 @@ _08128F0C: ContestAICmd_unk_13: @ 8128F10 push {lr} bl ContestAICmd_get_user_condition_maybe - ldr r0, _08128F40 @ =0x020192e4 + ldr r0, _08128F40 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128F44 @ =gAIScriptPtr @@ -894,7 +894,7 @@ ContestAICmd_unk_13: @ 8128F10 str r1, [r3] b _08128F4C .align 2, 0 -_08128F40: .4byte 0x020192e4 +_08128F40: .4byte gSharedMem + 0x192E4 _08128F44: .4byte gAIScriptPtr _08128F48: adds r0, r2, 0x5 @@ -908,7 +908,7 @@ _08128F4C: ContestAICmd_unk_14: @ 8128F50 push {lr} bl ContestAICmd_get_user_condition_maybe - ldr r0, _08128F80 @ =0x020192e4 + ldr r0, _08128F80 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08128F84 @ =gAIScriptPtr @@ -929,7 +929,7 @@ ContestAICmd_unk_14: @ 8128F50 str r1, [r3] b _08128F8C .align 2, 0 -_08128F80: .4byte 0x020192e4 +_08128F80: .4byte gSharedMem + 0x192E4 _08128F84: .4byte gAIScriptPtr _08128F88: adds r0, r2, 0x5 @@ -941,7 +941,7 @@ _08128F8C: thumb_func_start ContestAICmd_unk_15 ContestAICmd_unk_15: @ 8128F90 - ldr r2, _08128FB4 @ =0x020192e4 + ldr r2, _08128FB4 @ =gSharedMem + 0x192E4 adds r0, r2, 0 adds r0, 0x41 ldrb r1, [r0] @@ -959,7 +959,7 @@ ContestAICmd_unk_15: @ 8128F90 str r0, [r1] bx lr .align 2, 0 -_08128FB4: .4byte 0x020192e4 +_08128FB4: .4byte gSharedMem + 0x192E4 _08128FB8: .4byte gAIScriptPtr thumb_func_end ContestAICmd_unk_15 @@ -967,7 +967,7 @@ _08128FB8: .4byte gAIScriptPtr ContestAICmd_unk_16: @ 8128FBC push {r4,r5,lr} bl ContestAICmd_unk_15 - ldr r2, _08128FF4 @ =0x020192e4 + ldr r2, _08128FF4 @ =gSharedMem + 0x192E4 ldr r4, _08128FF8 @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3] @@ -993,7 +993,7 @@ ContestAICmd_unk_16: @ 8128FBC str r1, [r4] b _08129000 .align 2, 0 -_08128FF4: .4byte 0x020192e4 +_08128FF4: .4byte gSharedMem + 0x192E4 _08128FF8: .4byte gAIScriptPtr _08128FFC: adds r0, r3, 0x6 @@ -1008,7 +1008,7 @@ _08129000: ContestAICmd_unk_17: @ 8129008 push {r4,r5,lr} bl ContestAICmd_unk_15 - ldr r2, _08129040 @ =0x020192e4 + ldr r2, _08129040 @ =gSharedMem + 0x192E4 ldr r4, _08129044 @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3] @@ -1034,7 +1034,7 @@ ContestAICmd_unk_17: @ 8129008 str r1, [r4] b _0812904C .align 2, 0 -_08129040: .4byte 0x020192e4 +_08129040: .4byte gSharedMem + 0x192E4 _08129044: .4byte gAIScriptPtr _08129048: adds r0, r3, 0x6 @@ -1049,7 +1049,7 @@ _0812904C: ContestAICmd_unk_18: @ 8129054 push {r4,r5,lr} bl ContestAICmd_unk_15 - ldr r2, _0812908C @ =0x020192e4 + ldr r2, _0812908C @ =gSharedMem + 0x192E4 ldr r4, _08129090 @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3] @@ -1075,7 +1075,7 @@ ContestAICmd_unk_18: @ 8129054 str r1, [r4] b _08129098 .align 2, 0 -_0812908C: .4byte 0x020192e4 +_0812908C: .4byte gSharedMem + 0x192E4 _08129090: .4byte gAIScriptPtr _08129094: adds r0, r3, 0x6 @@ -1090,7 +1090,7 @@ _08129098: ContestAICmd_unk_19: @ 81290A0 push {r4,r5,lr} bl ContestAICmd_unk_15 - ldr r2, _081290D8 @ =0x020192e4 + ldr r2, _081290D8 @ =gSharedMem + 0x192E4 ldr r4, _081290DC @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3] @@ -1116,7 +1116,7 @@ ContestAICmd_unk_19: @ 81290A0 str r1, [r4] b _081290E4 .align 2, 0 -_081290D8: .4byte 0x020192e4 +_081290D8: .4byte gSharedMem + 0x192E4 _081290DC: .4byte gAIScriptPtr _081290E0: adds r0, r3, 0x6 @@ -1129,7 +1129,7 @@ _081290E4: thumb_func_start ContestAICmd_unk_1A ContestAICmd_unk_1A: @ 81290EC - ldr r2, _08129108 @ =0x020192e4 + ldr r2, _08129108 @ =gSharedMem + 0x192E4 ldr r1, _0812910C @ =gUnknown_02038670 adds r0, r2, 0 adds r0, 0x41 @@ -1144,7 +1144,7 @@ ContestAICmd_unk_1A: @ 81290EC str r0, [r1] bx lr .align 2, 0 -_08129108: .4byte 0x020192e4 +_08129108: .4byte gSharedMem + 0x192E4 _0812910C: .4byte gUnknown_02038670 _08129110: .4byte gAIScriptPtr thumb_func_end ContestAICmd_unk_1A @@ -1153,7 +1153,7 @@ _08129110: .4byte gAIScriptPtr ContestAICmd_unk_1B: @ 8129114 push {r4,r5,lr} bl ContestAICmd_unk_1A - ldr r2, _0812914C @ =0x020192e4 + ldr r2, _0812914C @ =gSharedMem + 0x192E4 ldr r4, _08129150 @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3] @@ -1179,7 +1179,7 @@ ContestAICmd_unk_1B: @ 8129114 str r1, [r4] b _08129158 .align 2, 0 -_0812914C: .4byte 0x020192e4 +_0812914C: .4byte gSharedMem + 0x192E4 _08129150: .4byte gAIScriptPtr _08129154: adds r0, r3, 0x6 @@ -1194,7 +1194,7 @@ _08129158: ContestAICmd_unk_1C: @ 8129160 push {r4,r5,lr} bl ContestAICmd_unk_1A - ldr r2, _08129198 @ =0x020192e4 + ldr r2, _08129198 @ =gSharedMem + 0x192E4 ldr r4, _0812919C @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3] @@ -1220,7 +1220,7 @@ ContestAICmd_unk_1C: @ 8129160 str r1, [r4] b _081291A4 .align 2, 0 -_08129198: .4byte 0x020192e4 +_08129198: .4byte gSharedMem + 0x192E4 _0812919C: .4byte gAIScriptPtr _081291A0: adds r0, r3, 0x6 @@ -1235,7 +1235,7 @@ _081291A4: ContestAICmd_unk_1D: @ 81291AC push {r4,r5,lr} bl ContestAICmd_unk_1A - ldr r2, _081291E4 @ =0x020192e4 + ldr r2, _081291E4 @ =gSharedMem + 0x192E4 ldr r4, _081291E8 @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3] @@ -1261,7 +1261,7 @@ ContestAICmd_unk_1D: @ 81291AC str r1, [r4] b _081291F0 .align 2, 0 -_081291E4: .4byte 0x020192e4 +_081291E4: .4byte gSharedMem + 0x192E4 _081291E8: .4byte gAIScriptPtr _081291EC: adds r0, r3, 0x6 @@ -1276,7 +1276,7 @@ _081291F0: ContestAICmd_unk_1E: @ 81291F8 push {r4,r5,lr} bl ContestAICmd_unk_1A - ldr r2, _08129230 @ =0x020192e4 + ldr r2, _08129230 @ =gSharedMem + 0x192E4 ldr r4, _08129234 @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3] @@ -1302,7 +1302,7 @@ ContestAICmd_unk_1E: @ 81291F8 str r1, [r4] b _0812923C .align 2, 0 -_08129230: .4byte 0x020192e4 +_08129230: .4byte gSharedMem + 0x192E4 _08129234: .4byte gAIScriptPtr _08129238: adds r0, r3, 0x6 @@ -1315,7 +1315,7 @@ _0812923C: thumb_func_start ContestAICmd_get_contest_type ContestAICmd_get_contest_type: @ 8129244 - ldr r1, _08129258 @ =0x020192e4 + ldr r1, _08129258 @ =gSharedMem + 0x192E4 ldr r0, _0812925C @ =gScriptContestCategory ldrh r0, [r0] strh r0, [r1, 0x18] @@ -1325,7 +1325,7 @@ ContestAICmd_get_contest_type: @ 8129244 str r0, [r1] bx lr .align 2, 0 -_08129258: .4byte 0x020192e4 +_08129258: .4byte gSharedMem + 0x192E4 _0812925C: .4byte gScriptContestCategory _08129260: .4byte gAIScriptPtr thumb_func_end ContestAICmd_get_contest_type @@ -1334,7 +1334,7 @@ _08129260: .4byte gAIScriptPtr ContestAICmd_unk_20: @ 8129264 push {lr} bl ContestAICmd_get_contest_type - ldr r0, _08129294 @ =0x020192e4 + ldr r0, _08129294 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08129298 @ =gAIScriptPtr @@ -1355,7 +1355,7 @@ ContestAICmd_unk_20: @ 8129264 str r1, [r3] b _081292A0 .align 2, 0 -_08129294: .4byte 0x020192e4 +_08129294: .4byte gSharedMem + 0x192E4 _08129298: .4byte gAIScriptPtr _0812929C: adds r0, r2, 0x5 @@ -1369,7 +1369,7 @@ _081292A0: ContestAICmd_unk_21: @ 81292A4 push {lr} bl ContestAICmd_get_contest_type - ldr r0, _081292D4 @ =0x020192e4 + ldr r0, _081292D4 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _081292D8 @ =gAIScriptPtr @@ -1390,7 +1390,7 @@ ContestAICmd_unk_21: @ 81292A4 str r1, [r3] b _081292E0 .align 2, 0 -_081292D4: .4byte 0x020192e4 +_081292D4: .4byte gSharedMem + 0x192E4 _081292D8: .4byte gAIScriptPtr _081292DC: adds r0, r2, 0x5 @@ -1404,7 +1404,7 @@ _081292E0: ContestAICmd_get_move_excitement: @ 81292E4 push {r4,lr} ldr r2, _08129318 @ =gContestMons - ldr r4, _0812931C @ =0x020192e4 + ldr r4, _0812931C @ =gSharedMem + 0x192E4 ldrb r1, [r4, 0x4] lsls r1, 1 adds r0, r4, 0 @@ -1428,7 +1428,7 @@ ContestAICmd_get_move_excitement: @ 81292E4 bx r0 .align 2, 0 _08129318: .4byte gContestMons -_0812931C: .4byte 0x020192e4 +_0812931C: .4byte gSharedMem + 0x192E4 _08129320: .4byte gAIScriptPtr thumb_func_end ContestAICmd_get_move_excitement @@ -1436,7 +1436,7 @@ _08129320: .4byte gAIScriptPtr ContestAICmd_unk_23: @ 8129324 push {r4,lr} bl ContestAICmd_get_move_excitement - ldr r0, _08129354 @ =0x020192e4 + ldr r0, _08129354 @ =gSharedMem + 0x192E4 ldr r3, _08129358 @ =gAIScriptPtr ldr r2, [r3] movs r4, 0x18 @@ -1458,7 +1458,7 @@ ContestAICmd_unk_23: @ 8129324 str r1, [r3] b _08129360 .align 2, 0 -_08129354: .4byte 0x020192e4 +_08129354: .4byte gSharedMem + 0x192E4 _08129358: .4byte gAIScriptPtr _0812935C: adds r0, r2, 0x5 @@ -1473,7 +1473,7 @@ _08129360: ContestAICmd_unk_24: @ 8129368 push {r4,lr} bl ContestAICmd_get_move_excitement - ldr r0, _08129398 @ =0x020192e4 + ldr r0, _08129398 @ =gSharedMem + 0x192E4 ldr r3, _0812939C @ =gAIScriptPtr ldr r2, [r3] movs r4, 0x18 @@ -1495,7 +1495,7 @@ ContestAICmd_unk_24: @ 8129368 str r1, [r3] b _081293A4 .align 2, 0 -_08129398: .4byte 0x020192e4 +_08129398: .4byte gSharedMem + 0x192E4 _0812939C: .4byte gAIScriptPtr _081293A0: adds r0, r2, 0x5 @@ -1510,7 +1510,7 @@ _081293A4: ContestAICmd_unk_25: @ 81293AC push {r4,lr} bl ContestAICmd_get_move_excitement - ldr r0, _081293DC @ =0x020192e4 + ldr r0, _081293DC @ =gSharedMem + 0x192E4 ldr r3, _081293E0 @ =gAIScriptPtr ldr r2, [r3] movs r4, 0x18 @@ -1532,7 +1532,7 @@ ContestAICmd_unk_25: @ 81293AC str r1, [r3] b _081293E8 .align 2, 0 -_081293DC: .4byte 0x020192e4 +_081293DC: .4byte gSharedMem + 0x192E4 _081293E0: .4byte gAIScriptPtr _081293E4: adds r0, r2, 0x5 @@ -1547,7 +1547,7 @@ _081293E8: ContestAICmd_unk_26: @ 81293F0 push {r4,lr} bl ContestAICmd_get_move_excitement - ldr r0, _08129420 @ =0x020192e4 + ldr r0, _08129420 @ =gSharedMem + 0x192E4 ldr r3, _08129424 @ =gAIScriptPtr ldr r2, [r3] movs r4, 0x18 @@ -1569,7 +1569,7 @@ ContestAICmd_unk_26: @ 81293F0 str r1, [r3] b _0812942C .align 2, 0 -_08129420: .4byte 0x020192e4 +_08129420: .4byte gSharedMem + 0x192E4 _08129424: .4byte gAIScriptPtr _08129428: adds r0, r2, 0x5 @@ -1583,7 +1583,7 @@ _0812942C: thumb_func_start ContestAICmd_get_move_effect ContestAICmd_get_move_effect: @ 8129434 ldr r2, _08129460 @ =gContestMons - ldr r3, _08129464 @ =0x020192e4 + ldr r3, _08129464 @ =gSharedMem + 0x192E4 ldrb r1, [r3, 0x4] lsls r1, 1 adds r0, r3, 0 @@ -1606,7 +1606,7 @@ ContestAICmd_get_move_effect: @ 8129434 bx lr .align 2, 0 _08129460: .4byte gContestMons -_08129464: .4byte 0x020192e4 +_08129464: .4byte gSharedMem + 0x192E4 _08129468: .4byte gContestMoves _0812946C: .4byte gAIScriptPtr thumb_func_end ContestAICmd_get_move_effect @@ -1615,7 +1615,7 @@ _0812946C: .4byte gAIScriptPtr ContestAICmd_unk_28: @ 8129470 push {lr} bl ContestAICmd_get_move_effect - ldr r0, _081294A0 @ =0x020192e4 + ldr r0, _081294A0 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _081294A4 @ =gAIScriptPtr @@ -1636,7 +1636,7 @@ ContestAICmd_unk_28: @ 8129470 str r1, [r3] b _081294AC .align 2, 0 -_081294A0: .4byte 0x020192e4 +_081294A0: .4byte gSharedMem + 0x192E4 _081294A4: .4byte gAIScriptPtr _081294A8: adds r0, r2, 0x5 @@ -1650,7 +1650,7 @@ _081294AC: ContestAICmd_unk_29: @ 81294B0 push {lr} bl ContestAICmd_get_move_effect - ldr r0, _081294E0 @ =0x020192e4 + ldr r0, _081294E0 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _081294E4 @ =gAIScriptPtr @@ -1671,7 +1671,7 @@ ContestAICmd_unk_29: @ 81294B0 str r1, [r3] b _081294EC .align 2, 0 -_081294E0: .4byte 0x020192e4 +_081294E0: .4byte gSharedMem + 0x192E4 _081294E4: .4byte gAIScriptPtr _081294E8: adds r0, r2, 0x5 @@ -1684,7 +1684,7 @@ _081294EC: thumb_func_start ContestAICmd_get_move_effect_type ContestAICmd_get_move_effect_type: @ 81294F0 ldr r2, _08129524 @ =gContestMons - ldr r3, _08129528 @ =0x020192e4 + ldr r3, _08129528 @ =gSharedMem + 0x192E4 ldrb r1, [r3, 0x4] lsls r1, 1 adds r0, r3, 0 @@ -1711,7 +1711,7 @@ ContestAICmd_get_move_effect_type: @ 81294F0 bx lr .align 2, 0 _08129524: .4byte gContestMons -_08129528: .4byte 0x020192e4 +_08129528: .4byte gSharedMem + 0x192E4 _0812952C: .4byte gContestEffects _08129530: .4byte gContestMoves _08129534: .4byte gAIScriptPtr @@ -1721,7 +1721,7 @@ _08129534: .4byte gAIScriptPtr ContestAICmd_unk_2B: @ 8129538 push {lr} bl ContestAICmd_get_move_effect_type - ldr r0, _08129568 @ =0x020192e4 + ldr r0, _08129568 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812956C @ =gAIScriptPtr @@ -1742,7 +1742,7 @@ ContestAICmd_unk_2B: @ 8129538 str r1, [r3] b _08129574 .align 2, 0 -_08129568: .4byte 0x020192e4 +_08129568: .4byte gSharedMem + 0x192E4 _0812956C: .4byte gAIScriptPtr _08129570: adds r0, r2, 0x5 @@ -1756,7 +1756,7 @@ _08129574: ContestAICmd_unk_2C: @ 8129578 push {lr} bl ContestAICmd_get_move_effect_type - ldr r0, _081295A8 @ =0x020192e4 + ldr r0, _081295A8 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _081295AC @ =gAIScriptPtr @@ -1777,7 +1777,7 @@ ContestAICmd_unk_2C: @ 8129578 str r1, [r3] b _081295B4 .align 2, 0 -_081295A8: .4byte 0x020192e4 +_081295A8: .4byte gSharedMem + 0x192E4 _081295AC: .4byte gAIScriptPtr _081295B0: adds r0, r2, 0x5 @@ -1791,7 +1791,7 @@ _081295B4: ContestAICmd_check_move_has_highest_appeal: @ 81295B8 push {r4-r7,lr} ldr r2, _08129610 @ =gContestMons - ldr r3, _08129614 @ =0x020192e4 + ldr r3, _08129614 @ =gSharedMem + 0x192E4 ldrb r0, [r3, 0x4] lsls r0, 1 adds r1, r3, 0 @@ -1838,7 +1838,7 @@ _08129608: b _08129626 .align 2, 0 _08129610: .4byte gContestMons -_08129614: .4byte 0x020192e4 +_08129614: .4byte gSharedMem + 0x192E4 _08129618: .4byte gContestEffects _0812961C: .4byte gContestMoves _08129620: .4byte gAIScriptPtr @@ -1859,7 +1859,7 @@ _08129626: ContestAICmd_unk_2E: @ 8129638 push {lr} bl ContestAICmd_check_move_has_highest_appeal - ldr r0, _08129664 @ =0x020192e4 + ldr r0, _08129664 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -1879,7 +1879,7 @@ ContestAICmd_unk_2E: @ 8129638 str r1, [r3] b _08129674 .align 2, 0 -_08129664: .4byte 0x020192e4 +_08129664: .4byte gSharedMem + 0x192E4 _08129668: .4byte gAIScriptPtr _0812966C: ldr r1, _08129678 @ =gAIScriptPtr @@ -1897,7 +1897,7 @@ _08129678: .4byte gAIScriptPtr ContestAICmd_unk_2F: @ 812967C push {r4-r7,lr} ldr r2, _081296D4 @ =gContestMons - ldr r3, _081296D8 @ =0x020192e4 + ldr r3, _081296D8 @ =gSharedMem + 0x192E4 ldrb r0, [r3, 0x4] lsls r0, 1 adds r1, r3, 0 @@ -1944,7 +1944,7 @@ _081296CC: b _081296EA .align 2, 0 _081296D4: .4byte gContestMons -_081296D8: .4byte 0x020192e4 +_081296D8: .4byte gSharedMem + 0x192E4 _081296DC: .4byte gContestEffects _081296E0: .4byte gContestMoves _081296E4: .4byte gAIScriptPtr @@ -1965,7 +1965,7 @@ _081296EA: ContestAICmd_unk_30: @ 81296FC push {lr} bl ContestAICmd_unk_2F - ldr r0, _08129728 @ =0x020192e4 + ldr r0, _08129728 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -1985,7 +1985,7 @@ ContestAICmd_unk_30: @ 81296FC str r1, [r3] b _08129738 .align 2, 0 -_08129728: .4byte 0x020192e4 +_08129728: .4byte gSharedMem + 0x192E4 _0812972C: .4byte gAIScriptPtr _08129730: ldr r1, _0812973C @ =gAIScriptPtr @@ -2003,7 +2003,7 @@ _0812973C: .4byte gAIScriptPtr ContestAICmd_unk_31: @ 8129740 push {r4,lr} ldr r2, _08129784 @ =gContestMons - ldr r4, _08129788 @ =0x020192e4 + ldr r4, _08129788 @ =gSharedMem + 0x192E4 ldrb r1, [r4, 0x4] lsls r1, 1 adds r0, r4, 0 @@ -2036,7 +2036,7 @@ ContestAICmd_unk_31: @ 8129740 bx r0 .align 2, 0 _08129784: .4byte gContestMons -_08129788: .4byte 0x020192e4 +_08129788: .4byte gSharedMem + 0x192E4 _0812978C: .4byte gContestEffects _08129790: .4byte gContestMoves _08129794: .4byte gAIScriptPtr @@ -2046,7 +2046,7 @@ _08129794: .4byte gAIScriptPtr ContestAICmd_unk_32: @ 8129798 push {lr} bl ContestAICmd_unk_31 - ldr r0, _081297C8 @ =0x020192e4 + ldr r0, _081297C8 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _081297CC @ =gAIScriptPtr @@ -2067,7 +2067,7 @@ ContestAICmd_unk_32: @ 8129798 str r1, [r3] b _081297D4 .align 2, 0 -_081297C8: .4byte 0x020192e4 +_081297C8: .4byte gSharedMem + 0x192E4 _081297CC: .4byte gAIScriptPtr _081297D0: adds r0, r2, 0x5 @@ -2081,7 +2081,7 @@ _081297D4: ContestAICmd_unk_33: @ 81297D8 push {lr} bl ContestAICmd_unk_31 - ldr r0, _08129808 @ =0x020192e4 + ldr r0, _08129808 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812980C @ =gAIScriptPtr @@ -2102,7 +2102,7 @@ ContestAICmd_unk_33: @ 81297D8 str r1, [r3] b _08129814 .align 2, 0 -_08129808: .4byte 0x020192e4 +_08129808: .4byte gSharedMem + 0x192E4 _0812980C: .4byte gAIScriptPtr _08129810: adds r0, r2, 0x5 @@ -2116,7 +2116,7 @@ _08129814: ContestAICmd_unk_34: @ 8129818 push {lr} bl ContestAICmd_unk_31 - ldr r0, _08129848 @ =0x020192e4 + ldr r0, _08129848 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812984C @ =gAIScriptPtr @@ -2137,7 +2137,7 @@ ContestAICmd_unk_34: @ 8129818 str r1, [r3] b _08129854 .align 2, 0 -_08129848: .4byte 0x020192e4 +_08129848: .4byte gSharedMem + 0x192E4 _0812984C: .4byte gAIScriptPtr _08129850: adds r0, r2, 0x5 @@ -2151,7 +2151,7 @@ _08129854: ContestAICmd_unk_35: @ 8129858 push {lr} bl ContestAICmd_unk_31 - ldr r0, _08129888 @ =0x020192e4 + ldr r0, _08129888 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812988C @ =gAIScriptPtr @@ -2172,7 +2172,7 @@ ContestAICmd_unk_35: @ 8129858 str r1, [r3] b _08129894 .align 2, 0 -_08129888: .4byte 0x020192e4 +_08129888: .4byte gSharedMem + 0x192E4 _0812988C: .4byte gAIScriptPtr _08129890: adds r0, r2, 0x5 @@ -2186,7 +2186,7 @@ _08129894: ContestAICmd_unk_36: @ 8129898 push {r4,lr} ldr r2, _081298DC @ =gContestMons - ldr r4, _081298E0 @ =0x020192e4 + ldr r4, _081298E0 @ =gSharedMem + 0x192E4 ldrb r1, [r4, 0x4] lsls r1, 1 adds r0, r4, 0 @@ -2219,7 +2219,7 @@ ContestAICmd_unk_36: @ 8129898 bx r0 .align 2, 0 _081298DC: .4byte gContestMons -_081298E0: .4byte 0x020192e4 +_081298E0: .4byte gSharedMem + 0x192E4 _081298E4: .4byte gContestEffects _081298E8: .4byte gContestMoves _081298EC: .4byte gAIScriptPtr @@ -2229,7 +2229,7 @@ _081298EC: .4byte gAIScriptPtr ContestAICmd_unk_37: @ 81298F0 push {lr} bl ContestAICmd_unk_36 - ldr r0, _08129920 @ =0x020192e4 + ldr r0, _08129920 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08129924 @ =gAIScriptPtr @@ -2250,7 +2250,7 @@ ContestAICmd_unk_37: @ 81298F0 str r1, [r3] b _0812992C .align 2, 0 -_08129920: .4byte 0x020192e4 +_08129920: .4byte gSharedMem + 0x192E4 _08129924: .4byte gAIScriptPtr _08129928: adds r0, r2, 0x5 @@ -2264,7 +2264,7 @@ _0812992C: ContestAICmd_unk_38: @ 8129930 push {lr} bl ContestAICmd_unk_36 - ldr r0, _08129960 @ =0x020192e4 + ldr r0, _08129960 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08129964 @ =gAIScriptPtr @@ -2285,7 +2285,7 @@ ContestAICmd_unk_38: @ 8129930 str r1, [r3] b _0812996C .align 2, 0 -_08129960: .4byte 0x020192e4 +_08129960: .4byte gSharedMem + 0x192E4 _08129964: .4byte gAIScriptPtr _08129968: adds r0, r2, 0x5 @@ -2299,7 +2299,7 @@ _0812996C: ContestAICmd_unk_39: @ 8129970 push {lr} bl ContestAICmd_unk_36 - ldr r0, _081299A0 @ =0x020192e4 + ldr r0, _081299A0 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _081299A4 @ =gAIScriptPtr @@ -2320,7 +2320,7 @@ ContestAICmd_unk_39: @ 8129970 str r1, [r3] b _081299AC .align 2, 0 -_081299A0: .4byte 0x020192e4 +_081299A0: .4byte gSharedMem + 0x192E4 _081299A4: .4byte gAIScriptPtr _081299A8: adds r0, r2, 0x5 @@ -2334,7 +2334,7 @@ _081299AC: ContestAICmd_unk_3A: @ 81299B0 push {lr} bl ContestAICmd_unk_36 - ldr r0, _081299E0 @ =0x020192e4 + ldr r0, _081299E0 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _081299E4 @ =gAIScriptPtr @@ -2355,7 +2355,7 @@ ContestAICmd_unk_3A: @ 81299B0 str r1, [r3] b _081299EC .align 2, 0 -_081299E0: .4byte 0x020192e4 +_081299E0: .4byte gSharedMem + 0x192E4 _081299E4: .4byte gAIScriptPtr _081299E8: adds r0, r2, 0x5 @@ -2369,7 +2369,7 @@ _081299EC: ContestAICmd_get_move_used_count: @ 81299F0 push {r4,lr} ldr r3, _08129A20 @ =gContestMons - ldr r4, _08129A24 @ =0x020192e4 + ldr r4, _08129A24 @ =gSharedMem + 0x192E4 ldrb r0, [r4, 0x4] lsls r0, 1 adds r1, r4, 0 @@ -2393,7 +2393,7 @@ ContestAICmd_get_move_used_count: @ 81299F0 b _08129A30 .align 2, 0 _08129A20: .4byte gContestMons -_08129A24: .4byte 0x020192e4 +_08129A24: .4byte gSharedMem + 0x192E4 _08129A28: ldrb r0, [r0, 0xB] lsls r0, 25 @@ -2416,7 +2416,7 @@ _08129A40: .4byte gAIScriptPtr ContestAICmd_unk_3C: @ 8129A44 push {lr} bl ContestAICmd_get_move_used_count - ldr r0, _08129A74 @ =0x020192e4 + ldr r0, _08129A74 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08129A78 @ =gAIScriptPtr @@ -2437,7 +2437,7 @@ ContestAICmd_unk_3C: @ 8129A44 str r1, [r3] b _08129A80 .align 2, 0 -_08129A74: .4byte 0x020192e4 +_08129A74: .4byte gSharedMem + 0x192E4 _08129A78: .4byte gAIScriptPtr _08129A7C: adds r0, r2, 0x5 @@ -2451,7 +2451,7 @@ _08129A80: ContestAICmd_unk_3D: @ 8129A84 push {lr} bl ContestAICmd_get_move_used_count - ldr r0, _08129AB4 @ =0x020192e4 + ldr r0, _08129AB4 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08129AB8 @ =gAIScriptPtr @@ -2472,7 +2472,7 @@ ContestAICmd_unk_3D: @ 8129A84 str r1, [r3] b _08129AC0 .align 2, 0 -_08129AB4: .4byte 0x020192e4 +_08129AB4: .4byte gSharedMem + 0x192E4 _08129AB8: .4byte gAIScriptPtr _08129ABC: adds r0, r2, 0x5 @@ -2486,7 +2486,7 @@ _08129AC0: ContestAICmd_unk_3E: @ 8129AC4 push {lr} bl ContestAICmd_get_move_used_count - ldr r0, _08129AF4 @ =0x020192e4 + ldr r0, _08129AF4 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08129AF8 @ =gAIScriptPtr @@ -2507,7 +2507,7 @@ ContestAICmd_unk_3E: @ 8129AC4 str r1, [r3] b _08129B00 .align 2, 0 -_08129AF4: .4byte 0x020192e4 +_08129AF4: .4byte gSharedMem + 0x192E4 _08129AF8: .4byte gAIScriptPtr _08129AFC: adds r0, r2, 0x5 @@ -2521,7 +2521,7 @@ _08129B00: ContestAICmd_unk_3F: @ 8129B04 push {lr} bl ContestAICmd_get_move_used_count - ldr r0, _08129B34 @ =0x020192e4 + ldr r0, _08129B34 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08129B38 @ =gAIScriptPtr @@ -2542,7 +2542,7 @@ ContestAICmd_unk_3F: @ 8129B04 str r1, [r3] b _08129B40 .align 2, 0 -_08129B34: .4byte 0x020192e4 +_08129B34: .4byte gSharedMem + 0x192E4 _08129B38: .4byte gAIScriptPtr _08129B3C: adds r0, r2, 0x5 @@ -2559,7 +2559,7 @@ ContestAICmd_check_combo_starter: @ 8129B44 push {r7} movs r5, 0 ldr r3, _08129BAC @ =gContestMons - ldr r2, _08129BB0 @ =0x020192e4 + ldr r2, _08129BB0 @ =gSharedMem + 0x192E4 ldrb r1, [r2, 0x4] lsls r1, 1 adds r2, 0x41 @@ -2598,7 +2598,7 @@ _08129B8A: _08129B94: movs r5, 0x1 _08129B96: - ldr r0, _08129BB0 @ =0x020192e4 + ldr r0, _08129BB0 @ =gSharedMem + 0x192E4 strh r5, [r0, 0x18] ldr r1, _08129BB4 @ =gAIScriptPtr ldr r0, [r1] @@ -2611,7 +2611,7 @@ _08129B96: bx r0 .align 2, 0 _08129BAC: .4byte gContestMons -_08129BB0: .4byte 0x020192e4 +_08129BB0: .4byte gSharedMem + 0x192E4 _08129BB4: .4byte gAIScriptPtr thumb_func_end ContestAICmd_check_combo_starter @@ -2619,7 +2619,7 @@ _08129BB4: .4byte gAIScriptPtr ContestAICmd_unk_41: @ 8129BB8 push {lr} bl ContestAICmd_check_combo_starter - ldr r0, _08129BE4 @ =0x020192e4 + ldr r0, _08129BE4 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -2639,7 +2639,7 @@ ContestAICmd_unk_41: @ 8129BB8 str r1, [r3] b _08129BF4 .align 2, 0 -_08129BE4: .4byte 0x020192e4 +_08129BE4: .4byte gSharedMem + 0x192E4 _08129BE8: .4byte gAIScriptPtr _08129BEC: ldr r1, _08129BF8 @ =gAIScriptPtr @@ -2657,7 +2657,7 @@ _08129BF8: .4byte gAIScriptPtr ContestAICmd_unk_42: @ 8129BFC push {lr} bl ContestAICmd_check_combo_starter - ldr r0, _08129C28 @ =0x020192e4 + ldr r0, _08129C28 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -2677,7 +2677,7 @@ ContestAICmd_unk_42: @ 8129BFC str r1, [r3] b _08129C38 .align 2, 0 -_08129C28: .4byte 0x020192e4 +_08129C28: .4byte gSharedMem + 0x192E4 _08129C2C: .4byte gAIScriptPtr _08129C30: ldr r1, _08129C3C @ =gAIScriptPtr @@ -2698,7 +2698,7 @@ ContestAICmd_check_combo_finisher: @ 8129C40 push {r7} movs r5, 0 ldr r3, _08129CA8 @ =gContestMons - ldr r2, _08129CAC @ =0x020192e4 + ldr r2, _08129CAC @ =gSharedMem + 0x192E4 ldrb r1, [r2, 0x4] lsls r1, 1 adds r2, 0x41 @@ -2736,7 +2736,7 @@ _08129C84: _08129C8E: movs r5, 0x1 _08129C90: - ldr r0, _08129CAC @ =0x020192e4 + ldr r0, _08129CAC @ =gSharedMem + 0x192E4 strh r5, [r0, 0x18] ldr r1, _08129CB0 @ =gAIScriptPtr ldr r0, [r1] @@ -2749,7 +2749,7 @@ _08129C90: bx r0 .align 2, 0 _08129CA8: .4byte gContestMons -_08129CAC: .4byte 0x020192e4 +_08129CAC: .4byte gSharedMem + 0x192E4 _08129CB0: .4byte gAIScriptPtr thumb_func_end ContestAICmd_check_combo_finisher @@ -2757,7 +2757,7 @@ _08129CB0: .4byte gAIScriptPtr ContestAICmd_unk_44: @ 8129CB4 push {lr} bl ContestAICmd_check_combo_finisher - ldr r0, _08129CE0 @ =0x020192e4 + ldr r0, _08129CE0 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -2777,7 +2777,7 @@ ContestAICmd_unk_44: @ 8129CB4 str r1, [r3] b _08129CF0 .align 2, 0 -_08129CE0: .4byte 0x020192e4 +_08129CE0: .4byte gSharedMem + 0x192E4 _08129CE4: .4byte gAIScriptPtr _08129CE8: ldr r1, _08129CF4 @ =gAIScriptPtr @@ -2795,7 +2795,7 @@ _08129CF4: .4byte gAIScriptPtr ContestAICmd_unk_45: @ 8129CF8 push {lr} bl ContestAICmd_check_combo_finisher - ldr r0, _08129D24 @ =0x020192e4 + ldr r0, _08129D24 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -2815,7 +2815,7 @@ ContestAICmd_unk_45: @ 8129CF8 str r1, [r3] b _08129D34 .align 2, 0 -_08129D24: .4byte 0x020192e4 +_08129D24: .4byte gSharedMem + 0x192E4 _08129D28: .4byte gAIScriptPtr _08129D2C: ldr r1, _08129D38 @ =gAIScriptPtr @@ -2834,7 +2834,7 @@ ContestAICmd_check_would_finish_combo: @ 8129D3C push {r4,r5,lr} movs r5, 0 ldr r3, _08129D8C @ =gContestMons - ldr r4, _08129D90 @ =0x020192e4 + ldr r4, _08129D90 @ =gSharedMem + 0x192E4 ldrb r0, [r4, 0x4] lsls r0, 1 adds r1, r4, 0 @@ -2873,7 +2873,7 @@ _08129D7A: bx r0 .align 2, 0 _08129D8C: .4byte gContestMons -_08129D90: .4byte 0x020192e4 +_08129D90: .4byte gSharedMem + 0x192E4 _08129D94: .4byte gAIScriptPtr thumb_func_end ContestAICmd_check_would_finish_combo @@ -2881,7 +2881,7 @@ _08129D94: .4byte gAIScriptPtr ContestAICmd_unk_47: @ 8129D98 push {lr} bl ContestAICmd_check_would_finish_combo - ldr r0, _08129DC4 @ =0x020192e4 + ldr r0, _08129DC4 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -2901,7 +2901,7 @@ ContestAICmd_unk_47: @ 8129D98 str r1, [r3] b _08129DD4 .align 2, 0 -_08129DC4: .4byte 0x020192e4 +_08129DC4: .4byte gSharedMem + 0x192E4 _08129DC8: .4byte gAIScriptPtr _08129DCC: ldr r1, _08129DD8 @ =gAIScriptPtr @@ -2919,7 +2919,7 @@ _08129DD8: .4byte gAIScriptPtr ContestAICmd_unk_48: @ 8129DDC push {lr} bl ContestAICmd_check_would_finish_combo - ldr r0, _08129E08 @ =0x020192e4 + ldr r0, _08129E08 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -2939,7 +2939,7 @@ ContestAICmd_unk_48: @ 8129DDC str r1, [r3] b _08129E18 .align 2, 0 -_08129E08: .4byte 0x020192e4 +_08129E08: .4byte gSharedMem + 0x192E4 _08129E0C: .4byte gAIScriptPtr _08129E10: ldr r1, _08129E1C @ =gAIScriptPtr @@ -2962,7 +2962,7 @@ ContestAICmd_get_condition: @ 8129E20 bl sub_8128A7C lsls r0, 24 lsrs r0, 24 - ldr r5, _08129E60 @ =0x020192e4 + ldr r5, _08129E60 @ =gSharedMem + 0x192E4 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -2984,14 +2984,14 @@ ContestAICmd_get_condition: @ 8129E20 bx r0 .align 2, 0 _08129E5C: .4byte gAIScriptPtr -_08129E60: .4byte 0x020192e4 +_08129E60: .4byte gSharedMem + 0x192E4 thumb_func_end ContestAICmd_get_condition thumb_func_start ContestAICmd_unk_4A ContestAICmd_unk_4A: @ 8129E64 push {lr} bl ContestAICmd_get_condition - ldr r0, _08129E94 @ =0x020192e4 + ldr r0, _08129E94 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08129E98 @ =gAIScriptPtr @@ -3012,7 +3012,7 @@ ContestAICmd_unk_4A: @ 8129E64 str r1, [r3] b _08129EA0 .align 2, 0 -_08129E94: .4byte 0x020192e4 +_08129E94: .4byte gSharedMem + 0x192E4 _08129E98: .4byte gAIScriptPtr _08129E9C: adds r0, r2, 0x5 @@ -3026,7 +3026,7 @@ _08129EA0: ContestAICmd_unk_4B: @ 8129EA4 push {lr} bl ContestAICmd_get_condition - ldr r0, _08129ED4 @ =0x020192e4 + ldr r0, _08129ED4 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08129ED8 @ =gAIScriptPtr @@ -3047,7 +3047,7 @@ ContestAICmd_unk_4B: @ 8129EA4 str r1, [r3] b _08129EE0 .align 2, 0 -_08129ED4: .4byte 0x020192e4 +_08129ED4: .4byte gSharedMem + 0x192E4 _08129ED8: .4byte gAIScriptPtr _08129EDC: adds r0, r2, 0x5 @@ -3061,7 +3061,7 @@ _08129EE0: ContestAICmd_unk_4C: @ 8129EE4 push {lr} bl ContestAICmd_get_condition - ldr r0, _08129F14 @ =0x020192e4 + ldr r0, _08129F14 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08129F18 @ =gAIScriptPtr @@ -3082,7 +3082,7 @@ ContestAICmd_unk_4C: @ 8129EE4 str r1, [r3] b _08129F20 .align 2, 0 -_08129F14: .4byte 0x020192e4 +_08129F14: .4byte gSharedMem + 0x192E4 _08129F18: .4byte gAIScriptPtr _08129F1C: adds r0, r2, 0x5 @@ -3096,7 +3096,7 @@ _08129F20: ContestAICmd_unk_4D: @ 8129F24 push {lr} bl ContestAICmd_get_condition - ldr r0, _08129F54 @ =0x020192e4 + ldr r0, _08129F54 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08129F58 @ =gAIScriptPtr @@ -3117,7 +3117,7 @@ ContestAICmd_unk_4D: @ 8129F24 str r1, [r3] b _08129F60 .align 2, 0 -_08129F54: .4byte 0x020192e4 +_08129F54: .4byte gSharedMem + 0x192E4 _08129F58: .4byte gAIScriptPtr _08129F5C: adds r0, r2, 0x5 @@ -3146,7 +3146,7 @@ ContestAICmd_get_used_combo_starter: @ 8129F64 lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r1, _08129FB4 @ =0x02019260 + ldr r1, _08129FB4 @ =gSharedMem + 0x19260 adds r0, r1 ldrh r0, [r0, 0x8] lsls r0, 3 @@ -3156,7 +3156,7 @@ ContestAICmd_get_used_combo_starter: @ 8129F64 orrs r0, r1 lsrs r6, r0, 31 _08129F9C: - ldr r0, _08129FB8 @ =0x020192e4 + ldr r0, _08129FB8 @ =gSharedMem + 0x192E4 strh r6, [r0, 0x18] ldr r0, [r5] adds r0, 0x2 @@ -3167,15 +3167,15 @@ _08129F9C: .align 2, 0 _08129FAC: .4byte gAIScriptPtr _08129FB0: .4byte gContestMoves -_08129FB4: .4byte 0x02019260 -_08129FB8: .4byte 0x020192e4 +_08129FB4: .4byte gSharedMem + 0x19260 +_08129FB8: .4byte gSharedMem + 0x192E4 thumb_func_end ContestAICmd_get_used_combo_starter thumb_func_start ContestAICmd_unk_4F ContestAICmd_unk_4F: @ 8129FBC push {lr} bl ContestAICmd_get_used_combo_starter - ldr r0, _08129FEC @ =0x020192e4 + ldr r0, _08129FEC @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _08129FF0 @ =gAIScriptPtr @@ -3196,7 +3196,7 @@ ContestAICmd_unk_4F: @ 8129FBC str r1, [r3] b _08129FF8 .align 2, 0 -_08129FEC: .4byte 0x020192e4 +_08129FEC: .4byte gSharedMem + 0x192E4 _08129FF0: .4byte gAIScriptPtr _08129FF4: adds r0, r2, 0x5 @@ -3210,7 +3210,7 @@ _08129FF8: ContestAICmd_unk_50: @ 8129FFC push {lr} bl ContestAICmd_get_used_combo_starter - ldr r0, _0812A02C @ =0x020192e4 + ldr r0, _0812A02C @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A030 @ =gAIScriptPtr @@ -3231,7 +3231,7 @@ ContestAICmd_unk_50: @ 8129FFC str r1, [r3] b _0812A038 .align 2, 0 -_0812A02C: .4byte 0x020192e4 +_0812A02C: .4byte gSharedMem + 0x192E4 _0812A030: .4byte gAIScriptPtr _0812A034: adds r0, r2, 0x5 @@ -3245,7 +3245,7 @@ _0812A038: ContestAICmd_unk_51: @ 812A03C push {lr} bl ContestAICmd_get_used_combo_starter - ldr r0, _0812A06C @ =0x020192e4 + ldr r0, _0812A06C @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A070 @ =gAIScriptPtr @@ -3266,7 +3266,7 @@ ContestAICmd_unk_51: @ 812A03C str r1, [r3] b _0812A078 .align 2, 0 -_0812A06C: .4byte 0x020192e4 +_0812A06C: .4byte gSharedMem + 0x192E4 _0812A070: .4byte gAIScriptPtr _0812A074: adds r0, r2, 0x5 @@ -3280,7 +3280,7 @@ _0812A078: ContestAICmd_unk_52: @ 812A07C push {lr} bl ContestAICmd_get_used_combo_starter - ldr r0, _0812A0AC @ =0x020192e4 + ldr r0, _0812A0AC @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A0B0 @ =gAIScriptPtr @@ -3301,7 +3301,7 @@ ContestAICmd_unk_52: @ 812A07C str r1, [r3] b _0812A0B8 .align 2, 0 -_0812A0AC: .4byte 0x020192e4 +_0812A0AC: .4byte gSharedMem + 0x192E4 _0812A0B0: .4byte gAIScriptPtr _0812A0B4: adds r0, r2, 0x5 @@ -3324,14 +3324,14 @@ ContestAICmd_check_can_participate: @ 812A0BC lsls r0, 24 cmp r0, 0 beq _0812A0E4 - ldr r1, _0812A0E0 @ =0x020192e4 + ldr r1, _0812A0E0 @ =gSharedMem + 0x192E4 movs r0, 0 b _0812A0E8 .align 2, 0 _0812A0DC: .4byte gAIScriptPtr -_0812A0E0: .4byte 0x020192e4 +_0812A0E0: .4byte gSharedMem + 0x192E4 _0812A0E4: - ldr r1, _0812A0F8 @ =0x020192e4 + ldr r1, _0812A0F8 @ =gSharedMem + 0x192E4 movs r0, 0x1 _0812A0E8: strh r0, [r1, 0x18] @@ -3342,7 +3342,7 @@ _0812A0E8: pop {r0} bx r0 .align 2, 0 -_0812A0F8: .4byte 0x020192e4 +_0812A0F8: .4byte gSharedMem + 0x192E4 _0812A0FC: .4byte gAIScriptPtr thumb_func_end ContestAICmd_check_can_participate @@ -3350,7 +3350,7 @@ _0812A0FC: .4byte gAIScriptPtr ContestAICmd_unk_54: @ 812A100 push {lr} bl ContestAICmd_check_can_participate - ldr r0, _0812A12C @ =0x020192e4 + ldr r0, _0812A12C @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -3370,7 +3370,7 @@ ContestAICmd_unk_54: @ 812A100 str r1, [r3] b _0812A13C .align 2, 0 -_0812A12C: .4byte 0x020192e4 +_0812A12C: .4byte gSharedMem + 0x192E4 _0812A130: .4byte gAIScriptPtr _0812A134: ldr r1, _0812A140 @ =gAIScriptPtr @@ -3388,7 +3388,7 @@ _0812A140: .4byte gAIScriptPtr ContestAICmd_unk_55: @ 812A144 push {lr} bl ContestAICmd_check_can_participate - ldr r0, _0812A170 @ =0x020192e4 + ldr r0, _0812A170 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -3408,7 +3408,7 @@ ContestAICmd_unk_55: @ 812A144 str r1, [r3] b _0812A180 .align 2, 0 -_0812A170: .4byte 0x020192e4 +_0812A170: .4byte gSharedMem + 0x192E4 _0812A174: .4byte gAIScriptPtr _0812A178: ldr r1, _0812A184 @ =gAIScriptPtr @@ -3431,7 +3431,7 @@ ContestAICmd_get_val_812A188: @ 812A188 bl sub_8128A7C lsls r0, 24 lsrs r0, 24 - ldr r2, _0812A1C0 @ =0x020192e4 + ldr r2, _0812A1C0 @ =gSharedMem + 0x192E4 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -3450,14 +3450,14 @@ ContestAICmd_get_val_812A188: @ 812A188 bx r0 .align 2, 0 _0812A1BC: .4byte gAIScriptPtr -_0812A1C0: .4byte 0x020192e4 +_0812A1C0: .4byte gSharedMem + 0x192E4 thumb_func_end ContestAICmd_get_val_812A188 thumb_func_start ContestAICmd_unk_57 ContestAICmd_unk_57: @ 812A1C4 push {lr} bl ContestAICmd_get_val_812A188 - ldr r0, _0812A1F0 @ =0x020192e4 + ldr r0, _0812A1F0 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -3477,7 +3477,7 @@ ContestAICmd_unk_57: @ 812A1C4 str r1, [r3] b _0812A200 .align 2, 0 -_0812A1F0: .4byte 0x020192e4 +_0812A1F0: .4byte gSharedMem + 0x192E4 _0812A1F4: .4byte gAIScriptPtr _0812A1F8: ldr r1, _0812A204 @ =gAIScriptPtr @@ -3495,7 +3495,7 @@ _0812A204: .4byte gAIScriptPtr ContestAICmd_unk_58: @ 812A208 push {lr} bl ContestAICmd_get_val_812A188 - ldr r0, _0812A234 @ =0x020192e4 + ldr r0, _0812A234 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -3515,7 +3515,7 @@ ContestAICmd_unk_58: @ 812A208 str r1, [r3] b _0812A244 .align 2, 0 -_0812A234: .4byte 0x020192e4 +_0812A234: .4byte gSharedMem + 0x192E4 _0812A238: .4byte gAIScriptPtr _0812A23C: ldr r1, _0812A248 @ =gAIScriptPtr @@ -3538,7 +3538,7 @@ ContestAICmd_unk_59: @ 812A24C bl sub_8128A7C lsls r0, 24 lsrs r0, 24 - ldr r3, _0812A290 @ =0x020192e4 + ldr r3, _0812A290 @ =gSharedMem + 0x192E4 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -3564,14 +3564,14 @@ ContestAICmd_unk_59: @ 812A24C bx r0 .align 2, 0 _0812A28C: .4byte gAIScriptPtr -_0812A290: .4byte 0x020192e4 +_0812A290: .4byte gSharedMem + 0x192E4 thumb_func_end ContestAICmd_unk_59 thumb_func_start ContestAICmd_unk_5A ContestAICmd_unk_5A: @ 812A294 push {lr} bl ContestAICmd_unk_59 - ldr r0, _0812A2C0 @ =0x020192e4 + ldr r0, _0812A2C0 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -3591,7 +3591,7 @@ ContestAICmd_unk_5A: @ 812A294 str r1, [r3] b _0812A2D0 .align 2, 0 -_0812A2C0: .4byte 0x020192e4 +_0812A2C0: .4byte gSharedMem + 0x192E4 _0812A2C4: .4byte gAIScriptPtr _0812A2C8: ldr r1, _0812A2D4 @ =gAIScriptPtr @@ -3609,7 +3609,7 @@ _0812A2D4: .4byte gAIScriptPtr ContestAICmd_unk_5B: @ 812A2D8 push {lr} bl ContestAICmd_unk_59 - ldr r0, _0812A304 @ =0x020192e4 + ldr r0, _0812A304 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -3629,7 +3629,7 @@ ContestAICmd_unk_5B: @ 812A2D8 str r1, [r3] b _0812A314 .align 2, 0 -_0812A304: .4byte 0x020192e4 +_0812A304: .4byte gSharedMem + 0x192E4 _0812A308: .4byte gAIScriptPtr _0812A30C: ldr r1, _0812A318 @ =gAIScriptPtr @@ -3647,7 +3647,7 @@ _0812A318: .4byte gAIScriptPtr ContestAICmd_unk_5C: @ 812A31C push {lr} bl ContestAICmd_unk_59 - ldr r0, _0812A348 @ =0x020192e4 + ldr r0, _0812A348 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -3667,7 +3667,7 @@ ContestAICmd_unk_5C: @ 812A31C str r1, [r3] b _0812A358 .align 2, 0 -_0812A348: .4byte 0x020192e4 +_0812A348: .4byte gSharedMem + 0x192E4 _0812A34C: .4byte gAIScriptPtr _0812A350: ldr r1, _0812A35C @ =gAIScriptPtr @@ -3685,7 +3685,7 @@ _0812A35C: .4byte gAIScriptPtr ContestAICmd_unk_5D: @ 812A360 push {lr} bl ContestAICmd_unk_59 - ldr r0, _0812A38C @ =0x020192e4 + ldr r0, _0812A38C @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -3705,7 +3705,7 @@ ContestAICmd_unk_5D: @ 812A360 str r1, [r3] b _0812A39C .align 2, 0 -_0812A38C: .4byte 0x020192e4 +_0812A38C: .4byte gSharedMem + 0x192E4 _0812A390: .4byte gAIScriptPtr _0812A394: ldr r1, _0812A3A0 @ =gAIScriptPtr @@ -3727,7 +3727,7 @@ ContestAICmd_unk_5E: @ 812A3A4 ldrb r0, [r0, 0x1] bl sub_8128A7C lsls r0, 24 - ldr r3, _0812A3DC @ =0x020192e4 + ldr r3, _0812A3DC @ =gSharedMem + 0x192E4 ldr r2, _0812A3E0 @ =gUnknown_02038670 lsrs r0, 23 adds r0, r2 @@ -3748,7 +3748,7 @@ ContestAICmd_unk_5E: @ 812A3A4 bx r0 .align 2, 0 _0812A3D8: .4byte gAIScriptPtr -_0812A3DC: .4byte 0x020192e4 +_0812A3DC: .4byte gSharedMem + 0x192E4 _0812A3E0: .4byte gUnknown_02038670 thumb_func_end ContestAICmd_unk_5E @@ -3756,7 +3756,7 @@ _0812A3E0: .4byte gUnknown_02038670 ContestAICmd_unk_5F: @ 812A3E4 push {lr} bl ContestAICmd_unk_5E - ldr r0, _0812A410 @ =0x020192e4 + ldr r0, _0812A410 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -3776,7 +3776,7 @@ ContestAICmd_unk_5F: @ 812A3E4 str r1, [r3] b _0812A420 .align 2, 0 -_0812A410: .4byte 0x020192e4 +_0812A410: .4byte gSharedMem + 0x192E4 _0812A414: .4byte gAIScriptPtr _0812A418: ldr r1, _0812A424 @ =gAIScriptPtr @@ -3794,7 +3794,7 @@ _0812A424: .4byte gAIScriptPtr ContestAICmd_unk_60: @ 812A428 push {lr} bl ContestAICmd_unk_5E - ldr r0, _0812A454 @ =0x020192e4 + ldr r0, _0812A454 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -3814,7 +3814,7 @@ ContestAICmd_unk_60: @ 812A428 str r1, [r3] b _0812A464 .align 2, 0 -_0812A454: .4byte 0x020192e4 +_0812A454: .4byte gSharedMem + 0x192E4 _0812A458: .4byte gAIScriptPtr _0812A45C: ldr r1, _0812A468 @ =gAIScriptPtr @@ -3832,7 +3832,7 @@ _0812A468: .4byte gAIScriptPtr ContestAICmd_unk_61: @ 812A46C push {lr} bl ContestAICmd_unk_5E - ldr r0, _0812A498 @ =0x020192e4 + ldr r0, _0812A498 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -3852,7 +3852,7 @@ ContestAICmd_unk_61: @ 812A46C str r1, [r3] b _0812A4A8 .align 2, 0 -_0812A498: .4byte 0x020192e4 +_0812A498: .4byte gSharedMem + 0x192E4 _0812A49C: .4byte gAIScriptPtr _0812A4A0: ldr r1, _0812A4AC @ =gAIScriptPtr @@ -3870,7 +3870,7 @@ _0812A4AC: .4byte gAIScriptPtr ContestAICmd_unk_62: @ 812A4B0 push {lr} bl ContestAICmd_unk_5E - ldr r0, _0812A4DC @ =0x020192e4 + ldr r0, _0812A4DC @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -3890,7 +3890,7 @@ ContestAICmd_unk_62: @ 812A4B0 str r1, [r3] b _0812A4EC .align 2, 0 -_0812A4DC: .4byte 0x020192e4 +_0812A4DC: .4byte gSharedMem + 0x192E4 _0812A4E0: .4byte gAIScriptPtr _0812A4E4: ldr r1, _0812A4F0 @ =gAIScriptPtr @@ -3914,7 +3914,7 @@ ContestAICmd_unk_63: @ 812A4F4 lsls r0, 24 ldr r3, [r4] ldrb r1, [r3, 0x2] - ldr r2, _0812A530 @ =0x02019204 + ldr r2, _0812A530 @ =gSharedMem + 0x19204 lsrs r0, 23 lsls r1, 3 adds r0, r1 @@ -3935,7 +3935,7 @@ ContestAICmd_unk_63: @ 812A4F4 bx r0 .align 2, 0 _0812A52C: .4byte gAIScriptPtr -_0812A530: .4byte 0x02019204 +_0812A530: .4byte gSharedMem + 0x19204 _0812A534: .4byte gContestMoves thumb_func_end ContestAICmd_unk_63 @@ -3943,7 +3943,7 @@ _0812A534: .4byte gContestMoves ContestAICmd_unk_64: @ 812A538 push {lr} bl ContestAICmd_unk_63 - ldr r0, _0812A568 @ =0x020192e4 + ldr r0, _0812A568 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A56C @ =gAIScriptPtr @@ -3964,7 +3964,7 @@ ContestAICmd_unk_64: @ 812A538 str r1, [r3] b _0812A574 .align 2, 0 -_0812A568: .4byte 0x020192e4 +_0812A568: .4byte gSharedMem + 0x192E4 _0812A56C: .4byte gAIScriptPtr _0812A570: adds r0, r2, 0x5 @@ -3978,7 +3978,7 @@ _0812A574: ContestAICmd_unk_65: @ 812A578 push {lr} bl ContestAICmd_unk_63 - ldr r0, _0812A5A8 @ =0x020192e4 + ldr r0, _0812A5A8 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A5AC @ =gAIScriptPtr @@ -3999,7 +3999,7 @@ ContestAICmd_unk_65: @ 812A578 str r1, [r3] b _0812A5B4 .align 2, 0 -_0812A5A8: .4byte 0x020192e4 +_0812A5A8: .4byte gSharedMem + 0x192E4 _0812A5AC: .4byte gAIScriptPtr _0812A5B0: adds r0, r2, 0x5 @@ -4013,7 +4013,7 @@ _0812A5B4: ContestAICmd_unk_66: @ 812A5B8 push {lr} bl ContestAICmd_unk_63 - ldr r0, _0812A5E8 @ =0x020192e4 + ldr r0, _0812A5E8 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A5EC @ =gAIScriptPtr @@ -4034,7 +4034,7 @@ ContestAICmd_unk_66: @ 812A5B8 str r1, [r3] b _0812A5F4 .align 2, 0 -_0812A5E8: .4byte 0x020192e4 +_0812A5E8: .4byte gSharedMem + 0x192E4 _0812A5EC: .4byte gAIScriptPtr _0812A5F0: adds r0, r2, 0x5 @@ -4048,7 +4048,7 @@ _0812A5F4: ContestAICmd_unk_67: @ 812A5F8 push {lr} bl ContestAICmd_unk_63 - ldr r0, _0812A628 @ =0x020192e4 + ldr r0, _0812A628 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A62C @ =gAIScriptPtr @@ -4069,7 +4069,7 @@ ContestAICmd_unk_67: @ 812A5F8 str r1, [r3] b _0812A634 .align 2, 0 -_0812A628: .4byte 0x020192e4 +_0812A628: .4byte gSharedMem + 0x192E4 _0812A62C: .4byte gAIScriptPtr _0812A630: adds r0, r2, 0x5 @@ -4090,7 +4090,7 @@ ContestAICmd_unk_68: @ 812A638 lsrs r0, 24 ldr r3, [r4] ldrb r1, [r3, 0x2] - ldr r2, _0812A670 @ =0x02019204 + ldr r2, _0812A670 @ =gSharedMem + 0x19204 lsls r1, 2 adds r0, r1 adds r1, r2, 0 @@ -4108,14 +4108,14 @@ ContestAICmd_unk_68: @ 812A638 bx r0 .align 2, 0 _0812A66C: .4byte gAIScriptPtr -_0812A670: .4byte 0x02019204 +_0812A670: .4byte gSharedMem + 0x19204 thumb_func_end ContestAICmd_unk_68 thumb_func_start ContestAICmd_unk_69 ContestAICmd_unk_69: @ 812A674 push {lr} bl ContestAICmd_unk_68 - ldr r0, _0812A6A4 @ =0x020192e4 + ldr r0, _0812A6A4 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A6A8 @ =gAIScriptPtr @@ -4136,7 +4136,7 @@ ContestAICmd_unk_69: @ 812A674 str r1, [r3] b _0812A6B0 .align 2, 0 -_0812A6A4: .4byte 0x020192e4 +_0812A6A4: .4byte gSharedMem + 0x192E4 _0812A6A8: .4byte gAIScriptPtr _0812A6AC: adds r0, r2, 0x5 @@ -4150,7 +4150,7 @@ _0812A6B0: ContestAICmd_unk_6A: @ 812A6B4 push {lr} bl ContestAICmd_unk_68 - ldr r0, _0812A6E4 @ =0x020192e4 + ldr r0, _0812A6E4 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A6E8 @ =gAIScriptPtr @@ -4171,7 +4171,7 @@ ContestAICmd_unk_6A: @ 812A6B4 str r1, [r3] b _0812A6F0 .align 2, 0 -_0812A6E4: .4byte 0x020192e4 +_0812A6E4: .4byte gSharedMem + 0x192E4 _0812A6E8: .4byte gAIScriptPtr _0812A6EC: adds r0, r2, 0x5 @@ -4185,7 +4185,7 @@ _0812A6F0: ContestAICmd_unk_6B: @ 812A6F4 push {lr} bl ContestAICmd_unk_68 - ldr r0, _0812A724 @ =0x020192e4 + ldr r0, _0812A724 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A728 @ =gAIScriptPtr @@ -4206,7 +4206,7 @@ ContestAICmd_unk_6B: @ 812A6F4 str r1, [r3] b _0812A730 .align 2, 0 -_0812A724: .4byte 0x020192e4 +_0812A724: .4byte gSharedMem + 0x192E4 _0812A728: .4byte gAIScriptPtr _0812A72C: adds r0, r2, 0x5 @@ -4220,7 +4220,7 @@ _0812A730: ContestAICmd_unk_6C: @ 812A734 push {lr} bl ContestAICmd_unk_68 - ldr r0, _0812A764 @ =0x020192e4 + ldr r0, _0812A764 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A768 @ =gAIScriptPtr @@ -4241,7 +4241,7 @@ ContestAICmd_unk_6C: @ 812A734 str r1, [r3] b _0812A770 .align 2, 0 -_0812A764: .4byte 0x020192e4 +_0812A764: .4byte gSharedMem + 0x192E4 _0812A768: .4byte gAIScriptPtr _0812A76C: adds r0, r2, 0x5 @@ -4261,7 +4261,7 @@ ContestAICmd_unk_6D: @ 812A774 lsls r0, 24 ldr r3, [r5] ldrb r1, [r3, 0x2] - ldr r2, _0812A7B8 @ =0x02019204 + ldr r2, _0812A7B8 @ =gSharedMem + 0x19204 lsrs r0, 23 lsls r1, 3 adds r0, r1 @@ -4286,7 +4286,7 @@ ContestAICmd_unk_6D: @ 812A774 bx r0 .align 2, 0 _0812A7B4: .4byte gAIScriptPtr -_0812A7B8: .4byte 0x02019204 +_0812A7B8: .4byte gSharedMem + 0x19204 _0812A7BC: .4byte gContestEffects _0812A7C0: .4byte gContestMoves thumb_func_end ContestAICmd_unk_6D @@ -4295,7 +4295,7 @@ _0812A7C0: .4byte gContestMoves ContestAICmd_unk_6E: @ 812A7C4 push {lr} bl ContestAICmd_unk_6D - ldr r0, _0812A7F4 @ =0x020192e4 + ldr r0, _0812A7F4 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A7F8 @ =gAIScriptPtr @@ -4316,7 +4316,7 @@ ContestAICmd_unk_6E: @ 812A7C4 str r1, [r3] b _0812A800 .align 2, 0 -_0812A7F4: .4byte 0x020192e4 +_0812A7F4: .4byte gSharedMem + 0x192E4 _0812A7F8: .4byte gAIScriptPtr _0812A7FC: adds r0, r2, 0x5 @@ -4330,7 +4330,7 @@ _0812A800: ContestAICmd_unk_6F: @ 812A804 push {lr} bl ContestAICmd_unk_6D - ldr r0, _0812A834 @ =0x020192e4 + ldr r0, _0812A834 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] ldr r3, _0812A838 @ =gAIScriptPtr @@ -4351,7 +4351,7 @@ ContestAICmd_unk_6F: @ 812A804 str r1, [r3] b _0812A840 .align 2, 0 -_0812A834: .4byte 0x020192e4 +_0812A834: .4byte gSharedMem + 0x192E4 _0812A838: .4byte gAIScriptPtr _0812A83C: adds r0, r2, 0x5 @@ -4364,7 +4364,7 @@ _0812A840: thumb_func_start ContestAICmd_unk_70 ContestAICmd_unk_70: @ 812A844 push {r4,lr} - ldr r3, _0812A864 @ =0x020192e4 + ldr r3, _0812A864 @ =gSharedMem + 0x192E4 ldr r4, _0812A868 @ =gAIScriptPtr ldr r2, [r4] ldrb r0, [r2, 0x1] @@ -4380,14 +4380,14 @@ ContestAICmd_unk_70: @ 812A844 pop {r0} bx r0 .align 2, 0 -_0812A864: .4byte 0x020192e4 +_0812A864: .4byte gSharedMem + 0x192E4 _0812A868: .4byte gAIScriptPtr thumb_func_end ContestAICmd_unk_70 thumb_func_start ContestAICmd_unk_71 ContestAICmd_unk_71: @ 812A86C push {r4,lr} - ldr r0, _0812A890 @ =0x020192e4 + ldr r0, _0812A890 @ =gSharedMem + 0x192E4 ldr r4, _0812A894 @ =gAIScriptPtr ldr r3, [r4] ldrb r2, [r3, 0x1] @@ -4405,14 +4405,14 @@ ContestAICmd_unk_71: @ 812A86C pop {r0} bx r0 .align 2, 0 -_0812A890: .4byte 0x020192e4 +_0812A890: .4byte gSharedMem + 0x192E4 _0812A894: .4byte gAIScriptPtr thumb_func_end ContestAICmd_unk_71 thumb_func_start ContestAICmd_unk_72 ContestAICmd_unk_72: @ 812A898 push {r4,lr} - ldr r0, _0812A8C4 @ =0x020192e4 + ldr r0, _0812A8C4 @ =gSharedMem + 0x192E4 ldr r4, _0812A8C8 @ =gAIScriptPtr ldr r3, [r4] ldrb r2, [r3, 0x1] @@ -4433,14 +4433,14 @@ ContestAICmd_unk_72: @ 812A898 pop {r0} bx r0 .align 2, 0 -_0812A8C4: .4byte 0x020192e4 +_0812A8C4: .4byte gSharedMem + 0x192E4 _0812A8C8: .4byte gAIScriptPtr thumb_func_end ContestAICmd_unk_72 thumb_func_start ContestAICmd_unk_73 ContestAICmd_unk_73: @ 812A8CC push {r4,lr} - ldr r2, _0812A8F4 @ =0x020192e4 + ldr r2, _0812A8F4 @ =gSharedMem + 0x192E4 ldr r4, _0812A8F8 @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3, 0x1] @@ -4460,14 +4460,14 @@ ContestAICmd_unk_73: @ 812A8CC pop {r0} bx r0 .align 2, 0 -_0812A8F4: .4byte 0x020192e4 +_0812A8F4: .4byte gSharedMem + 0x192E4 _0812A8F8: .4byte gAIScriptPtr thumb_func_end ContestAICmd_unk_73 thumb_func_start ContestAICmd_unk_74 ContestAICmd_unk_74: @ 812A8FC push {r4,lr} - ldr r2, _0812A924 @ =0x020192e4 + ldr r2, _0812A924 @ =gSharedMem + 0x192E4 ldr r4, _0812A928 @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3, 0x1] @@ -4487,14 +4487,14 @@ ContestAICmd_unk_74: @ 812A8FC pop {r0} bx r0 .align 2, 0 -_0812A924: .4byte 0x020192e4 +_0812A924: .4byte gSharedMem + 0x192E4 _0812A928: .4byte gAIScriptPtr thumb_func_end ContestAICmd_unk_74 thumb_func_start ContestAICmd_unk_75 ContestAICmd_unk_75: @ 812A92C push {r4,lr} - ldr r1, _0812A964 @ =0x020192e4 + ldr r1, _0812A964 @ =gSharedMem + 0x192E4 ldr r4, _0812A968 @ =gAIScriptPtr ldr r3, [r4] ldrb r0, [r3, 0x1] @@ -4522,7 +4522,7 @@ ContestAICmd_unk_75: @ 812A92C str r1, [r4] b _0812A972 .align 2, 0 -_0812A964: .4byte 0x020192e4 +_0812A964: .4byte gSharedMem + 0x192E4 _0812A968: .4byte gAIScriptPtr _0812A96C: adds r0, r3, 0 @@ -4537,7 +4537,7 @@ _0812A972: thumb_func_start ContestAICmd_unk_76 ContestAICmd_unk_76: @ 812A978 push {r4,lr} - ldr r1, _0812A9B0 @ =0x020192e4 + ldr r1, _0812A9B0 @ =gSharedMem + 0x192E4 ldr r4, _0812A9B4 @ =gAIScriptPtr ldr r3, [r4] ldrb r0, [r3, 0x1] @@ -4565,7 +4565,7 @@ ContestAICmd_unk_76: @ 812A978 str r1, [r4] b _0812A9BE .align 2, 0 -_0812A9B0: .4byte 0x020192e4 +_0812A9B0: .4byte gSharedMem + 0x192E4 _0812A9B4: .4byte gAIScriptPtr _0812A9B8: adds r0, r3, 0 @@ -4580,7 +4580,7 @@ _0812A9BE: thumb_func_start ContestAICmd_unk_77 ContestAICmd_unk_77: @ 812A9C4 push {r4,lr} - ldr r1, _0812A9FC @ =0x020192e4 + ldr r1, _0812A9FC @ =gSharedMem + 0x192E4 ldr r4, _0812AA00 @ =gAIScriptPtr ldr r3, [r4] ldrb r0, [r3, 0x1] @@ -4608,7 +4608,7 @@ ContestAICmd_unk_77: @ 812A9C4 str r1, [r4] b _0812AA0A .align 2, 0 -_0812A9FC: .4byte 0x020192e4 +_0812A9FC: .4byte gSharedMem + 0x192E4 _0812AA00: .4byte gAIScriptPtr _0812AA04: adds r0, r3, 0 @@ -4623,7 +4623,7 @@ _0812AA0A: thumb_func_start ContestAICmd_unk_78 ContestAICmd_unk_78: @ 812AA10 push {r4,lr} - ldr r1, _0812AA48 @ =0x020192e4 + ldr r1, _0812AA48 @ =gSharedMem + 0x192E4 ldr r4, _0812AA4C @ =gAIScriptPtr ldr r3, [r4] ldrb r0, [r3, 0x1] @@ -4651,7 +4651,7 @@ ContestAICmd_unk_78: @ 812AA10 str r1, [r4] b _0812AA56 .align 2, 0 -_0812AA48: .4byte 0x020192e4 +_0812AA48: .4byte gSharedMem + 0x192E4 _0812AA4C: .4byte gAIScriptPtr _0812AA50: adds r0, r3, 0 @@ -4666,7 +4666,7 @@ _0812AA56: thumb_func_start ContestAICmd_unk_79 ContestAICmd_unk_79: @ 812AA5C push {r4,lr} - ldr r2, _0812AA98 @ =0x020192e4 + ldr r2, _0812AA98 @ =gSharedMem + 0x192E4 ldr r4, _0812AA9C @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3, 0x1] @@ -4695,7 +4695,7 @@ ContestAICmd_unk_79: @ 812AA5C str r1, [r4] b _0812AAA4 .align 2, 0 -_0812AA98: .4byte 0x020192e4 +_0812AA98: .4byte gSharedMem + 0x192E4 _0812AA9C: .4byte gAIScriptPtr _0812AAA0: adds r0, r3, 0x7 @@ -4709,7 +4709,7 @@ _0812AAA4: thumb_func_start ContestAICmd_unk_7A ContestAICmd_unk_7A: @ 812AAAC push {r4,lr} - ldr r2, _0812AAE8 @ =0x020192e4 + ldr r2, _0812AAE8 @ =gSharedMem + 0x192E4 ldr r4, _0812AAEC @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3, 0x1] @@ -4738,7 +4738,7 @@ ContestAICmd_unk_7A: @ 812AAAC str r1, [r4] b _0812AAF4 .align 2, 0 -_0812AAE8: .4byte 0x020192e4 +_0812AAE8: .4byte gSharedMem + 0x192E4 _0812AAEC: .4byte gAIScriptPtr _0812AAF0: adds r0, r3, 0x7 @@ -4752,7 +4752,7 @@ _0812AAF4: thumb_func_start ContestAICmd_unk_7B ContestAICmd_unk_7B: @ 812AAFC push {r4,lr} - ldr r2, _0812AB38 @ =0x020192e4 + ldr r2, _0812AB38 @ =gSharedMem + 0x192E4 ldr r4, _0812AB3C @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3, 0x1] @@ -4781,7 +4781,7 @@ ContestAICmd_unk_7B: @ 812AAFC str r1, [r4] b _0812AB44 .align 2, 0 -_0812AB38: .4byte 0x020192e4 +_0812AB38: .4byte gSharedMem + 0x192E4 _0812AB3C: .4byte gAIScriptPtr _0812AB40: adds r0, r3, 0x7 @@ -4795,7 +4795,7 @@ _0812AB44: thumb_func_start ContestAICmd_unk_7C ContestAICmd_unk_7C: @ 812AB4C push {r4,lr} - ldr r2, _0812AB88 @ =0x020192e4 + ldr r2, _0812AB88 @ =gSharedMem + 0x192E4 ldr r4, _0812AB8C @ =gAIScriptPtr ldr r3, [r4] ldrb r1, [r3, 0x1] @@ -4824,7 +4824,7 @@ ContestAICmd_unk_7C: @ 812AB4C str r1, [r4] b _0812AB94 .align 2, 0 -_0812AB88: .4byte 0x020192e4 +_0812AB88: .4byte gSharedMem + 0x192E4 _0812AB8C: .4byte gAIScriptPtr _0812AB90: adds r0, r3, 0x7 @@ -4841,7 +4841,7 @@ ContestAICmd_unk_7D: @ 812AB9C bl Random movs r2, 0xFF ands r2, r0 - ldr r1, _0812ABD4 @ =0x020192e4 + ldr r1, _0812ABD4 @ =gSharedMem + 0x192E4 ldr r4, _0812ABD8 @ =gAIScriptPtr ldr r3, [r4] ldrb r0, [r3, 0x1] @@ -4865,7 +4865,7 @@ ContestAICmd_unk_7D: @ 812AB9C str r1, [r4] b _0812ABE0 .align 2, 0 -_0812ABD4: .4byte 0x020192e4 +_0812ABD4: .4byte gSharedMem + 0x192E4 _0812ABD8: .4byte gAIScriptPtr _0812ABDC: adds r0, r3, 0x6 @@ -4882,7 +4882,7 @@ ContestAICmd_unk_7E: @ 812ABE8 bl Random movs r2, 0xFF ands r2, r0 - ldr r1, _0812AC20 @ =0x020192e4 + ldr r1, _0812AC20 @ =gSharedMem + 0x192E4 ldr r4, _0812AC24 @ =gAIScriptPtr ldr r3, [r4] ldrb r0, [r3, 0x1] @@ -4906,7 +4906,7 @@ ContestAICmd_unk_7E: @ 812ABE8 str r1, [r4] b _0812AC2C .align 2, 0 -_0812AC20: .4byte 0x020192e4 +_0812AC20: .4byte gSharedMem + 0x192E4 _0812AC24: .4byte gAIScriptPtr _0812AC28: adds r0, r3, 0x6 @@ -4970,7 +4970,7 @@ ContestAICmd_unk_81: @ 812AC84 lsls r0, 24 cmp r0, 0 bne _0812AC9A - ldr r2, _0812ACA0 @ =0x020192e4 + ldr r2, _0812ACA0 @ =gSharedMem + 0x192E4 ldrb r1, [r2, 0x9] movs r0, 0x1 orrs r0, r1 @@ -4979,13 +4979,13 @@ _0812AC9A: pop {r0} bx r0 .align 2, 0 -_0812ACA0: .4byte 0x020192e4 +_0812ACA0: .4byte gSharedMem + 0x192E4 thumb_func_end ContestAICmd_unk_81 thumb_func_start sub_812ACA4 sub_812ACA4: @ 812ACA4 push {r4,lr} - ldr r3, _0812ACC4 @ =0x020192e4 + ldr r3, _0812ACC4 @ =gSharedMem + 0x192E4 adds r4, r3, 0 adds r4, 0x40 ldrb r1, [r4] @@ -5000,13 +5000,13 @@ sub_812ACA4: @ 812ACA4 pop {r0} bx r0 .align 2, 0 -_0812ACC4: .4byte 0x020192e4 +_0812ACC4: .4byte gSharedMem + 0x192E4 thumb_func_end sub_812ACA4 thumb_func_start sub_812ACC8 sub_812ACC8: @ 812ACC8 push {lr} - ldr r1, _0812ACDC @ =0x020192e4 + ldr r1, _0812ACDC @ =gSharedMem + 0x192E4 adds r3, r1, 0 adds r3, 0x40 ldrb r0, [r3] @@ -5015,7 +5015,7 @@ sub_812ACC8: @ 812ACC8 movs r0, 0 b _0812ACF4 .align 2, 0 -_0812ACDC: .4byte 0x020192e4 +_0812ACDC: .4byte gSharedMem + 0x192E4 _0812ACE0: subs r0, 0x1 strb r0, [r3] @@ -5039,7 +5039,7 @@ ContestAICmd_check_for_exciting_move: @ 812ACFC push {r4-r7,lr} movs r5, 0 movs r4, 0 - ldr r7, _0812AD28 @ =0x02019325 + ldr r7, _0812AD28 @ =gSharedMem + 0x19325 ldr r6, _0812AD2C @ =gUnknown_0203858E _0812AD06: lsls r0, r4, 1 @@ -5058,14 +5058,14 @@ _0812AD06: movs r5, 0x1 b _0812AD36 .align 2, 0 -_0812AD28: .4byte 0x02019325 +_0812AD28: .4byte gSharedMem + 0x19325 _0812AD2C: .4byte gUnknown_0203858E _0812AD30: adds r4, 0x1 cmp r4, 0x3 ble _0812AD06 _0812AD36: - ldr r0, _0812AD48 @ =0x020192e4 + ldr r0, _0812AD48 @ =gSharedMem + 0x192E4 strh r5, [r0, 0x18] ldr r1, _0812AD4C @ =gAIScriptPtr ldr r0, [r1] @@ -5075,7 +5075,7 @@ _0812AD36: pop {r0} bx r0 .align 2, 0 -_0812AD48: .4byte 0x020192e4 +_0812AD48: .4byte gSharedMem + 0x192E4 _0812AD4C: .4byte gAIScriptPtr thumb_func_end ContestAICmd_check_for_exciting_move @@ -5083,7 +5083,7 @@ _0812AD4C: .4byte gAIScriptPtr ContestAICmd_unk_83: @ 812AD50 push {lr} bl ContestAICmd_check_for_exciting_move - ldr r0, _0812AD7C @ =0x020192e4 + ldr r0, _0812AD7C @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -5103,7 +5103,7 @@ ContestAICmd_unk_83: @ 812AD50 str r1, [r3] b _0812AD8C .align 2, 0 -_0812AD7C: .4byte 0x020192e4 +_0812AD7C: .4byte gSharedMem + 0x192E4 _0812AD80: .4byte gAIScriptPtr _0812AD84: ldr r1, _0812AD90 @ =gAIScriptPtr @@ -5121,7 +5121,7 @@ _0812AD90: .4byte gAIScriptPtr ContestAICmd_unk_84: @ 812AD94 push {lr} bl ContestAICmd_check_for_exciting_move - ldr r0, _0812ADC0 @ =0x020192e4 + ldr r0, _0812ADC0 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -5141,7 +5141,7 @@ ContestAICmd_unk_84: @ 812AD94 str r1, [r3] b _0812ADD0 .align 2, 0 -_0812ADC0: .4byte 0x020192e4 +_0812ADC0: .4byte gSharedMem + 0x192E4 _0812ADC4: .4byte gAIScriptPtr _0812ADC8: ldr r1, _0812ADD4 @ =gAIScriptPtr @@ -5168,7 +5168,7 @@ ContestAICmd_unk_85: @ 812ADD8 movs r3, 0 ldr r0, _0812AE0C @ =gContestMons mov r12, r0 - ldr r5, _0812AE10 @ =0x020192e4 + ldr r5, _0812AE10 @ =gSharedMem + 0x192E4 adds r0, r5, 0 adds r0, 0x41 ldrb r0, [r0] @@ -5184,7 +5184,7 @@ ContestAICmd_unk_85: @ 812ADD8 .align 2, 0 _0812AE08: .4byte gAIScriptPtr _0812AE0C: .4byte gContestMons -_0812AE10: .4byte 0x020192e4 +_0812AE10: .4byte gSharedMem + 0x192E4 _0812AE14: adds r3, 0x1 cmp r3, 0x3 @@ -5218,7 +5218,7 @@ _0812AE34: ContestAICmd_unk_86: @ 812AE44 push {lr} bl ContestAICmd_unk_85 - ldr r0, _0812AE70 @ =0x020192e4 + ldr r0, _0812AE70 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -5238,7 +5238,7 @@ ContestAICmd_unk_86: @ 812AE44 str r1, [r3] b _0812AE80 .align 2, 0 -_0812AE70: .4byte 0x020192e4 +_0812AE70: .4byte gSharedMem + 0x192E4 _0812AE74: .4byte gAIScriptPtr _0812AE78: ldr r1, _0812AE84 @ =gAIScriptPtr @@ -5256,7 +5256,7 @@ _0812AE84: .4byte gAIScriptPtr ContestAICmd_unk_87: @ 812AE88 push {lr} bl ContestAICmd_unk_85 - ldr r0, _0812AEB4 @ =0x020192e4 + ldr r0, _0812AEB4 @ =gSharedMem + 0x192E4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 @@ -5276,7 +5276,7 @@ ContestAICmd_unk_87: @ 812AE88 str r1, [r3] b _0812AEC4 .align 2, 0 -_0812AEB4: .4byte 0x020192e4 +_0812AEB4: .4byte gSharedMem + 0x192E4 _0812AEB8: .4byte gAIScriptPtr _0812AEBC: ldr r1, _0812AEC8 @ =gAIScriptPtr diff --git a/asm/contest_effect.s b/asm/contest_effect.s index 4ae5c7e41..63cae8c82 100644 --- a/asm/contest_effect.s +++ b/asm/contest_effect.s @@ -70,7 +70,7 @@ ContestEffect_00: @ 80B7D8C thumb_func_start ContestEffect_01 ContestEffect_01: @ 80B7D90 push {lr} - ldr r3, _080B7DB8 @ =0x020192d0 + ldr r3, _080B7DB8 @ =gSharedMem + 0x192D0 ldrb r1, [r3, 0x11] lsls r0, r1, 3 subs r0, r1 @@ -88,13 +88,13 @@ ContestEffect_01: @ 80B7D90 pop {r0} bx r0 .align 2, 0 -_080B7DB8: .4byte 0x020192d0 +_080B7DB8: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_01 thumb_func_start ContestEffect_02 ContestEffect_02: @ 80B7DBC push {lr} - ldr r3, _080B7DE4 @ =0x020192d0 + ldr r3, _080B7DE4 @ =gSharedMem + 0x192D0 ldrb r1, [r3, 0x11] lsls r0, r1, 3 subs r0, r1 @@ -112,13 +112,13 @@ ContestEffect_02: @ 80B7DBC pop {r0} bx r0 .align 2, 0 -_080B7DE4: .4byte 0x020192d0 +_080B7DE4: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_02 thumb_func_start ContestEffect_03 ContestEffect_03: @ 80B7DE8 push {r4,lr} - ldr r3, _080B7E30 @ =0x020192d0 + ldr r3, _080B7E30 @ =gSharedMem + 0x192D0 ldrb r1, [r3, 0x11] lsls r0, r1, 3 subs r0, r1 @@ -154,13 +154,13 @@ ContestEffect_03: @ 80B7DE8 pop {r0} bx r0 .align 2, 0 -_080B7E30: .4byte 0x020192d0 +_080B7E30: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_03 thumb_func_start ContestEffect_04 ContestEffect_04: @ 80B7E34 push {lr} - ldr r2, _080B7E58 @ =0x020192d0 + ldr r2, _080B7E58 @ =gSharedMem + 0x192D0 ldrb r1, [r2, 0x11] lsls r0, r1, 3 subs r0, r1 @@ -176,13 +176,13 @@ ContestEffect_04: @ 80B7E34 pop {r0} bx r0 .align 2, 0 -_080B7E58: .4byte 0x020192d0 +_080B7E58: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_04 thumb_func_start ContestEffect_05 ContestEffect_05: @ 80B7E5C push {lr} - ldr r3, _080B7E84 @ =0x020192d0 + ldr r3, _080B7E84 @ =gSharedMem + 0x192D0 ldrb r1, [r3, 0x11] lsls r0, r1, 3 subs r0, r1 @@ -200,13 +200,13 @@ ContestEffect_05: @ 80B7E5C pop {r0} bx r0 .align 2, 0 -_080B7E84: .4byte 0x020192d0 +_080B7E84: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_05 thumb_func_start ContestEffect_06 ContestEffect_06: @ 80B7E88 push {lr} - ldr r2, _080B7EAC @ =0x020192d0 + ldr r2, _080B7EAC @ =gSharedMem + 0x192D0 ldrb r1, [r2, 0x11] lsls r0, r1, 3 subs r0, r1 @@ -222,13 +222,13 @@ ContestEffect_06: @ 80B7E88 pop {r0} bx r0 .align 2, 0 -_080B7EAC: .4byte 0x020192d0 +_080B7EAC: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_06 thumb_func_start ContestEffect_07 ContestEffect_07: @ 80B7EB0 push {lr} - ldr r3, _080B7ED8 @ =0x020192d0 + ldr r3, _080B7ED8 @ =gSharedMem + 0x192D0 ldrb r1, [r3, 0x11] lsls r0, r1, 3 subs r0, r1 @@ -246,14 +246,14 @@ ContestEffect_07: @ 80B7EB0 pop {r0} bx r0 .align 2, 0 -_080B7ED8: .4byte 0x020192d0 +_080B7ED8: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_07 thumb_func_start ContestEffect_08 ContestEffect_08: @ 80B7EDC push {r4,lr} movs r2, 0 - ldr r3, _080B7F38 @ =0x020192d0 + ldr r3, _080B7F38 @ =gSharedMem + 0x192D0 ldrb r0, [r3, 0x11] adds r1, r0, r3 ldrb r0, [r1] @@ -276,7 +276,7 @@ _080B7EF8: cmp r0, r1 bne _080B7EF8 _080B7F0A: - ldr r1, _080B7F38 @ =0x020192d0 + ldr r1, _080B7F38 @ =gSharedMem + 0x192D0 strb r2, [r1, 0x8] movs r0, 0xFF strb r0, [r1, 0x9] @@ -286,12 +286,12 @@ _080B7F0A: _080B7F1A: cmp r2, 0 bne _080B7F28 - ldr r0, _080B7F38 @ =0x020192d0 + ldr r0, _080B7F38 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80B1404 _080B7F28: - ldr r0, _080B7F38 @ =0x020192d0 + ldr r0, _080B7F38 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x30 bl sub_80B13EC @@ -299,14 +299,14 @@ _080B7F28: pop {r0} bx r0 .align 2, 0 -_080B7F38: .4byte 0x020192d0 +_080B7F38: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_08 thumb_func_start ContestEffect_09 ContestEffect_09: @ 80B7F3C push {r4-r6,lr} movs r2, 0 - ldr r1, _080B7F9C @ =0x020192d0 + ldr r1, _080B7F9C @ =gSharedMem + 0x192D0 ldrb r0, [r1, 0x11] adds r4, r0, r1 ldrb r0, [r4] @@ -329,7 +329,7 @@ _080B7F64: adds r2, 0x1 cmp r2, 0x3 ble _080B7F54 - ldr r0, _080B7F9C @ =0x020192d0 + ldr r0, _080B7F9C @ =gSharedMem + 0x192D0 adds r0, 0x8 adds r0, r3, r0 movs r1, 0xFF @@ -340,12 +340,12 @@ _080B7F64: _080B7F7C: cmp r2, 0 bne _080B7F8A - ldr r0, _080B7F9C @ =0x020192d0 + ldr r0, _080B7F9C @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80B1404 _080B7F8A: - ldr r0, _080B7F9C @ =0x020192d0 + ldr r0, _080B7F9C @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x30 bl sub_80B13EC @@ -353,7 +353,7 @@ _080B7F8A: pop {r0} bx r0 .align 2, 0 -_080B7F9C: .4byte 0x020192d0 +_080B7F9C: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_09 thumb_func_start ContestEffect_14 @@ -374,13 +374,13 @@ ContestEffect_14: @ 80B7FA0 bhi _080B7FC2 movs r1, 0x28 _080B7FC2: - ldr r0, _080B7FD0 @ =0x020192d0 + ldr r0, _080B7FD0 @ =gSharedMem + 0x192D0 strh r1, [r0, 0x4] bl ContestEffect_08 pop {r0} bx r0 .align 2, 0 -_080B7FD0: .4byte 0x020192d0 +_080B7FD0: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_14 thumb_func_start ContestEffect_15 @@ -389,7 +389,7 @@ ContestEffect_15: @ 80B7FD4 mov r7, r8 push {r7} movs r7, 0 - ldr r0, _080B806C @ =0x020192d0 + ldr r0, _080B806C @ =gSharedMem + 0x192D0 ldrb r6, [r0, 0x11] adds r1, r6, r0 ldrb r1, [r1] @@ -462,7 +462,7 @@ _080B8062: pop {r0} bx r0 .align 2, 0 -_080B806C: .4byte 0x020192d0 +_080B806C: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_15 thumb_func_start ContestEffect_16 @@ -474,7 +474,7 @@ ContestEffect_16: @ 80B8070 push {r5-r7} movs r0, 0 mov r9, r0 - ldr r0, _080B8108 @ =0x020192d0 + ldr r0, _080B8108 @ =gSharedMem + 0x192D0 ldrb r7, [r0, 0x11] adds r1, r7, r0 ldrb r1, [r1] @@ -544,7 +544,7 @@ _080B80FA: pop {r0} bx r0 .align 2, 0 -_080B8108: .4byte 0x020192d0 +_080B8108: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_16 thumb_func_start ContestEffect_17 @@ -555,7 +555,7 @@ ContestEffect_17: @ 80B810C push {r6,r7} movs r0, 0 mov r9, r0 - ldr r0, _080B8150 @ =0x020192d0 + ldr r0, _080B8150 @ =gSharedMem + 0x192D0 ldrb r1, [r0, 0x11] mov r8, r1 adds r1, r0 @@ -585,7 +585,7 @@ _080B812E: movs r0, 0x32 b _080B8156 .align 2, 0 -_080B8150: .4byte 0x020192d0 +_080B8150: .4byte gSharedMem + 0x192D0 _080B8154: movs r0, 0xA _080B8156: @@ -605,7 +605,7 @@ _080B8156: _080B8172: adds r7, 0x1C adds r5, 0x1 - ldr r6, _080B81A0 @ =0x020192d0 + ldr r6, _080B81A0 @ =gSharedMem + 0x192D0 cmp r5, 0x3 ble _080B812E _080B817C: @@ -626,13 +626,13 @@ _080B8192: pop {r0} bx r0 .align 2, 0 -_080B81A0: .4byte 0x020192d0 +_080B81A0: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_17 thumb_func_start ContestEffect_18 ContestEffect_18: @ 80B81A4 push {r4,lr} - ldr r4, _080B81D0 @ =0x020192d0 + ldr r4, _080B81D0 @ =gSharedMem + 0x192D0 ldrb r1, [r4, 0x11] lsls r0, r1, 3 subs r0, r1 @@ -652,13 +652,13 @@ ContestEffect_18: @ 80B81A4 pop {r0} bx r0 .align 2, 0 -_080B81D0: .4byte 0x020192d0 +_080B81D0: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_18 thumb_func_start ContestEffect_19 ContestEffect_19: @ 80B81D4 push {r4,lr} - ldr r4, _080B8208 @ =0x020192d0 + ldr r4, _080B8208 @ =gSharedMem + 0x192D0 ldrb r1, [r4, 0x11] lsls r0, r1, 3 subs r0, r1 @@ -681,7 +681,7 @@ ContestEffect_19: @ 80B81D4 pop {r0} bx r0 .align 2, 0 -_080B8208: .4byte 0x020192d0 +_080B8208: .4byte gSharedMem + 0x192D0 _080B820C: .4byte gContestMoves thumb_func_end ContestEffect_19 @@ -690,14 +690,14 @@ ContestEffect_20: @ 80B8210 push {lr} movs r0, 0 bl sub_80B9038 - ldr r0, _080B8228 @ =0x020192d0 + ldr r0, _080B8228 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x30 bl sub_80B13EC pop {r0} bx r0 .align 2, 0 -_080B8228: .4byte 0x020192d0 +_080B8228: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_20 thumb_func_start ContestEffect_21 @@ -705,14 +705,14 @@ ContestEffect_21: @ 80B822C push {lr} movs r0, 0x1 bl sub_80B9038 - ldr r0, _080B8244 @ =0x020192d0 + ldr r0, _080B8244 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x30 bl sub_80B13EC pop {r0} bx r0 .align 2, 0 -_080B8244: .4byte 0x020192d0 +_080B8244: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_21 thumb_func_start ContestEffect_22 @@ -720,14 +720,14 @@ ContestEffect_22: @ 80B8248 push {lr} movs r0, 0x2 bl sub_80B9038 - ldr r0, _080B8260 @ =0x020192d0 + ldr r0, _080B8260 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x30 bl sub_80B13EC pop {r0} bx r0 .align 2, 0 -_080B8260: .4byte 0x020192d0 +_080B8260: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_22 thumb_func_start ContestEffect_23 @@ -735,14 +735,14 @@ ContestEffect_23: @ 80B8264 push {lr} movs r0, 0x3 bl sub_80B9038 - ldr r0, _080B827C @ =0x020192d0 + ldr r0, _080B827C @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x30 bl sub_80B13EC pop {r0} bx r0 .align 2, 0 -_080B827C: .4byte 0x020192d0 +_080B827C: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_23 thumb_func_start ContestEffect_24 @@ -750,21 +750,21 @@ ContestEffect_24: @ 80B8280 push {lr} movs r0, 0x4 bl sub_80B9038 - ldr r0, _080B8298 @ =0x020192d0 + ldr r0, _080B8298 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x30 bl sub_80B13EC pop {r0} bx r0 .align 2, 0 -_080B8298: .4byte 0x020192d0 +_080B8298: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_24 thumb_func_start ContestEffect_25 ContestEffect_25: @ 80B829C push {r4-r7,lr} movs r4, 0 - ldr r0, _080B82E0 @ =0x020192d0 + ldr r0, _080B82E0 @ =gSharedMem + 0x192D0 ldrb r1, [r0, 0x11] adds r1, r0 ldrb r1, [r1] @@ -795,7 +795,7 @@ _080B82B2: movs r1, 0xA b _080B82E8 .align 2, 0 -_080B82E0: .4byte 0x020192d0 +_080B82E0: .4byte gSharedMem + 0x192D0 _080B82E4: adds r0, r4, 0 movs r1, 0x3C @@ -843,7 +843,7 @@ ContestEffect_26: @ 80B8310 mov r8, r2 add r3, sp, 0x8 mov r10, r3 - ldr r5, _080B8384 @ =0x020192d0 + ldr r5, _080B8384 @ =gSharedMem + 0x192D0 adds r7, r5, 0 subs r7, 0x70 _080B8340: @@ -881,7 +881,7 @@ _080B836E: strh r0, [r2] b _080B83B6 .align 2, 0 -_080B8384: .4byte 0x020192d0 +_080B8384: .4byte gSharedMem + 0x192D0 _080B8388: cmp r4, 0x2 bne _080B8396 @@ -914,7 +914,7 @@ _080B83B6: movs r7, 0 mov r4, r10 _080B83BC: - ldr r0, _080B83F0 @ =0x02019260 + ldr r0, _080B83F0 @ =gSharedMem + 0x19260 adds r5, r7, r0 ldrb r1, [r5, 0x15] movs r0, 0x10 @@ -940,14 +940,14 @@ _080B83BC: lsls r0, 1 b _080B83FE .align 2, 0 -_080B83F0: .4byte 0x02019260 +_080B83F0: .4byte gSharedMem + 0x19260 _080B83F4: .4byte gContestMoves _080B83F8: .4byte gComboStarterLookupTable _080B83FC: movs r0, 0 _080B83FE: strh r0, [r4] - ldr r5, _080B8494 @ =0x02019260 + ldr r5, _080B8494 @ =gSharedMem + 0x19260 adds r0, r7, r5 ldrb r0, [r0, 0xD] lsls r0, 24 @@ -1016,7 +1016,7 @@ _080B8442: mov r9, r0 b _080B849C .align 2, 0 -_080B8494: .4byte 0x02019260 +_080B8494: .4byte gSharedMem + 0x19260 _080B8498: movs r0, 0x1 str r0, [sp, 0x18] @@ -1046,7 +1046,7 @@ _080B84B8: cmp r0, 0xFF bne _080B8442 _080B84CA: - ldr r4, _080B84F4 @ =0x020192d0 + ldr r4, _080B84F4 @ =gSharedMem + 0x192D0 ldrb r0, [r4, 0x11] movs r1, 0xB bl sub_80B13EC @@ -1066,7 +1066,7 @@ _080B84E2: pop {r0} bx r0 .align 2, 0 -_080B84F4: .4byte 0x020192d0 +_080B84F4: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_26 thumb_func_start ContestEffect_27 @@ -1077,7 +1077,7 @@ ContestEffect_27: @ 80B84F8 movs r0, 0 mov r8, r0 movs r6, 0 - ldr r7, _080B8580 @ =0x020192d0 + ldr r7, _080B8580 @ =gSharedMem + 0x192D0 adds r5, r7, 0 subs r5, 0x63 _080B850A: @@ -1122,7 +1122,7 @@ _080B8556: adds r6, 0x1 cmp r6, 0x3 ble _080B850A - ldr r4, _080B8580 @ =0x020192d0 + ldr r4, _080B8580 @ =gSharedMem + 0x192D0 ldrb r0, [r4, 0x11] movs r1, 0xC bl sub_80B13EC @@ -1139,7 +1139,7 @@ _080B8576: pop {r0} bx r0 .align 2, 0 -_080B8580: .4byte 0x020192d0 +_080B8580: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_27 thumb_func_start ContestEffect_28 @@ -1147,7 +1147,7 @@ ContestEffect_28: @ 80B8584 push {r4-r7,lr} movs r7, 0 movs r5, 0 - ldr r4, _080B85B0 @ =0x020192d0 + ldr r4, _080B85B0 @ =gSharedMem + 0x192D0 movs r6, 0 _080B858E: ldrb r0, [r4, 0x11] @@ -1168,7 +1168,7 @@ _080B858E: movs r0, 0x28 b _080B85B6 .align 2, 0 -_080B85B0: .4byte 0x020192d0 +_080B85B0: .4byte gSharedMem + 0x192D0 _080B85B4: movs r0, 0xA _080B85B6: @@ -1188,7 +1188,7 @@ _080B85CE: adds r5, 0x1 cmp r5, 0x3 ble _080B858E - ldr r4, _080B85F4 @ =0x020192d0 + ldr r4, _080B85F4 @ =gSharedMem + 0x192D0 ldrb r0, [r4, 0x11] movs r1, 0xE bl sub_80B13EC @@ -1202,14 +1202,14 @@ _080B85EC: pop {r0} bx r0 .align 2, 0 -_080B85F4: .4byte 0x020192d0 +_080B85F4: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_28 thumb_func_start ContestEffect_29 ContestEffect_29: @ 80B85F8 push {r4,lr} ldr r0, _080B863C @ =gUnknown_02038696 - ldr r4, _080B8640 @ =0x020192d0 + ldr r4, _080B8640 @ =gSharedMem + 0x192D0 ldrb r2, [r4, 0x11] adds r0, r2, r0 ldrb r0, [r0] @@ -1243,7 +1243,7 @@ _080B8636: bx r0 .align 2, 0 _080B863C: .4byte gUnknown_02038696 -_080B8640: .4byte 0x020192d0 +_080B8640: .4byte gSharedMem + 0x192D0 _080B8644: .4byte gContestEffects _080B8648: .4byte gContestMoves thumb_func_end ContestEffect_29 @@ -1252,7 +1252,7 @@ _080B8648: .4byte gContestMoves ContestEffect_30: @ 80B864C push {r4,lr} ldr r0, _080B8690 @ =gUnknown_02038696 - ldr r4, _080B8694 @ =0x020192d0 + ldr r4, _080B8694 @ =gSharedMem + 0x192D0 ldrb r2, [r4, 0x11] adds r0, r2, r0 ldrb r0, [r0] @@ -1286,7 +1286,7 @@ _080B868A: bx r0 .align 2, 0 _080B8690: .4byte gUnknown_02038696 -_080B8694: .4byte 0x020192d0 +_080B8694: .4byte gSharedMem + 0x192D0 _080B8698: .4byte gContestEffects _080B869C: .4byte gContestMoves thumb_func_end ContestEffect_30 @@ -1296,7 +1296,7 @@ ContestEffect_31: @ 80B86A0 push {r4-r7,lr} movs r1, 0 movs r3, 0 - ldr r4, _080B86EC @ =0x020192d0 + ldr r4, _080B86EC @ =gSharedMem + 0x192D0 ldrb r0, [r4, 0x11] adds r0, r4 ldrb r5, [r0] @@ -1321,7 +1321,7 @@ _080B86C4: bge _080B86D2 movs r3, 0 _080B86D2: - ldr r4, _080B86EC @ =0x020192d0 + ldr r4, _080B86EC @ =gSharedMem + 0x192D0 ldrb r2, [r4, 0x11] adds r0, r2, r4 ldrb r0, [r0] @@ -1335,7 +1335,7 @@ _080B86E2: bl sub_80B13EC b _080B8710 .align 2, 0 -_080B86EC: .4byte 0x020192d0 +_080B86EC: .4byte gSharedMem + 0x192D0 _080B86F0: lsls r1, r2, 3 subs r1, r2 @@ -1353,7 +1353,7 @@ _080B86F0: movs r1, 0x11 bl sub_80B13EC _080B8710: - ldr r4, _080B873C @ =0x020192d0 + ldr r4, _080B873C @ =gSharedMem + 0x192D0 ldrb r1, [r4, 0x11] lsls r0, r1, 3 subs r0, r1 @@ -1374,14 +1374,14 @@ _080B8710: pop {r0} bx r0 .align 2, 0 -_080B873C: .4byte 0x020192d0 +_080B873C: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_31 thumb_func_start ContestEffect_32 ContestEffect_32: @ 80B8740 push {r4-r7,lr} movs r6, 0 - ldr r0, _080B8794 @ =0x020192d0 + ldr r0, _080B8794 @ =gSharedMem + 0x192D0 ldrb r1, [r0, 0x11] adds r3, r1, r0 ldrb r1, [r3] @@ -1423,7 +1423,7 @@ _080B8788: bl sub_80B13EC b _080B87B2 .align 2, 0 -_080B8794: .4byte 0x020192d0 +_080B8794: .4byte gSharedMem + 0x192D0 _080B8798: lsls r1, r2, 3 subs r1, r2 @@ -1446,7 +1446,7 @@ _080B87B2: thumb_func_start ContestEffect_33 ContestEffect_33: @ 80B87B8 push {lr} - ldr r0, _080B87D8 @ =0x020192d0 + ldr r0, _080B87D8 @ =gSharedMem + 0x192D0 ldrb r2, [r0, 0x11] adds r1, r2, r0 ldrb r3, [r1] @@ -1462,7 +1462,7 @@ ContestEffect_33: @ 80B87B8 movs r1, 0xA b _080B87EE .align 2, 0 -_080B87D8: .4byte 0x020192d0 +_080B87D8: .4byte gSharedMem + 0x192D0 _080B87DC: lsls r0, r2, 3 subs r0, r2 @@ -1522,54 +1522,54 @@ ContestEffect_34: @ 80B8830 cmp r0, 0x2 bhi _080B885C movs r4, 0xA - ldr r0, _080B8858 @ =0x020192d0 + ldr r0, _080B8858 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x1A bl sub_80B13EC b _080B88B0 .align 2, 0 -_080B8858: .4byte 0x020192d0 +_080B8858: .4byte gSharedMem + 0x192D0 _080B885C: cmp r0, 0x5 bhi _080B8874 movs r4, 0x14 - ldr r0, _080B8870 @ =0x020192d0 + ldr r0, _080B8870 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x1B bl sub_80B13EC b _080B88B0 .align 2, 0 -_080B8870: .4byte 0x020192d0 +_080B8870: .4byte gSharedMem + 0x192D0 _080B8874: cmp r0, 0x7 bhi _080B888C movs r4, 0x28 - ldr r0, _080B8888 @ =0x020192d0 + ldr r0, _080B8888 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x1C bl sub_80B13EC b _080B88B0 .align 2, 0 -_080B8888: .4byte 0x020192d0 +_080B8888: .4byte gSharedMem + 0x192D0 _080B888C: cmp r1, 0x8 bhi _080B88A4 movs r4, 0x3C - ldr r0, _080B88A0 @ =0x020192d0 + ldr r0, _080B88A0 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x1D bl sub_80B13EC b _080B88B0 .align 2, 0 -_080B88A0: .4byte 0x020192d0 +_080B88A0: .4byte gSharedMem + 0x192D0 _080B88A4: movs r4, 0x50 - ldr r0, _080B88C8 @ =0x020192d0 + ldr r0, _080B88C8 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x1E bl sub_80B13EC _080B88B0: - ldr r0, _080B88C8 @ =0x020192d0 + ldr r0, _080B88C8 @ =gSharedMem + 0x192D0 ldrb r2, [r0, 0x11] lsls r1, r2, 3 subs r1, r2 @@ -1581,13 +1581,13 @@ _080B88B0: pop {r0} bx r0 .align 2, 0 -_080B88C8: .4byte 0x020192d0 +_080B88C8: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_34 thumb_func_start ContestEffect_35 ContestEffect_35: @ 80B88CC push {r4-r7,lr} - ldr r1, _080B8940 @ =0x020192d0 + ldr r1, _080B8940 @ =gSharedMem + 0x192D0 ldrb r0, [r1, 0x11] adds r0, r1 movs r2, 0 @@ -1608,7 +1608,7 @@ _080B88EA: adds r4, r0, 0 cmp r5, r1 beq _080B8910 - ldr r3, _080B8940 @ =0x020192d0 + ldr r3, _080B8940 @ =gSharedMem + 0x192D0 _080B88F8: lsls r0, r2, 24 movs r2, 0x80 @@ -1649,7 +1649,7 @@ _080B8932: blt _080B8994 b _080B88EA .align 2, 0 -_080B8940: .4byte 0x020192d0 +_080B8940: .4byte gSharedMem + 0x192D0 _080B8944: mov r2, r12 ldrb r1, [r2, 0x11] @@ -1705,7 +1705,7 @@ ContestEffect_36: @ 80B89A4 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _080B8A28 @ =0x020192d0 + ldr r0, _080B8A28 @ =gSharedMem + 0x192D0 ldrb r2, [r0, 0x11] adds r1, r2, r0 ldrb r1, [r1] @@ -1768,7 +1768,7 @@ _080B89D4: bl sub_80B13EC b _080B8A3C .align 2, 0 -_080B8A28: .4byte 0x020192d0 +_080B8A28: .4byte gSharedMem + 0x192D0 _080B8A2C: .4byte gContestMoves _080B8A30: .4byte gContestEffects _080B8A34: @@ -1788,7 +1788,7 @@ _080B8A3C: thumb_func_start ContestEffect_37 ContestEffect_37: @ 80B8A48 push {r4-r7,lr} - ldr r1, _080B8A94 @ =0x020192d0 + ldr r1, _080B8A94 @ =gSharedMem + 0x192D0 ldrb r0, [r1, 0x11] adds r0, r1 ldrb r0, [r0] @@ -1826,7 +1826,7 @@ _080B8A60: bl sub_80B13EC b _080B8AA8 .align 2, 0 -_080B8A94: .4byte 0x020192d0 +_080B8A94: .4byte gSharedMem + 0x192D0 _080B8A98: cmp r1, r0 bge _080B8AA8 @@ -1849,7 +1849,7 @@ _080B8AB0: thumb_func_start ContestEffect_38 ContestEffect_38: @ 80B8AB8 push {r4,r5,lr} - ldr r4, _080B8AFC @ =0x020192d0 + ldr r4, _080B8AFC @ =gSharedMem + 0x192D0 ldrb r2, [r4, 0x11] lsls r0, r2, 3 subs r0, r2 @@ -1882,7 +1882,7 @@ ContestEffect_38: @ 80B8AB8 bl sub_80B13EC b _080B8B08 .align 2, 0 -_080B8AFC: .4byte 0x020192d0 +_080B8AFC: .4byte gSharedMem + 0x192D0 _080B8B00: adds r0, r2, 0 movs r1, 0x3A @@ -1896,7 +1896,7 @@ _080B8B08: thumb_func_start ContestEffect_39 ContestEffect_39: @ 80B8B10 push {r4,lr} - ldr r3, _080B8B48 @ =0x020192d0 + ldr r3, _080B8B48 @ =gSharedMem + 0x192D0 ldrb r1, [r3, 0x11] lsls r0, r1, 3 subs r0, r1 @@ -1923,7 +1923,7 @@ ContestEffect_39: @ 80B8B10 bl sub_80B13EC b _080B8B54 .align 2, 0 -_080B8B48: .4byte 0x020192d0 +_080B8B48: .4byte gSharedMem + 0x192D0 _080B8B4C: adds r0, r1, 0 movs r1, 0x3B @@ -1940,7 +1940,7 @@ ContestEffect_40: @ 80B8B5C mov r7, r8 push {r7} sub sp, 0x4 - ldr r1, _080B8BE4 @ =0x02019204 + ldr r1, _080B8BE4 @ =gSharedMem + 0x19204 ldrb r0, [r1, 0x1] cmp r0, 0x4 bne _080B8B6E @@ -2008,7 +2008,7 @@ _080B8BB0: strb r0, [r4] b _080B8BF8 .align 2, 0 -_080B8BE4: .4byte 0x02019204 +_080B8BE4: .4byte gSharedMem + 0x19204 _080B8BE8: lsls r0, r5, 24 movs r1, 0x80 @@ -2099,7 +2099,7 @@ ContestEffect_41: @ 80B8C84 mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r1, _080B8D14 @ =0x02019204 + ldr r1, _080B8D14 @ =gSharedMem + 0x19204 ldrb r0, [r1, 0x1] cmp r0, 0x4 bne _080B8C98 @@ -2170,7 +2170,7 @@ _080B8CE0: strb r0, [r4] b _080B8D28 .align 2, 0 -_080B8D14: .4byte 0x02019204 +_080B8D14: .4byte gSharedMem + 0x19204 _080B8D18: lsls r0, r5, 24 movs r2, 0x80 @@ -2264,7 +2264,7 @@ ContestEffect_42: @ 80B8DB4 ContestEffect_43: @ 80B8DB8 push {r4-r7,lr} sub sp, 0x8 - ldr r1, _080B8E30 @ =0x02019204 + ldr r1, _080B8E30 @ =gSharedMem + 0x19204 ldrb r0, [r1, 0x1] cmp r0, 0x4 beq _080B8EAE @@ -2323,7 +2323,7 @@ _080B8E10: strb r0, [r3] b _080B8E48 .align 2, 0 -_080B8E30: .4byte 0x02019204 +_080B8E30: .4byte gSharedMem + 0x19204 _080B8E34: subs r0, r4, 0x1 lsls r0, 24 @@ -2346,7 +2346,7 @@ _080B8E48: cmp r0, 0x3 ble _080B8DF6 movs r6, 0 - ldr r4, _080B8EB8 @ =0x020192d0 + ldr r4, _080B8EB8 @ =gSharedMem + 0x192D0 adds r7, r4, 0 subs r7, 0x70 movs r3, 0x3F @@ -2394,14 +2394,14 @@ _080B8EAE: pop {r0} bx r0 .align 2, 0 -_080B8EB8: .4byte 0x020192d0 +_080B8EB8: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_43 thumb_func_start ContestEffect_44 ContestEffect_44: @ 80B8EBC push {lr} ldr r3, _080B8EF0 @ =gContestMoves - ldr r1, _080B8EF4 @ =0x020192d0 + ldr r1, _080B8EF4 @ =gSharedMem + 0x192D0 ldrb r2, [r1, 0x11] lsls r0, r2, 3 subs r0, r2 @@ -2427,7 +2427,7 @@ _080B8EEA: bx r0 .align 2, 0 _080B8EF0: .4byte gContestMoves -_080B8EF4: .4byte 0x020192d0 +_080B8EF4: .4byte gSharedMem + 0x192D0 _080B8EF8: .4byte gScriptContestCategory thumb_func_end ContestEffect_44 @@ -2436,7 +2436,7 @@ ContestEffect_45: @ 80B8EFC push {r4-r7,lr} movs r7, 0 movs r5, 0 - ldr r4, _080B8F34 @ =0x020192d0 + ldr r4, _080B8F34 @ =gSharedMem + 0x192D0 movs r6, 0 _080B8F06: ldrb r0, [r4, 0x11] @@ -2462,7 +2462,7 @@ _080B8F06: bl sub_80B9268 b _080B8F3A .align 2, 0 -_080B8F34: .4byte 0x020192d0 +_080B8F34: .4byte gSharedMem + 0x192D0 _080B8F38: movs r0, 0xA _080B8F3A: @@ -2484,12 +2484,12 @@ _080B8F52: ble _080B8F06 cmp r7, 0 bne _080B8F68 - ldr r0, _080B8F78 @ =0x020192d0 + ldr r0, _080B8F78 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80B1404 _080B8F68: - ldr r0, _080B8F78 @ =0x020192d0 + ldr r0, _080B8F78 @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x30 bl sub_80B13EC @@ -2497,13 +2497,13 @@ _080B8F68: pop {r0} bx r0 .align 2, 0 -_080B8F78: .4byte 0x020192d0 +_080B8F78: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_45 thumb_func_start ContestEffect_46 ContestEffect_46: @ 80B8F7C push {r4,lr} - ldr r0, _080B8F98 @ =0x02019204 + ldr r0, _080B8F98 @ =gSharedMem + 0x19204 movs r1, 0x13 ldrsb r1, [r0, r1] cmp r1, 0 @@ -2515,7 +2515,7 @@ ContestEffect_46: @ 80B8F7C bl sub_80B13EC b _080B8FDE .align 2, 0 -_080B8F98: .4byte 0x02019204 +_080B8F98: .4byte gSharedMem + 0x19204 _080B8F9C: cmp r1, 0x1 bne _080B8FAE @@ -2550,7 +2550,7 @@ _080B8FD2: movs r1, 0x1E bl sub_80B13EC _080B8FDE: - ldr r0, _080B8FF4 @ =0x020192d0 + ldr r0, _080B8FF4 @ =gSharedMem + 0x192D0 ldrb r2, [r0, 0x11] lsls r1, r2, 3 subs r1, r2 @@ -2562,13 +2562,13 @@ _080B8FDE: pop {r0} bx r0 .align 2, 0 -_080B8FF4: .4byte 0x020192d0 +_080B8FF4: .4byte gSharedMem + 0x192D0 thumb_func_end ContestEffect_46 thumb_func_start ContestEffect_47 ContestEffect_47: @ 80B8FF8 push {lr} - ldr r3, _080B9034 @ =0x02019328 + ldr r3, _080B9034 @ =gSharedMem + 0x19328 ldrb r2, [r3, 0x1] movs r0, 0x1 ands r0, r2 @@ -2597,7 +2597,7 @@ _080B902E: pop {r0} bx r0 .align 2, 0 -_080B9034: .4byte 0x02019328 +_080B9034: .4byte gSharedMem + 0x19328 thumb_func_end ContestEffect_47 thumb_func_start sub_80B9038 @@ -2611,7 +2611,7 @@ sub_80B9038: @ 80B9038 mov r8, r0 movs r7, 0 movs r5, 0 - ldr r4, _080B907C @ =0x020192d0 + ldr r4, _080B907C @ =gSharedMem + 0x192D0 ldr r0, _080B9080 @ =gContestMoves mov r9, r0 movs r6, 0 @@ -2637,7 +2637,7 @@ _080B9052: movs r0, 0x28 b _080B9086 .align 2, 0 -_080B907C: .4byte 0x020192d0 +_080B907C: .4byte gSharedMem + 0x192D0 _080B9080: .4byte gContestMoves _080B9084: movs r0, 0xA @@ -2658,7 +2658,7 @@ _080B909A: ble _080B9052 cmp r7, 0 bne _080B90B0 - ldr r0, _080B90BC @ =0x020192d0 + ldr r0, _080B90BC @ =gSharedMem + 0x192D0 ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80B1404 @@ -2670,7 +2670,7 @@ _080B90B0: pop {r0} bx r0 .align 2, 0 -_080B90BC: .4byte 0x020192d0 +_080B90BC: .4byte gSharedMem + 0x192D0 thumb_func_end sub_80B9038 thumb_func_start sub_80B90C0 @@ -2678,7 +2678,7 @@ sub_80B90C0: @ 80B90C0 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _080B90EC @ =0x020192d0 + ldr r2, _080B90EC @ =gSharedMem + 0x192D0 adds r0, r2, 0 adds r0, 0xD adds r0, r3, r0 @@ -2698,7 +2698,7 @@ sub_80B90C0: @ 80B90C0 movs r1, 0x2D b _080B9116 .align 2, 0 -_080B90EC: .4byte 0x020192d0 +_080B90EC: .4byte gSharedMem + 0x192D0 _080B90F0: ldrb r0, [r2, 0x12] cmp r0, 0 @@ -2738,7 +2738,7 @@ sub_80B9120: @ 80B9120 movs r2, 0x8 bl memset movs r7, 0 - ldr r1, _080B918C @ =0x020192d0 + ldr r1, _080B918C @ =gSharedMem + 0x192D0 ldrb r0, [r1, 0x8] cmp r0, 0xFF beq _080B91D8 @@ -2785,7 +2785,7 @@ _080B9174: bl sub_80B13EC b _080B91C8 .align 2, 0 -_080B918C: .4byte 0x020192d0 +_080B918C: .4byte gSharedMem + 0x192D0 _080B9190: ldrb r1, [r2, 0xF] ldrh r0, [r5, 0x6] @@ -2815,7 +2815,7 @@ _080B91AC: strh r0, [r1] _080B91C8: adds r7, 0x1 - ldr r1, _080B91E8 @ =0x020192d0 + ldr r1, _080B91E8 @ =gSharedMem + 0x192D0 adds r0, r1, 0 adds r0, 0x8 adds r0, r7, r0 @@ -2833,7 +2833,7 @@ _080B91DC: movs r0, 0x1 b _080B91F6 .align 2, 0 -_080B91E8: .4byte 0x020192d0 +_080B91E8: .4byte gSharedMem + 0x192D0 _080B91EC: adds r1, 0x2 adds r7, 0x1 @@ -2856,7 +2856,7 @@ sub_80B9200: @ 80B9200 lsls r2, r0, 3 subs r2, r0 lsls r2, 2 - ldr r0, _080B9220 @ =0x02019260 + ldr r0, _080B9220 @ =gSharedMem + 0x19260 adds r2, r0 ldrh r0, [r2, 0x2] subs r0, r1 @@ -2866,7 +2866,7 @@ sub_80B9200: @ 80B9200 strb r1, [r2, 0xE] bx lr .align 2, 0 -_080B9220: .4byte 0x02019260 +_080B9220: .4byte gSharedMem + 0x19260 thumb_func_end sub_80B9200 thumb_func_start sub_80B9224 diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index b91a9665b..0f69dcb51 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -408,7 +408,7 @@ sub_80C2358: @ 80C2358 movs r1, 0x1 bl sub_80C30D4 bl sub_80C2340 - ldr r4, _080C2410 @ =0x02018000 + ldr r4, _080C2410 @ =gSharedMem + 0x18000 adds r0, r4, 0 movs r1, 0 movs r2, 0x18 @@ -458,7 +458,7 @@ sub_80C2358: @ 80C2358 bx r0 .align 2, 0 _080C240C: .4byte gPaletteFade -_080C2410: .4byte 0x02018000 +_080C2410: .4byte gSharedMem + 0x18000 _080C2414: .4byte sub_80C24F4 _080C2418: .4byte sub_80C2430 _080C241C: .4byte gUnknown_03004200 @@ -665,7 +665,7 @@ sub_80C25C0: @ 80C25C0 adds r0, r4, 0 bl DestroyTask ldr r2, _080C25F4 @ =gTasks - ldr r0, _080C25F8 @ =0x02018000 + ldr r0, _080C25F8 @ =gSharedMem + 0x18000 ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -680,7 +680,7 @@ _080C25EC: bx r0 .align 2, 0 _080C25F4: .4byte gTasks -_080C25F8: .4byte 0x02018000 +_080C25F8: .4byte gSharedMem + 0x18000 _080C25FC: .4byte sub_80C2600 thumb_func_end sub_80C25C0 @@ -703,7 +703,7 @@ sub_80C2600: @ 80C2600 movs r1, 0x14 bl CreateTask ldr r4, _080C264C @ =gContestText_AnnounceResults - ldr r0, _080C2650 @ =0x02018000 + ldr r0, _080C2650 @ =gSharedMem + 0x18000 ldrb r1, [r0] adds r0, r4, 0 bl sub_80C3158 @@ -720,17 +720,17 @@ sub_80C2600: @ 80C2600 _080C2644: .4byte gTasks _080C2648: .4byte sub_80C2F64 _080C264C: .4byte gContestText_AnnounceResults -_080C2650: .4byte 0x02018000 +_080C2650: .4byte gSharedMem + 0x18000 _080C2654: cmp r0, 0x1 bne _080C2668 - ldr r0, _080C2664 @ =0x02018000 + ldr r0, _080C2664 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x4] cmp r0, 0 bne _080C26D4 b _080C267C .align 2, 0 -_080C2664: .4byte 0x02018000 +_080C2664: .4byte gSharedMem + 0x18000 _080C2668: cmp r0, 0x2 bne _080C2684 @@ -751,7 +751,7 @@ _080C2684: cmp r0, 0x3 bne _080C26C0 ldr r4, _080C26B4 @ =gContestText_PreliminaryResults - ldr r0, _080C26B8 @ =0x02018000 + ldr r0, _080C26B8 @ =gSharedMem + 0x18000 ldrb r1, [r0] adds r0, r4, 0 bl sub_80C3158 @@ -771,12 +771,12 @@ _080C26A6: b _080C26D4 .align 2, 0 _080C26B4: .4byte gContestText_PreliminaryResults -_080C26B8: .4byte 0x02018000 +_080C26B8: .4byte gSharedMem + 0x18000 _080C26BC: .4byte 0x0000ffff _080C26C0: cmp r0, 0x4 bne _080C26D4 - ldr r0, _080C26DC @ =0x02018000 + ldr r0, _080C26DC @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x4] cmp r0, 0x2 bne _080C26D4 @@ -789,7 +789,7 @@ _080C26D4: pop {r0} bx r0 .align 2, 0 -_080C26DC: .4byte 0x02018000 +_080C26DC: .4byte gSharedMem + 0x18000 _080C26E0: .4byte sub_80C26E4 thumb_func_end sub_80C2600 @@ -819,7 +819,7 @@ _080C270C: beq _080C2754 b _080C2766 _080C2712: - ldr r5, _080C2738 @ =0x02018000 + ldr r5, _080C2738 @ =gSharedMem + 0x18000 ldrb r0, [r5, 0xA] cmp r0, 0 bne _080C2766 @@ -837,21 +837,21 @@ _080C2712: strh r0, [r4, 0x8] b _080C2766 .align 2, 0 -_080C2738: .4byte 0x02018000 +_080C2738: .4byte gSharedMem + 0x18000 _080C273C: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] b _080C2766 _080C2744: - ldr r0, _080C2750 @ =0x02018000 + ldr r0, _080C2750 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x14] cmp r0, 0 bne _080C2766 strh r0, [r4, 0x8] b _080C2766 .align 2, 0 -_080C2750: .4byte 0x02018000 +_080C2750: .4byte gSharedMem + 0x18000 _080C2754: movs r0, 0x88 lsls r0, 3 @@ -875,7 +875,7 @@ sub_80C2770: @ 80C2770 lsls r0, 24 lsrs r2, r0, 24 adds r4, r2, 0 - ldr r5, _080C27BC @ =0x02018000 + ldr r5, _080C27BC @ =gSharedMem + 0x18000 ldrb r3, [r5, 0x4] cmp r3, 0 bne _080C27CC @@ -907,7 +907,7 @@ sub_80C2770: @ 80C2770 bl sub_80C34CC b _080C27DE .align 2, 0 -_080C27BC: .4byte 0x02018000 +_080C27BC: .4byte gSharedMem + 0x18000 _080C27C0: .4byte gTasks _080C27C4: .4byte gContestText_Round2Results _080C27C8: .4byte 0x0000ffff @@ -956,7 +956,7 @@ _080C2814: beq _080C285C b _080C286C _080C281A: - ldr r5, _080C2840 @ =0x02018000 + ldr r5, _080C2840 @ =gSharedMem + 0x18000 ldrb r0, [r5, 0xA] cmp r0, 0 bne _080C286C @@ -974,21 +974,21 @@ _080C281A: strh r0, [r4, 0x8] b _080C286C .align 2, 0 -_080C2840: .4byte 0x02018000 +_080C2840: .4byte gSharedMem + 0x18000 _080C2844: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] b _080C286C _080C284C: - ldr r0, _080C2858 @ =0x02018000 + ldr r0, _080C2858 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x14] cmp r0, 0 bne _080C286C strh r0, [r4, 0x8] b _080C286C .align 2, 0 -_080C2858: .4byte 0x02018000 +_080C2858: .4byte gSharedMem + 0x18000 _080C285C: movs r0, 0x88 lsls r0, 3 @@ -1040,7 +1040,7 @@ _080C28A8: .4byte _080C299C .4byte _080C2A70 _080C28C0: - ldr r0, _080C28DC @ =0x02018000 + ldr r0, _080C28DC @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x4] cmp r0, 0 beq _080C28CA @@ -1055,7 +1055,7 @@ _080C28CA: strh r1, [r0, 0x8] b _080C2A80 .align 2, 0 -_080C28DC: .4byte 0x02018000 +_080C28DC: .4byte gSharedMem + 0x18000 _080C28E0: lsls r0, r5, 2 adds r0, r5 @@ -1101,7 +1101,7 @@ _080C292C: .4byte gTasks _080C2930: .4byte sub_80C3A5C _080C2934: .4byte gUnknown_02038690 _080C2938: - ldr r0, _080C2990 @ =0x02018000 + ldr r0, _080C2990 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x5] cmp r0, 0x4 beq _080C2942 @@ -1148,7 +1148,7 @@ _080C2984: bl sub_80C3E60 b _080C2A80 .align 2, 0 -_080C2990: .4byte 0x02018000 +_080C2990: .4byte gSharedMem + 0x18000 _080C2994: .4byte sub_80C3B30 _080C2998: .4byte gUnknown_02038690 _080C299C: @@ -1215,7 +1215,7 @@ _080C2A10: ldr r1, _080C2A60 @ =gContestText_PokeWon mov r0, sp bl StringExpandPlaceholders - ldr r0, _080C2A64 @ =0x02018000 + ldr r0, _080C2A64 @ =gSharedMem + 0x18000 ldrb r1, [r0] mov r0, sp bl sub_80C3158 @@ -1243,7 +1243,7 @@ _080C2A54: .4byte gUnknown_0203857D _080C2A58: .4byte gStringVar2 _080C2A5C: .4byte gContestMons + 0x2 _080C2A60: .4byte gContestText_PokeWon -_080C2A64: .4byte 0x02018000 +_080C2A64: .4byte gSharedMem + 0x18000 _080C2A68: .4byte 0x0000ffff _080C2A6C: .4byte gTasks _080C2A70: @@ -1356,7 +1356,7 @@ _080C2B14: str r3, [sp] str r6, [sp, 0x4] str r4, [sp, 0x8] - ldr r3, _080C2BE4 @ =0x02000000 + ldr r3, _080C2BE4 @ =gSharedMem bl HandleLoadSpecialPokePic adds r0, r6, 0 ldr r1, [sp, 0xC] @@ -1392,7 +1392,7 @@ _080C2B14: adds r2, r5 ldr r1, _080C2BF0 @ =sub_80C3C44 str r1, [r2] - ldr r2, _080C2BE4 @ =0x02000000 + ldr r2, _080C2BE4 @ =gSharedMem movs r3, 0xC0 lsls r3, 9 adds r1, r2, r3 @@ -1422,7 +1422,7 @@ _080C2BD4: .4byte gContestMons _080C2BD8: .4byte gMonFrontPicTable _080C2BDC: .4byte gMonFrontPicCoords _080C2BE0: .4byte gUnknown_081FAF4C -_080C2BE4: .4byte 0x02000000 +_080C2BE4: .4byte gSharedMem _080C2BE8: .4byte gUnknown_02024E8C _080C2BEC: .4byte gSprites _080C2BF0: .4byte sub_80C3C44 @@ -1472,13 +1472,13 @@ _080C2C30: .align 2, 0 _080C2C50: .4byte gUnknown_03004240 _080C2C54: - ldr r0, _080C2C60 @ =0x02018000 + ldr r0, _080C2C60 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x6] cmp r0, 0x1 bne _080C2D04 b _080C2CD0 .align 2, 0 -_080C2C60: .4byte 0x02018000 +_080C2C60: .4byte gSharedMem + 0x18000 _080C2C64: lsls r0, r7, 2 adds r0, r7 @@ -1494,7 +1494,7 @@ _080C2C64: movs r0, 0 strh r0, [r3, 0xA] ldr r2, _080C2C9C @ =gSprites - ldr r0, _080C2CA0 @ =0x02018000 + ldr r0, _080C2CA0 @ =gSharedMem + 0x18000 ldrb r1, [r0, 0x8] lsls r0, r1, 4 adds r0, r1 @@ -1509,10 +1509,10 @@ _080C2C64: b _080C2D04 .align 2, 0 _080C2C9C: .4byte gSprites -_080C2CA0: .4byte 0x02018000 +_080C2CA0: .4byte gSharedMem + 0x18000 _080C2CA4: .4byte sub_80C3CB8 _080C2CA8: - ldr r0, _080C2CE0 @ =0x02018000 + ldr r0, _080C2CE0 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x6] cmp r0, 0x2 bne _080C2D04 @@ -1543,10 +1543,10 @@ _080C2CD0: strh r1, [r0, 0x8] b _080C2D04 .align 2, 0 -_080C2CE0: .4byte 0x02018000 +_080C2CE0: .4byte gSharedMem + 0x18000 _080C2CE4: .4byte gUnknown_03004240 _080C2CE8: - ldr r2, _080C2D14 @ =0x02018000 + ldr r2, _080C2D14 @ =gSharedMem + 0x18000 ldrb r0, [r2, 0x6] cmp r0, 0x2 bne _080C2D04 @@ -1570,7 +1570,7 @@ _080C2D04: pop {r0} bx r0 .align 2, 0 -_080C2D14: .4byte 0x02018000 +_080C2D14: .4byte gSharedMem + 0x18000 _080C2D18: .4byte sub_80C2D1C thumb_func_end sub_80C2A8C @@ -1719,7 +1719,7 @@ sub_80C2E14: @ 80C2E14 bl sub_80B2A7C movs r0, 0xFE bl sub_80B2A7C - ldr r4, _080C2E8C @ =0x02000000 + ldr r4, _080C2E8C @ =gSharedMem ldr r0, _080C2E90 @ =0x00015ddf adds r1, r4, r0 movs r6, 0 @@ -1752,7 +1752,7 @@ sub_80C2E14: @ 80C2E14 _080C2E80: .4byte gUnknown_02038690 _080C2E84: .4byte gContestPlayerMonIndex _080C2E88: .4byte gScriptContestRank -_080C2E8C: .4byte 0x02000000 +_080C2E8C: .4byte gSharedMem _080C2E90: .4byte 0x00015ddf _080C2E94: .4byte 0x00015dde _080C2E98: .4byte gTasks @@ -1782,7 +1782,7 @@ sub_80C2EA0: @ 80C2EA0 ldrsh r0, [r4, r1] cmp r0, 0 bne _080C2EE8 - ldr r0, _080C2EE0 @ =0x02018000 + ldr r0, _080C2EE0 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x3] bl DestroyTask ldr r0, _080C2EE4 @ =0x0000ffff @@ -1790,7 +1790,7 @@ sub_80C2EA0: @ 80C2EA0 .align 2, 0 _080C2ED8: .4byte gPaletteFade _080C2EDC: .4byte gTasks -_080C2EE0: .4byte 0x02018000 +_080C2EE0: .4byte gSharedMem + 0x18000 _080C2EE4: .4byte 0x0000ffff _080C2EE8: cmp r0, 0x1 @@ -1938,7 +1938,7 @@ _080C2FE6: ldrsh r4, [r0, r3] cmp r4, 0 bne _080C3014 - ldr r0, _080C3010 @ =0x02018000 + ldr r0, _080C3010 @ =gSharedMem + 0x18000 strb r4, [r0, 0xA] b _080C301A .align 2, 0 @@ -1946,9 +1946,9 @@ _080C3000: .4byte gTasks _080C3004: .4byte 0x00002ede _080C3008: .4byte 0x00007fff _080C300C: .4byte 0x000077be -_080C3010: .4byte 0x02018000 +_080C3010: .4byte gSharedMem + 0x18000 _080C3014: - ldr r1, _080C3020 @ =0x02018000 + ldr r1, _080C3020 @ =gSharedMem + 0x18000 movs r0, 0x1 strb r0, [r1, 0xA] _080C301A: @@ -1956,7 +1956,7 @@ _080C301A: pop {r0} bx r0 .align 2, 0 -_080C3020: .4byte 0x02018000 +_080C3020: .4byte gSharedMem + 0x18000 thumb_func_end sub_80C2F64 thumb_func_start sub_80C3024 @@ -2235,7 +2235,7 @@ _080C3218: strb r5, [r2, 0x2] movs r0, 0xFF strb r0, [r2, 0x3] - ldr r0, _080C32DC @ =0x02018068 + ldr r0, _080C32DC @ =gSharedMem + 0x18068 mov r10, r0 ldr r1, _080C32D4 @ =gDisplayedStringBattle bl sub_80034D4 @@ -2303,7 +2303,7 @@ _080C32CC: .4byte 0x040000d4 _080C32D0: .4byte 0x85000100 _080C32D4: .4byte gDisplayedStringBattle _080C32D8: .4byte gUnknown_083D17E2 -_080C32DC: .4byte 0x02018068 +_080C32DC: .4byte gSharedMem + 0x18068 _080C32E0: .4byte gUnknown_083D1624 _080C32E4: .4byte REG_BG0CNT _080C32E8: .4byte 0x06010100 @@ -2501,7 +2501,7 @@ _080C340A: adds r0, r2 ldrb r1, [r5, 0x7] strh r1, [r0, 0x32] - ldr r1, _080C34A8 @ =0x02018000 + ldr r1, _080C34A8 @ =gSharedMem + 0x18000 ldrb r0, [r5] strb r0, [r1] strb r3, [r1, 0x4] @@ -2517,7 +2517,7 @@ _080C3498: .4byte gSpriteTemplate_83D174C _080C349C: .4byte gUnknown_083D1764 _080C34A0: .4byte gUnknown_083D17A4 _080C34A4: .4byte gSprites -_080C34A8: .4byte 0x02018000 +_080C34A8: .4byte gSharedMem + 0x18000 thumb_func_end sub_80C33DC thumb_func_start sub_80C34AC @@ -2543,7 +2543,7 @@ sub_80C34CC: @ 80C34CC push {r4-r6,lr} mov r6, r8 push {r6} - ldr r4, _080C3514 @ =0x02018000 + ldr r4, _080C3514 @ =gSharedMem + 0x18000 mov r8, r4 ldrb r5, [r4] lsls r4, r5, 4 @@ -2576,7 +2576,7 @@ sub_80C34CC: @ 80C34CC pop {r0} bx r0 .align 2, 0 -_080C3514: .4byte 0x02018000 +_080C3514: .4byte gSharedMem + 0x18000 _080C3518: .4byte gSprites _080C351C: .4byte sub_80C3588 thumb_func_end sub_80C34CC @@ -2584,7 +2584,7 @@ _080C351C: .4byte sub_80C3588 thumb_func_start sub_80C3520 sub_80C3520: @ 80C3520 push {r4,r5,lr} - ldr r4, _080C3558 @ =0x02018000 + ldr r4, _080C3558 @ =gSharedMem + 0x18000 ldrb r2, [r4] lsls r1, r2, 4 adds r1, r2 @@ -2612,7 +2612,7 @@ sub_80C3520: @ 80C3520 pop {r0} bx r0 .align 2, 0 -_080C3558: .4byte 0x02018000 +_080C3558: .4byte gSharedMem + 0x18000 _080C355C: .4byte gSprites _080C3560: .4byte sub_80C3630 thumb_func_end sub_80C3520 @@ -2630,12 +2630,12 @@ sub_80C3564: @ 80C3564 strh r2, [r0, 0x24] ldr r1, _080C3580 @ =SpriteCallbackDummy str r1, [r0, 0x1C] - ldr r0, _080C3584 @ =0x02018000 + ldr r0, _080C3584 @ =gSharedMem + 0x18000 strb r3, [r0, 0x4] bx lr .align 2, 0 _080C3580: .4byte SpriteCallbackDummy -_080C3584: .4byte 0x02018000 +_080C3584: .4byte gSharedMem + 0x18000 thumb_func_end sub_80C3564 thumb_func_start sub_80C3588 @@ -2705,7 +2705,7 @@ _080C35F8: .4byte sub_80C35FC sub_80C35FC: @ 80C35FC push {lr} adds r2, r0, 0 - ldr r0, _080C3628 @ =0x02018000 + ldr r0, _080C3628 @ =gSharedMem + 0x18000 movs r1, 0x2 strb r1, [r0, 0x4] ldrh r3, [r2, 0x38] @@ -2726,7 +2726,7 @@ _080C3624: pop {r0} bx r0 .align 2, 0 -_080C3628: .4byte 0x02018000 +_080C3628: .4byte gSharedMem + 0x18000 _080C362C: .4byte 0xffff0000 thumb_func_end sub_80C35FC @@ -2790,7 +2790,7 @@ _080C3694: .4byte gSprites sub_80C3698: @ 80C3698 push {r4-r7,lr} adds r4, r0, 0 - ldr r5, _080C374C @ =0x02018000 + ldr r5, _080C374C @ =gSharedMem + 0x18000 ldrb r1, [r5, 0x1] bl sub_80C3158 adds r0, r4, 0 @@ -2877,7 +2877,7 @@ _080C36DA: pop {r0} bx r0 .align 2, 0 -_080C374C: .4byte 0x02018000 +_080C374C: .4byte gSharedMem + 0x18000 _080C3750: .4byte gSprites _080C3754: .4byte gUnknown_030042C4 _080C3758: .4byte gUnknown_03004240 @@ -2888,7 +2888,7 @@ _080C3760: .4byte 0x00003f3e thumb_func_start sub_80C3764 sub_80C3764: @ 80C3764 push {r4-r7,lr} - ldr r0, _080C37C8 @ =0x02018000 + ldr r0, _080C37C8 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x1] lsls r2, r0, 4 adds r2, r0 @@ -2939,7 +2939,7 @@ _080C3790: pop {r0} bx r0 .align 2, 0 -_080C37C8: .4byte 0x02018000 +_080C37C8: .4byte gSharedMem + 0x18000 _080C37CC: .4byte gSprites _080C37D0: .4byte gUnknown_030042C4 _080C37D4: .4byte gUnknown_03004240 @@ -3354,7 +3354,7 @@ _080C3A94: adds r0, r1 adds r2, 0x11 strh r2, [r0] - ldr r1, _080C3B2C @ =0x02018000 + ldr r1, _080C3B2C @ =gSharedMem + 0x18000 ldrb r0, [r1, 0x5] adds r0, 0x1 strb r0, [r1, 0x5] @@ -3372,7 +3372,7 @@ _080C3B1C: .4byte 0x0600e142 _080C3B20: .4byte 0x0600e144 _080C3B24: .4byte 0x0600e182 _080C3B28: .4byte 0x0600e184 -_080C3B2C: .4byte 0x02018000 +_080C3B2C: .4byte gSharedMem + 0x18000 thumb_func_end sub_80C3A5C thumb_func_start sub_80C3B30 @@ -3444,7 +3444,7 @@ _080C3B82: ldr r2, _080C3BD0 @ =sub_80C3BD8 str r2, [r0] mov r1, r12 - ldr r0, _080C3BD4 @ =0x02018000 + ldr r0, _080C3BD4 @ =gSharedMem + 0x18000 strb r1, [r0, 0x3] pop {r3-r5} mov r8, r3 @@ -3459,7 +3459,7 @@ _080C3BC4: .4byte gTasks _080C3BC8: .4byte 0x00000fff _080C3BCC: .4byte 0x0600e100 _080C3BD0: .4byte sub_80C3BD8 -_080C3BD4: .4byte 0x02018000 +_080C3BD4: .4byte gSharedMem + 0x18000 thumb_func_end sub_80C3B30 thumb_func_start sub_80C3BD8 @@ -3569,7 +3569,7 @@ _080C3C92: str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x30] - ldr r1, _080C3CB4 @ =0x02018000 + ldr r1, _080C3CB4 @ =gSharedMem + 0x18000 movs r0, 0x1 strb r0, [r1, 0x6] _080C3CA8: @@ -3578,7 +3578,7 @@ _080C3CA8: bx r0 .align 2, 0 _080C3CB0: .4byte SpriteCallbackDummy -_080C3CB4: .4byte 0x02018000 +_080C3CB4: .4byte gSharedMem + 0x18000 thumb_func_end sub_80C3C44 thumb_func_start sub_80C3CB8 @@ -3612,7 +3612,7 @@ sub_80C3CB8: @ 80C3CB8 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r1, _080C3D00 @ =0x02018000 + ldr r1, _080C3D00 @ =gSharedMem + 0x18000 movs r0, 0x2 strb r0, [r1, 0x6] _080C3CF8: @@ -3620,7 +3620,7 @@ _080C3CF8: bx r0 .align 2, 0 _080C3CFC: .4byte SpriteCallbackDummy -_080C3D00: .4byte 0x02018000 +_080C3D00: .4byte gSharedMem + 0x18000 thumb_func_end sub_80C3CB8 thumb_func_start sub_80C3D04 @@ -3644,7 +3644,7 @@ sub_80C3D04: @ 80C3D04 bne _080C3DBE movs r0, 0 strh r0, [r1, 0x8] - ldr r0, _080C3DDC @ =0x02018000 + ldr r0, _080C3DDC @ =gSharedMem + 0x18000 mov r8, r0 ldrb r0, [r0, 0x7] cmp r0, 0x27 @@ -3710,7 +3710,7 @@ sub_80C3D04: @ 80C3D04 adds r0, 0x1 strb r0, [r1, 0x7] _080C3DBE: - ldr r0, _080C3DDC @ =0x02018000 + ldr r0, _080C3DDC @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x9] cmp r0, 0 beq _080C3DCC @@ -3724,7 +3724,7 @@ _080C3DCC: bx r0 .align 2, 0 _080C3DD8: .4byte gTasks -_080C3DDC: .4byte 0x02018000 +_080C3DDC: .4byte gSharedMem + 0x18000 _080C3DE0: .4byte gSpriteTemplate_83D17B4 _080C3DE4: .4byte gSprites _080C3DE8: .4byte 0x000003ff @@ -3759,7 +3759,7 @@ sub_80C3DF0: @ 80C3DF0 ldrh r0, [r4, 0x22] adds r0, 0x1 strh r0, [r4, 0x22] - ldr r5, _080C3E5C @ =0x02018000 + ldr r5, _080C3E5C @ =gSharedMem + 0x18000 ldrb r0, [r5, 0x9] cmp r0, 0 beq _080C3E3A @@ -3789,7 +3789,7 @@ _080C3E56: pop {r0} bx r0 .align 2, 0 -_080C3E5C: .4byte 0x02018000 +_080C3E5C: .4byte gSharedMem + 0x18000 thumb_func_end sub_80C3DF0 thumb_func_start sub_80C3E60 @@ -3961,7 +3961,7 @@ _080C3F8A: ble _080C3F9C adds r4, 0xA _080C3F9C: - ldr r0, _080C40A0 @ =0x02018018 + ldr r0, _080C40A0 @ =gSharedMem + 0x18018 mov r1, r10 adds r5, r1, r0 adds r0, r4, 0 @@ -4090,7 +4090,7 @@ _080C4080: .align 2, 0 _080C4098: .4byte gUnknown_02038678 _080C409C: .4byte gUnknown_02038670 -_080C40A0: .4byte 0x02018018 +_080C40A0: .4byte gSharedMem + 0x18018 _080C40A4: .4byte gUnknown_02038688 _080C40A8: .4byte gUnknown_02038690 _080C40AC: @@ -4135,7 +4135,7 @@ sub_80C40D4: @ 80C40D4 cmp r0, 0 bne _080C4198 mov r8, r2 - ldr r0, _080C417C @ =0x02018018 + ldr r0, _080C417C @ =gSharedMem + 0x18018 subs r1, 0x18 adds r1, r0 mov r9, r1 @@ -4204,7 +4204,7 @@ _080C416A: ble _080C4102 b _080C4292 .align 2, 0 -_080C417C: .4byte 0x02018018 +_080C417C: .4byte gSharedMem + 0x18018 _080C4180: .4byte 0x0600bffe _080C4184: .4byte 0x000060b3 _080C4188: .4byte sub_80C42C0 @@ -4214,7 +4214,7 @@ _080C4194: .4byte gTasks _080C4198: movs r2, 0 mov r8, r2 - ldr r0, _080C4220 @ =0x02018018 + ldr r0, _080C4220 @ =gSharedMem + 0x18018 mov r12, r0 mov r9, r2 movs r1, 0xC0 @@ -4282,7 +4282,7 @@ _080C41FA: str r0, [sp] b _080C4246 .align 2, 0 -_080C4220: .4byte 0x02018018 +_080C4220: .4byte gSharedMem + 0x18018 _080C4224: .4byte 0x000060a3 _080C4228: .4byte 0x0600bffe _080C422C: .4byte sub_80C42C0 @@ -4296,7 +4296,7 @@ _080C423C: lsrs r0, 24 mov r10, r0 _080C4246: - ldr r0, _080C4264 @ =0x02018018 + ldr r0, _080C4264 @ =gSharedMem + 0x18018 mov r1, r9 adds r4, r1, r0 ldrb r1, [r4, 0x10] @@ -4311,7 +4311,7 @@ _080C4246: subs r1, r2 b _080C4274 .align 2, 0 -_080C4264: .4byte 0x02018018 +_080C4264: .4byte gSharedMem + 0x18018 _080C4268: adds r0, r2, r5 lsls r0, 3 @@ -4321,7 +4321,7 @@ _080C4268: adds r1, r2 _080C4274: strh r1, [r0, 0xA] - ldr r1, _080C42BC @ =0x02018000 + ldr r1, _080C42BC @ =gSharedMem + 0x18000 ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] @@ -4358,7 +4358,7 @@ _080C42AA: pop {r0} bx r0 .align 2, 0 -_080C42BC: .4byte 0x02018000 +_080C42BC: .4byte gSharedMem + 0x18000 thumb_func_end sub_80C40D4 thumb_func_start sub_80C42C0 @@ -4386,7 +4386,7 @@ sub_80C42C0: @ 80C42C0 ldrsh r0, [r0, r2] cmp r0, 0 beq _080C4310 - ldr r1, _080C430C @ =0x02018000 + ldr r1, _080C430C @ =gSharedMem + 0x18000 lsls r2, r5, 1 adds r0, r1, 0 adds r0, 0xC @@ -4400,9 +4400,9 @@ sub_80C42C0: @ 80C42C0 b _080C4326 .align 2, 0 _080C4308: .4byte gTasks -_080C430C: .4byte 0x02018000 +_080C430C: .4byte gSharedMem + 0x18000 _080C4310: - ldr r1, _080C4350 @ =0x02018000 + ldr r1, _080C4350 @ =gSharedMem + 0x18000 lsls r2, r5, 1 adds r0, r1, 0 adds r0, 0xC @@ -4437,7 +4437,7 @@ _080C4340: strh r7, [r3] b _080C4362 .align 2, 0 -_080C4350: .4byte 0x02018000 +_080C4350: .4byte gSharedMem + 0x18000 _080C4354: mov r1, r8 cmp r1, 0 @@ -4455,7 +4455,7 @@ _080C4362: cmp r2, 0 bne _080C43CE movs r2, 0 - ldr r0, _080C4388 @ =0x0201800c + ldr r0, _080C4388 @ =gSharedMem + 0x1800C adds r6, r4, r0 adds r0, r4, r5 lsls r5, r0, 5 @@ -4470,7 +4470,7 @@ _080C4376: movs r0, 0x8 b _080C43A8 .align 2, 0 -_080C4388: .4byte 0x0201800c +_080C4388: .4byte gSharedMem + 0x1800C _080C438C: lsls r0, r2, 3 cmp r3, r0 diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index 12dc3bdb5..164b1ac03 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -12,7 +12,7 @@ sub_80C857C: @ 80C857C adds r2, r0, 0 lsls r4, r1, 16 lsrs r4, 16 - ldr r5, _080C85A8 @ =0x0201e000 + ldr r5, _080C85A8 @ =gSharedMem + 0x1E000 adds r0, r5, 0 adds r1, r2, 0 adds r2, r4, 0 @@ -27,7 +27,7 @@ sub_80C857C: @ 80C857C pop {r0} bx r0 .align 2, 0 -_080C85A8: .4byte 0x0201e000 +_080C85A8: .4byte gSharedMem + 0x1E000 thumb_func_end sub_80C857C thumb_func_start sub_80C85AC @@ -666,7 +666,7 @@ _080C8A64: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _080C8A90 @ =0x02019266 + ldr r1, _080C8A90 @ =gSharedMem + 0x19266 adds r0, r1 movs r1, 0x2 bl sub_80C857C @@ -676,14 +676,14 @@ _080C8A64: b _080C8AC2 .align 2, 0 _080C8A8C: .4byte gContestPlayerMonIndex -_080C8A90: .4byte 0x02019266 +_080C8A90: .4byte gSharedMem + 0x19266 _080C8A94: bl sub_80C85D8 lsls r0, 24 cmp r0, 0 beq _080C8AC2 ldr r1, _080C8AC8 @ =gBlockRecvBuffer - ldr r3, _080C8ACC @ =0x02019266 + ldr r3, _080C8ACC @ =gSharedMem + 0x19266 movs r4, 0x80 lsls r4, 1 movs r2, 0x3 @@ -707,7 +707,7 @@ _080C8AC2: bx r0 .align 2, 0 _080C8AC8: .4byte gBlockRecvBuffer -_080C8ACC: .4byte 0x02019266 +_080C8ACC: .4byte gSharedMem + 0x19266 thumb_func_end sub_80C8A38 thumb_func_start sub_80C8AD0 @@ -954,12 +954,12 @@ _080C8CE0: bne _080C8CEC b _080C8E16 _080C8CEC: - ldr r0, _080C8CF8 @ =0x02019260 + ldr r0, _080C8CF8 @ =gSharedMem + 0x19260 movs r1, 0x70 bl sub_80C857C b _080C8DE8 .align 2, 0 -_080C8CF8: .4byte 0x02019260 +_080C8CF8: .4byte gSharedMem + 0x19260 _080C8CFC: bl sub_80C85D8 lsls r0, 24 @@ -967,7 +967,7 @@ _080C8CFC: bne _080C8D08 b _080C8E16 _080C8D08: - ldr r0, _080C8D18 @ =0x02019260 + ldr r0, _080C8D18 @ =gSharedMem + 0x19260 ldr r1, _080C8D1C @ =gUnknown_0203869B ldrb r1, [r1] lsls r1, 8 @@ -976,7 +976,7 @@ _080C8D08: movs r2, 0x70 b _080C8DE4 .align 2, 0 -_080C8D18: .4byte 0x02019260 +_080C8D18: .4byte gSharedMem + 0x19260 _080C8D1C: .4byte gUnknown_0203869B _080C8D20: .4byte gBlockRecvBuffer _080C8D24: @@ -1002,18 +1002,18 @@ _080C8D46: lsls r0, 24 cmp r0, 0 beq _080C8E16 - ldr r0, _080C8D5C @ =0x020192d0 + ldr r0, _080C8D5C @ =gSharedMem + 0x192D0 movs r1, 0x14 bl sub_80C857C b _080C8DE8 .align 2, 0 -_080C8D5C: .4byte 0x020192d0 +_080C8D5C: .4byte gSharedMem + 0x192D0 _080C8D60: bl sub_80C85D8 lsls r0, 24 cmp r0, 0 beq _080C8E16 - ldr r0, _080C8D7C @ =0x020192d0 + ldr r0, _080C8D7C @ =gSharedMem + 0x192D0 ldr r1, _080C8D80 @ =gUnknown_0203869B ldrb r1, [r1] lsls r1, 8 @@ -1022,7 +1022,7 @@ _080C8D60: movs r2, 0x14 b _080C8DE4 .align 2, 0 -_080C8D7C: .4byte 0x020192d0 +_080C8D7C: .4byte gSharedMem + 0x192D0 _080C8D80: .4byte gUnknown_0203869B _080C8D84: .4byte gBlockRecvBuffer _080C8D88: @@ -1030,21 +1030,21 @@ _080C8D88: lsls r0, 24 cmp r0, 0 beq _080C8E16 - ldr r0, _080C8D9C @ =0x02019328 + ldr r0, _080C8D9C @ =gSharedMem + 0x19328 movs r1, 0x4 bl sub_80C857C b _080C8DE8 .align 2, 0 -_080C8D9C: .4byte 0x02019328 +_080C8D9C: .4byte gSharedMem + 0x19328 _080C8DA0: bl sub_80C85D8 lsls r0, 24 cmp r0, 0 beq _080C8E16 - ldr r0, _080C8DB0 @ =0x02019328 + ldr r0, _080C8DB0 @ =gSharedMem + 0x19328 b _080C8DD8 .align 2, 0 -_080C8DB0: .4byte 0x02019328 +_080C8DB0: .4byte gSharedMem + 0x19328 _080C8DB4: bl sub_8007ECC lsls r0, 24 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 7bb496641..d97fc58ad 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -192,7 +192,7 @@ _080E6254: .4byte gSpecialVar_0x8005 _080E6258: .4byte gSaveBlock1 + 0x2750 _080E625C: .4byte sub_80546B8 _080E6260: - ldr r1, _080E628C @ =0x02001000 + ldr r1, _080E628C @ =gSharedMem + 0x1000 ldr r0, _080E6290 @ =0x00009c7c adds r2, r1, r0 ldr r0, _080E6294 @ =0x0000ffff @@ -216,7 +216,7 @@ _080E6284: pop {r0} bx r0 .align 2, 0 -_080E628C: .4byte 0x02001000 +_080E628C: .4byte gSharedMem + 0x1000 _080E6290: .4byte 0x00009c7c _080E6294: .4byte 0x0000ffff _080E6298: .4byte 0x00009c7e @@ -228,7 +228,7 @@ sub_80E62A0: @ 80E62A0 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _080E62DC @ =0x02001000 + ldr r4, _080E62DC @ =gSharedMem + 0x1000 str r2, [r4] str r1, [r4, 0x4] strb r0, [r4, 0x8] @@ -256,7 +256,7 @@ _080E62D0: pop {r0} bx r0 .align 2, 0 -_080E62DC: .4byte 0x02001000 +_080E62DC: .4byte gSharedMem + 0x1000 _080E62E0: .4byte 0x00009c7c _080E62E4: .4byte gSaveBlock1 _080E62E8: .4byte 0x00002dd8 @@ -393,7 +393,7 @@ _080E6420: .4byte 0x0000043c thumb_func_start sub_80E6424 sub_80E6424: @ 80E6424 push {lr} - ldr r2, _080E6444 @ =0x02001000 + ldr r2, _080E6444 @ =gSharedMem + 0x1000 ldr r0, _080E6448 @ =gUnknown_083DB6A4 ldrb r1, [r2, 0x8] adds r1, r0 @@ -409,7 +409,7 @@ sub_80E6424: @ 80E6424 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E6444: .4byte 0x02001000 +_080E6444: .4byte gSharedMem + 0x1000 _080E6448: .4byte gUnknown_083DB6A4 _080E644C: .4byte _080E6450 .align 2, 0 @@ -550,11 +550,11 @@ sub_80E6554: @ 80E6554 sub sp, 0x4 movs r4, 0 movs r7, 0 - ldr r0, _080E6564 @ =0x02001000 + ldr r0, _080E6564 @ =gSharedMem + 0x1000 mov r12, r0 b _080E656E .align 2, 0 -_080E6564: .4byte 0x02001000 +_080E6564: .4byte gSharedMem + 0x1000 _080E6568: adds r0, r7, 0x1 lsls r0, 16 @@ -640,7 +640,7 @@ _080E65FC: subs r0, 0x11 adds r0, r2 strb r1, [r0] - ldr r0, _080E662C @ =0x02001000 + ldr r0, _080E662C @ =gSharedMem + 0x1000 mov r12, r0 _080E6608: adds r0, r4, 0x1 @@ -662,7 +662,7 @@ _080E6612: pop {r0} bx r0 .align 2, 0 -_080E662C: .4byte 0x02001000 +_080E662C: .4byte gSharedMem + 0x1000 thumb_func_end sub_80E6554 thumb_func_start sub_80E6630 @@ -683,7 +683,7 @@ _080E6638: lsls r0, r1, 3 subs r0, r1 lsls r4, r0, 1 - ldr r6, _080E6668 @ =0x02001040 + ldr r6, _080E6668 @ =gSharedMem + 0x1040 _080E6650: adds r0, r5, r3 ldrb r1, [r0] @@ -697,7 +697,7 @@ _080E6650: b _080E6672 .align 2, 0 _080E6664: .4byte gUnknown_083DB6B2 -_080E6668: .4byte 0x02001040 +_080E6668: .4byte gSharedMem + 0x1040 _080E666C: adds r0, r3, r4 adds r0, r6 @@ -733,7 +733,7 @@ sub_80E6690: @ 80E6690 movs r5, 0 ldr r6, _080E66E4 @ =gUnknown_083DB7C0 _080E66A4: - ldr r0, _080E66E8 @ =0x02001000 + ldr r0, _080E66E8 @ =gSharedMem + 0x1000 ldrb r0, [r0, 0x8] lsls r0, 1 adds r0, r5, r0 @@ -764,7 +764,7 @@ _080E66A4: .align 2, 0 _080E66E0: .4byte gUnknown_083DB7DC _080E66E4: .4byte gUnknown_083DB7C0 -_080E66E8: .4byte 0x02001000 +_080E66E8: .4byte gSharedMem + 0x1000 _080E66EC: .4byte gUnknown_083DB6F4 _080E66F0: strb r0, [r3] @@ -786,7 +786,7 @@ _080E670A: cmp r5, 0x1 bls _080E66A4 movs r5, 0 - ldr r3, _080E6758 @ =0x02001000 + ldr r3, _080E6758 @ =gSharedMem + 0x1000 ldr r0, _080E675C @ =0x00009da4 adds r2, r3, r0 movs r1, 0 @@ -820,7 +820,7 @@ _080E671E: pop {r0} bx r0 .align 2, 0 -_080E6758: .4byte 0x02001000 +_080E6758: .4byte gSharedMem + 0x1000 _080E675C: .4byte 0x00009da4 _080E6760: .4byte 0x00009f6e thumb_func_end sub_80E6690 @@ -930,19 +930,19 @@ _080E6828: .4byte gSaveBlock1 + 0x2D8C thumb_func_start sub_80E682C sub_80E682C: @ 80E682C - ldr r1, _080E6838 @ =0x02001000 + ldr r1, _080E6838 @ =gSharedMem + 0x1000 str r0, [r1, 0x20] movs r0, 0 strh r0, [r1, 0x24] bx lr .align 2, 0 -_080E6838: .4byte 0x02001000 +_080E6838: .4byte gSharedMem + 0x1000 thumb_func_end sub_80E682C thumb_func_start sub_80E683C sub_80E683C: @ 80E683C push {r4,r5,lr} - ldr r1, _080E6890 @ =0x02001000 + ldr r1, _080E6890 @ =gSharedMem + 0x1000 adds r0, r1, 0 adds r0, 0x26 ldrb r0, [r0] @@ -985,7 +985,7 @@ _080E6876: strb r0, [r3] b _080E68B8 .align 2, 0 -_080E6890: .4byte 0x02001000 +_080E6890: .4byte gSharedMem + 0x1000 _080E6894: .4byte 0x000001a9 _080E6898: movs r3, 0xD5 @@ -1032,7 +1032,7 @@ _080E68E4: .4byte 0x000001a9 sub_80E68E8: @ 80E68E8 push {r4-r6,lr} bl sub_80EB0B0 - ldr r3, _080E694C @ =0x02001000 + ldr r3, _080E694C @ =gSharedMem + 0x1000 adds r0, r3, 0 adds r0, 0x26 ldrb r0, [r0] @@ -1082,7 +1082,7 @@ _080E693A: ldr r3, _080E6950 @ =0x00004178 b _080E69AC .align 2, 0 -_080E694C: .4byte 0x02001000 +_080E694C: .4byte gSharedMem + 0x1000 _080E6950: .4byte 0x00004178 _080E6954: .4byte 0x00009a28 _080E6958: .4byte 0x000099a6 @@ -1167,7 +1167,7 @@ _080E69F4: .4byte 0x00009a29 thumb_func_start sub_80E69F8 sub_80E69F8: @ 80E69F8 push {r4,lr} - ldr r0, _080E6A10 @ =0x02001000 + ldr r0, _080E6A10 @ =gSharedMem + 0x1000 ldrb r1, [r0, 0x8] adds r4, r0, 0 cmp r1, 0xD @@ -1178,7 +1178,7 @@ sub_80E69F8: @ 80E69F8 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E6A10: .4byte 0x02001000 +_080E6A10: .4byte gSharedMem + 0x1000 _080E6A14: .4byte _080E6A18 .align 2, 0 _080E6A18: @@ -1227,7 +1227,7 @@ sub_80E6A6C: @ 80E6A6C thumb_func_start sub_80E6A88 sub_80E6A88: @ 80E6A88 push {lr} - ldr r0, _080E6AA4 @ =0x02001000 + ldr r0, _080E6AA4 @ =gSharedMem + 0x1000 ldr r0, [r0, 0x20] bl _call_via_r0 bl AnimateSprites @@ -1236,7 +1236,7 @@ sub_80E6A88: @ 80E6A88 pop {r0} bx r0 .align 2, 0 -_080E6AA4: .4byte 0x02001000 +_080E6AA4: .4byte gSharedMem + 0x1000 thumb_func_end sub_80E6A88 thumb_func_start sub_80E6AA8 @@ -1275,7 +1275,7 @@ _080E6AE0: .4byte sub_80E6AE4 sub_80E6AE4: @ 80E6AE4 push {r4,r5,lr} bl sub_80E75D8 - ldr r4, _080E6B44 @ =0x02001000 + ldr r4, _080E6B44 @ =gSharedMem + 0x1000 adds r1, r4, 0 adds r1, 0x87 strb r0, [r1] @@ -1320,7 +1320,7 @@ _080E6AFE: beq _080E6B52 b _080E6BA4 .align 2, 0 -_080E6B44: .4byte 0x02001000 +_080E6B44: .4byte gSharedMem + 0x1000 _080E6B48: .4byte gMain _080E6B4C: cmp r0, 0x2 @@ -1383,7 +1383,7 @@ _080E6BBC: .4byte sub_80E6C84 thumb_func_start sub_80E6BC0 sub_80E6BC0: @ 80E6BC0 push {r4,lr} - ldr r4, _080E6BD4 @ =0x02001000 + ldr r4, _080E6BD4 @ =gSharedMem + 0x1000 ldrh r0, [r4, 0x24] cmp r0, 0x1 beq _080E6C12 @@ -1393,7 +1393,7 @@ sub_80E6BC0: @ 80E6BC0 beq _080E6BE2 b _080E6C76 .align 2, 0 -_080E6BD4: .4byte 0x02001000 +_080E6BD4: .4byte gSharedMem + 0x1000 _080E6BD8: cmp r0, 0x2 beq _080E6C54 @@ -1448,13 +1448,13 @@ _080E6C3E: strh r0, [r4, 0x24] b _080E6C76 _080E6C46: - ldr r1, _080E6C50 @ =0x02001000 + ldr r1, _080E6C50 @ =gSharedMem + 0x1000 ldrh r0, [r1, 0x24] adds r0, 0x1 strh r0, [r1, 0x24] b _080E6C76 .align 2, 0 -_080E6C50: .4byte 0x02001000 +_080E6C50: .4byte gSharedMem + 0x1000 _080E6C54: bl sub_80E81FC ldr r0, _080E6C60 @ =sub_80E6AC4 @@ -1483,7 +1483,7 @@ _080E6C80: .4byte sub_80E6AC4 thumb_func_start sub_80E6C84 sub_80E6C84: @ 80E6C84 push {r4,lr} - ldr r4, _080E6C98 @ =0x02001000 + ldr r4, _080E6C98 @ =gSharedMem + 0x1000 ldrh r0, [r4, 0x24] cmp r0, 0x1 beq _080E6CF4 @@ -1493,7 +1493,7 @@ sub_80E6C84: @ 80E6C84 beq _080E6CA6 b _080E6D72 .align 2, 0 -_080E6C98: .4byte 0x02001000 +_080E6C98: .4byte gSharedMem + 0x1000 _080E6C9C: cmp r0, 0x2 beq _080E6D24 @@ -1531,12 +1531,12 @@ _080E6CA6: cmp r0, 0xD bne _080E6D1C _080E6CE8: - ldr r1, _080E6CF0 @ =0x02001000 + ldr r1, _080E6CF0 @ =gSharedMem + 0x1000 movs r0, 0x2 strh r0, [r1, 0x24] b _080E6D72 .align 2, 0 -_080E6CF0: .4byte 0x02001000 +_080E6CF0: .4byte gSharedMem + 0x1000 _080E6CF4: bl ProcessMenuInputNoWrap_ lsls r0, 24 @@ -1588,12 +1588,12 @@ _080E6D44: _080E6D50: .4byte gScriptResult _080E6D54: .4byte sub_80E752C _080E6D58: - ldr r1, _080E6D60 @ =0x02001000 + ldr r1, _080E6D60 @ =gSharedMem + 0x1000 movs r0, 0xFF strh r0, [r1, 0x24] b _080E6D72 .align 2, 0 -_080E6D60: .4byte 0x02001000 +_080E6D60: .4byte gSharedMem + 0x1000 _080E6D64: bl HandleDestroyMenuCursors bl sub_80E81FC @@ -1610,7 +1610,7 @@ _080E6D78: .4byte sub_80E6AC4 thumb_func_start sub_80E6D7C sub_80E6D7C: @ 80E6D7C push {r4-r7,lr} - ldr r5, _080E6D98 @ =0x02001000 + ldr r5, _080E6D98 @ =gSharedMem + 0x1000 ldrh r0, [r5, 0x24] cmp r0, 0xA bne _080E6D88 @@ -1624,7 +1624,7 @@ _080E6D88: beq _080E6E3C b _080E6F5E .align 2, 0 -_080E6D98: .4byte 0x02001000 +_080E6D98: .4byte gSharedMem + 0x1000 _080E6D9C: cmp r0, 0x65 bne _080E6DA2 @@ -1680,7 +1680,7 @@ _080E6DEE: .align 2, 0 _080E6DF8: .4byte 0x0000ffff _080E6DFC: - ldr r0, _080E6E18 @ =0x02001000 + ldr r0, _080E6E18 @ =gSharedMem + 0x1000 ldrb r0, [r0, 0x8] cmp r0, 0x4 bne _080E6E20 @@ -1692,7 +1692,7 @@ _080E6DFC: bl sub_80E682C b _080E6F5E .align 2, 0 -_080E6E18: .4byte 0x02001000 +_080E6E18: .4byte gSharedMem + 0x1000 _080E6E1C: .4byte sub_80E6C84 _080E6E20: movs r0, 0x1 @@ -1783,7 +1783,7 @@ _080E6ED8: .4byte sub_80E752C _080E6EDC: bl HandleDestroyMenuCursors bl sub_80E81FC - ldr r4, _080E6EFC @ =0x02001000 + ldr r4, _080E6EFC @ =gSharedMem + 0x1000 ldrb r0, [r4, 0x8] cmp r0, 0x6 bne _080E6F00 @@ -1795,7 +1795,7 @@ _080E6EDC: strh r0, [r4, 0x24] b _080E6F5E .align 2, 0 -_080E6EFC: .4byte 0x02001000 +_080E6EFC: .4byte gSharedMem + 0x1000 _080E6F00: bl sub_80E95A4 b _080E6F12 @@ -1827,14 +1827,14 @@ _080E6F30: cmp r0, 0 beq _080E6F5E _080E6F3C: - ldr r1, _080E6F4C @ =0x02001000 + ldr r1, _080E6F4C @ =gSharedMem + 0x1000 ldrh r0, [r1, 0x24] adds r0, 0x1 strh r0, [r1, 0x24] b _080E6F5E .align 2, 0 _080E6F48: .4byte gMain -_080E6F4C: .4byte 0x02001000 +_080E6F4C: .4byte gSharedMem + 0x1000 _080E6F50: bl sub_80E7E50 bl sub_80E95A4 @@ -1851,7 +1851,7 @@ _080E6F64: .4byte sub_80E6AC4 thumb_func_start sub_80E6F68 sub_80E6F68: @ 80E6F68 push {r4,lr} - ldr r4, _080E6F78 @ =0x02001000 + ldr r4, _080E6F78 @ =gSharedMem + 0x1000 ldrh r0, [r4, 0x24] cmp r0, 0 beq _080E6F7C @@ -1859,7 +1859,7 @@ sub_80E6F68: @ 80E6F68 beq _080E6F9C b _080E6FBC .align 2, 0 -_080E6F78: .4byte 0x02001000 +_080E6F78: .4byte gSharedMem + 0x1000 _080E6F7C: movs r0, 0x1 bl sub_80E8398 @@ -1897,7 +1897,7 @@ sub_80E6FC8: @ 80E6FC8 push {r4,lr} bl sub_80E77C8 adds r1, r0, 0 - ldr r4, _080E7000 @ =0x02001000 + ldr r4, _080E7000 @ =gSharedMem + 0x1000 adds r0, r4, 0 adds r0, 0x96 strb r1, [r0] @@ -1920,7 +1920,7 @@ sub_80E6FC8: @ 80E6FC8 bl sub_80E682C b _080E710A .align 2, 0 -_080E7000: .4byte 0x02001000 +_080E7000: .4byte gSharedMem + 0x1000 _080E7004: .4byte sub_80E6FC8 _080E7008: .4byte sub_80E7458 _080E700C: @@ -2055,7 +2055,7 @@ _080E7110: .4byte sub_80E718C thumb_func_start sub_80E7114 sub_80E7114: @ 80E7114 push {lr} - ldr r0, _080E712C @ =0x02001000 + ldr r0, _080E712C @ =gSharedMem + 0x1000 ldrh r1, [r0, 0x24] adds r2, r0, 0 cmp r1, 0x4 @@ -2066,7 +2066,7 @@ sub_80E7114: @ 80E7114 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E712C: .4byte 0x02001000 +_080E712C: .4byte gSharedMem + 0x1000 _080E7130: .4byte _080E7134 .align 2, 0 _080E7134: @@ -2093,13 +2093,13 @@ _080E7164: cmp r0, 0 beq _080E7182 _080E716E: - ldr r1, _080E7178 @ =0x02001000 + ldr r1, _080E7178 @ =gSharedMem + 0x1000 ldrh r0, [r1, 0x24] adds r0, 0x1 strh r0, [r1, 0x24] b _080E7182 .align 2, 0 -_080E7178: .4byte 0x02001000 +_080E7178: .4byte gSharedMem + 0x1000 _080E717C: ldr r0, _080E7188 @ =sub_80E6AC4 bl sub_80E682C @@ -2113,7 +2113,7 @@ _080E7188: .4byte sub_80E6AC4 thumb_func_start sub_80E718C sub_80E718C: @ 80E718C push {r4,lr} - ldr r0, _080E71A4 @ =0x02001000 + ldr r0, _080E71A4 @ =gSharedMem + 0x1000 ldrh r1, [r0, 0x24] adds r4, r0, 0 cmp r1, 0x1 @@ -2124,7 +2124,7 @@ sub_80E718C: @ 80E718C beq _080E71AE b _080E71EC .align 2, 0 -_080E71A4: .4byte 0x02001000 +_080E71A4: .4byte gSharedMem + 0x1000 _080E71A8: cmp r1, 0x8 beq _080E71F4 @@ -2181,7 +2181,7 @@ _080E7214: .4byte sub_80E6FC8 thumb_func_start sub_80E7218 sub_80E7218: @ 80E7218 push {r4,lr} - ldr r4, _080E7230 @ =0x02001000 + ldr r4, _080E7230 @ =gSharedMem + 0x1000 ldrh r0, [r4, 0x24] adds r1, r4, 0 cmp r0, 0x9 @@ -2192,7 +2192,7 @@ sub_80E7218: @ 80E7218 beq _080E7244 b _080E723C .align 2, 0 -_080E7230: .4byte 0x02001000 +_080E7230: .4byte gSharedMem + 0x1000 _080E7234: cmp r0, 0xA beq _080E7276 @@ -2243,7 +2243,7 @@ sub_80E7294: @ 80E7294 push {r4,lr} bl sub_80E7B40 adds r1, r0, 0 - ldr r4, _080E72CC @ =0x02001000 + ldr r4, _080E72CC @ =gSharedMem + 0x1000 ldr r2, _080E72D0 @ =0x000001b9 adds r0, r4, r2 strb r1, [r0] @@ -2265,7 +2265,7 @@ sub_80E7294: @ 80E7294 bl sub_80E682C b _080E731A .align 2, 0 -_080E72CC: .4byte 0x02001000 +_080E72CC: .4byte gSharedMem + 0x1000 _080E72D0: .4byte 0x000001b9 _080E72D4: .4byte sub_80E7294 _080E72D8: .4byte sub_80E7458 @@ -2308,7 +2308,7 @@ _080E7320: .4byte sub_80E73D0 thumb_func_start sub_80E7324 sub_80E7324: @ 80E7324 push {lr} - ldr r0, _080E733C @ =0x02001000 + ldr r0, _080E733C @ =gSharedMem + 0x1000 ldrh r1, [r0, 0x24] adds r2, r0, 0 cmp r1, 0x4 @@ -2319,7 +2319,7 @@ sub_80E7324: @ 80E7324 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E733C: .4byte 0x02001000 +_080E733C: .4byte gSharedMem + 0x1000 _080E7340: .4byte _080E7344 .align 2, 0 _080E7344: @@ -2357,13 +2357,13 @@ _080E738A: cmp r0, 0 beq _080E73C6 _080E7394: - ldr r1, _080E73A0 @ =0x02001000 + ldr r1, _080E73A0 @ =gSharedMem + 0x1000 ldrh r0, [r1, 0x24] adds r0, 0x1 strh r0, [r1, 0x24] b _080E73C6 .align 2, 0 -_080E73A0: .4byte 0x02001000 +_080E73A0: .4byte gSharedMem + 0x1000 _080E73A4: ldrb r0, [r2, 0x8] cmp r0, 0x6 @@ -2390,7 +2390,7 @@ _080E73CC: .4byte sub_80E6AC4 thumb_func_start sub_80E73D0 sub_80E73D0: @ 80E73D0 push {lr} - ldr r0, _080E73E4 @ =0x02001000 + ldr r0, _080E73E4 @ =gSharedMem + 0x1000 ldrh r0, [r0, 0x24] cmp r0, 0x4 bhi _080E744E @@ -2400,7 +2400,7 @@ sub_80E73D0: @ 80E73D0 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E73E4: .4byte 0x02001000 +_080E73E4: .4byte gSharedMem + 0x1000 _080E73E8: .4byte _080E73EC .align 2, 0 _080E73EC: @@ -2432,13 +2432,13 @@ _080E742C: movs r0, 0 bl sub_80E8958 _080E7436: - ldr r1, _080E7440 @ =0x02001000 + ldr r1, _080E7440 @ =gSharedMem + 0x1000 ldrh r0, [r1, 0x24] adds r0, 0x1 strh r0, [r1, 0x24] b _080E744E .align 2, 0 -_080E7440: .4byte 0x02001000 +_080E7440: .4byte gSharedMem + 0x1000 _080E7444: bl sub_80E9974 ldr r0, _080E7454 @ =sub_80E6FC8 @@ -2453,7 +2453,7 @@ _080E7454: .4byte sub_80E6FC8 thumb_func_start sub_80E7458 sub_80E7458: @ 80E7458 push {r4,r5,lr} - ldr r4, _080E7468 @ =0x02001000 + ldr r4, _080E7468 @ =gSharedMem + 0x1000 ldrh r5, [r4, 0x24] cmp r5, 0 beq _080E746C @@ -2461,7 +2461,7 @@ sub_80E7458: @ 80E7458 beq _080E74A4 b _080E7518 .align 2, 0 -_080E7468: .4byte 0x02001000 +_080E7468: .4byte gSharedMem + 0x1000 _080E746C: movs r1, 0xE2 lsls r1, 1 @@ -2477,7 +2477,7 @@ _080E7480: .4byte sub_80E6FC8 _080E7484: bl sub_80E9D00 _080E7488: - ldr r4, _080E74A0 @ =0x02001000 + ldr r4, _080E74A0 @ =gSharedMem + 0x1000 movs r2, 0xDF lsls r2, 1 adds r0, r4, r2 @@ -2488,7 +2488,7 @@ _080E7488: strh r0, [r4, 0x24] b _080E7518 .align 2, 0 -_080E74A0: .4byte 0x02001000 +_080E74A0: .4byte gSharedMem + 0x1000 _080E74A4: bl sub_80E9E54 lsls r0, 24 @@ -2532,7 +2532,7 @@ _080E74E4: adds r0, r4, r1 _080E74FE: strb r5, [r0] - ldr r1, _080E7528 @ =0x02001000 + ldr r1, _080E7528 @ =gSharedMem + 0x1000 movs r0, 0xDF lsls r0, 1 adds r2, r1, r0 @@ -2550,14 +2550,14 @@ _080E7518: .align 2, 0 _080E7520: .4byte 0x00009a29 _080E7524: .4byte 0x000001b9 -_080E7528: .4byte 0x02001000 +_080E7528: .4byte gSharedMem + 0x1000 thumb_func_end sub_80E7458 thumb_func_start sub_80E752C sub_80E752C: @ 80E752C push {r4,lr} sub sp, 0x4 - ldr r4, _080E7540 @ =0x02001000 + ldr r4, _080E7540 @ =gSharedMem + 0x1000 ldrh r1, [r4, 0x24] cmp r1, 0 beq _080E7544 @@ -2565,7 +2565,7 @@ sub_80E752C: @ 80E752C beq _080E755C b _080E756C .align 2, 0 -_080E7540: .4byte 0x02001000 +_080E7540: .4byte gSharedMem + 0x1000 _080E7544: movs r0, 0x1 negs r0, r0 @@ -2595,7 +2595,7 @@ _080E756C: thumb_func_start sub_80E7574 sub_80E7574: @ 80E7574 push {r4,r5,lr} - ldr r4, _080E75B8 @ =0x02001000 + ldr r4, _080E75B8 @ =gSharedMem + 0x1000 ldrb r5, [r4, 0x8] cmp r5, 0x1 bne _080E75BC @@ -2628,9 +2628,9 @@ sub_80E7574: @ 80E7574 adds r1, r4, 0 b _080E75C6 .align 2, 0 -_080E75B8: .4byte 0x02001000 +_080E75B8: .4byte gSharedMem + 0x1000 _080E75BC: - ldr r1, _080E75D4 @ =0x02001000 + ldr r1, _080E75D4 @ =gSharedMem + 0x1000 adds r2, r1, 0 adds r2, 0x7D movs r0, 0 @@ -2643,7 +2643,7 @@ _080E75C6: pop {r0} bx r0 .align 2, 0 -_080E75D4: .4byte 0x02001000 +_080E75D4: .4byte gSharedMem + 0x1000 thumb_func_end sub_80E7574 thumb_func_start sub_80E75D8 @@ -2656,7 +2656,7 @@ sub_80E75D8: @ 80E75D8 ands r0, r1 cmp r0, 0 beq _080E7604 - ldr r1, _080E7600 @ =0x02001000 + ldr r1, _080E7600 @ =gSharedMem + 0x1000 adds r0, r1, 0 adds r0, 0x84 ldrb r0, [r0] @@ -2668,14 +2668,14 @@ sub_80E75D8: @ 80E75D8 b _080E768E .align 2, 0 _080E75FC: .4byte gMain -_080E7600: .4byte 0x02001000 +_080E7600: .4byte gSharedMem + 0x1000 _080E7604: ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _080E7630 - ldr r2, _080E762C @ =0x02001000 + ldr r2, _080E762C @ =gSharedMem + 0x1000 adds r1, r2, 0 adds r1, 0x86 ldrb r0, [r1] @@ -2690,13 +2690,13 @@ _080E7604: strb r0, [r1] b _080E765C .align 2, 0 -_080E762C: .4byte 0x02001000 +_080E762C: .4byte gSharedMem + 0x1000 _080E7630: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _080E7658 - ldr r0, _080E7684 @ =0x02001000 + ldr r0, _080E7684 @ =gSharedMem + 0x1000 adds r3, r0, 0 adds r3, 0x86 ldrb r1, [r3] @@ -2717,7 +2717,7 @@ _080E7658: cmp r4, 0 beq _080E76EA _080E765C: - ldr r2, _080E7684 @ =0x02001000 + ldr r2, _080E7684 @ =gSharedMem + 0x1000 ldrb r3, [r2, 0x9] cmp r3, 0x2 bne _080E7692 @@ -2738,7 +2738,7 @@ _080E765C: strb r3, [r0] b _080E77BC .align 2, 0 -_080E7684: .4byte 0x02001000 +_080E7684: .4byte gSharedMem + 0x1000 _080E7688: adds r1, r2, 0 adds r1, 0x85 @@ -2800,7 +2800,7 @@ _080E76EA: lsrs r4, r0, 16 cmp r4, 0 beq _080E7744 - ldr r2, _080E7728 @ =0x02001000 + ldr r2, _080E7728 @ =gSharedMem + 0x1000 adds r3, r2, 0 adds r3, 0x85 ldrb r0, [r3] @@ -2825,7 +2825,7 @@ _080E76EA: movs r0, 0x2 b _080E77BA .align 2, 0 -_080E7728: .4byte 0x02001000 +_080E7728: .4byte gSharedMem + 0x1000 _080E772C: adds r0, r2, 0 adds r0, 0x83 @@ -2844,7 +2844,7 @@ _080E7744: ands r0, r2 cmp r0, 0 beq _080E77C0 - ldr r2, _080E777C @ =0x02001000 + ldr r2, _080E777C @ =gSharedMem + 0x1000 adds r5, r2, 0 adds r5, 0x86 adds r0, r2, 0 @@ -2868,7 +2868,7 @@ _080E7744: strb r4, [r1] b _080E77BC .align 2, 0 -_080E777C: .4byte 0x02001000 +_080E777C: .4byte gSharedMem + 0x1000 _080E7780: adds r3, r2, 0 adds r3, 0x85 @@ -2921,7 +2921,7 @@ sub_80E77C8: @ 80E77C8 mov r6, r8 push {r6,r7} movs r7, 0 - ldr r1, _080E780C @ =0x02001000 + ldr r1, _080E780C @ =gSharedMem + 0x1000 ldr r2, _080E7810 @ =0x000001b7 adds r0, r1, r2 ldrb r0, [r0] @@ -2952,7 +2952,7 @@ _080E7806: strb r0, [r1] b _080E7948 .align 2, 0 -_080E780C: .4byte 0x02001000 +_080E780C: .4byte gSharedMem + 0x1000 _080E7810: .4byte 0x000001b7 _080E7814: .4byte gMain _080E7818: @@ -3301,7 +3301,7 @@ _080E7A8A: thumb_func_start sub_80E7A98 sub_80E7A98: @ 80E7A98 push {lr} - ldr r1, _080E7ACC @ =0x02001000 + ldr r1, _080E7ACC @ =gSharedMem + 0x1000 ldr r0, _080E7AD0 @ =0x000001a9 adds r3, r1, r0 movs r2, 0xD4 @@ -3327,14 +3327,14 @@ _080E7AC6: pop {r0} bx r0 .align 2, 0 -_080E7ACC: .4byte 0x02001000 +_080E7ACC: .4byte gSharedMem + 0x1000 _080E7AD0: .4byte 0x000001a9 thumb_func_end sub_80E7A98 thumb_func_start sub_80E7AD4 sub_80E7AD4: @ 80E7AD4 push {lr} - ldr r3, _080E7B08 @ =0x02001000 + ldr r3, _080E7B08 @ =gSharedMem + 0x1000 adds r0, r3, 0 adds r0, 0x26 ldrb r0, [r0] @@ -3359,7 +3359,7 @@ sub_80E7AD4: @ 80E7AD4 adds r2, 0x10 b _080E7B34 .align 2, 0 -_080E7B08: .4byte 0x02001000 +_080E7B08: .4byte gSharedMem + 0x1000 _080E7B0C: .4byte 0x000001a9 _080E7B10: ldr r1, _080E7B3C @ =0x000001a9 @@ -3393,7 +3393,7 @@ _080E7B3C: .4byte 0x000001a9 sub_80E7B40: @ 80E7B40 push {r4-r7,lr} movs r5, 0 - ldr r2, _080E7B8C @ =0x02001000 + ldr r2, _080E7B8C @ =gSharedMem + 0x1000 movs r0, 0xE0 lsls r0, 1 adds r6, r2, r0 @@ -3430,7 +3430,7 @@ _080E7B6E: strb r0, [r6] b _080E7D1A .align 2, 0 -_080E7B8C: .4byte 0x02001000 +_080E7B8C: .4byte gSharedMem + 0x1000 _080E7B90: .4byte gMain _080E7B94: .4byte 0x000099a4 _080E7B98: .4byte 0x00009a29 @@ -3646,7 +3646,7 @@ _080E7D2C: .4byte 0x000099a4 thumb_func_start sub_80E7D30 sub_80E7D30: @ 80E7D30 push {r4,lr} - ldr r0, _080E7D60 @ =0x02001000 + ldr r0, _080E7D60 @ =gSharedMem + 0x1000 ldr r1, _080E7D64 @ =0x000099a5 adds r4, r0, r1 ldr r2, _080E7D68 @ =0x000099a4 @@ -3671,7 +3671,7 @@ _080E7D5A: pop {r0} bx r0 .align 2, 0 -_080E7D60: .4byte 0x02001000 +_080E7D60: .4byte gSharedMem + 0x1000 _080E7D64: .4byte 0x000099a5 _080E7D68: .4byte 0x000099a4 thumb_func_end sub_80E7D30 @@ -3680,7 +3680,7 @@ _080E7D68: .4byte 0x000099a4 sub_80E7D6C: @ 80E7D6C push {r4,r5,lr} movs r4, 0 - ldr r0, _080E7D94 @ =0x02001000 + ldr r0, _080E7D94 @ =gSharedMem + 0x1000 ldrb r1, [r0, 0xA] cmp r4, r1 bcs _080E7D8E @@ -3700,7 +3700,7 @@ _080E7D8E: pop {r0} bx r0 .align 2, 0 -_080E7D94: .4byte 0x02001000 +_080E7D94: .4byte gSharedMem + 0x1000 _080E7D98: .4byte 0x0000ffff thumb_func_end sub_80E7D6C @@ -3708,7 +3708,7 @@ _080E7D98: .4byte 0x0000ffff sub_80E7D9C: @ 80E7D9C push {r4,r5,lr} movs r2, 0 - ldr r0, _080E7DCC @ =0x02001000 + ldr r0, _080E7DCC @ =gSharedMem + 0x1000 ldrb r1, [r0, 0xA] cmp r2, r1 bcs _080E7DC6 @@ -3733,13 +3733,13 @@ _080E7DC6: pop {r0} bx r0 .align 2, 0 -_080E7DCC: .4byte 0x02001000 +_080E7DCC: .4byte gSharedMem + 0x1000 thumb_func_end sub_80E7D9C thumb_func_start sub_80E7DD0 sub_80E7DD0: @ 80E7DD0 push {r4,lr} - ldr r2, _080E7E28 @ =0x02001000 + ldr r2, _080E7E28 @ =gSharedMem + 0x1000 ldr r1, _080E7E2C @ =0x000099a5 adds r0, r2, r1 movs r1, 0 @@ -3781,11 +3781,11 @@ sub_80E7DD0: @ 80E7DD0 movs r0, 0 b _080E7E46 .align 2, 0 -_080E7E28: .4byte 0x02001000 +_080E7E28: .4byte gSharedMem + 0x1000 _080E7E2C: .4byte 0x000099a5 _080E7E30: .4byte 0x000099a4 _080E7E34: - ldr r0, _080E7E4C @ =0x02001000 + ldr r0, _080E7E4C @ =gSharedMem + 0x1000 adds r0, 0x27 ldrb r0, [r0] adds r1, r4, 0 @@ -3797,7 +3797,7 @@ _080E7E46: pop {r1} bx r1 .align 2, 0 -_080E7E4C: .4byte 0x02001000 +_080E7E4C: .4byte gSharedMem + 0x1000 thumb_func_end sub_80E7DD0 thumb_func_start sub_80E7E50 @@ -3810,7 +3810,7 @@ sub_80E7E50: @ 80E7E50 sub sp, 0x8 movs r5, 0 movs r2, 0 - ldr r1, _080E7EF0 @ =0x02001000 + ldr r1, _080E7EF0 @ =gSharedMem + 0x1000 adds r3, r1, 0 adds r3, 0x84 movs r0, 0 @@ -3827,7 +3827,7 @@ _080E7E74: movs r1, 0 strb r1, [r0] movs r3, 0 - ldr r6, _080E7EF4 @ =0x02001083 + ldr r6, _080E7EF4 @ =gSharedMem + 0x1083 movs r0, 0 ldrsb r0, [r6, r0] adds r1, r2, 0x1 @@ -3838,9 +3838,9 @@ _080E7E74: mov r12, r6 movs r0, 0 mov r10, r0 - ldr r1, _080E7EF4 @ =0x02001083 + ldr r1, _080E7EF4 @ =gSharedMem + 0x1083 mov r9, r1 - ldr r7, _080E7EF8 @ =0x0200100c + ldr r7, _080E7EF8 @ =gSharedMem + 0x100C lsls r4, r2, 1 _080E7E9E: lsls r1, r5, 1 @@ -3871,7 +3871,7 @@ _080E7ECE: ldr r1, [sp, 0x4] lsls r0, r1, 16 lsrs r2, r0, 16 - ldr r6, _080E7EFC @ =0x02001084 + ldr r6, _080E7EFC @ =gSharedMem + 0x1084 movs r0, 0 ldrsb r0, [r6, r0] cmp r2, r0 @@ -3886,10 +3886,10 @@ _080E7EDE: pop {r0} bx r0 .align 2, 0 -_080E7EF0: .4byte 0x02001000 -_080E7EF4: .4byte 0x02001083 -_080E7EF8: .4byte 0x0200100c -_080E7EFC: .4byte 0x02001084 +_080E7EF0: .4byte gSharedMem + 0x1000 +_080E7EF4: .4byte gSharedMem + 0x1083 +_080E7EF8: .4byte gSharedMem + 0x100C +_080E7EFC: .4byte gSharedMem + 0x1084 thumb_func_end sub_80E7E50 thumb_func_start sub_80E7F00 @@ -3903,7 +3903,7 @@ sub_80E7F00: @ 80E7F00 lsls r1, 16 lsrs r1, 16 mov r9, r1 - ldr r7, _080E7F68 @ =0x02001000 + ldr r7, _080E7F68 @ =gSharedMem + 0x1000 adds r0, r7, 0 adds r0, 0x83 movs r4, 0 @@ -3943,7 +3943,7 @@ sub_80E7F00: @ 80E7F00 subs r0, 0x1 b _080E7F7A .align 2, 0 -_080E7F68: .4byte 0x02001000 +_080E7F68: .4byte gSharedMem + 0x1000 _080E7F6C: cmp r3, 0x7 bne _080E7F7C @@ -3956,7 +3956,7 @@ _080E7F7A: strb r0, [r1] _080E7F7C: movs r3, 0 - ldr r2, _080E7FA4 @ =0x02001000 + ldr r2, _080E7FA4 @ =gSharedMem + 0x1000 lsls r0, r5, 1 add r0, r8 adds r1, r2, 0 @@ -3975,7 +3975,7 @@ _080E7F7C: pop {r0} bx r0 .align 2, 0 -_080E7FA4: .4byte 0x02001000 +_080E7FA4: .4byte gSharedMem + 0x1000 thumb_func_end sub_80E7F00 thumb_func_start sub_80E7FA8 @@ -3987,7 +3987,7 @@ sub_80E7FA8: @ 80E7FA8 movs r0, 0 mov r8, r0 movs r5, 0 - ldr r0, _080E8040 @ =0x02001000 + ldr r0, _080E8040 @ =gSharedMem + 0x1000 ldrb r1, [r0, 0xA] cmp r8, r1 bcs _080E802E @@ -4043,7 +4043,7 @@ _080E8018: lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r3, _080E8040 @ =0x02001000 + ldr r3, _080E8040 @ =gSharedMem + 0x1000 _080E8024: lsls r0, r4, 16 lsrs r5, r0, 16 @@ -4061,7 +4061,7 @@ _080E802E: pop {r1} bx r1 .align 2, 0 -_080E8040: .4byte 0x02001000 +_080E8040: .4byte gSharedMem + 0x1000 _080E8044: .4byte 0x00009e14 _080E8048: .4byte 0x00009e41 _080E804C: .4byte 0xffff61ec @@ -4072,7 +4072,7 @@ _080E8050: .4byte 0xffff61f8 sub_80E8054: @ 80E8054 push {r4,lr} movs r1, 0 - ldr r2, _080E8078 @ =0x02001000 + ldr r2, _080E8078 @ =gSharedMem + 0x1000 ldrb r0, [r2, 0xA] cmp r1, r0 bcs _080E808A @@ -4089,7 +4089,7 @@ _080E8068: movs r0, 0 b _080E808C .align 2, 0 -_080E8078: .4byte 0x02001000 +_080E8078: .4byte gSharedMem + 0x1000 _080E807C: .4byte 0x0000ffff _080E8080: adds r0, r1, 0x1 @@ -4109,7 +4109,7 @@ _080E808C: sub_80E8094: @ 80E8094 push {r4-r7,lr} movs r5, 0 - ldr r6, _080E80C4 @ =0x0200ae14 + ldr r6, _080E80C4 @ =gSharedMem + 0xAE14 adds r7, r6, 0 adds r7, 0x2D _080E809E: @@ -4131,7 +4131,7 @@ _080E809E: adds r4, r7, 0 b _080E80D8 .align 2, 0 -_080E80C4: .4byte 0x0200ae14 +_080E80C4: .4byte gSharedMem + 0xAE14 _080E80C8: .4byte 0xffff61f8 _080E80CC: .4byte gMysteryEventPhrase _080E80D0: @@ -4179,7 +4179,7 @@ sub_80E810C: @ 80E810C mov r5, r8 push {r5-r7} movs r5, 0 - ldr r6, _080E8198 @ =0x0200ae6e + ldr r6, _080E8198 @ =gSharedMem + 0xAE6E ldr r0, _080E819C @ =0xffff6192 adds r0, r6 mov r9, r0 @@ -4243,7 +4243,7 @@ _080E818A: lsrs r0, 24 b _080E81B2 .align 2, 0 -_080E8198: .4byte 0x0200ae6e +_080E8198: .4byte gSharedMem + 0xAE6E _080E819C: .4byte 0xffff6192 _080E81A0: .4byte gBerryMasterWifePhrases _080E81A4: .4byte gBerryMasterWifePhrases + 0x2 @@ -4267,7 +4267,7 @@ _080E81B2: sub_80E81C0: @ 80E81C0 push {r4,lr} ldr r0, _080E81EC @ =gStringVar2 - ldr r4, _080E81F0 @ =0x02001000 + ldr r4, _080E81F0 @ =gSharedMem + 0x1000 ldr r2, _080E81F4 @ =0x00009c7c adds r1, r4, r2 ldrh r1, [r1] @@ -4286,7 +4286,7 @@ sub_80E81C0: @ 80E81C0 bx r0 .align 2, 0 _080E81EC: .4byte gStringVar2 -_080E81F0: .4byte 0x02001000 +_080E81F0: .4byte gSharedMem + 0x1000 _080E81F4: .4byte 0x00009c7c _080E81F8: .4byte 0x00009c7e thumb_func_end sub_80E81C0 diff --git a/asm/field_weather.s b/asm/field_weather.s index 92d2ffab2..7d30bbdb8 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -268,7 +268,7 @@ _0807D0AC: mov r8, r1 adds r4, 0x1 mov r12, r4 - ldr r2, _0807D10C @ =0x02000000 + ldr r2, _0807D10C @ =gSharedMem mov r10, r2 ldr r3, [sp] lsls r0, r3, 24 @@ -313,7 +313,7 @@ _0807D0FA: bls _0807D0C2 b _0807D174 .align 2, 0 -_0807D10C: .4byte 0x02000000 +_0807D10C: .4byte gSharedMem _0807D110: .4byte gPlttBufferUnfaded _0807D114: .4byte 0x00002d9f _0807D118: .4byte gPlttBufferFaded @@ -326,7 +326,7 @@ _0807D11C: mov r8, r2 adds r4, 0x1 mov r12, r4 - ldr r3, _0807D184 @ =0x02000000 + ldr r3, _0807D184 @ =gSharedMem mov r10, r3 asrs r6, r0, 11 _0807D132: @@ -373,7 +373,7 @@ _0807D174: _0807D180: b _0807D1A2 .align 2, 0 -_0807D184: .4byte 0x02000000 +_0807D184: .4byte gSharedMem _0807D188: .4byte gPlttBufferFaded _0807D18C: .4byte gPlttBufferUnfaded _0807D190: @@ -653,7 +653,7 @@ _0807D37A: lsls r0, 1 orrs r0, r2 add r0, r9 - ldr r1, _0807D41C @ =0x02000000 + ldr r1, _0807D41C @ =gSharedMem adds r0, r1 ldr r1, [r0] lsls r3, r1, 27 @@ -715,7 +715,7 @@ _0807D3FE: bx r0 .align 2, 0 _0807D418: .4byte gPlttBufferUnfaded -_0807D41C: .4byte 0x02000000 +_0807D41C: .4byte gSharedMem _0807D420: .4byte gPlttBufferFaded thumb_func_end sub_807D304 @@ -1374,7 +1374,7 @@ sub_807D8F0: @ 807D8F0 adds r0, r1 ldr r0, [r0] lsls r6, r4, 13 - ldr r5, _0807D950 @ =0x02000000 + ldr r5, _0807D950 @ =gSharedMem adds r1, r6, r5 bl LZ77UnCompWram subs r0, r4, 0x1 @@ -1406,7 +1406,7 @@ _0807D92A: b _0807D984 .align 2, 0 _0807D94C: .4byte gUnknown_08396FA8 -_0807D950: .4byte 0x02000000 +_0807D950: .4byte gSharedMem _0807D954: .4byte 0x00000421 _0807D958: .4byte 0x00000fff _0807D95C: diff --git a/asm/libagbsyscall.s b/asm/libagbsyscall.s index 3b59592b6..c874e8a77 100644 --- a/asm/libagbsyscall.s +++ b/asm/libagbsyscall.s @@ -69,7 +69,7 @@ SoftReset: @ 81E0814 ldr r3, =0x04000208 movs r2, 0 strb r2, [r3] - ldr r1, =0x03007f00 + ldr r1, =0x03007f00 @ User Stack mov sp, r1 swi 0x1 swi 0 diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s index 9e380f597..c8caf3628 100644 --- a/asm/pokedex_area_screen.s +++ b/asm/pokedex_area_screen.s @@ -9,7 +9,7 @@ thumb_func_start UnusedPokedexAreaScreen UnusedPokedexAreaScreen: @ 8110664 push {lr} - ldr r3, _08110678 @ =0x02000000 + ldr r3, _08110678 @ =gSharedMem str r1, [r3, 0x4] str r2, [r3, 0x8] strh r0, [r3, 0xE] @@ -18,7 +18,7 @@ UnusedPokedexAreaScreen: @ 8110664 pop {r0} bx r0 .align 2, 0 -_08110678: .4byte 0x02000000 +_08110678: .4byte gSharedMem _0811067C: .4byte CB2_UnusedPokedexAreaScreen thumb_func_end UnusedPokedexAreaScreen @@ -89,7 +89,7 @@ _08110714: .4byte REG_BG0VOFS _08110718: .4byte 0x0000fff8 _0811071C: .4byte REG_BG2VOFS _08110720: - ldr r4, _0811073C @ =0x020006e8 + ldr r4, _0811073C @ =gSharedMem + 0x6E8 adds r0, r4, 0 movs r1, 0 bl InitRegionMap @@ -102,7 +102,7 @@ _08110720: bl StringFill b _081107C0 .align 2, 0 -_0811073C: .4byte 0x020006e8 +_0811073C: .4byte gSharedMem + 0x6E8 _08110740: bl sub_8110824 b _081107C0 @@ -189,7 +189,7 @@ sub_81107DC: @ 81107DC thumb_func_start sub_81107F0 sub_81107F0: @ 81107F0 push {lr} - ldr r0, _08110810 @ =0x02000000 + ldr r0, _08110810 @ =gSharedMem ldr r0, [r0] bl _call_via_r0 bl sub_8111110 @@ -199,23 +199,23 @@ sub_81107F0: @ 81107F0 pop {r0} bx r0 .align 2, 0 -_08110810: .4byte 0x02000000 +_08110810: .4byte gSharedMem thumb_func_end sub_81107F0 thumb_func_start sub_8110814 sub_8110814: @ 8110814 - ldr r1, _08110820 @ =0x02000000 + ldr r1, _08110820 @ =gSharedMem str r0, [r1] movs r0, 0 strh r0, [r1, 0xC] bx lr .align 2, 0 -_08110820: .4byte 0x02000000 +_08110820: .4byte gSharedMem thumb_func_end sub_8110814 thumb_func_start sub_8110824 sub_8110824: @ 8110824 - ldr r0, _08110834 @ =0x02000000 + ldr r0, _08110834 @ =gSharedMem movs r1, 0x8A lsls r1, 1 adds r0, r1 @@ -223,13 +223,13 @@ sub_8110824: @ 8110824 strh r1, [r0] bx lr .align 2, 0 -_08110834: .4byte 0x02000000 +_08110834: .4byte gSharedMem thumb_func_end sub_8110824 thumb_func_start DrawAreaGlow DrawAreaGlow: @ 8110838 push {lr} - ldr r1, _08110854 @ =0x02000000 + ldr r1, _08110854 @ =gSharedMem movs r2, 0x8A lsls r2, 1 adds r0, r1, r2 @@ -243,7 +243,7 @@ DrawAreaGlow: @ 8110838 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08110854: .4byte 0x02000000 +_08110854: .4byte gSharedMem _08110858: .4byte _0811085C .align 2, 0 _0811085C: @@ -254,12 +254,12 @@ _0811085C: .4byte _081108C0 .4byte _081108D0 _08110874: - ldr r0, _08110880 @ =0x02000000 + ldr r0, _08110880 @ =gSharedMem ldrh r0, [r0, 0xE] bl FindMapsWithMon b _081108F0 .align 2, 0 -_08110880: .4byte 0x02000000 +_08110880: .4byte gSharedMem _08110884: bl BuildAreaGlowTilemap b _081108F0 @@ -273,7 +273,7 @@ _08110894: .4byte gUnknown_083F8438 _08110898: .4byte 0x0600c000 _0811089C: ldr r1, _081108B0 @ =0x040000d4 - ldr r0, _081108B4 @ =0x02000116 + ldr r0, _081108B4 @ =gSharedMem + 0x116 str r0, [r1] ldr r0, _081108B8 @ =0x0600f000 str r0, [r1, 0x4] @@ -283,7 +283,7 @@ _0811089C: b _081108F0 .align 2, 0 _081108B0: .4byte 0x040000d4 -_081108B4: .4byte 0x02000116 +_081108B4: .4byte gSharedMem + 0x116 _081108B8: .4byte 0x0600f000 _081108BC: .4byte 0x80000280 _081108C0: @@ -312,7 +312,7 @@ _081108E4: _081108E8: .4byte REG_BG0CNT _081108EC: .4byte 0x00001e0d _081108F0: - ldr r1, _08110904 @ =0x02000000 + ldr r1, _08110904 @ =gSharedMem movs r2, 0x8A lsls r2, 1 adds r1, r2 @@ -324,7 +324,7 @@ _08110900: pop {r1} bx r1 .align 2, 0 -_08110904: .4byte 0x02000000 +_08110904: .4byte gSharedMem thumb_func_end DrawAreaGlow thumb_func_start FindMapsWithMon @@ -346,7 +346,7 @@ FindMapsWithMon: @ 8110908 bne _0811091E b _08110A44 _0811091E: - ldr r2, _08110988 @ =0x02000000 + ldr r2, _08110988 @ =gSharedMem movs r1, 0x88 lsls r1, 1 adds r0, r2, r1 @@ -405,7 +405,7 @@ _08110960: .ifdef SAPPHIRE _sub_8110908_Latias: .4byte 407 .endif -_08110988: .4byte 0x02000000 +_08110988: .4byte gSharedMem _0811098C: .4byte gUnknown_083F856C _08110990: .4byte gUnknown_083F856E _08110994: @@ -501,7 +501,7 @@ _08110A28: .align 2, 0 _08110A40: .4byte gWildMonHeaders _08110A44: - ldr r4, _08110A7C @ =0x02000000 + ldr r4, _08110A7C @ =gSharedMem movs r0, 0x89 lsls r0, 1 adds r1, r4, r0 @@ -528,7 +528,7 @@ _08110A44: strh r0, [r1] b _08110A8C .align 2, 0 -_08110A7C: .4byte 0x02000000 +_08110A7C: .4byte gSharedMem _08110A80: .4byte gSaveBlock1 + 0x3144 _08110A84: movs r1, 0x88 @@ -551,7 +551,7 @@ SetAreaHasMon: @ 8110A98 lsrs r2, r0, 16 lsls r1, 16 lsrs r1, 16 - ldr r5, _08110AE0 @ =0x02000000 + ldr r5, _08110AE0 @ =gSharedMem movs r0, 0x88 lsls r0, 1 adds r4, r5, r0 @@ -581,7 +581,7 @@ _08110AD8: pop {r0} bx r0 .align 2, 0 -_08110AE0: .4byte 0x02000000 +_08110AE0: .4byte gSharedMem thumb_func_end SetAreaHasMon thumb_func_start SetSpecialMapHasMon @@ -591,7 +591,7 @@ SetSpecialMapHasMon: @ 8110AE4 lsrs r2, r0, 16 lsls r1, 16 lsrs r1, 16 - ldr r0, _08110B9C @ =0x02000000 + ldr r0, _08110B9C @ =gSharedMem movs r3, 0x89 lsls r3, 1 adds r0, r3 @@ -635,7 +635,7 @@ _08110B32: bne _08110B16 _08110B42: movs r4, 0 - ldr r0, _08110B9C @ =0x02000000 + ldr r0, _08110B9C @ =gSharedMem movs r1, 0x89 lsls r1, 1 adds r2, r0, r1 @@ -683,7 +683,7 @@ _08110B96: pop {r0} bx r0 .align 2, 0 -_08110B9C: .4byte 0x02000000 +_08110B9C: .4byte gSharedMem _08110BA0: .4byte gUnknown_083F857A thumb_func_end SetSpecialMapHasMon @@ -779,7 +779,7 @@ BuildAreaGlowTilemap: @ 8110C34 movs r0, 0 strh r0, [r1] mov r9, r1 - ldr r0, _08110E60 @ =0x02000000 + ldr r0, _08110E60 @ =gSharedMem mov r8, r0 ldr r1, _08110E64 @ =gUnknown_02039262 mov r12, r1 @@ -873,7 +873,7 @@ _08110CCC: strh r0, [r7] lsls r0, 16 lsrs r0, 16 - ldr r3, _08110E78 @ =0x02000110 + ldr r3, _08110E78 @ =gSharedMem + 0x110 ldrh r3, [r3] cmp r0, r3 bcc _08110C9A @@ -886,7 +886,7 @@ _08110D04: ldr r6, _08110E64 @ =gUnknown_02039262 mov r10, r0 adds r3, r1, 0 - ldr r5, _08110E7C @ =0x02000116 + ldr r5, _08110E7C @ =gSharedMem + 0x116 ldr r4, _08110E74 @ =0x0000ffff ldr r7, _08110E70 @ =gUnknown_02039264 _08110D1A: @@ -1064,14 +1064,14 @@ _08110E3C: b _0811105E .align 2, 0 _08110E5C: .4byte gUnknown_02039260 -_08110E60: .4byte 0x02000000 +_08110E60: .4byte gSharedMem _08110E64: .4byte gUnknown_02039262 _08110E68: .4byte 0x0000027f _08110E6C: .4byte gUnknown_02039266 _08110E70: .4byte gUnknown_02039264 _08110E74: .4byte 0x0000ffff -_08110E78: .4byte 0x02000110 -_08110E7C: .4byte 0x02000116 +_08110E78: .4byte gSharedMem + 0x110 +_08110E7C: .4byte gSharedMem + 0x116 _08110E80: cmp r1, 0 bne _08110E86 @@ -1341,7 +1341,7 @@ _08111080: .4byte 0x027f0000 thumb_func_start sub_8111084 sub_8111084: @ 8111084 push {lr} - ldr r0, _081110AC @ =0x02000000 + ldr r0, _081110AC @ =gSharedMem movs r2, 0x89 lsls r2, 1 adds r1, r0, r2 @@ -1360,7 +1360,7 @@ sub_8111084: @ 8111084 movs r0, 0x1 b _081110BA .align 2, 0 -_081110AC: .4byte 0x02000000 +_081110AC: .4byte gSharedMem _081110B0: .4byte 0x0000061e _081110B4: ldr r3, _081110FC @ =0x0000061e @@ -1413,7 +1413,7 @@ sub_8111110: @ 8111110 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _0811114C @ =0x02000000 + ldr r0, _0811114C @ =gSharedMem ldr r2, _08111150 @ =0x0000061e adds r1, r0, r2 ldrb r1, [r1] @@ -1439,7 +1439,7 @@ sub_8111110: @ 8111110 adds r0, r5, r2 b _0811115C .align 2, 0 -_0811114C: .4byte 0x02000000 +_0811114C: .4byte gSharedMem _08111150: .4byte 0x0000061e _08111154: .4byte 0x00000616 _08111158: @@ -1598,7 +1598,7 @@ _08111284: .4byte 0x0000061e thumb_func_start sub_8111288 sub_8111288: @ 8111288 push {lr} - ldr r1, _08111298 @ =0x02000000 + ldr r1, _08111298 @ =gSharedMem ldrh r0, [r1, 0xC] cmp r0, 0 beq _0811129C @@ -1606,7 +1606,7 @@ sub_8111288: @ 8111288 beq _081112A2 b _081112B2 .align 2, 0 -_08111298: .4byte 0x02000000 +_08111298: .4byte gSharedMem _0811129C: movs r0, 0x1 strh r0, [r1, 0xC] @@ -1628,7 +1628,7 @@ _081112B8: .4byte sub_81112BC thumb_func_start sub_81112BC sub_81112BC: @ 81112BC push {lr} - ldr r0, _081112DC @ =0x02000000 + ldr r0, _081112DC @ =gSharedMem ldrh r0, [r0, 0xC] cmp r0, 0 bne _08111308 @@ -1642,7 +1642,7 @@ sub_81112BC: @ 81112BC bl sub_8110814 b _08111308 .align 2, 0 -_081112DC: .4byte 0x02000000 +_081112DC: .4byte gSharedMem _081112E0: .4byte gMain _081112E4: .4byte sub_8111314 _081112E8: @@ -1674,7 +1674,7 @@ _08111310: .4byte sub_8111360 sub_8111314: @ 8111314 push {r4,lr} sub sp, 0x4 - ldr r4, _08111328 @ =0x02000000 + ldr r4, _08111328 @ =gSharedMem ldrh r1, [r4, 0xC] cmp r1, 0 beq _0811132C @@ -1682,7 +1682,7 @@ sub_8111314: @ 8111314 beq _08111344 b _08111358 .align 2, 0 -_08111328: .4byte 0x02000000 +_08111328: .4byte gSharedMem _0811132C: movs r0, 0x15 negs r0, r0 @@ -1714,7 +1714,7 @@ _08111358: sub_8111360: @ 8111360 push {r4,lr} sub sp, 0x4 - ldr r4, _08111374 @ =0x02000000 + ldr r4, _08111374 @ =gSharedMem ldrh r1, [r4, 0xC] cmp r1, 0 beq _08111378 @@ -1722,7 +1722,7 @@ sub_8111360: @ 8111360 beq _08111390 b _081113A4 .align 2, 0 -_08111374: .4byte 0x02000000 +_08111374: .4byte gSharedMem _08111378: movs r0, 0x15 negs r0, r0 @@ -1753,7 +1753,7 @@ _081113A4: thumb_func_start ShowPokedexAreaScreen ShowPokedexAreaScreen: @ 81113AC push {r4,lr} - ldr r2, _081113DC @ =0x02000000 + ldr r2, _081113DC @ =gSharedMem movs r3, 0 movs r4, 0 strh r0, [r2, 0xE] @@ -1776,7 +1776,7 @@ ShowPokedexAreaScreen: @ 81113AC pop {r0} bx r0 .align 2, 0 -_081113DC: .4byte 0x02000000 +_081113DC: .4byte gSharedMem _081113E0: .4byte 0x000006e4 _081113E4: .4byte Task_PokedexAreaScreen_0 _081113E8: .4byte gTasks @@ -1856,7 +1856,7 @@ _08111488: bl FreeAllSpritePalettes b _08111540 _08111496: - ldr r4, _081114B4 @ =0x020006e8 + ldr r4, _081114B4 @ =gSharedMem + 0x6E8 adds r0, r4, 0 movs r1, 0 bl InitRegionMap @@ -1869,7 +1869,7 @@ _08111496: bl StringFill b _08111540 .align 2, 0 -_081114B4: .4byte 0x020006e8 +_081114B4: .4byte gSharedMem + 0x6E8 _081114B8: bl sub_8110824 b _08111540 @@ -2051,7 +2051,7 @@ _0811160A: cmp r0, 0 bne _0811164C bl DestroyAreaSprites - ldr r0, _08111634 @ =0x02000000 + ldr r0, _08111634 @ =gSharedMem ldr r1, _08111638 @ =0x000006e4 adds r0, r1 ldr r1, [r0] @@ -2062,7 +2062,7 @@ _0811160A: b _0811164C .align 2, 0 _08111630: .4byte gPaletteFade -_08111634: .4byte 0x02000000 +_08111634: .4byte gSharedMem _08111638: .4byte 0x000006e4 _0811163C: ldr r0, _08111654 @ =gTasks @@ -2093,7 +2093,7 @@ CreateAreaMarkerSprites: @ 8111658 bl LoadSpritePalette movs r5, 0 movs r1, 0 - ldr r0, _08111728 @ =0x02000000 + ldr r0, _08111728 @ =gSharedMem movs r3, 0x89 lsls r3, 1 adds r2, r0, r3 @@ -2174,7 +2174,7 @@ _081116FC: cmp r0, r2 blt _08111680 _0811170C: - ldr r0, _08111728 @ =0x02000000 + ldr r0, _08111728 @ =gSharedMem movs r3, 0xDC lsls r3, 3 adds r0, r3 @@ -2187,7 +2187,7 @@ _0811170C: .align 2, 0 _08111720: .4byte gUnknown_083F858C _08111724: .4byte gUnknown_083F8594 -_08111728: .4byte 0x02000000 +_08111728: .4byte gSharedMem _0811172C: .4byte gRegionMapLocations _08111730: .4byte gSpriteTemplate_83F85A4 _08111734: .4byte gSprites @@ -2201,7 +2201,7 @@ DestroyAreaSprites: @ 8111738 movs r0, 0x2 bl FreeSpritePaletteByTag movs r4, 0 - ldr r1, _081117A4 @ =0x02000000 + ldr r1, _081117A4 @ =gSharedMem movs r2, 0xDC lsls r2, 3 adds r0, r1, r2 @@ -2230,7 +2230,7 @@ _08111776: movs r0, 0x3 bl FreeSpritePaletteByTag movs r4, 0 - ldr r5, _081117A8 @ =0x02000fa8 + ldr r5, _081117A8 @ =gSharedMem + 0xFA8 _08111786: lsls r0, r4, 2 adds r0, r5 @@ -2248,8 +2248,8 @@ _08111794: pop {r0} bx r0 .align 2, 0 -_081117A4: .4byte 0x02000000 -_081117A8: .4byte 0x02000fa8 +_081117A4: .4byte gSharedMem +_081117A8: .4byte gSharedMem + 0xFA8 thumb_func_end DestroyAreaSprites thumb_func_start LoadAreaUnknownGraphics @@ -2262,7 +2262,7 @@ LoadAreaUnknownGraphics: @ 81117AC str r0, [sp] str r1, [sp, 0x4] ldr r0, _081117D8 @ =gAreaUnknownTiles - ldr r1, _081117DC @ =0x02000fb4 + ldr r1, _081117DC @ =gSharedMem + 0xFB4 bl LZ77UnCompWram mov r0, sp bl LoadSpriteSheet @@ -2274,14 +2274,14 @@ LoadAreaUnknownGraphics: @ 81117AC .align 2, 0 _081117D4: .4byte gUnknown_083F8664 _081117D8: .4byte gAreaUnknownTiles -_081117DC: .4byte 0x02000fb4 +_081117DC: .4byte gSharedMem + 0xFB4 _081117E0: .4byte gUnknown_083F865C thumb_func_end LoadAreaUnknownGraphics thumb_func_start CreateAreaUnknownSprites CreateAreaUnknownSprites: @ 81117E4 push {r4-r7,lr} - ldr r1, _08111810 @ =0x02000000 + ldr r1, _08111810 @ =gSharedMem movs r2, 0x88 lsls r2, 1 adds r0, r1, r2 @@ -2303,7 +2303,7 @@ _081117FC: bls _081117FC b _0811188E .align 2, 0 -_08111810: .4byte 0x02000000 +_08111810: .4byte gSharedMem _08111814: .4byte 0x00000fa8 _08111818: movs r4, 0 diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s index da52c84d4..ecb215abb 100644 --- a/asm/pokedex_cry_screen.s +++ b/asm/pokedex_cry_screen.s @@ -33,7 +33,7 @@ _08119E64: beq _08119F60 b _08119F74 _08119E6A: - ldr r4, _08119ECC @ =0x0201c000 + ldr r4, _08119ECC @ =gSharedMem + 0x1C000 ldrh r0, [r5] movs r1, 0 strh r0, [r4, 0x14] @@ -83,7 +83,7 @@ _08119EA6: mov r1, r12 b _08119F50 .align 2, 0 -_08119ECC: .4byte 0x0201c000 +_08119ECC: .4byte gSharedMem + 0x1C000 _08119ED0: .4byte 0x040000d4 _08119ED4: .4byte gUnknown_083FB718 _08119ED8: .4byte 0xfffe4000 @@ -101,7 +101,7 @@ _08119EE0: lsls r1, 16 lsrs r6, r1, 16 movs r0, 0 - ldr r2, _08119F58 @ =0x0201c000 + ldr r2, _08119F58 @ =gSharedMem + 0x1C000 mov r8, r2 movs r1, 0xC0 lsls r1, 19 @@ -154,7 +154,7 @@ _08119F50: strb r0, [r1] b _08119F74 .align 2, 0 -_08119F58: .4byte 0x0201c000 +_08119F58: .4byte gSharedMem + 0x1C000 _08119F5C: .4byte gUnknown_03005E98 _08119F60: bl sub_811A324 @@ -186,7 +186,7 @@ sub_8119F88: @ 8119F88 bl sub_811A324 adds r0, r4, 0 bl sub_811A15C - ldr r1, _08119FC4 @ =0x0201c000 + ldr r1, _08119FC4 @ =gSharedMem + 0x1C000 ldrb r0, [r1, 0x1B] cmp r0, 0 beq _08119FA6 @@ -206,16 +206,16 @@ _08119FA6: bl sub_811A124 b _0811A044 .align 2, 0 -_08119FC4: .4byte 0x0201c000 +_08119FC4: .4byte gSharedMem + 0x1C000 _08119FC8: - ldr r5, _08119FD8 @ =0x0201c000 + ldr r5, _08119FD8 @ =gSharedMem + 0x1C000 ldrb r0, [r5, 0x10] cmp r0, 0 bne _08119FDC bl sub_811A124 b _0811A044 .align 2, 0 -_08119FD8: .4byte 0x0201c000 +_08119FD8: .4byte gSharedMem + 0x1C000 _08119FDC: cmp r0, 0x1 bne _08119FE6 @@ -237,7 +237,7 @@ _08119FFE: movs r0, 0x1 strb r0, [r5, 0x10] _0811A006: - ldr r5, _0811A04C @ =0x0201c000 + ldr r5, _0811A04C @ =gSharedMem + 0x1C000 ldrb r4, [r5, 0x10] subs r4, 0x1 lsls r4, 25 @@ -271,7 +271,7 @@ _0811A044: pop {r0} bx r0 .align 2, 0 -_0811A04C: .4byte 0x0201c000 +_0811A04C: .4byte gSharedMem + 0x1C000 thumb_func_end sub_8119F88 thumb_func_start sub_811A050 @@ -284,7 +284,7 @@ sub_811A050: @ 811A050 ldr r0, [r0, 0x4] cmp r0, 0 bge _0811A09A - ldr r4, _0811A090 @ =0x0201c000 + ldr r4, _0811A090 @ =gSharedMem + 0x1C000 ldrb r0, [r4, 0x1A] cmp r0, 0 bne _0811A09A @@ -305,7 +305,7 @@ sub_811A050: @ 811A050 b _0811A09A .align 2, 0 _0811A08C: .4byte gMPlay_BGM -_0811A090: .4byte 0x0201c000 +_0811A090: .4byte gSharedMem + 0x1C000 _0811A094: adds r0, r6, 0 bl sub_811A0A0 @@ -324,13 +324,13 @@ sub_811A0A0: @ 811A0A0 movs r2, 0x7D movs r3, 0xA bl PlayCry2 - ldr r1, _0811A0BC @ =0x0201c000 + ldr r1, _0811A0BC @ =gSharedMem + 0x1C000 movs r0, 0x1 strb r0, [r1, 0x10] pop {r0} bx r0 .align 2, 0 -_0811A0BC: .4byte 0x0201c000 +_0811A0BC: .4byte gSharedMem + 0x1C000 thumb_func_end sub_811A0A0 thumb_func_start sub_811A0C0 @@ -364,7 +364,7 @@ _0811A0F0: lsls r1, 3 adds r3, r0, r1 movs r2, 0 - ldr r4, _0811A120 @ =0x0201c000 + ldr r4, _0811A120 @ =gSharedMem + 0x1C000 _0811A0FA: adds r1, r2, r4 lsls r0, r2, 1 @@ -384,13 +384,13 @@ _0811A0FA: bx r0 .align 2, 0 _0811A11C: .4byte gSoundInfo -_0811A120: .4byte 0x0201c000 +_0811A120: .4byte gSharedMem + 0x1C000 thumb_func_end sub_811A0C0 thumb_func_start sub_811A124 sub_811A124: @ 811A124 push {r4,lr} - ldr r4, _0811A158 @ =0x0201c000 + ldr r4, _0811A158 @ =gSharedMem + 0x1C000 ldrb r0, [r4, 0x16] lsls r0, 3 ldrb r1, [r4, 0x11] @@ -413,7 +413,7 @@ sub_811A124: @ 811A124 pop {r0} bx r0 .align 2, 0 -_0811A158: .4byte 0x0201c000 +_0811A158: .4byte gSharedMem + 0x1C000 thumb_func_end sub_811A124 thumb_func_start sub_811A15C @@ -421,7 +421,7 @@ sub_811A15C: @ 811A15C push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _0811A1B4 @ =0x0201c000 + ldr r4, _0811A1B4 @ =gSharedMem + 0x1C000 ldrb r1, [r4, 0x11] movs r2, 0 bl sub_811A350 @@ -463,7 +463,7 @@ _0811A194: pop {r0} bx r0 .align 2, 0 -_0811A1B4: .4byte 0x0201c000 +_0811A1B4: .4byte gSharedMem + 0x1C000 _0811A1B8: .4byte 0x040000d4 _0811A1BC: .4byte gUnknown_083FB718 _0811A1C0: .4byte 0xfffe4000 @@ -500,7 +500,7 @@ _0811A1FE: str r6, [sp] movs r7, 0x1 ands r7, r4 - ldr r0, _0811A284 @ =0x0201c000 + ldr r0, _0811A284 @ =gSharedMem + 0x1C000 mov r10, r0 lsrs r5, 27 mov r8, r5 @@ -528,7 +528,7 @@ _0811A220: adds r0, r1 lsls r0, 16 lsrs r0, 16 - ldr r1, _0811A290 @ =0x02000000 + ldr r1, _0811A290 @ =gSharedMem adds r5, r0, r1 ldrb r4, [r5] mov r3, r9 @@ -554,7 +554,7 @@ _0811A220: lsls r0, 24 lsrs r6, r0, 24 ldr r2, [sp, 0x8] - ldr r3, _0811A284 @ =0x0201c000 + ldr r3, _0811A284 @ =gSharedMem + 0x1C000 ldrb r3, [r3, 0x12] cmp r6, r3 bhi _0811A220 @@ -562,10 +562,10 @@ _0811A220: .align 2, 0 _0811A27C: .4byte 0x40920000 _0811A280: .4byte 0x00000000 -_0811A284: .4byte 0x0201c000 +_0811A284: .4byte gSharedMem + 0x1C000 _0811A288: .4byte gUnknown_083FB738 _0811A28C: .4byte gUnknown_083FB274 -_0811A290: .4byte 0x02000000 +_0811A290: .4byte gSharedMem _0811A294: .4byte gUnknown_083FB73A _0811A298: lsls r1, r7, 4 @@ -589,7 +589,7 @@ _0811A2A6: adds r0, r1 lsls r0, 16 lsrs r0, 16 - ldr r1, _0811A318 @ =0x02000000 + ldr r1, _0811A318 @ =gSharedMem adds r5, r0, r1 ldrb r4, [r5] mov r2, r9 @@ -613,7 +613,7 @@ _0811A2A6: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _0811A320 @ =0x0201c000 + ldr r2, _0811A320 @ =gSharedMem + 0x1C000 ldrb r2, [r2, 0x12] cmp r6, r2 bcc _0811A2A6 @@ -632,15 +632,15 @@ _0811A2FA: bx r0 .align 2, 0 _0811A314: .4byte gUnknown_083FB274 -_0811A318: .4byte 0x02000000 +_0811A318: .4byte gSharedMem _0811A31C: .4byte gUnknown_083FB73A -_0811A320: .4byte 0x0201c000 +_0811A320: .4byte gSharedMem + 0x1C000 thumb_func_end sub_811A1C8 thumb_func_start sub_811A324 sub_811A324: @ 811A324 ldr r2, _0811A344 @ =0x040000d4 - ldr r0, _0811A348 @ =0x02000000 + ldr r0, _0811A348 @ =gSharedMem str r0, [r2] movs r1, 0xE0 lsls r1, 9 @@ -656,7 +656,7 @@ sub_811A324: @ 811A324 bx lr .align 2, 0 _0811A344: .4byte 0x040000d4 -_0811A348: .4byte 0x02000000 +_0811A348: .4byte gSharedMem _0811A34C: .4byte 0x80000e00 thumb_func_end sub_811A324 @@ -743,7 +743,7 @@ _0811A3C8: .4byte REG_BG3HOFS DestroyCryMeterNeedleSprite: @ 811A4F8 push {r4,r5,lr} ldr r5, _0811A52C @ =gSprites - ldr r4, _0811A530 @ =0x0201c800 + ldr r4, _0811A530 @ =gSharedMem + 0x1C800 ldrh r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -766,7 +766,7 @@ DestroyCryMeterNeedleSprite: @ 811A4F8 bx r0 .align 2, 0 _0811A52C: .4byte gSprites -_0811A530: .4byte 0x0201c800 +_0811A530: .4byte gSharedMem + 0x1C800 thumb_func_end DestroyCryMeterNeedleSprite thumb_func_start sub_811A534 @@ -775,7 +775,7 @@ sub_811A534: @ 811A534 sub sp, 0x14 adds r7, r0, 0 ldr r3, _0811A578 @ =gSprites - ldr r5, _0811A57C @ =0x0201c800 + ldr r5, _0811A57C @ =gSharedMem + 0x1C800 ldrh r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -807,7 +807,7 @@ sub_811A534: @ 811A534 b _0811A5F4 .align 2, 0 _0811A578: .4byte gSprites -_0811A57C: .4byte 0x0201c800 +_0811A57C: .4byte gSharedMem + 0x1C800 _0811A580: .4byte 0xfffff800 _0811A584: cmp r0, 0x6 @@ -874,7 +874,7 @@ _0811A5E2: _0811A5F4: add r4, sp, 0xC _0811A5F6: - ldr r0, _0811A624 @ =0x0201c800 + ldr r0, _0811A624 @ =gSharedMem + 0x1C800 ldrb r3, [r0] movs r2, 0 ldrsb r2, [r0, r2] @@ -896,7 +896,7 @@ _0811A5F6: b _0811A636 .align 2, 0 _0811A620: .4byte 0xfffff80a -_0811A624: .4byte 0x0201c800 +_0811A624: .4byte gSharedMem + 0x1C800 _0811A628: ldrb r0, [r5, 0x2] subs r0, r3, r0 @@ -1004,14 +1004,14 @@ sub_811A6D8: @ 811A6D8 bhi _0811A6F4 movs r2, 0xE0 _0811A6F4: - ldr r1, _0811A700 @ =0x0201c800 + ldr r1, _0811A700 @ =gSharedMem + 0x1C800 strb r2, [r1, 0x1] movs r0, 0x5 strb r0, [r1, 0x2] pop {r0} bx r0 .align 2, 0 -_0811A700: .4byte 0x0201c800 +_0811A700: .4byte gSharedMem + 0x1C800 thumb_func_end sub_811A6D8 .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s index dc74831d5..dcd0cada5 100644 --- a/asm/pokemon_item_effect.s +++ b/asm/pokemon_item_effect.s @@ -1099,7 +1099,7 @@ _0803EA4C: movs r0, 0x1 b _0803EA6A _0803EA62: - ldr r0, _0803EB24 @ =0x02000000 + ldr r0, _0803EB24 @ =gSharedMem ldr r5, _0803EB28 @ =0x000160fa adds r0, r5 ldrb r0, [r0] @@ -1192,7 +1192,7 @@ _0803EB08: strb r5, [r4] b _0803EB48 .align 2, 0 -_0803EB24: .4byte 0x02000000 +_0803EB24: .4byte gSharedMem _0803EB28: .4byte 0x000160fa _0803EB2C: .4byte gMain _0803EB30: .4byte 0x0000043d diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index eaf44749b..735f19a64 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1953,7 +1953,7 @@ task_intro_29: @ 80967B8 lsrs r0, 24 ldr r1, _080967D0 @ =gUnknown_0203847D strb r0, [r1] - ldr r1, _080967D4 @ =0x02000000 + ldr r1, _080967D4 @ =gSharedMem strb r0, [r1, 0x5] ldr r0, _080967D8 @ =sub_8096884 bl SetMainCallback2 @@ -1961,7 +1961,7 @@ task_intro_29: @ 80967B8 bx r0 .align 2, 0 _080967D0: .4byte gUnknown_0203847D -_080967D4: .4byte 0x02000000 +_080967D4: .4byte gSharedMem _080967D8: .4byte sub_8096884 thumb_func_end task_intro_29 @@ -2002,7 +2002,7 @@ sub_8096804: @ 8096804 lsls r2, 2 adds r0, r2, 0 strh r0, [r1] - ldr r0, _08096840 @ =0x02000020 + ldr r0, _08096840 @ =gSharedMem + 0x20 adds r1, r0, 0 adds r1, 0x8 movs r2, 0x8 @@ -2014,7 +2014,7 @@ sub_8096804: @ 8096804 bx r0 .align 2, 0 _0809683C: .4byte gReservedSpriteTileCount -_08096840: .4byte 0x02000020 +_08096840: .4byte gSharedMem + 0x20 _08096844: .4byte gKeyRepeatStartDelay thumb_func_end sub_8096804 @@ -2024,7 +2024,7 @@ sub_8096848: @ 8096848 bl sub_809B0D4 ldr r2, _08096868 @ =gUnknown_0203847C movs r1, 0 - ldr r0, _0809686C @ =0x02000000 + ldr r0, _0809686C @ =gSharedMem ldrb r0, [r0, 0x5] cmp r0, 0x1 bne _0809685C @@ -2038,7 +2038,7 @@ _0809685C: bx r0 .align 2, 0 _08096868: .4byte gUnknown_0203847C -_0809686C: .4byte 0x02000000 +_0809686C: .4byte gSharedMem _08096870: .4byte gUnknown_0203847E thumb_func_end sub_8096848 @@ -2128,7 +2128,7 @@ _0809692A: ldr r0, _08096950 @ =gPokemonStorage ldrb r0, [r0] bl sub_8099BF8 - ldr r2, _08096954 @ =0x02000000 + ldr r2, _08096954 @ =gSharedMem ldr r1, _08096958 @ =0x000012bc adds r0, r2, r1 movs r1, 0xA @@ -2142,7 +2142,7 @@ _0809692A: b _0809697A .align 2, 0 _08096950: .4byte gPokemonStorage -_08096954: .4byte 0x02000000 +_08096954: .4byte gSharedMem _08096958: .4byte 0x000012bc _0809695C: .4byte 0x000012be _08096960: .4byte 0x0000dacb @@ -2213,7 +2213,7 @@ _080969F4: lsls r1, 19 movs r0, 0 strh r0, [r1] - ldr r1, _08096A28 @ =0x02000000 + ldr r1, _08096A28 @ =gSharedMem ldr r0, _08096A2C @ =gUnknown_0203847D ldrb r0, [r0] strb r0, [r1, 0x5] @@ -2230,7 +2230,7 @@ _08096A1A: bl sub_809BD14 b _08096AD8 .align 2, 0 -_08096A28: .4byte 0x02000000 +_08096A28: .4byte gSharedMem _08096A2C: .4byte gUnknown_0203847D _08096A30: .4byte gUnknown_0203847F _08096A34: @@ -2266,7 +2266,7 @@ _08096A72: ldr r0, _08096A98 @ =gPokemonStorage ldrb r0, [r0] bl sub_8099BF8 - ldr r2, _08096A9C @ =0x02000000 + ldr r2, _08096A9C @ =gSharedMem ldr r1, _08096AA0 @ =0x000012bc adds r0, r2, r1 movs r1, 0xA @@ -2280,7 +2280,7 @@ _08096A72: b _08096AD8 .align 2, 0 _08096A98: .4byte gPokemonStorage -_08096A9C: .4byte 0x02000000 +_08096A9C: .4byte gSharedMem _08096AA0: .4byte 0x000012bc _08096AA4: .4byte 0x000012be _08096AA8: .4byte 0x0000dacb @@ -2326,7 +2326,7 @@ _08096AF8: .4byte 0x0000043c sub_8096AFC: @ 8096AFC push {lr} ldr r2, _08096B2C @ =REG_BG2HOFS - ldr r1, _08096B30 @ =0x02000000 + ldr r1, _08096B30 @ =gSharedMem ldr r3, _08096B34 @ =0x000008b4 adds r0, r1, r3 ldrh r0, [r0] @@ -2345,14 +2345,14 @@ sub_8096AFC: @ 8096AFC bx r0 .align 2, 0 _08096B2C: .4byte REG_BG2HOFS -_08096B30: .4byte 0x02000000 +_08096B30: .4byte gSharedMem _08096B34: .4byte 0x000008b4 thumb_func_end sub_8096AFC thumb_func_start sub_8096B38 sub_8096B38: @ 8096B38 push {lr} - ldr r0, _08096B58 @ =0x02000000 + ldr r0, _08096B58 @ =gSharedMem ldr r0, [r0] bl _call_via_r0 bl sub_8097E44 @@ -2362,14 +2362,14 @@ sub_8096B38: @ 8096B38 pop {r0} bx r0 .align 2, 0 -_08096B58: .4byte 0x02000000 +_08096B58: .4byte gSharedMem thumb_func_end sub_8096B38 thumb_func_start sub_8096B5C sub_8096B5C: @ 8096B5C push {r4,r5,lr} sub sp, 0x8 - ldr r4, _08096B70 @ =0x02000000 + ldr r4, _08096B70 @ =gSharedMem ldrb r0, [r4, 0x6] cmp r0, 0 beq _08096B74 @@ -2377,7 +2377,7 @@ sub_8096B5C: @ 8096B5C beq _08096BAC b _08096BCC .align 2, 0 -_08096B70: .4byte 0x02000000 +_08096B70: .4byte gSharedMem _08096B74: ldr r1, _08096B98 @ =0x00002690 adds r0, r4, r1 @@ -2430,19 +2430,19 @@ _08096BDC: .4byte sub_80969A0 thumb_func_start sub_8096BE0 sub_8096BE0: @ 8096BE0 - ldr r1, _08096BEC @ =0x02000000 + ldr r1, _08096BEC @ =gSharedMem str r0, [r1] movs r0, 0 strb r0, [r1, 0x4] bx lr .align 2, 0 -_08096BEC: .4byte 0x02000000 +_08096BEC: .4byte gSharedMem thumb_func_end sub_8096BE0 thumb_func_start sub_8096BF0 sub_8096BF0: @ 8096BF0 push {r4,lr} - ldr r4, _08096C04 @ =0x02000000 + ldr r4, _08096C04 @ =gSharedMem ldrb r0, [r4, 0x4] cmp r0, 0x1 beq _08096C16 @@ -2452,7 +2452,7 @@ sub_8096BF0: @ 8096BF0 beq _08096C0E b _08096C5C .align 2, 0 -_08096C04: .4byte 0x02000000 +_08096C04: .4byte gSharedMem _08096C08: cmp r0, 0x2 beq _08096C4C @@ -2521,7 +2521,7 @@ _08096C80: .4byte sub_8096C84 thumb_func_start sub_8096C84 sub_8096C84: @ 8096C84 push {r4,lr} - ldr r0, _08096C9C @ =0x02000000 + ldr r0, _08096C9C @ =gSharedMem ldrb r0, [r0, 0x4] cmp r0, 0x6 bls _08096C90 @@ -2533,7 +2533,7 @@ _08096C90: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08096C9C: .4byte 0x02000000 +_08096C9C: .4byte gSharedMem _08096CA0: .4byte _08096CA4 .align 2, 0 _08096CA4: @@ -2581,14 +2581,14 @@ _08096CE0: _08096D20: movs r0, 0x5 bl PlaySE - ldr r1, _08096D30 @ =0x02000000 + ldr r1, _08096D30 @ =gSharedMem movs r0, 0x1 strb r0, [r1, 0x4] b _08096FBA .align 2, 0 -_08096D30: .4byte 0x02000000 +_08096D30: .4byte gSharedMem _08096D34: - ldr r4, _08096D48 @ =0x02000000 + ldr r4, _08096D48 @ =gSharedMem ldrb r0, [r4, 0x5] cmp r0, 0x2 beq _08096D4C @@ -2598,7 +2598,7 @@ _08096D34: strb r0, [r4, 0x4] b _08096FBA .align 2, 0 -_08096D48: .4byte 0x02000000 +_08096D48: .4byte gSharedMem _08096D4C: bl sub_809B0D4 ldr r0, _08096D58 @ =sub_8096FC8 @@ -2607,7 +2607,7 @@ _08096D4C: .align 2, 0 _08096D58: .4byte sub_8096FC8 _08096D5C: - ldr r4, _08096D88 @ =0x02000000 + ldr r4, _08096D88 @ =gSharedMem ldrb r0, [r4, 0x5] cmp r0, 0x2 beq _08096D66 @@ -2629,7 +2629,7 @@ _08096D80: bl sub_8096BE0 b _08096FBA .align 2, 0 -_08096D88: .4byte 0x02000000 +_08096D88: .4byte gSharedMem _08096D8C: .4byte 0x000011f2 _08096D90: .4byte sub_8097004 _08096D94: @@ -2663,7 +2663,7 @@ _08096DD0: .4byte sub_8097078 _08096DD4: movs r0, 0x5 bl PlaySE - ldr r4, _08096DF0 @ =0x02000000 + ldr r4, _08096DF0 @ =gSharedMem ldr r0, _08096DF4 @ =gPokemonStorage ldrb r0, [r0] adds r0, 0x1 @@ -2675,13 +2675,13 @@ _08096DD4: movs r0, 0 b _08096E16 .align 2, 0 -_08096DF0: .4byte 0x02000000 +_08096DF0: .4byte gSharedMem _08096DF4: .4byte gPokemonStorage _08096DF8: .4byte 0x000008b2 _08096DFC: movs r0, 0x5 bl PlaySE - ldr r4, _08096E24 @ =0x02000000 + ldr r4, _08096E24 @ =gSharedMem ldr r0, _08096E28 @ =gPokemonStorage ldrb r0, [r0] subs r0, 0x1 @@ -2700,7 +2700,7 @@ _08096E18: strb r0, [r4, 0x4] b _08096FBA .align 2, 0 -_08096E24: .4byte 0x02000000 +_08096E24: .4byte gSharedMem _08096E28: .4byte gPokemonStorage _08096E2C: .4byte 0x000008b2 _08096E30: @@ -2708,7 +2708,7 @@ _08096E30: lsls r0, 24 cmp r0, 0 bne _08096E96 - ldr r4, _08096E54 @ =0x02000000 + ldr r4, _08096E54 @ =gSharedMem ldr r1, _08096E58 @ =0x000011f2 adds r0, r4, r1 ldrh r0, [r0] @@ -2721,7 +2721,7 @@ _08096E4C: strb r0, [r4, 0x4] b _08096FBA .align 2, 0 -_08096E54: .4byte 0x02000000 +_08096E54: .4byte gSharedMem _08096E58: .4byte 0x000011f2 _08096E5C: movs r0, 0x5 @@ -2749,12 +2749,12 @@ _08096E8C: cmp r0, 0 bne _08096EA4 _08096E96: - ldr r1, _08096EA0 @ =0x02000000 + ldr r1, _08096EA0 @ =gSharedMem movs r0, 0x4 strb r0, [r1, 0x4] b _08096FBA .align 2, 0 -_08096EA0: .4byte 0x02000000 +_08096EA0: .4byte gSharedMem _08096EA4: movs r0, 0x5 bl PlaySE @@ -2793,7 +2793,7 @@ _08096EE0: _08096EFA: bl sub_8098710 _08096EFE: - ldr r4, _08096F14 @ =0x02000000 + ldr r4, _08096F14 @ =gSharedMem ldr r2, _08096F18 @ =0x000011f6 adds r0, r4, r2 ldrb r0, [r0] @@ -2805,7 +2805,7 @@ _08096F0E: strb r0, [r4, 0x4] b _08096FBA .align 2, 0 -_08096F14: .4byte 0x02000000 +_08096F14: .4byte gSharedMem _08096F18: .4byte 0x000011f6 _08096F1C: bl sub_8099D34 @@ -2813,7 +2813,7 @@ _08096F1C: cmp r0, 0 bne _08096FBA ldr r1, _08096F50 @ =gPokemonStorage - ldr r0, _08096F54 @ =0x02000000 + ldr r0, _08096F54 @ =gSharedMem ldr r2, _08096F58 @ =0x000008b2 adds r0, r2 ldrh r0, [r0] @@ -2831,7 +2831,7 @@ _08096F1C: b _08096F70 .align 2, 0 _08096F50: .4byte gPokemonStorage -_08096F54: .4byte 0x02000000 +_08096F54: .4byte gSharedMem _08096F58: .4byte 0x000008b2 _08096F5C: .4byte gUnknown_0203847C _08096F60: @@ -2843,13 +2843,13 @@ _08096F60: beq _08096FBA bl sub_8098A5C _08096F70: - ldr r1, _08096F7C @ =0x02000000 + ldr r1, _08096F7C @ =gSharedMem movs r0, 0 strb r0, [r1, 0x4] b _08096FBA .align 2, 0 _08096F78: .4byte gMain -_08096F7C: .4byte 0x02000000 +_08096F7C: .4byte gSharedMem _08096F80: movs r0, 0x20 bl PlaySE @@ -2861,12 +2861,12 @@ _08096F8A: movs r0, 0x16 _08096F92: bl sub_8098898 - ldr r1, _08096FA0 @ =0x02000000 + ldr r1, _08096FA0 @ =gSharedMem movs r0, 0x6 strb r0, [r1, 0x4] b _08096FBA .align 2, 0 -_08096FA0: .4byte 0x02000000 +_08096FA0: .4byte gSharedMem _08096FA4: ldr r0, _08096FC0 @ =gMain ldrh r1, [r0, 0x2E] @@ -2889,7 +2889,7 @@ _08096FC4: .4byte sub_8096C84 thumb_func_start sub_8096FC8 sub_8096FC8: @ 8096FC8 push {r4,lr} - ldr r4, _08096FD8 @ =0x02000000 + ldr r4, _08096FD8 @ =gSharedMem ldrb r0, [r4, 0x4] cmp r0, 0 beq _08096FDC @@ -2897,7 +2897,7 @@ sub_8096FC8: @ 8096FC8 beq _08096FE8 b _08096FF8 .align 2, 0 -_08096FD8: .4byte 0x02000000 +_08096FD8: .4byte gSharedMem _08096FDC: bl sub_809880C ldrb r0, [r4, 0x4] @@ -2922,7 +2922,7 @@ _08097000: .4byte sub_8096C84 thumb_func_start sub_8097004 sub_8097004: @ 8097004 push {r4,lr} - ldr r4, _08097018 @ =0x02000000 + ldr r4, _08097018 @ =gSharedMem ldrb r0, [r4, 0x4] cmp r0, 0x1 beq _0809702E @@ -2932,7 +2932,7 @@ sub_8097004: @ 8097004 beq _08097022 b _0809706A .align 2, 0 -_08097018: .4byte 0x02000000 +_08097018: .4byte gSharedMem _0809701C: cmp r0, 0x2 beq _0809704C @@ -2982,7 +2982,7 @@ _08097074: .4byte sub_8096C84 thumb_func_start sub_8097078 sub_8097078: @ 8097078 push {r4,lr} - ldr r0, _08097090 @ =0x02000000 + ldr r0, _08097090 @ =gSharedMem ldrb r0, [r0, 0x4] cmp r0, 0x5 bls _08097084 @@ -2994,7 +2994,7 @@ _08097084: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08097090: .4byte 0x02000000 +_08097090: .4byte gSharedMem _08097094: .4byte _08097098 .align 2, 0 _08097098: @@ -3008,12 +3008,12 @@ _080970B0: movs r0, 0x4 bl sub_8098898 bl sub_809CE84 - ldr r1, _080970C4 @ =0x02000000 + ldr r1, _080970C4 @ =gSharedMem movs r0, 0x1 strb r0, [r1, 0x4] b _0809729A .align 2, 0 -_080970C4: .4byte 0x02000000 +_080970C4: .4byte gSharedMem _080970C8: bl sub_809CF30 adds r0, 0x1 @@ -3098,7 +3098,7 @@ _08097190: lsls r0, 24 cmp r0, 0 bne _080971D6 - ldr r4, _080971C0 @ =0x02000000 + ldr r4, _080971C0 @ =gSharedMem ldr r1, _080971C4 @ =0x000011f2 adds r0, r4, r1 ldrh r0, [r0] @@ -3113,7 +3113,7 @@ _08097190: bl sub_8096BE0 b _0809729A .align 2, 0 -_080971C0: .4byte 0x02000000 +_080971C0: .4byte gSharedMem _080971C4: .4byte 0x000011f2 _080971C8: .4byte sub_809746C _080971CC: @@ -3122,14 +3122,14 @@ _080971CC: cmp r0, 0 beq _080971E4 _080971D6: - ldr r1, _080971E0 @ =0x02000000 + ldr r1, _080971E0 @ =gSharedMem movs r0, 0x2 strb r0, [r1, 0x4] b _0809729A .align 2, 0 -_080971E0: .4byte 0x02000000 +_080971E0: .4byte gSharedMem _080971E4: - ldr r4, _080971F8 @ =0x02000000 + ldr r4, _080971F8 @ =gSharedMem ldr r1, _080971FC @ =0x000011f9 adds r0, r4, r1 ldrb r0, [r0] @@ -3139,7 +3139,7 @@ _080971E4: strb r0, [r4, 0x4] b _0809729A .align 2, 0 -_080971F8: .4byte 0x02000000 +_080971F8: .4byte gSharedMem _080971FC: .4byte 0x000011f9 _08097200: ldr r1, _08097218 @ =0x000011f2 @@ -3195,12 +3195,12 @@ _0809726C: movs r0, 0x16 _08097274: bl sub_8098898 - ldr r1, _08097280 @ =0x02000000 + ldr r1, _08097280 @ =gSharedMem movs r0, 0x5 strb r0, [r1, 0x4] b _0809729A .align 2, 0 -_08097280: .4byte 0x02000000 +_08097280: .4byte gSharedMem _08097284: ldr r0, _080972A0 @ =gMain ldrh r1, [r0, 0x2E] @@ -3223,7 +3223,7 @@ _080972A4: .4byte sub_8096C84 thumb_func_start sub_80972A8 sub_80972A8: @ 80972A8 push {r4,lr} - ldr r4, _080972B8 @ =0x02000000 + ldr r4, _080972B8 @ =gSharedMem ldrb r0, [r4, 0x4] cmp r0, 0 beq _080972BC @@ -3231,7 +3231,7 @@ sub_80972A8: @ 80972A8 beq _080972CA b _080972F2 .align 2, 0 -_080972B8: .4byte 0x02000000 +_080972B8: .4byte gSharedMem _080972BC: movs r0, 0 bl sub_809B100 @@ -3268,7 +3268,7 @@ _080972F8: .4byte sub_8096C84 thumb_func_start sub_80972FC sub_80972FC: @ 80972FC push {r4,lr} - ldr r4, _0809730C @ =0x02000000 + ldr r4, _0809730C @ =gSharedMem ldrb r0, [r4, 0x4] cmp r0, 0 beq _08097310 @@ -3276,7 +3276,7 @@ sub_80972FC: @ 80972FC beq _0809731E b _08097346 .align 2, 0 -_0809730C: .4byte 0x02000000 +_0809730C: .4byte gSharedMem _08097310: movs r0, 0x1 bl sub_809B100 @@ -3313,7 +3313,7 @@ _0809734C: .4byte sub_8096C84 thumb_func_start c3_0808DC50 c3_0808DC50: @ 8097350 push {r4,lr} - ldr r4, _08097360 @ =0x02000000 + ldr r4, _08097360 @ =gSharedMem ldrb r0, [r4, 0x4] cmp r0, 0 beq _08097364 @@ -3321,7 +3321,7 @@ c3_0808DC50: @ 8097350 beq _08097372 b _08097386 .align 2, 0 -_08097360: .4byte 0x02000000 +_08097360: .4byte gSharedMem _08097364: movs r0, 0x2 bl sub_809B100 @@ -3348,7 +3348,7 @@ _0809738C: .4byte sub_8096C84 thumb_func_start sub_8097390 sub_8097390: @ 8097390 push {lr} - ldr r0, _080973A4 @ =0x02000000 + ldr r0, _080973A4 @ =gSharedMem ldrb r0, [r0, 0x4] cmp r0, 0x5 bhi _08097462 @@ -3358,7 +3358,7 @@ sub_8097390: @ 8097390 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080973A4: .4byte 0x02000000 +_080973A4: .4byte gSharedMem _080973A8: .4byte _080973AC .align 2, 0 _080973AC: @@ -3376,22 +3376,22 @@ _080973C4: bne _080973E4 movs r0, 0xE bl sub_8098898 - ldr r1, _080973E0 @ =0x02000000 + ldr r1, _080973E0 @ =gSharedMem movs r0, 0x1 strb r0, [r1, 0x4] b _08097462 .align 2, 0 -_080973E0: .4byte 0x02000000 +_080973E0: .4byte gSharedMem _080973E4: bl sub_809B0E0 movs r0, 0 bl sub_809B100 - ldr r1, _080973F8 @ =0x02000000 + ldr r1, _080973F8 @ =gSharedMem movs r0, 0x2 strb r0, [r1, 0x4] b _08097462 .align 2, 0 -_080973F8: .4byte 0x02000000 +_080973F8: .4byte gSharedMem _080973FC: ldr r0, _08097414 @ =gMain ldrh r1, [r0, 0x2E] @@ -3428,13 +3428,13 @@ _0809743E: bne _08097462 bl sub_80987DC _0809744C: - ldr r1, _08097458 @ =0x02000000 + ldr r1, _08097458 @ =gSharedMem ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] b _08097462 .align 2, 0 -_08097458: .4byte 0x02000000 +_08097458: .4byte gSharedMem _0809745C: ldr r0, _08097468 @ =sub_8097004 bl sub_8096BE0 @@ -3448,7 +3448,7 @@ _08097468: .4byte sub_8097004 thumb_func_start sub_809746C sub_809746C: @ 809746C push {r4,lr} - ldr r0, _08097484 @ =0x02000000 + ldr r0, _08097484 @ =gSharedMem ldrb r0, [r0, 0x4] cmp r0, 0x4 bls _08097478 @@ -3460,7 +3460,7 @@ _08097478: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08097484: .4byte 0x02000000 +_08097484: .4byte gSharedMem _08097488: .4byte _0809748C .align 2, 0 _0809748C: @@ -3472,7 +3472,7 @@ _0809748C: _080974A0: movs r0, 0x6 bl sub_8098898 - ldr r4, _080974C8 @ =0x02002370 + ldr r4, _080974C8 @ =gSharedMem + 0x2370 ldr r2, _080974CC @ =0x0000daca adds r0, r4, 0 movs r1, 0x7 @@ -3488,7 +3488,7 @@ _080974A0: strb r0, [r4, 0x4] b _08097584 .align 2, 0 -_080974C8: .4byte 0x02002370 +_080974C8: .4byte gSharedMem + 0x2370 _080974CC: .4byte 0x0000daca _080974D0: .4byte gUnknown_0203847E _080974D4: .4byte 0xffffdc90 @@ -3513,15 +3513,15 @@ _080974F6: bl sub_8098A5C bl sub_809635C bl sub_8096310 - ldr r1, _08097514 @ =0x02000000 + ldr r1, _08097514 @ =gSharedMem movs r0, 0x2 b _08097522 .align 2, 0 -_08097514: .4byte 0x02000000 +_08097514: .4byte gSharedMem _08097518: movs r0, 0x8 bl sub_8098898 - ldr r1, _0809752C @ =0x02000000 + ldr r1, _0809752C @ =gSharedMem movs r0, 0x4 _08097522: strb r0, [r1, 0x4] @@ -3529,17 +3529,17 @@ _08097522: strb r4, [r0] b _08097584 .align 2, 0 -_0809752C: .4byte 0x02000000 +_0809752C: .4byte gSharedMem _08097530: .4byte gUnknown_0203847E _08097534: bl party_compaction bl sub_8099310 - ldr r1, _08097544 @ =0x02000000 + ldr r1, _08097544 @ =gSharedMem ldrb r0, [r1, 0x4] adds r0, 0x1 b _08097582 .align 2, 0 -_08097544: .4byte 0x02000000 +_08097544: .4byte gSharedMem _08097548: bl sub_8099374 lsls r0, 24 @@ -3563,7 +3563,7 @@ _0809756C: beq _08097584 movs r0, 0x6 bl sub_8098898 - ldr r1, _08097590 @ =0x02000000 + ldr r1, _08097590 @ =gSharedMem movs r0, 0x1 _08097582: strb r0, [r1, 0x4] @@ -3573,13 +3573,13 @@ _08097584: bx r0 .align 2, 0 _0809758C: .4byte gMain -_08097590: .4byte 0x02000000 +_08097590: .4byte gSharedMem thumb_func_end sub_809746C thumb_func_start sub_8097594 sub_8097594: @ 8097594 push {r4,lr} - ldr r0, _080975AC @ =0x02000000 + ldr r0, _080975AC @ =gSharedMem ldrb r0, [r0, 0x4] cmp r0, 0xD bls _080975A0 @@ -3591,7 +3591,7 @@ _080975A0: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080975AC: .4byte 0x02000000 +_080975AC: .4byte gSharedMem _080975B0: .4byte _080975B4 .align 2, 0 _080975B4: @@ -3614,7 +3614,7 @@ _080975EC: bl sub_8098898 movs r0, 0x1 bl sub_8098A38 - ldr r1, _0809761C @ =0x02000000 + ldr r1, _0809761C @ =gSharedMem ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] @@ -3632,7 +3632,7 @@ _08097600: beq _08097626 b _0809777A .align 2, 0 -_0809761C: .4byte 0x02000000 +_0809761C: .4byte gSharedMem _08097620: cmp r1, 0x1 beq _08097626 @@ -3653,10 +3653,10 @@ _0809763A: beq _0809764A b _0809777A _0809764A: - ldr r4, _08097650 @ =0x02000000 + ldr r4, _08097650 @ =gSharedMem b _0809765A .align 2, 0 -_08097650: .4byte 0x02000000 +_08097650: .4byte gSharedMem _08097654: cmp r0, 0 bne _0809765A @@ -3708,12 +3708,12 @@ _08097690: _080976B4: .4byte gMain _080976B8: .4byte gUnknown_0203847C _080976BC: - ldr r1, _080976C4 @ =0x02000000 + ldr r1, _080976C4 @ =gSharedMem movs r0, 0x7 strb r0, [r1, 0x4] b _0809777A .align 2, 0 -_080976C4: .4byte 0x02000000 +_080976C4: .4byte gSharedMem _080976C8: bl sub_8099374 lsls r0, 24 @@ -3774,21 +3774,21 @@ _08097732: _08097740: bl sub_8098898 _08097744: - ldr r1, _08097754 @ =0x02000000 + ldr r1, _08097754 @ =gSharedMem ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] b _0809777A .align 2, 0 _08097750: .4byte gMain -_08097754: .4byte 0x02000000 +_08097754: .4byte gSharedMem _08097758: - ldr r1, _08097760 @ =0x02000000 + ldr r1, _08097760 @ =gSharedMem movs r0, 0x8 strb r0, [r1, 0x4] b _0809777A .align 2, 0 -_08097760: .4byte 0x02000000 +_08097760: .4byte gSharedMem _08097764: ldr r0, _08097780 @ =gMain ldrh r1, [r0, 0x2E] @@ -3812,7 +3812,7 @@ _08097784: .4byte sub_8096C84 sub_8097788: @ 8097788 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _0809779C @ =0x02000000 + ldr r5, _0809779C @ =gSharedMem ldrb r4, [r5, 0x4] cmp r4, 0 beq _080977A0 @@ -3820,7 +3820,7 @@ sub_8097788: @ 8097788 beq _080977BC b _080977D4 .align 2, 0 -_0809779C: .4byte 0x02000000 +_0809779C: .4byte gSharedMem _080977A0: bl sub_809BC18 movs r0, 0x1 @@ -3858,7 +3858,7 @@ _080977E0: .4byte sub_8096B5C thumb_func_start sub_80977E4 sub_80977E4: @ 80977E4 push {r4,lr} - ldr r4, _080977F4 @ =0x02000000 + ldr r4, _080977F4 @ =gSharedMem ldrb r0, [r4, 0x4] cmp r0, 0 beq _080977F8 @@ -3866,7 +3866,7 @@ sub_80977E4: @ 80977E4 beq _08097824 b _0809784C .align 2, 0 -_080977F4: .4byte 0x02000000 +_080977F4: .4byte gSharedMem _080977F8: movs r0, 0xC bl sub_8098898 @@ -3913,7 +3913,7 @@ _08097854: .4byte sub_8096C84 thumb_func_start sub_8097858 sub_8097858: @ 8097858 push {r4,lr} - ldr r4, _08097868 @ =0x02000000 + ldr r4, _08097868 @ =gSharedMem ldrb r0, [r4, 0x4] cmp r0, 0 beq _0809786C @@ -3921,7 +3921,7 @@ sub_8097858: @ 8097858 beq _0809787C b _08097890 .align 2, 0 -_08097868: .4byte 0x02000000 +_08097868: .4byte gSharedMem _0809786C: bl party_compaction bl sub_8099310 @@ -3948,7 +3948,7 @@ _08097898: .4byte sub_8096C84 thumb_func_start sub_809789C sub_809789C: @ 809789C push {r4,lr} - ldr r4, _080978AC @ =0x02000000 + ldr r4, _080978AC @ =gSharedMem ldrb r0, [r4, 0x4] cmp r0, 0 beq _080978B0 @@ -3956,7 +3956,7 @@ sub_809789C: @ 809789C beq _080978C2 b _08097968 .align 2, 0 -_080978AC: .4byte 0x02000000 +_080978AC: .4byte gSharedMem _080978B0: movs r0, 0x1 bl sub_8098898 @@ -4037,7 +4037,7 @@ _08097970: .4byte sub_8097A64 thumb_func_start sub_8097974 sub_8097974: @ 8097974 push {r4,r5,lr} - ldr r5, _08097988 @ =0x02000000 + ldr r5, _08097988 @ =gSharedMem ldrb r0, [r5, 0x4] cmp r0, 0x1 beq _080979A2 @@ -4047,7 +4047,7 @@ sub_8097974: @ 8097974 beq _08097996 b _08097A5A .align 2, 0 -_08097988: .4byte 0x02000000 +_08097988: .4byte gSharedMem _0809798C: cmp r0, 0x2 beq _080979FC @@ -4151,7 +4151,7 @@ _08097A60: .4byte sub_8096C84 thumb_func_start sub_8097A64 sub_8097A64: @ 8097A64 push {r4,r5,lr} - ldr r5, _08097A78 @ =0x02000000 + ldr r5, _08097A78 @ =gSharedMem ldrb r0, [r5, 0x4] cmp r0, 0x1 beq _08097AB0 @@ -4161,7 +4161,7 @@ sub_8097A64: @ 8097A64 beq _08097A86 b _08097B32 .align 2, 0 -_08097A78: .4byte 0x02000000 +_08097A78: .4byte gSharedMem _08097A7C: cmp r0, 0x2 beq _08097B00 @@ -4256,7 +4256,7 @@ _08097B40: .4byte sub_8096C84 sub_8097B44: @ 8097B44 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _08097B58 @ =0x02000000 + ldr r5, _08097B58 @ =gSharedMem ldrb r4, [r5, 0x4] cmp r4, 0 beq _08097B5C @@ -4264,7 +4264,7 @@ sub_8097B44: @ 8097B44 beq _08097B78 b _08097B8E .align 2, 0 -_08097B58: .4byte 0x02000000 +_08097B58: .4byte gSharedMem _08097B5C: bl sub_809BB90 movs r0, 0x1 @@ -4301,7 +4301,7 @@ _08097B9C: .4byte sub_8096B5C thumb_func_start sub_8097BA0 sub_8097BA0: @ 8097BA0 push {r4,lr} - ldr r0, _08097BB8 @ =0x02000000 + ldr r0, _08097BB8 @ =gSharedMem ldrb r1, [r0, 0x4] adds r4, r0, 0 cmp r1, 0x4 @@ -4314,7 +4314,7 @@ _08097BAE: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08097BB8: .4byte 0x02000000 +_08097BB8: .4byte gSharedMem _08097BBC: .4byte _08097BC0 .align 2, 0 _08097BC0: @@ -4332,12 +4332,12 @@ _08097BD4: bl PlaySE movs r0, 0xF bl sub_8098898 - ldr r1, _08097BF4 @ =0x02000000 + ldr r1, _08097BF4 @ =gSharedMem movs r0, 0x1 strb r0, [r1, 0x4] b _08097CB0 .align 2, 0 -_08097BF4: .4byte 0x02000000 +_08097BF4: .4byte gSharedMem _08097BF8: movs r0, 0x5 bl PlaySE @@ -4345,12 +4345,12 @@ _08097BF8: bl sub_8098898 movs r0, 0 bl sub_8098A38 - ldr r1, _08097C14 @ =0x02000000 + ldr r1, _08097C14 @ =gSharedMem movs r0, 0x2 strb r0, [r1, 0x4] b _08097CB0 .align 2, 0 -_08097C14: .4byte 0x02000000 +_08097C14: .4byte gSharedMem _08097C18: ldr r0, _08097C28 @ =gMain ldrh r1, [r0, 0x2E] @@ -4388,13 +4388,13 @@ _08097C5C: movs r0, 0x3 bl PlaySE bl sub_8098A5C - ldr r1, _08097C70 @ =0x02000000 + ldr r1, _08097C70 @ =gSharedMem ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] b _08097CB0 .align 2, 0 -_08097C70: .4byte 0x02000000 +_08097C70: .4byte gSharedMem _08097C74: movs r1, 0 movs r0, 0xE @@ -4435,7 +4435,7 @@ _08097CBC: .4byte sub_80961A8 thumb_func_start sub_8097CC0 sub_8097CC0: @ 8097CC0 push {r4,lr} - ldr r0, _08097CD8 @ =0x02000000 + ldr r0, _08097CD8 @ =gSharedMem ldrb r1, [r0, 0x4] adds r4, r0, 0 cmp r1, 0x4 @@ -4448,7 +4448,7 @@ _08097CCE: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08097CD8: .4byte 0x02000000 +_08097CD8: .4byte gSharedMem _08097CDC: .4byte _08097CE0 .align 2, 0 _08097CE0: @@ -4466,12 +4466,12 @@ _08097CF4: bl PlaySE movs r0, 0xF bl sub_8098898 - ldr r1, _08097D14 @ =0x02000000 + ldr r1, _08097D14 @ =gSharedMem movs r0, 0x1 strb r0, [r1, 0x4] b _08097DD0 .align 2, 0 -_08097D14: .4byte 0x02000000 +_08097D14: .4byte gSharedMem _08097D18: movs r0, 0x5 bl PlaySE @@ -4479,12 +4479,12 @@ _08097D18: bl sub_8098898 movs r0, 0 bl sub_8098A38 - ldr r1, _08097D34 @ =0x02000000 + ldr r1, _08097D34 @ =gSharedMem movs r0, 0x2 strb r0, [r1, 0x4] b _08097DD0 .align 2, 0 -_08097D34: .4byte 0x02000000 +_08097D34: .4byte gSharedMem _08097D38: ldr r0, _08097D48 @ =gMain ldrh r1, [r0, 0x2E] @@ -4523,13 +4523,13 @@ _08097D7C: movs r0, 0x3 bl PlaySE bl sub_8098A5C - ldr r1, _08097D90 @ =0x02000000 + ldr r1, _08097D90 @ =gSharedMem ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] b _08097DD0 .align 2, 0 -_08097D90: .4byte 0x02000000 +_08097D90: .4byte gSharedMem _08097D94: movs r1, 0 movs r0, 0xE @@ -4570,7 +4570,7 @@ _08097DDC: .4byte sub_80961A8 thumb_func_start sub_8097DE0 sub_8097DE0: @ 8097DE0 push {lr} - ldr r1, _08097E1C @ =0x02000000 + ldr r1, _08097E1C @ =gSharedMem movs r0, 0 strb r0, [r1, 0x7] strh r0, [r1, 0x8] @@ -4597,7 +4597,7 @@ sub_8097DE0: @ 8097DE0 pop {r0} bx r0 .align 2, 0 -_08097E1C: .4byte 0x02000000 +_08097E1C: .4byte gSharedMem _08097E20: .4byte REG_BG3CNT _08097E24: .4byte 0x00001e0f _08097E28: .4byte gPokemonStorageScrollingBGTile @@ -4612,7 +4612,7 @@ _08097E40: .4byte gPokemonStorageScrollingBGPalette thumb_func_start sub_8097E44 sub_8097E44: @ 8097E44 push {lr} - ldr r1, _08097E6C @ =0x02000000 + ldr r1, _08097E6C @ =gSharedMem ldrb r0, [r1, 0x7] adds r0, 0x1 strb r0, [r1, 0x7] @@ -4632,7 +4632,7 @@ _08097E66: pop {r0} bx r0 .align 2, 0 -_08097E6C: .4byte 0x02000000 +_08097E6C: .4byte gSharedMem thumb_func_end sub_8097E44 thumb_func_start sub_8097E70 @@ -4734,7 +4734,7 @@ sub_8097F58: @ 8097F58 movs r0, 0xD movs r2, 0 bl sub_80F7940 - ldr r4, _08097FA8 @ =0x02000000 + ldr r4, _08097FA8 @ =gSharedMem ldr r1, _08097FAC @ =0x000012ac adds r3, r4, r1 str r0, [r3] @@ -4767,7 +4767,7 @@ sub_8097F58: @ 8097F58 bx r0 .align 2, 0 _08097FA4: .4byte 0x0000dace -_08097FA8: .4byte 0x02000000 +_08097FA8: .4byte gSharedMem _08097FAC: .4byte 0x000012ac _08097FB0: .4byte 0x000012b8 _08097FB4: .4byte 0x06010000 @@ -4785,7 +4785,7 @@ sub_8097FB8: @ 8097FB8 mov r0, sp bl LoadSpriteSheet movs r4, 0 - ldr r5, _08098010 @ =0x020012b0 + ldr r5, _08098010 @ =gSharedMem + 0x12B0 _08097FD0: lsls r1, r4, 6 subs r1, r4 @@ -4817,7 +4817,7 @@ _08097FD0: bx r0 .align 2, 0 _0809800C: .4byte gWaveformSpriteSheet -_08098010: .4byte 0x020012b0 +_08098010: .4byte gSharedMem + 0x12B0 _08098014: .4byte gSpriteTemplate_83B6EFC _08098018: .4byte gSprites thumb_func_end sub_8097FB8 @@ -4825,7 +4825,7 @@ _08098018: .4byte gSprites thumb_func_start sub_809801C sub_809801C: @ 809801C push {lr} - ldr r1, _0809803C @ =0x02000000 + ldr r1, _0809803C @ =gSharedMem ldr r2, _08098040 @ =0x000011f0 adds r0, r1, r2 ldrh r0, [r0] @@ -4838,7 +4838,7 @@ sub_809801C: @ 809801C pop {r0} bx r0 .align 2, 0 -_0809803C: .4byte 0x02000000 +_0809803C: .4byte gSharedMem _08098040: .4byte 0x000011f0 thumb_func_end sub_809801C @@ -4846,7 +4846,7 @@ _08098040: .4byte 0x000011f0 BoxSetMosaic: @ 8098044 push {lr} bl sub_809801C - ldr r0, _08098084 @ =0x02000000 + ldr r0, _08098084 @ =gSharedMem movs r1, 0x9C lsls r1, 6 adds r3, r0, r1 @@ -4877,7 +4877,7 @@ _08098080: pop {r0} bx r0 .align 2, 0 -_08098084: .4byte 0x02000000 +_08098084: .4byte gSharedMem _08098088: .4byte sub_8098090 _0809808C: .4byte REG_MOSAIC thumb_func_end BoxSetMosaic @@ -4943,7 +4943,7 @@ sub_80980D4: @ 80980D4 stm r1!, {r2-r4} movs r1, 0 add r5, sp, 0x18 - ldr r4, _0809815C @ =0x02002784 + ldr r4, _0809815C @ =gSharedMem + 0x2784 movs r3, 0 ldr r2, _08098160 @ =0x000007ff _08098102: @@ -4955,7 +4955,7 @@ _08098102: cmp r1, r2 bls _08098102 movs r1, 0 - ldr r3, _08098164 @ =0x02002704 + ldr r3, _08098164 @ =gSharedMem + 0x2704 movs r2, 0 _08098116: lsls r0, r1, 1 @@ -4966,7 +4966,7 @@ _08098116: lsrs r1, r0, 16 cmp r1, 0xF bls _08098116 - ldr r0, _08098168 @ =0x02000000 + ldr r0, _08098168 @ =gSharedMem movs r1, 0x9C lsls r1, 6 adds r0, r1 @@ -4989,12 +4989,12 @@ _08098116: _08098150: .4byte gUnknown_083B6DCC _08098154: .4byte gUnknown_083B6DD4 _08098158: .4byte gSpriteTemplate_83B6DDC -_0809815C: .4byte 0x02002784 +_0809815C: .4byte gSharedMem + 0x2784 _08098160: .4byte 0x000007ff -_08098164: .4byte 0x02002704 -_08098168: .4byte 0x02000000 +_08098164: .4byte gSharedMem + 0x2704 +_08098168: .4byte gSharedMem _0809816C: - ldr r2, _0809819C @ =0x02000000 + ldr r2, _0809819C @ =gSharedMem movs r0, 0x9C lsls r0, 6 adds r3, r2, r0 @@ -5019,7 +5019,7 @@ _0809816C: str r0, [r2] b _080981C4 .align 2, 0 -_0809819C: .4byte 0x02000000 +_0809819C: .4byte gSharedMem _080981A0: .4byte gSprites _080981A4: .4byte 0x000026fa _080981A8: .4byte 0x000026fc @@ -5035,7 +5035,7 @@ _080981B0: cmp r1, 0x40 bne _0809816C _080981C4: - ldr r0, _080981E8 @ =0x02000000 + ldr r0, _080981E8 @ =gSharedMem movs r2, 0x9C lsls r2, 6 adds r0, r2 @@ -5052,7 +5052,7 @@ _080981DE: pop {r0} bx r0 .align 2, 0 -_080981E8: .4byte 0x02000000 +_080981E8: .4byte gSharedMem _080981EC: .4byte 0x0000dac7 thumb_func_end sub_80980D4 @@ -5065,7 +5065,7 @@ sub_80981F0: @ 80981F0 adds r7, r1, 0 lsls r0, 16 lsrs r4, r0, 16 - ldr r6, _08098274 @ =0x02000000 + ldr r6, _08098274 @ =gSharedMem movs r0, 0x9C lsls r0, 6 adds r0, r6 @@ -5120,7 +5120,7 @@ sub_80981F0: @ 80981F0 strb r0, [r1] b _080982A6 .align 2, 0 -_08098274: .4byte 0x02000000 +_08098274: .4byte gSharedMem _08098278: .4byte gMonFrontPicTable _0809827C: .4byte gMonFrontPicCoords _08098280: .4byte 0x00004784 @@ -5148,7 +5148,7 @@ _080982A6: thumb_func_start sub_80982B4 sub_80982B4: @ 80982B4 push {r4,lr} - ldr r4, _080982E4 @ =0x02000000 + ldr r4, _080982E4 @ =gSharedMem ldr r1, _080982E8 @ =0x000011f0 adds r0, r4, r1 ldrh r0, [r0] @@ -5171,7 +5171,7 @@ sub_80982B4: @ 80982B4 ands r0, r2 b _08098302 .align 2, 0 -_080982E4: .4byte 0x02000000 +_080982E4: .4byte gSharedMem _080982E8: .4byte 0x000011f0 _080982EC: .4byte 0x000011f7 _080982F0: .4byte 0x000012ac @@ -5190,7 +5190,7 @@ _08098302: movs r2, 0x9 movs r3, 0x11 bl MenuZeroFillWindowRect - ldr r4, _0809834C @ =0x0200127a + ldr r4, _0809834C @ =gSharedMem + 0x127A adds r0, r4, 0 movs r1, 0x1 movs r2, 0x10 @@ -5215,14 +5215,14 @@ _08098302: bx r0 .align 2, 0 _08098348: .4byte 0x000012ac -_0809834C: .4byte 0x0200127a +_0809834C: .4byte gSharedMem + 0x127A thumb_func_end sub_80982B4 thumb_func_start sub_8098350 sub_8098350: @ 8098350 push {r4,r5,lr} sub sp, 0x10 - ldr r5, _080983A0 @ =0x02000000 + ldr r5, _080983A0 @ =gSharedMem ldr r1, _080983A4 @ =0x000011f0 adds r0, r5, r1 ldrh r2, [r0] @@ -5260,7 +5260,7 @@ _08098382: bls _08098382 b _080983EC .align 2, 0 -_080983A0: .4byte 0x02000000 +_080983A0: .4byte gSharedMem _080983A4: .4byte 0x000011f0 _080983A8: .4byte 0x06007800 _080983AC: .4byte gUnknown_02039760 @@ -5316,7 +5316,7 @@ sub_8098400: @ 8098400 ldr r1, _08098488 @ =0x06006800 bl LZ77UnCompVram ldr r0, _0809848C @ =gPSSMenuMisc_Tilemap - ldr r5, _08098490 @ =0x020000a8 + ldr r5, _08098490 @ =gSharedMem + 0xA8 adds r1, r5, 0 bl LZ77UnCompWram ldr r0, _08098494 @ =gPSSMenu3_Pal @@ -5365,7 +5365,7 @@ _08098480: .4byte 0x00000f01 _08098484: .4byte gPSSMenuMisc_Gfx _08098488: .4byte 0x06006800 _0809848C: .4byte gPSSMenuMisc_Tilemap -_08098490: .4byte 0x020000a8 +_08098490: .4byte gSharedMem + 0xA8 _08098494: .4byte gPSSMenu3_Pal _08098498: .4byte gPSSMenu4_Pal _0809849C: .4byte 0x06007800 @@ -5388,7 +5388,7 @@ _080984AC: movs r0, 0x1 bl sub_8098690 _080984CC: - ldr r0, _080984E0 @ =0x02000000 + ldr r0, _080984E0 @ =gSharedMem ldr r1, _080984E4 @ =0x000008af adds r0, r1 movs r1, 0 @@ -5398,14 +5398,14 @@ _080984CC: pop {r0} bx r0 .align 2, 0 -_080984E0: .4byte 0x02000000 +_080984E0: .4byte gSharedMem _080984E4: .4byte 0x000008af thumb_func_end sub_8098400 thumb_func_start sub_80984E8 sub_80984E8: @ 80984E8 push {lr} - ldr r1, _08098510 @ =0x02000000 + ldr r1, _08098510 @ =gSharedMem ldr r0, _08098514 @ =0x000008a8 adds r2, r1, r0 movs r3, 0 @@ -5423,7 +5423,7 @@ sub_80984E8: @ 80984E8 pop {r0} bx r0 .align 2, 0 -_08098510: .4byte 0x02000000 +_08098510: .4byte gSharedMem _08098514: .4byte 0x000008a8 _08098518: .4byte 0x000008aa _0809851C: .4byte 0x000008ad @@ -5433,7 +5433,7 @@ _0809851C: .4byte 0x000008ad sub_8098520: @ 8098520 push {r4,r5,lr} sub sp, 0x10 - ldr r3, _08098578 @ =0x02000000 + ldr r3, _08098578 @ =gSharedMem ldr r0, _0809857C @ =0x000008ad adds r5, r3, r0 ldrb r0, [r5] @@ -5474,7 +5474,7 @@ sub_8098520: @ 8098520 movs r0, 0x1 b _08098594 .align 2, 0 -_08098578: .4byte 0x02000000 +_08098578: .4byte gSharedMem _0809857C: .4byte 0x000008ad _08098580: .4byte 0x000008a8 _08098584: .4byte 0x000008aa @@ -5496,7 +5496,7 @@ _0809859C: .4byte gUnknown_0203847C thumb_func_start add_to_c3_somehow add_to_c3_somehow: @ 80985A0 - ldr r1, _080985BC @ =0x02000000 + ldr r1, _080985BC @ =gSharedMem ldr r0, _080985C0 @ =0x000008a8 adds r2, r1, r0 movs r3, 0 @@ -5511,7 +5511,7 @@ add_to_c3_somehow: @ 80985A0 strb r3, [r1] bx lr .align 2, 0 -_080985BC: .4byte 0x02000000 +_080985BC: .4byte gSharedMem _080985C0: .4byte 0x000008a8 _080985C4: .4byte 0x000008aa _080985C8: .4byte 0x000008ad @@ -5524,7 +5524,7 @@ sub_80985CC: @ 80985CC mov r6, r8 push {r6,r7} sub sp, 0x10 - ldr r3, _08098640 @ =0x02000000 + ldr r3, _08098640 @ =gSharedMem ldr r0, _08098644 @ =0x000008ad adds r6, r3, r0 ldrb r0, [r6] @@ -5575,7 +5575,7 @@ sub_80985CC: @ 80985CC movs r0, 0x1 b _0809867C .align 2, 0 -_08098640: .4byte 0x02000000 +_08098640: .4byte gSharedMem _08098644: .4byte 0x000008ad _08098648: .4byte 0x000008a8 _0809864C: .4byte 0x000008aa @@ -5619,7 +5619,7 @@ sub_8098690: @ 8098690 cmp r0, 0 beq _080986C0 ldr r0, _080986B8 @ =0x06007800 - ldr r3, _080986BC @ =0x020000a8 + ldr r3, _080986BC @ =gSharedMem + 0xA8 movs r1, 0xC str r1, [sp] movs r1, 0 @@ -5634,10 +5634,10 @@ sub_8098690: @ 8098690 b _080986DA .align 2, 0 _080986B8: .4byte 0x06007800 -_080986BC: .4byte 0x020000a8 +_080986BC: .4byte gSharedMem + 0xA8 _080986C0: ldr r0, _080986E0 @ =0x06007800 - ldr r3, _080986E4 @ =0x020000a8 + ldr r3, _080986E4 @ =gSharedMem + 0xA8 movs r1, 0xC str r1, [sp] movs r2, 0x2 @@ -5654,12 +5654,12 @@ _080986DA: bx r0 .align 2, 0 _080986E0: .4byte 0x06007800 -_080986E4: .4byte 0x020000a8 +_080986E4: .4byte gSharedMem + 0xA8 thumb_func_end sub_8098690 thumb_func_start sub_80986E8 sub_80986E8: @ 80986E8 - ldr r1, _08098704 @ =0x02000000 + ldr r1, _08098704 @ =gSharedMem ldr r2, _08098708 @ =0x000008af adds r0, r1, r2 movs r3, 0x1 @@ -5674,7 +5674,7 @@ sub_80986E8: @ 80986E8 strb r3, [r1] bx lr .align 2, 0 -_08098704: .4byte 0x02000000 +_08098704: .4byte gSharedMem _08098708: .4byte 0x000008af _0809870C: .4byte 0x000008b1 thumb_func_end sub_80986E8 @@ -5682,7 +5682,7 @@ _0809870C: .4byte 0x000008b1 thumb_func_start sub_8098710 sub_8098710: @ 8098710 push {lr} - ldr r0, _0809872C @ =0x02000000 + ldr r0, _0809872C @ =gSharedMem ldr r2, _08098730 @ =0x000008af adds r1, r0, r2 ldrb r0, [r1] @@ -5696,14 +5696,14 @@ _08098728: pop {r0} bx r0 .align 2, 0 -_0809872C: .4byte 0x02000000 +_0809872C: .4byte gSharedMem _08098730: .4byte 0x000008af thumb_func_end sub_8098710 thumb_func_start sub_8098734 sub_8098734: @ 8098734 push {lr} - ldr r2, _08098774 @ =0x02000000 + ldr r2, _08098774 @ =gSharedMem ldr r1, _08098778 @ =0x000008af adds r0, r2, r1 ldrb r0, [r0] @@ -5736,7 +5736,7 @@ _08098770: pop {r0} bx r0 .align 2, 0 -_08098774: .4byte 0x02000000 +_08098774: .4byte gSharedMem _08098778: .4byte 0x000008af _0809877C: .4byte 0x000008b1 thumb_func_end sub_8098734 @@ -5746,7 +5746,7 @@ sub_8098780: @ 8098780 push {r4-r6,lr} sub sp, 0x10 movs r4, 0x1 - ldr r6, _080987D4 @ =0x020000a8 + ldr r6, _080987D4 @ =gSharedMem + 0xA8 movs r5, 0x80 lsls r5, 9 _0809878C: @@ -5787,7 +5787,7 @@ _080987A8: pop {r0} bx r0 .align 2, 0 -_080987D4: .4byte 0x020000a8 +_080987D4: .4byte gSharedMem + 0xA8 _080987D8: .4byte gPlayerParty thumb_func_end sub_8098780 @@ -5797,7 +5797,7 @@ sub_80987DC: @ 80987DC sub sp, 0x10 bl sub_8098780 ldr r0, _08098804 @ =0x06007800 - ldr r3, _08098808 @ =0x020000a8 + ldr r3, _08098808 @ =gSharedMem + 0xA8 movs r1, 0 str r1, [sp] str r1, [sp, 0x4] @@ -5813,13 +5813,13 @@ sub_80987DC: @ 80987DC bx r0 .align 2, 0 _08098804: .4byte 0x06007800 -_08098808: .4byte 0x020000a8 +_08098808: .4byte gSharedMem + 0xA8 thumb_func_end sub_80987DC thumb_func_start sub_809880C sub_809880C: @ 809880C push {lr} - ldr r0, _08098828 @ =0x02000000 + ldr r0, _08098828 @ =gSharedMem ldr r1, _0809882C @ =0x000008ae adds r0, r1 movs r1, 0 @@ -5830,14 +5830,14 @@ sub_809880C: @ 809880C pop {r0} bx r0 .align 2, 0 -_08098828: .4byte 0x02000000 +_08098828: .4byte gSharedMem _0809882C: .4byte 0x000008ae thumb_func_end sub_809880C thumb_func_start sub_8098830 sub_8098830: @ 8098830 push {r4,r5,lr} - ldr r5, _08098848 @ =0x02000000 + ldr r5, _08098848 @ =gSharedMem ldr r0, _0809884C @ =0x000008ae adds r4, r5, r0 ldrb r0, [r4] @@ -5849,7 +5849,7 @@ sub_8098830: @ 8098830 beq _08098856 b _08098890 .align 2, 0 -_08098848: .4byte 0x02000000 +_08098848: .4byte gSharedMem _0809884C: .4byte 0x000008ae _08098850: cmp r0, 0x2 @@ -12471,7 +12471,7 @@ sub_809BD14: @ 809BD14 _0809BD24: .4byte gUnknown_020384E6 _0809BD28: ldr r0, _0809BD34 @ =gUnknown_020384E5 - ldr r1, _0809BD38 @ =0x02018000 + ldr r1, _0809BD38 @ =gSharedMem + 0x18000 ldrb r1, [r1, 0x9] strb r1, [r0] _0809BD30: @@ -12479,7 +12479,7 @@ _0809BD30: bx r0 .align 2, 0 _0809BD34: .4byte gUnknown_020384E5 -_0809BD38: .4byte 0x02018000 +_0809BD38: .4byte gSharedMem + 0x18000 thumb_func_end sub_809BD14 thumb_func_start party_compaction diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 859fd177f..dddc31fd8 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -70,7 +70,7 @@ ShowPokemonSummaryScreen: @ 809D8BC movs r5, 0x80 orrs r4, r5 strb r4, [r6, 0x8] - ldr r5, _0809D908 @ =0x02018000 + ldr r5, _0809D908 @ =gSharedMem + 0x18000 str r0, [r5] movs r4, 0 strb r7, [r5, 0x8] @@ -99,7 +99,7 @@ ShowPokemonSummaryScreen: @ 809D8BC b _0809D90E .align 2, 0 _0809D904: .4byte gPaletteFade -_0809D908: .4byte 0x02018000 +_0809D908: .4byte gSharedMem + 0x18000 _0809D90C: strb r1, [r5, 0xE] _0809D90E: @@ -231,7 +231,7 @@ sub_809D9F0: @ 809D9F0 movs r4, 0x2 str r4, [sp] bl ShowPokemonSummaryScreen - ldr r0, _0809DA18 @ =0x02018000 + ldr r0, _0809DA18 @ =gSharedMem + 0x18000 adds r0, 0x7C strh r5, [r0] add sp, 0x4 @@ -239,13 +239,13 @@ sub_809D9F0: @ 809D9F0 pop {r0} bx r0 .align 2, 0 -_0809DA18: .4byte 0x02018000 +_0809DA18: .4byte gSharedMem + 0x18000 thumb_func_end sub_809D9F0 thumb_func_start sub_809DA1C sub_809DA1C: @ 809DA1C push {lr} - ldr r0, _0809DA30 @ =0x02018000 + ldr r0, _0809DA30 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x8] cmp r0, 0x6 bhi _0809DA78 @@ -255,7 +255,7 @@ sub_809DA1C: @ 809DA1C ldr r0, [r0] mov pc, r0 .align 2, 0 -_0809DA30: .4byte 0x02018000 +_0809DA30: .4byte gSharedMem + 0x18000 _0809DA34: .4byte _0809DA38 .align 2, 0 _0809DA38: @@ -286,14 +286,14 @@ _0809DA6C: _0809DA6E: movs r1, 0 bl CreateTask - ldr r1, _0809DA80 @ =0x02018000 + ldr r1, _0809DA80 @ =gSharedMem + 0x18000 strb r0, [r1, 0xF] _0809DA78: pop {r0} bx r0 .align 2, 0 _0809DA7C: .4byte sub_809E3FC -_0809DA80: .4byte 0x02018000 +_0809DA80: .4byte gSharedMem + 0x18000 thumb_func_end sub_809DA1C thumb_func_start sub_809DA84 @@ -456,7 +456,7 @@ _0809DBDC: ldr r1, _0809DC20 @ =0x80000080 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - ldr r0, _0809DC24 @ =0x02018000 + ldr r0, _0809DC24 @ =gSharedMem + 0x18000 adds r0, 0x74 movs r1, 0 strb r1, [r0] @@ -471,7 +471,7 @@ _0809DC14: .4byte 0x800000a0 _0809DC18: .4byte gSummaryScreenButtonTiles _0809DC1C: .4byte 0x0600d140 _0809DC20: .4byte 0x80000080 -_0809DC24: .4byte 0x02018000 +_0809DC24: .4byte gSharedMem + 0x18000 _0809DC28: .4byte 0x0000043c _0809DC2C: bl sub_809DF00 @@ -480,13 +480,13 @@ _0809DC2C: bne _0809DC38 b _0809DE38 _0809DC38: - ldr r0, _0809DC44 @ =0x02018000 + ldr r0, _0809DC44 @ =gSharedMem + 0x18000 adds r0, 0x74 movs r1, 0 strb r1, [r0] b _0809DDE8 .align 2, 0 -_0809DC44: .4byte 0x02018000 +_0809DC44: .4byte gSharedMem + 0x18000 _0809DC48: bl sub_80A18C4 ldr r1, _0809DC54 @ =gMain @@ -497,7 +497,7 @@ _0809DC48: _0809DC54: .4byte gMain _0809DC58: .4byte 0x0000043c _0809DC5C: - ldr r4, _0809DC78 @ =0x02018010 + ldr r4, _0809DC78 @ =gSharedMem + 0x18010 adds r0, r4, 0 bl sub_809F678 adds r0, r4, 0 @@ -509,30 +509,30 @@ _0809DC5C: bl sub_80A12D0 b _0809DC82 .align 2, 0 -_0809DC78: .4byte 0x02018010 +_0809DC78: .4byte gSharedMem + 0x18010 _0809DC7C: movs r0, 0xA bl sub_80A12D0 _0809DC82: - ldr r0, _0809DC8C @ =0x02018010 + ldr r0, _0809DC8C @ =gSharedMem + 0x18010 bl sub_80A0EA4 b _0809DDE8 .align 2, 0 -_0809DC8C: .4byte 0x02018010 +_0809DC8C: .4byte gSharedMem + 0x18010 _0809DC90: bl sub_80A1950 - ldr r0, _0809DCA4 @ =0x02018010 + ldr r0, _0809DCA4 @ =gSharedMem + 0x18010 bl sub_80A1D84 ldr r1, _0809DCA8 @ =gMain ldr r2, _0809DCAC @ =0x0000043c adds r1, r2 b _0809DDEE .align 2, 0 -_0809DCA4: .4byte 0x02018010 +_0809DCA4: .4byte gSharedMem + 0x18010 _0809DCA8: .4byte gMain _0809DCAC: .4byte 0x0000043c _0809DCB0: - ldr r4, _0809DCC0 @ =0x02018010 + ldr r4, _0809DCC0 @ =gSharedMem + 0x18010 adds r0, r4, 0 bl sub_80A1DE8 adds r4, 0x64 @@ -540,9 +540,9 @@ _0809DCB0: strb r0, [r4] b _0809DDE8 .align 2, 0 -_0809DCC0: .4byte 0x02018010 +_0809DCC0: .4byte gSharedMem + 0x18010 _0809DCC4: - ldr r4, _0809DCEC @ =0x02018010 + ldr r4, _0809DCEC @ =gSharedMem + 0x18010 adds r5, r4, 0 adds r5, 0x64 adds r0, r4, 0 @@ -563,7 +563,7 @@ _0809DCE0: adds r1, r2 b _0809DDEE .align 2, 0 -_0809DCEC: .4byte 0x02018010 +_0809DCEC: .4byte gSharedMem + 0x18010 _0809DCF0: .4byte gMain _0809DCF4: .4byte 0x0000043c _0809DCF8: @@ -571,7 +571,7 @@ _0809DCF8: bl sub_80A0EE8 b _0809DDE8 _0809DD02: - ldr r1, _0809DD20 @ =0x02018000 + ldr r1, _0809DD20 @ =gSharedMem + 0x18000 ldrb r0, [r1, 0xB] cmp r0, 0x1 bhi _0809DD18 @@ -587,19 +587,19 @@ _0809DD18: adds r1, r2 b _0809DDEE .align 2, 0 -_0809DD20: .4byte 0x02018000 +_0809DD20: .4byte gSharedMem + 0x18000 _0809DD24: .4byte gUnknown_083C1580 _0809DD28: .4byte gMain _0809DD2C: .4byte 0x0000043c _0809DD30: - ldr r0, _0809DD38 @ =0x02018010 + ldr r0, _0809DD38 @ =gSharedMem + 0x18010 bl sub_809FAC8 b _0809DDE8 .align 2, 0 -_0809DD38: .4byte 0x02018010 +_0809DD38: .4byte gSharedMem + 0x18010 _0809DD3C: ldr r2, _0809DD58 @ =gUnknown_083C1598 - ldr r0, _0809DD5C @ =0x02018000 + ldr r0, _0809DD5C @ =gSharedMem + 0x18000 ldrb r1, [r0, 0xB] lsls r1, 2 adds r1, r2 @@ -612,11 +612,11 @@ _0809DD3C: b _0809DDEE .align 2, 0 _0809DD58: .4byte gUnknown_083C1598 -_0809DD5C: .4byte 0x02018000 +_0809DD5C: .4byte gSharedMem + 0x18000 _0809DD60: .4byte gMain _0809DD64: .4byte 0x0000043c _0809DD68: - ldr r0, _0809DD84 @ =0x02018010 + ldr r0, _0809DD84 @ =gSharedMem + 0x18010 movs r1, 0x2D bl GetMonData adds r1, r0, 0 @@ -629,7 +629,7 @@ _0809DD68: strh r0, [r1] b _0809DDE8 .align 2, 0 -_0809DD84: .4byte 0x02018010 +_0809DD84: .4byte gSharedMem + 0x18010 _0809DD88: .4byte gUnknown_030041B0 _0809DD8C: ldr r0, _0809DD94 @ =gUnknown_030041B0 @@ -639,7 +639,7 @@ _0809DD8C: _0809DD94: .4byte gUnknown_030041B0 _0809DD98: bl sub_809EBC4 - ldr r0, _0809DDB8 @ =0x02018000 + ldr r0, _0809DDB8 @ =gSharedMem + 0x18000 adds r0, 0x79 ldrb r0, [r0] cmp r0, 0 @@ -652,7 +652,7 @@ _0809DD98: bl sub_80A1654 b _0809DDCC .align 2, 0 -_0809DDB8: .4byte 0x02018000 +_0809DDB8: .4byte gSharedMem + 0x18000 _0809DDBC: movs r0, 0xA movs r1, 0 @@ -809,7 +809,7 @@ _0809DEFC: .4byte REG_BG0HOFS thumb_func_start sub_809DF00 sub_809DF00: @ 809DF00 push {lr} - ldr r0, _0809DF18 @ =0x02018000 + ldr r0, _0809DF18 @ =gSharedMem + 0x18000 adds r0, 0x74 ldrb r0, [r0] cmp r0, 0xC @@ -822,7 +822,7 @@ _0809DF0E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0809DF18: .4byte 0x02018000 +_0809DF18: .4byte gSharedMem + 0x18000 _0809DF1C: .4byte _0809DF20 .align 2, 0 _0809DF20: @@ -932,7 +932,7 @@ _0809E010: lsls r1, 1 movs r2, 0x60 bl LoadCompressedPalette - ldr r0, _0809E02C @ =0x02018000 + ldr r0, _0809E02C @ =gSharedMem + 0x18000 adds r0, 0x74 movs r1, 0 strb r1, [r0] @@ -940,9 +940,9 @@ _0809E010: b _0809E03C .align 2, 0 _0809E028: .4byte gMoveTypes_Pal -_0809E02C: .4byte 0x02018000 +_0809E02C: .4byte gSharedMem + 0x18000 _0809E030: - ldr r1, _0809E040 @ =0x02018000 + ldr r1, _0809E040 @ =gSharedMem + 0x18000 adds r1, 0x74 ldrb r0, [r1] adds r0, 0x1 @@ -952,7 +952,7 @@ _0809E03C: pop {r1} bx r1 .align 2, 0 -_0809E040: .4byte 0x02018000 +_0809E040: .4byte gSharedMem + 0x18000 thumb_func_end sub_809DF00 thumb_func_start sub_809E044 @@ -1082,7 +1082,7 @@ sub_809E13C: @ 809E13C cmp r0, 0 bne _0809E182 ldr r1, _0809E18C @ =gUnknown_020384F0 - ldr r4, _0809E190 @ =0x02018000 + ldr r4, _0809E190 @ =gSharedMem + 0x18000 ldrb r0, [r4, 0x9] strb r0, [r1] bl ResetSpriteData @@ -1104,7 +1104,7 @@ _0809E182: .align 2, 0 _0809E188: .4byte gPaletteFade _0809E18C: .4byte gUnknown_020384F0 -_0809E190: .4byte 0x02018000 +_0809E190: .4byte gSharedMem + 0x18000 _0809E194: .4byte gMPlay_BGM _0809E198: .4byte 0x0000ffff thumb_func_end sub_809E13C @@ -1182,7 +1182,7 @@ _0809E222: ands r0, r1 cmp r0, 0 beq _0809E24C - ldr r5, _0809E248 @ =0x02018000 + ldr r5, _0809E248 @ =gSharedMem + 0x18000 ldrb r0, [r5, 0xB] cmp r0, 0x1 bls _0809E23A @@ -1196,7 +1196,7 @@ _0809E23A: bl SummaryScreenExit b _0809E25A .align 2, 0 -_0809E248: .4byte 0x02018000 +_0809E248: .4byte gSharedMem + 0x18000 _0809E24C: movs r0, 0x2 ands r0, r1 @@ -1238,7 +1238,7 @@ _0809E276: movs r1, 0x4 strh r1, [r0, 0x8] subs r1, 0x5 - ldr r2, _0809E2A8 @ =0x02018079 + ldr r2, _0809E2A8 @ =gSharedMem + 0x18079 adds r0, r4, 0 bl sub_809E8F0 b _0809E3EE @@ -1246,7 +1246,7 @@ _0809E276: _0809E29C: .4byte gPaletteFade _0809E2A0: .4byte gMain _0809E2A4: .4byte gTasks -_0809E2A8: .4byte 0x02018079 +_0809E2A8: .4byte gSharedMem + 0x18079 _0809E2AC: adds r0, r2, 0 ands r0, r1 @@ -1259,14 +1259,14 @@ _0809E2AC: adds r0, r1 movs r1, 0x4 strh r1, [r0, 0x8] - ldr r2, _0809E2D4 @ =0x02018079 + ldr r2, _0809E2D4 @ =gSharedMem + 0x18079 adds r0, r4, 0 movs r1, 0x1 bl sub_809E8F0 b _0809E3EE .align 2, 0 _0809E2D0: .4byte gTasks -_0809E2D4: .4byte 0x02018079 +_0809E2D4: .4byte gSharedMem + 0x18079 _0809E2D8: movs r0, 0x20 ands r0, r1 @@ -1278,7 +1278,7 @@ _0809E2D8: cmp r0, 0x1 bne _0809E324 _0809E2EC: - ldr r1, _0809E320 @ =0x02018000 + ldr r1, _0809E320 @ =gSharedMem + 0x18000 ldrb r0, [r1, 0xB] cmp r0, 0x3 bne _0809E314 @@ -1305,7 +1305,7 @@ _0809E314: bl SummaryScreenHandleLeftRightInput b _0809E3EE .align 2, 0 -_0809E320: .4byte 0x02018000 +_0809E320: .4byte gSharedMem + 0x18000 _0809E324: ldrh r1, [r5, 0x2E] movs r0, 0x10 @@ -1318,7 +1318,7 @@ _0809E324: cmp r0, 0x2 bne _0809E37C _0809E33A: - ldr r1, _0809E378 @ =0x02018000 + ldr r1, _0809E378 @ =gSharedMem + 0x18000 adds r2, r1, 0 adds r2, 0x76 ldrb r0, [r1, 0xB] @@ -1349,7 +1349,7 @@ _0809E36C: bl SummaryScreenHandleLeftRightInput b _0809E3EE .align 2, 0 -_0809E378: .4byte 0x02018000 +_0809E378: .4byte gSharedMem + 0x18000 _0809E37C: ldrh r1, [r5, 0x2E] movs r0, 0x1 @@ -1362,14 +1362,14 @@ _0809E37C: lsrs r0, 24 cmp r0, 0x1 beq _0809E3A0 - ldr r0, _0809E3BC @ =0x02018000 + ldr r0, _0809E3BC @ =gSharedMem + 0x18000 adds r5, r0, 0 adds r5, 0x79 ldrb r0, [r5] cmp r0, 0x4 bne _0809E3C4 _0809E3A0: - ldr r0, _0809E3BC @ =0x02018000 + ldr r0, _0809E3BC @ =gSharedMem + 0x18000 adds r1, r0, 0 adds r1, 0x79 ldrb r1, [r1] @@ -1382,7 +1382,7 @@ _0809E3A0: bl SummaryScreenExit b _0809E3EE .align 2, 0 -_0809E3BC: .4byte 0x02018000 +_0809E3BC: .4byte gSharedMem + 0x18000 _0809E3C0: .4byte gSpecialVar_0x8005 _0809E3C4: movs r0, 0x20 @@ -1396,7 +1396,7 @@ _0809E3D4: ands r0, r1 cmp r0, 0 beq _0809E3EE - ldr r0, _0809E3F4 @ =0x02018000 + ldr r0, _0809E3F4 @ =gSharedMem + 0x18000 adds r0, 0x7A movs r1, 0x4 strb r1, [r0] @@ -1409,7 +1409,7 @@ _0809E3EE: pop {r0} bx r0 .align 2, 0 -_0809E3F4: .4byte 0x02018000 +_0809E3F4: .4byte gSharedMem + 0x18000 _0809E3F8: .4byte gSpecialVar_0x8005 thumb_func_end sub_809E260 @@ -1440,7 +1440,7 @@ sub_809E3FC: @ 809E3FC movs r1, 0x4 strh r1, [r0, 0x8] subs r1, 0x5 - ldr r2, _0809E444 @ =0x02018079 + ldr r2, _0809E444 @ =gSharedMem + 0x18079 adds r0, r5, 0 bl sub_809E8F0 b _0809E502 @@ -1448,7 +1448,7 @@ sub_809E3FC: @ 809E3FC _0809E438: .4byte gPaletteFade _0809E43C: .4byte gMain _0809E440: .4byte gTasks -_0809E444: .4byte 0x02018079 +_0809E444: .4byte gSharedMem + 0x18079 _0809E448: adds r0, r2, 0 ands r0, r1 @@ -1461,20 +1461,20 @@ _0809E448: adds r0, r1 movs r1, 0x4 strh r1, [r0, 0x8] - ldr r2, _0809E470 @ =0x02018079 + ldr r2, _0809E470 @ =gSharedMem + 0x18079 adds r0, r5, 0 movs r1, 0x1 bl sub_809E8F0 b _0809E502 .align 2, 0 _0809E46C: .4byte gTasks -_0809E470: .4byte 0x02018079 +_0809E470: .4byte gSharedMem + 0x18079 _0809E474: movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _0809E4EE - ldr r4, _0809E4A8 @ =0x02018000 + ldr r4, _0809E4A8 @ =gSharedMem + 0x18000 adds r6, r4, 0 adds r6, 0x79 ldrb r0, [r6] @@ -1495,7 +1495,7 @@ _0809E474: bl PlaySE b _0809E502 .align 2, 0 -_0809E4A8: .4byte 0x02018000 +_0809E4A8: .4byte gSharedMem + 0x18000 _0809E4AC: movs r0, 0x5 bl PlaySE @@ -1586,14 +1586,14 @@ sub_809E534: @ 809E534 movs r1, 0x3 strh r1, [r0, 0x8] subs r1, 0x4 - ldr r2, _0809E56C @ =0x0201807a + ldr r2, _0809E56C @ =gSharedMem + 0x1807A adds r0, r3, 0 bl sub_809E8F0 b _0809E5C0 .align 2, 0 _0809E564: .4byte gMain _0809E568: .4byte gTasks -_0809E56C: .4byte 0x0201807a +_0809E56C: .4byte gSharedMem + 0x1807A _0809E570: movs r0, 0x80 ands r0, r1 @@ -1606,14 +1606,14 @@ _0809E570: adds r0, r1 movs r1, 0x3 strh r1, [r0, 0x8] - ldr r2, _0809E598 @ =0x0201807a + ldr r2, _0809E598 @ =gSharedMem + 0x1807A adds r0, r3, 0 movs r1, 0x1 bl sub_809E8F0 b _0809E5C0 .align 2, 0 _0809E594: .4byte gTasks -_0809E598: .4byte 0x0201807a +_0809E598: .4byte gSharedMem + 0x1807A _0809E59C: movs r0, 0x1 ands r0, r1 @@ -1645,7 +1645,7 @@ sub_809E5C4: @ 809E5C4 mov r5, r8 push {r5-r7} sub sp, 0x20 - ldr r1, _0809E6D0 @ =0x02018000 + ldr r1, _0809E6D0 @ =gSharedMem + 0x18000 ldr r5, [r1] ldrb r2, [r1, 0x9] movs r0, 0x64 @@ -1764,7 +1764,7 @@ sub_809E5C4: @ 809E5C4 pop {r0} bx r0 .align 2, 0 -_0809E6D0: .4byte 0x02018000 +_0809E6D0: .4byte gSharedMem + 0x18000 _0809E6D4: .4byte gUnknown_08208238 thumb_func_end sub_809E5C4 @@ -1776,7 +1776,7 @@ sub_809E6D8: @ 809E6D8 mov r5, r8 push {r5-r7} sub sp, 0x20 - ldr r2, _0809E7E8 @ =0x02018000 + ldr r2, _0809E7E8 @ =gSharedMem + 0x18000 ldr r5, [r2] ldrb r1, [r2, 0x9] lsls r0, r1, 2 @@ -1896,7 +1896,7 @@ sub_809E6D8: @ 809E6D8 pop {r0} bx r0 .align 2, 0 -_0809E7E8: .4byte 0x02018000 +_0809E7E8: .4byte gSharedMem + 0x18000 _0809E7EC: .4byte gUnknown_08208238 thumb_func_end sub_809E6D8 @@ -1909,7 +1909,7 @@ sub_809E7F0: @ 809E7F0 lsls r0, 24 cmp r0, 0 beq _0809E828 - ldr r1, _0809E830 @ =0x02018000 + ldr r1, _0809E830 @ =gSharedMem + 0x18000 adds r2, r1, 0 adds r2, 0x74 movs r0, 0 @@ -1932,7 +1932,7 @@ _0809E828: pop {r0} bx r0 .align 2, 0 -_0809E830: .4byte 0x02018000 +_0809E830: .4byte gSharedMem + 0x18000 _0809E834: .4byte gTasks _0809E838: .4byte sub_809E3FC thumb_func_end sub_809E7F0 @@ -1953,7 +1953,7 @@ sub_809E83C: @ 809E83C bl sub_80A1B40 cmp r4, 0x1 bne _0809E8C0 - ldr r1, _0809E87C @ =0x02018000 + ldr r1, _0809E87C @ =gSharedMem + 0x18000 adds r0, r1, 0 adds r0, 0x79 adds r2, r1, 0 @@ -1968,11 +1968,11 @@ sub_809E83C: @ 809E83C bl sub_809E5C4 b _0809E884 .align 2, 0 -_0809E87C: .4byte 0x02018000 +_0809E87C: .4byte gSharedMem + 0x18000 _0809E880: bl sub_809E6D8 _0809E884: - ldr r4, _0809E8B4 @ =0x02018000 + ldr r4, _0809E8B4 @ =gSharedMem + 0x18000 adds r0, r4, 0 adds r0, 0x7A ldrb r0, [r0] @@ -1995,11 +1995,11 @@ _0809E884: str r1, [r0] b _0809E8DE .align 2, 0 -_0809E8B4: .4byte 0x02018000 +_0809E8B4: .4byte gSharedMem + 0x18000 _0809E8B8: .4byte gTasks _0809E8BC: .4byte sub_809E7F0 _0809E8C0: - ldr r0, _0809E8E4 @ =0x02018010 + ldr r0, _0809E8E4 @ =gSharedMem + 0x18010 adds r1, r0, 0 adds r1, 0x69 bl sub_80A0428 @@ -2018,7 +2018,7 @@ _0809E8DE: pop {r0} bx r0 .align 2, 0 -_0809E8E4: .4byte 0x02018010 +_0809E8E4: .4byte gSharedMem + 0x18010 _0809E8E8: .4byte gTasks _0809E8EC: .4byte sub_809E3FC thumb_func_end sub_809E83C @@ -2076,7 +2076,7 @@ _0809E948: _0809E94E: lsls r4, r6, 24 lsrs r1, r4, 24 - ldr r0, _0809EA10 @ =0x02018010 + ldr r0, _0809EA10 @ =gSharedMem + 0x18010 str r2, [sp, 0x4] bl sub_809F760 lsls r0, 16 @@ -2103,7 +2103,7 @@ _0809E97A: asrs r0, r5, 24 cmp r0, 0x4 beq _0809E996 - ldr r0, _0809EA14 @ =0x02018000 + ldr r0, _0809EA14 @ =gSharedMem + 0x18000 adds r0, 0x7C ldrh r0, [r0] mov r2, r8 @@ -2147,7 +2147,7 @@ _0809E9D0: asrs r0, r5, 24 cmp r0, 0x4 bne _0809E9FE - ldr r0, _0809EA14 @ =0x02018000 + ldr r0, _0809EA14 @ =gSharedMem + 0x18000 adds r0, 0x7C ldrh r0, [r0] cmp r0, 0 @@ -2164,17 +2164,17 @@ _0809E9D0: _0809E9FE: mov r2, r9 strb r6, [r2] - ldr r0, _0809EA1C @ =0x02018079 + ldr r0, _0809EA1C @ =gSharedMem + 0x18079 cmp r9, r0 bne _0809EA20 movs r0, 0 bl sub_80A1C30 b _0809EA26 .align 2, 0 -_0809EA10: .4byte 0x02018010 -_0809EA14: .4byte 0x02018000 +_0809EA10: .4byte gSharedMem + 0x18010 +_0809EA14: .4byte gSharedMem + 0x18000 _0809EA18: .4byte gTasks -_0809EA1C: .4byte 0x02018079 +_0809EA1C: .4byte gSharedMem + 0x18079 _0809EA20: movs r0, 0x1 bl sub_80A1C30 @@ -2182,7 +2182,7 @@ _0809EA26: ldr r3, [sp] cmp r3, 0 beq _0809EA34 - ldr r0, _0809EA4C @ =0x02018010 + ldr r0, _0809EA4C @ =gSharedMem + 0x18010 mov r1, r9 bl sub_80A0428 _0809EA34: @@ -2197,7 +2197,7 @@ _0809EA34: pop {r0} bx r0 .align 2, 0 -_0809EA4C: .4byte 0x02018010 +_0809EA4C: .4byte gSharedMem + 0x18010 thumb_func_end sub_809E8F0 thumb_func_start SummaryScreenHandleAButton @@ -2207,7 +2207,7 @@ SummaryScreenHandleAButton: @ 809EA50 lsrs r5, r0, 24 movs r0, 0x5 bl PlaySE - ldr r4, _0809EABC @ =0x02018000 + ldr r4, _0809EABC @ =gSharedMem + 0x18000 adds r1, r4, 0 adds r1, 0x79 movs r0, 0 @@ -2249,7 +2249,7 @@ _0809EA8C: pop {r0} bx r0 .align 2, 0 -_0809EABC: .4byte 0x02018000 +_0809EABC: .4byte gSharedMem + 0x18000 _0809EAC0: .4byte gTasks _0809EAC4: .4byte sub_809E3FC thumb_func_end SummaryScreenHandleAButton @@ -2259,7 +2259,7 @@ sub_809EAC8: @ 809EAC8 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0809EB34 @ =0x02018000 + ldr r6, _0809EB34 @ =gSharedMem + 0x18000 adds r0, r6, 0 adds r0, 0x79 ldrb r0, [r0] @@ -2304,7 +2304,7 @@ _0809EAEE: pop {r0} bx r0 .align 2, 0 -_0809EB34: .4byte 0x02018000 +_0809EB34: .4byte gSharedMem + 0x18000 _0809EB38: .4byte gTasks _0809EB3C: .4byte SummaryScreenHandleKeyInput thumb_func_end sub_809EAC8 @@ -2336,7 +2336,7 @@ sub_809EB40: @ 809EB40 _0809EB6C: .4byte gTasks _0809EB70: .4byte sub_809E260 _0809EB74: - ldr r4, _0809EBBC @ =0x02018000 + ldr r4, _0809EBBC @ =gSharedMem + 0x18000 adds r6, r4, 0 adds r6, 0x79 strb r0, [r6] @@ -2371,14 +2371,14 @@ _0809EBB4: pop {r0} bx r0 .align 2, 0 -_0809EBBC: .4byte 0x02018000 +_0809EBBC: .4byte gSharedMem + 0x18000 _0809EBC0: .4byte gTasks thumb_func_end sub_809EB40 thumb_func_start sub_809EBC4 sub_809EBC4: @ 809EBC4 push {r4,lr} - ldr r4, _0809EC28 @ =0x02018000 + ldr r4, _0809EC28 @ =gSharedMem + 0x18000 ldrb r0, [r4, 0xB] cmp r0, 0 beq _0809EC22 @@ -2430,7 +2430,7 @@ _0809EC22: pop {r0} bx r0 .align 2, 0 -_0809EC28: .4byte 0x02018000 +_0809EC28: .4byte gSharedMem + 0x18000 _0809EC2C: .4byte gUnknown_030042C0 _0809EC30: .4byte REG_BG1CNT _0809EC34: .4byte 0x0000e0ff @@ -2469,7 +2469,7 @@ _0809EC64: .4byte _0809EE1C .4byte _0809EE4C _0809EC7C: - ldr r1, _0809ECB8 @ =0x02018000 + ldr r1, _0809ECB8 @ =gSharedMem + 0x18000 adds r0, r1, 0 adds r0, 0x80 ldrb r0, [r0] @@ -2503,7 +2503,7 @@ _0809ECB4: ldr r2, _0809ECC0 @ =REG_BG2CNT b _0809ECF6 .align 2, 0 -_0809ECB8: .4byte 0x02018000 +_0809ECB8: .4byte gSharedMem + 0x18000 _0809ECBC: .4byte gUnknown_03004288 _0809ECC0: .4byte REG_BG2CNT _0809ECC4: .4byte 0x0000e0ff @@ -2549,7 +2549,7 @@ _0809ED08: .4byte gUnknown_030042C0 _0809ED0C: .4byte REG_BG1CNT _0809ED10: .4byte 0x0000e0ff _0809ED14: - ldr r0, _0809ED48 @ =0x02018000 + ldr r0, _0809ED48 @ =gSharedMem + 0x18000 adds r0, 0x80 ldrb r0, [r0] cmp r0, 0 @@ -2577,7 +2577,7 @@ _0809ED2E: strh r1, [r2] b _0809EE3A .align 2, 0 -_0809ED48: .4byte 0x02018000 +_0809ED48: .4byte gSharedMem + 0x18000 _0809ED4C: .4byte gUnknown_030042C0 _0809ED50: .4byte REG_BG1CNT _0809ED54: .4byte 0x0000fffc @@ -2611,7 +2611,7 @@ _0809ED8C: .4byte REG_BG1CNT _0809ED90: .4byte 0x0000fffc _0809ED94: .4byte REG_BG2CNT _0809ED98: - ldr r1, _0809EDD4 @ =0x02018000 + ldr r1, _0809EDD4 @ =gSharedMem + 0x18000 ldrb r3, [r1, 0xB] adds r0, r3, 0x1 adds r2, r1, 0 @@ -2639,7 +2639,7 @@ _0809ED98: bl sub_80A00F4 b _0809EE3A .align 2, 0 -_0809EDD4: .4byte 0x02018000 +_0809EDD4: .4byte gSharedMem + 0x18000 _0809EDD8: lsls r0, r3, 24 lsrs r0, 24 @@ -2680,7 +2680,7 @@ _0809EE12: b _0809EE3A _0809EE1C: ldr r0, _0809EE44 @ =gUnknown_083C1598 - ldr r4, _0809EE48 @ =0x02018000 + ldr r4, _0809EE48 @ =gSharedMem + 0x18000 ldrb r1, [r4, 0xB] lsls r1, 2 adds r1, r0 @@ -2700,7 +2700,7 @@ _0809EE3A: b _0809EE64 .align 2, 0 _0809EE44: .4byte gUnknown_083C1598 -_0809EE48: .4byte 0x02018000 +_0809EE48: .4byte gSharedMem + 0x18000 _0809EE4C: bl sub_8055870 cmp r0, 0x1 @@ -2756,7 +2756,7 @@ _0809EEA0: .4byte _0809F078 .4byte _0809F0A8 _0809EEBC: - ldr r0, _0809EECC @ =0x02018000 + ldr r0, _0809EECC @ =gSharedMem + 0x18000 adds r0, 0x80 ldrb r1, [r0] cmp r1, 0 @@ -2765,7 +2765,7 @@ _0809EEBC: strh r1, [r0] b _0809F096 .align 2, 0 -_0809EECC: .4byte 0x02018000 +_0809EECC: .4byte gSharedMem + 0x18000 _0809EED0: .4byte gUnknown_03004288 _0809EED4: ldr r1, _0809EEDC @ =gUnknown_030042C0 @@ -2775,7 +2775,7 @@ _0809EED4: .align 2, 0 _0809EEDC: .4byte gUnknown_030042C0 _0809EEE0: - ldr r1, _0809EF30 @ =0x02018000 + ldr r1, _0809EF30 @ =gSharedMem + 0x18000 adds r0, r1, 0 adds r0, 0x80 ldrb r0, [r0] @@ -2818,7 +2818,7 @@ _0809EF2A: ldr r2, _0809EF48 @ =REG_BG1CNT b _0809EF8C .align 2, 0 -_0809EF30: .4byte 0x02018000 +_0809EF30: .4byte gSharedMem + 0x18000 _0809EF34: .4byte REG_BG2CNT _0809EF38: .4byte 0x0000e0fc _0809EF3C: .4byte 0x00000801 @@ -2877,7 +2877,7 @@ _0809EFA8: .4byte 0x00000c01 _0809EFAC: .4byte REG_BG2CNT _0809EFB0: .4byte 0x0000fffc _0809EFB4: - ldr r0, _0809EFD4 @ =0x02018000 + ldr r0, _0809EFD4 @ =gSharedMem + 0x18000 adds r0, 0x80 ldrb r0, [r0] cmp r0, 0 @@ -2893,7 +2893,7 @@ _0809EFB4: bne _0809F0C0 b _0809F096 .align 2, 0 -_0809EFD4: .4byte 0x02018000 +_0809EFD4: .4byte gSharedMem + 0x18000 _0809EFD8: .4byte gUnknown_03004288 _0809EFDC: ldr r0, _0809EFF0 @ =gUnknown_030042C0 @@ -2909,7 +2909,7 @@ _0809EFDC: .align 2, 0 _0809EFF0: .4byte gUnknown_030042C0 _0809EFF4: - ldr r1, _0809F030 @ =0x02018000 + ldr r1, _0809F030 @ =gSharedMem + 0x18000 ldrb r3, [r1, 0xB] adds r0, r3, 0x1 adds r2, r1, 0 @@ -2937,7 +2937,7 @@ _0809EFF4: bl sub_80A00F4 b _0809F096 .align 2, 0 -_0809F030: .4byte 0x02018000 +_0809F030: .4byte gSharedMem + 0x18000 _0809F034: lsls r0, r3, 24 lsrs r0, 24 @@ -2978,7 +2978,7 @@ _0809F06E: b _0809F096 _0809F078: ldr r0, _0809F0A0 @ =gUnknown_083C1598 - ldr r4, _0809F0A4 @ =0x02018000 + ldr r4, _0809F0A4 @ =gSharedMem + 0x18000 ldrb r1, [r4, 0xB] lsls r1, 2 adds r1, r0 @@ -2998,7 +2998,7 @@ _0809F096: b _0809F0C0 .align 2, 0 _0809F0A0: .4byte gUnknown_083C1598 -_0809F0A4: .4byte 0x02018000 +_0809F0A4: .4byte gSharedMem + 0x18000 _0809F0A8: bl sub_8055870 cmp r0, 0x1 @@ -3028,7 +3028,7 @@ sub_809F0D0: @ 809F0D0 lsrs r7, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, _0809F110 @ =0x02018000 + ldr r1, _0809F110 @ =gSharedMem + 0x18000 ldrb r0, [r1, 0xB] adds r0, r4 movs r5, 0 @@ -3053,7 +3053,7 @@ sub_809F0D0: @ 809F0D0 str r0, [r6] b _0809F12A .align 2, 0 -_0809F110: .4byte 0x02018000 +_0809F110: .4byte gSharedMem + 0x18000 _0809F114: .4byte gUnknown_03005CF0 _0809F118: .4byte gTasks _0809F11C: .4byte sub_809EC38 @@ -3077,7 +3077,7 @@ SummaryScreenHandleLeftRightInput: @ 809F134 lsrs r6, r0, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r4, _0809F1AC @ =0x02018010 + ldr r4, _0809F1AC @ =gSharedMem + 0x18010 adds r0, r4, 0 movs r1, 0x2D bl GetMonData @@ -3131,7 +3131,7 @@ _0809F1A6: pop {r0} bx r0 .align 2, 0 -_0809F1AC: .4byte 0x02018010 +_0809F1AC: .4byte gSharedMem + 0x18010 _0809F1B0: .4byte sub_80A1334 _0809F1B4: .4byte sub_80A1500 thumb_func_end SummaryScreenHandleLeftRightInput @@ -3143,7 +3143,7 @@ SummaryScreenHandleUpDownInput: @ 809F1B8 lsrs r6, r0, 24 lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _0809F1E4 @ =0x02018000 + ldr r0, _0809F1E4 @ =gSharedMem + 0x18000 ldrb r1, [r0, 0xE] adds r2, r0, 0 cmp r1, 0x1 @@ -3160,7 +3160,7 @@ SummaryScreenHandleUpDownInput: @ 809F1B8 lsrs r4, r0, 31 b _0809F1F4 .align 2, 0 -_0809F1E4: .4byte 0x02018000 +_0809F1E4: .4byte gSharedMem + 0x18000 _0809F1E8: lsls r0, r4, 24 asrs r0, 24 @@ -3205,7 +3205,7 @@ _0809F22C: beq _0809F270 movs r0, 0x5 bl PlaySE - ldr r5, _0809F278 @ =0x02018010 + ldr r5, _0809F278 @ =gSharedMem + 0x18010 adds r0, r5, 0 bl GetMonStatusAndPokerus lsls r0, 24 @@ -3232,7 +3232,7 @@ _0809F270: pop {r0} bx r0 .align 2, 0 -_0809F278: .4byte 0x02018010 +_0809F278: .4byte gSharedMem + 0x18010 _0809F27C: .4byte gTasks _0809F280: .4byte sub_809F43C thumb_func_end SummaryScreenHandleUpDownInput @@ -3242,7 +3242,7 @@ sub_809F284: @ 809F284 push {r4-r7,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _0809F2C0 @ =0x02018000 + ldr r0, _0809F2C0 @ =gSharedMem + 0x18000 ldr r7, [r0] movs r6, 0 ldrb r1, [r0, 0xB] @@ -3272,7 +3272,7 @@ _0809F2BA: adds r0, r3 b _0809F304 .align 2, 0 -_0809F2C0: .4byte 0x02018000 +_0809F2C0: .4byte gSharedMem + 0x18000 _0809F2C4: lsls r5, r3, 24 _0809F2C6: @@ -3281,7 +3281,7 @@ _0809F2C6: asrs r1, r5, 24 adds r0, r1 lsls r0, 24 - ldr r4, _0809F2EC @ =0x02018000 + ldr r4, _0809F2EC @ =gSharedMem + 0x18000 lsrs r6, r0, 24 asrs r0, 24 ldrb r2, [r4, 0x9] @@ -3296,7 +3296,7 @@ _0809F2E4: negs r0, r0 b _0809F308 .align 2, 0 -_0809F2EC: .4byte 0x02018000 +_0809F2EC: .4byte gSharedMem + 0x18000 _0809F2F0: movs r0, 0x64 muls r0, r1 @@ -3324,7 +3324,7 @@ sub_809F310: @ 809F310 bl GetMonData cmp r0, 0 beq _0809F33C - ldr r0, _0809F338 @ =0x02018000 + ldr r0, _0809F338 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0xB] cmp r0, 0 bne _0809F332 @@ -3337,7 +3337,7 @@ _0809F332: movs r0, 0x1 b _0809F33E .align 2, 0 -_0809F338: .4byte 0x02018000 +_0809F338: .4byte gSharedMem + 0x18000 _0809F33C: movs r0, 0 _0809F33E: @@ -3430,7 +3430,7 @@ sub_809F3CC: @ 809F3CC movs r2, 0 movs r1, 0 ldr r3, _0809F41C @ =gUnknown_083C15A8 - ldr r4, _0809F420 @ =0x02018000 + ldr r4, _0809F420 @ =gSharedMem + 0x18000 ldrb r0, [r3] ldrb r5, [r4, 0x9] cmp r0, r5 @@ -3469,7 +3469,7 @@ _0809F414: b _0809F436 .align 2, 0 _0809F41C: .4byte gUnknown_083C15A8 -_0809F420: .4byte 0x02018000 +_0809F420: .4byte gSharedMem + 0x18000 _0809F424: adds r0, r2, 0 bl sub_809F388 @@ -3524,7 +3524,7 @@ _0809F48C: bl StopCryAndClearCrySongs b _0809F5B2 _0809F492: - ldr r0, _0809F4AC @ =0x02018000 + ldr r0, _0809F4AC @ =gSharedMem + 0x18000 ldrb r1, [r0, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -3537,12 +3537,12 @@ _0809F492: adds r1, r0 b _0809F5B8 .align 2, 0 -_0809F4AC: .4byte 0x02018000 +_0809F4AC: .4byte gSharedMem + 0x18000 _0809F4B0: .4byte gSprites _0809F4B4: .4byte gMain _0809F4B8: .4byte 0x0000043c _0809F4BC: - ldr r0, _0809F4D0 @ =0x02018000 + ldr r0, _0809F4D0 @ =gSharedMem + 0x18000 ldrb r1, [r0, 0xD] lsls r0, r1, 4 adds r0, r1 @@ -3552,10 +3552,10 @@ _0809F4BC: bl DestroySpriteAndFreeResources b _0809F5B2 .align 2, 0 -_0809F4D0: .4byte 0x02018000 +_0809F4D0: .4byte gSharedMem + 0x18000 _0809F4D4: .4byte gSprites _0809F4D8: - ldr r0, _0809F4EC @ =0x02018000 + ldr r0, _0809F4EC @ =gSharedMem + 0x18000 adds r1, r0, 0 adds r1, 0x74 movs r2, 0 @@ -3566,10 +3566,10 @@ _0809F4D8: adds r1, r3, r0 b _0809F5B8 .align 2, 0 -_0809F4EC: .4byte 0x02018000 +_0809F4EC: .4byte gSharedMem + 0x18000 _0809F4F0: .4byte 0x0000043c _0809F4F4: - ldr r4, _0809F518 @ =0x02018010 + ldr r4, _0809F518 @ =gSharedMem + 0x18010 adds r0, r4, 0 bl sub_809F678 adds r0, r4, 0 @@ -3584,9 +3584,9 @@ _0809F50E: bl sub_80A0EA4 b _0809F5B2 .align 2, 0 -_0809F518: .4byte 0x02018010 +_0809F518: .4byte gSharedMem + 0x18010 _0809F51C: - ldr r4, _0809F558 @ =0x02018010 + ldr r4, _0809F558 @ =gSharedMem + 0x18010 adds r5, r4, 0 adds r5, 0x64 adds r0, r4, 0 @@ -3614,7 +3614,7 @@ _0809F51C: strh r0, [r1] b _0809F564 .align 2, 0 -_0809F558: .4byte 0x02018010 +_0809F558: .4byte gSharedMem + 0x18010 _0809F55C: .4byte gUnknown_030041B0 _0809F560: ldr r0, _0809F56C @ =gUnknown_030041B0 @@ -3629,20 +3629,20 @@ _0809F56C: .4byte gUnknown_030041B0 _0809F570: .4byte gMain _0809F574: .4byte 0x0000043c _0809F578: - ldr r0, _0809F580 @ =0x02018010 + ldr r0, _0809F580 @ =gSharedMem + 0x18010 bl sub_80A1DCC b _0809F5B2 .align 2, 0 -_0809F580: .4byte 0x02018010 +_0809F580: .4byte gSharedMem + 0x18010 _0809F584: - ldr r0, _0809F594 @ =0x02018010 + ldr r0, _0809F594 @ =gSharedMem + 0x18010 bl sub_80A1DE8 ldr r1, _0809F598 @ =gMain ldr r0, _0809F59C @ =0x0000043c adds r1, r0 b _0809F5B8 .align 2, 0 -_0809F594: .4byte 0x02018010 +_0809F594: .4byte gSharedMem + 0x18010 _0809F598: .4byte gMain _0809F59C: .4byte 0x0000043c _0809F5A0: @@ -3650,7 +3650,7 @@ _0809F5A0: lsls r0, 24 cmp r0, 0 beq _0809F5EA - ldr r0, _0809F5C0 @ =0x02018000 + ldr r0, _0809F5C0 @ =gSharedMem + 0x18000 adds r0, 0x74 movs r1, 0 strb r1, [r0] @@ -3664,7 +3664,7 @@ _0809F5B8: strb r0, [r1] b _0809F5EA .align 2, 0 -_0809F5C0: .4byte 0x02018000 +_0809F5C0: .4byte gSharedMem + 0x18000 _0809F5C4: .4byte gMain _0809F5C8: .4byte 0x0000043c _0809F5CC: @@ -3678,7 +3678,7 @@ _0809F5CC: adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0809F5F4 @ =0x02018000 + ldr r0, _0809F5F4 @ =gSharedMem + 0x18000 adds r0, 0x84 ldr r0, [r0] str r0, [r1] @@ -3688,13 +3688,13 @@ _0809F5EA: bx r0 .align 2, 0 _0809F5F0: .4byte gTasks -_0809F5F4: .4byte 0x02018000 +_0809F5F4: .4byte gSharedMem + 0x18000 thumb_func_end sub_809F43C thumb_func_start sub_809F5F8 sub_809F5F8: @ 809F5F8 push {r4,lr} - ldr r2, _0809F61C @ =0x02018000 + ldr r2, _0809F61C @ =gSharedMem + 0x18000 adds r4, r2, 0 adds r4, 0x74 ldrb r0, [r4] @@ -3711,7 +3711,7 @@ sub_809F5F8: @ 809F5F8 movs r0, 0x1 b _0809F634 .align 2, 0 -_0809F61C: .4byte 0x02018000 +_0809F61C: .4byte gSharedMem + 0x18000 _0809F620: .4byte gUnknown_083C1588 _0809F624: adds r0, r2, 0 @@ -3767,7 +3767,7 @@ sub_809F664: @ 809F664 sub_809F678: @ 809F678 push {lr} adds r3, r0, 0 - ldr r1, _0809F698 @ =0x02018000 + ldr r1, _0809F698 @ =gSharedMem + 0x18000 ldrb r0, [r1, 0xE] cmp r0, 0 bne _0809F69C @@ -3781,7 +3781,7 @@ sub_809F678: @ 809F678 bl memcpy b _0809F6AE .align 2, 0 -_0809F698: .4byte 0x02018000 +_0809F698: .4byte gSharedMem + 0x18000 _0809F69C: ldr r0, [r1] ldrb r2, [r1, 0x9] @@ -3955,7 +3955,7 @@ sub_809F7D0: @ 809F7D0 sub sp, 0x64 mov r0, sp bl sub_809F678 - ldr r4, _0809F804 @ =0x02018000 + ldr r4, _0809F804 @ =gSharedMem + 0x18000 adds r0, r4, 0 adds r0, 0x79 ldrb r1, [r0] @@ -3974,7 +3974,7 @@ sub_809F7D0: @ 809F7D0 movs r0, 0 b _0809F80A .align 2, 0 -_0809F804: .4byte 0x02018000 +_0809F804: .4byte gSharedMem + 0x18000 _0809F808: movs r0, 0x1 _0809F80A: @@ -4023,7 +4023,7 @@ _0809F840: strh r0, [r4] movs r0, 0x1 strh r0, [r4, 0x1A] - ldr r2, _0809F87C @ =0x02018000 + ldr r2, _0809F87C @ =gSharedMem + 0x18000 ldrh r0, [r4, 0x1E] adds r2, 0x79 strb r0, [r2] @@ -4035,7 +4035,7 @@ _0809F840: .align 2, 0 _0809F874: .4byte gMain _0809F878: .4byte sub_809E260 -_0809F87C: .4byte 0x02018000 +_0809F87C: .4byte gSharedMem + 0x18000 _0809F880: movs r0, 0x80 ands r0, r1 @@ -4050,7 +4050,7 @@ _0809F880: strh r0, [r4] movs r0, 0x1 strh r0, [r4, 0x1A] - ldr r2, _0809F8B0 @ =0x02018000 + ldr r2, _0809F8B0 @ =gSharedMem + 0x18000 ldrh r0, [r4, 0x1E] adds r2, 0x79 strb r0, [r2] @@ -4060,7 +4060,7 @@ _0809F880: b _0809F9C0 .align 2, 0 _0809F8AC: .4byte sub_809E260 -_0809F8B0: .4byte 0x02018000 +_0809F8B0: .4byte gSharedMem + 0x18000 _0809F8B4: movs r0, 0x20 ands r0, r1 @@ -4072,7 +4072,7 @@ _0809F8B4: cmp r0, 0x1 bne _0809F918 _0809F8C8: - ldr r1, _0809F90C @ =0x02018000 + ldr r1, _0809F90C @ =gSharedMem + 0x18000 ldrb r0, [r1, 0xB] cmp r0, 0x2 beq _0809F9C0 @@ -4107,7 +4107,7 @@ _0809F8F4: adds r0, r5, 0 b _0809F972 .align 2, 0 -_0809F90C: .4byte 0x02018000 +_0809F90C: .4byte gSharedMem + 0x18000 _0809F910: .4byte gTasks _0809F914: .4byte sub_809E260 _0809F918: @@ -4122,7 +4122,7 @@ _0809F918: cmp r0, 0x2 bne _0809F994 _0809F92E: - ldr r1, _0809F988 @ =0x02018000 + ldr r1, _0809F988 @ =gSharedMem + 0x18000 adds r2, r1, 0 adds r2, 0x76 ldrb r0, [r1, 0xB] @@ -4167,7 +4167,7 @@ _0809F972: bl sub_80A1654 b _0809F9C0 .align 2, 0 -_0809F988: .4byte 0x02018000 +_0809F988: .4byte gSharedMem + 0x18000 _0809F98C: .4byte gTasks _0809F990: .4byte sub_809E260 _0809F994: @@ -4249,12 +4249,12 @@ _0809FA2C: .4byte sub_809F814 thumb_func_start sub_809FA30 sub_809FA30: @ 809FA30 - ldr r0, _0809FA38 @ =0x02018000 + ldr r0, _0809FA38 @ =gSharedMem + 0x18000 adds r0, 0x7A ldrb r0, [r0] bx lr .align 2, 0 -_0809FA38: .4byte 0x02018000 +_0809FA38: .4byte gSharedMem + 0x18000 thumb_func_end sub_809FA30 thumb_func_start GetStringCenterAlignXOffsetWithLetterSpacing @@ -5056,7 +5056,7 @@ sub_80A00F4: @ 80A00F4 push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r2, _080A012C @ =0x02018000 + ldr r2, _080A012C @ =gSharedMem + 0x18000 adds r0, r2, 0 adds r0, 0x7C ldrh r0, [r0] @@ -5080,7 +5080,7 @@ _080A010A: bl sub_80A1FF8 b _080A0150 .align 2, 0 -_080A012C: .4byte 0x02018000 +_080A012C: .4byte gSharedMem + 0x18000 _080A0130: .4byte gOtherText_Power2 _080A0134: .4byte gOtherText_Accuracy2 _080A0138: @@ -5146,7 +5146,7 @@ _080A0168: _080A01B0: .4byte gOtherText_OneDash _080A01B4: .4byte gOtherText_TwoDashes _080A01B8: - ldr r0, _080A01E0 @ =0x02018000 + ldr r0, _080A01E0 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0xB] cmp r0, 0x2 bne _080A01E8 @@ -5165,7 +5165,7 @@ _080A01B8: bl sub_80A198C b _080A020C .align 2, 0 -_080A01E0: .4byte 0x02018000 +_080A01E0: .4byte gSharedMem + 0x18000 _080A01E4: .4byte gBattleMoves _080A01E8: ldr r1, _080A0290 @ =gContestMoves @@ -5255,7 +5255,7 @@ _080A0298: .4byte gStringVar1 thumb_func_start sub_80A029C sub_80A029C: @ 80A029C push {r4,r5,lr} - ldr r1, _080A02B8 @ =0x02018000 + ldr r1, _080A02B8 @ =gSharedMem + 0x18000 adds r4, r1, 0 adds r4, 0x7C ldrh r0, [r4] @@ -5268,7 +5268,7 @@ sub_80A029C: @ 80A029C bl sub_80A1FF8 b _080A037E .align 2, 0 -_080A02B8: .4byte 0x02018000 +_080A02B8: .4byte gSharedMem + 0x18000 _080A02BC: .4byte gOtherText_CancelNoTerminator _080A02C0: ldrh r5, [r4] @@ -5305,7 +5305,7 @@ _080A02E4: bl sub_80A198C lsls r4, r5, 1 _080A0304: - ldr r0, _080A0324 @ =0x02018000 + ldr r0, _080A0324 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0xB] cmp r0, 0x2 bne _080A032C @@ -5320,7 +5320,7 @@ _080A0304: b _080A033E .align 2, 0 _080A0320: .4byte gContestMoves -_080A0324: .4byte 0x02018000 +_080A0324: .4byte gSharedMem + 0x18000 _080A0328: .4byte gMoveNames _080A032C: movs r0, 0xD @@ -5407,7 +5407,7 @@ sub_80A03BC: @ 80A03BC lsrs r1, r0, 16 b _080A03E0 _080A03D0: - ldr r0, _080A03E8 @ =0x02018000 + ldr r0, _080A03E8 @ =gSharedMem + 0x18000 adds r2, r0, 0 adds r2, 0x7C ldrh r0, [r2] @@ -5420,7 +5420,7 @@ _080A03E0: pop {r1} bx r1 .align 2, 0 -_080A03E8: .4byte 0x02018000 +_080A03E8: .4byte gSharedMem + 0x18000 _080A03EC: .4byte 0x0000ffff thumb_func_end sub_80A03BC @@ -5431,7 +5431,7 @@ sub_80A03F0: @ 80A03F0 bl sub_80A03BC lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _080A0414 @ =0x02018000 + ldr r0, _080A0414 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0xB] cmp r0, 0x2 bne _080A041C @@ -5441,7 +5441,7 @@ sub_80A03F0: @ 80A03F0 bl sub_80A057C b _080A0422 .align 2, 0 -_080A0414: .4byte 0x02018000 +_080A0414: .4byte gSharedMem + 0x18000 _080A0418: .4byte 0x0000ffff _080A041C: adds r0, r1, 0 @@ -5465,7 +5465,7 @@ sub_80A0428: @ 80A0428 movs r2, 0x1C movs r3, 0x12 bl MenuZeroFillWindowRect - ldr r0, _080A0454 @ =0x02018000 + ldr r0, _080A0454 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0xB] cmp r0, 0x2 bne _080A0458 @@ -5473,7 +5473,7 @@ sub_80A0428: @ 80A0428 bl sub_80A046C b _080A045E .align 2, 0 -_080A0454: .4byte 0x02018000 +_080A0454: .4byte gSharedMem + 0x18000 _080A0458: adds r0, r4, 0 bl sub_80A0498 @@ -6075,7 +6075,7 @@ sub_80A0BF4: @ 80A0BF4 lsrs r0, 24 cmp r0, 0x1 bne _080A0C48 - ldr r0, _080A0C40 @ =0x02018000 + ldr r0, _080A0C40 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x9] cmp r0, 0x1 beq _080A0C2E @@ -6092,7 +6092,7 @@ _080A0C2E: bl StringCopy b _080A0C68 .align 2, 0 -_080A0C40: .4byte 0x02018000 +_080A0C40: .4byte gSharedMem + 0x18000 _080A0C44: .4byte gStringVar1 _080A0C48: cmp r5, 0 @@ -6303,7 +6303,7 @@ sub_80A0DD0: @ 80A0DD0 bl sub_80A1E58 adds r2, r0, 0 ldr r1, _080A0E40 @ =gUnknown_083C1068 - ldr r4, _080A0E44 @ =0x02018000 + ldr r4, _080A0E44 @ =gSharedMem + 0x18000 adds r0, r4, 0 adds r0, 0x7E ldrb r0, [r0] @@ -6340,7 +6340,7 @@ sub_80A0DD0: @ 80A0DD0 .align 2, 0 _080A0E3C: .4byte gStringVar1 _080A0E40: .4byte gUnknown_083C1068 -_080A0E44: .4byte 0x02018000 +_080A0E44: .4byte gSharedMem + 0x18000 _080A0E48: movs r0, 0x17 movs r1, 0 @@ -6354,7 +6354,7 @@ _080A0E54: bl sub_80A1E58 adds r2, r0, 0 ldr r1, _080A0E9C @ =gUnknown_083C1068 - ldr r0, _080A0EA0 @ =0x02018000 + ldr r0, _080A0EA0 @ =gSharedMem + 0x18000 adds r0, 0x7F ldrb r0, [r0] lsls r0, 2 @@ -6381,7 +6381,7 @@ _080A0E54: .align 2, 0 _080A0E98: .4byte gStringVar1 _080A0E9C: .4byte gUnknown_083C1068 -_080A0EA0: .4byte 0x02018000 +_080A0EA0: .4byte gSharedMem + 0x18000 thumb_func_end sub_80A0DD0 thumb_func_start sub_80A0EA4 @@ -6428,7 +6428,7 @@ sub_80A0EE8: @ 80A0EE8 push {r5-r7} sub sp, 0x10 movs r3, 0 - ldr r6, _080A0F24 @ =0x02018000 + ldr r6, _080A0F24 @ =gSharedMem + 0x18000 adds r5, r6, 0 ldr r1, _080A0F28 @ =0x00004040 mov r8, r1 @@ -6452,7 +6452,7 @@ _080A0F02: strh r4, [r0] b _080A0FE2 .align 2, 0 -_080A0F24: .4byte 0x02018000 +_080A0F24: .4byte gSharedMem + 0x18000 _080A0F28: .4byte 0x00004040 _080A0F2C: .4byte 0x0000404a _080A0F30: @@ -7075,7 +7075,7 @@ _080A1400: cmp r0, 0 bge _080A144A _080A1410: - ldr r4, _080A1480 @ =0x02018000 + ldr r4, _080A1480 @ =gSharedMem + 0x18000 ldrb r0, [r4, 0xB] cmp r0, 0x2 bne _080A1444 @@ -7105,7 +7105,7 @@ _080A144A: ldrsh r0, [r7, r1] cmp r0, 0x9 ble _080A1470 - ldr r4, _080A1480 @ =0x02018000 + ldr r4, _080A1480 @ =gSharedMem + 0x18000 ldrb r0, [r4, 0xB] cmp r0, 0x2 bne _080A1460 @@ -7128,7 +7128,7 @@ _080A1470: pop {r0} bx r0 .align 2, 0 -_080A1480: .4byte 0x02018000 +_080A1480: .4byte gSharedMem + 0x18000 _080A1484: .4byte gOtherText_Status thumb_func_end sub_80A1334 @@ -7139,7 +7139,7 @@ sub_80A1488: @ 80A1488 lsrs r6, r0, 24 lsls r1, 24 lsrs r7, r1, 24 - ldr r0, _080A14DC @ =0x02018000 + ldr r0, _080A14DC @ =gSharedMem + 0x18000 ldrb r0, [r0, 0xB] cmp r0, 0x2 bne _080A14A6 @@ -7175,7 +7175,7 @@ _080A14C2: movs r0, 0xA b _080A14EA .align 2, 0 -_080A14DC: .4byte 0x02018000 +_080A14DC: .4byte gSharedMem + 0x18000 _080A14E0: .4byte sub_80A1334 _080A14E4: .4byte gTasks _080A14E8: @@ -7305,7 +7305,7 @@ _080A15CC: cmp r0, 0 bge _080A1616 _080A15DC: - ldr r4, _080A164C @ =0x02018000 + ldr r4, _080A164C @ =gSharedMem + 0x18000 ldrb r0, [r4, 0xB] cmp r0, 0x3 bne _080A1610 @@ -7335,7 +7335,7 @@ _080A1616: ldrsh r0, [r7, r1] cmp r0, 0x9 ble _080A163C - ldr r4, _080A164C @ =0x02018000 + ldr r4, _080A164C @ =gSharedMem + 0x18000 ldrb r0, [r4, 0xB] cmp r0, 0x3 bne _080A162C @@ -7358,7 +7358,7 @@ _080A163C: pop {r0} bx r0 .align 2, 0 -_080A164C: .4byte 0x02018000 +_080A164C: .4byte gSharedMem + 0x18000 _080A1650: .4byte gOtherText_Status thumb_func_end sub_80A1500 @@ -7369,7 +7369,7 @@ sub_80A1654: @ 80A1654 lsrs r6, r0, 24 lsls r1, 24 lsrs r7, r1, 24 - ldr r0, _080A16A8 @ =0x02018000 + ldr r0, _080A16A8 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0xB] cmp r0, 0x3 bne _080A1672 @@ -7405,7 +7405,7 @@ _080A168E: movs r0, 0xA b _080A16B6 .align 2, 0 -_080A16A8: .4byte 0x02018000 +_080A16A8: .4byte gSharedMem + 0x18000 _080A16AC: .4byte sub_80A1500 _080A16B0: .4byte gTasks _080A16B4: @@ -7664,7 +7664,7 @@ sub_80A1888: @ 80A1888 bne _080A18B0 ldr r0, _080A18BC @ =SpriteCallbackDummy str r0, [r4, 0x1C] - ldr r0, _080A18C0 @ =0x02018010 + ldr r0, _080A18C0 @ =gSharedMem + 0x18010 movs r1, 0x2D bl GetMonData cmp r0, 0 @@ -7679,14 +7679,14 @@ _080A18B0: .align 2, 0 _080A18B8: .4byte gPaletteFade _080A18BC: .4byte SpriteCallbackDummy -_080A18C0: .4byte 0x02018010 +_080A18C0: .4byte gSharedMem + 0x18010 thumb_func_end sub_80A1888 thumb_func_start sub_80A18C4 sub_80A18C4: @ 80A18C4 push {lr} movs r1, 0 - ldr r3, _080A18E0 @ =0x0201a000 + ldr r3, _080A18E0 @ =gSharedMem + 0x1A000 movs r2, 0xFF _080A18CC: adds r0, r1, r3 @@ -7699,7 +7699,7 @@ _080A18CC: pop {r0} bx r0 .align 2, 0 -_080A18E0: .4byte 0x0201a000 +_080A18E0: .4byte gSharedMem + 0x1A000 thumb_func_end sub_80A18C4 thumb_func_start sub_80A18E4 @@ -7707,7 +7707,7 @@ sub_80A18E4: @ 80A18E4 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080A1910 @ =0x0201a000 + ldr r1, _080A1910 @ =gSharedMem + 0x1A000 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF @@ -7726,7 +7726,7 @@ _080A1908: pop {r0} bx r0 .align 2, 0 -_080A1910: .4byte 0x0201a000 +_080A1910: .4byte gSharedMem + 0x1A000 _080A1914: .4byte gSprites thumb_func_end sub_80A18E4 @@ -7737,7 +7737,7 @@ sub_80A1918: @ 80A1918 lsls r1, 24 lsrs r1, 24 ldr r3, _080A1948 @ =gSprites - ldr r2, _080A194C @ =0x0201a000 + ldr r2, _080A194C @ =gSharedMem + 0x1A000 adds r0, r2 ldrb r0, [r0] lsls r2, r0, 4 @@ -7757,7 +7757,7 @@ sub_80A1918: @ 80A1918 bx lr .align 2, 0 _080A1948: .4byte gSprites -_080A194C: .4byte 0x0201a000 +_080A194C: .4byte gSharedMem + 0x1A000 thumb_func_end sub_80A1918 thumb_func_start sub_80A1950 @@ -7765,7 +7765,7 @@ sub_80A1950: @ 80A1950 push {r4,r5,lr} movs r5, 0 _080A1954: - ldr r0, _080A1984 @ =0x0201a000 + ldr r0, _080A1984 @ =gSharedMem + 0x1A000 adds r4, r5, r0 ldrb r0, [r4] cmp r0, 0xFF @@ -7789,7 +7789,7 @@ _080A196C: pop {r0} bx r0 .align 2, 0 -_080A1984: .4byte 0x0201a000 +_080A1984: .4byte gSharedMem + 0x1A000 _080A1988: .4byte gSpriteTemplate_83C11C0 thumb_func_end sub_80A1950 @@ -7814,7 +7814,7 @@ sub_80A198C: @ 80A198C lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r1, _080A1A24 @ =0x0201a000 + ldr r1, _080A1A24 @ =gSharedMem + 0x1A000 mov r8, r1 add r8, r10 mov r0, r8 @@ -7869,7 +7869,7 @@ sub_80A198C: @ 80A198C pop {r0} bx r0 .align 2, 0 -_080A1A24: .4byte 0x0201a000 +_080A1A24: .4byte gSharedMem + 0x1A000 _080A1A28: .4byte gSprites _080A1A2C: .4byte gUnknown_083C11D8 thumb_func_end sub_80A198C @@ -7885,7 +7885,7 @@ sub_80A1A30: @ 80A1A30 lsrs r4, r0, 24 movs r0, 0 mov r9, r0 - ldr r1, _080A1A98 @ =0x02018000 + ldr r1, _080A1A98 @ =gSharedMem + 0x18000 ldrb r0, [r1, 0xB] cmp r0, 0x1 bls _080A1B0A @@ -7928,7 +7928,7 @@ _080A1A60: bl StartSpriteAnim b _080A1AD0 .align 2, 0 -_080A1A98: .4byte 0x02018000 +_080A1A98: .4byte gSharedMem + 0x18000 _080A1A9C: .4byte gSprites _080A1AA0: .4byte gSpriteTemplate_83C1280 _080A1AA4: @@ -8026,7 +8026,7 @@ sub_80A1B40: @ 80A1B40 lsls r1, r7, 1 adds r1, r7 lsls r1, 24 - ldr r0, _080A1BB4 @ =0x0201a009 + ldr r0, _080A1BB4 @ =gSharedMem + 0x1A009 ldrb r2, [r0] lsls r0, r2, 4 adds r0, r2 @@ -8044,7 +8044,7 @@ sub_80A1B40: @ 80A1B40 lsls r0, 24 mov r8, r0 _080A1B74: - ldr r6, _080A1BBC @ =0x0201a00a + ldr r6, _080A1BBC @ =gSharedMem + 0x1A00A adds r0, r4, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -8075,9 +8075,9 @@ _080A1B74: pop {r0} bx r0 .align 2, 0 -_080A1BB4: .4byte 0x0201a009 +_080A1BB4: .4byte gSharedMem + 0x1A009 _080A1BB8: .4byte gSprites -_080A1BBC: .4byte 0x0201a00a +_080A1BBC: .4byte gSharedMem + 0x1A00A thumb_func_end sub_80A1B40 thumb_func_start sub_80A1BC0 @@ -8126,13 +8126,13 @@ _080A1C06: ldrsh r0, [r2, r1] cmp r0, 0x9 bne _080A1C1C - ldr r0, _080A1C18 @ =0x02018000 + ldr r0, _080A1C18 @ =gSharedMem + 0x18000 adds r0, 0x79 b _080A1C20 .align 2, 0 -_080A1C18: .4byte 0x02018000 +_080A1C18: .4byte gSharedMem + 0x18000 _080A1C1C: - ldr r0, _080A1C2C @ =0x02018000 + ldr r0, _080A1C2C @ =gSharedMem + 0x18000 adds r0, 0x7A _080A1C20: ldrb r0, [r0] @@ -8141,7 +8141,7 @@ _080A1C20: pop {r0} bx r0 .align 2, 0 -_080A1C2C: .4byte 0x02018000 +_080A1C2C: .4byte gSharedMem + 0x18000 thumb_func_end sub_80A1BC0 thumb_func_start sub_80A1C30 @@ -8161,7 +8161,7 @@ sub_80A1C30: @ 80A1C30 ldr r5, _080A1C88 @ =gSprites movs r7, 0x5 negs r7, r7 - ldr r6, _080A1C8C @ =0x0201a009 + ldr r6, _080A1C8C @ =gSharedMem + 0x1A009 _080A1C50: adds r2, r3, r6 ldrb r1, [r2] @@ -8194,7 +8194,7 @@ _080A1C82: bx r0 .align 2, 0 _080A1C88: .4byte gSprites -_080A1C8C: .4byte 0x0201a009 +_080A1C8C: .4byte gSharedMem + 0x1A009 thumb_func_end sub_80A1C30 thumb_func_start pokemon_ailments_get_primary @@ -8292,7 +8292,7 @@ sub_80A1D18: @ 80A1D18 subs r0, 0x1 lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080A1D50 @ =0x0201a01d + ldr r4, _080A1D50 @ =gSharedMem + 0x1A01D ldrb r0, [r4] cmp r0, 0xFF bne _080A1D60 @@ -8304,14 +8304,14 @@ sub_80A1D18: @ 80A1D18 strb r0, [r4] b _080A1D60 .align 2, 0 -_080A1D50: .4byte 0x0201a01d +_080A1D50: .4byte gSharedMem + 0x1A01D _080A1D54: .4byte gSpriteTemplate_83C1304 _080A1D58: movs r0, 0x1D bl sub_80A18E4 b _080A1D74 _080A1D60: - ldr r0, _080A1D7C @ =0x0201a01d + ldr r0, _080A1D7C @ =gSharedMem + 0x1A01D ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 @@ -8326,7 +8326,7 @@ _080A1D74: pop {r0} bx r0 .align 2, 0 -_080A1D7C: .4byte 0x0201a01d +_080A1D7C: .4byte gSharedMem + 0x1A01D _080A1D80: .4byte gSprites thumb_func_end sub_80A1D18 @@ -8404,7 +8404,7 @@ sub_80A1DE8: @ 80A1DE8 movs r2, 0x88 movs r3, 0 bl CreateSprite - ldr r2, _080A1E4C @ =0x02018000 + ldr r2, _080A1E4C @ =gSharedMem + 0x18000 strb r0, [r2, 0xD] ldr r3, _080A1E50 @ =gSprites ldrb r1, [r2, 0xD] @@ -8430,7 +8430,7 @@ sub_80A1DE8: @ 80A1DE8 bx r0 .align 2, 0 _080A1E48: .4byte gBallSpriteTemplates -_080A1E4C: .4byte 0x02018000 +_080A1E4C: .4byte gSharedMem + 0x18000 _080A1E50: .4byte gSprites _080A1E54: .4byte SpriteCallbackDummy thumb_func_end sub_80A1DE8 diff --git a/asm/pokenav.s b/asm/pokenav.s index ce72a83e0..b7ff9a032 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -46,7 +46,7 @@ _080EBABC: strb r0, [r1] _080EBAC0: bl is_c1_link_related_active - ldr r3, _080EBAF0 @ =0x02000000 + ldr r3, _080EBAF0 @ =gSharedMem ldr r2, _080EBAF4 @ =0x00006dac adds r1, r3, r2 strb r0, [r1] @@ -67,7 +67,7 @@ _080EBAC0: bl SetMainCallback2 b _080EBBC0 .align 2, 0 -_080EBAF0: .4byte 0x02000000 +_080EBAF0: .4byte gSharedMem _080EBAF4: .4byte 0x00006dac _080EBAF8: .4byte 0x00006dab _080EBAFC: .4byte gMain @@ -146,7 +146,7 @@ _080EBB90: .align 2, 0 _080EBB9C: .4byte sub_80EBDD8 _080EBBA0: - ldr r0, _080EBBD0 @ =0x02000000 + ldr r0, _080EBBD0 @ =gSharedMem ldr r1, _080EBBD4 @ =0x00006dab adds r0, r1 movs r1, 0x1 @@ -169,7 +169,7 @@ _080EBBCC: pop {r0} bx r0 .align 2, 0 -_080EBBD0: .4byte 0x02000000 +_080EBBD0: .4byte gSharedMem _080EBBD4: .4byte 0x00006dab _080EBBD8: .4byte sub_80EBD90 _080EBBDC: .4byte sub_80EBD18 @@ -180,7 +180,7 @@ _080EBBE4: .4byte 0x0000043c thumb_func_start sub_80EBBE8 sub_80EBBE8: @ 80EBBE8 push {r4,lr} - ldr r0, _080EBC08 @ =0x02000000 + ldr r0, _080EBC08 @ =gSharedMem ldr r2, _080EBC0C @ =0x00006dab adds r1, r0, r2 ldrb r0, [r1] @@ -197,7 +197,7 @@ _080EBC02: pop {r0} bx r0 .align 2, 0 -_080EBC08: .4byte 0x02000000 +_080EBC08: .4byte gSharedMem _080EBC0C: .4byte 0x00006dab thumb_func_end sub_80EBBE8 @@ -208,7 +208,7 @@ sub_80EBC10: @ 80EBC10 movs r0, 0x14 strh r0, [r1] bl CalculatePlayerPartyCount - ldr r2, _080EBC80 @ =0x02000000 + ldr r2, _080EBC80 @ =gSharedMem ldr r1, _080EBC84 @ =0x00008828 adds r3, r2, r1 movs r1, 0 @@ -258,7 +258,7 @@ _080EBC4C: bx r0 .align 2, 0 _080EBC7C: .4byte gKeyRepeatStartDelay -_080EBC80: .4byte 0x02000000 +_080EBC80: .4byte gSharedMem _080EBC84: .4byte 0x00008828 _080EBC88: .4byte 0x00006ddc _080EBC8C: .4byte 0x00009344 @@ -273,7 +273,7 @@ _080EBCA4: .4byte 0x00006e95 thumb_func_start sub_80EBCA8 sub_80EBCA8: @ 80EBCA8 push {r4,lr} - ldr r4, _080EBCDC @ =0x02000000 + ldr r4, _080EBCDC @ =gSharedMem ldr r0, _080EBCE0 @ =0x00006db2 adds r1, r4, r0 movs r0, 0x1 @@ -298,7 +298,7 @@ sub_80EBCA8: @ 80EBCA8 strb r0, [r1] b _080EBCFA .align 2, 0 -_080EBCDC: .4byte 0x02000000 +_080EBCDC: .4byte gSharedMem _080EBCE0: .4byte 0x00006db2 _080EBCE4: .4byte 0x00006db3 _080EBCE8: .4byte 0x00006db4 @@ -309,7 +309,7 @@ _080EBCF4: adds r0, r4, r1 strb r2, [r0] _080EBCFA: - ldr r0, _080EBD10 @ =0x02000000 + ldr r0, _080EBD10 @ =gSharedMem ldr r1, _080EBD14 @ =0x00006db6 adds r0, r1 movs r1, 0x5 @@ -319,7 +319,7 @@ _080EBCFA: bx r0 .align 2, 0 _080EBD0C: .4byte 0x00006db5 -_080EBD10: .4byte 0x02000000 +_080EBD10: .4byte gSharedMem _080EBD14: .4byte 0x00006db6 thumb_func_end sub_80EBCA8 @@ -381,7 +381,7 @@ sub_80EBD80: @ 80EBD80 thumb_func_start sub_80EBD90 sub_80EBD90: @ 80EBD90 push {lr} - ldr r0, _080EBDB8 @ =0x02000000 + ldr r0, _080EBDB8 @ =gSharedMem movs r1, 0xC0 lsls r1, 2 adds r0, r1 @@ -395,12 +395,12 @@ sub_80EBD90: @ 80EBD90 pop {r0} bx r0 .align 2, 0 -_080EBDB8: .4byte 0x02000000 +_080EBDB8: .4byte gSharedMem thumb_func_end sub_80EBD90 thumb_func_start sub_80EBDBC sub_80EBDBC: @ 80EBDBC - ldr r2, _080EBDD4 @ =0x02000000 + ldr r2, _080EBDD4 @ =gSharedMem movs r3, 0xC0 lsls r3, 2 adds r1, r2, r3 @@ -412,14 +412,14 @@ sub_80EBDBC: @ 80EBDBC strh r0, [r1] bx lr .align 2, 0 -_080EBDD4: .4byte 0x02000000 +_080EBDD4: .4byte gSharedMem thumb_func_end sub_80EBDBC thumb_func_start sub_80EBDD8 sub_80EBDD8: @ 80EBDD8 push {lr} sub sp, 0x4 - ldr r1, _080EBDF8 @ =0x02000000 + ldr r1, _080EBDF8 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -435,7 +435,7 @@ _080EBDEE: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EBDF8: .4byte 0x02000000 +_080EBDF8: .4byte gSharedMem _080EBDFC: .4byte _080EBE00 .align 2, 0 _080EBE00: @@ -464,7 +464,7 @@ _080EBE48: lsls r1, 19 movs r0, 0 strh r0, [r1] - ldr r1, _080EBE74 @ =0x02000000 + ldr r1, _080EBE74 @ =gSharedMem ldr r3, _080EBE78 @ =0x00006ddc adds r0, r1, r3 ldrb r2, [r0] @@ -480,12 +480,12 @@ _080EBE48: adds r1, r2 b _080EBFDC .align 2, 0 -_080EBE74: .4byte 0x02000000 +_080EBE74: .4byte gSharedMem _080EBE78: .4byte 0x00006ddc _080EBE7C: .4byte 0x00006dae _080EBE80: bl sub_80F3FF0 - ldr r1, _080EBEA8 @ =0x02000000 + ldr r1, _080EBEA8 @ =gSharedMem movs r3, 0xC1 lsls r3, 2 adds r1, r3 @@ -499,25 +499,25 @@ _080EBE92: beq _080EBE9E b _080EC000 _080EBE9E: - ldr r1, _080EBEA8 @ =0x02000000 + ldr r1, _080EBEA8 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EBFDC .align 2, 0 -_080EBEA8: .4byte 0x02000000 +_080EBEA8: .4byte gSharedMem _080EBEAC: bl sub_80F2598 - ldr r1, _080EBEBC @ =0x02000000 + ldr r1, _080EBEBC @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EBFDC .align 2, 0 -_080EBEBC: .4byte 0x02000000 +_080EBEBC: .4byte gSharedMem _080EBEC0: bl sub_80EEE20 - ldr r1, _080EBEEC @ =0x02000000 + ldr r1, _080EBEEC @ =gSharedMem movs r3, 0xC1 lsls r3, 2 adds r1, r3 @@ -532,17 +532,17 @@ _080EBED2: b _080EC000 _080EBEDE: bl sub_80EEE08 - ldr r1, _080EBEEC @ =0x02000000 + ldr r1, _080EBEEC @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EBFDC .align 2, 0 -_080EBEEC: .4byte 0x02000000 +_080EBEEC: .4byte gSharedMem _080EBEF0: movs r0, 0 bl sub_80EF248 - ldr r1, _080EBF14 @ =0x02000000 + ldr r1, _080EBF14 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -559,11 +559,11 @@ _080EBF04: _080EBF12: b _080EBFD4 .align 2, 0 -_080EBF14: .4byte 0x02000000 +_080EBF14: .4byte gSharedMem _080EBF18: movs r0, 0 bl sub_80F1B8C - ldr r1, _080EBF44 @ =0x02000000 + ldr r1, _080EBF44 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -576,13 +576,13 @@ _080EBF2C: lsls r0, 24 cmp r0, 0 bne _080EC000 - ldr r1, _080EBF44 @ =0x02000000 + ldr r1, _080EBF44 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EBFDC .align 2, 0 -_080EBF44: .4byte 0x02000000 +_080EBF44: .4byte gSharedMem _080EBF48: ldr r0, _080EBF50 @ =sub_80EBD18 bl SetVBlankCallback @@ -597,23 +597,23 @@ _080EBF54: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r1, _080EBF70 @ =0x02000000 + ldr r1, _080EBF70 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EBFDC .align 2, 0 -_080EBF70: .4byte 0x02000000 +_080EBF70: .4byte gSharedMem _080EBF74: movs r0, 0 bl sub_80EED2C - ldr r1, _080EBF84 @ =0x02000000 + ldr r1, _080EBF84 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EBFDC .align 2, 0 -_080EBF84: .4byte 0x02000000 +_080EBF84: .4byte gSharedMem _080EBF88: ldr r0, _080EBF9C @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -630,7 +630,7 @@ _080EBF9C: .4byte gPaletteFade _080EBFA0: movs r0, 0 bl sub_80F2C80 - ldr r1, _080EBFCC @ =0x02000000 + ldr r1, _080EBFCC @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -643,17 +643,17 @@ _080EBFB4: lsls r0, 24 cmp r0, 0 bne _080EC000 - ldr r1, _080EBFCC @ =0x02000000 + ldr r1, _080EBFCC @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EBFDC .align 2, 0 -_080EBFCC: .4byte 0x02000000 +_080EBFCC: .4byte gSharedMem _080EBFD0: bl sub_80F1DF0 _080EBFD4: - ldr r1, _080EBFE4 @ =0x02000000 + ldr r1, _080EBFE4 @ =gSharedMem movs r3, 0xC1 lsls r3, 2 adds r1, r3 @@ -663,7 +663,7 @@ _080EBFDC: strh r0, [r1] b _080EC000 .align 2, 0 -_080EBFE4: .4byte 0x02000000 +_080EBFE4: .4byte gSharedMem _080EBFE8: bl sub_80F1E50 lsls r0, 24 @@ -686,7 +686,7 @@ _080EC008: .4byte sub_80EC268 sub_80EC00C: @ 80EC00C push {r4,lr} sub sp, 0x4 - ldr r1, _080EC02C @ =0x02000000 + ldr r1, _080EC02C @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -702,7 +702,7 @@ _080EC022: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EC02C: .4byte 0x02000000 +_080EC02C: .4byte gSharedMem _080EC030: .4byte _080EC034 .align 2, 0 _080EC034: @@ -730,7 +730,7 @@ _080EC078: ldr r0, _080EC0AC @ =sub_80EBD80 bl SetVBlankCallback bl sub_80EED1C - ldr r4, _080EC0B0 @ =0x02000000 + ldr r4, _080EC0B0 @ =gSharedMem ldr r1, _080EC0B4 @ =0x00006ddc adds r0, r4, r1 ldrb r1, [r0] @@ -751,14 +751,14 @@ _080EC078: b _080EC1FA .align 2, 0 _080EC0AC: .4byte sub_80EBD80 -_080EC0B0: .4byte 0x02000000 +_080EC0B0: .4byte gSharedMem _080EC0B4: .4byte 0x00006ddc _080EC0B8: .4byte 0x00006dad _080EC0BC: .4byte 0x00006dae _080EC0C0: movs r0, 0 bl sub_80EF248 - ldr r1, _080EC0EC @ =0x02000000 + ldr r1, _080EC0EC @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -773,17 +773,17 @@ _080EC0D4: beq _080EC0E2 b _080EC1FA _080EC0E2: - ldr r1, _080EC0EC @ =0x02000000 + ldr r1, _080EC0EC @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EC1D0 .align 2, 0 -_080EC0EC: .4byte 0x02000000 +_080EC0EC: .4byte gSharedMem _080EC0F0: movs r0, 0 bl sub_80F1B8C - ldr r1, _080EC11C @ =0x02000000 + ldr r1, _080EC11C @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -798,13 +798,13 @@ _080EC104: beq _080EC112 b _080EC1FA _080EC112: - ldr r1, _080EC11C @ =0x02000000 + ldr r1, _080EC11C @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EC1D0 .align 2, 0 -_080EC11C: .4byte 0x02000000 +_080EC11C: .4byte gSharedMem _080EC120: bl sub_8055870 cmp r0, 0 @@ -833,13 +833,13 @@ _080EC150: .4byte sub_80EBD18 _080EC154: movs r0, 0 bl sub_80EED2C - ldr r1, _080EC164 @ =0x02000000 + ldr r1, _080EC164 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EC1D0 .align 2, 0 -_080EC164: .4byte 0x02000000 +_080EC164: .4byte gSharedMem _080EC168: ldr r0, _080EC17C @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -855,17 +855,17 @@ _080EC168: _080EC17C: .4byte gPaletteFade _080EC180: bl sub_80F2598 - ldr r1, _080EC190 @ =0x02000000 + ldr r1, _080EC190 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EC1D0 .align 2, 0 -_080EC190: .4byte 0x02000000 +_080EC190: .4byte gSharedMem _080EC194: movs r0, 0 bl sub_80F2C80 - ldr r1, _080EC1C0 @ =0x02000000 + ldr r1, _080EC1C0 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -878,17 +878,17 @@ _080EC1A8: lsls r0, 24 cmp r0, 0 bne _080EC1FA - ldr r1, _080EC1C0 @ =0x02000000 + ldr r1, _080EC1C0 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EC1D0 .align 2, 0 -_080EC1C0: .4byte 0x02000000 +_080EC1C0: .4byte gSharedMem _080EC1C4: bl sub_80F1DF0 _080EC1C8: - ldr r1, _080EC1D8 @ =0x02000000 + ldr r1, _080EC1D8 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -898,13 +898,13 @@ _080EC1D0: strh r0, [r1] b _080EC1FA .align 2, 0 -_080EC1D8: .4byte 0x02000000 +_080EC1D8: .4byte gSharedMem _080EC1DC: bl sub_80F1E50 lsls r0, 24 cmp r0, 0 bne _080EC1FA - ldr r0, _080EC204 @ =0x02000000 + ldr r0, _080EC204 @ =gSharedMem ldr r1, _080EC208 @ =0x00006dad adds r0, r1 ldrb r1, [r0] @@ -918,7 +918,7 @@ _080EC1FA: pop {r0} bx r0 .align 2, 0 -_080EC204: .4byte 0x02000000 +_080EC204: .4byte gSharedMem _080EC208: .4byte 0x00006dad _080EC20C: .4byte sub_80EC268 thumb_func_end sub_80EC00C @@ -926,7 +926,7 @@ _080EC20C: .4byte sub_80EC268 thumb_func_start sub_80EC210 sub_80EC210: @ 80EC210 push {r4,r5,lr} - ldr r5, _080EC228 @ =0x02000000 + ldr r5, _080EC228 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r4, r5, r0 @@ -937,7 +937,7 @@ sub_80EC210: @ 80EC210 beq _080EC24C b _080EC25C .align 2, 0 -_080EC228: .4byte 0x02000000 +_080EC228: .4byte gSharedMem _080EC22C: movs r0, 0x1 bl sub_80F2D04 @@ -971,7 +971,7 @@ _080EC264: .4byte sub_80EC268 thumb_func_start sub_80EC268 sub_80EC268: @ 80EC268 push {r4-r6,lr} - ldr r4, _080EC290 @ =0x02000000 + ldr r4, _080EC290 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r6, r4, r0 @@ -994,7 +994,7 @@ _080EC28A: beq _080EC2AE b _080EC492 .align 2, 0 -_080EC290: .4byte 0x02000000 +_080EC290: .4byte gSharedMem _080EC294: cmp r0, 0x6 bne _080EC29A @@ -1088,7 +1088,7 @@ _080EC344: .align 2, 0 _080EC354: .4byte sub_80EC81C _080EC358: - ldr r0, _080EC368 @ =0x02000000 + ldr r0, _080EC368 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r0, r1 @@ -1096,9 +1096,9 @@ _080EC358: strh r1, [r0] b _080EC492 .align 2, 0 -_080EC368: .4byte 0x02000000 +_080EC368: .4byte gSharedMem _080EC36C: - ldr r0, _080EC37C @ =0x02000000 + ldr r0, _080EC37C @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r2 @@ -1106,9 +1106,9 @@ _080EC36C: strh r1, [r0] b _080EC492 .align 2, 0 -_080EC37C: .4byte 0x02000000 +_080EC37C: .4byte gSharedMem _080EC380: - ldr r0, _080EC390 @ =0x02000000 + ldr r0, _080EC390 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r0, r1 @@ -1116,7 +1116,7 @@ _080EC380: strh r1, [r0] b _080EC492 .align 2, 0 -_080EC390: .4byte 0x02000000 +_080EC390: .4byte gSharedMem _080EC394: movs r0, 0x2 ands r0, r1 @@ -1143,7 +1143,7 @@ _080EC3BE: lsls r0, 24 cmp r0, 0 bne _080EC492 - ldr r1, _080EC3D8 @ =0x02000000 + ldr r1, _080EC3D8 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -1152,7 +1152,7 @@ _080EC3BE: strh r0, [r1] b _080EC492 .align 2, 0 -_080EC3D8: .4byte 0x02000000 +_080EC3D8: .4byte gSharedMem _080EC3DC: bl sub_8055870 cmp r0, 0 @@ -1248,7 +1248,7 @@ _080EC49C: .4byte 0x00006dad sub_80EC4A0: @ 80EC4A0 push {r4,lr} sub sp, 0x4 - ldr r1, _080EC4C0 @ =0x02000000 + ldr r1, _080EC4C0 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -1264,7 +1264,7 @@ _080EC4B6: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EC4C0: .4byte 0x02000000 +_080EC4C0: .4byte gSharedMem _080EC4C4: .4byte _080EC4C8 .align 2, 0 _080EC4C8: @@ -1306,14 +1306,14 @@ _080EC51C: _080EC52C: adds r0, r1, 0 bl sub_80EEFBC - ldr r1, _080EC540 @ =0x02000000 + ldr r1, _080EC540 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EC64C .align 2, 0 _080EC53C: .4byte gSaveBlock2 -_080EC540: .4byte 0x02000000 +_080EC540: .4byte gSharedMem _080EC544: bl sub_80EEF34 lsls r0, 24 @@ -1322,7 +1322,7 @@ _080EC544: beq _080EC552 b _080EC66A _080EC552: - ldr r4, _080EC574 @ =0x02000000 + ldr r4, _080EC574 @ =gSharedMem movs r1, 0xC2 lsls r1, 2 adds r0, r4, r1 @@ -1338,7 +1338,7 @@ _080EC552: adds r1, r4, r2 b _080EC64C .align 2, 0 -_080EC574: .4byte 0x02000000 +_080EC574: .4byte gSharedMem _080EC578: ldr r0, _080EC590 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -1354,19 +1354,19 @@ _080EC578: _080EC590: .4byte gPaletteFade _080EC594: bl sub_80F2620 - ldr r1, _080EC5A4 @ =0x02000000 + ldr r1, _080EC5A4 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EC64C .align 2, 0 -_080EC5A4: .4byte 0x02000000 +_080EC5A4: .4byte gSharedMem _080EC5A8: bl sub_80EF814 b _080EC644 _080EC5AE: bl sub_80EF840 - ldr r1, _080EC5CC @ =0x02000000 + ldr r1, _080EC5CC @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -1380,11 +1380,11 @@ _080EC5C0: bne _080EC66A b _080EC644 .align 2, 0 -_080EC5CC: .4byte 0x02000000 +_080EC5CC: .4byte gSharedMem _080EC5D0: movs r0, 0x4 bl sub_80F2C80 - ldr r1, _080EC5F4 @ =0x02000000 + ldr r1, _080EC5F4 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -1399,19 +1399,19 @@ _080EC5E4: bne _080EC66A b _080EC644 .align 2, 0 -_080EC5F4: .4byte 0x02000000 +_080EC5F4: .4byte gSharedMem _080EC5F8: bl sub_80F2DD8 ldr r0, _080EC60C @ =sub_80EBD30 bl SetVBlankCallback - ldr r1, _080EC610 @ =0x02000000 + ldr r1, _080EC610 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EC64C .align 2, 0 _080EC60C: .4byte sub_80EBD30 -_080EC610: .4byte 0x02000000 +_080EC610: .4byte gSharedMem _080EC614: bl sub_8055870 cmp r0, 0 @@ -1437,7 +1437,7 @@ _080EC63E: movs r0, 0x1 bl sub_80EED2C _080EC644: - ldr r1, _080EC654 @ =0x02000000 + ldr r1, _080EC654 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -1447,7 +1447,7 @@ _080EC64C: strh r0, [r1] b _080EC66A .align 2, 0 -_080EC654: .4byte 0x02000000 +_080EC654: .4byte gSharedMem _080EC658: ldr r0, _080EC674 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -1471,7 +1471,7 @@ _080EC678: .4byte sub_80EC67C sub_80EC67C: @ 80EC67C push {r4,r5,lr} sub sp, 0x4 - ldr r1, _080EC69C @ =0x02000000 + ldr r1, _080EC69C @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -1487,7 +1487,7 @@ _080EC692: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EC69C: .4byte 0x02000000 +_080EC69C: .4byte gSharedMem _080EC6A0: .4byte _080EC6A4 .align 2, 0 _080EC6A4: @@ -1523,7 +1523,7 @@ _080EC6E2: _080EC6E8: movs r0, 0x5 bl PlaySE - ldr r0, _080EC6FC @ =0x02000000 + ldr r0, _080EC6FC @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r0, r1 @@ -1531,11 +1531,11 @@ _080EC6E8: strh r1, [r0] b _080EC800 .align 2, 0 -_080EC6FC: .4byte 0x02000000 +_080EC6FC: .4byte gSharedMem _080EC700: movs r0, 0x5 bl PlaySE - ldr r0, _080EC714 @ =0x02000000 + ldr r0, _080EC714 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r2 @@ -1543,7 +1543,7 @@ _080EC700: strh r1, [r0] b _080EC800 .align 2, 0 -_080EC714: .4byte 0x02000000 +_080EC714: .4byte gSharedMem _080EC718: ldr r1, _080EC730 @ =0x00006e90 adds r0, r4, r1 @@ -1570,7 +1570,7 @@ _080EC746: lsls r0, 24 cmp r0, 0 bne _080EC800 - ldr r5, _080EC76C @ =0x02000000 + ldr r5, _080EC76C @ =gSharedMem ldr r1, _080EC770 @ =0x00006e90 adds r0, r5, r1 ldrb r4, [r0] @@ -1583,7 +1583,7 @@ _080EC746: strh r4, [r0] b _080EC800 .align 2, 0 -_080EC76C: .4byte 0x02000000 +_080EC76C: .4byte gSharedMem _080EC770: .4byte 0x00006e90 _080EC774: movs r0, 0xC1 @@ -1598,14 +1598,14 @@ _080EC77C: cmp r4, 0 bne _080EC800 bl sub_80EFBB0 - ldr r0, _080EC79C @ =0x02000000 + ldr r0, _080EC79C @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r0, r1 strh r4, [r0] b _080EC800 .align 2, 0 -_080EC79C: .4byte 0x02000000 +_080EC79C: .4byte gSharedMem _080EC7A0: movs r2, 0xC2 lsls r2, 2 @@ -1638,7 +1638,7 @@ _080EC7C4: bl sub_80F2D04 ldr r3, _080EC80C @ =gSaveBlock2 movs r2, 0 - ldr r0, _080EC810 @ =0x02000000 + ldr r0, _080EC810 @ =gSharedMem ldr r1, _080EC814 @ =0x00006e90 adds r0, r1 ldrb r0, [r0] @@ -1663,7 +1663,7 @@ _080EC800: .align 2, 0 _080EC808: .4byte gPaletteFade _080EC80C: .4byte gSaveBlock2 -_080EC810: .4byte 0x02000000 +_080EC810: .4byte gSharedMem _080EC814: .4byte 0x00006e90 _080EC818: .4byte sub_80EC00C thumb_func_end sub_80EC67C @@ -1671,7 +1671,7 @@ _080EC818: .4byte sub_80EC00C thumb_func_start sub_80EC81C sub_80EC81C: @ 80EC81C push {r4,lr} - ldr r0, _080EC834 @ =0x02000000 + ldr r0, _080EC834 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r4, r0, r1 @@ -1682,7 +1682,7 @@ sub_80EC81C: @ 80EC81C beq _080EC850 b _080EC860 .align 2, 0 -_080EC834: .4byte 0x02000000 +_080EC834: .4byte gSharedMem _080EC838: movs r0, 0 bl sub_80F2D04 @@ -1712,7 +1712,7 @@ _080EC868: .4byte sub_80EC86C thumb_func_start sub_80EC86C sub_80EC86C: @ 80EC86C push {r4-r6,lr} - ldr r4, _080EC884 @ =0x02000000 + ldr r4, _080EC884 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r5, r4, r0 @@ -1723,7 +1723,7 @@ sub_80EC86C: @ 80EC86C beq _080EC944 b _080EC954 .align 2, 0 -_080EC884: .4byte 0x02000000 +_080EC884: .4byte gSharedMem _080EC888: bl sub_80EEC90 lsls r0, 24 @@ -1829,7 +1829,7 @@ _080EC95C: .4byte sub_80EC210 thumb_func_start sub_80EC960 sub_80EC960: @ 80EC960 push {r4,lr} - ldr r0, _080EC978 @ =0x02000000 + ldr r0, _080EC978 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r4, r0, r1 @@ -1840,7 +1840,7 @@ sub_80EC960: @ 80EC960 beq _080EC98E b _080EC99E .align 2, 0 -_080EC978: .4byte 0x02000000 +_080EC978: .4byte gSharedMem _080EC97C: movs r0, 0x2 movs r1, 0 @@ -1868,7 +1868,7 @@ _080EC9A4: .4byte sub_80ECC08 thumb_func_start sub_80EC9A8 sub_80EC9A8: @ 80EC9A8 push {r4,r5,lr} - ldr r5, _080EC9C0 @ =0x02000000 + ldr r5, _080EC9C0 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r4, r5, r0 @@ -1879,7 +1879,7 @@ sub_80EC9A8: @ 80EC9A8 beq _080EC9E4 b _080ECA00 .align 2, 0 -_080EC9C0: .4byte 0x02000000 +_080EC9C0: .4byte gSharedMem _080EC9C4: movs r0, 0x5 bl sub_80F2D04 @@ -1920,7 +1920,7 @@ _080ECA0C: .4byte 0x00006dad sub_80ECA10: @ 80ECA10 push {r4,lr} sub sp, 0x4 - ldr r1, _080ECA30 @ =0x02000000 + ldr r1, _080ECA30 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -1936,7 +1936,7 @@ _080ECA26: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080ECA30: .4byte 0x02000000 +_080ECA30: .4byte gSharedMem _080ECA34: .4byte _080ECA38 .align 2, 0 _080ECA38: @@ -1964,7 +1964,7 @@ _080ECA7C: ldr r0, _080ECAB0 @ =sub_80EBD80 bl SetVBlankCallback bl sub_80EED1C - ldr r4, _080ECAB4 @ =0x02000000 + ldr r4, _080ECAB4 @ =gSharedMem ldr r1, _080ECAB8 @ =0x00006df0 adds r0, r4, r1 ldrb r1, [r0] @@ -1985,14 +1985,14 @@ _080ECA7C: b _080ECBF2 .align 2, 0 _080ECAB0: .4byte sub_80EBD80 -_080ECAB4: .4byte 0x02000000 +_080ECAB4: .4byte gSharedMem _080ECAB8: .4byte 0x00006df0 _080ECABC: .4byte 0x00006dad _080ECAC0: .4byte 0x00006dae _080ECAC4: movs r0, 0x1 bl sub_80EF248 - ldr r1, _080ECAF0 @ =0x02000000 + ldr r1, _080ECAF0 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -2007,17 +2007,17 @@ _080ECAD8: beq _080ECAE6 b _080ECBF2 _080ECAE6: - ldr r1, _080ECAF0 @ =0x02000000 + ldr r1, _080ECAF0 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ECBC8 .align 2, 0 -_080ECAF0: .4byte 0x02000000 +_080ECAF0: .4byte gSharedMem _080ECAF4: movs r0, 0x1 bl sub_80F1B8C - ldr r1, _080ECB20 @ =0x02000000 + ldr r1, _080ECB20 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -2030,13 +2030,13 @@ _080ECB08: lsls r0, 24 cmp r0, 0 bne _080ECBF2 - ldr r1, _080ECB20 @ =0x02000000 + ldr r1, _080ECB20 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ECBC8 .align 2, 0 -_080ECB20: .4byte 0x02000000 +_080ECB20: .4byte gSharedMem _080ECB24: bl sub_8055870 cmp r0, 0 @@ -2065,13 +2065,13 @@ _080ECB54: .4byte sub_80EBD18 _080ECB58: movs r0, 0 bl sub_80EED2C - ldr r1, _080ECB68 @ =0x02000000 + ldr r1, _080ECB68 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ECBC8 .align 2, 0 -_080ECB68: .4byte 0x02000000 +_080ECB68: .4byte gSharedMem _080ECB6C: bl sub_80F2598 b _080ECBC0 @@ -2091,7 +2091,7 @@ _080ECB88: .4byte gPaletteFade _080ECB8C: movs r0, 0x1 bl sub_80F2C80 - ldr r1, _080ECBB8 @ =0x02000000 + ldr r1, _080ECBB8 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -2104,17 +2104,17 @@ _080ECBA0: lsls r0, 24 cmp r0, 0 bne _080ECBF2 - ldr r1, _080ECBB8 @ =0x02000000 + ldr r1, _080ECBB8 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ECBC8 .align 2, 0 -_080ECBB8: .4byte 0x02000000 +_080ECBB8: .4byte gSharedMem _080ECBBC: bl sub_80F1DF0 _080ECBC0: - ldr r1, _080ECBD0 @ =0x02000000 + ldr r1, _080ECBD0 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -2124,13 +2124,13 @@ _080ECBC8: strh r0, [r1] b _080ECBF2 .align 2, 0 -_080ECBD0: .4byte 0x02000000 +_080ECBD0: .4byte gSharedMem _080ECBD4: bl sub_80F1E50 lsls r0, 24 cmp r0, 0 bne _080ECBF2 - ldr r0, _080ECBFC @ =0x02000000 + ldr r0, _080ECBFC @ =gSharedMem ldr r1, _080ECC00 @ =0x00006dad adds r0, r1 ldrb r1, [r0] @@ -2144,7 +2144,7 @@ _080ECBF2: pop {r0} bx r0 .align 2, 0 -_080ECBFC: .4byte 0x02000000 +_080ECBFC: .4byte gSharedMem _080ECC00: .4byte 0x00006dad _080ECC04: .4byte sub_80EC86C thumb_func_end sub_80ECA10 @@ -2152,7 +2152,7 @@ _080ECC04: .4byte sub_80EC86C thumb_func_start sub_80ECC08 sub_80ECC08: @ 80ECC08 push {r4,r5,lr} - ldr r4, _080ECC20 @ =0x02000000 + ldr r4, _080ECC20 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r5, r4, r0 @@ -2165,7 +2165,7 @@ sub_80ECC08: @ 80ECC08 _080ECC1E: b _080ECD74 .align 2, 0 -_080ECC20: .4byte 0x02000000 +_080ECC20: .4byte gSharedMem _080ECC24: bl sub_80EEC90 lsls r0, 24 @@ -2218,54 +2218,54 @@ _080ECC84: .4byte _080ECCEC .4byte _080ECD00 _080ECC9C: - ldr r0, _080ECCA8 @ =0x02000000 + ldr r0, _080ECCA8 @ =gSharedMem ldr r3, _080ECCAC @ =0x000087d8 adds r0, r3 movs r1, 0x16 strb r1, [r0] b _080ECD0C .align 2, 0 -_080ECCA8: .4byte 0x02000000 +_080ECCA8: .4byte gSharedMem _080ECCAC: .4byte 0x000087d8 _080ECCB0: - ldr r0, _080ECCBC @ =0x02000000 + ldr r0, _080ECCBC @ =gSharedMem ldr r1, _080ECCC0 @ =0x000087d8 adds r0, r1 movs r1, 0x17 strb r1, [r0] b _080ECD0C .align 2, 0 -_080ECCBC: .4byte 0x02000000 +_080ECCBC: .4byte gSharedMem _080ECCC0: .4byte 0x000087d8 _080ECCC4: - ldr r0, _080ECCD0 @ =0x02000000 + ldr r0, _080ECCD0 @ =gSharedMem ldr r2, _080ECCD4 @ =0x000087d8 adds r0, r2 movs r1, 0x18 strb r1, [r0] b _080ECD0C .align 2, 0 -_080ECCD0: .4byte 0x02000000 +_080ECCD0: .4byte gSharedMem _080ECCD4: .4byte 0x000087d8 _080ECCD8: - ldr r0, _080ECCE4 @ =0x02000000 + ldr r0, _080ECCE4 @ =gSharedMem ldr r3, _080ECCE8 @ =0x000087d8 adds r0, r3 movs r1, 0x21 strb r1, [r0] b _080ECD0C .align 2, 0 -_080ECCE4: .4byte 0x02000000 +_080ECCE4: .4byte gSharedMem _080ECCE8: .4byte 0x000087d8 _080ECCEC: - ldr r0, _080ECCF8 @ =0x02000000 + ldr r0, _080ECCF8 @ =gSharedMem ldr r1, _080ECCFC @ =0x000087d8 adds r0, r1 movs r1, 0x2F strb r1, [r0] b _080ECD0C .align 2, 0 -_080ECCF8: .4byte 0x02000000 +_080ECCF8: .4byte gSharedMem _080ECCFC: .4byte 0x000087d8 _080ECD00: ldr r0, _080ECD08 @ =sub_80EC9A8 @@ -2274,7 +2274,7 @@ _080ECD00: .align 2, 0 _080ECD08: .4byte sub_80EC9A8 _080ECD0C: - ldr r1, _080ECD2C @ =0x02000000 + ldr r1, _080ECD2C @ =gSharedMem ldr r2, _080ECD30 @ =0x00006dad adds r0, r1, r2 ldrb r2, [r0] @@ -2289,7 +2289,7 @@ _080ECD0C: bl sub_80EBDBC b _080ECD74 .align 2, 0 -_080ECD2C: .4byte 0x02000000 +_080ECD2C: .4byte gSharedMem _080ECD30: .4byte 0x00006dad _080ECD34: .4byte 0x00006dfc _080ECD38: .4byte 0x000076aa @@ -2330,7 +2330,7 @@ _080ECD7C: .4byte sub_80EC9A8 sub_80ECD80: @ 80ECD80 push {r4,lr} sub sp, 0x4 - ldr r1, _080ECDA0 @ =0x02000000 + ldr r1, _080ECDA0 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -2346,7 +2346,7 @@ _080ECD96: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080ECDA0: .4byte 0x02000000 +_080ECDA0: .4byte gSharedMem _080ECDA4: .4byte _080ECDA8 .align 2, 0 _080ECDA8: @@ -2416,23 +2416,23 @@ _080ECE48: .4byte sub_80EBD80 _080ECE4C: bl sub_80EED1C bl sub_80F3130 - ldr r1, _080ECE60 @ =0x02000000 + ldr r1, _080ECE60 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ECFDC .align 2, 0 -_080ECE60: .4byte 0x02000000 +_080ECE60: .4byte gSharedMem _080ECE64: movs r0, 0x1 bl sub_80F2D6C - ldr r1, _080ECE74 @ =0x02000000 + ldr r1, _080ECE74 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080ECFDC .align 2, 0 -_080ECE74: .4byte 0x02000000 +_080ECE74: .4byte gSharedMem _080ECE78: movs r0, 0x5 bl sub_80F2D6C @@ -2460,7 +2460,7 @@ _080ECEA8: .4byte 0x00006dae _080ECEAC: movs r0, 0x2 bl sub_80EF248 - ldr r1, _080ECED0 @ =0x02000000 + ldr r1, _080ECED0 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -2477,11 +2477,11 @@ _080ECEC0: _080ECECE: b _080ECFD4 .align 2, 0 -_080ECED0: .4byte 0x02000000 +_080ECED0: .4byte gSharedMem _080ECED4: movs r0, 0x2 bl sub_80F1B8C - ldr r1, _080ECF00 @ =0x02000000 + ldr r1, _080ECF00 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -2496,13 +2496,13 @@ _080ECEE8: beq _080ECEF6 b _080ED006 _080ECEF6: - ldr r1, _080ECF00 @ =0x02000000 + ldr r1, _080ECF00 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080ECFDC .align 2, 0 -_080ECF00: .4byte 0x02000000 +_080ECF00: .4byte gSharedMem _080ECF04: bl sub_8055870 cmp r0, 0 @@ -2536,13 +2536,13 @@ _080ECF3C: b _080ECFD4 _080ECF44: bl sub_80F2598 - ldr r1, _080ECF54 @ =0x02000000 + ldr r1, _080ECF54 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ECFDC .align 2, 0 -_080ECF54: .4byte 0x02000000 +_080ECF54: .4byte gSharedMem _080ECF58: ldr r0, _080ECF6C @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -2559,7 +2559,7 @@ _080ECF6C: .4byte gPaletteFade _080ECF70: movs r0, 0x1 bl sub_80F2C80 - ldr r1, _080ECFA8 @ =0x02000000 + ldr r1, _080ECFA8 @ =gSharedMem movs r3, 0xC1 lsls r3, 2 adds r1, r3 @@ -2573,7 +2573,7 @@ _080ECF84: lsrs r2, r0, 24 cmp r2, 0 bne _080ED006 - ldr r0, _080ECFA8 @ =0x02000000 + ldr r0, _080ECFA8 @ =gSharedMem ldr r3, _080ECFAC @ =0x00000306 adds r1, r0, r3 strh r2, [r1] @@ -2585,12 +2585,12 @@ _080ECF84: strh r1, [r0] b _080ED006 .align 2, 0 -_080ECFA8: .4byte 0x02000000 +_080ECFA8: .4byte gSharedMem _080ECFAC: .4byte 0x00000306 _080ECFB0: movs r0, 0x5 bl sub_80F2C80 - ldr r1, _080ECFE4 @ =0x02000000 + ldr r1, _080ECFE4 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -2605,7 +2605,7 @@ _080ECFC4: bne _080ED006 bl sub_80F1DF0 _080ECFD4: - ldr r1, _080ECFE4 @ =0x02000000 + ldr r1, _080ECFE4 @ =gSharedMem movs r3, 0xC1 lsls r3, 2 adds r1, r3 @@ -2615,13 +2615,13 @@ _080ECFDC: strh r0, [r1] b _080ED006 .align 2, 0 -_080ECFE4: .4byte 0x02000000 +_080ECFE4: .4byte gSharedMem _080ECFE8: bl sub_80F1E50 lsls r0, 24 cmp r0, 0 bne _080ED006 - ldr r0, _080ED010 @ =0x02000000 + ldr r0, _080ED010 @ =gSharedMem ldr r1, _080ED014 @ =0x00006dad adds r0, r1 ldrb r1, [r0] @@ -2635,7 +2635,7 @@ _080ED006: pop {r0} bx r0 .align 2, 0 -_080ED010: .4byte 0x02000000 +_080ED010: .4byte gSharedMem _080ED014: .4byte 0x00006dad _080ED018: .4byte sub_80ECC08 thumb_func_end sub_80ECD80 @@ -2644,7 +2644,7 @@ _080ED018: .4byte sub_80ECC08 sub_80ED01C: @ 80ED01C push {r4,lr} sub sp, 0x4 - ldr r1, _080ED03C @ =0x02000000 + ldr r1, _080ED03C @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -2660,7 +2660,7 @@ _080ED032: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080ED03C: .4byte 0x02000000 +_080ED03C: .4byte gSharedMem _080ED040: .4byte _080ED044 .align 2, 0 _080ED044: @@ -2690,13 +2690,13 @@ _080ED094: bl sub_80F2D04 movs r0, 0x5 bl sub_80F2D04 - ldr r1, _080ED0B0 @ =0x02000000 + ldr r1, _080ED0B0 @ =gSharedMem movs r3, 0xC1 lsls r3, 2 adds r1, r3 b _080ED27C .align 2, 0 -_080ED0B0: .4byte 0x02000000 +_080ED0B0: .4byte gSharedMem _080ED0B4: bl sub_80F1F10 lsls r0, 24 @@ -2706,13 +2706,13 @@ _080ED0B4: _080ED0C0: movs r0, 0 bl sub_80EEFBC - ldr r1, _080ED0D0 @ =0x02000000 + ldr r1, _080ED0D0 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ED27C .align 2, 0 -_080ED0D0: .4byte 0x02000000 +_080ED0D0: .4byte gSharedMem _080ED0D4: bl sub_80EEF34 lsls r0, 24 @@ -2721,7 +2721,7 @@ _080ED0D4: beq _080ED0E2 b _080ED308 _080ED0E2: - ldr r4, _080ED104 @ =0x02000000 + ldr r4, _080ED104 @ =gSharedMem movs r1, 0xC2 lsls r1, 2 adds r0, r4, r1 @@ -2737,7 +2737,7 @@ _080ED0E2: adds r1, r4, r2 b _080ED27C .align 2, 0 -_080ED104: .4byte 0x02000000 +_080ED104: .4byte gSharedMem _080ED108: ldr r0, _080ED130 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -2751,26 +2751,26 @@ _080ED116: bl SetVBlankCallback bl sub_80EED0C bl sub_80EF814 - ldr r1, _080ED134 @ =0x02000000 + ldr r1, _080ED134 @ =gSharedMem movs r3, 0xC1 lsls r3, 2 adds r1, r3 b _080ED27C .align 2, 0 _080ED130: .4byte gPaletteFade -_080ED134: .4byte 0x02000000 +_080ED134: .4byte gSharedMem _080ED138: bl sub_80F2620 - ldr r1, _080ED148 @ =0x02000000 + ldr r1, _080ED148 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ED27C .align 2, 0 -_080ED148: .4byte 0x02000000 +_080ED148: .4byte gSharedMem _080ED14C: bl sub_80F4D44 - ldr r1, _080ED178 @ =0x02000000 + ldr r1, _080ED178 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -2782,7 +2782,7 @@ _080ED15E: lsls r0, 24 cmp r0, 0 bne _080ED17C - ldr r1, _080ED178 @ =0x02000000 + ldr r1, _080ED178 @ =gSharedMem movs r3, 0xC1 lsls r3, 2 adds r1, r3 @@ -2791,22 +2791,22 @@ _080ED15E: strh r0, [r1] b _080ED308 .align 2, 0 -_080ED178: .4byte 0x02000000 +_080ED178: .4byte gSharedMem _080ED17C: - ldr r1, _080ED188 @ =0x02000000 + ldr r1, _080ED188 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ED27C .align 2, 0 -_080ED188: .4byte 0x02000000 +_080ED188: .4byte gSharedMem _080ED18C: bl sub_8055870 cmp r0, 0 beq _080ED196 b _080ED308 _080ED196: - ldr r1, _080ED1A8 @ =0x02000000 + ldr r1, _080ED1A8 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -2815,24 +2815,24 @@ _080ED196: strh r0, [r1] b _080ED308 .align 2, 0 -_080ED1A8: .4byte 0x02000000 +_080ED1A8: .4byte gSharedMem _080ED1AC: bl sub_8055870 cmp r0, 0 beq _080ED1B6 b _080ED308 _080ED1B6: - ldr r1, _080ED1C0 @ =0x02000000 + ldr r1, _080ED1C0 @ =gSharedMem movs r3, 0xC1 lsls r3, 2 adds r1, r3 b _080ED27C .align 2, 0 -_080ED1C0: .4byte 0x02000000 +_080ED1C0: .4byte gSharedMem _080ED1C4: movs r0, 0 bl sub_80F0264 - ldr r1, _080ED1F0 @ =0x02000000 + ldr r1, _080ED1F0 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -2846,36 +2846,36 @@ _080ED1D8: beq _080ED1E4 b _080ED308 _080ED1E4: - ldr r1, _080ED1F0 @ =0x02000000 + ldr r1, _080ED1F0 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080ED27C .align 2, 0 -_080ED1F0: .4byte 0x02000000 +_080ED1F0: .4byte gSharedMem _080ED1F4: movs r0, 0 bl sub_80F3008 - ldr r1, _080ED204 @ =0x02000000 + ldr r1, _080ED204 @ =gSharedMem movs r3, 0xC1 lsls r3, 2 adds r1, r3 b _080ED27C .align 2, 0 -_080ED204: .4byte 0x02000000 +_080ED204: .4byte gSharedMem _080ED208: bl sub_8055870 cmp r0, 0 beq _080ED212 b _080ED308 _080ED212: - ldr r1, _080ED21C @ =0x02000000 + ldr r1, _080ED21C @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ED27C .align 2, 0 -_080ED21C: .4byte 0x02000000 +_080ED21C: .4byte gSharedMem _080ED220: movs r1, 0xC2 lsls r1, 2 @@ -2899,13 +2899,13 @@ _080ED248: .4byte sub_80EBD18 _080ED24C: movs r0, 0x4 bl sub_80EED2C - ldr r1, _080ED25C @ =0x02000000 + ldr r1, _080ED25C @ =gSharedMem movs r3, 0xC1 lsls r3, 2 adds r1, r3 b _080ED27C .align 2, 0 -_080ED25C: .4byte 0x02000000 +_080ED25C: .4byte gSharedMem _080ED260: ldr r0, _080ED284 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -2932,7 +2932,7 @@ _080ED288: .4byte 0x00000306 _080ED28C: movs r0, 0x1 bl sub_80F2C80 - ldr r1, _080ED2C4 @ =0x02000000 + ldr r1, _080ED2C4 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -2946,7 +2946,7 @@ _080ED2A0: lsrs r2, r0, 24 cmp r2, 0 bne _080ED308 - ldr r0, _080ED2C4 @ =0x02000000 + ldr r0, _080ED2C4 @ =gSharedMem ldr r3, _080ED2C8 @ =0x00000306 adds r1, r0, r3 strh r2, [r1] @@ -2958,10 +2958,10 @@ _080ED2A0: strh r1, [r0] b _080ED308 .align 2, 0 -_080ED2C4: .4byte 0x02000000 +_080ED2C4: .4byte gSharedMem _080ED2C8: .4byte 0x00000306 _080ED2CC: - ldr r4, _080ED310 @ =0x02000000 + ldr r4, _080ED310 @ =gSharedMem ldr r2, _080ED314 @ =0x00006dfc adds r0, r4, r2 ldrb r0, [r0] @@ -2976,7 +2976,7 @@ _080ED2CC: adds r0, 0x1 strh r0, [r4] _080ED2EA: - ldr r0, _080ED310 @ =0x02000000 + ldr r0, _080ED310 @ =gSharedMem ldr r1, _080ED314 @ =0x00006dfc adds r0, r1 ldrb r0, [r0] @@ -2995,7 +2995,7 @@ _080ED308: pop {r0} bx r0 .align 2, 0 -_080ED310: .4byte 0x02000000 +_080ED310: .4byte gSharedMem _080ED314: .4byte 0x00006dfc _080ED318: .4byte sub_80ED31C thumb_func_end sub_80ED01C @@ -3003,7 +3003,7 @@ _080ED318: .4byte sub_80ED31C thumb_func_start sub_80ED31C sub_80ED31C: @ 80ED31C push {r4,lr} - ldr r0, _080ED338 @ =0x02000000 + ldr r0, _080ED338 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r4, r0, r1 @@ -3016,7 +3016,7 @@ sub_80ED31C: @ 80ED31C beq _080ED342 b _080ED3CA .align 2, 0 -_080ED338: .4byte 0x02000000 +_080ED338: .4byte gSharedMem _080ED33C: cmp r0, 0x2 beq _080ED3C0 @@ -3092,7 +3092,7 @@ _080ED3CA: sub_80ED3D0: @ 80ED3D0 push {r4,lr} sub sp, 0x4 - ldr r0, _080ED3EC @ =0x02000000 + ldr r0, _080ED3EC @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r0, r1 @@ -3105,7 +3105,7 @@ sub_80ED3D0: @ 80ED3D0 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080ED3EC: .4byte 0x02000000 +_080ED3EC: .4byte gSharedMem _080ED3F0: .4byte _080ED3F4 .align 2, 0 _080ED3F4: @@ -3133,7 +3133,7 @@ _080ED42A: _080ED432: movs r0, 0 bl sub_80F0264 - ldr r1, _080ED454 @ =0x02000000 + ldr r1, _080ED454 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -3147,7 +3147,7 @@ _080ED446: bne _080ED4C6 b _080ED49E .align 2, 0 -_080ED454: .4byte 0x02000000 +_080ED454: .4byte gSharedMem _080ED458: bl sub_8055870 cmp r0, 0 @@ -3156,7 +3156,7 @@ _080ED458: _080ED462: movs r0, 0 bl sub_80F3008 - ldr r4, _080ED490 @ =0x02000000 + ldr r4, _080ED490 @ =gSharedMem movs r1, 0xC2 lsls r1, 2 adds r0, r4, r1 @@ -3175,13 +3175,13 @@ _080ED462: adds r1, r4, r0 b _080ED4A6 .align 2, 0 -_080ED490: .4byte 0x02000000 +_080ED490: .4byte gSharedMem _080ED494: .4byte sub_80EBD18 _080ED498: movs r0, 0x4 bl sub_80EED2C _080ED49E: - ldr r1, _080ED4B0 @ =0x02000000 + ldr r1, _080ED4B0 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -3191,7 +3191,7 @@ _080ED4A6: strh r0, [r1] b _080ED4C6 .align 2, 0 -_080ED4B0: .4byte 0x02000000 +_080ED4B0: .4byte gSharedMem _080ED4B4: ldr r0, _080ED4D0 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -3215,7 +3215,7 @@ _080ED4D4: .4byte sub_80ED31C sub_80ED4D8: @ 80ED4D8 push {r4,lr} sub sp, 0x4 - ldr r1, _080ED4F8 @ =0x02000000 + ldr r1, _080ED4F8 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -3231,7 +3231,7 @@ _080ED4EE: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080ED4F8: .4byte 0x02000000 +_080ED4F8: .4byte gSharedMem _080ED4FC: .4byte _080ED500 .align 2, 0 _080ED500: @@ -3277,19 +3277,19 @@ _080ED564: bl sub_8055870 cmp r0, 0 bne _080ED60E - ldr r1, _080ED578 @ =0x02000000 + ldr r1, _080ED578 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080ED5EE .align 2, 0 -_080ED578: .4byte 0x02000000 +_080ED578: .4byte gSharedMem _080ED57C: bl sub_80F4CF0 b _080ED5E6 _080ED582: bl sub_80EFF34 - ldr r1, _080ED5A0 @ =0x02000000 + ldr r1, _080ED5A0 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -3303,12 +3303,12 @@ _080ED594: bne _080ED60E b _080ED5E6 .align 2, 0 -_080ED5A0: .4byte 0x02000000 +_080ED5A0: .4byte gSharedMem _080ED5A4: bl sub_80F35B4 movs r0, 0x2 bl sub_80EEFBC - ldr r4, _080ED5D8 @ =0x02000000 + ldr r4, _080ED5D8 @ =gSharedMem movs r1, 0xC2 lsls r1, 2 adds r0, r4, r1 @@ -3327,13 +3327,13 @@ _080ED5A4: adds r1, r4, r2 b _080ED5EE .align 2, 0 -_080ED5D8: .4byte 0x02000000 +_080ED5D8: .4byte gSharedMem _080ED5DC: .4byte sub_80EBD4C _080ED5E0: movs r0, 0x2 bl sub_80EED2C _080ED5E6: - ldr r1, _080ED5F8 @ =0x02000000 + ldr r1, _080ED5F8 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -3343,7 +3343,7 @@ _080ED5EE: strh r0, [r1] b _080ED60E .align 2, 0 -_080ED5F8: .4byte 0x02000000 +_080ED5F8: .4byte gSharedMem _080ED5FC: ldr r0, _080ED618 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -3367,7 +3367,7 @@ _080ED61C: .4byte sub_80ED858 sub_80ED620: @ 80ED620 push {r4,lr} sub sp, 0x4 - ldr r1, _080ED640 @ =0x02000000 + ldr r1, _080ED640 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -3383,7 +3383,7 @@ _080ED636: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080ED640: .4byte 0x02000000 +_080ED640: .4byte gSharedMem _080ED644: .4byte _080ED648 .align 2, 0 _080ED648: @@ -3408,13 +3408,13 @@ _080ED68C: bl sub_80F1E84 movs r0, 0x1 bl sub_80F2D04 - ldr r1, _080ED6A0 @ =0x02000000 + ldr r1, _080ED6A0 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ED814 .align 2, 0 -_080ED6A0: .4byte 0x02000000 +_080ED6A0: .4byte gSharedMem _080ED6A4: bl sub_80F1F10 lsls r0, 24 @@ -3433,7 +3433,7 @@ _080ED6B8: beq _080ED6C6 b _080ED846 _080ED6C6: - ldr r4, _080ED6E8 @ =0x02000000 + ldr r4, _080ED6E8 @ =gSharedMem movs r1, 0xC2 lsls r1, 2 adds r0, r4, r1 @@ -3449,7 +3449,7 @@ _080ED6C6: adds r1, r4, r2 b _080ED814 .align 2, 0 -_080ED6E8: .4byte 0x02000000 +_080ED6E8: .4byte gSharedMem _080ED6EC: ldr r0, _080ED724 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -3465,7 +3465,7 @@ _080ED6FE: bl SetVBlankCallback bl sub_80EED0C bl sub_80EF814 - ldr r0, _080ED728 @ =0x02000000 + ldr r0, _080ED728 @ =gSharedMem ldr r2, _080ED72C @ =0x000076aa adds r1, r0, r2 strb r4, [r1] @@ -3478,7 +3478,7 @@ _080ED6FE: b _080ED846 .align 2, 0 _080ED724: .4byte gPaletteFade -_080ED728: .4byte 0x02000000 +_080ED728: .4byte gSharedMem _080ED72C: .4byte 0x000076aa _080ED730: bl sub_80F2620 @@ -3497,7 +3497,7 @@ _080ED736: _080ED74C: .4byte 0x0000d162 _080ED750: bl sub_80EFF34 - ldr r1, _080ED768 @ =0x02000000 + ldr r1, _080ED768 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -3508,24 +3508,24 @@ _080ED762: bl sub_80EFF68 b _080ED806 .align 2, 0 -_080ED768: .4byte 0x02000000 +_080ED768: .4byte gSharedMem _080ED76C: bl sub_8055870 cmp r0, 0 bne _080ED846 - ldr r1, _080ED780 @ =0x02000000 + ldr r1, _080ED780 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ED814 .align 2, 0 -_080ED780: .4byte 0x02000000 +_080ED780: .4byte gSharedMem _080ED784: bl sub_8055870 b _080ED808 _080ED78A: bl sub_80F33A8 - ldr r4, _080ED7B8 @ =0x02000000 + ldr r4, _080ED7B8 @ =gSharedMem movs r1, 0xC2 lsls r1, 2 adds r0, r4, r1 @@ -3544,18 +3544,18 @@ _080ED78A: adds r1, r4, r2 b _080ED814 .align 2, 0 -_080ED7B8: .4byte 0x02000000 +_080ED7B8: .4byte gSharedMem _080ED7BC: .4byte sub_80EBD4C _080ED7C0: movs r0, 0x2 bl sub_80EED2C - ldr r1, _080ED7D0 @ =0x02000000 + ldr r1, _080ED7D0 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080ED814 .align 2, 0 -_080ED7D0: .4byte 0x02000000 +_080ED7D0: .4byte gSharedMem _080ED7D4: ldr r0, _080ED7E8 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -3572,7 +3572,7 @@ _080ED7E8: .4byte gPaletteFade _080ED7EC: movs r0, 0x1 bl sub_80F2C80 - ldr r1, _080ED81C @ =0x02000000 + ldr r1, _080ED81C @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -3588,7 +3588,7 @@ _080ED808: cmp r0, 0 bne _080ED846 _080ED80C: - ldr r1, _080ED81C @ =0x02000000 + ldr r1, _080ED81C @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -3598,11 +3598,11 @@ _080ED814: strh r0, [r1] b _080ED846 .align 2, 0 -_080ED81C: .4byte 0x02000000 +_080ED81C: .4byte gSharedMem _080ED820: movs r0, 0x6 bl sub_80F2C80 - ldr r1, _080ED850 @ =0x02000000 + ldr r1, _080ED850 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -3623,7 +3623,7 @@ _080ED846: pop {r0} bx r0 .align 2, 0 -_080ED850: .4byte 0x02000000 +_080ED850: .4byte gSharedMem _080ED854: .4byte sub_80ED858 thumb_func_end sub_80ED620 @@ -3631,7 +3631,7 @@ _080ED854: .4byte sub_80ED858 sub_80ED858: @ 80ED858 push {r4,r5,lr} sub sp, 0x4 - ldr r1, _080ED878 @ =0x02000000 + ldr r1, _080ED878 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -3647,7 +3647,7 @@ _080ED86E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080ED878: .4byte 0x02000000 +_080ED878: .4byte gSharedMem _080ED87C: .4byte _080ED880 .align 2, 0 _080ED880: @@ -3666,7 +3666,7 @@ _080ED880: _080ED8B0: bl sub_80F4F78 bl sub_80F5B38 - ldr r0, _080ED8C8 @ =0x02000000 + ldr r0, _080ED8C8 @ =gSharedMem movs r4, 0xC1 lsls r4, 2 adds r0, r4 @@ -3674,7 +3674,7 @@ _080ED8B0: strh r1, [r0] b _080EDB7A .align 2, 0 -_080ED8C8: .4byte 0x02000000 +_080ED8C8: .4byte gSharedMem _080ED8CC: bl sub_80F5B50 lsls r0, 24 @@ -3682,7 +3682,7 @@ _080ED8CC: beq _080ED8D8 b _080EDB7A _080ED8D8: - ldr r0, _080ED8E8 @ =0x02000000 + ldr r0, _080ED8E8 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r0, r1 @@ -3690,11 +3690,11 @@ _080ED8D8: strh r1, [r0] b _080EDB7A .align 2, 0 -_080ED8E8: .4byte 0x02000000 +_080ED8E8: .4byte gSharedMem _080ED8EC: movs r0, 0x1 bl sub_80F0174 - ldr r0, _080ED900 @ =0x02000000 + ldr r0, _080ED900 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r2 @@ -3702,7 +3702,7 @@ _080ED8EC: strh r1, [r0] b _080EDB7A .align 2, 0 -_080ED900: .4byte 0x02000000 +_080ED900: .4byte gSharedMem _080ED904: bl sub_80F4FB4 lsls r0, 24 @@ -3805,7 +3805,7 @@ _080ED9CC: bl PlaySE bl sub_80F4FDC bl move_anim_execute - ldr r0, _080ED9F4 @ =0x02000000 + ldr r0, _080ED9F4 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r0, r1 @@ -3813,7 +3813,7 @@ _080ED9CC: strh r1, [r0] b _080EDB7A .align 2, 0 -_080ED9F4: .4byte 0x02000000 +_080ED9F4: .4byte gSharedMem _080ED9F8: movs r0, 0x1 ands r0, r2 @@ -3878,7 +3878,7 @@ _080EDA68: b _080EDB7A _080EDA74: bl sub_80F3D00 - ldr r0, _080EDA88 @ =0x02000000 + ldr r0, _080EDA88 @ =gSharedMem movs r4, 0xC1 lsls r4, 2 adds r0, r4 @@ -3886,23 +3886,23 @@ _080EDA74: strh r1, [r0] b _080EDB7A .align 2, 0 -_080EDA88: .4byte 0x02000000 +_080EDA88: .4byte gSharedMem _080EDA8C: bl sub_8055870 cmp r0, 0 bne _080EDB7A - ldr r0, _080EDAA0 @ =0x02000000 + ldr r0, _080EDAA0 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r0, r1 b _080EDADC .align 2, 0 -_080EDAA0: .4byte 0x02000000 +_080EDAA0: .4byte gSharedMem _080EDAA4: movs r0, 0x3 bl sub_80EEFBC bl sub_80F3668 - ldr r0, _080EDABC @ =0x02000000 + ldr r0, _080EDABC @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r2 @@ -3910,7 +3910,7 @@ _080EDAA4: strh r1, [r0] b _080EDB7A .align 2, 0 -_080EDABC: .4byte 0x02000000 +_080EDABC: .4byte gSharedMem _080EDAC0: bl sub_80F7500 lsls r0, 24 @@ -3920,7 +3920,7 @@ _080EDAC0: bl sub_80EEFBC bl sub_80F3698 _080EDAD4: - ldr r0, _080EDAE4 @ =0x02000000 + ldr r0, _080EDAE4 @ =gSharedMem movs r4, 0xC1 lsls r4, 2 adds r0, r4 @@ -3929,7 +3929,7 @@ _080EDADC: strh r1, [r0] b _080EDB7A .align 2, 0 -_080EDAE4: .4byte 0x02000000 +_080EDAE4: .4byte gSharedMem _080EDAE8: bl sub_80F5038 lsls r0, 24 @@ -3939,7 +3939,7 @@ _080EDAE8: movs r0, 0 bl sub_80F0174 bl sub_80F2F48 - ldr r5, _080EDB24 @ =0x02000000 + ldr r5, _080EDB24 @ =gSharedMem movs r1, 0xC2 lsls r1, 2 adds r0, r5, r1 @@ -3957,7 +3957,7 @@ _080EDAE8: strh r0, [r1] b _080EDB7A .align 2, 0 -_080EDB24: .4byte 0x02000000 +_080EDB24: .4byte gSharedMem _080EDB28: ldr r0, _080EDB60 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -3967,7 +3967,7 @@ _080EDB28: bne _080EDB7A bl sub_80F3CE8 bl sub_80F5BDC - ldr r0, _080EDB64 @ =0x02000000 + ldr r0, _080EDB64 @ =gSharedMem ldr r4, _080EDB68 @ =0x000076aa adds r0, r4 ldrb r0, [r0] @@ -3983,7 +3983,7 @@ _080EDB28: b _080EDB7A .align 2, 0 _080EDB60: .4byte gPaletteFade -_080EDB64: .4byte 0x02000000 +_080EDB64: .4byte gSharedMem _080EDB68: .4byte 0x000076aa _080EDB6C: .4byte sub_80ECA10 _080EDB70: @@ -4003,7 +4003,7 @@ _080EDB84: .4byte sub_80ED3D0 sub_80EDB88: @ 80EDB88 push {r4,lr} sub sp, 0x4 - ldr r1, _080EDBA8 @ =0x02000000 + ldr r1, _080EDBA8 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -4019,7 +4019,7 @@ _080EDB9E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EDBA8: .4byte 0x02000000 +_080EDBA8: .4byte gSharedMem _080EDBAC: .4byte _080EDBB0 .align 2, 0 _080EDBB0: @@ -4055,13 +4055,13 @@ _080EDC04: _080EDC10: movs r0, 0x4 bl sub_80EEFBC - ldr r1, _080EDC20 @ =0x02000000 + ldr r1, _080EDC20 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EDD8A .align 2, 0 -_080EDC20: .4byte 0x02000000 +_080EDC20: .4byte gSharedMem _080EDC24: bl sub_80EEF34 lsls r0, 24 @@ -4070,7 +4070,7 @@ _080EDC24: beq _080EDC32 b _080EDDAA _080EDC32: - ldr r4, _080EDC54 @ =0x02000000 + ldr r4, _080EDC54 @ =gSharedMem movs r1, 0xC2 lsls r1, 2 adds r0, r4, r1 @@ -4086,7 +4086,7 @@ _080EDC32: adds r1, r4, r2 b _080EDD8A .align 2, 0 -_080EDC54: .4byte 0x02000000 +_080EDC54: .4byte gSharedMem _080EDC58: ldr r0, _080EDC78 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -4105,16 +4105,16 @@ _080EDC66: _080EDC78: .4byte gPaletteFade _080EDC7C: bl sub_80F2620 - ldr r1, _080EDC8C @ =0x02000000 + ldr r1, _080EDC8C @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EDD8A .align 2, 0 -_080EDC8C: .4byte 0x02000000 +_080EDC8C: .4byte gSharedMem _080EDC90: bl sub_80F638C - ldr r1, _080EDCBC @ =0x02000000 + ldr r1, _080EDCBC @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -4126,7 +4126,7 @@ _080EDCA2: lsls r0, 24 cmp r0, 0 bne _080EDD82 - ldr r1, _080EDCBC @ =0x02000000 + ldr r1, _080EDCBC @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -4135,12 +4135,12 @@ _080EDCA2: strh r0, [r1] b _080EDDAA .align 2, 0 -_080EDCBC: .4byte 0x02000000 +_080EDCBC: .4byte gSharedMem _080EDCC0: bl sub_8055870 cmp r0, 0 bne _080EDDAA - ldr r1, _080EDCD8 @ =0x02000000 + ldr r1, _080EDCD8 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -4149,7 +4149,7 @@ _080EDCC0: strh r0, [r1] b _080EDDAA .align 2, 0 -_080EDCD8: .4byte 0x02000000 +_080EDCD8: .4byte gSharedMem _080EDCDC: bl sub_8055870 cmp r0, 0 @@ -4158,7 +4158,7 @@ _080EDCDC: _080EDCE6: movs r0, 0x1 bl sub_80F0264 - ldr r1, _080EDD08 @ =0x02000000 + ldr r1, _080EDD08 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -4172,11 +4172,11 @@ _080EDCFA: bne _080EDDAA b _080EDD82 .align 2, 0 -_080EDD08: .4byte 0x02000000 +_080EDD08: .4byte gSharedMem _080EDD0C: movs r0, 0x2 bl sub_80F2C80 - ldr r1, _080EDD30 @ =0x02000000 + ldr r1, _080EDD30 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -4191,17 +4191,17 @@ _080EDD20: bne _080EDDAA b _080EDD82 .align 2, 0 -_080EDD30: .4byte 0x02000000 +_080EDD30: .4byte gSharedMem _080EDD34: movs r0, 0x1 bl sub_80F3008 - ldr r1, _080EDD44 @ =0x02000000 + ldr r1, _080EDD44 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EDD8A .align 2, 0 -_080EDD44: .4byte 0x02000000 +_080EDD44: .4byte gSharedMem _080EDD48: bl sub_8055870 cmp r0, 0 @@ -4231,7 +4231,7 @@ _080EDD7C: movs r0, 0x4 bl sub_80EED2C _080EDD82: - ldr r1, _080EDD94 @ =0x02000000 + ldr r1, _080EDD94 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -4241,7 +4241,7 @@ _080EDD8A: strh r0, [r1] b _080EDDAA .align 2, 0 -_080EDD94: .4byte 0x02000000 +_080EDD94: .4byte gSharedMem _080EDD98: ldr r0, _080EDDB4 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -4264,7 +4264,7 @@ _080EDDB8: .4byte sub_80EDDBC thumb_func_start sub_80EDDBC sub_80EDDBC: @ 80EDDBC push {r4,lr} - ldr r0, _080EDDD8 @ =0x02000000 + ldr r0, _080EDDD8 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r4, r0, r1 @@ -4277,7 +4277,7 @@ sub_80EDDBC: @ 80EDDBC beq _080EDDE2 b _080EDE6A .align 2, 0 -_080EDDD8: .4byte 0x02000000 +_080EDDD8: .4byte gSharedMem _080EDDDC: cmp r0, 0x2 beq _080EDE60 @@ -4353,7 +4353,7 @@ _080EDE6A: sub_80EDE70: @ 80EDE70 push {r4,lr} sub sp, 0x4 - ldr r0, _080EDE8C @ =0x02000000 + ldr r0, _080EDE8C @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r4, r0, r1 @@ -4366,7 +4366,7 @@ sub_80EDE70: @ 80EDE70 beq _080EDE96 b _080EDED6 .align 2, 0 -_080EDE8C: .4byte 0x02000000 +_080EDE8C: .4byte gSharedMem _080EDE90: cmp r2, 0x2 beq _080EDED0 @@ -4416,7 +4416,7 @@ _080EDEE0: .4byte sub_80EC00C sub_80EDEE4: @ 80EDEE4 push {r4,lr} sub sp, 0x4 - ldr r1, _080EDF04 @ =0x02000000 + ldr r1, _080EDF04 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -4432,7 +4432,7 @@ _080EDEFA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EDF04: .4byte 0x02000000 +_080EDF04: .4byte gSharedMem _080EDF08: .4byte _080EDF0C .align 2, 0 _080EDF0C: @@ -4472,41 +4472,41 @@ _080EDF5E: bl SetVBlankCallback bl sub_80EED0C bl sub_80F3130 - ldr r1, _080EDF7C @ =0x02000000 + ldr r1, _080EDF7C @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EE042 .align 2, 0 _080EDF78: .4byte gPaletteFade -_080EDF7C: .4byte 0x02000000 +_080EDF7C: .4byte gSharedMem _080EDF80: bl sub_80F66E0 bl sub_80EEE08 - ldr r1, _080EDF94 @ =0x02000000 + ldr r1, _080EDF94 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EE042 .align 2, 0 -_080EDF94: .4byte 0x02000000 +_080EDF94: .4byte gSharedMem _080EDF98: bl sub_80F1080 lsls r0, 24 cmp r0, 0 bne _080EE060 - ldr r1, _080EDFAC @ =0x02000000 + ldr r1, _080EDFAC @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EE042 .align 2, 0 -_080EDFAC: .4byte 0x02000000 +_080EDFAC: .4byte gSharedMem _080EDFB0: movs r0, 0x5 bl sub_80EEFBC bl sub_80F38B8 - ldr r1, _080EDFDC @ =0x02000000 + ldr r1, _080EDFDC @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -4518,24 +4518,24 @@ _080EDFC8: lsls r0, 24 cmp r0, 0 bne _080EE060 - ldr r1, _080EDFDC @ =0x02000000 + ldr r1, _080EDFDC @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EE042 .align 2, 0 -_080EDFDC: .4byte 0x02000000 +_080EDFDC: .4byte gSharedMem _080EDFE0: bl sub_8055870 cmp r0, 0 bne _080EE060 - ldr r1, _080EDFF4 @ =0x02000000 + ldr r1, _080EDFF4 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EE042 .align 2, 0 -_080EDFF4: .4byte 0x02000000 +_080EDFF4: .4byte gSharedMem _080EDFF8: movs r1, 0xC2 lsls r1, 2 @@ -4556,13 +4556,13 @@ _080EE018: .4byte sub_80EBD18 _080EE01C: movs r0, 0x3 bl sub_80EED2C - ldr r1, _080EE02C @ =0x02000000 + ldr r1, _080EE02C @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EE042 .align 2, 0 -_080EE02C: .4byte 0x02000000 +_080EE02C: .4byte gSharedMem _080EE030: ldr r0, _080EE04C @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -4600,7 +4600,7 @@ _080EE068: .4byte sub_80EE06C thumb_func_start sub_80EE06C sub_80EE06C: @ 80EE06C push {r4,r5,lr} - ldr r1, _080EE08C @ =0x02000000 + ldr r1, _080EE08C @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -4616,7 +4616,7 @@ _080EE080: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EE08C: .4byte 0x02000000 +_080EE08C: .4byte gSharedMem _080EE090: .4byte _080EE094 .align 2, 0 _080EE094: @@ -4631,13 +4631,13 @@ _080EE094: .4byte _080EE26C _080EE0B8: bl sub_80F15A8 - ldr r1, _080EE0C8 @ =0x02000000 + ldr r1, _080EE0C8 @ =gSharedMem movs r5, 0xC1 lsls r5, 2 adds r1, r5 b _080EE1C4 .align 2, 0 -_080EE0C8: .4byte 0x02000000 +_080EE0C8: .4byte gSharedMem _080EE0CC: ldr r2, _080EE0FC @ =gMain ldrh r1, [r2, 0x30] @@ -4701,13 +4701,13 @@ _080EE140: bl PlaySE movs r0, 0xB bl sub_80EEFBC - ldr r0, _080EE160 @ =0x02000000 + ldr r0, _080EE160 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r0, r1 b _080EE262 .align 2, 0 -_080EE160: .4byte 0x02000000 +_080EE160: .4byte gSharedMem _080EE164: movs r0, 0x2 ands r0, r2 @@ -4729,29 +4729,29 @@ _080EE180: beq _080EE18C b _080EE288 _080EE18C: - ldr r1, _080EE198 @ =0x02000000 + ldr r1, _080EE198 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EE1C4 .align 2, 0 -_080EE198: .4byte 0x02000000 +_080EE198: .4byte gSharedMem _080EE19C: bl sub_8055870 adds r1, r0, 0 cmp r1, 0 bne _080EE288 - ldr r0, _080EE1B4 @ =0x02000000 + ldr r0, _080EE1B4 @ =gSharedMem movs r5, 0xC1 lsls r5, 2 adds r0, r5 strh r1, [r0] b _080EE288 .align 2, 0 -_080EE1B4: .4byte 0x02000000 +_080EE1B4: .4byte gSharedMem _080EE1B8: bl sub_80F3B00 - ldr r1, _080EE1CC @ =0x02000000 + ldr r1, _080EE1CC @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -4761,14 +4761,14 @@ _080EE1C4: strh r0, [r1] b _080EE288 .align 2, 0 -_080EE1CC: .4byte 0x02000000 +_080EE1CC: .4byte gSharedMem _080EE1D0: bl sub_80F3B58 lsls r0, 24 cmp r0, 0 bne _080EE288 bl sub_80F1494 - ldr r1, _080EE1F4 @ =0x02000000 + ldr r1, _080EE1F4 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -4778,7 +4778,7 @@ _080EE1D0: bl sub_80EED9C b _080EE288 .align 2, 0 -_080EE1F4: .4byte 0x02000000 +_080EE1F4: .4byte gSharedMem _080EE1F8: bl sub_80F68E8 lsls r0, 24 @@ -4790,7 +4790,7 @@ _080EE1F8: movs r0, 0x5 bl PlaySE bl sub_80F3B94 - ldr r0, _080EE220 @ =0x02000000 + ldr r0, _080EE220 @ =gSharedMem movs r5, 0xC1 lsls r5, 2 adds r0, r5 @@ -4798,7 +4798,7 @@ _080EE1F8: strh r1, [r0] b _080EE288 .align 2, 0 -_080EE220: .4byte 0x02000000 +_080EE220: .4byte gSharedMem _080EE224: ldr r0, _080EE248 @ =gMain ldrh r1, [r0, 0x2E] @@ -4809,7 +4809,7 @@ _080EE224: movs r0, 0x5 bl PlaySE bl sub_80F3B94 - ldr r0, _080EE24C @ =0x02000000 + ldr r0, _080EE24C @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r0, r1 @@ -4818,13 +4818,13 @@ _080EE224: b _080EE288 .align 2, 0 _080EE248: .4byte gMain -_080EE24C: .4byte 0x02000000 +_080EE24C: .4byte gSharedMem _080EE250: bl sub_80F3BD4 lsls r0, 24 cmp r0, 0 bne _080EE288 - ldr r0, _080EE268 @ =0x02000000 + ldr r0, _080EE268 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r2 @@ -4833,7 +4833,7 @@ _080EE262: strh r1, [r0] b _080EE288 .align 2, 0 -_080EE268: .4byte 0x02000000 +_080EE268: .4byte gSharedMem _080EE26C: bl sub_80F3BD4 lsls r0, 24 @@ -4842,7 +4842,7 @@ _080EE26C: bne _080EE288 movs r0, 0x5 bl sub_80EEFBC - ldr r0, _080EE290 @ =0x02000000 + ldr r0, _080EE290 @ =gSharedMem movs r5, 0xC1 lsls r5, 2 adds r0, r5 @@ -4852,14 +4852,14 @@ _080EE288: pop {r0} bx r0 .align 2, 0 -_080EE290: .4byte 0x02000000 +_080EE290: .4byte gSharedMem thumb_func_end sub_80EE06C thumb_func_start sub_80EE294 sub_80EE294: @ 80EE294 push {r4,lr} sub sp, 0x4 - ldr r1, _080EE2B4 @ =0x02000000 + ldr r1, _080EE2B4 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -4875,7 +4875,7 @@ _080EE2AA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EE2B4: .4byte 0x02000000 +_080EE2B4: .4byte gSharedMem _080EE2B8: .4byte _080EE2BC .align 2, 0 _080EE2BC: @@ -4922,7 +4922,7 @@ _080EE324: bl sub_80F6134 movs r0, 0x1 bl sub_80F0264 - ldr r1, _080EE348 @ =0x02000000 + ldr r1, _080EE348 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -4936,7 +4936,7 @@ _080EE33C: bne _080EE3C6 b _080EE3A0 .align 2, 0 -_080EE348: .4byte 0x02000000 +_080EE348: .4byte gSharedMem _080EE34C: movs r0, 0x4 bl sub_80EEFBC @@ -4944,14 +4944,14 @@ _080EE34C: bl sub_80F3008 ldr r0, _080EE368 @ =sub_80EBD18 bl SetVBlankCallback - ldr r1, _080EE36C @ =0x02000000 + ldr r1, _080EE36C @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EE3A8 .align 2, 0 _080EE368: .4byte sub_80EBD18 -_080EE36C: .4byte 0x02000000 +_080EE36C: .4byte gSharedMem _080EE370: bl sub_8055870 cmp r0, 0 @@ -4977,7 +4977,7 @@ _080EE39A: movs r0, 0x4 bl sub_80EED2C _080EE3A0: - ldr r1, _080EE3B0 @ =0x02000000 + ldr r1, _080EE3B0 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -4987,7 +4987,7 @@ _080EE3A8: strh r0, [r1] b _080EE3C6 .align 2, 0 -_080EE3B0: .4byte 0x02000000 +_080EE3B0: .4byte gSharedMem _080EE3B4: ldr r0, _080EE3D0 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -5011,7 +5011,7 @@ _080EE3D4: .4byte sub_80EDDBC sub_80EE3D8: @ 80EE3D8 push {r4,lr} sub sp, 0x4 - ldr r0, _080EE3F8 @ =0x02000000 + ldr r0, _080EE3F8 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r0, r1 @@ -5026,7 +5026,7 @@ _080EE3EC: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EE3F8: .4byte 0x02000000 +_080EE3F8: .4byte gSharedMem _080EE3FC: .4byte _080EE400 .align 2, 0 _080EE400: @@ -5067,7 +5067,7 @@ _080EE458: beq _080EE466 b _080EE57A _080EE466: - ldr r4, _080EE488 @ =0x02000000 + ldr r4, _080EE488 @ =gSharedMem movs r1, 0xC2 lsls r1, 2 adds r0, r4, r1 @@ -5083,7 +5083,7 @@ _080EE466: adds r1, r4, r0 b _080EE55A .align 2, 0 -_080EE488: .4byte 0x02000000 +_080EE488: .4byte gSharedMem _080EE48C: ldr r0, _080EE4AC @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -5105,7 +5105,7 @@ _080EE4B0: _080EE4B6: movs r0, 0x2 bl sub_80F0264 - ldr r1, _080EE4D8 @ =0x02000000 + ldr r1, _080EE4D8 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -5119,11 +5119,11 @@ _080EE4CA: bne _080EE57A b _080EE552 .align 2, 0 -_080EE4D8: .4byte 0x02000000 +_080EE4D8: .4byte gSharedMem _080EE4DC: movs r0, 0x3 bl sub_80F2C80 - ldr r1, _080EE500 @ =0x02000000 + ldr r1, _080EE500 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -5138,7 +5138,7 @@ _080EE4F0: bne _080EE57A b _080EE552 .align 2, 0 -_080EE500: .4byte 0x02000000 +_080EE500: .4byte gSharedMem _080EE504: movs r0, 0x2 bl sub_80F3008 @@ -5150,7 +5150,7 @@ _080EE50C: b _080EE552 _080EE516: bl sub_80F6F10 - ldr r4, _080EE544 @ =0x02000000 + ldr r4, _080EE544 @ =gSharedMem movs r1, 0xC2 lsls r1, 2 adds r0, r4, r1 @@ -5169,13 +5169,13 @@ _080EE516: adds r1, r4, r0 b _080EE55A .align 2, 0 -_080EE544: .4byte 0x02000000 +_080EE544: .4byte gSharedMem _080EE548: .4byte sub_80EBD68 _080EE54C: movs r0, 0x5 bl sub_80EED2C _080EE552: - ldr r1, _080EE564 @ =0x02000000 + ldr r1, _080EE564 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 @@ -5185,7 +5185,7 @@ _080EE55A: strh r0, [r1] b _080EE57A .align 2, 0 -_080EE564: .4byte 0x02000000 +_080EE564: .4byte gSharedMem _080EE568: ldr r0, _080EE584 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -5208,7 +5208,7 @@ _080EE588: .4byte sub_80EE58C thumb_func_start sub_80EE58C sub_80EE58C: @ 80EE58C push {r4,r5,lr} - ldr r5, _080EE5A8 @ =0x02000000 + ldr r5, _080EE5A8 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r4, r5, r0 @@ -5221,7 +5221,7 @@ sub_80EE58C: @ 80EE58C beq _080EE5B2 b _080EE652 .align 2, 0 -_080EE5A8: .4byte 0x02000000 +_080EE5A8: .4byte gSharedMem _080EE5AC: cmp r0, 0x2 beq _080EE648 @@ -5306,7 +5306,7 @@ _080EE652: thumb_func_start sub_80EE658 sub_80EE658: @ 80EE658 push {r4,r5,lr} - ldr r1, _080EE678 @ =0x02000000 + ldr r1, _080EE678 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r0, r1, r2 @@ -5322,7 +5322,7 @@ _080EE66C: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EE678: .4byte 0x02000000 +_080EE678: .4byte gSharedMem _080EE67C: .4byte _080EE680 .align 2, 0 _080EE680: @@ -5358,22 +5358,22 @@ _080EE6DA: beq _080EE6E6 b _080EE8E8 _080EE6E6: - ldr r1, _080EE6F0 @ =0x02000000 + ldr r1, _080EE6F0 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EE8C6 .align 2, 0 -_080EE6F0: .4byte 0x02000000 +_080EE6F0: .4byte gSharedMem _080EE6F4: bl sub_80F0F64 - ldr r1, _080EE704 @ =0x02000000 + ldr r1, _080EE704 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EE8C6 .align 2, 0 -_080EE704: .4byte 0x02000000 +_080EE704: .4byte gSharedMem _080EE708: bl sub_80F0FEC lsls r0, 24 @@ -5386,15 +5386,15 @@ _080EE714: b _080EE8BE _080EE71C: bl sub_80F6DB8 - ldr r1, _080EE72C @ =0x02000000 + ldr r1, _080EE72C @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EE8C6 .align 2, 0 -_080EE72C: .4byte 0x02000000 +_080EE72C: .4byte gSharedMem _080EE730: - ldr r4, _080EE750 @ =0x02008788 + ldr r4, _080EE750 @ =gSharedMem + 0x8788 adds r0, r4, 0 subs r0, 0x1A ldrh r1, [r0] @@ -5409,11 +5409,11 @@ _080EE730: strh r0, [r4] b _080EE8E8 .align 2, 0 -_080EE750: .4byte 0x02008788 +_080EE750: .4byte gSharedMem + 0x8788 _080EE754: .4byte 0xffff7b7c _080EE758: bl sub_80F0CD8 - ldr r1, _080EE77C @ =0x02000000 + ldr r1, _080EE77C @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 @@ -5430,7 +5430,7 @@ _080EE776: bl sub_80F0D5C b _080EE8B8 .align 2, 0 -_080EE77C: .4byte 0x02000000 +_080EE77C: .4byte gSharedMem _080EE780: ldr r2, _080EE7B0 @ =gMain ldrh r1, [r2, 0x2C] @@ -5497,13 +5497,13 @@ _080EE7F8: bl PlaySE bl sub_80F4394 bl sub_80F0EC0 - ldr r1, _080EE81C @ =0x02000000 + ldr r1, _080EE81C @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EE8C6 .align 2, 0 -_080EE81C: .4byte 0x02000000 +_080EE81C: .4byte gSharedMem _080EE820: bl sub_80F6ED4 lsls r0, 24 @@ -5519,46 +5519,46 @@ _080EE820: b _080EE8BE _080EE840: bl sub_80F6134 - ldr r1, _080EE850 @ =0x02000000 + ldr r1, _080EE850 @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EE8C6 .align 2, 0 -_080EE850: .4byte 0x02000000 +_080EE850: .4byte gSharedMem _080EE854: bl sub_80F0FA0 - ldr r1, _080EE864 @ =0x02000000 + ldr r1, _080EE864 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EE8C6 .align 2, 0 -_080EE864: .4byte 0x02000000 +_080EE864: .4byte gSharedMem _080EE868: bl sub_80F0FEC b _080EE8B8 _080EE86E: bl sub_80F0C28 - ldr r1, _080EE87C @ =0x02000000 + ldr r1, _080EE87C @ =gSharedMem movs r0, 0xC1 lsls r0, 2 adds r1, r0 b _080EE8C6 .align 2, 0 -_080EE87C: .4byte 0x02000000 +_080EE87C: .4byte gSharedMem _080EE880: bl sub_80F0C48 lsls r0, 24 cmp r0, 0 bne _080EE8E8 - ldr r1, _080EE894 @ =0x02000000 + ldr r1, _080EE894 @ =gSharedMem movs r2, 0xC1 lsls r2, 2 adds r1, r2 b _080EE8C6 .align 2, 0 -_080EE894: .4byte 0x02000000 +_080EE894: .4byte gSharedMem _080EE898: movs r0, 0x9 bl sub_80EEFBC @@ -5577,7 +5577,7 @@ _080EE8B8: cmp r0, 0 bne _080EE8E8 _080EE8BE: - ldr r1, _080EE8D0 @ =0x02000000 + ldr r1, _080EE8D0 @ =gSharedMem movs r5, 0xC1 lsls r5, 2 adds r1, r5 @@ -5587,12 +5587,12 @@ _080EE8C6: strh r0, [r1] b _080EE8E8 .align 2, 0 -_080EE8D0: .4byte 0x02000000 +_080EE8D0: .4byte gSharedMem _080EE8D4: bl sub_8055870 cmp r0, 0 bne _080EE8E8 - ldr r0, _080EE8F0 @ =0x02000000 + ldr r0, _080EE8F0 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r0, r1 @@ -5603,14 +5603,14 @@ _080EE8E8: pop {r0} bx r0 .align 2, 0 -_080EE8F0: .4byte 0x02000000 +_080EE8F0: .4byte gSharedMem thumb_func_end sub_80EE658 thumb_func_start sub_80EE8F4 sub_80EE8F4: @ 80EE8F4 push {r4,lr} sub sp, 0x4 - ldr r0, _080EE910 @ =0x02000000 + ldr r0, _080EE910 @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r4, r0, r1 @@ -5623,7 +5623,7 @@ sub_80EE8F4: @ 80EE8F4 beq _080EE91A b _080EE95E .align 2, 0 -_080EE910: .4byte 0x02000000 +_080EE910: .4byte gSharedMem _080EE914: cmp r2, 0x2 beq _080EE958 @@ -5674,7 +5674,7 @@ _080EE968: .4byte sub_80EC00C sub_80EE96C: @ 80EE96C push {r4,r5,lr} sub sp, 0x4 - ldr r0, _080EE99C @ =0x02000000 + ldr r0, _080EE99C @ =gSharedMem movs r1, 0xC1 lsls r1, 2 adds r5, r0, r1 @@ -5695,7 +5695,7 @@ sub_80EE96C: @ 80EE96C strh r0, [r5] b _080EE9B4 .align 2, 0 -_080EE99C: .4byte 0x02000000 +_080EE99C: .4byte gSharedMem _080EE9A0: ldr r0, _080EE9BC @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -5727,7 +5727,7 @@ sub_80EE9C0: @ 80EE9C0 lsls r6, 24 lsrs r6, 24 bl sub_80F1E84 - ldr r1, _080EE9FC @ =0x02000000 + ldr r1, _080EE9FC @ =gSharedMem ldr r2, _080EEA00 @ =0x00006e14 adds r0, r1, r2 movs r2, 0 @@ -5745,7 +5745,7 @@ sub_80EE9C0: @ 80EE9C0 pop {r0} bx r0 .align 2, 0 -_080EE9FC: .4byte 0x02000000 +_080EE9FC: .4byte gSharedMem _080EEA00: .4byte 0x00006e14 _080EEA04: .4byte 0x00006e15 _080EEA08: .4byte 0x00006e17 @@ -5754,7 +5754,7 @@ _080EEA08: .4byte 0x00006e17 thumb_func_start sub_80EEA0C sub_80EEA0C: @ 80EEA0C push {r4,lr} - ldr r1, _080EEA28 @ =0x02000000 + ldr r1, _080EEA28 @ =gSharedMem ldr r2, _080EEA2C @ =0x00006e16 adds r0, r1, r2 ldrb r0, [r0] @@ -5769,7 +5769,7 @@ _080EEA1E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EEA28: .4byte 0x02000000 +_080EEA28: .4byte gSharedMem _080EEA2C: .4byte 0x00006e16 _080EEA30: .4byte _080EEA34 .align 2, 0 @@ -5790,7 +5790,7 @@ _080EEA58: beq _080EEA64 b _080EEC08 _080EEA64: - ldr r1, _080EEA7C @ =0x02000000 + ldr r1, _080EEA7C @ =gSharedMem ldr r4, _080EEA80 @ =0x00006e17 adds r0, r1, r4 ldrb r0, [r0] @@ -5802,7 +5802,7 @@ _080EEA64: strb r0, [r1] b _080EEC08 .align 2, 0 -_080EEA7C: .4byte 0x02000000 +_080EEA7C: .4byte gSharedMem _080EEA80: .4byte 0x00006e17 _080EEA84: .4byte 0x00006e16 _080EEA88: @@ -5814,7 +5814,7 @@ _080EEA88: .align 2, 0 _080EEA94: .4byte 0x00006e16 _080EEA98: - ldr r4, _080EEAC8 @ =0x02000000 + ldr r4, _080EEAC8 @ =gSharedMem ldr r1, _080EEACC @ =0x00006e17 adds r0, r4, r1 ldrb r0, [r0] @@ -5825,7 +5825,7 @@ _080EEA98: adds r0, 0x1 strb r0, [r4] _080EEAAE: - ldr r4, _080EEAC8 @ =0x02000000 + ldr r4, _080EEAC8 @ =gSharedMem ldr r1, _080EEACC @ =0x00006e17 adds r0, r4, r1 ldrb r0, [r0] @@ -5839,7 +5839,7 @@ _080EEAC2: adds r1, r4, r2 b _080EEB76 .align 2, 0 -_080EEAC8: .4byte 0x02000000 +_080EEAC8: .4byte gSharedMem _080EEACC: .4byte 0x00006e17 _080EEAD0: .4byte 0x00006e16 _080EEAD4: @@ -5888,7 +5888,7 @@ _080EEB20: _080EEB26: strb r0, [r1] _080EEB28: - ldr r4, _080EEB5C @ =0x02000000 + ldr r4, _080EEB5C @ =gSharedMem ldr r1, _080EEB60 @ =0x00006e14 adds r0, r4, r1 ldrb r0, [r0] @@ -5899,7 +5899,7 @@ _080EEB28: adds r0, 0x1 strb r0, [r4] _080EEB3E: - ldr r4, _080EEB5C @ =0x02000000 + ldr r4, _080EEB5C @ =gSharedMem ldr r1, _080EEB60 @ =0x00006e14 adds r0, r4, r1 ldrb r0, [r0] @@ -5912,14 +5912,14 @@ _080EEB3E: b _080EEB76 .align 2, 0 _080EEB58: .4byte 0x00006dae -_080EEB5C: .4byte 0x02000000 +_080EEB5C: .4byte gSharedMem _080EEB60: .4byte 0x00006e14 _080EEB64: .4byte 0x00006e16 _080EEB68: bl sub_8055870 cmp r0, 0 bne _080EEC08 - ldr r1, _080EEB80 @ =0x02000000 + ldr r1, _080EEB80 @ =gSharedMem ldr r4, _080EEB84 @ =0x00006e16 adds r1, r4 _080EEB76: @@ -5928,11 +5928,11 @@ _080EEB76: strb r0, [r1] b _080EEC08 .align 2, 0 -_080EEB80: .4byte 0x02000000 +_080EEB80: .4byte gSharedMem _080EEB84: .4byte 0x00006e16 _080EEB88: bl sub_80F1DF0 - ldr r4, _080EEBA0 @ =0x02000000 + ldr r4, _080EEBA0 @ =gSharedMem ldr r1, _080EEBA4 @ =0x00006e14 adds r0, r4, r1 ldrb r0, [r0] @@ -5941,7 +5941,7 @@ _080EEB88: adds r4, r2 b _080EEBCC .align 2, 0 -_080EEBA0: .4byte 0x02000000 +_080EEBA0: .4byte gSharedMem _080EEBA4: .4byte 0x00006e14 _080EEBA8: .4byte 0x00006e16 _080EEBAC: @@ -5949,7 +5949,7 @@ _080EEBAC: lsls r0, 24 cmp r0, 0 bne _080EEC08 - ldr r4, _080EEBD4 @ =0x02000000 + ldr r4, _080EEBD4 @ =gSharedMem ldr r1, _080EEBD8 @ =0x00006e14 adds r0, r4, r1 ldrb r0, [r0] @@ -5965,7 +5965,7 @@ _080EEBCC: strb r0, [r4] b _080EEC08 .align 2, 0 -_080EEBD4: .4byte 0x02000000 +_080EEBD4: .4byte gSharedMem _080EEBD8: .4byte 0x00006e14 _080EEBDC: .4byte 0x00006dad _080EEBE0: .4byte 0x00006e16 @@ -5974,7 +5974,7 @@ _080EEBE4: lsls r0, 24 cmp r0, 0 bne _080EEC08 - ldr r1, _080EEC00 @ =0x02000000 + ldr r1, _080EEC00 @ =gSharedMem ldr r2, _080EEC04 @ =0x00006e16 adds r1, r2 ldrb r0, [r1] @@ -5984,7 +5984,7 @@ _080EEBFA: movs r0, 0 b _080EEC0A .align 2, 0 -_080EEC00: .4byte 0x02000000 +_080EEC00: .4byte gSharedMem _080EEC04: .4byte 0x00006e16 _080EEC08: movs r0, 0x1 @@ -6003,7 +6003,7 @@ sub_80EEC10: @ 80EEC10 ands r0, r1 cmp r0, 0 beq _080EEC50 - ldr r1, _080EEC4C @ =0x02006dad + ldr r1, _080EEC4C @ =gSharedMem + 0x6DAD adds r3, r1, 0x1 adds r2, r1, 0x5 _080EEC24: @@ -6027,13 +6027,13 @@ _080EEC36: b _080EEC8A .align 2, 0 _080EEC48: .4byte gMain -_080EEC4C: .4byte 0x02006dad +_080EEC4C: .4byte gSharedMem + 0x6DAD _080EEC50: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _080EEC88 - ldr r1, _080EEC84 @ =0x02006dad + ldr r1, _080EEC84 @ =gSharedMem + 0x6DAD movs r4, 0 movs r2, 0x1 ldrsb r2, [r1, r2] @@ -6057,7 +6057,7 @@ _080EEC72: movs r0, 0x1 b _080EEC8A .align 2, 0 -_080EEC84: .4byte 0x02006dad +_080EEC84: .4byte gSharedMem + 0x6DAD _080EEC88: movs r0, 0 _080EEC8A: @@ -6077,7 +6077,7 @@ sub_80EEC90: @ 80EEC90 lsrs r3, r0, 16 cmp r3, 0 beq _080EECD0 - ldr r2, _080EECC4 @ =0x02000000 + ldr r2, _080EECC4 @ =gSharedMem ldr r0, _080EECC8 @ =0x00006dad adds r1, r2, r0 ldrb r0, [r1] @@ -6094,7 +6094,7 @@ sub_80EEC90: @ 80EEC90 b _080EECF8 .align 2, 0 _080EECC0: .4byte gMain -_080EECC4: .4byte 0x02000000 +_080EECC4: .4byte gSharedMem _080EECC8: .4byte 0x00006dad _080EECCC: .4byte 0x00006dae _080EECD0: @@ -6102,7 +6102,7 @@ _080EECD0: ands r0, r1 cmp r0, 0 beq _080EED04 - ldr r0, _080EECFC @ =0x02000000 + ldr r0, _080EECFC @ =gSharedMem ldr r4, _080EED00 @ =0x00006dad adds r2, r0, r4 ldrb r1, [r2] @@ -6122,7 +6122,7 @@ _080EECF8: movs r0, 0x1 b _080EED06 .align 2, 0 -_080EECFC: .4byte 0x02000000 +_080EECFC: .4byte gSharedMem _080EED00: .4byte 0x00006dad _080EED04: movs r0, 0 @@ -6219,7 +6219,7 @@ _080EED98: sub_80EED9C: @ 80EED9C push {lr} ldr r2, _080EEDB8 @ =gUnknown_03000744 - ldr r0, _080EEDBC @ =0x02000000 + ldr r0, _080EEDBC @ =gSharedMem movs r1, 0xC0 lsls r1, 2 adds r0, r1 @@ -6232,7 +6232,7 @@ sub_80EED9C: @ 80EED9C bx r0 .align 2, 0 _080EEDB8: .4byte gUnknown_03000744 -_080EEDBC: .4byte 0x02000000 +_080EEDBC: .4byte gSharedMem _080EEDC0: .4byte sub_80EEDC4 thumb_func_end sub_80EED9C @@ -6242,7 +6242,7 @@ sub_80EEDC4: @ 80EEDC4 bl sub_8055870 cmp r0, 0x1 beq _080EEDDC - ldr r0, _080EEDE0 @ =0x02000000 + ldr r0, _080EEDE0 @ =gSharedMem movs r1, 0xC0 lsls r1, 2 adds r0, r1 @@ -6253,7 +6253,7 @@ _080EEDDC: pop {r0} bx r0 .align 2, 0 -_080EEDE0: .4byte 0x02000000 +_080EEDE0: .4byte gSharedMem _080EEDE4: .4byte gUnknown_03000744 thumb_func_end sub_80EEDC4 diff --git a/asm/roulette.s b/asm/roulette.s index fcfedbd80..2dc191630 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -12,7 +12,7 @@ sub_81150FC: @ 81150FC bl RunTasks bl AnimateSprites bl BuildOamBuffer - ldr r0, _08115120 @ =0x02019000 + ldr r0, _08115120 @ =gSharedMem + 0x19000 adds r1, r0, 0 adds r1, 0xB8 ldrb r0, [r1] @@ -24,7 +24,7 @@ _0811511C: pop {r0} bx r0 .align 2, 0 -_08115120: .4byte 0x02019000 +_08115120: .4byte gSharedMem + 0x19000 thumb_func_end sub_81150FC thumb_func_start sub_8115124 @@ -36,7 +36,7 @@ sub_8115124: @ 8115124 bl TransferPlttBuffer bl sub_8117434 ldr r2, _08115188 @ =REG_BG1HOFS - ldr r3, _0811518C @ =0x02019000 + ldr r3, _0811518C @ =gSharedMem + 0x19000 ldrh r1, [r3, 0x26] movs r4, 0x80 lsls r4, 2 @@ -78,7 +78,7 @@ _08115170: b _0811521A .align 2, 0 _08115188: .4byte REG_BG1HOFS -_0811518C: .4byte 0x02019000 +_0811518C: .4byte gSharedMem + 0x19000 _08115190: .4byte REG_BLDALPHA _08115194: .4byte 0x040000d4 _08115198: .4byte gBGTilemapBuffers + 0x800 + 0x1C0 @@ -160,7 +160,7 @@ sub_8115238: @ 8115238 mov r0, sp movs r2, 0x6 bl memcpy - ldr r5, _081152C4 @ =0x02019000 + ldr r5, _081152C4 @ =gSharedMem + 0x19000 movs r2, 0xBE lsls r2, 1 adds r0, r5, 0 @@ -223,7 +223,7 @@ _08115276: b _081152E4 .align 2, 0 _081152C0: .4byte gUnknown_083F8EC4 -_081152C4: .4byte 0x02019000 +_081152C4: .4byte gSharedMem + 0x19000 _081152C8: .4byte gSpecialVar_0x8004 _081152CC: .4byte gUnknown_083F8DF4 _081152D0: .4byte gUnknown_083F8DF0 @@ -248,14 +248,14 @@ _081152E4: strh r0, [r2] ands r0, r1 strh r0, [r4] - ldr r0, _08115354 @ =0x020190b8 + ldr r0, _08115354 @ =gSharedMem + 0x190B8 bl sub_8124918 movs r4, 0 ldr r5, _08115358 @ =gUnknown_083F8E34 _08115308: lsls r2, r4, 3 adds r2, r5 - ldr r0, _08115354 @ =0x020190b8 + ldr r0, _08115354 @ =gSharedMem + 0x190B8 adds r1, r4, 0 bl sub_812492C adds r0, r4, 0x1 @@ -264,7 +264,7 @@ _08115308: cmp r4, 0xC bls _08115308 movs r4, 0 - ldr r5, _0811535C @ =0x02019000 + ldr r5, _0811535C @ =gSharedMem + 0x19000 _08115322: movs r0, 0x64 muls r0, r4 @@ -287,9 +287,9 @@ _08115322: _08115348: .4byte gPlttBufferUnfaded _0811534C: .4byte gPlttBufferFaded _08115350: .4byte 0x0000ffff -_08115354: .4byte 0x020190b8 +_08115354: .4byte gSharedMem + 0x190B8 _08115358: .4byte gUnknown_083F8E34 -_0811535C: .4byte 0x02019000 +_0811535C: .4byte gSharedMem + 0x19000 _08115360: .4byte gPlayerParty _08115364: ldrb r0, [r5, 0x2] @@ -421,7 +421,7 @@ _08115494: bl sub_8115238 bl sub_80F9020 ldr r0, _081154B4 @ =gUnknown_083F88BC - ldr r1, _081154B8 @ =0x02018800 + ldr r1, _081154B8 @ =gSharedMem + 0x18800 bl LZ77UnCompWram ldr r0, _081154BC @ =gUnknown_083F8A60 ldr r1, _081154C0 @ =0x06003000 @@ -432,7 +432,7 @@ _08115494: b _0811557A .align 2, 0 _081154B4: .4byte gUnknown_083F88BC -_081154B8: .4byte 0x02018800 +_081154B8: .4byte gSharedMem + 0x18800 _081154BC: .4byte gUnknown_083F8A60 _081154C0: .4byte 0x06003000 _081154C4: .4byte gMain @@ -540,7 +540,7 @@ _0811558C: ldr r0, _08115618 @ =sub_81156BC movs r1, 0 bl CreateTask - ldr r4, _0811561C @ =0x02019000 + ldr r4, _0811561C @ =gSharedMem + 0x19000 adds r1, r4, 0 adds r1, 0xA4 strb r0, [r1] @@ -576,7 +576,7 @@ _0811560C: .4byte 0x04000200 _08115610: .4byte REG_DISPSTAT _08115614: .4byte sub_8115124 _08115618: .4byte sub_81156BC -_0811561C: .4byte 0x02019000 +_0811561C: .4byte gSharedMem + 0x19000 _08115620: .4byte gTasks _08115624: .4byte gSaveBlock1 _08115628: .4byte 0x00000494 @@ -587,7 +587,7 @@ _08115630: .4byte sub_81150FC thumb_func_start sub_8115634 sub_8115634: @ 8115634 push {r4-r6,lr} - ldr r0, _081156B8 @ =0x02019000 + ldr r0, _081156B8 @ =gSharedMem + 0x19000 adds r3, r0, 0 adds r3, 0x21 ldrb r1, [r3] @@ -654,7 +654,7 @@ _081156A2: pop {r0} bx r0 .align 2, 0 -_081156B8: .4byte 0x02019000 +_081156B8: .4byte gSharedMem + 0x19000 thumb_func_end sub_8115634 thumb_func_start sub_81156BC @@ -775,7 +775,7 @@ sub_81157AC: @ 81157AC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081157CC @ =0x02019000 + ldr r0, _081157CC @ =gSharedMem + 0x19000 adds r0, 0xA5 ldrb r0, [r0] bl DestroyTask @@ -785,7 +785,7 @@ sub_81157AC: @ 81157AC pop {r0} bx r0 .align 2, 0 -_081157CC: .4byte 0x02019000 +_081157CC: .4byte gSharedMem + 0x19000 thumb_func_end sub_81157AC thumb_func_start sub_81157D0 @@ -850,7 +850,7 @@ _08115848: movs r2, 0xE movs r3, 0x7 bl sub_8124DDC - ldr r1, _08115880 @ =0x02018a32 + ldr r1, _08115880 @ =gSharedMem + 0x18A32 movs r0, 0x3 str r0, [sp] str r4, [sp, 0x4] @@ -861,7 +861,7 @@ _08115848: b _08115918 .align 2, 0 _0811587C: .4byte gBGTilemapBuffers + 0x1000 -_08115880: .4byte 0x02018a32 +_08115880: .4byte gSharedMem + 0x18A32 _08115884: subs r0, r4, 0x1 movs r1, 0x5 @@ -881,7 +881,7 @@ _08115884: movs r2, 0xE movs r3, 0x7 bl sub_8124DDC - ldr r1, _081158C4 @ =0x02018a80 + ldr r1, _081158C4 @ =gSharedMem + 0x18A80 str r4, [sp] movs r0, 0x3 str r0, [sp, 0x4] @@ -892,7 +892,7 @@ _08115884: b _08115918 .align 2, 0 _081158C0: .4byte gBGTilemapBuffers + 0x1000 -_081158C4: .4byte 0x02018a80 +_081158C4: .4byte gSharedMem + 0x18A80 _081158C8: adds r0, r4, 0 movs r1, 0x5 @@ -922,7 +922,7 @@ _081158C8: movs r2, 0xE movs r3, 0x7 bl sub_8124DDC - ldr r1, _08115924 @ =0x02018a20 + ldr r1, _08115924 @ =gSharedMem + 0x18A20 movs r0, 0x3 str r0, [sp] str r0, [sp, 0x4] @@ -937,7 +937,7 @@ _08115918: bx r0 .align 2, 0 _08115920: .4byte gBGTilemapBuffers + 0x1000 -_08115924: .4byte 0x02018a20 +_08115924: .4byte gSharedMem + 0x18A20 thumb_func_end sub_81157D0 thumb_func_start sub_8115928 @@ -959,7 +959,7 @@ sub_8115928: @ 8115928 .align 2, 0 _08115948: .4byte gTasks _0811594C: - ldr r0, _08115974 @ =0x02019000 + ldr r0, _08115974 @ =gSharedMem + 0x19000 ldrb r1, [r0, 0x1A] lsls r1, 28 lsrs r1, 28 @@ -979,7 +979,7 @@ _08115960: pop {r0} bx r0 .align 2, 0 -_08115974: .4byte 0x02019000 +_08115974: .4byte gSharedMem + 0x19000 _08115978: .4byte gTasks thumb_func_end sub_8115928 @@ -988,7 +988,7 @@ sub_811597C: @ 811597C push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081159B0 @ =0x02019000 + ldr r5, _081159B0 @ =gSharedMem + 0x19000 movs r6, 0 movs r1, 0x1 strh r1, [r5, 0x28] @@ -1011,7 +1011,7 @@ sub_811597C: @ 811597C pop {r0} bx r0 .align 2, 0 -_081159B0: .4byte 0x02019000 +_081159B0: .4byte gSharedMem + 0x19000 _081159B4: .4byte gTasks _081159B8: .4byte sub_8115E14 thumb_func_end sub_811597C @@ -1021,7 +1021,7 @@ sub_81159BC: @ 81159BC push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r3, _08115A10 @ =0x02019000 + ldr r3, _08115A10 @ =gSharedMem + 0x19000 ldr r1, [r3, 0x8] movs r0, 0x20 ands r0, r1 @@ -1061,7 +1061,7 @@ _081159EA: bne _081159EA b _08115A5A .align 2, 0 -_08115A10: .4byte 0x02019000 +_08115A10: .4byte gSharedMem + 0x19000 _08115A14: .4byte gUnknown_083F8C00 _08115A18: .4byte gTasks _08115A1C: @@ -1333,7 +1333,7 @@ _08115C0C: strh r1, [r4, 0xA] movs r0, 0x5 bl PlaySE - ldr r5, _08115D3C @ =0x020190b8 + ldr r5, _08115D3C @ =gSharedMem + 0x190B8 ldr r1, _08115D40 @ =0x0000ffff adds r0, r5, 0 bl sub_8124D3C @@ -1417,7 +1417,7 @@ _08115C7C: lsls r0, 2 adds r2, 0x8 adds r0, r2 - ldr r2, _08115D54 @ =0x02019000 + ldr r2, _08115D54 @ =gSharedMem + 0x19000 ldr r1, [r2, 0x8] ldr r0, [r0] ands r1, r0 @@ -1465,13 +1465,13 @@ _08115D20: _08115D30: .4byte gMain _08115D34: .4byte gTasks + 0x8 _08115D38: .4byte gTasks -_08115D3C: .4byte 0x020190b8 +_08115D3C: .4byte gSharedMem + 0x190B8 _08115D40: .4byte 0x0000ffff _08115D44: .4byte gSprites _08115D48: .4byte 0xfffffc00 _08115D4C: .4byte 0x000003ff _08115D50: .4byte gUnknown_083F8C00 -_08115D54: .4byte 0x02019000 +_08115D54: .4byte gSharedMem + 0x19000 thumb_func_end sub_8115B58 thumb_func_start sub_8115D58 @@ -1479,7 +1479,7 @@ sub_8115D58: @ 8115D58 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _08115D70 @ =0x02019000 + ldr r1, _08115D70 @ =gSharedMem + 0x19000 movs r0, 0xFF strh r0, [r1, 0x28] ldrb r0, [r1, 0x19] @@ -1489,7 +1489,7 @@ sub_8115D58: @ 8115D58 adds r2, 0x23 b _08115D7A .align 2, 0 -_08115D70: .4byte 0x02019000 +_08115D70: .4byte gSharedMem + 0x19000 _08115D74: adds r2, r1, 0 adds r2, 0x23 @@ -1520,7 +1520,7 @@ sub_8115DA0: @ 8115DA0 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _08115E08 @ =0x02019000 + ldr r4, _08115E08 @ =gSharedMem + 0x19000 ldrb r2, [r4, 0x1A] lsls r2, 28 lsrs r2, 28 @@ -1567,7 +1567,7 @@ _08115DF6: pop {r0} bx r0 .align 2, 0 -_08115E08: .4byte 0x02019000 +_08115E08: .4byte gSharedMem + 0x19000 _08115E0C: .4byte gTasks _08115E10: .4byte sub_8115D58 thumb_func_end sub_8115DA0 @@ -1630,7 +1630,7 @@ _08115E6E: ands r0, r1 cmp r0, 0 beq _08115EC2 - ldr r3, _08115EB0 @ =0x02019000 + ldr r3, _08115EB0 @ =gSharedMem + 0x19000 ldr r2, _08115EB4 @ =gUnknown_083F8C00 ldr r1, _08115EA8 @ =gTasks lsls r0, r5, 2 @@ -1655,7 +1655,7 @@ _08115E6E: .align 2, 0 _08115EA8: .4byte gTasks _08115EAC: .4byte gMain -_08115EB0: .4byte 0x02019000 +_08115EB0: .4byte gSharedMem + 0x19000 _08115EB4: .4byte gUnknown_083F8C00 _08115EB8: movs r0, 0x5F @@ -1695,7 +1695,7 @@ sub_8115ECC: @ 8115ECC adds r0, 0x2 strh r0, [r1] _08115EF8: - ldr r1, _08115F28 @ =0x02019000 + ldr r1, _08115F28 @ =gSharedMem + 0x19000 ldrh r0, [r1, 0x26] adds r0, 0x4 strh r0, [r1, 0x26] @@ -1718,7 +1718,7 @@ _08115EF8: .align 2, 0 _08115F20: .4byte gTasks _08115F24: .4byte gSpriteCoordOffsetX -_08115F28: .4byte 0x02019000 +_08115F28: .4byte gSharedMem + 0x19000 _08115F2C: .4byte gSprites _08115F30: .4byte SpriteCallbackDummy _08115F34: @@ -1747,7 +1747,7 @@ sub_8115F58: @ 8115F58 lsrs r3, r0, 16 lsls r1, 16 lsrs r1, 16 - ldr r0, _08115F74 @ =0x02019000 + ldr r0, _08115F74 @ =gSharedMem + 0x19000 ldrb r2, [r0, 0x2] adds r4, r0, 0 cmp r2, 0x2 @@ -1756,7 +1756,7 @@ sub_8115F58: @ 8115F58 bge _08115F7E b _08116048 .align 2, 0 -_08115F74: .4byte 0x02019000 +_08115F74: .4byte gSharedMem + 0x19000 _08115F78: cmp r2, 0x3 beq _08115FE0 @@ -1989,7 +1989,7 @@ sub_8116100: @ 8116100 bl __umodsi3 lsls r0, 16 lsrs r6, r0, 16 - ldr r3, _0811618C @ =0x02019000 + ldr r3, _0811618C @ =gSharedMem + 0x19000 ldr r1, _08116190 @ =gTasks mov r2, r9 lsls r0, r2, 2 @@ -2033,7 +2033,7 @@ _08116180: b _081161A2 .align 2, 0 _08116188: .4byte gUnknown_083F8ECE -_0811618C: .4byte 0x02019000 +_0811618C: .4byte gSharedMem + 0x19000 _08116190: .4byte gTasks _08116194: .4byte gLocalTime _08116198: @@ -2044,7 +2044,7 @@ _08116198: lsls r0, 25 _081161A2: lsrs r5, r0, 24 - ldr r6, _081162D8 @ =0x02019000 + ldr r6, _081162D8 @ =gSharedMem + 0x19000 ldrb r0, [r6, 0x4] lsls r0, 30 mov r10, r0 @@ -2099,7 +2099,7 @@ _081161D4: ldr r1, _081162E0 @ =0x47800000 bl __addsf3 _0811621A: - ldr r2, _081162E8 @ =0x02019088 + ldr r2, _081162E8 @ =gSharedMem + 0x19088 str r0, [r2] adds r7, r6, 0 adds r7, 0x8C @@ -2187,11 +2187,11 @@ _081162A2: pop {r0} bx r0 .align 2, 0 -_081162D8: .4byte 0x02019000 +_081162D8: .4byte gSharedMem + 0x19000 _081162DC: .4byte gUnknown_083F8DF4 _081162E0: .4byte 0x47800000 _081162E4: .4byte 0x40a00000 -_081162E8: .4byte 0x02019088 +_081162E8: .4byte gSharedMem + 0x19088 _081162EC: .4byte 0x3f000000 _081162F0: .4byte 0x42880000 _081162F4: .4byte 0x00000000 @@ -2206,7 +2206,7 @@ sub_8116308: @ 8116308 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _08116368 @ =0x02019000 + ldr r3, _08116368 @ =gSharedMem + 0x19000 ldrb r1, [r3, 0x3] movs r2, 0x80 orrs r1, r2 @@ -2250,7 +2250,7 @@ sub_8116308: @ 8116308 pop {r0} bx r0 .align 2, 0 -_08116368: .4byte 0x02019000 +_08116368: .4byte gSharedMem + 0x19000 _0811636C: .4byte gSprites _08116370: .4byte sub_81191F4 _08116374: .4byte gTasks @@ -2262,7 +2262,7 @@ sub_811637C: @ 811637C push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _081163B0 @ =0x02019000 + ldr r4, _081163B0 @ =gSharedMem + 0x19000 adds r0, r4, 0 adds r0, 0x7D ldrb r0, [r0] @@ -2286,7 +2286,7 @@ sub_811637C: @ 811637C strb r0, [r4, 0x3] b _08116464 .align 2, 0 -_081163B0: .4byte 0x02019000 +_081163B0: .4byte gSharedMem + 0x19000 _081163B4: ldr r2, _08116428 @ =gTasks lsls r1, r5, 2 @@ -2349,7 +2349,7 @@ _08116420: _08116428: .4byte gTasks _0811642C: .4byte gMain _08116430: - ldr r1, _0811646C @ =0x02019000 + ldr r1, _0811646C @ =gSharedMem + 0x19000 ldrb r0, [r1, 0x1A] lsls r0, 28 lsrs r0, 28 @@ -2377,7 +2377,7 @@ _08116464: pop {r0} bx r0 .align 2, 0 -_0811646C: .4byte 0x02019000 +_0811646C: .4byte gSharedMem + 0x19000 _08116470: .4byte sub_8116474 thumb_func_end sub_811637C @@ -2406,7 +2406,7 @@ sub_8116474: @ 8116474 subs r0, 0x2 strh r0, [r1] _081164A0: - ldr r1, _081164D0 @ =0x02019000 + ldr r1, _081164D0 @ =gSharedMem + 0x19000 ldrh r0, [r1, 0x26] subs r0, 0x4 strh r0, [r1, 0x26] @@ -2429,7 +2429,7 @@ _081164A0: .align 2, 0 _081164C8: .4byte gTasks _081164CC: .4byte gSpriteCoordOffsetX -_081164D0: .4byte 0x02019000 +_081164D0: .4byte gSharedMem + 0x19000 _081164D4: .4byte gSprites _081164D8: .4byte sub_81184CC _081164DC: @@ -2770,7 +2770,7 @@ sub_811677C: @ 811677C lsls r0, 24 lsrs r0, 24 ldr r3, _081167DC @ =gStringVar1 - ldr r6, _081167E0 @ =0x02019000 + ldr r6, _081167E0 @ =gSharedMem + 0x19000 ldrb r2, [r6, 0x19] ldr r1, _081167E4 @ =gTasks lsls r4, r0, 2 @@ -2812,7 +2812,7 @@ sub_811677C: @ 811677C bx r0 .align 2, 0 _081167DC: .4byte gStringVar1 -_081167E0: .4byte 0x02019000 +_081167E0: .4byte gSharedMem + 0x19000 _081167E4: .4byte gTasks _081167E8: .4byte gStringVar4 _081167EC: .4byte gUnknown_081C41BD @@ -2825,7 +2825,7 @@ sub_81167F4: @ 81167F4 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r4, _08116868 @ =0x020190b8 + ldr r4, _08116868 @ =gSharedMem + 0x190B8 ldr r1, _0811686C @ =0x0000ffff adds r0, r4, 0 bl sub_8124D3C @@ -2878,7 +2878,7 @@ sub_81167F4: @ 81167F4 pop {r0} bx r0 .align 2, 0 -_08116868: .4byte 0x020190b8 +_08116868: .4byte gSharedMem + 0x190B8 _0811686C: .4byte 0x0000ffff _08116870: .4byte gSprites _08116874: .4byte gUnknown_083F8C00 @@ -2903,7 +2903,7 @@ sub_8116880: @ 8116880 adds r0, r1 movs r2, 0 strh r5, [r0, 0x10] - ldr r4, _08116958 @ =0x02019000 + ldr r4, _08116958 @ =gSharedMem + 0x19000 ldrb r0, [r4, 0x1A] lsls r0, 28 lsrs r0, 28 @@ -2993,7 +2993,7 @@ _081168E4: b _08116992 .align 2, 0 _08116954: .4byte gTasks -_08116958: .4byte 0x02019000 +_08116958: .4byte gSharedMem + 0x19000 _0811695C: .4byte gSprites _08116960: .4byte 0xfffffc00 _08116964: .4byte 0x000003ff @@ -3081,7 +3081,7 @@ dp01t_12_3_battle_menu: @ 81169F4 movs r0, 0x6 bl sub_81182F8 ldr r7, _08116A88 @ =gSprites - ldr r3, _08116A8C @ =0x0201903c + ldr r3, _08116A8C @ =gSharedMem + 0x1903C movs r6, 0x5 negs r6, r6 _08116A2A: @@ -3130,7 +3130,7 @@ _08116A2A: .align 2, 0 _08116A84: .4byte gTasks _08116A88: .4byte gSprites -_08116A8C: .4byte 0x0201903c +_08116A8C: .4byte gSharedMem + 0x1903C _08116A90: .4byte 0x0000270f _08116A94: .4byte gUnknown_081C4231 _08116A98: .4byte sub_8115734 @@ -3152,7 +3152,7 @@ sub_8116AB0: @ 8116AB0 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _08116AF0 @ =0x020190b8 + ldr r4, _08116AF0 @ =gSharedMem + 0x190B8 ldr r1, _08116AF4 @ =0x0000ffff adds r0, r4, 0 bl sub_8124D3C @@ -3178,7 +3178,7 @@ sub_8116AB0: @ 8116AB0 movs r0, 0x1 b _08116B0C .align 2, 0 -_08116AF0: .4byte 0x020190b8 +_08116AF0: .4byte gSharedMem + 0x190B8 _08116AF4: .4byte 0x0000ffff _08116AF8: .4byte gSaveBlock1 _08116AFC: .4byte gTasks @@ -3225,7 +3225,7 @@ sub_8116B40: @ 8116B40 bne _08116B9E movs r0, 0 bl SetVBlankCallback - ldr r0, _08116BA4 @ =0x02019000 + ldr r0, _08116BA4 @ =gSharedMem + 0x19000 movs r2, 0xBE lsls r2, 1 movs r1, 0 @@ -3257,7 +3257,7 @@ _08116B9E: pop {r0} bx r0 .align 2, 0 -_08116BA4: .4byte 0x02019000 +_08116BA4: .4byte gSharedMem + 0x19000 _08116BA8: .4byte gSpriteCoordOffsetX _08116BAC: .4byte gSpriteCoordOffsetY _08116BB0: .4byte REG_BLDCNT @@ -3271,7 +3271,7 @@ sub_8116BC0: @ 8116BC0 push {r4-r7,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _08116C24 @ =0x02019000 + ldr r0, _08116C24 @ =gSharedMem + 0x19000 adds r7, r0, 0 adds r7, 0xA8 ldrh r1, [r7] @@ -3322,7 +3322,7 @@ _08116C1E: pop {r0} bx r0 .align 2, 0 -_08116C24: .4byte 0x02019000 +_08116C24: .4byte gSharedMem + 0x19000 _08116C28: .4byte gMain _08116C2C: .4byte gTasks _08116C30: .4byte 0x0000ffff @@ -3338,7 +3338,7 @@ sub_8116C34: @ 8116C34 lsrs r4, r2, 16 lsls r3, 16 lsrs r3, 16 - ldr r0, _08116C84 @ =0x02019000 + ldr r0, _08116C84 @ =gSharedMem + 0x19000 mov r12, r0 mov r2, r12 adds r2, 0xB4 @@ -3372,7 +3372,7 @@ _08116C64: strh r4, [r1] b _08116C96 .align 2, 0 -_08116C84: .4byte 0x02019000 +_08116C84: .4byte gSharedMem + 0x19000 _08116C88: .4byte gTasks _08116C8C: .4byte 0x0000ffff _08116C90: @@ -3399,7 +3399,7 @@ sub_8116CAC: @ 8116CAC lsls r0, 24 lsrs r5, r0, 24 movs r2, 0 - ldr r0, _08116CF0 @ =0x02019000 + ldr r0, _08116CF0 @ =gSharedMem + 0x19000 strb r2, [r0] movs r1, 0 strb r1, [r0, 0x3] @@ -3430,14 +3430,14 @@ _08116CC4: pop {r0} bx r0 .align 2, 0 -_08116CF0: .4byte 0x02019000 +_08116CF0: .4byte gSharedMem + 0x19000 _08116CF4: .4byte gTasks thumb_func_end sub_8116CAC thumb_func_start sub_8116CF8 sub_8116CF8: @ 8116CF8 push {lr} - ldr r1, _08116D48 @ =0x02019000 + ldr r1, _08116D48 @ =gSharedMem + 0x19000 movs r0, 0 str r0, [r1, 0x8] movs r2, 0 @@ -3452,7 +3452,7 @@ _08116D06: cmp r2, 0x5 bls _08116D06 movs r2, 0 - ldr r3, _08116D4C @ =0x02019012 + ldr r3, _08116D4C @ =gSharedMem + 0x19012 movs r1, 0 _08116D1A: adds r0, r2, r3 @@ -3463,7 +3463,7 @@ _08116D1A: cmp r2, 0x3 bls _08116D1A movs r2, 0 - ldr r3, _08116D50 @ =0x02019016 + ldr r3, _08116D50 @ =gSharedMem + 0x19016 movs r1, 0 _08116D2E: adds r0, r2, r3 @@ -3479,9 +3479,9 @@ _08116D2E: pop {r0} bx r0 .align 2, 0 -_08116D48: .4byte 0x02019000 -_08116D4C: .4byte 0x02019012 -_08116D50: .4byte 0x02019016 +_08116D48: .4byte gSharedMem + 0x19000 +_08116D4C: .4byte gSharedMem + 0x19012 +_08116D50: .4byte gSharedMem + 0x19016 thumb_func_end sub_8116CF8 thumb_func_start sub_8116D54 @@ -3515,7 +3515,7 @@ sub_8116D54: @ 8116D54 _08116D88: .4byte gUnknown_083F8ED8 _08116D8C: .4byte gUnknown_083F8EE8 _08116D90: - ldr r6, _08116E48 @ =0x02019000 + ldr r6, _08116E48 @ =gSharedMem + 0x19000 ldr r1, _08116E4C @ =gTasks lsls r0, r3, 2 adds r0, r3 @@ -3574,7 +3574,7 @@ _08116DEE: ldr r0, _08116E54 @ =gUnknown_083F8D90 + 0x4 add r0, r12 ldr r7, [r0] - ldr r4, _08116E58 @ =0x02019016 + ldr r4, _08116E58 @ =gSharedMem + 0x19016 mov r5, r9 _08116E04: lsls r0, r2, 2 @@ -3614,11 +3614,11 @@ _08116E38: pop {r1} bx r1 .align 2, 0 -_08116E48: .4byte 0x02019000 +_08116E48: .4byte gSharedMem + 0x19000 _08116E4C: .4byte gTasks _08116E50: .4byte gUnknown_083F8D90 _08116E54: .4byte gUnknown_083F8D90 + 0x4 -_08116E58: .4byte 0x02019016 +_08116E58: .4byte gSharedMem + 0x19016 thumb_func_end sub_8116D54 thumb_func_start sub_8116E5C @@ -3722,7 +3722,7 @@ _08116F1E: lsls r0, 24 lsrs r4, r0, 24 adds r0, r6, 0x5 - ldr r7, _08116F70 @ =0x020190b8 + ldr r7, _08116F70 @ =gSharedMem + 0x190B8 cmp r4, r0 bge _08116F5E adds r1, r7, 0 @@ -3762,7 +3762,7 @@ _08116F5E: bl sub_8124CE8 b _0811713C .align 2, 0 -_08116F70: .4byte 0x020190b8 +_08116F70: .4byte gSharedMem + 0x190B8 _08116F74: .4byte gUnknown_083F8C00 _08116F78: .4byte 0x0000dfff _08116F7C: @@ -3801,51 +3801,51 @@ _08116F9A: bgt _08116FD4 cmp r0, 0x1 beq _08116FE4 - ldr r4, _08116FD0 @ =0x02019000 + ldr r4, _08116FD0 @ =gSharedMem + 0x19000 b _0811703A .align 2, 0 _08116FC8: .4byte gUnknown_083F8E9C _08116FCC: .4byte 0xffff0000 -_08116FD0: .4byte 0x02019000 +_08116FD0: .4byte gSharedMem + 0x19000 _08116FD4: cmp r0, 0x3 beq _0811700C cmp r0, 0x4 beq _08117020 - ldr r4, _08116FE0 @ =0x02019000 + ldr r4, _08116FE0 @ =gSharedMem + 0x19000 b _0811703A .align 2, 0 -_08116FE0: .4byte 0x02019000 +_08116FE0: .4byte gSharedMem + 0x19000 _08116FE4: ldr r3, _08116FF0 @ =gSprites - ldr r2, _08116FF4 @ =0x02019000 + ldr r2, _08116FF4 @ =gSharedMem + 0x19000 adds r0, r2, 0 adds r0, 0x43 b _08117028 .align 2, 0 _08116FF0: .4byte gSprites -_08116FF4: .4byte 0x02019000 +_08116FF4: .4byte gSharedMem + 0x19000 _08116FF8: ldr r3, _08117004 @ =gSprites - ldr r2, _08117008 @ =0x02019000 + ldr r2, _08117008 @ =gSharedMem + 0x19000 adds r0, r2, 0 adds r0, 0x44 b _08117028 .align 2, 0 _08117004: .4byte gSprites -_08117008: .4byte 0x02019000 +_08117008: .4byte gSharedMem + 0x19000 _0811700C: ldr r3, _08117018 @ =gSprites - ldr r2, _0811701C @ =0x02019000 + ldr r2, _0811701C @ =gSharedMem + 0x19000 adds r0, r2, 0 adds r0, 0x45 b _08117028 .align 2, 0 _08117018: .4byte gSprites -_0811701C: .4byte 0x02019000 +_0811701C: .4byte gSharedMem + 0x19000 _08117020: ldr r3, _08117088 @ =gSprites - ldr r2, _0811708C @ =0x02019000 + ldr r2, _0811708C @ =gSharedMem + 0x19000 adds r0, r2, 0 adds r0, 0x46 _08117028: @@ -3897,13 +3897,13 @@ _0811703A: b _08117122 .align 2, 0 _08117088: .4byte gSprites -_0811708C: .4byte 0x02019000 +_0811708C: .4byte gSharedMem + 0x19000 _08117090: .4byte gUnknown_083F8C00 _08117094: movs r4, 0 lsls r0, r6, 2 str r0, [sp, 0x1C] - ldr r1, _0811714C @ =0x02019000 + ldr r1, _0811714C @ =gSharedMem + 0x19000 mov r8, r1 ldr r2, _08117150 @ =gUnknown_083F8C00 mov r9, r2 @@ -3973,7 +3973,7 @@ _0811710E: movs r3, 0 str r3, [sp, 0x18] _08117122: - ldr r0, _08117154 @ =0x020190b8 + ldr r0, _08117154 @ =gSharedMem + 0x190B8 ldr r2, _08117150 @ =gUnknown_083F8C00 ldr r4, [sp, 0x1C] adds r1, r4, r6 @@ -3995,9 +3995,9 @@ _0811713C: pop {r0} bx r0 .align 2, 0 -_0811714C: .4byte 0x02019000 +_0811714C: .4byte gSharedMem + 0x19000 _08117150: .4byte gUnknown_083F8C00 -_08117154: .4byte 0x020190b8 +_08117154: .4byte gSharedMem + 0x190B8 thumb_func_end sub_8116EF8 thumb_func_start sub_8117158 @@ -4010,7 +4010,7 @@ sub_8117158: @ 8117158 sub sp, 0x24 lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _0811719C @ =0x02019000 + ldr r4, _0811719C @ =gSharedMem + 0x19000 movs r0, 0x1 strh r0, [r4, 0x2A] movs r0, 0 @@ -4035,7 +4035,7 @@ sub_8117158: @ 8117158 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811719C: .4byte 0x02019000 +_0811719C: .4byte gSharedMem + 0x19000 _081171A0: .4byte gBGTilemapBuffers + 0x800 _081171A4: .4byte 0xfffff800 _081171A8: .4byte _081171AC @@ -4172,7 +4172,7 @@ _0811727C: ldr r0, _08117374 @ =gBGTilemapBuffers + 0x800 mov r8, r0 ldr r6, [sp, 0x1C] - ldr r1, _08117378 @ =0x020189a0 + ldr r1, _08117378 @ =gSharedMem + 0x189A0 mov r10, r1 _081172C8: mov r1, r12 @@ -4233,7 +4233,7 @@ _081172C8: lsls r0, r1, 1 adds r0, r1 lsls r0, 1 - ldr r1, _0811737C @ =0x020189a4 + ldr r1, _0811737C @ =gSharedMem + 0x189A4 adds r0, r1 ldrh r0, [r0] strh r0, [r2] @@ -4264,8 +4264,8 @@ _08117360: .align 2, 0 _08117370: .4byte gUnknown_083F8C00 _08117374: .4byte gBGTilemapBuffers + 0x800 -_08117378: .4byte 0x020189a0 -_0811737C: .4byte 0x020189a4 +_08117378: .4byte gSharedMem + 0x189A0 +_0811737C: .4byte gSharedMem + 0x189A4 thumb_func_end sub_8117158 thumb_func_start sub_8117380 @@ -4311,7 +4311,7 @@ _081173C6: subs r0, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081173E8 @ =0x02019000 + ldr r0, _081173E8 @ =gSharedMem + 0x19000 adds r0, 0x16 adds r1, r4, r0 ldrb r0, [r1] @@ -4321,12 +4321,12 @@ _081173C6: adds r0, 0x1 b _08117402 .align 2, 0 -_081173E8: .4byte 0x02019000 +_081173E8: .4byte gSharedMem + 0x19000 _081173EC: subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08117408 @ =0x02019000 + ldr r0, _08117408 @ =gSharedMem + 0x19000 adds r0, 0x12 adds r1, r4, r0 ldrb r0, [r1] @@ -4339,9 +4339,9 @@ _08117402: ldrb r0, [r0] b _0811742A .align 2, 0 -_08117408: .4byte 0x02019000 +_08117408: .4byte gSharedMem + 0x19000 _0811740C: - ldr r1, _08117424 @ =0x02019000 + ldr r1, _08117424 @ =gSharedMem + 0x19000 adds r0, r3, 0 adds r0, 0x8 adds r0, r2, r0 @@ -4354,7 +4354,7 @@ _0811740C: ldrb r0, [r0, 0x4] b _0811742A .align 2, 0 -_08117424: .4byte 0x02019000 +_08117424: .4byte gSharedMem + 0x19000 _08117428: movs r0, 0 _0811742A: @@ -4368,7 +4368,7 @@ _0811742A: sub_8117434: @ 8117434 push {r4-r6,lr} ldr r1, _081174AC @ =REG_BG2PA - ldr r4, _081174B0 @ =0x02019000 + ldr r4, _081174B0 @ =gSharedMem + 0x19000 ldrh r0, [r4, 0x2C] strh r0, [r1] adds r1, 0x2 @@ -4428,7 +4428,7 @@ sub_8117434: @ 8117434 bx r0 .align 2, 0 _081174AC: .4byte REG_BG2PA -_081174B0: .4byte 0x02019000 +_081174B0: .4byte gSharedMem + 0x19000 _081174B4: .4byte gSpriteCoordOffsetY _081174B8: .4byte gSpriteCoordOffsetX _081174BC: .4byte REG_BG2X_L @@ -4863,7 +4863,7 @@ sub_8117838: @ 8117838 ldr r0, _08117870 @ =gUnknown_083F9E30 bl LoadSpritePalettes ldr r0, _08117874 @ =gUnknown_083F92A8 - ldr r4, _08117878 @ =0x02017000 + ldr r4, _08117878 @ =gSharedMem + 0x17000 adds r1, r4, 0 bl LZ77UnCompWram ldr r0, _0811787C @ =gUnknown_083F90FC @@ -4881,7 +4881,7 @@ sub_8117838: @ 8117838 .align 2, 0 _08117870: .4byte gUnknown_083F9E30 _08117874: .4byte gUnknown_083F92A8 -_08117878: .4byte 0x02017000 +_08117878: .4byte gSharedMem + 0x17000 _0811787C: .4byte gUnknown_083F90FC _08117880: .4byte gUnknown_083F9D3C _08117884: @@ -4959,7 +4959,7 @@ sub_8117900: @ 8117900 sub sp, 0x8 ldr r4, _08117A50 @ =gUnknown_083F9F54 ldr r0, [r4] - ldr r5, _08117A54 @ =0x02000000 + ldr r5, _08117A54 @ =gSharedMem adds r1, r5, 0 bl LZ77UnCompWram str r5, [sp] @@ -5041,7 +5041,7 @@ _081179A0: cmp r7, 0x2 bls _08117950 movs r7, 0 - ldr r5, _08117A68 @ =0x0201903c + ldr r5, _08117A68 @ =gSharedMem + 0x1903C ldr r4, _08117A60 @ =gSprites _081179BA: lsls r1, r7, 1 @@ -5076,7 +5076,7 @@ _081179BA: cmp r7, 0x3 bls _081179BA movs r7, 0 - ldr r5, _08117A68 @ =0x0201903c + ldr r5, _08117A68 @ =gSharedMem + 0x1903C ldr r4, _08117A60 @ =gSprites _08117A00: lsls r2, r7, 1 @@ -5119,12 +5119,12 @@ _08117A00: bx r0 .align 2, 0 _08117A50: .4byte gUnknown_083F9F54 -_08117A54: .4byte 0x02000000 +_08117A54: .4byte gSharedMem _08117A58: .4byte gUnknown_083F9F5C _08117A5C: .4byte 0x0001903c _08117A60: .4byte gSprites _08117A64: .4byte gSpriteTemplate_83FA07C -_08117A68: .4byte 0x0201903c +_08117A68: .4byte gSharedMem + 0x1903C _08117A6C: .4byte gSpriteTemplate_83F9FD4 _08117A70: .4byte gSpriteTemplate_83FA034 thumb_func_end sub_8117900 @@ -5133,7 +5133,7 @@ _08117A70: .4byte gSpriteTemplate_83FA034 unref_sub_8117A74: @ 8117A74 push {r4,r5,lr} movs r4, 0 - ldr r5, _08117AA0 @ =0x0201903c + ldr r5, _08117AA0 @ =gSharedMem + 0x1903C _08117A7A: adds r0, r4, 0 adds r0, 0x1D @@ -5154,7 +5154,7 @@ _08117A7A: pop {r0} bx r0 .align 2, 0 -_08117AA0: .4byte 0x0201903c +_08117AA0: .4byte gSharedMem + 0x1903C _08117AA4: .4byte gSprites thumb_func_end unref_sub_8117A74 @@ -5175,7 +5175,7 @@ sub_8117AA8: @ 8117AA8 bne _08117BA8 movs r3, 0 ldr r5, _08117AF0 @ =gSprites - ldr r4, _08117AF4 @ =0x0201903c + ldr r4, _08117AF4 @ =gSharedMem + 0x1903C movs r2, 0x4 _08117ACA: adds r0, r3, 0 @@ -5198,12 +5198,12 @@ _08117ACA: b _08117BA8 .align 2, 0 _08117AF0: .4byte gSprites -_08117AF4: .4byte 0x0201903c +_08117AF4: .4byte gSharedMem + 0x1903C _08117AF8: movs r3, 0 ldr r0, _08117B48 @ =gUnknown_083F8D90 mov r12, r0 - ldr r7, _08117B4C @ =0x02019000 + ldr r7, _08117B4C @ =gSharedMem + 0x19000 movs r1, 0x4 add r1, r12 mov r9, r1 @@ -5242,7 +5242,7 @@ _08117B10: b _08117B6E .align 2, 0 _08117B48: .4byte gUnknown_083F8D90 -_08117B4C: .4byte 0x02019000 +_08117B4C: .4byte gSharedMem + 0x19000 _08117B50: .4byte gSprites _08117B54: adds r0, r3, 0 @@ -5267,7 +5267,7 @@ _08117B6E: cmp r3, 0x12 bhi _08117BA8 ldr r6, _08117BB4 @ =gSprites - ldr r4, _08117BB8 @ =0x0201903c + ldr r4, _08117BB8 @ =gSharedMem + 0x1903C movs r5, 0x5 negs r5, r5 _08117B84: @@ -5298,7 +5298,7 @@ _08117BA8: bx r0 .align 2, 0 _08117BB4: .4byte gSprites -_08117BB8: .4byte 0x0201903c +_08117BB8: .4byte gSharedMem + 0x1903C thumb_func_end sub_8117AA8 thumb_func_start sub_8117BBC @@ -5307,7 +5307,7 @@ sub_8117BBC: @ 8117BBC mov r7, r8 push {r7} movs r5, 0 - ldr r0, _08117C50 @ =0x0201903c + ldr r0, _08117C50 @ =gSharedMem + 0x1903C mov r8, r0 ldr r4, _08117C54 @ =gSprites movs r6, 0x4 @@ -5376,7 +5376,7 @@ _08117BCC: pop {r0} bx r0 .align 2, 0 -_08117C50: .4byte 0x0201903c +_08117C50: .4byte gSharedMem + 0x1903C _08117C54: .4byte gSprites _08117C58: .4byte gSpriteTemplate_83FA40C _08117C5C: .4byte sub_81184CC @@ -5397,7 +5397,7 @@ sub_8117C60: @ 8117C60 cmp r0, 0 beq _08117CAC ldr r4, _08117CA4 @ =gSprites - ldr r3, _08117CA8 @ =0x0201903c + ldr r3, _08117CA8 @ =gSharedMem + 0x1903C movs r2, 0x4 _08117C7E: adds r0, r5, 0 @@ -5420,9 +5420,9 @@ _08117C7E: b _08117D58 .align 2, 0 _08117CA4: .4byte gSprites -_08117CA8: .4byte 0x0201903c +_08117CA8: .4byte gSharedMem + 0x1903C _08117CAC: - ldr r0, _08117CEC @ =0x02019000 + ldr r0, _08117CEC @ =gSharedMem + 0x19000 mov r12, r0 ldr r6, _08117CF0 @ =gSprites movs r0, 0x3C @@ -5457,7 +5457,7 @@ _08117CD0: strb r1, [r0] b _08117D4E .align 2, 0 -_08117CEC: .4byte 0x02019000 +_08117CEC: .4byte gSharedMem + 0x19000 _08117CF0: .4byte gSprites _08117CF4: .4byte gUnknown_083F8C00 _08117CF8: @@ -5528,7 +5528,7 @@ sub_8117D68: @ 8117D68 cmp r5, 0 bne _08117D98 ldr r2, _08117D90 @ =gSprites - ldr r0, _08117D94 @ =0x02019000 + ldr r0, _08117D94 @ =gSharedMem + 0x19000 adds r0, 0x6C ldrb r1, [r0] lsls r0, r1, 4 @@ -5543,10 +5543,10 @@ sub_8117D68: @ 8117D68 b _08117DE2 .align 2, 0 _08117D90: .4byte gSprites -_08117D94: .4byte 0x02019000 +_08117D94: .4byte gSharedMem + 0x19000 _08117D98: ldr r4, _08117DE8 @ =gSprites - ldr r3, _08117DEC @ =0x02019000 + ldr r3, _08117DEC @ =gSharedMem + 0x19000 adds r3, 0x6C ldrb r1, [r3] lsls r0, r1, 4 @@ -5588,7 +5588,7 @@ _08117DE2: bx r0 .align 2, 0 _08117DE8: .4byte gSprites -_08117DEC: .4byte 0x02019000 +_08117DEC: .4byte gSharedMem + 0x19000 _08117DF0: .4byte gUnknown_083F8C00 thumb_func_end sub_8117D68 @@ -5600,7 +5600,7 @@ sub_8117DF4: @ 8117DF4 sub sp, 0xC ldr r4, _08117E84 @ =gUnknown_083F9EE8 ldr r0, [r4] - ldr r5, _08117E88 @ =0x02000000 + ldr r5, _08117E88 @ =gSharedMem adds r1, r5, 0 bl LZ77UnCompWram str r5, [sp, 0x4] @@ -5667,7 +5667,7 @@ _08117E30: bx r0 .align 2, 0 _08117E84: .4byte gUnknown_083F9EE8 -_08117E88: .4byte 0x02000000 +_08117E88: .4byte gSharedMem _08117E8C: .4byte 0x0001903c _08117E90: .4byte gSprites _08117E94: .4byte gSpriteTemplate_83FA0DC @@ -5677,7 +5677,7 @@ _08117E94: .4byte gSpriteTemplate_83FA0DC sub_8117E98: @ 8117E98 push {r4-r6,lr} adds r6, r0, 0 - ldr r0, _08117F1C @ =0x02019000 + ldr r0, _08117F1C @ =gSharedMem + 0x19000 ldrh r1, [r6, 0x2E] ldrh r0, [r0, 0x24] adds r1, r0 @@ -5742,7 +5742,7 @@ _08117F04: pop {r0} bx r0 .align 2, 0 -_08117F1C: .4byte 0x02019000 +_08117F1C: .4byte gSharedMem + 0x19000 _08117F20: .4byte 0x00000167 _08117F24: .4byte 0xfffffe98 _08117F28: .4byte gOamMatrices @@ -5755,7 +5755,7 @@ sub_8117F2C: @ 8117F2C push {r7} sub sp, 0x8 movs r5, 0 - ldr r7, _081180C8 @ =0x02000000 + ldr r7, _081180C8 @ =gSharedMem mov r6, sp _08117F3A: ldr r0, _081180CC @ =gUnknown_083FA21C @@ -5789,7 +5789,7 @@ _08117F3A: movs r2, 0x10 movs r3, 0x4 bl CreateSprite - ldr r4, _081180DC @ =0x02019000 + ldr r4, _081180DC @ =gSharedMem + 0x19000 adds r1, r4, 0 adds r1, 0x50 strb r0, [r1] @@ -5851,7 +5851,7 @@ _08117FA2: movs r2, 0x44 movs r3, 0x4 bl CreateSprite - ldr r3, _081180DC @ =0x02019000 + ldr r3, _081180DC @ =gSharedMem + 0x19000 adds r1, r3, 0 adds r1, 0x55 strb r0, [r1] @@ -5913,7 +5913,7 @@ _08118020: movs r2, 0x60 movs r3, 0x9 bl CreateSprite - ldr r3, _081180DC @ =0x02019000 + ldr r3, _081180DC @ =gSharedMem + 0x19000 adds r3, 0x6C strb r0, [r3] ldr r4, _081180E0 @ =gSprites @@ -5953,12 +5953,12 @@ _08118020: pop {r0} bx r0 .align 2, 0 -_081180C8: .4byte 0x02000000 +_081180C8: .4byte gSharedMem _081180CC: .4byte gUnknown_083FA21C _081180D0: .4byte 0xffff0000 _081180D4: .4byte 0x0000ffff _081180D8: .4byte gSpriteTemplate_83FA2B0 -_081180DC: .4byte 0x02019000 +_081180DC: .4byte gSharedMem + 0x19000 _081180E0: .4byte gSprites _081180E4: .4byte gSpriteTemplate_83FA2C8 _081180E8: .4byte gSpriteTemplate_83FA2E0 @@ -5980,7 +5980,7 @@ sub_81180F4: @ 81180F4 mov r8, r0 movs r4, 0 movs r6, 0 - ldr r1, _081181D4 @ =0x02019000 + ldr r1, _081181D4 @ =gSharedMem + 0x19000 mov r9, r1 ldr r0, _081181D8 @ =gSprites mov r10, r0 @@ -6081,7 +6081,7 @@ _081181A2: pop {r0} bx r0 .align 2, 0 -_081181D4: .4byte 0x02019000 +_081181D4: .4byte gSharedMem + 0x19000 _081181D8: .4byte gSprites _081181DC: .4byte gSprites + 0x8 _081181E0: .4byte 0x000003ff @@ -6131,7 +6131,7 @@ _0811822E: subs r0, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08118250 @ =0x02019000 + ldr r0, _08118250 @ =gSharedMem + 0x19000 adds r0, 0x16 adds r1, r4, r0 ldrb r0, [r1] @@ -6141,12 +6141,12 @@ _0811822E: adds r0, 0x1 b _0811826A .align 2, 0 -_08118250: .4byte 0x02019000 +_08118250: .4byte gSharedMem + 0x19000 _08118254: subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08118270 @ =0x02019000 + ldr r0, _08118270 @ =gSharedMem + 0x19000 adds r0, 0x12 adds r1, r4, r0 ldrb r0, [r1] @@ -6159,9 +6159,9 @@ _0811826A: ldrb r0, [r0] b _08118292 .align 2, 0 -_08118270: .4byte 0x02019000 +_08118270: .4byte gSharedMem + 0x19000 _08118274: - ldr r1, _0811828C @ =0x02019000 + ldr r1, _0811828C @ =gSharedMem + 0x19000 adds r0, r3, 0 adds r0, 0x8 adds r0, r2, r0 @@ -6174,7 +6174,7 @@ _08118274: ldrb r0, [r0, 0x4] b _08118292 .align 2, 0 -_0811828C: .4byte 0x02019000 +_0811828C: .4byte gSharedMem + 0x19000 _08118290: movs r0, 0 _08118292: @@ -6189,7 +6189,7 @@ sub_811829C: @ 811829C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081182E8 @ =0x02019000 + ldr r1, _081182E8 @ =gSharedMem + 0x19000 adds r1, 0x55 ldrb r2, [r1] lsls r1, r2, 4 @@ -6223,7 +6223,7 @@ sub_811829C: @ 811829C pop {r0} bx r0 .align 2, 0 -_081182E8: .4byte 0x02019000 +_081182E8: .4byte gSharedMem + 0x19000 _081182EC: .4byte gSprites _081182F0: .4byte 0x000003ff _081182F4: .4byte 0xfffffc00 @@ -6237,7 +6237,7 @@ sub_81182F8: @ 81182F8 lsls r0, 24 lsrs r2, r0, 24 movs r5, 0 - ldr r0, _08118320 @ =0x02019000 + ldr r0, _08118320 @ =gSharedMem + 0x19000 ldrb r1, [r0, 0x19] adds r3, r0, 0 cmp r1, 0x1 @@ -6254,7 +6254,7 @@ _08118316: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08118320: .4byte 0x02019000 +_08118320: .4byte gSharedMem + 0x19000 _08118324: .4byte _08118328 .align 2, 0 _08118328: @@ -6268,7 +6268,7 @@ _08118328: _08118344: movs r4, 0 ldr r5, _081183A8 @ =gSprites - ldr r0, _081183AC @ =0x0201903c + ldr r0, _081183AC @ =gSharedMem + 0x1903C mov r8, r0 movs r2, 0x5 negs r2, r2 @@ -6319,7 +6319,7 @@ _08118358: b _081184B2 .align 2, 0 _081183A8: .4byte gSprites -_081183AC: .4byte 0x0201903c +_081183AC: .4byte gSharedMem + 0x1903C _081183B0: .4byte 0xfffffc00 _081183B4: .4byte 0x000003ff _081183B8: @@ -6417,7 +6417,7 @@ _08118464: movs r4, 0 lsls r6, r5, 2 ldr r5, _081184BC @ =gSprites - ldr r0, _081184C0 @ =0x0201903c + ldr r0, _081184C0 @ =gSharedMem + 0x1903C mov r8, r0 adds r7, r5, 0 adds r7, 0x8 @@ -6462,19 +6462,19 @@ _081184B2: bx r0 .align 2, 0 _081184BC: .4byte gSprites -_081184C0: .4byte 0x0201903c +_081184C0: .4byte gSharedMem + 0x1903C _081184C4: .4byte 0xfffffc00 _081184C8: .4byte 0x000003ff thumb_func_end sub_81182F8 thumb_func_start sub_81184CC sub_81184CC: @ 81184CC - ldr r1, _081184D4 @ =0x02019000 + ldr r1, _081184D4 @ =gSharedMem + 0x19000 ldrh r1, [r1, 0x26] strh r1, [r0, 0x24] bx lr .align 2, 0 -_081184D4: .4byte 0x02019000 +_081184D4: .4byte gSharedMem + 0x19000 thumb_func_end sub_81184CC thumb_func_start sub_81184D8 @@ -6483,7 +6483,7 @@ sub_81184D8: @ 81184D8 sub sp, 0x8 ldr r4, _08118544 @ =gUnknown_083FA42C ldr r0, [r4] - ldr r5, _08118548 @ =0x02000000 + ldr r5, _08118548 @ =gSharedMem adds r1, r5, 0 bl LZ77UnCompWram str r5, [sp] @@ -6532,7 +6532,7 @@ sub_81184D8: @ 81184D8 bx r0 .align 2, 0 _08118544: .4byte gUnknown_083FA42C -_08118548: .4byte 0x02000000 +_08118548: .4byte gSharedMem _0811854C: .4byte gSpriteTemplate_83FA434 _08118550: .4byte gSprites thumb_func_end sub_81184D8 @@ -6545,7 +6545,7 @@ sub_8118554: @ 8118554 ldr r1, _08118574 @ =gOamMatrices lsls r0, 3 adds r0, r1 - ldr r2, _08118578 @ =0x02019000 + ldr r2, _08118578 @ =gSharedMem + 0x19000 ldrh r1, [r2, 0x2C] strh r1, [r0, 0x6] ldrh r1, [r2, 0x2C] @@ -6557,14 +6557,14 @@ sub_8118554: @ 8118554 bx lr .align 2, 0 _08118574: .4byte gOamMatrices -_08118578: .4byte 0x02019000 +_08118578: .4byte gSharedMem + 0x19000 thumb_func_end sub_8118554 thumb_func_start sub_811857C sub_811857C: @ 811857C push {r4-r6,lr} movs r4, 0 - ldr r6, _081185DC @ =0x0201903c + ldr r6, _081185DC @ =gSharedMem + 0x1903C ldr r5, _081185E0 @ =gSprites _08118584: movs r3, 0x39 @@ -6611,7 +6611,7 @@ _081185CA: pop {r0} bx r0 .align 2, 0 -_081185DC: .4byte 0x0201903c +_081185DC: .4byte gSharedMem + 0x1903C _081185E0: .4byte gSprites _081185E4: .4byte gSpriteTemplate_83FA40C thumb_func_end sub_811857C @@ -6623,7 +6623,7 @@ sub_81185E8: @ 81185E8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08118660 @ =0x02019000 + ldr r0, _08118660 @ =gSharedMem + 0x19000 adds r0, 0x3C ldrb r5, [r0] movs r6, 0 @@ -6680,7 +6680,7 @@ _08118632: pop {r0} bx r0 .align 2, 0 -_08118660: .4byte 0x02019000 +_08118660: .4byte gSharedMem + 0x19000 _08118664: .4byte gSprites _08118668: .4byte SpriteCallbackDummy thumb_func_end sub_81185E8 @@ -6689,7 +6689,7 @@ _08118668: .4byte SpriteCallbackDummy sub_811866C: @ 811866C push {r4,r5,lr} adds r3, r0, 0 - ldr r0, _0811869C @ =0x02019000 + ldr r0, _0811869C @ =gSharedMem + 0x19000 ldrh r4, [r0, 0x24] movs r2, 0x24 ldrsh r1, [r0, r2] @@ -6711,7 +6711,7 @@ sub_811866C: @ 811866C adds r0, r2, r5 b _081186AA .align 2, 0 -_0811869C: .4byte 0x02019000 +_0811869C: .4byte gSharedMem + 0x19000 _081186A0: .4byte 0x01670000 _081186A4: .4byte 0xfffffe98 _081186A8: @@ -6730,7 +6730,7 @@ _081186AC: sub_81186B8: @ 81186B8 push {r4,lr} bl sub_811866C - ldr r4, _081186E0 @ =0x02019000 + ldr r4, _081186E0 @ =gSharedMem + 0x19000 lsls r0, 16 asrs r0, 16 bl __floatsisf @@ -6744,7 +6744,7 @@ sub_81186B8: @ 81186B8 pop {r1} bx r1 .align 2, 0 -_081186E0: .4byte 0x02019000 +_081186E0: .4byte gSharedMem + 0x19000 _081186E4: .4byte 0x41f00000 thumb_func_end sub_81186B8 @@ -6790,7 +6790,7 @@ sub_8118724: @ 8118724 mov r7, r8 push {r7} adds r6, r0, 0 - ldr r5, _08118770 @ =0x02019000 + ldr r5, _08118770 @ =gSharedMem + 0x19000 adds r4, r5, 0 adds r4, 0x8C adds r1, r5, 0 @@ -6820,7 +6820,7 @@ sub_8118724: @ 8118724 str r0, [r2] b _08118790 .align 2, 0 -_08118770: .4byte 0x02019000 +_08118770: .4byte gSharedMem + 0x19000 _08118774: .4byte 0x43b40000 _08118778: ldr r1, _08118824 @ =0x00000000 @@ -6910,7 +6910,7 @@ _08118830: .4byte gMPlay_SE2 sub_8118834: @ 8118834 push {r4,r5,lr} adds r5, r0, 0 - ldr r1, _0811888C @ =0x02019000 + ldr r1, _0811888C @ =gSharedMem + 0x19000 ldrh r0, [r5, 0x3A] ldrh r1, [r1, 0x24] adds r2, r0, r1 @@ -6952,7 +6952,7 @@ _08118850: pop {r0} bx r0 .align 2, 0 -_0811888C: .4byte 0x02019000 +_0811888C: .4byte gSharedMem + 0x19000 _08118890: .4byte 0x01670000 _08118894: .4byte 0xfffffe98 _08118898: .4byte gSpriteCoordOffsetY @@ -6995,7 +6995,7 @@ _081188CE: ldrsh r0, [r5, r1] cmp r0, 0 bne _08118908 - ldr r6, _08118900 @ =0x02019000 + ldr r6, _08118900 @ =gSharedMem + 0x19000 adds r4, r6, 0 adds r4, 0x94 adds r0, r6, 0 @@ -7010,10 +7010,10 @@ _081188CE: bgt _0811898E b _08118926 .align 2, 0 -_08118900: .4byte 0x02019000 +_08118900: .4byte gSharedMem + 0x19000 _08118904: .4byte 0x40000000 _08118908: - ldr r6, _08118994 @ =0x02019000 + ldr r6, _08118994 @ =gSharedMem + 0x19000 adds r4, r6, 0 adds r4, 0x94 adds r0, r6, 0 @@ -7079,7 +7079,7 @@ _0811898E: pop {r0} bx r0 .align 2, 0 -_08118994: .4byte 0x02019000 +_08118994: .4byte gSharedMem + 0x19000 _08118998: .4byte 0x40000000 _0811899C: .4byte sub_8118834 _081189A0: .4byte 0x00000000 @@ -7115,7 +7115,7 @@ _081189D0: mov r8, r0 ldr r0, _08118A24 @ =gUnknown_083F8DF4 mov r9, r0 - ldr r1, _08118A28 @ =0x02019000 + ldr r1, _08118A28 @ =gSharedMem + 0x19000 mov r10, r1 ldrb r4, [r1, 0x4] lsls r4, 30 @@ -7146,7 +7146,7 @@ _081189D0: b _08118A8A .align 2, 0 _08118A24: .4byte gUnknown_083F8DF4 -_08118A28: .4byte 0x02019000 +_08118A28: .4byte gSharedMem + 0x19000 _08118A2C: movs r1, 0x2E ldrsh r0, [r7, r1] @@ -7158,7 +7158,7 @@ _08118A2C: mov r8, r0 ldr r0, _08118B1C @ =gUnknown_083F8DF4 mov r9, r0 - ldr r1, _08118B20 @ =0x02019000 + ldr r1, _08118B20 @ =gSharedMem + 0x19000 mov r10, r1 ldrb r4, [r1, 0x4] lsls r4, 30 @@ -7257,7 +7257,7 @@ _08118B0C: bx r0 .align 2, 0 _08118B1C: .4byte gUnknown_083F8DF4 -_08118B20: .4byte 0x02019000 +_08118B20: .4byte gSharedMem + 0x19000 _08118B24: .4byte 0x40000000 _08118B28: .4byte 0x00000000 _08118B2C: .4byte sub_811889C @@ -7289,7 +7289,7 @@ sub_8118B30: @ 8118B30 lsls r0, r1, 16 cmp r0, 0 blt _08118BC6 - ldr r4, _08118BD0 @ =0x02019000 + ldr r4, _08118BD0 @ =gSharedMem + 0x19000 adds r1, r4, 0 adds r1, 0x7D movs r0, 0xFF @@ -7337,7 +7337,7 @@ _08118BC6: bx r0 .align 2, 0 _08118BCC: .4byte 0x3d4ccccd -_08118BD0: .4byte 0x02019000 +_08118BD0: .4byte gSharedMem + 0x19000 _08118BD4: .4byte sub_8118834 thumb_func_end sub_8118B30 @@ -7360,7 +7360,7 @@ sub_8118BD8: @ 8118BD8 cmp r0, 0x2D bne _08118CA2 ldr r2, _08118C14 @ =gSprites - ldr r0, _08118C18 @ =0x02019000 + ldr r0, _08118C18 @ =gSharedMem + 0x19000 adds r0, 0x73 ldrb r1, [r0] lsls r0, r1, 4 @@ -7375,7 +7375,7 @@ sub_8118BD8: @ 8118BD8 b _08118CA2 .align 2, 0 _08118C14: .4byte gSprites -_08118C18: .4byte 0x02019000 +_08118C18: .4byte gSharedMem + 0x19000 _08118C1C: lsls r0, r1, 16 asrs r0, 16 @@ -7384,7 +7384,7 @@ _08118C1C: cmp r0, r1 bge _08118C68 ldr r2, _08118C58 @ =gSprites - ldr r0, _08118C5C @ =0x02019000 + ldr r0, _08118C5C @ =gSharedMem + 0x19000 adds r0, 0x73 ldrb r1, [r0] lsls r0, r1, 4 @@ -7408,7 +7408,7 @@ _08118C1C: b _08118CA2 .align 2, 0 _08118C58: .4byte gSprites -_08118C5C: .4byte 0x02019000 +_08118C5C: .4byte gSharedMem + 0x19000 _08118C60: ldrh r0, [r3, 0x26] subs r0, 0x1 @@ -7494,7 +7494,7 @@ sub_8118CEC: @ 8118CEC push {r4,lr} adds r4, r0, 0 bl sub_8118724 - ldr r0, _08118D10 @ =0x02019000 + ldr r0, _08118D10 @ =gSharedMem + 0x19000 ldrb r0, [r0, 0x3] lsls r0, 27 lsrs r0, 27 @@ -7508,7 +7508,7 @@ _08118D04: ldr r0, _08118D14 @ =sub_81189A8 b _08118D20 .align 2, 0 -_08118D10: .4byte 0x02019000 +_08118D10: .4byte gSharedMem + 0x19000 _08118D14: .4byte sub_81189A8 _08118D18: adds r0, r4, 0 @@ -7535,7 +7535,7 @@ sub_8118D2C: @ 8118D2C asrs r0, 16 cmp r0, 0xF bne _08118D50 - ldr r4, _08118DB8 @ =0x02019000 + ldr r4, _08118DB8 @ =gSharedMem + 0x19000 adds r4, 0x98 ldr r0, [r4] ldr r1, _08118DBC @ =0xbf800000 @@ -7550,7 +7550,7 @@ _08118D50: ldrsh r0, [r5, r1] cmp r0, 0 bne _08118DC4 - ldr r1, _08118DB8 @ =0x02019000 + ldr r1, _08118DB8 @ =gSharedMem + 0x19000 adds r2, r1, 0 adds r2, 0x7D movs r0, 0xFF @@ -7590,7 +7590,7 @@ _08118D50: bl m4aSongNumStartOrChange b _08118DDC .align 2, 0 -_08118DB8: .4byte 0x02019000 +_08118DB8: .4byte gSharedMem + 0x19000 _08118DBC: .4byte 0xbf800000 _08118DC0: .4byte sub_8118834 _08118DC4: @@ -7623,7 +7623,7 @@ sub_8118DE4: @ 8118DE4 adds r0, r7, 0 bl sub_81186B8 ldr r1, _08118E70 @ =gUnknown_083F8D90 - ldr r6, _08118E74 @ =0x02019000 + ldr r6, _08118E74 @ =gSharedMem + 0x19000 movs r0, 0x7E adds r0, r6 mov r8, r0 @@ -7676,7 +7676,7 @@ sub_8118DE4: @ 8118DE4 b _08118F74 .align 2, 0 _08118E70: .4byte gUnknown_083F8D90 -_08118E74: .4byte 0x02019000 +_08118E74: .4byte gSharedMem + 0x19000 _08118E78: .4byte sub_8118834 _08118E7C: movs r0, 0x38 @@ -7738,7 +7738,7 @@ _08118EF4: lsls r1, r2, 3 adds r0, 0x4 adds r1, r0 - ldr r2, _08118F24 @ =0x02019000 + ldr r2, _08118F24 @ =gSharedMem + 0x19000 ldr r1, [r1] ldr r0, [r2, 0x8] ands r1, r0 @@ -7756,7 +7756,7 @@ _08118EF4: .align 2, 0 _08118F1C: .4byte gUnknown_083F8DF4 _08118F20: .4byte gUnknown_083F8D90 -_08118F24: .4byte 0x02019000 +_08118F24: .4byte gSharedMem + 0x19000 _08118F28: strh r1, [r7, 0x2E] ldrb r1, [r2, 0x4] @@ -7821,7 +7821,7 @@ sub_8118F8C: @ 8118F8C push {r6,r7} adds r6, r0, 0 bl sub_8118724 - ldr r5, _08119018 @ =0x02019000 + ldr r5, _08119018 @ =gSharedMem + 0x19000 movs r0, 0x8C adds r0, r5 mov r8, r0 @@ -7878,7 +7878,7 @@ _08118FEC: str r0, [r6, 0x1C] b _0811906E .align 2, 0 -_08119018: .4byte 0x02019000 +_08119018: .4byte gSharedMem + 0x19000 _0811901C: .4byte 0x3f000000 _08119020: .4byte 0x00000000 _08119024: .4byte gUnknown_083F8DF4 @@ -7929,7 +7929,7 @@ sub_8119088: @ 8119088 push {r4-r7,lr} adds r6, r0, 0 bl sub_8118724 - ldr r5, _08119120 @ =0x02019000 + ldr r5, _08119120 @ =gSharedMem + 0x19000 adds r0, r5, 0 adds r0, 0x94 ldr r0, [r0] @@ -7996,7 +7996,7 @@ _0811911A: pop {r0} bx r0 .align 2, 0 -_08119120: .4byte 0x02019000 +_08119120: .4byte gSharedMem + 0x19000 _08119124: .4byte 0x42200000 _08119128: .4byte 0x47800000 _0811912C: .4byte 0x40800000 @@ -8008,7 +8008,7 @@ sub_8119134: @ 8119134 push {r4-r7,lr} adds r6, r0, 0 bl sub_8118724 - ldr r4, _081191DC @ =0x02019000 + ldr r4, _081191DC @ =gSharedMem + 0x19000 adds r0, r4, 0 adds r0, 0x94 ldr r0, [r0] @@ -8081,7 +8081,7 @@ _081191D4: pop {r0} bx r0 .align 2, 0 -_081191DC: .4byte 0x02019000 +_081191DC: .4byte gSharedMem + 0x19000 _081191E0: .4byte 0x42700000 _081191E4: .4byte 0x47800000 _081191E8: .4byte 0x41a00000 @@ -8133,7 +8133,7 @@ sub_8119224: @ 8119224 lsls r0, 16 lsrs r0, 16 mov r9, r0 - ldr r5, _081193BC @ =0x02019000 + ldr r5, _081193BC @ =gSharedMem + 0x19000 ldr r0, _081193C0 @ =gSpriteTemplate_83FA50C movs r2, 0xC negs r2, r2 @@ -8318,7 +8318,7 @@ _081192BE: bx r0 .align 2, 0 _081193B8: .4byte gUnknown_083FA60E -_081193BC: .4byte 0x02019000 +_081193BC: .4byte gSharedMem + 0x19000 _081193C0: .4byte gSpriteTemplate_83FA50C _081193C4: .4byte gSpriteTemplate_83FA5C0 _081193C8: .4byte gSprites @@ -8360,7 +8360,7 @@ sub_81193D4: @ 81193D4 ldrsh r2, [r2, r3] movs r3, 0x32 bl CreateSprite - ldr r6, _0811951C @ =0x02019000 + ldr r6, _0811951C @ =gSharedMem + 0x19000 adds r1, r6, 0 adds r1, 0x73 strb r0, [r1] @@ -8487,7 +8487,7 @@ _081194A2: .align 2, 0 _08119514: .4byte gUnknown_083FA616 _08119518: .4byte gSpriteTemplate_83FA524 -_0811951C: .4byte 0x02019000 +_0811951C: .4byte gSharedMem + 0x19000 _08119520: .4byte gSprites _08119524: .4byte gSpriteTemplate_83FA5F0 _08119528: .4byte gUnknown_083F8DF4 @@ -8516,7 +8516,7 @@ sub_811952C: @ 811952C lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x10] - ldr r7, _08119610 @ =0x02019000 + ldr r7, _08119610 @ =gSharedMem + 0x19000 adds r0, r7, 0 adds r0, 0x7D movs r6, 0x1 @@ -8590,7 +8590,7 @@ _081195D4: cmp r5, 0x3 bls _081195C8 _081195EA: - ldr r0, _08119610 @ =0x02019000 + ldr r0, _08119610 @ =gSharedMem + 0x19000 ldrb r1, [r0, 0x3] movs r0, 0x1F ands r0, r1 @@ -8608,14 +8608,14 @@ _081195EA: bl PlayCry1 b _08119670 .align 2, 0 -_08119610: .4byte 0x02019000 +_08119610: .4byte gSharedMem + 0x19000 _08119614: .4byte 0x00000000 _08119618: .4byte gUnknown_083F8DF4 _0811961C: movs r0, 0x1 mov r3, r8 strh r0, [r3, 0x2E] - ldr r2, _08119634 @ =0x02019000 + ldr r2, _08119634 @ =gSharedMem + 0x19000 ldrb r1, [r2, 0x3] subs r0, 0x21 ands r0, r1 @@ -8624,12 +8624,12 @@ _0811961C: strb r0, [r2, 0x3] b _081195EA .align 2, 0 -_08119634: .4byte 0x02019000 +_08119634: .4byte gSharedMem + 0x19000 _08119638: lsrs r0, r5, 1 mov r1, r8 strh r0, [r1, 0x2E] - ldr r3, _08119654 @ =0x02019000 + ldr r3, _08119654 @ =gSharedMem + 0x19000 movs r1, 0x1 ands r1, r5 ldrb r2, [r3, 0x3] @@ -8640,7 +8640,7 @@ _08119638: strb r0, [r3, 0x3] b _081195EA .align 2, 0 -_08119654: .4byte 0x02019000 +_08119654: .4byte gSharedMem + 0x19000 _08119658: movs r0, 0x98 lsls r0, 1 @@ -8655,7 +8655,7 @@ _08119664: bl PlayCry1 _08119670: movs r5, 0x2 - ldr r4, _081196A0 @ =0x02019000 + ldr r4, _081196A0 @ =gSharedMem + 0x19000 adds r0, r4, 0 adds r0, 0x7F ldrb r0, [r0] @@ -8678,7 +8678,7 @@ _08119670: adds r0, 0x6 b _081196A8 .align 2, 0 -_081196A0: .4byte 0x02019000 +_081196A0: .4byte gSharedMem + 0x19000 _081196A4: mov r2, r9 adds r0, r2, r5 @@ -8688,7 +8688,7 @@ _081196A8: mov r9, r0 cmp r5, r9 bcs _0811970E - ldr r6, _08119734 @ =0x02019000 + ldr r6, _08119734 @ =gSharedMem + 0x19000 ldr r7, _08119738 @ =gUnknown_083F8C00 + 0xC _081196B6: lsls r0, r3, 3 @@ -8712,7 +8712,7 @@ _081196B6: ldrb r0, [r6, 0x1A] lsls r0, 28 lsrs r0, 28 - ldr r1, _08119740 @ =0x0201901b + ldr r1, _08119740 @ =gSharedMem + 0x1901B adds r0, r1 ldrb r1, [r0] lsls r0, r1, 2 @@ -8756,10 +8756,10 @@ _0811970E: strh r2, [r0, 0x3C] b _08119766 .align 2, 0 -_08119734: .4byte 0x02019000 +_08119734: .4byte gSharedMem + 0x19000 _08119738: .4byte gUnknown_083F8C00 + 0xC _0811973C: .4byte gUnknown_083F8D90 + 0x4 -_08119740: .4byte 0x0201901b +_08119740: .4byte gSharedMem + 0x1901B _08119744: ldr r0, [sp, 0x10] mov r1, r10 @@ -8815,7 +8815,7 @@ sub_8119780: @ 8119780 negs r1, r1 cmp r0, r1 bge _081197CA - ldr r4, _081197D0 @ =0x02019000 + ldr r4, _081197D0 @ =gSharedMem + 0x19000 ldrb r1, [r4, 0x3] movs r0, 0x40 ands r0, r1 @@ -8837,7 +8837,7 @@ _081197CA: pop {r0} bx r0 .align 2, 0 -_081197D0: .4byte 0x02019000 +_081197D0: .4byte gSharedMem + 0x19000 _081197D4: .4byte gUnknown_083FA61E thumb_func_end sub_8119780 @@ -8913,7 +8913,7 @@ _0811985C: movs r0, 0 strh r0, [r1] ldr r2, _08119890 @ =gSprites - ldr r0, _08119894 @ =0x02019000 + ldr r0, _08119894 @ =gSharedMem + 0x19000 adds r0, 0x73 ldrb r1, [r0] lsls r0, r1, 4 @@ -8936,7 +8936,7 @@ _08119884: .align 2, 0 _0811988C: .4byte gSpriteCoordOffsetY _08119890: .4byte gSprites -_08119894: .4byte 0x02019000 +_08119894: .4byte gSharedMem + 0x19000 thumb_func_end sub_81197D8 thumb_func_start sub_8119898 @@ -8956,7 +8956,7 @@ sub_8119898: @ 8119898 bl __mulsf3 bl __fixsfsi strh r0, [r5, 0x26] - ldr r3, _0811994C @ =0x02019000 + ldr r3, _0811994C @ =gSharedMem + 0x19000 ldr r2, _08119950 @ =gUnknown_083FA61E ldrb r0, [r3, 0x1] subs r0, 0x1 @@ -9027,7 +9027,7 @@ _08119940: bx r0 .align 2, 0 _08119948: .4byte 0x3d1fbe77 -_0811994C: .4byte 0x02019000 +_0811994C: .4byte gSharedMem + 0x19000 _08119950: .4byte gUnknown_083FA61E _08119954: .4byte sub_8119780 _08119958: .4byte gSprites @@ -9043,7 +9043,7 @@ sub_8119964: @ 8119964 ldrsh r0, [r4, r1] cmp r0, 0 bne _081199E4 - ldr r3, _08119990 @ =0x02019000 + ldr r3, _08119990 @ =gSharedMem + 0x19000 ldr r1, [r3, 0x38] movs r2, 0x2E ldrsh r0, [r1, r2] @@ -9059,7 +9059,7 @@ sub_8119964: @ 8119964 ldrh r0, [r0, 0x8] b _081199AA .align 2, 0 -_08119990: .4byte 0x02019000 +_08119990: .4byte gSharedMem + 0x19000 _08119994: .4byte gUnknown_083F8DF4 _08119998: movs r0, 0x34 @@ -9086,7 +9086,7 @@ _081199AA: strh r0, [r4, 0x3C] movs r0, 0x2B bl m4aSongNumStart - ldr r1, _081199DC @ =0x02019000 + ldr r1, _081199DC @ =gSharedMem + 0x19000 movs r0, 0x1 strb r0, [r1, 0x1] ldr r0, _081199E0 @ =gUnknown_083FA61E @@ -9095,10 +9095,10 @@ _081199AA: b _08119A78 .align 2, 0 _081199D8: .4byte gUnknown_083F8DF4 -_081199DC: .4byte 0x02019000 +_081199DC: .4byte gSharedMem + 0x19000 _081199E0: .4byte gUnknown_083FA61E _081199E4: - ldr r3, _08119A20 @ =0x02019000 + ldr r3, _08119A20 @ =gSharedMem + 0x19000 ldr r2, _08119A24 @ =gUnknown_083FA61E ldrb r0, [r3, 0x1] subs r0, 0x1 @@ -9130,7 +9130,7 @@ _08119A04: ldrh r0, [r0, 0xA] b _08119A3E .align 2, 0 -_08119A20: .4byte 0x02019000 +_08119A20: .4byte gSharedMem + 0x19000 _08119A24: .4byte gUnknown_083FA61E _08119A28: .4byte gUnknown_083F8DF4 _08119A2C: @@ -9234,7 +9234,7 @@ _08119AC4: adds r0, r4, 0 bl DestroySprite ldr r5, _08119B1C @ =gSprites - ldr r4, _08119B20 @ =0x02019000 + ldr r4, _08119B20 @ =gSharedMem + 0x19000 adds r4, 0x74 ldrb r1, [r4] lsls r0, r1, 4 @@ -9258,7 +9258,7 @@ _08119B12: .align 2, 0 _08119B18: .4byte SpriteCallbackDummy _08119B1C: .4byte gSprites -_08119B20: .4byte 0x02019000 +_08119B20: .4byte gSharedMem + 0x19000 thumb_func_end sub_8119AAC thumb_func_start sub_8119B24 @@ -9317,7 +9317,7 @@ _08119B7C: _08119B84: movs r0, 0x2B bl m4aSongNumStart - ldr r0, _08119BC0 @ =0x02019000 + ldr r0, _08119BC0 @ =gSharedMem + 0x19000 ldr r0, [r0, 0x38] ldrh r1, [r0, 0x2E] adds r1, 0x4 @@ -9344,7 +9344,7 @@ _08119BB8: pop {r0} bx r0 .align 2, 0 -_08119BC0: .4byte 0x02019000 +_08119BC0: .4byte gSharedMem + 0x19000 _08119BC4: .4byte sub_8119AAC _08119BC8: .4byte gSprites thumb_func_end sub_8119B24 @@ -9370,7 +9370,7 @@ sub_8119BCC: @ 8119BCC asrs r0, 16 cmp r0, 0x7 ble _08119C5C - ldr r0, _08119C4C @ =0x02019000 + ldr r0, _08119C4C @ =gSharedMem + 0x19000 ldr r0, [r0, 0x38] movs r1, 0x2E ldrsh r0, [r0, r1] @@ -9409,7 +9409,7 @@ sub_8119BCC: @ 8119BCC .align 2, 0 _08119C44: .4byte gUnknown_083FA64A _08119C48: .4byte gUnknown_083FA64C -_08119C4C: .4byte 0x02019000 +_08119C4C: .4byte gSharedMem + 0x19000 _08119C50: .4byte gMPlay_SE1 _08119C54: .4byte 0x0000ffff _08119C58: .4byte gMPlay_SE2 @@ -9417,7 +9417,7 @@ _08119C5C: lsls r0, r1, 16 cmp r0, 0 blt _08119CAC - ldr r0, _08119CA8 @ =0x02019000 + ldr r0, _08119CA8 @ =gSharedMem + 0x19000 ldr r0, [r0, 0x38] movs r2, 0x2E ldrsh r0, [r0, r2] @@ -9452,11 +9452,11 @@ _08119C5C: strh r0, [r4, 0x22] b _08119CF6 .align 2, 0 -_08119CA8: .4byte 0x02019000 +_08119CA8: .4byte gSharedMem + 0x19000 _08119CAC: movs r0, 0x5E bl m4aSongNumStartOrChange - ldr r0, _08119CCC @ =0x02019000 + ldr r0, _08119CCC @ =gSharedMem + 0x19000 ldr r0, [r0, 0x38] movs r2, 0x2E ldrsh r0, [r0, r2] @@ -9468,7 +9468,7 @@ _08119CAC: bl PlayCry1 b _08119CDC .align 2, 0 -_08119CCC: .4byte 0x02019000 +_08119CCC: .4byte gSharedMem + 0x19000 _08119CD0: movs r0, 0x98 lsls r0, 1 @@ -9476,7 +9476,7 @@ _08119CD0: negs r1, r1 bl PlayCry1 _08119CDC: - ldr r0, _08119D00 @ =0x02019000 + ldr r0, _08119D00 @ =gSharedMem + 0x19000 ldr r0, [r0, 0x38] ldrh r1, [r0, 0x2E] adds r1, 0x2 @@ -9494,7 +9494,7 @@ _08119CF6: pop {r0} bx r0 .align 2, 0 -_08119D00: .4byte 0x02019000 +_08119D00: .4byte gSharedMem + 0x19000 _08119D04: .4byte sub_8119B24 thumb_func_end sub_8119BCC @@ -9513,7 +9513,7 @@ sub_8119D08: @ 8119D08 lsls r0, 16 cmp r0, 0 blt _08119D70 - ldr r0, _08119D68 @ =0x02019000 + ldr r0, _08119D68 @ =gSharedMem + 0x19000 ldr r0, [r0, 0x38] movs r1, 0x2E ldrsh r0, [r0, r1] @@ -9547,7 +9547,7 @@ sub_8119D08: @ 8119D08 b _08119D74 .align 2, 0 _08119D64: .4byte gUnknown_083FA64A -_08119D68: .4byte 0x02019000 +_08119D68: .4byte gSharedMem + 0x19000 _08119D6C: .4byte gSprites _08119D70: ldr r0, _08119D7C @ =sub_8119A90 @@ -9565,7 +9565,7 @@ _08119D7C: .4byte sub_8119A90 sub_8119D80: @ 8119D80 push {r4,lr} adds r4, r0, 0 - ldr r3, _08119DB8 @ =0x02019000 + ldr r3, _08119DB8 @ =gSharedMem + 0x19000 ldr r1, [r3, 0x38] movs r2, 0x2E ldrsh r0, [r1, r2] @@ -9592,7 +9592,7 @@ sub_8119D80: @ 8119D80 movs r3, 0x34 b _08119DEE .align 2, 0 -_08119DB8: .4byte 0x02019000 +_08119DB8: .4byte gSharedMem + 0x19000 _08119DBC: .4byte gUnknown_083F8DF4 _08119DC0: .4byte gSprites _08119DC4: diff --git a/asm/slot_machine.s b/asm/slot_machine.s index bebe3633e..1ae5b718d 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -108,7 +108,7 @@ sub_810196C: @ 810196C bl ProcessSpriteCopyRequests bl TransferPlttBuffer ldr r1, _081019A8 @ =REG_WIN0H - ldr r2, _081019AC @ =0x02000000 + ldr r2, _081019AC @ =gSharedMem adds r0, r2, 0 adds r0, 0x58 ldrh r0, [r0] @@ -132,7 +132,7 @@ sub_810196C: @ 810196C bx r0 .align 2, 0 _081019A8: .4byte REG_WIN0H -_081019AC: .4byte 0x02000000 +_081019AC: .4byte gSharedMem thumb_func_end sub_810196C thumb_func_start sub_81019B0 @@ -177,7 +177,7 @@ sub_81019EC: @ 81019EC lsls r2, 3 ldr r0, _08101A1C @ =gTasks adds r2, r0 - ldr r1, _08101A20 @ =0x02000000 + ldr r1, _08101A20 @ =gSharedMem ldrh r0, [r2, 0x8] strb r0, [r1, 0x1] adds r2, 0xA @@ -189,7 +189,7 @@ sub_81019EC: @ 81019EC .align 2, 0 _08101A18: .4byte nullsub_67 _08101A1C: .4byte gTasks -_08101A20: .4byte 0x02000000 +_08101A20: .4byte gSharedMem thumb_func_end sub_81019EC thumb_func_start nullsub_67 @@ -394,7 +394,7 @@ sub_8101BA4: @ 8101BA4 mov r6, r8 push {r6,r7} bl sub_81019EC - ldr r5, _08101C74 @ =0x02000000 + ldr r5, _08101C74 @ =gSharedMem movs r4, 0 strb r4, [r5] strb r4, [r5, 0x2] @@ -490,7 +490,7 @@ _08101C14: pop {r0} bx r0 .align 2, 0 -_08101C74: .4byte 0x02000000 +_08101C74: .4byte gSharedMem _08101C78: .4byte gSaveBlock1 _08101C7C: .4byte 0x00000494 _08101C80: .4byte gUnknown_083ECCF8 @@ -585,7 +585,7 @@ sub_8101D24: @ 8101D24 lsls r1, r0, 2 adds r1, r0 lsls r4, r1, 3 - ldr r6, _08101D54 @ =0x02000000 + ldr r6, _08101D54 @ =gSharedMem ldr r5, _08101D58 @ =gTasks _08101D36: ldrb r0, [r6] @@ -602,7 +602,7 @@ _08101D36: bx r0 .align 2, 0 _08101D50: .4byte gUnknown_083ECAAC -_08101D54: .4byte 0x02000000 +_08101D54: .4byte gSharedMem _08101D58: .4byte gTasks thumb_func_end sub_8101D24 @@ -617,7 +617,7 @@ sub_8101D5C: @ 8101D5C movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r4, _08101D88 @ =0x02000000 + ldr r4, _08101D88 @ =gSharedMem ldrb r0, [r4, 0x2] bl sub_810423C ldrb r0, [r4] @@ -629,7 +629,7 @@ sub_8101D5C: @ 8101D5C pop {r1} bx r1 .align 2, 0 -_08101D88: .4byte 0x02000000 +_08101D88: .4byte gSharedMem thumb_func_end sub_8101D5C thumb_func_start sub_8101D8C @@ -641,7 +641,7 @@ sub_8101D8C: @ 8101D8C ands r0, r1 cmp r0, 0 bne _08101DA2 - ldr r1, _08101DAC @ =0x02000000 + ldr r1, _08101DAC @ =gSharedMem ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -651,13 +651,13 @@ _08101DA2: bx r1 .align 2, 0 _08101DA8: .4byte gPaletteFade -_08101DAC: .4byte 0x02000000 +_08101DAC: .4byte gSharedMem thumb_func_end sub_8101D8C thumb_func_start sub_8101DB0 sub_8101DB0: @ 8101DB0 push {lr} - ldr r2, _08101DD8 @ =0x02000000 + ldr r2, _08101DD8 @ =gSharedMem movs r0, 0 strh r0, [r2, 0xE] strh r0, [r2, 0x12] @@ -676,7 +676,7 @@ sub_8101DB0: @ 8101DB0 strb r0, [r2] b _08101DEC .align 2, 0 -_08101DD8: .4byte 0x02000000 +_08101DD8: .4byte gSharedMem _08101DDC: ldrb r0, [r2, 0xA] cmp r0, 0 @@ -698,7 +698,7 @@ sub_8101DF4: @ 8101DF4 lsls r0, 24 cmp r0, 0 beq _08101E06 - ldr r1, _08101E0C @ =0x02000000 + ldr r1, _08101E0C @ =gSharedMem movs r0, 0x4 strb r0, [r1] _08101E06: @@ -706,7 +706,7 @@ _08101E06: pop {r1} bx r1 .align 2, 0 -_08101E0C: .4byte 0x02000000 +_08101E0C: .4byte gSharedMem thumb_func_end sub_8101DF4 thumb_func_start sub_8101E10 @@ -714,7 +714,7 @@ sub_8101E10: @ 8101E10 push {lr} movs r0, 0 bl sub_8104CAC - ldr r2, _08101E34 @ =0x02000000 + ldr r2, _08101E34 @ =gSharedMem movs r0, 0x5 strb r0, [r2] movs r0, 0xC @@ -729,7 +729,7 @@ _08101E2C: pop {r1} bx r1 .align 2, 0 -_08101E34: .4byte 0x02000000 +_08101E34: .4byte gSharedMem _08101E38: .4byte 0x0000270e thumb_func_end sub_8101E10 @@ -744,20 +744,20 @@ sub_8101E3C: @ 8101E3C beq _08101E60 movs r0, 0 bl sub_8104AB8 - ldr r1, _08101E5C @ =0x02000000 + ldr r1, _08101E5C @ =gSharedMem movs r0, 0x8 strb r0, [r1] b _08101F1A .align 2, 0 _08101E58: .4byte gMain -_08101E5C: .4byte 0x02000000 +_08101E5C: .4byte gSharedMem _08101E60: movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 beq _08101EC2 - ldr r2, _08101EB8 @ =0x02000000 + ldr r2, _08101EB8 @ =gSharedMem movs r1, 0xC ldrsh r0, [r2, r1] subs r0, 0x3 @@ -783,7 +783,7 @@ _08101E84: cmp r0, 0x2 ble _08101E84 _08101E9C: - ldr r1, _08101EB8 @ =0x02000000 + ldr r1, _08101EB8 @ =gSharedMem ldrh r0, [r1, 0xC] subs r0, 0x3 ldrh r3, [r1, 0x12] @@ -797,7 +797,7 @@ _08101E9C: bl PlaySE b _08101F1A .align 2, 0 -_08101EB8: .4byte 0x02000000 +_08101EB8: .4byte gSharedMem _08101EBC: movs r0, 0x6 strb r0, [r2] @@ -807,7 +807,7 @@ _08101EC2: ands r0, r1 cmp r0, 0 beq _08101EEC - ldr r4, _08101F24 @ =0x02000000 + ldr r4, _08101F24 @ =gSharedMem movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0 @@ -823,7 +823,7 @@ _08101EC2: adds r0, 0x1 strh r0, [r4, 0x12] _08101EEC: - ldr r0, _08101F24 @ =0x02000000 + ldr r0, _08101F24 @ =gSharedMem movs r2, 0x12 ldrsh r1, [r0, r2] ldr r2, _08101F28 @ =gMain @@ -854,7 +854,7 @@ _08101F1A: pop {r1} bx r1 .align 2, 0 -_08101F24: .4byte 0x02000000 +_08101F24: .4byte gSharedMem _08101F28: .4byte gMain thumb_func_end sub_8101E3C @@ -877,7 +877,7 @@ sub_8101F44: @ 8101F44 push {lr} ldr r0, _08101F58 @ =gOtherText_DontHaveThreeCoins bl sub_8101F2C - ldr r1, _08101F5C @ =0x02000000 + ldr r1, _08101F5C @ =gSharedMem movs r0, 0x7 strb r0, [r1] movs r0, 0 @@ -885,7 +885,7 @@ sub_8101F44: @ 8101F44 bx r1 .align 2, 0 _08101F58: .4byte gOtherText_DontHaveThreeCoins -_08101F5C: .4byte 0x02000000 +_08101F5C: .4byte gSharedMem thumb_func_end sub_8101F44 thumb_func_start sub_8101F60 @@ -898,7 +898,7 @@ sub_8101F60: @ 8101F60 cmp r0, 0 beq _08101F78 bl MenuZeroFillScreen - ldr r1, _08101F84 @ =0x02000000 + ldr r1, _08101F84 @ =gSharedMem movs r0, 0x5 strb r0, [r1] _08101F78: @@ -907,7 +907,7 @@ _08101F78: bx r1 .align 2, 0 _08101F80: .4byte gMain -_08101F84: .4byte 0x02000000 +_08101F84: .4byte gSharedMem thumb_func_end sub_8101F60 thumb_func_start sub_8101F88 @@ -917,7 +917,7 @@ sub_8101F88: @ 8101F88 lsls r0, 24 cmp r0, 0 beq _08101F9A - ldr r1, _08101FA0 @ =0x02000000 + ldr r1, _08101FA0 @ =gSharedMem movs r0, 0x5 strb r0, [r1] _08101F9A: @@ -925,7 +925,7 @@ _08101F9A: pop {r1} bx r1 .align 2, 0 -_08101FA0: .4byte 0x02000000 +_08101FA0: .4byte gSharedMem thumb_func_end sub_8101F88 thumb_func_start sub_8101FA4 @@ -942,7 +942,7 @@ sub_8101FA4: @ 8101FA4 bl sub_8102DEC movs r0, 0 strh r0, [r4, 0x8] - ldr r4, _08101FDC @ =0x02000000 + ldr r4, _08101FDC @ =gSharedMem ldrb r1, [r4, 0x4] movs r0, 0x20 ands r0, r1 @@ -952,14 +952,14 @@ sub_8101FA4: @ 8101FA4 movs r0, 0xA b _08101FE8 .align 2, 0 -_08101FDC: .4byte 0x02000000 +_08101FDC: .4byte gSharedMem _08101FE0: movs r0, 0x1 bl sub_8104CAC movs r0, 0xB _08101FE8: strb r0, [r4] - ldr r4, _08102004 @ =0x02000000 + ldr r4, _08102004 @ =gSharedMem movs r0, 0x8 strh r0, [r4, 0x1A] ldrb r0, [r4, 0xA] @@ -973,7 +973,7 @@ _08101FFC: pop {r1} bx r1 .align 2, 0 -_08102004: .4byte 0x02000000 +_08102004: .4byte gSharedMem thumb_func_end sub_8101FA4 thumb_func_start sub_8102008 @@ -985,7 +985,7 @@ sub_8102008: @ 8102008 beq _08102028 movs r0, 0x1 bl sub_8104CAC - ldr r1, _08102030 @ =0x02000000 + ldr r1, _08102030 @ =gSharedMem ldrb r2, [r1, 0x4] movs r0, 0xDF ands r0, r2 @@ -997,7 +997,7 @@ _08102028: pop {r1} bx r1 .align 2, 0 -_08102030: .4byte 0x02000000 +_08102030: .4byte gSharedMem thumb_func_end sub_8102008 thumb_func_start sub_8102034 @@ -1011,7 +1011,7 @@ sub_8102034: @ 8102034 cmp r1, 0x1D ble _0810204E bl sub_81024F0 - ldr r1, _08102054 @ =0x02000000 + ldr r1, _08102054 @ =gSharedMem movs r0, 0xC strb r0, [r1] _0810204E: @@ -1019,7 +1019,7 @@ _0810204E: pop {r1} bx r1 .align 2, 0 -_08102054: .4byte 0x02000000 +_08102054: .4byte gSharedMem thumb_func_end sub_8102034 thumb_func_start sub_8102058 @@ -1033,7 +1033,7 @@ sub_8102058: @ 8102058 beq _0810207E movs r0, 0x18 bl PlaySE - ldr r4, _0810208C @ =0x02000000 + ldr r4, _0810208C @ =gSharedMem ldrb r0, [r4, 0x18] bl sub_8102E1C ldrb r0, [r4, 0x18] @@ -1047,13 +1047,13 @@ _0810207E: bx r1 .align 2, 0 _08102088: .4byte gMain -_0810208C: .4byte 0x02000000 +_0810208C: .4byte gSharedMem thumb_func_end sub_8102058 thumb_func_start sub_8102090 sub_8102090: @ 8102090 push {r4,lr} - ldr r4, _081020BC @ =0x02000000 + ldr r4, _081020BC @ =gSharedMem ldrb r0, [r4, 0x18] bl sub_8102E40 lsls r0, 24 @@ -1074,7 +1074,7 @@ _081020B6: movs r0, 0x1 b _081020C2 .align 2, 0 -_081020BC: .4byte 0x02000000 +_081020BC: .4byte gSharedMem _081020C0: movs r0, 0 _081020C2: @@ -1086,7 +1086,7 @@ _081020C2: thumb_func_start sub_81020C8 sub_81020C8: @ 81020C8 push {r4,lr} - ldr r4, _08102128 @ =0x02000000 + ldr r4, _08102128 @ =gSharedMem ldrb r1, [r4, 0x4] movs r0, 0xC0 ands r0, r1 @@ -1130,7 +1130,7 @@ _0810210C: bl sub_8104CAC b _0810215A .align 2, 0 -_08102128: .4byte 0x02000000 +_08102128: .4byte gSharedMem _0810212C: .4byte 0x00000185 _08102130: movs r0, 0x40 @@ -1151,7 +1151,7 @@ _0810214C: movs r0, 0x2 bl sub_8104CAC _0810215A: - ldr r1, _081021B0 @ =0x02000000 + ldr r1, _081021B0 @ =gSharedMem ldrh r3, [r1, 0x8] movs r0, 0xE0 lsls r0, 1 @@ -1194,7 +1194,7 @@ _08102192: bl sub_8104064 b _081021D2 .align 2, 0 -_081021B0: .4byte 0x02000000 +_081021B0: .4byte gSharedMem _081021B4: movs r0, 0x3 bl sub_8104CAC @@ -1226,7 +1226,7 @@ sub_81021E0: @ 81021E0 lsls r0, 24 cmp r0, 0 beq _081021F2 - ldr r1, _081021F8 @ =0x02000000 + ldr r1, _081021F8 @ =gSharedMem movs r0, 0x10 strb r0, [r1] _081021F2: @@ -1234,7 +1234,7 @@ _081021F2: pop {r1} bx r1 .align 2, 0 -_081021F8: .4byte 0x02000000 +_081021F8: .4byte gSharedMem thumb_func_end sub_81021E0 thumb_func_start sub_81021FC @@ -1244,7 +1244,7 @@ sub_81021FC: @ 81021FC lsls r0, 24 cmp r0, 0 beq _08102256 - ldr r4, _08102260 @ =0x02000000 + ldr r4, _08102260 @ =gSharedMem movs r0, 0x13 strb r0, [r4] ldrh r1, [r4, 0x8] @@ -1290,7 +1290,7 @@ _08102256: pop {r1} bx r1 .align 2, 0 -_08102260: .4byte 0x02000000 +_08102260: .4byte gSharedMem thumb_func_end sub_81021FC thumb_func_start sub_8102264 @@ -1300,7 +1300,7 @@ sub_8102264: @ 8102264 lsls r0, 24 cmp r0, 0 bne _08102294 - ldr r4, _0810229C @ =0x02000000 + ldr r4, _0810229C @ =gSharedMem movs r0, 0x13 strb r0, [r4] ldrh r1, [r4, 0x8] @@ -1323,7 +1323,7 @@ _08102294: pop {r1} bx r1 .align 2, 0 -_0810229C: .4byte 0x02000000 +_0810229C: .4byte gSharedMem thumb_func_end sub_8102264 thumb_func_start sub_81022A0 @@ -1333,7 +1333,7 @@ sub_81022A0: @ 81022A0 lsls r0, 24 cmp r0, 0 beq _081022C0 - ldr r2, _081022C8 @ =0x02000000 + ldr r2, _081022C8 @ =gSharedMem movs r0, 0x13 strb r0, [r2] ldrh r1, [r2, 0x8] @@ -1348,7 +1348,7 @@ _081022C0: pop {r1} bx r1 .align 2, 0 -_081022C8: .4byte 0x02000000 +_081022C8: .4byte gSharedMem thumb_func_end sub_81022A0 thumb_func_start sub_81022CC @@ -1360,14 +1360,14 @@ sub_81022CC: @ 81022CC bl sub_8103D8C movs r0, 0x2 bl sub_8103D8C - ldr r1, _081022EC @ =0x02000000 + ldr r1, _081022EC @ =gSharedMem movs r0, 0x2 strb r0, [r1] movs r0, 0 pop {r1} bx r1 .align 2, 0 -_081022EC: .4byte 0x02000000 +_081022EC: .4byte gSharedMem thumb_func_end sub_81022CC thumb_func_start sub_81022F0 @@ -1383,7 +1383,7 @@ sub_81022F0: @ 81022F0 ble _0810230C movs r0, 0 strh r0, [r1, 0xA] - ldr r1, _08102314 @ =0x02000000 + ldr r1, _08102314 @ =gSharedMem movs r0, 0x13 strb r0, [r1] _0810230C: @@ -1391,7 +1391,7 @@ _0810230C: pop {r1} bx r1 .align 2, 0 -_08102314: .4byte 0x02000000 +_08102314: .4byte gSharedMem thumb_func_end sub_81022F0 thumb_func_start sub_8102318 @@ -1404,7 +1404,7 @@ sub_8102318: @ 8102318 movs r2, 0x1 bl DisplayYesNoMenu bl sub_814AB84 - ldr r1, _08102340 @ =0x02000000 + ldr r1, _08102340 @ =gSharedMem movs r0, 0x16 strb r0, [r1] movs r0, 0 @@ -1412,7 +1412,7 @@ sub_8102318: @ 8102318 bx r1 .align 2, 0 _0810233C: .4byte gOtherText_QuitGamePrompt -_08102340: .4byte 0x02000000 +_08102340: .4byte gSharedMem thumb_func_end sub_8102318 thumb_func_start sub_8102344 @@ -1430,7 +1430,7 @@ sub_8102344: @ 8102344 bl sub_8103D8C movs r0, 0x2 bl sub_8103D8C - ldr r0, _08102378 @ =0x02000000 + ldr r0, _08102378 @ =gSharedMem ldrh r1, [r0, 0x12] ldrh r2, [r0, 0xC] adds r1, r2 @@ -1439,7 +1439,7 @@ sub_8102344: @ 8102344 strb r1, [r0] b _08102392 .align 2, 0 -_08102378: .4byte 0x02000000 +_08102378: .4byte gSharedMem _0810237C: cmp r1, 0x1 beq _08102388 @@ -1449,7 +1449,7 @@ _0810237C: bne _08102392 _08102388: bl MenuZeroFillScreen - ldr r1, _08102398 @ =0x02000000 + ldr r1, _08102398 @ =gSharedMem movs r0, 0x5 strb r0, [r1] _08102392: @@ -1457,7 +1457,7 @@ _08102392: pop {r1} bx r1 .align 2, 0 -_08102398: .4byte 0x02000000 +_08102398: .4byte gSharedMem thumb_func_end sub_8102344 thumb_func_start sub_810239C @@ -1465,7 +1465,7 @@ sub_810239C: @ 810239C push {lr} ldr r0, _081023B0 @ =gOtherText_MaxCoins bl sub_8101F2C - ldr r1, _081023B4 @ =0x02000000 + ldr r1, _081023B4 @ =gSharedMem movs r0, 0x18 strb r0, [r1] movs r0, 0 @@ -1473,7 +1473,7 @@ sub_810239C: @ 810239C bx r1 .align 2, 0 _081023B0: .4byte gOtherText_MaxCoins -_081023B4: .4byte 0x02000000 +_081023B4: .4byte gSharedMem thumb_func_end sub_810239C thumb_func_start sub_81023B8 @@ -1486,7 +1486,7 @@ sub_81023B8: @ 81023B8 cmp r0, 0 beq _081023D0 bl MenuZeroFillScreen - ldr r1, _081023DC @ =0x02000000 + ldr r1, _081023DC @ =gSharedMem movs r0, 0x5 strb r0, [r1] _081023D0: @@ -1495,7 +1495,7 @@ _081023D0: bx r1 .align 2, 0 _081023D8: .4byte gMain -_081023DC: .4byte 0x02000000 +_081023DC: .4byte gSharedMem thumb_func_end sub_81023B8 thumb_func_start sub_81023E0 @@ -1503,7 +1503,7 @@ sub_81023E0: @ 81023E0 push {lr} ldr r0, _081023F4 @ =gOtherText_OutOfCoins bl sub_8101F2C - ldr r1, _081023F8 @ =0x02000000 + ldr r1, _081023F8 @ =gSharedMem movs r0, 0x1A strb r0, [r1] movs r0, 0 @@ -1511,7 +1511,7 @@ sub_81023E0: @ 81023E0 bx r1 .align 2, 0 _081023F4: .4byte gOtherText_OutOfCoins -_081023F8: .4byte 0x02000000 +_081023F8: .4byte gSharedMem thumb_func_end sub_81023E0 thumb_func_start sub_81023FC @@ -1524,7 +1524,7 @@ sub_81023FC: @ 81023FC cmp r0, 0 beq _08102414 bl MenuZeroFillScreen - ldr r1, _08102420 @ =0x02000000 + ldr r1, _08102420 @ =gSharedMem movs r0, 0x1B strb r0, [r1] _08102414: @@ -1533,7 +1533,7 @@ _08102414: bx r1 .align 2, 0 _0810241C: .4byte gMain -_08102420: .4byte 0x02000000 +_08102420: .4byte gSharedMem thumb_func_end sub_81023FC thumb_func_start sub_8102424 @@ -1541,7 +1541,7 @@ sub_8102424: @ 8102424 push {r4,lr} sub sp, 0x4 ldr r0, _08102454 @ =gSaveBlock1 - ldr r4, _08102458 @ =0x02000000 + ldr r4, _08102458 @ =gSharedMem ldrh r1, [r4, 0xC] ldr r2, _0810245C @ =0x00000494 adds r0, r2 @@ -1563,7 +1563,7 @@ sub_8102424: @ 8102424 bx r1 .align 2, 0 _08102454: .4byte gSaveBlock1 -_08102458: .4byte 0x02000000 +_08102458: .4byte gSharedMem _0810245C: .4byte 0x00000494 thumb_func_end sub_8102424 @@ -1576,7 +1576,7 @@ sub_8102460: @ 8102460 ands r0, r1 cmp r0, 0 bne _08102476 - ldr r0, _08102480 @ =0x02000000 + ldr r0, _08102480 @ =gSharedMem ldr r0, [r0, 0x64] bl SetMainCallback2 _08102476: @@ -1585,13 +1585,13 @@ _08102476: bx r1 .align 2, 0 _0810247C: .4byte gPaletteFade -_08102480: .4byte 0x02000000 +_08102480: .4byte gSharedMem thumb_func_end sub_8102460 thumb_func_start sub_8102484 sub_8102484: @ 8102484 push {r4,lr} - ldr r4, _081024E4 @ =0x02000000 + ldr r4, _081024E4 @ =gSharedMem ldrb r0, [r4, 0xA] cmp r0, 0 bne _081024DC @@ -1624,7 +1624,7 @@ _081024C0: lsrs r3, r0, 24 cmp r3, 0x5 beq _081024DC - ldr r2, _081024E4 @ =0x02000000 + ldr r2, _081024E4 @ =gSharedMem ldr r1, _081024EC @ =gUnknown_083ECE48 lsls r0, r3, 1 adds r0, r1 @@ -1637,7 +1637,7 @@ _081024DC: pop {r0} bx r0 .align 2, 0 -_081024E4: .4byte 0x02000000 +_081024E4: .4byte gSharedMem _081024E8: .4byte gUnknown_083ECE42 _081024EC: .4byte gUnknown_083ECE48 thumb_func_end sub_8102484 @@ -1645,7 +1645,7 @@ _081024EC: .4byte gUnknown_083ECE48 thumb_func_start sub_81024F0 sub_81024F0: @ 81024F0 push {lr} - ldr r1, _08102508 @ =0x02000000 + ldr r1, _08102508 @ =gSharedMem movs r0, 0 strb r0, [r1, 0x6] ldrb r0, [r1, 0x4] @@ -1657,7 +1657,7 @@ _08102502: pop {r0} bx r0 .align 2, 0 -_08102508: .4byte 0x02000000 +_08102508: .4byte gSharedMem thumb_func_end sub_81024F0 thumb_func_start sub_810250C @@ -1699,7 +1699,7 @@ sub_8102540: @ 8102540 lsls r0, 24 lsrs r0, 24 ldr r4, _08102568 @ =gUnknown_083ECD04 - ldr r1, _0810256C @ =0x02000000 + ldr r1, _0810256C @ =gSharedMem movs r3, 0x12 ldrsh r2, [r1, r3] ldrb r3, [r1, 0x1] @@ -1715,7 +1715,7 @@ sub_8102540: @ 8102540 b _08102572 .align 2, 0 _08102568: .4byte gUnknown_083ECD04 -_0810256C: .4byte 0x02000000 +_0810256C: .4byte gSharedMem _08102570: movs r0, 0x1 _08102572: @@ -1732,7 +1732,7 @@ sub_8102578: @ 8102578 _0810257E: bl Random movs r2, 0xFF - ldr r3, _081025B8 @ =0x02000000 + ldr r3, _081025B8 @ =gSharedMem lsls r1, r5, 16 asrs r4, r1, 16 lsls r1, r4, 1 @@ -1759,7 +1759,7 @@ _081025AA: bx r1 .align 2, 0 _081025B4: .4byte gUnknown_083ECD16 -_081025B8: .4byte 0x02000000 +_081025B8: .4byte gSharedMem thumb_func_end sub_8102578 thumb_func_start sub_81025BC @@ -1770,7 +1770,7 @@ sub_81025BC: @ 81025BC movs r6, 0 ldr r0, _08102600 @ =gUnknown_083ECD28 mov r8, r0 - ldr r5, _08102604 @ =0x02000000 + ldr r5, _08102604 @ =gSharedMem movs r7, 0x80 lsls r7, 17 _081025CE: @@ -1799,7 +1799,7 @@ _081025CE: b _08102622 .align 2, 0 _08102600: .4byte gUnknown_083ECD28 -_08102604: .4byte 0x02000000 +_08102604: .4byte gSharedMem _08102608: asrs r0, r2, 16 cmp r0, 0x4 @@ -1843,14 +1843,14 @@ sub_810264C: @ 810264C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r3, _08102660 @ =0x02000000 + ldr r3, _08102660 @ =gSharedMem ldrb r0, [r3, 0x3] cmp r0, 0 beq _08102668 ldr r0, _08102664 @ =gUnknown_083ECDAC b _0810266A .align 2, 0 -_08102660: .4byte 0x02000000 +_08102660: .4byte gSharedMem _08102664: .4byte gUnknown_083ECDAC _08102668: ldr r0, _0810267C @ =gUnknown_083ECD46 @@ -1870,7 +1870,7 @@ _0810267C: .4byte gUnknown_083ECD46 thumb_func_start sub_8102680 sub_8102680: @ 8102680 push {r4-r6,lr} - ldr r1, _081026A4 @ =0x02000000 + ldr r1, _081026A4 @ =gSharedMem movs r0, 0 strb r0, [r1, 0x5] bl Random @@ -1885,7 +1885,7 @@ sub_8102680: @ 8102680 movs r6, 0x5 b _081026AE .align 2, 0 -_081026A4: .4byte 0x02000000 +_081026A4: .4byte gSharedMem _081026A8: subs r0, r5, 0x1 lsls r0, 16 @@ -1906,14 +1906,14 @@ _081026AE: cmp r4, r0 bcs _081026A8 _081026CE: - ldr r0, _081026D8 @ =0x02000000 + ldr r0, _081026D8 @ =gSharedMem strb r6, [r0, 0x5] _081026D2: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081026D8: .4byte 0x02000000 +_081026D8: .4byte gSharedMem thumb_func_end sub_8102680 thumb_func_start sub_81026DC @@ -1947,7 +1947,7 @@ _08102702: dp15_jump_random_unknown: @ 8102708 push {r4,r5,lr} movs r4, 0 - ldr r0, _0810271C @ =0x02000000 + ldr r0, _0810271C @ =gSharedMem movs r2, 0x10 ldrsh r1, [r0, r2] ldr r0, _08102720 @ =0x0000012b @@ -1956,7 +1956,7 @@ dp15_jump_random_unknown: @ 8102708 movs r4, 0x4 b _0810273A .align 2, 0 -_0810271C: .4byte 0x02000000 +_0810271C: .4byte gSharedMem _08102720: .4byte 0x0000012b _08102724: cmp r1, 0xF9 @@ -2000,7 +2000,7 @@ _08102760: adds r2, r5, 0x2 adds r2, r4, r2 ldr r3, _08102790 @ =gUnknown_083ECE30 - ldr r1, _08102794 @ =0x02000000 + ldr r1, _08102794 @ =gSharedMem ldrb r1, [r1, 0xB] lsls r1, 1 adds r1, r3 @@ -2014,7 +2014,7 @@ _08102760: b _0810279A .align 2, 0 _08102790: .4byte gUnknown_083ECE30 -_08102794: .4byte 0x02000000 +_08102794: .4byte gSharedMem _08102798: movs r0, 0x2 _0810279A: @@ -2026,7 +2026,7 @@ _0810279A: thumb_func_start sub_81027A0 sub_81027A0: @ 81027A0 push {r4,lr} - ldr r4, _081027CC @ =0x02000000 + ldr r4, _081027CC @ =gSharedMem movs r0, 0 strh r0, [r4, 0x8] bl sub_81027D0 @@ -2046,7 +2046,7 @@ _081027C4: pop {r0} bx r0 .align 2, 0 -_081027CC: .4byte 0x02000000 +_081027CC: .4byte gSharedMem thumb_func_end sub_81027A0 thumb_func_start sub_81027D0 @@ -2077,7 +2077,7 @@ sub_81027D0: @ 81027D0 lsrs r1, r0, 24 cmp r1, 0x9 beq _0810282E - ldr r2, _08102834 @ =0x02000000 + ldr r2, _08102834 @ =gSharedMem ldr r0, _08102838 @ =gUnknown_083ECE6C lsls r1, 1 adds r0, r1, r0 @@ -2098,7 +2098,7 @@ _0810282E: pop {r0} bx r0 .align 2, 0 -_08102834: .4byte 0x02000000 +_08102834: .4byte gSharedMem _08102838: .4byte gUnknown_083ECE6C _0810283C: .4byte gUnknown_083ECE5A thumb_func_end sub_81027D0 @@ -2132,7 +2132,7 @@ sub_8102840: @ 8102840 bne _0810287C movs r1, 0x1 _0810287C: - ldr r2, _08102900 @ =0x02000000 + ldr r2, _08102900 @ =gSharedMem ldr r0, _08102904 @ =gUnknown_083ECE6C lsls r1, 1 adds r0, r1, r0 @@ -2175,7 +2175,7 @@ _0810289E: bne _081028D8 movs r1, 0x1 _081028D8: - ldr r2, _08102900 @ =0x02000000 + ldr r2, _08102900 @ =gSharedMem ldr r0, _08102904 @ =gUnknown_083ECE6C lsls r1, 1 adds r0, r1, r0 @@ -2196,7 +2196,7 @@ _081028FA: pop {r0} bx r0 .align 2, 0 -_08102900: .4byte 0x02000000 +_08102900: .4byte gSharedMem _08102904: .4byte gUnknown_083ECE6C _08102908: .4byte gUnknown_083ECE5A thumb_func_end sub_8102840 @@ -2228,7 +2228,7 @@ sub_810290C: @ 810290C beq _08102968 cmp r1, 0 beq _08102962 - ldr r2, _081029C8 @ =0x02000000 + ldr r2, _081029C8 @ =gSharedMem ldr r0, _081029CC @ =gUnknown_083ECE6C lsls r1, 1 adds r0, r1, r0 @@ -2270,7 +2270,7 @@ _08102968: beq _081029C2 cmp r1, 0 beq _081029BC - ldr r2, _081029C8 @ =0x02000000 + ldr r2, _081029C8 @ =gSharedMem ldr r0, _081029CC @ =gUnknown_083ECE6C lsls r1, 1 adds r0, r1, r0 @@ -2292,7 +2292,7 @@ _081029C2: pop {r0} bx r0 .align 2, 0 -_081029C8: .4byte 0x02000000 +_081029C8: .4byte gSharedMem _081029CC: .4byte gUnknown_083ECE6C _081029D0: .4byte gUnknown_083ECE5A thumb_func_end sub_810290C @@ -2423,7 +2423,7 @@ sub_8102A9C: @ 8102A9C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r0, _08102AC4 @ =0x02000000 + ldr r0, _08102AC4 @ =gSharedMem movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0 @@ -2433,7 +2433,7 @@ sub_8102A9C: @ 8102A9C movs r0, 0x1 b _08102ACA .align 2, 0 -_08102AC4: .4byte 0x02000000 +_08102AC4: .4byte gSharedMem _08102AC8: movs r0, 0 _08102ACA: @@ -2462,7 +2462,7 @@ sub_8102AD0: @ 8102AD0 movs r0, 0x15 bl PlaySE _08102AF6: - ldr r2, _08102B70 @ =0x02000000 + ldr r2, _08102B70 @ =gSharedMem ldrh r0, [r2, 0xE] subs r0, 0x1 strh r0, [r2, 0xE] @@ -2498,7 +2498,7 @@ _08102B22: beq _08102B58 movs r0, 0x15 bl PlaySE - ldr r1, _08102B70 @ =0x02000000 + ldr r1, _08102B70 @ =gSharedMem ldrh r0, [r1, 0xE] ldrh r2, [r1, 0xC] adds r0, r2 @@ -2513,7 +2513,7 @@ _08102B54: movs r0, 0 strh r0, [r1, 0xE] _08102B58: - ldr r0, _08102B70 @ =0x02000000 + ldr r0, _08102B70 @ =gSharedMem movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0 @@ -2527,7 +2527,7 @@ _08102B68: pop {r1} bx r1 .align 2, 0 -_08102B70: .4byte 0x02000000 +_08102B70: .4byte gSharedMem _08102B74: .4byte 0x0000270e _08102B78: .4byte gMain _08102B7C: .4byte 0x0000270f @@ -2559,7 +2559,7 @@ sub_8102BA4: @ 8102BA4 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r0, _08102BF0 @ =0x02000000 + ldr r0, _08102BF0 @ =gSharedMem lsls r2, r4, 1 adds r0, 0x28 adds r2, r0 @@ -2593,7 +2593,7 @@ _08102BD4: pop {r1} bx r1 .align 2, 0 -_08102BF0: .4byte 0x02000000 +_08102BF0: .4byte gSharedMem _08102BF4: .4byte gUnknown_083ECCB2 thumb_func_end sub_8102BA4 @@ -2606,7 +2606,7 @@ sub_8102BF8: @ 8102BF8 lsls r1, 16 lsrs r4, r1, 16 movs r6, 0 - ldr r0, _08102C40 @ =0x02000000 + ldr r0, _08102C40 @ =gSharedMem lsls r1, r5, 1 adds r0, 0x1C adds r1, r0 @@ -2634,14 +2634,14 @@ _08102C20: pop {r1} bx r1 .align 2, 0 -_08102C40: .4byte 0x02000000 +_08102C40: .4byte gSharedMem _08102C44: .4byte 0x0000ffff thumb_func_end sub_8102BF8 thumb_func_start sub_8102C48 sub_8102C48: @ 8102C48 push {lr} - ldr r1, _08102C7C @ =0x02000000 + ldr r1, _08102C7C @ =gSharedMem movs r2, 0x16 ldrsh r1, [r1, r2] lsls r0, 16 @@ -2667,7 +2667,7 @@ _08102C6E: pop {r1} bx r1 .align 2, 0 -_08102C7C: .4byte 0x02000000 +_08102C7C: .4byte gSharedMem _08102C80: .4byte gUnknown_083ECCF1 thumb_func_end sub_8102C48 @@ -2676,7 +2676,7 @@ sub_8102C84: @ 8102C84 push {r4-r6,lr} adds r5, r0, 0 lsls r5, 24 - ldr r6, _08102CC8 @ =0x02000000 + ldr r6, _08102CC8 @ =gSharedMem lsrs r5, 23 adds r4, r6, 0 adds r4, 0x1C @@ -2705,7 +2705,7 @@ sub_8102C84: @ 8102C84 pop {r0} bx r0 .align 2, 0 -_08102CC8: .4byte 0x02000000 +_08102CC8: .4byte gSharedMem thumb_func_end sub_8102C84 thumb_func_start sub_8102CCC @@ -2716,7 +2716,7 @@ sub_8102CCC: @ 8102CCC adds r6, r0, 0 lsls r1, 16 lsrs r4, r1, 16 - ldr r0, _08102D24 @ =0x02000000 + ldr r0, _08102D24 @ =gSharedMem lsls r1, r6, 1 adds r0, 0x1C adds r5, r1, r0 @@ -2753,13 +2753,13 @@ _08102D18: pop {r1} bx r1 .align 2, 0 -_08102D24: .4byte 0x02000000 +_08102D24: .4byte gSharedMem thumb_func_end sub_8102CCC thumb_func_start sub_8102D28 sub_8102D28: @ 8102D28 push {r4,lr} - ldr r4, _08102D58 @ =0x02000000 + ldr r4, _08102D58 @ =gSharedMem lsls r0, 16 asrs r0, 16 ldrh r1, [r4, 0x14] @@ -2781,7 +2781,7 @@ sub_8102D28: @ 8102D28 pop {r0} bx r0 .align 2, 0 -_08102D58: .4byte 0x02000000 +_08102D58: .4byte gSharedMem thumb_func_end sub_8102D28 thumb_func_start sub_8102D5C @@ -2789,7 +2789,7 @@ sub_8102D5C: @ 8102D5C push {r4,r5,lr} lsls r0, 16 lsrs r4, r0, 16 - ldr r5, _08102DA4 @ =0x02000000 + ldr r5, _08102DA4 @ =gSharedMem movs r1, 0x14 ldrsh r0, [r5, r1] movs r1, 0x14 @@ -2822,7 +2822,7 @@ _08102D9A: pop {r1} bx r1 .align 2, 0 -_08102DA4: .4byte 0x02000000 +_08102DA4: .4byte gSharedMem thumb_func_end sub_8102D5C thumb_func_start sub_8102DA8 @@ -2831,7 +2831,7 @@ sub_8102DA8: @ 8102DA8 movs r4, 0 ldr r5, _08102DE0 @ =sub_8102E68 ldr r7, _08102DE4 @ =gTasks - ldr r6, _08102DE8 @ =0x0200003a + ldr r6, _08102DE8 @ =gSharedMem + 0x3A _08102DB2: adds r0, r5, 0 movs r1, 0x2 @@ -2857,7 +2857,7 @@ _08102DB2: .align 2, 0 _08102DE0: .4byte sub_8102E68 _08102DE4: .4byte gTasks -_08102DE8: .4byte 0x0200003a +_08102DE8: .4byte gSharedMem + 0x3A thumb_func_end sub_8102DA8 thumb_func_start sub_8102DEC @@ -2865,7 +2865,7 @@ sub_8102DEC: @ 8102DEC lsls r0, 24 lsrs r0, 24 ldr r3, _08102E14 @ =gTasks - ldr r1, _08102E18 @ =0x02000000 + ldr r1, _08102E18 @ =gSharedMem adds r1, 0x3A adds r0, r1 ldrb r2, [r0] @@ -2884,7 +2884,7 @@ sub_8102DEC: @ 8102DEC bx lr .align 2, 0 _08102E14: .4byte gTasks -_08102E18: .4byte 0x02000000 +_08102E18: .4byte gSharedMem thumb_func_end sub_8102DEC thumb_func_start sub_8102E1C @@ -2892,7 +2892,7 @@ sub_8102E1C: @ 8102E1C lsls r0, 24 lsrs r0, 24 ldr r2, _08102E38 @ =gTasks - ldr r1, _08102E3C @ =0x02000000 + ldr r1, _08102E3C @ =gSharedMem adds r1, 0x3A adds r0, r1 ldrb r1, [r0] @@ -2905,7 +2905,7 @@ sub_8102E1C: @ 8102E1C bx lr .align 2, 0 _08102E38: .4byte gTasks -_08102E3C: .4byte 0x02000000 +_08102E3C: .4byte gSharedMem thumb_func_end sub_8102E1C thumb_func_start sub_8102E40 @@ -2913,7 +2913,7 @@ sub_8102E40: @ 8102E40 lsls r0, 24 lsrs r0, 24 ldr r2, _08102E60 @ =gTasks - ldr r1, _08102E64 @ =0x02000000 + ldr r1, _08102E64 @ =gSharedMem adds r1, 0x3A adds r0, r1 ldrb r1, [r0] @@ -2927,7 +2927,7 @@ sub_8102E40: @ 8102E40 bx lr .align 2, 0 _08102E60: .4byte gTasks -_08102E64: .4byte 0x02000000 +_08102E64: .4byte gSharedMem thumb_func_end sub_8102E40 thumb_func_start sub_8102E68 @@ -2972,7 +2972,7 @@ sub_8102EA4: @ 8102EA4 ldrh r0, [r0, 0x26] lsls r0, 24 lsrs r0, 24 - ldr r1, _08102EBC @ =0x02000000 + ldr r1, _08102EBC @ =gSharedMem movs r2, 0x1A ldrsh r1, [r1, r2] bl sub_8102C84 @@ -2980,7 +2980,7 @@ sub_8102EA4: @ 8102EA4 pop {r1} bx r1 .align 2, 0 -_08102EBC: .4byte 0x02000000 +_08102EBC: .4byte gSharedMem thumb_func_end sub_8102EA4 thumb_func_start sub_8102EC0 @@ -2991,7 +2991,7 @@ sub_8102EC0: @ 8102EC0 adds r0, 0x1 movs r2, 0 strh r0, [r4, 0x8] - ldr r3, _08102F40 @ =0x02000000 + ldr r3, _08102F40 @ =gSharedMem movs r1, 0x26 ldrsh r0, [r4, r1] lsls r0, 1 @@ -3026,7 +3026,7 @@ sub_8102EC0: @ 8102EC0 cmp r0, 0 bne _08102F28 _08102F12: - ldr r1, _08102F40 @ =0x02000000 + ldr r1, _08102F40 @ =gSharedMem movs r0, 0 strb r0, [r1, 0x6] ldr r1, _08102F48 @ =gUnknown_083ECB4C @@ -3037,7 +3037,7 @@ _08102F12: ldr r0, [r0] bl _call_via_r0 _08102F28: - ldr r0, _08102F40 @ =0x02000000 + ldr r0, _08102F40 @ =gSharedMem movs r2, 0x26 ldrsh r1, [r4, r2] lsls r1, 1 @@ -3050,7 +3050,7 @@ _08102F28: pop {r1} bx r1 .align 2, 0 -_08102F40: .4byte 0x02000000 +_08102F40: .4byte gSharedMem _08102F44: .4byte gUnknown_083ECB40 _08102F48: .4byte gUnknown_083ECB4C thumb_func_end sub_8102EC0 @@ -3064,7 +3064,7 @@ sub_8102F4C: @ 8102F4C mov r0, sp movs r2, 0xA bl memcpy - ldr r5, _08102F90 @ =0x02000000 + ldr r5, _08102F90 @ =gSharedMem movs r1, 0x26 ldrsh r0, [r4, r1] lsls r6, r0, 1 @@ -3088,7 +3088,7 @@ sub_8102F4C: @ 8102F4C b _08102FC8 .align 2, 0 _08102F8C: .4byte gUnknown_083ECB58 -_08102F90: .4byte 0x02000000 +_08102F90: .4byte gSharedMem _08102F94: adds r0, r5, 0 adds r0, 0x2E @@ -3120,7 +3120,7 @@ _08102FC8: _08102FCC: cmp r2, 0 bne _08102FF8 - ldr r1, _08103004 @ =0x02000000 + ldr r1, _08103004 @ =gSharedMem movs r2, 0x26 ldrsh r0, [r4, r2] lsls r0, 1 @@ -3147,14 +3147,14 @@ _08102FF8: pop {r1} bx r1 .align 2, 0 -_08103004: .4byte 0x02000000 +_08103004: .4byte gSharedMem thumb_func_end sub_8102F4C thumb_func_start sub_8103008 sub_8103008: @ 8103008 push {r4,lr} adds r2, r0, 0 - ldr r1, _08103058 @ =0x02000000 + ldr r1, _08103058 @ =gSharedMem movs r3, 0x26 ldrsh r0, [r2, r3] lsls r0, 1 @@ -3194,13 +3194,13 @@ _0810304E: pop {r1} bx r1 .align 2, 0 -_08103058: .4byte 0x02000000 +_08103058: .4byte gSharedMem thumb_func_end sub_8103008 thumb_func_start sub_810305C sub_810305C: @ 810305C push {r4,r5,lr} - ldr r4, _0810309C @ =0x02000000 + ldr r4, _0810309C @ =gSharedMem ldrb r0, [r4, 0x4] bl sub_810250C lsls r0, 24 @@ -3230,7 +3230,7 @@ _0810307A: pop {r1} bx r1 .align 2, 0 -_0810309C: .4byte 0x02000000 +_0810309C: .4byte gSharedMem _081030A0: .4byte gUnknown_083ECB64 thumb_func_end sub_810305C @@ -3256,12 +3256,12 @@ sub_81030A4: @ 81030A4 cmp r0, r5 bne _081030D8 _081030CC: - ldr r0, _081030D4 @ =0x02000000 + ldr r0, _081030D4 @ =gSharedMem strb r1, [r0, 0x7] movs r0, 0x1 b _081030DA .align 2, 0 -_081030D4: .4byte 0x02000000 +_081030D4: .4byte gSharedMem _081030D8: movs r0, 0 _081030DA: @@ -3319,7 +3319,7 @@ _0810312E: thumb_func_start sub_8103134 sub_8103134: @ 8103134 push {lr} - ldr r0, _08103148 @ =0x02000000 + ldr r0, _08103148 @ =gSharedMem ldrb r1, [r0, 0x4] movs r0, 0xC2 ands r0, r1 @@ -3328,7 +3328,7 @@ sub_8103134: @ 8103134 movs r0, 0 b _0810314E .align 2, 0 -_08103148: .4byte 0x02000000 +_08103148: .4byte gSharedMem _0810314C: movs r0, 0x1 _0810314E: @@ -3350,7 +3350,7 @@ sub_8103154: @ 8103154 movs r5, 0 movs r0, 0x2 mov r9, r0 - ldr r6, _08103194 @ =0x02000000 + ldr r6, _08103194 @ =gSharedMem _0810316E: lsls r0, r5, 16 asrs r4, r0, 16 @@ -3370,7 +3370,7 @@ _0810316E: movs r0, 0x1 b _081031A6 .align 2, 0 -_08103194: .4byte 0x02000000 +_08103194: .4byte gSharedMem _08103198: adds r0, r4, 0x1 lsls r0, 16 @@ -3414,7 +3414,7 @@ sub_81031B4: @ 81031B4 _081031E2: movs r0, 0x1 mov r8, r0 - ldr r5, _0810320C @ =0x02000000 + ldr r5, _0810320C @ =gSharedMem movs r7, 0 _081031EA: mov r1, r8 @@ -3433,7 +3433,7 @@ _081031EA: movs r0, 0x1 b _081032B2 .align 2, 0 -_0810320C: .4byte 0x02000000 +_0810320C: .4byte gSharedMem _08103210: adds r0, r4, 0x1 lsls r0, 16 @@ -3446,7 +3446,7 @@ _0810321E: movs r0, 0x1 mov r8, r0 adds r7, r6, 0 - ldr r6, _0810326C @ =0x02000000 + ldr r6, _0810326C @ =gSharedMem _08103226: mov r1, r8 lsls r5, r1, 16 @@ -3483,7 +3483,7 @@ _08103266: strh r0, [r6, 0x34] b _0810329A .align 2, 0 -_0810326C: .4byte 0x02000000 +_0810326C: .4byte gSharedMem _08103270: asrs r0, r5, 16 cmp r0, 0x3 @@ -3535,7 +3535,7 @@ _081032B2: sub_81032C0: @ 81032C0 push {lr} ldr r1, _081032E0 @ =gUnknown_083ECB70 - ldr r0, _081032E4 @ =0x02000000 + ldr r0, _081032E4 @ =gSharedMem movs r2, 0x12 ldrsh r0, [r0, r2] subs r0, 0x1 @@ -3549,7 +3549,7 @@ sub_81032C0: @ 81032C0 bx r1 .align 2, 0 _081032E0: .4byte gUnknown_083ECB70 -_081032E4: .4byte 0x02000000 +_081032E4: .4byte gSharedMem thumb_func_end sub_81032C0 thumb_func_start sub_81032E8 @@ -3557,7 +3557,7 @@ sub_81032E8: @ 81032E8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _08103320 @ =0x02000000 + ldr r0, _08103320 @ =gSharedMem movs r6, 0 ldrh r1, [r0, 0x34] mov r8, r1 @@ -3583,7 +3583,7 @@ _081032FC: movs r0, 0x1 b _08103332 .align 2, 0 -_08103320: .4byte 0x02000000 +_08103320: .4byte gSharedMem _08103324: adds r0, r4, 0x1 lsls r0, 16 @@ -3607,7 +3607,7 @@ sub_810333C: @ 810333C lsls r0, 24 cmp r0, 0 beq _0810339A - ldr r1, _0810338C @ =0x02000000 + ldr r1, _0810338C @ =gSharedMem movs r2, 0x34 ldrsh r0, [r1, r2] cmp r0, 0x2 @@ -3642,7 +3642,7 @@ _08103364: ble _08103364 b _08103396 .align 2, 0 -_0810338C: .4byte 0x02000000 +_0810338C: .4byte gSharedMem _08103390: movs r0, 0x2 strh r0, [r6, 0x36] @@ -3651,7 +3651,7 @@ _08103396: movs r0, 0x1 b _081033D2 _0810339A: - ldr r1, _081033D8 @ =0x02000000 + ldr r1, _081033D8 @ =gSharedMem movs r2, 0x34 ldrsh r0, [r1, r2] cmp r0, 0x2 @@ -3685,13 +3685,13 @@ _081033D2: pop {r1} bx r1 .align 2, 0 -_081033D8: .4byte 0x02000000 +_081033D8: .4byte gSharedMem thumb_func_end sub_810333C thumb_func_start sub_81033DC sub_81033DC: @ 81033DC push {r4,lr} - ldr r0, _08103414 @ =0x02000000 + ldr r0, _08103414 @ =gSharedMem ldrb r3, [r0, 0x7] adds r4, r3, 0 ldrb r2, [r0, 0x4] @@ -3719,7 +3719,7 @@ _081033F6: pop {r1} bx r1 .align 2, 0 -_08103414: .4byte 0x02000000 +_08103414: .4byte gSharedMem _08103418: .4byte gUnknown_083ECB7C thumb_func_end sub_81033DC @@ -3732,7 +3732,7 @@ sub_810341C: @ 810341C lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _0810345C @ =0x02000000 + ldr r0, _0810345C @ =gSharedMem movs r5, 0 ldrh r1, [r0, 0x36] mov r8, r1 @@ -3757,7 +3757,7 @@ _08103438: movs r0, 0x1 b _0810346E .align 2, 0 -_0810345C: .4byte 0x02000000 +_0810345C: .4byte gSharedMem _08103460: adds r0, r4, 0x1 lsls r0, 16 @@ -3782,7 +3782,7 @@ sub_810347C: @ 810347C push {r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _081034A0 @ =0x02000000 + ldr r0, _081034A0 @ =gSharedMem movs r2, 0x34 ldrsh r1, [r0, r2] movs r2, 0x36 @@ -3795,16 +3795,16 @@ sub_810347C: @ 810347C lsrs r0, 24 b _081034EA .align 2, 0 -_081034A0: .4byte 0x02000000 +_081034A0: .4byte gSharedMem _081034A4: - ldr r0, _081034B0 @ =0x02000000 + ldr r0, _081034B0 @ =gSharedMem strh r5, [r0, 0x32] mov r1, r8 strh r1, [r0, 0x38] movs r0, 0x1 b _081034EA .align 2, 0 -_081034B0: .4byte 0x02000000 +_081034B0: .4byte gSharedMem _081034B4: movs r2, 0x1 mov r8, r2 @@ -3859,13 +3859,13 @@ _08103500: lsls r0, 24 cmp r0, 0 bne _081034FA - ldr r0, _0810351C @ =0x02000000 + ldr r0, _0810351C @ =gSharedMem strh r5, [r0, 0x2E] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810351C: .4byte 0x02000000 +_0810351C: .4byte gSharedMem thumb_func_end sub_81034F4 thumb_func_start sub_8103520 @@ -3896,7 +3896,7 @@ _0810353C: sub_8103540: @ 8103540 push {lr} ldr r1, _0810355C @ =gUnknown_083ECB88 - ldr r0, _08103560 @ =0x02000000 + ldr r0, _08103560 @ =gSharedMem movs r2, 0x12 ldrsh r0, [r0, r2] subs r0, 0x1 @@ -3908,7 +3908,7 @@ sub_8103540: @ 8103540 bx r0 .align 2, 0 _0810355C: .4byte gUnknown_083ECB88 -_08103560: .4byte 0x02000000 +_08103560: .4byte gSharedMem thumb_func_end sub_8103540 thumb_func_start sub_8103564 @@ -3917,7 +3917,7 @@ sub_8103564: @ 8103564 mov r7, r8 push {r7} sub sp, 0x4 - ldr r4, _081035D0 @ =0x02000000 + ldr r4, _081035D0 @ =gSharedMem movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0 @@ -3965,7 +3965,7 @@ _081035AA: strh r5, [r6, 0x30] b _081035E0 .align 2, 0 -_081035D0: .4byte 0x02000000 +_081035D0: .4byte gSharedMem _081035D4: adds r0, r4, 0x1 lsls r0, 16 @@ -3986,7 +3986,7 @@ _081035E0: j5_08111E84: @ 81035EC push {r4-r7,lr} sub sp, 0x4 - ldr r4, _08103650 @ =0x02000000 + ldr r4, _08103650 @ =gSharedMem ldrh r2, [r4, 0x34] movs r1, 0x34 ldrsh r0, [r4, r1] @@ -4032,7 +4032,7 @@ _0810362A: strh r6, [r5, 0x30] b _08103660 .align 2, 0 -_08103650: .4byte 0x02000000 +_08103650: .4byte gSharedMem _08103654: adds r0, r4, 0x1 lsls r0, 16 @@ -4051,7 +4051,7 @@ _08103660: sub_8103668: @ 8103668 push {r4-r7,lr} sub sp, 0x4 - ldr r4, _0810368C @ =0x02000000 + ldr r4, _0810368C @ =gSharedMem ldrh r3, [r4, 0x34] movs r0, 0x34 ldrsh r2, [r4, r0] @@ -4067,15 +4067,15 @@ sub_8103668: @ 8103668 bl j5_08111E84 b _0810375A .align 2, 0 -_0810368C: .4byte 0x02000000 +_0810368C: .4byte gSharedMem _08103690: - ldr r0, _0810369C @ =0x02000000 + ldr r0, _0810369C @ =gSharedMem movs r1, 0 strh r6, [r0, 0x36] strh r1, [r0, 0x30] b _0810375A .align 2, 0 -_0810369C: .4byte 0x02000000 +_0810369C: .4byte gSharedMem _081036A0: movs r0, 0x2 strh r0, [r5, 0x36] @@ -4132,7 +4132,7 @@ _081036DC: ble _081036DC movs r6, 0x1 mov r7, sp - ldr r5, _0810373C @ =0x02000000 + ldr r5, _0810373C @ =gSharedMem _0810370E: ldrh r1, [r5, 0x34] lsls r0, r6, 16 @@ -4158,7 +4158,7 @@ _08103736: strh r6, [r5, 0x30] b _0810375A .align 2, 0 -_0810373C: .4byte 0x02000000 +_0810373C: .4byte gSharedMem _08103740: cmp r4, 0x2 ble _081036AA @@ -4295,7 +4295,7 @@ _08103808: sub_810380C: @ 810380C push {lr} ldr r1, _08103828 @ =gUnknown_083ECB94 - ldr r0, _0810382C @ =0x02000000 + ldr r0, _0810382C @ =gSharedMem movs r2, 0x12 ldrsh r0, [r0, r2] subs r0, 0x1 @@ -4307,14 +4307,14 @@ sub_810380C: @ 810380C bx r0 .align 2, 0 _08103828: .4byte gUnknown_083ECB94 -_0810382C: .4byte 0x02000000 +_0810382C: .4byte gSharedMem thumb_func_end sub_810380C thumb_func_start sub_8103830 sub_8103830: @ 8103830 push {r4-r7,lr} movs r6, 0 - ldr r7, _08103868 @ =0x02000000 + ldr r7, _08103868 @ =gSharedMem ldrh r1, [r7, 0x2E] movs r4, 0x2 subs r1, r4, r1 @@ -4338,7 +4338,7 @@ sub_8103830: @ 8103830 movs r4, 0x2 b _08103876 .align 2, 0 -_08103868: .4byte 0x02000000 +_08103868: .4byte gSharedMem _0810386C: lsls r0, r6, 16 movs r1, 0x80 @@ -4418,13 +4418,13 @@ _081038E8: cmp r5, r0 beq _081038E2 _08103900: - ldr r0, _0810390C @ =0x02000000 + ldr r0, _0810390C @ =gSharedMem strh r6, [r0, 0x32] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0810390C: .4byte 0x02000000 +_0810390C: .4byte gSharedMem thumb_func_end sub_8103830 thumb_func_start sub_8103910 @@ -4437,7 +4437,7 @@ sub_8103910: @ 8103910 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r4, _08103978 @ =0x02000000 + ldr r4, _08103978 @ =gSharedMem movs r2, 0x36 ldrsh r1, [r4, r2] cmp r1, 0 @@ -4478,7 +4478,7 @@ sub_8103910: @ 8103910 movs r5, 0 b _08103982 .align 2, 0 -_08103978: .4byte 0x02000000 +_08103978: .4byte gSharedMem _0810397C: adds r0, r5, 0x1 lsls r0, 16 @@ -4488,7 +4488,7 @@ _08103982: asrs r5, r6, 16 cmp r5, 0x4 bgt _081039A6 - ldr r0, _08103A34 @ =0x02000000 + ldr r0, _08103A34 @ =gSharedMem ldrh r1, [r0, 0x36] subs r1, r5 lsls r1, 16 @@ -4502,7 +4502,7 @@ _08103982: lsrs r6, 16 str r6, [sp] _081039A6: - ldr r0, _08103A34 @ =0x02000000 + ldr r0, _08103A34 @ =gSharedMem mov r9, r0 _081039AA: movs r5, 0x1 @@ -4572,7 +4572,7 @@ _08103A24: mov r8, r0 b _08103A46 .align 2, 0 -_08103A34: .4byte 0x02000000 +_08103A34: .4byte gSharedMem _08103A38: movs r2, 0x80 lsls r2, 9 @@ -4594,7 +4594,7 @@ _08103A46: str r0, [sp] b _081039AA _08103A5C: - ldr r0, _08103A74 @ =0x02000000 + ldr r0, _08103A74 @ =gSharedMem mov r3, sp ldrh r3, [r3] strh r3, [r0, 0x32] @@ -4607,7 +4607,7 @@ _08103A5C: pop {r0} bx r0 .align 2, 0 -_08103A74: .4byte 0x02000000 +_08103A74: .4byte gSharedMem thumb_func_end sub_8103910 thumb_func_start sub_8103A78 @@ -4616,7 +4616,7 @@ sub_8103A78: @ 8103A78 mov r7, r8 push {r7} bl sub_8103910 - ldr r4, _08103B10 @ =0x02000000 + ldr r4, _08103B10 @ =gSharedMem movs r0, 0x36 ldrsh r1, [r4, r0] cmp r1, 0 @@ -4686,7 +4686,7 @@ _08103AE8: strh r0, [r7, 0x32] b _08103B20 .align 2, 0 -_08103B10: .4byte 0x02000000 +_08103B10: .4byte gSharedMem _08103B14: adds r0, r5, 0x1 lsls r0, 16 @@ -4695,7 +4695,7 @@ _08103B14: cmp r0, 0x4 ble _08103AE8 _08103B20: - ldr r7, _08103B90 @ =0x02000000 + ldr r7, _08103B90 @ =gSharedMem _08103B22: ldrh r0, [r7, 0x2E] movs r1, 0x1 @@ -4749,9 +4749,9 @@ _08103B88: strh r0, [r7, 0x32] b _08103B22 .align 2, 0 -_08103B90: .4byte 0x02000000 +_08103B90: .4byte gSharedMem _08103B94: - ldr r7, _08103C04 @ =0x02000000 + ldr r7, _08103C04 @ =gSharedMem _08103B96: ldrh r0, [r7, 0x2E] movs r1, 0x3 @@ -4805,7 +4805,7 @@ _08103BFC: strh r0, [r7, 0x32] b _08103B96 .align 2, 0 -_08103C04: .4byte 0x02000000 +_08103C04: .4byte gSharedMem _08103C08: pop {r3} mov r8, r3 @@ -5059,7 +5059,7 @@ sub_8103DC8: @ 8103DC8 push {r4-r6,lr} movs r4, 0 ldr r6, _08103DF8 @ =gSprites - ldr r5, _08103DFC @ =0x02000044 + ldr r5, _08103DFC @ =gSharedMem + 0x44 _08103DD0: ldr r0, _08103E00 @ =sub_8103EE4 bl CreateInvisibleSprite @@ -5082,7 +5082,7 @@ _08103DD0: bx r0 .align 2, 0 _08103DF8: .4byte gSprites -_08103DFC: .4byte 0x02000044 +_08103DFC: .4byte gSharedMem + 0x44 _08103E00: .4byte sub_8103EE4 thumb_func_end sub_8103DC8 @@ -5090,7 +5090,7 @@ _08103E00: .4byte sub_8103EE4 sub_8103E04: @ 8103E04 lsls r0, 24 lsrs r0, 24 - ldr r1, _08103E30 @ =0x02000000 + ldr r1, _08103E30 @ =gSharedMem adds r1, 0x44 adds r0, r1 ldrb r1, [r0] @@ -5111,7 +5111,7 @@ sub_8103E04: @ 8103E04 strh r2, [r0, 0x3C] bx lr .align 2, 0 -_08103E30: .4byte 0x02000000 +_08103E30: .4byte gSharedMem _08103E34: .4byte gSprites thumb_func_end sub_8103E04 @@ -5119,7 +5119,7 @@ _08103E34: .4byte gSprites sub_8103E38: @ 8103E38 push {r4,r5,lr} movs r2, 0 - ldr r4, _08103E60 @ =0x02000044 + ldr r4, _08103E60 @ =gSharedMem + 0x44 ldr r3, _08103E64 @ =gSprites _08103E40: adds r0, r2, r4 @@ -5139,7 +5139,7 @@ _08103E40: movs r0, 0 b _08103E74 .align 2, 0 -_08103E60: .4byte 0x02000044 +_08103E60: .4byte gSharedMem + 0x44 _08103E64: .4byte gSprites _08103E68: adds r0, r2, 0x1 @@ -5158,7 +5158,7 @@ _08103E74: sub_8103E7C: @ 8103E7C push {r4,r5,lr} movs r4, 0 - ldr r5, _08103E94 @ =0x02000044 + ldr r5, _08103E94 @ =gSharedMem + 0x44 _08103E82: adds r0, r4, r5 ldrb r0, [r0] @@ -5169,7 +5169,7 @@ _08103E82: movs r0, 0 b _08103EA4 .align 2, 0 -_08103E94: .4byte 0x02000044 +_08103E94: .4byte gSharedMem + 0x44 _08103E98: adds r0, r4, 0x1 lsls r0, 24 @@ -5414,20 +5414,20 @@ sub_8104048: @ 8104048 ldr r0, _0810405C @ =sub_81040E8 movs r1, 0x8 bl CreateTask - ldr r1, _08104060 @ =0x02000000 + ldr r1, _08104060 @ =gSharedMem adds r1, 0x3E strb r0, [r1] pop {r0} bx r0 .align 2, 0 _0810405C: .4byte sub_81040E8 -_08104060: .4byte 0x02000000 +_08104060: .4byte gSharedMem thumb_func_end sub_8104048 thumb_func_start sub_8104064 sub_8104064: @ 8104064 push {r4,lr} - ldr r0, _08104090 @ =0x02000000 + ldr r0, _08104090 @ =gSharedMem adds r0, 0x3E ldrb r0, [r0] lsls r4, r0, 2 @@ -5447,14 +5447,14 @@ sub_8104064: @ 8104064 pop {r0} bx r0 .align 2, 0 -_08104090: .4byte 0x02000000 +_08104090: .4byte gSharedMem _08104094: .4byte gTasks thumb_func_end sub_8104064 thumb_func_start sub_8104098 sub_8104098: @ 8104098 push {r4,lr} - ldr r0, _081040C0 @ =0x02000000 + ldr r0, _081040C0 @ =gSharedMem adds r0, 0x3E ldrb r0, [r0] lsls r4, r0, 2 @@ -5472,14 +5472,14 @@ sub_8104098: @ 8104098 pop {r0} bx r0 .align 2, 0 -_081040C0: .4byte 0x02000000 +_081040C0: .4byte gSharedMem _081040C4: .4byte gTasks thumb_func_end sub_8104098 thumb_func_start sub_81040C8 sub_81040C8: @ 81040C8 ldr r2, _081040E0 @ =gTasks - ldr r0, _081040E4 @ =0x02000000 + ldr r0, _081040E4 @ =gSharedMem adds r0, 0x3E ldrb r1, [r0] lsls r0, r1, 2 @@ -5492,7 +5492,7 @@ sub_81040C8: @ 81040C8 bx lr .align 2, 0 _081040E0: .4byte gTasks -_081040E4: .4byte 0x02000000 +_081040E4: .4byte gSharedMem thumb_func_end sub_81040C8 thumb_func_start sub_81040E8 @@ -5701,7 +5701,7 @@ sub_810423C: @ 810423C movs r4, 0 ldr r0, _0810426C @ =gTasks mov r8, r0 - ldr r1, _08104270 @ =0x02000000 + ldr r1, _08104270 @ =gSharedMem mov r12, r1 cmp r4, r5 bge _081042A6 @@ -5717,7 +5717,7 @@ _0810425A: .align 2, 0 _08104268: .4byte 0x0600e800 _0810426C: .4byte gTasks -_08104270: .4byte 0x02000000 +_08104270: .4byte gSharedMem _08104274: .4byte gUnknown_083ECBC4 _08104278: cmp r0, 0xF @@ -5866,7 +5866,7 @@ _08104378: .4byte gTasks thumb_func_start sub_810437C sub_810437C: @ 810437C push {lr} - ldr r1, _081043DC @ =0x02000000 + ldr r1, _081043DC @ =gSharedMem movs r2, 0 strb r2, [r1, 0xA] strh r2, [r1, 0x14] @@ -5904,7 +5904,7 @@ sub_810437C: @ 810437C pop {r0} bx r0 .align 2, 0 -_081043DC: .4byte 0x02000000 +_081043DC: .4byte gSharedMem _081043E0: .4byte gSpriteCoordOffsetX _081043E4: .4byte gSpriteCoordOffsetY _081043E8: .4byte REG_BG1HOFS @@ -6041,7 +6041,7 @@ sub_8104498: @ 8104498 movs r1, 0 ldrsh r0, [r6, r1] bl sub_81057E8 - ldr r0, _08104540 @ =0x02000000 + ldr r0, _08104540 @ =gSharedMem adds r0, 0x3F ldrb r1, [r0] lsls r0, r1, 4 @@ -6076,7 +6076,7 @@ _08104526: _08104534: .4byte gUnknown_083ECC1C _08104538: .4byte gUnknown_083ECC20 _0810453C: .4byte gUnknown_083ECC28 -_08104540: .4byte 0x02000000 +_08104540: .4byte gSharedMem _08104544: .4byte gSprites thumb_func_end sub_8104498 @@ -6102,7 +6102,7 @@ sub_8104548: @ 8104548 strh r0, [r4, 0x12] movs r0, 0x2 bl sub_81057E8 - ldr r0, _08104590 @ =0x02000000 + ldr r0, _08104590 @ =gSharedMem adds r0, 0x3F ldrb r1, [r0] lsls r0, r1, 4 @@ -6117,7 +6117,7 @@ _0810458A: pop {r0} bx r0 .align 2, 0 -_08104590: .4byte 0x02000000 +_08104590: .4byte gSharedMem _08104594: .4byte gSprites thumb_func_end sub_8104548 @@ -6170,7 +6170,7 @@ sub_81045CC: @ 81045CC ble _08104634 movs r0, 0 strh r0, [r4, 0x12] - ldr r1, _0810460C @ =0x02000000 + ldr r1, _0810460C @ =gSharedMem ldrb r0, [r1, 0x5] cmp r0, 0 beq _08104610 @@ -6183,7 +6183,7 @@ sub_81045CC: @ 81045CC adds r0, 0x1 b _0810462C .align 2, 0 -_0810460C: .4byte 0x02000000 +_0810460C: .4byte gSharedMem _08104610: movs r1, 0x14 ldrsh r0, [r4, r1] @@ -6215,7 +6215,7 @@ _08104634: sub_810463C: @ 810463C push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _08104660 @ =0x02000000 + ldr r6, _08104660 @ =gSharedMem movs r1, 0x14 ldrsh r0, [r6, r1] movs r1, 0x14 @@ -6230,7 +6230,7 @@ sub_810463C: @ 810463C bl sub_8102D5C b _08104688 .align 2, 0 -_08104660: .4byte 0x02000000 +_08104660: .4byte gSharedMem _08104664: movs r0, 0x1 bl sub_8102C48 @@ -6260,7 +6260,7 @@ _08104692: bne _081046B4 movs r0, 0x1 bl sub_8102C48 - ldr r1, _081046BC @ =0x02000000 + ldr r1, _081046BC @ =gSharedMem lsls r0, 24 lsrs r0, 24 ldrb r1, [r1, 0x5] @@ -6275,7 +6275,7 @@ _081046B4: pop {r0} bx r0 .align 2, 0 -_081046BC: .4byte 0x02000000 +_081046BC: .4byte gSharedMem thumb_func_end sub_810463C thumb_func_start sub_81046C0 @@ -6296,7 +6296,7 @@ sub_81046C0: @ 81046C0 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r5, _08104710 @ =0x02000000 + ldr r5, _08104710 @ =gSharedMem ldrb r0, [r5, 0x5] cmp r0, 0 bne _0810471C @@ -6316,7 +6316,7 @@ sub_81046C0: @ 81046C0 bl PlayFanfare b _08104758 .align 2, 0 -_08104710: .4byte 0x02000000 +_08104710: .4byte gSharedMem _08104714: .4byte gSprites _08104718: .4byte 0x00000187 _0810471C: @@ -6434,7 +6434,7 @@ _081047E6: sub_81047EC: @ 81047EC push {r4-r6,lr} adds r5, r0, 0 - ldr r4, _08104834 @ =0x02000000 + ldr r4, _08104834 @ =gSharedMem movs r6, 0 strb r6, [r4, 0xB] ldrb r0, [r4, 0x5] @@ -6462,7 +6462,7 @@ sub_81047EC: @ 81047EC bl DestroyTask b _0810485A .align 2, 0 -_08104834: .4byte 0x02000000 +_08104834: .4byte gSharedMem _08104838: .4byte gSpriteCoordOffsetX _0810483C: .4byte REG_BG1HOFS _08104840: .4byte sub_810434C @@ -6486,7 +6486,7 @@ _0810485A: sub_8104860: @ 8104860 push {r4-r6,lr} adds r4, r0, 0 - ldr r5, _0810487C @ =0x02000000 + ldr r5, _0810487C @ =gSharedMem ldrh r0, [r5, 0x1A] lsls r6, r0, 16 asrs r1, r6, 16 @@ -6499,7 +6499,7 @@ sub_8104860: @ 8104860 strh r0, [r4, 0x8] b _081048A2 .align 2, 0 -_0810487C: .4byte 0x02000000 +_0810487C: .4byte gSharedMem _08104880: movs r1, 0x1C ldrsh r0, [r5, r1] @@ -6551,7 +6551,7 @@ sub_81048CC: @ 81048CC bl sub_8105804 bl sub_8105854 ldr r5, _08104934 @ =gSprites - ldr r3, _08104938 @ =0x02000000 + ldr r3, _08104938 @ =gSharedMem adds r0, r3, 0 adds r0, 0x4E ldrb r1, [r0] @@ -6589,7 +6589,7 @@ sub_81048CC: @ 81048CC bx r0 .align 2, 0 _08104934: .4byte gSprites -_08104938: .4byte 0x02000000 +_08104938: .4byte gSharedMem _0810493C: .4byte 0x00000187 thumb_func_end sub_81048CC @@ -6632,7 +6632,7 @@ _08104974: bl sub_8105284 bl sub_81059E8 ldr r2, _081049C0 @ =gSprites - ldr r0, _081049C4 @ =0x02000000 + ldr r0, _081049C4 @ =gSharedMem adds r0, 0x4E ldrb r1, [r0] lsls r0, r1, 4 @@ -6657,7 +6657,7 @@ _081049B0: _081049B8: .4byte gSpriteCoordOffsetY _081049BC: .4byte REG_BG1VOFS _081049C0: .4byte gSprites -_081049C4: .4byte 0x02000000 +_081049C4: .4byte gSharedMem thumb_func_end sub_8104940 thumb_func_start sub_81049C8 @@ -6694,7 +6694,7 @@ sub_81049F8: @ 81049F8 strh r1, [r0] ldr r0, _08104A34 @ =REG_BG1HOFS strh r1, [r0] - ldr r0, _08104A38 @ =0x02000000 + ldr r0, _08104A38 @ =gSharedMem adds r0, 0x60 ldrh r0, [r0] bl PlayNewMapMusic @@ -6712,7 +6712,7 @@ sub_81049F8: @ 81049F8 .align 2, 0 _08104A30: .4byte gSpriteCoordOffsetX _08104A34: .4byte REG_BG1HOFS -_08104A38: .4byte 0x02000000 +_08104A38: .4byte gSharedMem _08104A3C: .4byte sub_810434C thumb_func_end sub_81049F8 @@ -6972,7 +6972,7 @@ sub_8104BFC: @ 8104BFC bl sub_81064B8 ldrb r0, [r4, 0xA] bl sub_8104CAC - ldr r0, _08104C40 @ =0x02000000 + ldr r0, _08104C40 @ =gSharedMem ldrb r0, [r0, 0x2] bl sub_810423C movs r0, 0x1 @@ -6991,7 +6991,7 @@ sub_8104BFC: @ 8104BFC bx r0 .align 2, 0 _08104C3C: .4byte gWindowConfig_81E7128 -_08104C40: .4byte 0x02000000 +_08104C40: .4byte gSharedMem thumb_func_end sub_8104BFC thumb_func_start sub_8104C44 @@ -7016,7 +7016,7 @@ sub_8104C5C: @ 8104C5C bl CreateTask lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _08104CA0 @ =0x02000000 + ldr r0, _08104CA0 @ =gSharedMem adds r0, 0x3D strb r1, [r0] lsls r0, r1, 2 @@ -7043,7 +7043,7 @@ _08104C86: bx r0 .align 2, 0 _08104C9C: .4byte sub_8104E74 -_08104CA0: .4byte 0x02000000 +_08104CA0: .4byte gSharedMem _08104CA4: .4byte gTasks _08104CA8: .4byte 0x0000ffff thumb_func_end sub_8104C5C @@ -7060,7 +7060,7 @@ sub_8104D30: @ 8104D30 ldr r4, [sp, 0x1C] lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08104D84 @ =0x02000000 + ldr r0, _08104D84 @ =gSharedMem adds r0, 0x3D ldrb r1, [r0] lsls r0, r1, 2 @@ -7094,7 +7094,7 @@ _08104D5C: strh r0, [r4] b _08104D96 .align 2, 0 -_08104D84: .4byte 0x02000000 +_08104D84: .4byte gSharedMem _08104D88: .4byte gTasks _08104D8C: adds r0, r5, 0x1 @@ -7114,7 +7114,7 @@ _08104D96: thumb_func_start sub_8104DA4 sub_8104DA4: @ 8104DA4 push {r4-r6,lr} - ldr r0, _08104E04 @ =0x02000000 + ldr r0, _08104E04 @ =gSharedMem adds r0, 0x3D ldrb r1, [r0] lsls r0, r1, 2 @@ -7163,7 +7163,7 @@ _08104DF4: pop {r0} bx r0 .align 2, 0 -_08104E04: .4byte 0x02000000 +_08104E04: .4byte gSharedMem _08104E08: .4byte gTasks _08104E0C: .4byte 0x0000ffff _08104E10: .4byte gUnknown_083ED064 @@ -7173,7 +7173,7 @@ _08104E14: .4byte gSprites thumb_func_start sub_8104E18 sub_8104E18: @ 8104E18 push {r4,r5,lr} - ldr r0, _08104E54 @ =0x02000000 + ldr r0, _08104E54 @ =gSharedMem adds r0, 0x3D ldrb r1, [r0] lsls r0, r1, 2 @@ -7203,7 +7203,7 @@ _08104E32: movs r0, 0 b _08104E6C .align 2, 0 -_08104E54: .4byte 0x02000000 +_08104E54: .4byte gSharedMem _08104E58: .4byte gTasks _08104E5C: .4byte gSprites _08104E60: @@ -7311,7 +7311,7 @@ _08104F14: .4byte 0x0000ffff sub_8104F18: @ 8104F18 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08104F88 @ =0x02000000 + ldr r4, _08104F88 @ =gSharedMem movs r0, 0x2E ldrsh r1, [r5, r0] lsls r1, 1 @@ -7360,7 +7360,7 @@ sub_8104F18: @ 8104F18 pop {r0} bx r0 .align 2, 0 -_08104F88: .4byte 0x02000000 +_08104F88: .4byte gSharedMem thumb_func_end sub_8104F18 thumb_func_start sub_8104F8C @@ -7483,7 +7483,7 @@ _08105068: .4byte 0x0000ffff sub_810506C: @ 810506C push {r4,lr} adds r4, r0, 0 - ldr r1, _081050C0 @ =0x02000000 + ldr r1, _081050C0 @ =gSharedMem ldrh r2, [r1, 0xC] movs r3, 0x2E ldrsh r0, [r4, r3] @@ -7521,7 +7521,7 @@ _081050B8: pop {r0} bx r0 .align 2, 0 -_081050C0: .4byte 0x02000000 +_081050C0: .4byte gSharedMem thumb_func_end sub_810506C thumb_func_start sub_81050C4 @@ -7582,7 +7582,7 @@ sub_8105100: @ 8105100 movs r3, 0x2 orrs r1, r3 strb r1, [r2] - ldr r1, _08105148 @ =0x02000000 + ldr r1, _08105148 @ =gSharedMem adds r1, 0x3F strb r0, [r1] pop {r0} @@ -7590,13 +7590,13 @@ sub_8105100: @ 8105100 .align 2, 0 _08105140: .4byte gSpriteTemplate_83ED45C _08105144: .4byte gSprites -_08105148: .4byte 0x02000000 +_08105148: .4byte gSharedMem thumb_func_end sub_8105100 thumb_func_start sub_810514C sub_810514C: @ 810514C push {lr} - ldr r0, _08105168 @ =0x02000000 + ldr r0, _08105168 @ =gSharedMem adds r0, 0x3F ldrb r1, [r0] lsls r0, r1, 4 @@ -7608,7 +7608,7 @@ sub_810514C: @ 810514C pop {r0} bx r0 .align 2, 0 -_08105168: .4byte 0x02000000 +_08105168: .4byte gSharedMem _0810516C: .4byte gSprites thumb_func_end sub_810514C @@ -7702,7 +7702,7 @@ sub_81051C0: @ 81051C0 ldr r1, _08105274 @ =gSubspriteTables_83ED73C adds r0, r2, 0 bl SetSubspriteTables - ldr r6, _08105278 @ =0x02000000 + ldr r6, _08105278 @ =gSharedMem adds r0, r6, 0 adds r0, 0x49 strb r4, [r0] @@ -7746,7 +7746,7 @@ sub_81051C0: @ 81051C0 _0810526C: .4byte gSpriteTemplate_83ED474 _08105270: .4byte gSprites _08105274: .4byte gSubspriteTables_83ED73C -_08105278: .4byte 0x02000000 +_08105278: .4byte gSharedMem _0810527C: .4byte gSpriteTemplate_83ED48C _08105280: .4byte gSubspriteTables_83ED75C thumb_func_end sub_81051C0 @@ -7787,7 +7787,7 @@ sub_8105284: @ 8105284 strb r1, [r3] ldr r1, _081052E4 @ =gSubspriteTables_83ED78C bl SetSubspriteTables - ldr r0, _081052E8 @ =0x02000000 + ldr r0, _081052E8 @ =gSharedMem adds r0, 0x42 strb r4, [r0] pop {r4} @@ -7798,7 +7798,7 @@ _081052D8: .4byte gSpriteTemplate_83ED4A4 _081052DC: .4byte gSpriteCoordOffsetX _081052E0: .4byte gSprites _081052E4: .4byte gSubspriteTables_83ED78C -_081052E8: .4byte 0x02000000 +_081052E8: .4byte gSharedMem thumb_func_end sub_8105284 thumb_func_start sub_81052EC @@ -7806,7 +7806,7 @@ sub_81052EC: @ 81052EC push {r4-r7,lr} movs r4, 0 movs r5, 0 - ldr r6, _08105350 @ =0x0200004b + ldr r6, _08105350 @ =gSharedMem + 0x4B _081052F4: ldr r0, _08105354 @ =gSpriteTemplate_83ED4BC movs r1, 0xB8 @@ -7854,7 +7854,7 @@ _081052F4: pop {r0} bx r0 .align 2, 0 -_08105350: .4byte 0x0200004b +_08105350: .4byte gSharedMem + 0x4B _08105354: .4byte gSpriteTemplate_83ED4BC _08105358: .4byte gSprites thumb_func_end sub_81052EC @@ -7863,7 +7863,7 @@ _08105358: .4byte gSprites sub_810535C: @ 810535C push {r4,lr} adds r4, r0, 0 - ldr r1, _0810539C @ =0x02000000 + ldr r1, _0810539C @ =gSharedMem ldrh r0, [r4, 0x3C] ldrh r1, [r1, 0x14] adds r0, r1 @@ -7890,7 +7890,7 @@ sub_810535C: @ 810535C pop {r0} bx r0 .align 2, 0 -_0810539C: .4byte 0x02000000 +_0810539C: .4byte gSharedMem thumb_func_end sub_810535C thumb_func_start sub_81053A0 @@ -7937,7 +7937,7 @@ sub_81053A0: @ 81053A0 adds r0, r2, 0 mov r1, r9 bl SetSubspriteTables - ldr r6, _08105458 @ =0x02000000 + ldr r6, _08105458 @ =gSharedMem adds r0, r6, 0 adds r0, 0x4E strb r4, [r0] @@ -7981,7 +7981,7 @@ sub_81053A0: @ 81053A0 _0810544C: .4byte gSpriteTemplate_83ED4D4 _08105450: .4byte gSprites _08105454: .4byte gSubspriteTables_83ED7B4 -_08105458: .4byte 0x02000000 +_08105458: .4byte gSharedMem thumb_func_end sub_81053A0 thumb_func_start sub_810545C @@ -8016,7 +8016,7 @@ sub_810545C: @ 810545C strb r1, [r0, 0x5] ldr r1, _081054B0 @ =gSubspriteTables_83ED7D4 bl SetSubspriteTables - ldr r0, _081054B4 @ =0x02000000 + ldr r0, _081054B4 @ =gSharedMem adds r0, 0x40 strb r4, [r0] pop {r4} @@ -8026,13 +8026,13 @@ sub_810545C: @ 810545C _081054A8: .4byte gSpriteTemplate_83ED4EC _081054AC: .4byte gSprites _081054B0: .4byte gSubspriteTables_83ED7D4 -_081054B4: .4byte 0x02000000 +_081054B4: .4byte gSharedMem thumb_func_end sub_810545C thumb_func_start sub_81054B8 sub_81054B8: @ 81054B8 push {r4,r5,lr} - ldr r4, _08105518 @ =0x02000000 + ldr r4, _08105518 @ =gSharedMem adds r0, r4, 0 adds r0, 0x40 ldrb r1, [r0] @@ -8059,7 +8059,7 @@ _081054D4: cmp r5, 0x1 bls _081054D4 movs r5, 0 - ldr r4, _08105520 @ =0x0200004b + ldr r4, _08105520 @ =gSharedMem + 0x4B _081054F4: adds r0, r5, r4 ldrb r1, [r0] @@ -8078,16 +8078,16 @@ _081054F4: pop {r0} bx r0 .align 2, 0 -_08105518: .4byte 0x02000000 +_08105518: .4byte gSharedMem _0810551C: .4byte gSprites -_08105520: .4byte 0x0200004b +_08105520: .4byte gSharedMem + 0x4B thumb_func_end sub_81054B8 thumb_func_start sub_8105524 sub_8105524: @ 8105524 push {r4,r5,lr} movs r4, 0 - ldr r5, _0810554C @ =0x0200004e + ldr r5, _0810554C @ =gSharedMem + 0x4E _0810552A: adds r0, r4, r5 ldrb r1, [r0] @@ -8106,14 +8106,14 @@ _0810552A: pop {r0} bx r0 .align 2, 0 -_0810554C: .4byte 0x0200004e +_0810554C: .4byte gSharedMem + 0x4E _08105550: .4byte gSprites thumb_func_end sub_8105524 thumb_func_start sub_8105554 sub_8105554: @ 8105554 push {lr} - ldr r0, _08105570 @ =0x02000000 + ldr r0, _08105570 @ =gSharedMem adds r0, 0x42 ldrb r1, [r0] lsls r0, r1, 4 @@ -8125,7 +8125,7 @@ sub_8105554: @ 8105554 pop {r0} bx r0 .align 2, 0 -_08105570: .4byte 0x02000000 +_08105570: .4byte gSharedMem _08105574: .4byte gSprites thumb_func_end sub_8105554 @@ -8166,7 +8166,7 @@ sub_8105578: @ 8105578 movs r2, 0x1 orrs r1, r2 strb r1, [r5] - ldr r5, _08105624 @ =0x02000000 + ldr r5, _08105624 @ =gSharedMem adds r1, r5, 0 adds r1, 0x50 strb r0, [r1] @@ -8213,7 +8213,7 @@ sub_8105578: @ 8105578 .align 2, 0 _0810561C: .4byte gSpriteTemplate_83ED504 _08105620: .4byte gSprites -_08105624: .4byte 0x02000000 +_08105624: .4byte gSharedMem _08105628: .4byte 0x0000ffff thumb_func_end sub_8105578 @@ -8275,7 +8275,7 @@ sub_8105688: @ 8105688 lsls r0, 16 lsrs r0, 16 ldr r4, _081056B8 @ =gSprites - ldr r3, _081056BC @ =0x02000000 + ldr r3, _081056BC @ =gSharedMem adds r1, r3, 0 adds r1, 0x50 ldrb r2, [r1] @@ -8296,14 +8296,14 @@ sub_8105688: @ 8105688 bx r0 .align 2, 0 _081056B8: .4byte gSprites -_081056BC: .4byte 0x02000000 +_081056BC: .4byte gSharedMem thumb_func_end sub_8105688 thumb_func_start sub_81056C0 sub_81056C0: @ 81056C0 push {r4,r5,lr} movs r4, 0 - ldr r5, _081056E8 @ =0x02000050 + ldr r5, _081056E8 @ =gSharedMem + 0x50 _081056C6: adds r0, r4, r5 ldrb r1, [r0] @@ -8322,7 +8322,7 @@ _081056C6: pop {r0} bx r0 .align 2, 0 -_081056E8: .4byte 0x02000050 +_081056E8: .4byte gSharedMem + 0x50 _081056EC: .4byte gSprites thumb_func_end sub_81056C0 @@ -8362,7 +8362,7 @@ sub_81056F0: @ 81056F0 strh r1, [r2, 0x3A] movs r1, 0x8 strh r1, [r2, 0x3C] - ldr r5, _08105780 @ =0x02000000 + ldr r5, _08105780 @ =gSharedMem adds r1, r5, 0 adds r1, 0x52 strb r0, [r1] @@ -8397,7 +8397,7 @@ sub_81056F0: @ 81056F0 .align 2, 0 _08105778: .4byte gSpriteTemplate_83ED51C _0810577C: .4byte gSprites -_08105780: .4byte 0x02000000 +_08105780: .4byte gSharedMem thumb_func_end sub_81056F0 thumb_func_start sub_8105784 @@ -8453,7 +8453,7 @@ _081057E4: .4byte 0x01030000 thumb_func_start sub_81057E8 sub_81057E8: @ 81057E8 ldr r3, _081057FC @ =gSprites - ldr r1, _08105800 @ =0x02000000 + ldr r1, _08105800 @ =gSharedMem adds r1, 0x52 ldrb r2, [r1] lsls r1, r2, 4 @@ -8464,7 +8464,7 @@ sub_81057E8: @ 81057E8 bx lr .align 2, 0 _081057FC: .4byte gSprites -_08105800: .4byte 0x02000000 +_08105800: .4byte gSharedMem thumb_func_end sub_81057E8 thumb_func_start sub_8105804 @@ -8482,7 +8482,7 @@ sub_8105804: @ 8105804 movs r3, 0 bl MultiplyInvertedPaletteRGBComponents movs r4, 0 - ldr r5, _0810584C @ =0x02000052 + ldr r5, _0810584C @ =gSharedMem + 0x52 _08105824: adds r0, r4, r5 ldrb r1, [r0] @@ -8502,7 +8502,7 @@ _08105824: bx r0 .align 2, 0 _08105848: .4byte 0x01030000 -_0810584C: .4byte 0x02000052 +_0810584C: .4byte gSharedMem + 0x52 _08105850: .4byte gSprites thumb_func_end sub_8105804 @@ -8528,7 +8528,7 @@ sub_8105854: @ 8105854 movs r3, 0x4 orrs r2, r3 strb r2, [r1, 0x5] - ldr r1, _08105890 @ =0x02000000 + ldr r1, _08105890 @ =gSharedMem adds r1, 0x41 strb r0, [r1] pop {r0} @@ -8536,7 +8536,7 @@ sub_8105854: @ 8105854 .align 2, 0 _08105888: .4byte gSpriteTemplate_83ED534 _0810588C: .4byte gSprites -_08105890: .4byte 0x02000000 +_08105890: .4byte gSharedMem thumb_func_end sub_8105854 thumb_func_start sub_8105894 @@ -8552,7 +8552,7 @@ _0810589C: .4byte gSpriteCoordOffsetY thumb_func_start sub_81058A0 sub_81058A0: @ 81058A0 push {lr} - ldr r0, _081058BC @ =0x02000000 + ldr r0, _081058BC @ =gSharedMem adds r0, 0x41 ldrb r1, [r0] lsls r0, r1, 4 @@ -8564,7 +8564,7 @@ sub_81058A0: @ 81058A0 pop {r0} bx r0 .align 2, 0 -_081058BC: .4byte 0x02000000 +_081058BC: .4byte gSharedMem _081058C0: .4byte gSprites thumb_func_end sub_81058A0 @@ -8577,7 +8577,7 @@ sub_81058C4: @ 81058C4 movs r2, 0x8 bl memcpy movs r4, 0 - ldr r5, _0810593C @ =0x02000054 + ldr r5, _0810593C @ =gSharedMem + 0x54 _081058D6: ldr r0, _08105940 @ =gSpriteCoordOffsetX ldrh r0, [r0] @@ -8629,7 +8629,7 @@ _081058D6: bx r0 .align 2, 0 _08105938: .4byte gUnknown_083ECC5A -_0810593C: .4byte 0x02000054 +_0810593C: .4byte gSharedMem + 0x54 _08105940: .4byte gSpriteCoordOffsetX _08105944: .4byte gSpriteTemplate_83ED54C _08105948: .4byte gSprites @@ -8696,7 +8696,7 @@ _081059B0: sub_81059B8: @ 81059B8 push {r4,r5,lr} movs r4, 0 - ldr r5, _081059E0 @ =0x02000054 + ldr r5, _081059E0 @ =gSharedMem + 0x54 _081059BE: adds r0, r4, r5 ldrb r1, [r0] @@ -8715,7 +8715,7 @@ _081059BE: pop {r0} bx r0 .align 2, 0 -_081059E0: .4byte 0x02000054 +_081059E0: .4byte gSharedMem + 0x54 _081059E4: .4byte gSprites thumb_func_end sub_81059B8 @@ -8747,7 +8747,7 @@ sub_81059E8: @ 81059E8 orrs r1, r2 strb r1, [r0, 0x1] bl InitSpriteAffineAnim - ldr r0, _08105A34 @ =0x02000000 + ldr r0, _08105A34 @ =gSharedMem adds r0, 0x43 strb r4, [r0] pop {r4} @@ -8756,7 +8756,7 @@ sub_81059E8: @ 81059E8 .align 2, 0 _08105A2C: .4byte gSpriteTemplate_83ED564 _08105A30: .4byte gSprites -_08105A34: .4byte 0x02000000 +_08105A34: .4byte gSharedMem thumb_func_end sub_81059E8 thumb_func_start sub_8105A38 @@ -8842,7 +8842,7 @@ _08105AB4: thumb_func_start sub_8105ACC sub_8105ACC: @ 8105ACC ldr r2, _08105AE4 @ =gSprites - ldr r0, _08105AE8 @ =0x02000000 + ldr r0, _08105AE8 @ =gSharedMem adds r0, 0x43 ldrb r1, [r0] lsls r0, r1, 4 @@ -8855,13 +8855,13 @@ sub_8105ACC: @ 8105ACC bx lr .align 2, 0 _08105AE4: .4byte gSprites -_08105AE8: .4byte 0x02000000 +_08105AE8: .4byte gSharedMem thumb_func_end sub_8105ACC thumb_func_start sub_8105AEC sub_8105AEC: @ 8105AEC push {r4,lr} - ldr r0, _08105B14 @ =0x02000000 + ldr r0, _08105B14 @ =gSharedMem adds r0, 0x43 ldrb r0, [r0] lsls r4, r0, 4 @@ -8879,7 +8879,7 @@ sub_8105AEC: @ 8105AEC pop {r0} bx r0 .align 2, 0 -_08105B14: .4byte 0x02000000 +_08105B14: .4byte gSharedMem _08105B18: .4byte gSprites thumb_func_end sub_8105AEC @@ -9321,7 +9321,7 @@ _08105E24: .4byte _08105E94 .4byte _08105EAA _08105E3C: - ldr r0, _08105E6C @ =0x02000000 + ldr r0, _08105E6C @ =gSharedMem ldrb r1, [r0, 0xA] subs r1, 0x1 lsls r1, 24 @@ -9346,7 +9346,7 @@ _08105E52: strh r0, [r4, 0x30] b _08105EAE .align 2, 0 -_08105E6C: .4byte 0x02000000 +_08105E6C: .4byte gSharedMem _08105E70: ldrh r0, [r4, 0x20] adds r0, 0x4 @@ -9890,7 +9890,7 @@ _08106248: beq _081062FC b _0810634A _08106252: - ldr r2, _081062BC @ =0x02000000 + ldr r2, _081062BC @ =gSharedMem adds r1, r2, 0 adds r1, 0x5C movs r0, 0x2F @@ -9933,7 +9933,7 @@ _08106296: movs r0, 0xD0 strh r0, [r5, 0x34] _081062A2: - ldr r2, _081062BC @ =0x02000000 + ldr r2, _081062BC @ =gSharedMem ldrh r0, [r5, 0x32] lsls r0, 8 ldrh r1, [r5, 0x34] @@ -9947,10 +9947,10 @@ _081062A2: ble _0810634A b _0810633C .align 2, 0 -_081062BC: .4byte 0x02000000 +_081062BC: .4byte gSharedMem _081062C0: .4byte 0x00002088 _081062C4: - ldr r6, _08106354 @ =0x02000000 + ldr r6, _08106354 @ =gSharedMem movs r1, 0x12 ldrsh r0, [r6, r1] cmp r0, 0 @@ -10000,7 +10000,7 @@ _08106318: movs r0, 0xD0 strh r0, [r5, 0x34] _08106324: - ldr r2, _08106354 @ =0x02000000 + ldr r2, _08106354 @ =gSharedMem ldrh r0, [r5, 0x32] lsls r0, 8 ldrh r1, [r5, 0x34] @@ -10026,7 +10026,7 @@ _0810634A: pop {r0} bx r0 .align 2, 0 -_08106354: .4byte 0x02000000 +_08106354: .4byte gSharedMem _08106358: .4byte SpriteCallbackDummy _0810635C: .4byte 0x0000c0e0 thumb_func_end sub_8106230 @@ -10072,7 +10072,7 @@ _08106398: .4byte gUnknown_083EDE20 thumb_func_start sub_810639C sub_810639C: @ 810639C - ldr r2, _081063BC @ =0x02000000 + ldr r2, _081063BC @ =gSharedMem adds r1, r2, 0 adds r1, 0x58 movs r0, 0xF0 @@ -10088,7 +10088,7 @@ sub_810639C: @ 810639C strh r1, [r0] bx lr .align 2, 0 -_081063BC: .4byte 0x02000000 +_081063BC: .4byte gSharedMem thumb_func_end sub_810639C thumb_func_start sub_81063C0 @@ -10096,7 +10096,7 @@ sub_81063C0: @ 81063C0 push {r4,lr} bl sub_8106404 ldr r0, _081063F0 @ =gSlotMachineReelTimeLights_Gfx - ldr r4, _081063F4 @ =0x02010000 + ldr r4, _081063F4 @ =gSharedMem + 0x10000 adds r1, r4, 0 bl LZDecompressWram ldr r0, _081063F8 @ =gUnknown_083EDE8C @@ -10114,7 +10114,7 @@ sub_81063C0: @ 81063C0 bx r0 .align 2, 0 _081063F0: .4byte gSlotMachineReelTimeLights_Gfx -_081063F4: .4byte 0x02010000 +_081063F4: .4byte gSharedMem + 0x10000 _081063F8: .4byte gUnknown_083EDE8C _081063FC: .4byte gUnknown_083EDC2C _08106400: .4byte gSlotMachineSpritePalettes @@ -10123,7 +10123,7 @@ _08106400: .4byte gSlotMachineSpritePalettes thumb_func_start sub_8106404 sub_8106404: @ 8106404 push {r4,r5,lr} - ldr r3, _0810643C @ =0x02010000 + ldr r3, _0810643C @ =gSharedMem + 0x10000 movs r2, 0 ldr r5, _08106440 @ =gUnknown_083EDCDC ldr r0, _08106444 @ =gUnknown_083EDCE4 @@ -10151,7 +10151,7 @@ _08106414: pop {r0} bx r0 .align 2, 0 -_0810643C: .4byte 0x02010000 +_0810643C: .4byte gSharedMem + 0x10000 _08106440: .4byte gUnknown_083EDCDC _08106444: .4byte gUnknown_083EDCE4 thumb_func_end sub_8106404 diff --git a/src/scene/credits.c b/src/scene/credits.c index 3e7247d39..077fc5e0d 100644 --- a/src/scene/credits.c +++ b/src/scene/credits.c @@ -246,7 +246,7 @@ const u8 gUnknown_0840B878[] = }; #ifdef GERMAN -#include "../data/credits_de.h" // TODO, german credits +#include "../data/credits_de.h" #else #include "../data/credits_en.h" #endif |