summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm-de/contest_link_80C2020.s184
-rw-r--r--asm-de/contest_link_80C857C.s40
-rw-r--r--asm-de/easy_chat.s266
-rwxr-xr-xinclude/ewram.h26
-rw-r--r--src/battle/battle_4.c282
-rw-r--r--src/battle/battle_7.c16
-rw-r--r--src/battle/battle_ai.c10
-rw-r--r--src/battle/battle_anim.c8
-rw-r--r--src/battle/battle_interface.c44
-rw-r--r--src/de_rom_8040FE0.c4
-rw-r--r--src/engine/decompress.c3
-rw-r--r--src/engine/trade.c4
-rw-r--r--src/engine/trainer_card.c12
-rw-r--r--src/field/party_menu.c16
-rw-r--r--src/field/shop.c2
-rw-r--r--src/field/slot_machine.c9
-rw-r--r--src/pokemon/pokedex.c159
-rw-r--r--src/scene/contest_painting.c4
-rw-r--r--src/scene/evolution_scene.c224
-rw-r--r--src/scene/intro.c16
20 files changed, 680 insertions, 649 deletions
diff --git a/asm-de/contest_link_80C2020.s b/asm-de/contest_link_80C2020.s
index 65bbf0f22..9f914bbd1 100644
--- a/asm-de/contest_link_80C2020.s
+++ b/asm-de/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
@@ -3413,7 +3413,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]
@@ -3431,7 +3431,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
@@ -3503,7 +3503,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
@@ -3518,7 +3518,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
@@ -3628,7 +3628,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:
@@ -3637,7 +3637,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
@@ -3671,7 +3671,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:
@@ -3679,7 +3679,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
@@ -3703,7 +3703,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
@@ -3769,7 +3769,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
@@ -3783,7 +3783,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
@@ -3818,7 +3818,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
@@ -3848,7 +3848,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
@@ -4020,7 +4020,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
@@ -4149,7 +4149,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:
@@ -4194,7 +4194,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
@@ -4263,7 +4263,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
@@ -4273,7 +4273,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
@@ -4341,7 +4341,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
@@ -4355,7 +4355,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]
@@ -4370,7 +4370,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
@@ -4380,7 +4380,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]
@@ -4417,7 +4417,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
@@ -4445,7 +4445,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
@@ -4459,9 +4459,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
@@ -4496,7 +4496,7 @@ _080C4340:
strh r7, [r3]
b _080C4362
.align 2, 0
-_080C4350: .4byte 0x02018000
+_080C4350: .4byte gSharedMem + 0x18000
_080C4354:
mov r1, r8
cmp r1, 0
@@ -4514,7 +4514,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
@@ -4529,7 +4529,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-de/contest_link_80C857C.s b/asm-de/contest_link_80C857C.s
index f898f177f..19feb8b40 100644
--- a/asm-de/contest_link_80C857C.s
+++ b/asm-de/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
@@ -352,7 +352,7 @@ _080C881C:
mov r0, r10
movs r2, 0x40
bl memcpy
- ldr r1, _080C8858 @ =0x02038572
+ ldr r1, _080C8858 @ =gContestMons + 0x2
adds r4, r6, r1
ldrh r0, [r7, 0x1A]
cmp r0, 0x1
@@ -369,7 +369,7 @@ _080C881C:
_080C884C: .4byte gContestMons
_080C8850: .4byte gLinkPlayers
_080C8854: .4byte gBlockRecvBuffer
-_080C8858: .4byte 0x02038572
+_080C8858: .4byte gContestMons + 0x2
_080C885C:
ldrb r0, [r4, 0xA]
cmp r0, 0xFC
@@ -729,7 +729,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
@@ -739,14 +739,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
@@ -770,7 +770,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
@@ -1017,12 +1017,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
@@ -1030,7 +1030,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
@@ -1039,7 +1039,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:
@@ -1065,18 +1065,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
@@ -1085,7 +1085,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:
@@ -1093,21 +1093,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-de/easy_chat.s b/asm-de/easy_chat.s
index 1d93e36b4..c87996dbb 100644
--- a/asm-de/easy_chat.s
+++ b/asm-de/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 @ =0x00009fa8
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 0x00009fa8
_080E6294: .4byte 0x0000ffff
_080E6298: .4byte 0x00009faa
@@ -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 0x00009fa8
_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 @ =0x0000a0d0
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 0x0000a0d0
_080E6760: .4byte 0x0000a29a
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 @ =0x000044a2
b _080E69AC
.align 2, 0
-_080E694C: .4byte 0x02001000
+_080E694C: .4byte gSharedMem + 0x1000
_080E6950: .4byte 0x000044a2
_080E6954: .4byte 0x00009d54
_080E6958: .4byte 0x00009cd2
@@ -1167,7 +1167,7 @@ _080E69F4: .4byte 0x00009d55
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 0x00009d55
_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 0x00009cd0
_080E7B98: .4byte 0x00009d55
@@ -3646,7 +3646,7 @@ _080E7D2C: .4byte 0x00009cd0
thumb_func_start sub_80E7D30
sub_80E7D30: @ 80E7D30
push {r4,lr}
- ldr r0, _080E7D60 @ =0x02001000
+ ldr r0, _080E7D60 @ =gSharedMem + 0x1000
ldr r1, _080E7D64 @ =0x00009cd1
adds r4, r0, r1
ldr r2, _080E7D68 @ =0x00009cd0
@@ -3671,7 +3671,7 @@ _080E7D5A:
pop {r0}
bx r0
.align 2, 0
-_080E7D60: .4byte 0x02001000
+_080E7D60: .4byte gSharedMem + 0x1000
_080E7D64: .4byte 0x00009cd1
_080E7D68: .4byte 0x00009cd0
thumb_func_end sub_80E7D30
@@ -3680,7 +3680,7 @@ _080E7D68: .4byte 0x00009cd0
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 @ =0x00009cd1
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 0x00009cd1
_080E7E30: .4byte 0x00009cd0
_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 0x0000a140
_080E8048: .4byte 0x0000a16d
_080E804C: .4byte 0xffff5ec0
@@ -4072,7 +4072,7 @@ _080E8050: .4byte 0xffff5ecc
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 @ =0x0200b140
+ ldr r6, _080E80C4 @ =gSharedMem + 0xB140
adds r7, r6, 0
adds r7, 0x2D
_080E809E:
@@ -4131,7 +4131,7 @@ _080E809E:
adds r4, r7, 0
b _080E80D8
.align 2, 0
-_080E80C4: .4byte 0x0200b140
+_080E80C4: .4byte gSharedMem + 0xB140
_080E80C8: .4byte 0xffff5ecc
_080E80CC: .4byte gMysteryEventPhrase
_080E80D0:
@@ -4179,7 +4179,7 @@ sub_80E810C: @ 80E810C
mov r5, r8
push {r5-r7}
movs r5, 0
- ldr r6, _080E8198 @ =0x0200b19a
+ ldr r6, _080E8198 @ =gSharedMem + 0xB19A
ldr r0, _080E819C @ =0xffff5e66
adds r0, r6
mov r9, r0
@@ -4243,7 +4243,7 @@ _080E818A:
lsrs r0, 24
b _080E81B2
.align 2, 0
-_080E8198: .4byte 0x0200b19a
+_080E8198: .4byte gSharedMem + 0xB19A
_080E819C: .4byte 0xffff5e66
_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 @ =0x00009fa8
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 0x00009fa8
_080E81F8: .4byte 0x00009faa
thumb_func_end sub_80E81C0
diff --git a/include/ewram.h b/include/ewram.h
index 4f96688c9..ed7ceea16 100755
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -20,8 +20,14 @@ extern u8 gSharedMem[];
#define ewram0_6 (u32)(&gSharedMem[0])
#define ewram0_7 (&gSharedMem[0])
#define eSaveSection (struct SaveSection *)(gSharedMem + 0x0)
+#define ewram0arr ((u8 (*)[32])gSharedMem)
+#define eVoidSharedArr (void *)(ewram_addr + 0x0)
+#define eVoidSharedArr2 (u32)(ewram_addr) // ew(ram)
+#define ewram0_8 ((struct UnkStruct2000000 *)(gSharedMem + 0x0))
+#define ewram0_9(i) (u8 *)(ewram_addr + (i * 0x20))
#define ewram4 (*(struct UnknownStruct8 *)(gSharedMem + 0x4))
#define ewram520 ((struct UnknownStruct7 *)(gSharedMem + 0x00520))
+#define ewram520_2 (u8 *)(ewram_addr + 0x520)
#define eMaySprite (gSharedMem + 0x800)
#define ewram888 (gSharedMem + 0x888)
#define ewramBlankMapName (gSharedMem + 0xA48)
@@ -39,6 +45,7 @@ extern u8 gSharedMem[];
#define ARRAY_2007900 ((struct EasyChatPair *)(gSharedMem + 0x7900))
#define ewram_2008000 (*(struct PlayerRecords *)(gSharedMem + 0x08000))
#define ewram8000 (&gSharedMem[0x8000])
+#define ePokedexPalAddr1 (void *)(gSharedMem + 0x8000)
#define ewram8800 (&gSharedMem[0x8800])
#define ewram9000 (&gSharedMem[0x9000])
#define ewram9000_hack (void *)(ewram_addr + 0x9000) // TODO: Fix this.
@@ -49,6 +56,7 @@ extern u8 gSharedMem[];
#define ewramB800 (&gSharedMem[0xB800])
#define TRANSITION_STRUCT (*(struct TransitionData *) (gSharedMem + 0xC000))
#define ewramC000 (&gSharedMem[0xC000])
+#define ePokedexPalAddr2 (void *)(gSharedMem + 0xC000)
#define ewramC03C (&gSharedMem[0xC03C])
#define ewramC800 (&gSharedMem[0xC800])
#define ewramD000 (&gSharedMem[0xD000])
@@ -59,12 +67,18 @@ extern u8 gSharedMem[];
#define ewramF800 (&gSharedMem[0xF800])
#define ewram_2010000 (*(struct TradeEwramStruct *)(gSharedMem + 0x10000))
#define ewram10000 (&gSharedMem[0x10000])
+#define ewram10000_2 (void *)(gSharedMem + 0x10000) // slot machine
+#define ePokedexPalAddr3 (void *)(gSharedMem + 0x10000)
#define ewram10800 (&gSharedMem[0x10800])
#define ewram11000 (&gSharedMem[0x11000])
#define ewram11800 (&gSharedMem[0x11800])
+#define ewram12000 (&gSharedMem[0x12000])
+#define ewram12800 (&gSharedMem[0x12800])
#define ewram13000 (&gSharedMem[0x13000])
+#define ewram13800 (&gSharedMem[0x13800])
#define EWRAM_14000 ((u8 *)(gSharedMem + 0x14000))
#define ewram14000 (&gSharedMem[0x14000])
+#define ePokedexPalAddr4 (void *)(gSharedMem + 0x14000)
#define ewram14000arr(i, data) (gSharedMem[0x14000 + i + data])
#define ewram14004arr(i, data) (gSharedMem[0x14004 + i + data])
#define ewram14008arr(i, data) (gSharedMem[0x14008 + data + i])
@@ -80,6 +94,7 @@ extern u8 gSharedMem[];
#define ewram15DE0 ((*(struct ContestEntry*)(gSharedMem + 0x15DE0)))
#define ewram15E00 ((*(struct Unk2015E00*)(gSharedMem + 0x15E00)))
#define ewram16000 (gSharedMem[0x16000])
+#define ewram16000_2 (&gSharedMem[0x16000])
#define ewram16001 (gSharedMem[0x16001])
#define ewram16002 (gSharedMem[0x16002])
#define ewram16003 (gSharedMem[0x16003])
@@ -162,6 +177,8 @@ extern u8 gSharedMem[];
#define UNK_2016A00_STRUCT ((struct UnkBattleStruct1 *) (gSharedMem + 0x16A00))
#define AI_STACK ((struct AI_Stack *) (gSharedMem + 0x16C00))
#define AI_ARRAY_160CC(i) (gSharedMem[0x160CC + i * 2])
+#define ewram16800 (&gSharedMem[0x16800])
+#define ewram17000 (&gSharedMem[0x17000])
#define eLearnMoveStruct (struct LearnMoveStruct *)(gSharedMem + 0x17000)
#define eSecretBaseRecord ((struct SecretBaseRecord *)(gSharedMem + 0x17000))
#define ewram17002 (&gSharedMem[0x17002])
@@ -173,6 +190,7 @@ extern u8 gSharedMem[];
#define ewram17800 ((struct Struct2017800 *) (gSharedMem + 0x17800))
#define EWRAM_17800 ((struct UnknownStruct1 *)(gSharedMem + 0x17800))
#define eTransformStatuses ((struct TransformStatus *)(gSharedMem + 0x17800))
+#define ewram17800_2 (&gSharedMem[0x17800])
#define ewram17810 ((struct Struct2017810 *) (gSharedMem + 0x17810))
#define EWRAM_17810 ((struct UnknownStruct3 *)(gSharedMem + 0x17810))
#define ewram17840 (*(struct Struct2017840 *) (gSharedMem + 0x17840))
@@ -184,17 +202,25 @@ extern u8 gSharedMem[];
#define ewram18000_3 *(struct Pokemon **)(gSharedMem + 0x18000)
#define eBerryBlenderData (struct BerryBlenderData*)(&gSharedMem[0x18000])
#define eEggHatchData (struct EggHatchData*)(&gSharedMem[0x18000])
+#define ePokedexView1 (struct PokedexView *)(gSharedMem + 0x18000)
#define UNK_2018000_STRUCT (*(struct UnknownStruct2018000 *)(gSharedMem + 0x18000))
#define ewram18300 ((u16 *)(gSharedMem + 0x18300))
#define ewram18800 (&gSharedMem[0x18800])
+#define ePokedexView2 (struct PokedexView *)(gSharedMem + 0x18800)
#define ewram19000 (&gSharedMem[0x19000])
+#define ePokedexView3 (struct PokedexView *)(gSharedMem + 0x19000)
#define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348))
#define ewram19348 (*(struct Struct2019348 *)(gSharedMem + 0x19348))
#define ewram19800 (&gSharedMem[0x19800])
+#define ePokedexView4 (struct PokedexView *)(gSharedMem + 0x19800)
+#define ewram1A000 (&gSharedMem[0x1A000])
+#define ewram1A800 (&gSharedMem[0x1A800])
#define ewram1B000 (*(struct Unk201B000 *)(gSharedMem + 0x1B000))
#define ewram1B000_alt (*(struct Struct201B000 *)(gSharedMem + 0x1B000))
#define EWRAM_1B000 ewram1B000_alt // FIXME
#define EWRAM_1B000_2 (*(struct Struct201B000 *)(gSharedMem + 0x1B000))
+#define ewram1B000_2 (&gSharedMem[0x1B000])
+#define ewram1B800 (&gSharedMem[0x1B800])
#define EWRAM_1C000 (*(struct Struct201C000 *)(gSharedMem + 0x1C000))
#define ewram1C000 (*(struct Unk201C000 *)(gSharedMem + 0x1C000))
#define ewram1c000 (*(struct Unk201C000 *)(gSharedMem + 0x1C000)) // FIXME, names too similar
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index d7ca298c3..6f3be7804 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -265,7 +265,7 @@ extern u8 gUnknown_081D9468[];
#define TARGET_TURN_DAMAGED (((gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_physical.moveturnLostHP_special)))
-#define HP_ON_SWITCHOUT (((u16*)(0x020160bc)))
+#define HP_ON_SWITCHOUT (((u16*)(ewram_addr + 0x160BC)))
static void atk00_attackcanceler(void);
static void atk01_accuracycheck(void);
@@ -2773,21 +2773,21 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
ands r0, r3\n\
strb r0, [r7, 0x3]\n\
movs r6, 0x40\n\
- ldr r0, _0801E43C @ =0x02000000\n\
+ ldr r0, _0801E43C @ =gSharedMem\n\
ldr r1, _0801E440 @ =gBankTarget\n\
b _0801E450\n\
.align 2, 0\n\
_0801E430: .4byte gBattleCommunication\n\
_0801E434: .4byte gEffectBank\n\
_0801E438: .4byte gBankAttacker\n\
-_0801E43C: .4byte 0x02000000\n\
+_0801E43C: .4byte gSharedMem\n\
_0801E440: .4byte gBankTarget\n\
_0801E444:\n\
ldr r2, _0801E538 @ =gEffectBank\n\
ldr r0, _0801E53C @ =gBankTarget\n\
ldrb r0, [r0]\n\
strb r0, [r2]\n\
- ldr r0, _0801E540 @ =0x02000000\n\
+ ldr r0, _0801E540 @ =gSharedMem\n\
ldr r1, _0801E544 @ =gBankAttacker\n\
_0801E450:\n\
ldrb r1, [r1]\n\
@@ -2911,7 +2911,7 @@ _0801E536:\n\
.align 2, 0\n\
_0801E538: .4byte gEffectBank\n\
_0801E53C: .4byte gBankTarget\n\
-_0801E540: .4byte 0x02000000\n\
+_0801E540: .4byte gSharedMem\n\
_0801E544: .4byte gBankAttacker\n\
_0801E548: .4byte 0x00016003\n\
_0801E54C: .4byte gBattleMons\n\
@@ -3654,7 +3654,7 @@ _0801EAFA:\n\
beq _0801EB14\n\
bl _0801F5FA\n\
_0801EB14:\n\
- ldr r0, _0801EB30 @ =0x02000000\n\
+ ldr r0, _0801EB30 @ =gSharedMem\n\
ldrb r1, [r7, 0x3]\n\
ldr r2, _0801EB34 @ =0x000160ca\n\
adds r0, r2\n\
@@ -3666,7 +3666,7 @@ _0801EB14:\n\
bl _0801F4F2\n\
.align 2, 0\n\
_0801EB2C: .4byte gBattleCommunication\n\
-_0801EB30: .4byte 0x02000000\n\
+_0801EB30: .4byte gSharedMem\n\
_0801EB34: .4byte 0x000160ca\n\
_0801EB38: .4byte gHitMarker\n\
_0801EB3C:\n\
@@ -4075,7 +4075,7 @@ _0801EEE8:\n\
ldr r0, [r2]\n\
orrs r0, r1\n\
str r0, [r2]\n\
- ldr r2, _0801EF80 @ =0x02000000\n\
+ ldr r2, _0801EF80 @ =gSharedMem\n\
mov r3, r8\n\
ldrb r0, [r3]\n\
lsls r0, 1\n\
@@ -4140,7 +4140,7 @@ _0801EF70:\n\
bne _0801EF60\n\
b _0801F5FA\n\
.align 2, 0\n\
-_0801EF80: .4byte 0x02000000\n\
+_0801EF80: .4byte gSharedMem\n\
_0801EF84: .4byte 0x00016004\n\
_0801EF88: .4byte gCurrentMove\n\
_0801EF8C: .4byte 0x00016005\n\
@@ -4197,7 +4197,7 @@ _0801EFEC:\n\
beq _0801F008\n\
b _0801F5DC\n\
_0801F008:\n\
- ldr r2, _0801F02C @ =0x02000000\n\
+ ldr r2, _0801F02C @ =gSharedMem\n\
ldrb r1, [r7, 0x3]\n\
movs r0, 0x3F\n\
ands r0, r1\n\
@@ -4214,7 +4214,7 @@ _0801F008:\n\
ldr r0, _0801F03C @ =BattleScript_StatUp\n\
b _0801F5F8\n\
.align 2, 0\n\
-_0801F02C: .4byte 0x02000000\n\
+_0801F02C: .4byte gSharedMem\n\
_0801F030: .4byte 0x000160a4\n\
_0801F034: .4byte 0x000160a5\n\
_0801F038: .4byte gBattlescriptCurrInstr\n\
@@ -4235,7 +4235,7 @@ _0801F040:\n\
beq _0801F05E\n\
b _0801F5DC\n\
_0801F05E:\n\
- ldr r2, _0801F080 @ =0x02000000\n\
+ ldr r2, _0801F080 @ =gSharedMem\n\
ldrb r1, [r7, 0x3]\n\
movs r0, 0x3F\n\
ands r0, r1\n\
@@ -4252,7 +4252,7 @@ _0801F05E:\n\
ldr r0, _0801F090 @ =BattleScript_StatDown\n\
b _0801F5F8\n\
.align 2, 0\n\
-_0801F080: .4byte 0x02000000\n\
+_0801F080: .4byte gSharedMem\n\
_0801F084: .4byte 0x000160a4\n\
_0801F088: .4byte 0x000160a5\n\
_0801F08C: .4byte gBattlescriptCurrInstr\n\
@@ -4272,7 +4272,7 @@ _0801F094:\n\
beq _0801F0B0\n\
b _0801F5DC\n\
_0801F0B0:\n\
- ldr r2, _0801F0D4 @ =0x02000000\n\
+ ldr r2, _0801F0D4 @ =gSharedMem\n\
ldrb r1, [r7, 0x3]\n\
movs r0, 0x3F\n\
ands r0, r1\n\
@@ -4289,7 +4289,7 @@ _0801F0B0:\n\
ldr r0, _0801F0E4 @ =BattleScript_StatUp\n\
b _0801F5F8\n\
.align 2, 0\n\
-_0801F0D4: .4byte 0x02000000\n\
+_0801F0D4: .4byte gSharedMem\n\
_0801F0D8: .4byte 0x000160a4\n\
_0801F0DC: .4byte 0x000160a5\n\
_0801F0E0: .4byte gBattlescriptCurrInstr\n\
@@ -4310,7 +4310,7 @@ _0801F0E8:\n\
beq _0801F106\n\
b _0801F5DC\n\
_0801F106:\n\
- ldr r2, _0801F128 @ =0x02000000\n\
+ ldr r2, _0801F128 @ =gSharedMem\n\
ldrb r1, [r7, 0x3]\n\
movs r0, 0x3F\n\
ands r0, r1\n\
@@ -4327,7 +4327,7 @@ _0801F106:\n\
ldr r0, _0801F138 @ =BattleScript_StatDown\n\
b _0801F5F8\n\
.align 2, 0\n\
-_0801F128: .4byte 0x02000000\n\
+_0801F128: .4byte gSharedMem\n\
_0801F12C: .4byte 0x000160a4\n\
_0801F130: .4byte 0x000160a5\n\
_0801F134: .4byte gBattlescriptCurrInstr\n\
@@ -4515,7 +4515,7 @@ _0801F2B0:\n\
b _0801F5DC\n\
_0801F2B6:\n\
lsls r0, r1, 1\n\
- ldr r5, _0801F344 @ =0x020160f0\n\
+ ldr r5, _0801F344 @ =gSharedMem + 0x160F0\n\
adds r0, r5\n\
ldr r1, _0801F348 @ =gLastUsedItem\n\
strh r2, [r0]\n\
@@ -4580,7 +4580,7 @@ _0801F2B6:\n\
b _0801F5FA\n\
.align 2, 0\n\
_0801F340: .4byte gBankAttacker\n\
-_0801F344: .4byte 0x020160f0\n\
+_0801F344: .4byte gSharedMem + 0x160F0\n\
_0801F348: .4byte gLastUsedItem\n\
_0801F34C: .4byte gActiveBank\n\
_0801F350: .4byte gBattlescriptCurrInstr\n\
@@ -4851,7 +4851,7 @@ _0801F540:\n\
bl b_movescr_stack_push\n\
ldr r0, _0801F5CC @ =BattleScript_KnockedOff\n\
str r0, [r4]\n\
- ldr r1, _0801F5D0 @ =0x02000000\n\
+ ldr r1, _0801F5D0 @ =gSharedMem\n\
mov r2, r8\n\
ldrb r0, [r2]\n\
lsls r0, 1\n\
@@ -4873,7 +4873,7 @@ _0801F5C0: .4byte gBitTable\n\
_0801F5C4: .4byte gBattlePartyID\n\
_0801F5C8: .4byte gBattlescriptCurrInstr\n\
_0801F5CC: .4byte BattleScript_KnockedOff\n\
-_0801F5D0: .4byte 0x02000000\n\
+_0801F5D0: .4byte gSharedMem\n\
_0801F5D4: .4byte 0x000160e8\n\
_0801F5D8: .4byte 0x000160e9\n\
_0801F5DC:\n\
@@ -5540,7 +5540,7 @@ static void atk23_getexp(void)
mov r5, r8\n\
push {r5-r7}\n\
movs r6, 0\n\
- ldr r0, _0802004C @ =0x0201605c\n\
+ ldr r0, _0802004C @ =gSharedMem + 0x1605C\n\
mov r10, r0\n\
ldr r0, _08020050 @ =gBattlescriptCurrInstr\n\
ldr r0, [r0]\n\
@@ -5569,7 +5569,7 @@ _08020040:\n\
ldr r0, [r0]\n\
mov pc, r0\n\
.align 2, 0\n\
-_0802004C: .4byte 0x0201605c\n\
+_0802004C: .4byte gSharedMem + 0x1605C\n\
_08020050: .4byte gBattlescriptCurrInstr\n\
_08020054: .4byte gBank1\n\
_08020058: .4byte gSentPokesToOpponent\n\
@@ -5598,7 +5598,7 @@ _0802007C:\n\
cmp r0, 0\n\
beq _080200BC\n\
_08020098:\n\
- ldr r0, _080200B4 @ =0x02000000\n\
+ ldr r0, _080200B4 @ =gSharedMem\n\
ldr r1, _080200B8 @ =0x0001600f\n\
adds r0, r1\n\
movs r1, 0x6\n\
@@ -5608,10 +5608,10 @@ _08020098:\n\
_080200A8: .4byte gBank1\n\
_080200AC: .4byte gBattleTypeFlags\n\
_080200B0: .4byte 0x00000982\n\
-_080200B4: .4byte 0x02000000\n\
+_080200B4: .4byte gSharedMem\n\
_080200B8: .4byte 0x0001600f\n\
_080200BC:\n\
- ldr r2, _080200E8 @ =0x02000000\n\
+ ldr r2, _080200E8 @ =gSharedMem\n\
ldr r3, _080200EC @ =0x0001600f\n\
adds r1, r2, r3\n\
ldrb r0, [r1]\n\
@@ -5633,7 +5633,7 @@ _080200BC:\n\
strb r0, [r2]\n\
bl _08020996\n\
.align 2, 0\n\
-_080200E8: .4byte 0x02000000\n\
+_080200E8: .4byte gSharedMem\n\
_080200EC: .4byte 0x0001600f\n\
_080200F0: .4byte 0x00016113\n\
_080200F4: .4byte gBitTable\n\
@@ -5760,7 +5760,7 @@ _080201F6:\n\
ldr r0, _08020248 @ =gExpShareExp\n\
strh r6, [r0]\n\
_080201FA:\n\
- ldr r1, _0802024C @ =0x02000000\n\
+ ldr r1, _0802024C @ =gSharedMem\n\
ldr r3, _08020250 @ =0x0001600f\n\
adds r2, r1, r3\n\
ldrb r0, [r2]\n\
@@ -5781,7 +5781,7 @@ _08020216:\n\
beq _08020220\n\
b _08020996\n\
_08020220:\n\
- ldr r0, _0802024C @ =0x02000000\n\
+ ldr r0, _0802024C @ =gSharedMem\n\
ldr r1, _08020254 @ =0x00016018\n\
adds r0, r1\n\
ldrb r1, [r0]\n\
@@ -5802,7 +5802,7 @@ _08020220:\n\
b _08020274\n\
.align 2, 0\n\
_08020248: .4byte gExpShareExp\n\
-_0802024C: .4byte 0x02000000\n\
+_0802024C: .4byte gSharedMem\n\
_08020250: .4byte 0x0001600f\n\
_08020254: .4byte 0x00016018\n\
_08020258: .4byte 0x0001605f\n\
@@ -5815,7 +5815,7 @@ _0802026C:\n\
lsls r0, 24\n\
lsrs r4, r0, 24\n\
_08020274:\n\
- ldr r5, _08020294 @ =0x02000000\n\
+ ldr r5, _08020294 @ =gSharedMem\n\
cmp r4, 0x19\n\
beq _080202A0\n\
ldr r3, _08020298 @ =0x0001605f\n\
@@ -5831,7 +5831,7 @@ _08020274:\n\
adds r1, r5, r0\n\
b _080202C8\n\
.align 2, 0\n\
-_08020294: .4byte 0x02000000\n\
+_08020294: .4byte gSharedMem\n\
_08020298: .4byte 0x0001605f\n\
_0802029C: .4byte 0x0001600f\n\
_080202A0:\n\
@@ -5889,7 +5889,7 @@ _080202E8:\n\
adds r0, 0x1\n\
strb r0, [r5]\n\
_08020316:\n\
- ldr r5, _0802035C @ =0x02000000\n\
+ ldr r5, _0802035C @ =gSharedMem\n\
ldr r1, _08020360 @ =0x00016018\n\
adds r0, r5, r1\n\
ldrb r1, [r0]\n\
@@ -5921,7 +5921,7 @@ _0802034C: .4byte gBattleTypeFlags\n\
_08020350: .4byte gBattleMons\n\
_08020354: .4byte 0x0001601b\n\
_08020358: .4byte 0x00000161\n\
-_0802035C: .4byte 0x02000000\n\
+_0802035C: .4byte gSharedMem\n\
_08020360: .4byte 0x00016018\n\
_08020364: .4byte gPlayerParty\n\
_08020368: .4byte 0x0001605f\n\
@@ -5965,7 +5965,7 @@ _0802039C:\n\
bl __divsi3\n\
str r0, [r4]\n\
_080203B8:\n\
- ldr r0, _080203F8 @ =0x02000000\n\
+ ldr r0, _080203F8 @ =gSharedMem\n\
ldr r2, _080203FC @ =0x00016018\n\
adds r0, r2\n\
ldrb r1, [r0]\n\
@@ -5992,7 +5992,7 @@ _080203B8:\n\
_080203EC: .4byte gBattleMoveDamage\n\
_080203F0: .4byte gExpShareExp\n\
_080203F4: .4byte gBattleTypeFlags\n\
-_080203F8: .4byte 0x02000000\n\
+_080203F8: .4byte gSharedMem\n\
_080203FC: .4byte 0x00016018\n\
_08020400: .4byte gPlayerParty\n\
_08020404:\n\
@@ -6007,7 +6007,7 @@ _0802040A:\n\
cmp r1, 0\n\
beq _08020488\n\
ldr r1, _08020448 @ =gBattlePartyID\n\
- ldr r0, _0802044C @ =0x02000000\n\
+ ldr r0, _0802044C @ =gSharedMem\n\
ldr r3, _08020450 @ =0x00016018\n\
adds r2, r0, r3\n\
ldrh r1, [r1, 0x4]\n\
@@ -6030,7 +6030,7 @@ _0802043C: .4byte 0x00000149\n\
_08020440: .4byte gBattleMoveDamage\n\
_08020444: .4byte gBattleTypeFlags\n\
_08020448: .4byte gBattlePartyID\n\
-_0802044C: .4byte 0x02000000\n\
+_0802044C: .4byte gSharedMem\n\
_08020450: .4byte 0x00016018\n\
_08020454: .4byte gBitTable\n\
_08020458: .4byte gAbsentBankFlags\n\
@@ -6057,7 +6057,7 @@ _0802047C:\n\
.align 2, 0\n\
_08020484: .4byte 0x000160a2\n\
_08020488:\n\
- ldr r0, _08020530 @ =0x02000000\n\
+ ldr r0, _08020530 @ =gSharedMem\n\
ldr r3, _08020534 @ =0x000160a2\n\
adds r0, r3\n\
strb r1, [r0]\n\
@@ -6068,7 +6068,7 @@ _08020490:\n\
strb r2, [r1]\n\
movs r5, 0x4\n\
strb r5, [r1, 0x1]\n\
- ldr r4, _08020530 @ =0x02000000\n\
+ ldr r4, _08020530 @ =gSharedMem\n\
ldr r0, _08020534 @ =0x000160a2\n\
adds r6, r4, r0\n\
ldrb r0, [r6]\n\
@@ -6132,7 +6132,7 @@ _08020490:\n\
ldrh r1, [r1]\n\
bl MonGainEVs\n\
_0802051E:\n\
- ldr r1, _08020530 @ =0x02000000\n\
+ ldr r1, _08020530 @ =gSharedMem\n\
ldr r3, _08020554 @ =0x0001605f\n\
adds r2, r1, r3\n\
ldrb r0, [r2]\n\
@@ -6142,7 +6142,7 @@ _0802051E:\n\
adds r1, r0\n\
b _08020618\n\
.align 2, 0\n\
-_08020530: .4byte 0x02000000\n\
+_08020530: .4byte gSharedMem\n\
_08020534: .4byte 0x000160a2\n\
_08020538: .4byte gBattleTextBuff1\n\
_0802053C: .4byte 0x00016018\n\
@@ -6161,7 +6161,7 @@ _0802055C:\n\
b _08020996\n\
_08020566:\n\
ldr r1, _08020624 @ =gBattleBufferB\n\
- ldr r4, _08020628 @ =0x02000000\n\
+ ldr r4, _08020628 @ =gSharedMem\n\
ldr r3, _0802062C @ =0x000160a2\n\
adds r3, r4\n\
mov r8, r3\n\
@@ -6237,7 +6237,7 @@ _08020566:\n\
ldrb r0, [r4]\n\
bl MarkBufferBankForExecution\n\
_08020612:\n\
- ldr r1, _08020628 @ =0x02000000\n\
+ ldr r1, _08020628 @ =gSharedMem\n\
ldr r3, _08020644 @ =0x0001600f\n\
adds r1, r3\n\
_08020618:\n\
@@ -6248,7 +6248,7 @@ _08020618:\n\
.align 2, 0\n\
_08020620: .4byte gBattleExecBuffer\n\
_08020624: .4byte gBattleBufferB\n\
-_08020628: .4byte 0x02000000\n\
+_08020628: .4byte gSharedMem\n\
_0802062C: .4byte 0x000160a2\n\
_08020630: .4byte 0x00016018\n\
_08020634: .4byte gPlayerParty\n\
@@ -6264,7 +6264,7 @@ _08020648:\n\
b _08020996\n\
_08020652:\n\
ldr r1, _080208B0 @ =gActiveBank\n\
- ldr r4, _080208B4 @ =0x02000000\n\
+ ldr r4, _080208B4 @ =gSharedMem\n\
ldr r2, _080208B8 @ =0x000160a2\n\
adds r0, r4, r2\n\
ldrb r0, [r0]\n\
@@ -6316,7 +6316,7 @@ _080206A8:\n\
ldr r5, _080208B0 @ =gActiveBank\n\
ldrb r0, [r5]\n\
strb r0, [r1, 0x2]\n\
- ldr r0, _080208B4 @ =0x02000000\n\
+ ldr r0, _080208B4 @ =gSharedMem\n\
ldr r3, _080208C8 @ =0x00016018\n\
adds r6, r0, r3\n\
ldrb r0, [r6]\n\
@@ -6460,7 +6460,7 @@ _080206A8:\n\
strh r0, [r4, 0xA]\n\
_080207EC:\n\
ldr r0, _080208C4 @ =gBattlePartyID\n\
- ldr r1, _080208B4 @ =0x02000000\n\
+ ldr r1, _080208B4 @ =gSharedMem\n\
ldr r3, _080208C8 @ =0x00016018\n\
adds r7, r1, r3\n\
ldrb r2, [r7]\n\
@@ -6549,7 +6549,7 @@ _080207EC:\n\
.align 2, 0\n\
_080208AC: .4byte gBattleExecBuffer\n\
_080208B0: .4byte gActiveBank\n\
-_080208B4: .4byte 0x02000000\n\
+_080208B4: .4byte gSharedMem\n\
_080208B8: .4byte 0x000160a2\n\
_080208BC: .4byte gBattleBufferB\n\
_080208C0: .4byte gBattleTypeFlags\n\
@@ -6569,7 +6569,7 @@ _080208F0:\n\
movs r0, 0\n\
str r0, [r1]\n\
_080208F6:\n\
- ldr r0, _08020908 @ =0x02000000\n\
+ ldr r0, _08020908 @ =gSharedMem\n\
ldr r1, _0802090C @ =0x0001600f\n\
adds r0, r1\n\
movs r1, 0x5\n\
@@ -6577,14 +6577,14 @@ _080208F6:\n\
b _08020996\n\
.align 2, 0\n\
_08020904: .4byte gBattleMoveDamage\n\
-_08020908: .4byte 0x02000000\n\
+_08020908: .4byte gSharedMem\n\
_0802090C: .4byte 0x0001600f\n\
_08020910:\n\
ldr r0, _08020924 @ =gBattleMoveDamage\n\
ldr r0, [r0]\n\
cmp r0, 0\n\
beq _08020930\n\
- ldr r0, _08020928 @ =0x02000000\n\
+ ldr r0, _08020928 @ =gSharedMem\n\
ldr r2, _0802092C @ =0x0001600f\n\
adds r0, r2\n\
movs r1, 0x3\n\
@@ -6592,10 +6592,10 @@ _08020910:\n\
b _08020996\n\
.align 2, 0\n\
_08020924: .4byte gBattleMoveDamage\n\
-_08020928: .4byte 0x02000000\n\
+_08020928: .4byte gSharedMem\n\
_0802092C: .4byte 0x0001600f\n\
_08020930:\n\
- ldr r2, _08020950 @ =0x02000000\n\
+ ldr r2, _08020950 @ =gSharedMem\n\
ldr r3, _08020954 @ =0x00016018\n\
adds r1, r2, r3\n\
ldrb r0, [r1]\n\
@@ -6611,7 +6611,7 @@ _08020930:\n\
strb r0, [r1]\n\
b _08020996\n\
.align 2, 0\n\
-_08020950: .4byte 0x02000000\n\
+_08020950: .4byte gSharedMem\n\
_08020954: .4byte 0x00016018\n\
_08020958: .4byte 0x0001600f\n\
_0802095C:\n\
@@ -7919,7 +7919,7 @@ _0802178C: .4byte gUnknown_02024A98\n\
_08021790:\n\
cmp r3, 0\n\
beq _080217E0\n\
- ldr r0, _080217D0 @ =0x02000000\n\
+ ldr r0, _080217D0 @ =gSharedMem\n\
ldr r1, _080217D4 @ =0x000160dc\n\
adds r4, r0, r1\n\
ldrb r0, [r4]\n\
@@ -7949,7 +7949,7 @@ _080217CC:\n\
ldr r1, _080217DC @ =gBattlescriptCurrInstr\n\
b _080217E2\n\
.align 2, 0\n\
-_080217D0: .4byte 0x02000000\n\
+_080217D0: .4byte gSharedMem\n\
_080217D4: .4byte 0x000160dc\n\
_080217D8: .4byte gActiveBank\n\
_080217DC: .4byte gBattlescriptCurrInstr\n\
@@ -7990,7 +7990,7 @@ static void atk49_moveendturn(void)
else
hold_effect_atk = ItemId_GetHoldEffect(gBattleMons[gBankTarget].item);
- choiced_move_atk = (u16*)(gBankAttacker * 0x020160e8);
+ choiced_move_atk = (u16*)(gBankAttacker * (ewram_addr + 0x160E8));
if (BATTLE_STRUCT->dynamicMoveType)
move_type = BATTLE_STRUCT->dynamicMoveType & 0x3F;
else
@@ -8066,7 +8066,7 @@ static void atk49_moveendturn(void)
case 7: //changed held items
for (i = 0; i < gNoOfAllBanks; i++)
{
- #define CHANGED_ITEM (((*u16)(0x020160f0)))
+ #define CHANGED_ITEM (((*u16)(gSharedMem + 0x160F0)))
if (CHANGED_ITEM(i))
gBattleMons[i].item = CHANGED_ITEM(i);
}
@@ -8162,7 +8162,7 @@ _0802184E:\n\
ldr r0, _0802186C @ =gBankAttacker\n\
ldrb r1, [r0]\n\
lsls r1, 1\n\
- ldr r0, _08021870 @ =0x020160e8\n\
+ ldr r0, _08021870 @ =gSharedMem + 0x160E8\n\
adds r1, r0\n\
str r1, [sp, 0xC]\n\
subs r0, 0xCC\n\
@@ -8175,13 +8175,13 @@ _0802184E:\n\
b _080218D2\n\
.align 2, 0\n\
_0802186C: .4byte gBankAttacker\n\
-_08021870: .4byte 0x020160e8\n\
+_08021870: .4byte gSharedMem + 0x160E8\n\
_08021874:\n\
strb r2, [r7]\n\
ldr r0, [r5]\n\
orrs r0, r6\n\
str r0, [r5]\n\
- ldr r0, _080218AC @ =0x02000000\n\
+ ldr r0, _080218AC @ =gSharedMem\n\
ldr r3, _080218B0 @ =0x0001600c\n\
adds r0, r3\n\
strb r4, [r0]\n\
@@ -8202,7 +8202,7 @@ _08021874:\n\
ldr r0, _080218BC @ =gUnknown_081D9B2D\n\
bl _0802229C\n\
.align 2, 0\n\
-_080218AC: .4byte 0x02000000\n\
+_080218AC: .4byte gSharedMem\n\
_080218B0: .4byte 0x0001600c\n\
_080218B4: .4byte gBattleScriptsEffectsTable\n\
_080218B8: .4byte gBattlescriptCurrInstr\n\
@@ -8218,13 +8218,13 @@ _080218C0:\n\
ldrb r0, [r0, 0x2]\n\
str r0, [sp, 0x4]\n\
_080218D2:\n\
- ldr r5, _080218E0 @ =0x02000000\n\
+ ldr r5, _080218E0 @ =gSharedMem\n\
mov r12, r5\n\
b _080218EE\n\
.align 2, 0\n\
_080218D8: .4byte gBattleMoves\n\
_080218DC: .4byte gCurrentMove\n\
-_080218E0: .4byte 0x02000000\n\
+_080218E0: .4byte gSharedMem\n\
_080218E4:\n\
mov r0, r10\n\
cmp r0, 0\n\
@@ -8349,7 +8349,7 @@ _080219C8:\n\
movs r5, 0x1\n\
mov r10, r5\n\
_080219FE:\n\
- ldr r2, _08021A2C @ =0x02000000\n\
+ ldr r2, _08021A2C @ =gSharedMem\n\
ldr r0, _08021A30 @ =0x0001600c\n\
adds r1, r2, r0\n\
b _08021E00\n\
@@ -8363,7 +8363,7 @@ _08021A1C: .4byte gBattleMoves\n\
_08021A20: .4byte gCurrentMove\n\
_08021A24: .4byte gBattlescriptCurrInstr\n\
_08021A28: .4byte gUnknown_081D9132\n\
-_08021A2C: .4byte 0x02000000\n\
+_08021A2C: .4byte gSharedMem\n\
_08021A30: .4byte 0x0001600c\n\
_08021A34:\n\
ldr r2, _08021AD0 @ =gBattleMons\n\
@@ -8471,13 +8471,13 @@ _08021AF0:\n\
movs r4, 0x1\n\
mov r10, r4\n\
_08021B0C:\n\
- ldr r2, _08021B18 @ =0x02000000\n\
+ ldr r2, _08021B18 @ =gSharedMem\n\
ldr r5, _08021B1C @ =0x0001600c\n\
adds r1, r2, r5\n\
b _08021E00\n\
.align 2, 0\n\
_08021B14: .4byte gBankTarget\n\
-_08021B18: .4byte 0x02000000\n\
+_08021B18: .4byte gSharedMem\n\
_08021B1C: .4byte 0x0001600c\n\
_08021B20:\n\
ldr r0, _08021B40 @ =gBankTarget\n\
@@ -8511,18 +8511,18 @@ _08021B44:\n\
beq _08021B68\n\
movs r4, 0x1\n\
mov r10, r4\n\
- ldr r5, _08021B64 @ =0x02000000\n\
+ ldr r5, _08021B64 @ =gSharedMem\n\
mov r12, r5\n\
b _0802224E\n\
.align 2, 0\n\
-_08021B64: .4byte 0x02000000\n\
+_08021B64: .4byte gSharedMem\n\
_08021B68:\n\
- ldr r2, _08021B70 @ =0x02000000\n\
+ ldr r2, _08021B70 @ =gSharedMem\n\
ldr r0, _08021B74 @ =0x0001600c\n\
adds r1, r2, r0\n\
b _08021E00\n\
.align 2, 0\n\
-_08021B70: .4byte 0x02000000\n\
+_08021B70: .4byte gSharedMem\n\
_08021B74: .4byte 0x0001600c\n\
_08021B78:\n\
ldr r0, _08021B98 @ =gBankAttacker\n\
@@ -8636,7 +8636,7 @@ _08021C40:\n\
b _08022244\n\
_08021C4C:\n\
movs r5, 0\n\
- ldr r2, _08021C70 @ =0x020160f0\n\
+ ldr r2, _08021C70 @ =gSharedMem + 0x160F0\n\
ldr r3, _08021C74 @ =gBattleMons\n\
_08021C52:\n\
ldrh r1, [r2]\n\
@@ -8654,7 +8654,7 @@ _08021C5C:\n\
b _08022244\n\
.align 2, 0\n\
_08021C6C: .4byte gNoOfAllBanks\n\
-_08021C70: .4byte 0x020160f0\n\
+_08021C70: .4byte gSharedMem + 0x160F0\n\
_08021C74: .4byte gBattleMons\n\
_08021C78:\n\
movs r0, 0x3\n\
@@ -8666,18 +8666,18 @@ _08021C78:\n\
beq _08021C98\n\
movs r2, 0x1\n\
mov r10, r2\n\
- ldr r3, _08021C94 @ =0x02000000\n\
+ ldr r3, _08021C94 @ =gSharedMem\n\
mov r12, r3\n\
b _0802224E\n\
.align 2, 0\n\
-_08021C94: .4byte 0x02000000\n\
+_08021C94: .4byte gSharedMem\n\
_08021C98:\n\
- ldr r2, _08021CA0 @ =0x02000000\n\
+ ldr r2, _08021CA0 @ =gSharedMem\n\
ldr r4, _08021CA4 @ =0x0001600c\n\
adds r1, r2, r4\n\
b _08021E00\n\
.align 2, 0\n\
-_08021CA0: .4byte 0x02000000\n\
+_08021CA0: .4byte gSharedMem\n\
_08021CA4: .4byte 0x0001600c\n\
_08021CA8:\n\
movs r0, 0x4\n\
@@ -8690,12 +8690,12 @@ _08021CA8:\n\
movs r5, 0x1\n\
mov r10, r5\n\
_08021CBC:\n\
- ldr r2, _08021CC4 @ =0x02000000\n\
+ ldr r2, _08021CC4 @ =gSharedMem\n\
ldr r0, _08021CC8 @ =0x0001600c\n\
adds r1, r2, r0\n\
b _08021E00\n\
.align 2, 0\n\
-_08021CC4: .4byte 0x02000000\n\
+_08021CC4: .4byte gSharedMem\n\
_08021CC8: .4byte 0x0001600c\n\
_08021CCC:\n\
ldr r1, _08021D04 @ =gStatuses3\n\
@@ -8783,7 +8783,7 @@ _08021D44:\n\
orrs r1, r2\n\
strb r1, [r0]\n\
_08021D7E:\n\
- ldr r2, _08021DA4 @ =0x02000000\n\
+ ldr r2, _08021DA4 @ =gSharedMem\n\
ldr r4, _08021DA8 @ =0x0001600c\n\
adds r1, r2, r4\n\
b _08021E00\n\
@@ -8795,7 +8795,7 @@ _08021D94: .4byte 0x000400c0\n\
_08021D98: .4byte gActiveBank\n\
_08021D9C: .4byte 0xfffbff3f\n\
_08021DA0: .4byte gSpecialStatuses\n\
-_08021DA4: .4byte 0x02000000\n\
+_08021DA4: .4byte gSharedMem\n\
_08021DA8: .4byte 0x0001600c\n\
_08021DAC:\n\
ldr r2, _08021E0C @ =gSpecialStatuses\n\
@@ -8836,7 +8836,7 @@ _08021DAC:\n\
ands r0, r1\n\
str r0, [r2]\n\
_08021DFA:\n\
- ldr r2, _08021E28 @ =0x02000000\n\
+ ldr r2, _08021E28 @ =gSharedMem\n\
ldr r3, _08021E2C @ =0x0001600c\n\
adds r1, r2, r3\n\
_08021E00:\n\
@@ -8853,7 +8853,7 @@ _08021E18: .4byte gStatuses3\n\
_08021E1C: .4byte 0x000400c0\n\
_08021E20: .4byte gActiveBank\n\
_08021E24: .4byte 0xfffbff3f\n\
-_08021E28: .4byte 0x02000000\n\
+_08021E28: .4byte gSharedMem\n\
_08021E2C: .4byte 0x0001600c\n\
_08021E30:\n\
movs r4, 0\n\
@@ -9347,7 +9347,7 @@ _0802223A:\n\
ldr r0, [r5]\n\
orrs r0, r6\n\
str r0, [r5]\n\
- ldr r2, _080222D0 @ =0x02000000\n\
+ ldr r2, _080222D0 @ =gSharedMem\n\
mov r12, r2\n\
_08022244:\n\
ldr r1, _080222D4 @ =0x0001600c\n\
@@ -9417,7 +9417,7 @@ _080222C0: .4byte gBattleMoves\n\
_080222C4: .4byte gCurrentMove\n\
_080222C8: .4byte gBankTarget\n\
_080222CC: .4byte gBattleMons\n\
-_080222D0: .4byte 0x02000000\n\
+_080222D0: .4byte gSharedMem\n\
_080222D4: .4byte 0x0001600c\n\
_080222D8: .4byte gBattlescriptCurrInstr\n\
.syntax divided"
@@ -9930,7 +9930,7 @@ _08022C2C:\n\
lsls r0, 25\n\
cmp r0, 0\n\
blt _08022C6C\n\
- ldr r0, _08022C64 @ =0x02000000\n\
+ ldr r0, _08022C64 @ =gSharedMem\n\
ldr r1, _08022C68 @ =0x0001606a\n\
adds r0, r1\n\
ldrb r0, [r0]\n\
@@ -9947,7 +9947,7 @@ _08022C2C:\n\
b _08022C7E\n\
.align 2, 0\n\
_08022C60: .4byte gSpecialStatuses\n\
-_08022C64: .4byte 0x02000000\n\
+_08022C64: .4byte gSharedMem\n\
_08022C68: .4byte 0x0001606a\n\
_08022C6C:\n\
movs r0, 0\n\
@@ -10015,7 +10015,7 @@ _08022CE8:\n\
lsls r0, 25\n\
cmp r0, 0\n\
blt _08022D28\n\
- ldr r0, _08022D20 @ =0x02000000\n\
+ ldr r0, _08022D20 @ =gSharedMem\n\
ldr r1, _08022D24 @ =0x00016068\n\
adds r0, r1\n\
ldrb r0, [r0]\n\
@@ -10032,7 +10032,7 @@ _08022CE8:\n\
b _08022D40\n\
.align 2, 0\n\
_08022D1C: .4byte gSpecialStatuses\n\
-_08022D20: .4byte 0x02000000\n\
+_08022D20: .4byte gSharedMem\n\
_08022D24: .4byte 0x00016068\n\
_08022D28:\n\
movs r0, 0x1\n\
@@ -10099,7 +10099,7 @@ _08022DA0:\n\
lsls r0, 25\n\
cmp r0, 0\n\
blt _08022DE0\n\
- ldr r0, _08022DD8 @ =0x02000000\n\
+ ldr r0, _08022DD8 @ =gSharedMem\n\
ldr r1, _08022DDC @ =0x0001606b\n\
adds r0, r1\n\
ldrb r0, [r0]\n\
@@ -10116,7 +10116,7 @@ _08022DA0:\n\
b _08022DF6\n\
.align 2, 0\n\
_08022DD4: .4byte gSpecialStatuses\n\
-_08022DD8: .4byte 0x02000000\n\
+_08022DD8: .4byte gSharedMem\n\
_08022DDC: .4byte 0x0001606b\n\
_08022DE0:\n\
movs r0, 0\n\
@@ -10186,7 +10186,7 @@ _08022E60:\n\
lsls r0, 25\n\
cmp r0, 0\n\
blt _08022EA0\n\
- ldr r0, _08022E98 @ =0x02000000\n\
+ ldr r0, _08022E98 @ =gSharedMem\n\
ldr r1, _08022E9C @ =0x00016069\n\
adds r0, r1\n\
ldrb r0, [r0]\n\
@@ -10203,7 +10203,7 @@ _08022E60:\n\
b _08022EB8\n\
.align 2, 0\n\
_08022E94: .4byte gSpecialStatuses\n\
-_08022E98: .4byte 0x02000000\n\
+_08022E98: .4byte gSharedMem\n\
_08022E9C: .4byte 0x00016069\n\
_08022EA0:\n\
movs r0, 0x2\n\
@@ -10386,7 +10386,7 @@ _08023008:\n\
lsls r0, 25\n\
cmp r0, 0\n\
blt _0802303A\n\
- ldr r0, _0802309C @ =0x02000000\n\
+ ldr r0, _0802309C @ =gSharedMem\n\
ldr r1, _080230A0 @ =0x00016068\n\
adds r0, r1\n\
ldrb r0, [r0]\n\
@@ -10447,7 +10447,7 @@ _0802303A:\n\
b _080230EE\n\
.align 2, 0\n\
_08023098: .4byte gSpecialStatuses\n\
-_0802309C: .4byte 0x02000000\n\
+_0802309C: .4byte gSharedMem\n\
_080230A0: .4byte 0x00016068\n\
_080230A4: .4byte gBitTable\n\
_080230A8: .4byte gActiveBank\n\
@@ -10466,7 +10466,7 @@ _080230BC:\n\
lsls r0, 25\n\
cmp r0, 0\n\
blt _080230EE\n\
- ldr r0, _08023100 @ =0x02000000\n\
+ ldr r0, _08023100 @ =gSharedMem\n\
ldr r1, _08023104 @ =0x00016069\n\
adds r0, r1\n\
ldrb r0, [r0]\n\
@@ -10489,7 +10489,7 @@ _080230EE:\n\
b _08023110\n\
.align 2, 0\n\
_080230FC: .4byte gSpecialStatuses\n\
-_08023100: .4byte 0x02000000\n\
+_08023100: .4byte gSharedMem\n\
_08023104: .4byte 0x00016069\n\
_08023108: .4byte gBattlescriptCurrInstr\n\
_0802310C:\n\
@@ -10610,7 +10610,7 @@ _080231F4: .4byte gHitMarker\n\
_080231F8:\n\
ldr r4, _080232A0 @ =gActiveBank\n\
strb r7, [r4]\n\
- ldr r3, _080232A4 @ =0x02000000\n\
+ ldr r3, _080232A4 @ =gSharedMem\n\
ldrb r0, [r4]\n\
ldr r2, _080232A8 @ =0x00016064\n\
adds r1, r0, r2\n\
@@ -10691,7 +10691,7 @@ _0802328A:\n\
b _08023302\n\
.align 2, 0\n\
_080232A0: .4byte gActiveBank\n\
-_080232A4: .4byte 0x02000000\n\
+_080232A4: .4byte gSharedMem\n\
_080232A8: .4byte 0x00016064\n\
_080232AC: .4byte gBattlePartyID\n\
_080232B0: .4byte 0x00016068\n\
@@ -11134,7 +11134,7 @@ static void atk5C_hitanimation(void)
gBattlescriptCurrInstr += 2;
}
-#define MONEY_UNKNOWN ((*(u8*)(0x02017000 + 0x94)))
+#define MONEY_UNKNOWN ((*(u8*)(ewram_addr + 0x17000 + 0x94)))
#ifdef NONMATCHING
static void atk5D_getmoneyreward(void)
@@ -11208,7 +11208,7 @@ static void atk5D_getmoneyreward(void)
lsls r1, 3\n\
cmp r2, r1\n\
bne _08024058\n\
- ldr r0, _0802404C @ =0x02017000\n\
+ ldr r0, _0802404C @ =gSharedMem + 0x17000\n\
adds r1, r0, 0\n\
adds r1, 0x94\n\
ldrb r2, [r1]\n\
@@ -11225,7 +11225,7 @@ static void atk5D_getmoneyreward(void)
b _08024140\n\
.align 2, 0\n\
_08024048: .4byte gTrainerBattleOpponent\n\
-_0802404C: .4byte 0x02017000\n\
+_0802404C: .4byte gSharedMem + 0x17000\n\
_08024050: .4byte 0xfffff056\n\
_08024054: .4byte gSaveBlock1 + 0x490\n\
_08024058:\n\
@@ -11295,7 +11295,7 @@ _080240C4:\n\
ldrb r1, [r3]\n\
mov r12, r0\n\
lsls r4, r5, 2\n\
- ldr r5, _08024124 @ =0x02000000\n\
+ ldr r5, _08024124 @ =gSharedMem\n\
ldr r7, _08024128 @ =gBattleTypeFlags\n\
ldr r0, _0802412C @ =gSaveBlock1 + 0x490\n\
mov r8, r0\n\
@@ -11339,7 +11339,7 @@ _080240FE:\n\
b _08024140\n\
.align 2, 0\n\
_08024120: .4byte gTrainerMoney\n\
-_08024124: .4byte 0x02000000\n\
+_08024124: .4byte gSharedMem\n\
_08024128: .4byte gBattleTypeFlags\n\
_0802412C: .4byte gSaveBlock1 + 0x490\n\
_08024130: .4byte gTrainers\n\
@@ -11678,7 +11678,7 @@ static void atk6C_lvlbox_display(void)
sub sp, 0x4\n\
movs r1, 0\n\
movs r7, 0\n\
- ldr r0, _08024928 @ =0x02000000\n\
+ ldr r0, _08024928 @ =gSharedMem\n\
mov r10, r0\n\
ldr r4, _0802492C @ =0x0001609c\n\
add r4, r10\n\
@@ -11693,7 +11693,7 @@ _0802491C:\n\
beq _0802493E\n\
b _08024C38\n\
.align 2, 0\n\
-_08024928: .4byte 0x02000000\n\
+_08024928: .4byte gSharedMem\n\
_0802492C: .4byte 0x0001609c\n\
_08024930:\n\
cmp r0, 0x2\n\
@@ -11729,7 +11729,7 @@ _0802495A:\n\
adds r0, r5, 0\n\
bl StringAppend\n\
adds r5, r0, 0\n\
- ldr r0, _080249A8 @ =0x02000000\n\
+ ldr r0, _080249A8 @ =gSharedMem\n\
ldr r2, _080249AC @ =0x00016018\n\
adds r0, r2\n\
ldrb r1, [r0]\n\
@@ -11754,7 +11754,7 @@ _0802495A:\n\
_0802499C: .4byte gStringVar4\n\
_080249A0: .4byte gUnknown_08400D9F\n\
_080249A4: .4byte gUnknown_0840165C\n\
-_080249A8: .4byte 0x02000000\n\
+_080249A8: .4byte gSharedMem\n\
_080249AC: .4byte 0x00016018\n\
_080249B0: .4byte gPlayerParty\n\
_080249B4: .4byte gLevelUpStatBoxStats\n\
@@ -11768,37 +11768,37 @@ _080249BC:\n\
.4byte _08024A04\n\
.4byte _08024A10\n\
_080249D4:\n\
- ldr r0, _080249DC @ =0x02017180\n\
+ ldr r0, _080249DC @ =gSharedMem + 0x17180\n\
ldrh r0, [r0]\n\
b _08024A14\n\
.align 2, 0\n\
-_080249DC: .4byte 0x02017180\n\
+_080249DC: .4byte gSharedMem + 0x17180\n\
_080249E0:\n\
- ldr r0, _080249E8 @ =0x02017180\n\
+ ldr r0, _080249E8 @ =gSharedMem + 0x17180\n\
ldrh r0, [r0, 0x8]\n\
b _08024A14\n\
.align 2, 0\n\
-_080249E8: .4byte 0x02017180\n\
+_080249E8: .4byte gSharedMem + 0x17180\n\
_080249EC:\n\
- ldr r0, _080249F4 @ =0x02017180\n\
+ ldr r0, _080249F4 @ =gSharedMem + 0x17180\n\
ldrh r0, [r0, 0x2]\n\
b _08024A14\n\
.align 2, 0\n\
-_080249F4: .4byte 0x02017180\n\
+_080249F4: .4byte gSharedMem + 0x17180\n\
_080249F8:\n\
- ldr r0, _08024A00 @ =0x02017180\n\
+ ldr r0, _08024A00 @ =gSharedMem + 0x17180\n\
ldrh r0, [r0, 0xA]\n\
b _08024A14\n\
.align 2, 0\n\
-_08024A00: .4byte 0x02017180\n\
+_08024A00: .4byte gSharedMem + 0x17180\n\
_08024A04:\n\
- ldr r0, _08024A0C @ =0x02017180\n\
+ ldr r0, _08024A0C @ =gSharedMem + 0x17180\n\
ldrh r0, [r0, 0x4]\n\
b _08024A14\n\
.align 2, 0\n\
-_08024A0C: .4byte 0x02017180\n\
+_08024A0C: .4byte gSharedMem + 0x17180\n\
_08024A10:\n\
- ldr r0, _08024A54 @ =0x02017180\n\
+ ldr r0, _08024A54 @ =gSharedMem + 0x17180\n\
ldrh r0, [r0, 0x6]\n\
_08024A14:\n\
subs r0, r1, r0\n\
@@ -11835,7 +11835,7 @@ _08024A2C:\n\
ldr r1, _08024A58 @ =gUnknown_08400DAC\n\
b _08024A5E\n\
.align 2, 0\n\
-_08024A54: .4byte 0x02017180\n\
+_08024A54: .4byte gSharedMem + 0x17180\n\
_08024A58: .4byte gUnknown_08400DAC\n\
_08024A5C:\n\
ldr r1, _08024AA4 @ =gUnknown_08400DAA\n\
@@ -11902,14 +11902,14 @@ _08024AC4:\n\
bl InitWindow\n\
adds r0, r4, 0\n\
bl sub_8002F44\n\
- ldr r1, _08024AEC @ =0x02000000\n\
+ ldr r1, _08024AEC @ =gSharedMem\n\
ldr r2, _08024AF0 @ =0x0001609c\n\
adds r1, r2\n\
b _08024BEA\n\
.align 2, 0\n\
_08024AE4: .4byte gUnknown_03004210\n\
_08024AE8: .4byte gStringVar4\n\
-_08024AEC: .4byte 0x02000000\n\
+_08024AEC: .4byte gSharedMem\n\
_08024AF0: .4byte 0x0001609c\n\
_08024AF4:\n\
ldr r0, _08024B94 @ =gMain\n\
@@ -12023,7 +12023,7 @@ _08024BC0:\n\
bl InitWindow\n\
adds r0, r4, 0\n\
bl sub_8002F44\n\
- ldr r1, _08024BFC @ =0x02000000\n\
+ ldr r1, _08024BFC @ =gSharedMem\n\
ldr r0, _08024C00 @ =0x0001609c\n\
adds r1, r0\n\
_08024BEA:\n\
@@ -12034,7 +12034,7 @@ _08024BEA:\n\
.align 2, 0\n\
_08024BF4: .4byte gUnknown_03004210\n\
_08024BF8: .4byte gStringVar4\n\
-_08024BFC: .4byte 0x02000000\n\
+_08024BFC: .4byte gSharedMem\n\
_08024C00: .4byte 0x0001609c\n\
_08024C04:\n\
ldr r0, _08024C2C @ =gMain\n\
@@ -12954,7 +12954,7 @@ _08025F10: .4byte gBattlescriptCurrInstr\n\
_08025F14:\n\
mov r0, r8\n\
bl b_movescr_stack_push\n\
- ldr r0, _08025F40 @ =0x02000000\n\
+ ldr r0, _08025F40 @ =gSharedMem\n\
ldr r6, _08025F44 @ =gActiveBank\n\
ldrb r1, [r6]\n\
ldr r2, _08025F48 @ =0x00016003\n\
@@ -12974,7 +12974,7 @@ _08025F14:\n\
strb r1, [r0]\n\
b _08025F74\n\
.align 2, 0\n\
-_08025F40: .4byte 0x02000000\n\
+_08025F40: .4byte gSharedMem\n\
_08025F44: .4byte gActiveBank\n\
_08025F48: .4byte 0x00016003\n\
_08025F4C: .4byte gBattlescriptCurrInstr\n\
@@ -13049,7 +13049,7 @@ _08025FDC: .4byte gBattlescriptCurrInstr\n\
_08025FE0:\n\
mov r0, r8\n\
bl b_movescr_stack_push\n\
- ldr r0, _08026028 @ =0x02000000\n\
+ ldr r0, _08026028 @ =gSharedMem\n\
ldr r2, _0802602C @ =gActiveBank\n\
ldrb r1, [r2]\n\
ldr r3, _08026030 @ =0x00016003\n\
@@ -13081,7 +13081,7 @@ _08025FE0:\n\
strb r1, [r0]\n\
b _08025F74\n\
.align 2, 0\n\
-_08026028: .4byte 0x02000000\n\
+_08026028: .4byte gSharedMem\n\
_0802602C: .4byte gActiveBank\n\
_08026030: .4byte 0x00016003\n\
_08026034: .4byte gBattlescriptCurrInstr\n\
@@ -13106,7 +13106,7 @@ _08026040:\n\
bne _08025F74\n\
mov r0, r8\n\
bl b_movescr_stack_push\n\
- ldr r0, _08026094 @ =0x02000000\n\
+ ldr r0, _08026094 @ =gSharedMem\n\
ldr r3, _08026090 @ =gActiveBank\n\
ldrb r1, [r3]\n\
ldr r6, _08026098 @ =0x00016003\n\
@@ -13128,7 +13128,7 @@ _08026040:\n\
b _08025F74\n\
.align 2, 0\n\
_08026090: .4byte gActiveBank\n\
-_08026094: .4byte 0x02000000\n\
+_08026094: .4byte gSharedMem\n\
_08026098: .4byte 0x00016003\n\
_0802609C: .4byte gBattlescriptCurrInstr\n\
_080260A0: .4byte BattleScript_AbilityNoSpecificStatLoss\n\
@@ -13154,7 +13154,7 @@ _080260A8:\n\
_080260CA:\n\
mov r0, r8\n\
bl b_movescr_stack_push\n\
- ldr r0, _08026100 @ =0x02000000\n\
+ ldr r0, _08026100 @ =gSharedMem\n\
ldr r3, _080260FC @ =gActiveBank\n\
ldrb r1, [r3]\n\
ldr r6, _08026104 @ =0x00016003\n\
@@ -13176,7 +13176,7 @@ _080260CA:\n\
b _08025F74\n\
.align 2, 0\n\
_080260FC: .4byte gActiveBank\n\
-_08026100: .4byte 0x02000000\n\
+_08026100: .4byte gSharedMem\n\
_08026104: .4byte 0x00016003\n\
_08026108: .4byte gBattlescriptCurrInstr\n\
_0802610C: .4byte BattleScript_AbilityNoSpecificStatLoss\n\
@@ -15656,7 +15656,7 @@ push {r4-r7,lr}\n\
bl __divsi3\n\
adds r0, 0x1E\n\
strh r0, [r5]\n\
- ldr r5, _080298A0 @ =0x02000000\n\
+ ldr r5, _080298A0 @ =gSharedMem\n\
lsls r0, r4, 4\n\
subs r0, r4\n\
movs r1, 0x3F\n\
@@ -15691,7 +15691,7 @@ _08029876:\n\
_08029894: .4byte gBattleMons\n\
_08029898: .4byte gBankAttacker\n\
_0802989C: .4byte gDynamicBasePower\n\
-_080298A0: .4byte 0x02000000\n\
+_080298A0: .4byte gSharedMem\n\
_080298A4: .4byte 0x0001601c\n\
_080298A8: .4byte gBattlescriptCurrInstr\n\
.syntax divided");
@@ -16372,7 +16372,7 @@ _0802A364: .4byte BattleScript_NoItemSteal\n\
_0802A368: .4byte gLastUsedAbility\n\
_0802A36C:\n\
lsls r0, r4, 1\n\
- ldr r4, _0802A458 @ =0x020160f0\n\
+ ldr r4, _0802A458 @ =gSharedMem + 0x160F0\n\
adds r6, r0, r4\n\
ldrh r5, [r5, 0x2E]\n\
mov r10, r5\n\
@@ -16486,7 +16486,7 @@ _0802A36C:\n\
movs r0, 0x2\n\
b _0802A498\n\
.align 2, 0\n\
-_0802A458: .4byte 0x020160f0\n\
+_0802A458: .4byte gSharedMem + 0x160F0\n\
_0802A45C: .4byte gBankAttacker\n\
_0802A460: .4byte gActiveBank\n\
_0802A464: .4byte 0xfffe9f10\n\
@@ -16820,7 +16820,7 @@ _0802AAAE:\n\
mov r9, r6\n\
mov r1, r10\n\
lsls r0, r1, 1\n\
- ldr r1, _0802ABB0 @ =0x02016024\n\
+ ldr r1, _0802ABB0 @ =gSharedMem + 0x16024\n\
adds r6, r0, r1\n\
_0802AAF8:\n\
movs r7, 0\n\
@@ -16891,7 +16891,7 @@ _0802AB54:\n\
muls r0, r1\n\
asrs r0, 8\n\
lsls r0, 1\n\
- ldr r1, _0802ABB0 @ =0x02016024\n\
+ ldr r1, _0802ABB0 @ =gSharedMem + 0x16024\n\
adds r0, r1\n\
ldrh r0, [r0]\n\
strh r0, [r4]\n\
@@ -16911,7 +16911,7 @@ _0802ABA0: .4byte gPlayerParty\n\
_0802ABA4: .4byte gEnemyParty\n\
_0802ABA8: .4byte gBattlePartyID\n\
_0802ABAC: .4byte 0x0000ffff\n\
-_0802ABB0: .4byte 0x02016024\n\
+_0802ABB0: .4byte gSharedMem + 0x16024\n\
_0802ABB4: .4byte sUnknown_081FACFE\n\
_0802ABB8: .4byte gHitMarker\n\
_0802ABBC: .4byte 0xfffffbff\n\
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index ceac8ff24..fe1d0b159 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -284,7 +284,7 @@ void BattleLoadOpponentMonSprite(struct Pokemon *pkmn, u8 b)
&gMonFrontPicTable[species],
gMonFrontPicCoords[species].coords,
gMonFrontPicCoords[species].y_offset,
- 0x02000000,
+ eVoidSharedArr2,
gUnknown_081FAF4C[var],
species,
r7);
@@ -336,7 +336,7 @@ void BattleLoadPlayerMonSprite(struct Pokemon *pkmn, u8 b)
&gMonBackPicTable[species],
gMonBackPicCoords[species].coords,
gMonBackPicCoords[species].y_offset,
- 0x02000000,
+ eVoidSharedArr2,
gUnknown_081FAF4C[var],
species,
r7);
@@ -379,7 +379,7 @@ void sub_8031A6C(u16 a, u8 b)
&gTrainerFrontPicTable[a],
gTrainerFrontPicCoords[a].coords,
gTrainerFrontPicCoords[a].y_offset,
- (void *)0x02000000,
+ eVoidSharedArr,
gUnknown_081FAF4C[status],
0);
spriteSheet.data = gUnknown_081FAF4C[status];
@@ -398,7 +398,7 @@ void LoadPlayerTrainerBankSprite(u16 a, u8 b)
&gTrainerBackPicTable[a],
gTrainerBackPicCoords[a].coords,
gTrainerBackPicCoords[a].y_offset,
- (void *)0x02000000,
+ eVoidSharedArr,
gUnknown_081FAF4C[status],
0);
LoadCompressedPalette(gTrainerBackPicPaletteTable[a].data, 0x100 + b * 16, 32);
@@ -495,7 +495,7 @@ bool8 sub_8031C30(u8 a)
void load_gfxc_health_bar(void)
{
- LZDecompressWram(gUnknown_08D09C48, (void *)0x02000000);
+ LZDecompressWram(gUnknown_08D09C48, eVoidSharedArr);
}
u8 battle_load_something(u8 *pState, u8 *b)
@@ -636,7 +636,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
&gMonBackPicTable[species],
gMonBackPicCoords[species].coords,
gMonBackPicCoords[species].y_offset,
- 0x02000000,
+ eVoidSharedArr2,
gUnknown_081FAF4C[0],
species,
ewram19348.unk10);
@@ -656,7 +656,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
&gMonBackPicTable[species],
gMonBackPicCoords[species].coords,
gMonBackPicCoords[species].y_offset,
- 0x02000000,
+ eVoidSharedArr2,
gUnknown_081FAF4C[r10],
species,
gPID_perBank[a]);
@@ -669,7 +669,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
&gMonFrontPicTable[species],
gMonFrontPicCoords[species].coords,
gMonFrontPicCoords[species].y_offset,
- 0x02000000,
+ eVoidSharedArr2,
gUnknown_081FAF4C[r10],
species,
gPID_perBank[a]);
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index 5145d4980..cb6c10676 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -1017,7 +1017,7 @@ static void BattleAICmd_is_most_powerful_move(void)
ldrh r1, [r0]\n\
ldr r4, _0810832C @ =0x0000ffff\n\
ldr r6, _08108330 @ =gBattleMoves\n\
- ldr r5, _08108334 @ =0x02016800\n\
+ ldr r5, _08108334 @ =gSharedMem + 0x16800\n\
cmp r1, r4\n\
beq _0810822E\n\
ldrh r1, [r5, 0x2]\n\
@@ -1150,7 +1150,7 @@ _081082BA:\n\
mov r4, sp\n\
add r4, r8\n\
ldr r2, _08108358 @ =gBattleMoveDamage\n\
- ldr r0, _08108334 @ =0x02016800\n\
+ ldr r0, _08108334 @ =gSharedMem + 0x16800\n\
adds r0, 0x18\n\
adds r0, r6, r0\n\
ldrb r1, [r0]\n\
@@ -1168,7 +1168,7 @@ _081082BA:\n\
_08108328: .4byte sDiscouragedPowerfulMoveEffects\n\
_0810832C: .4byte 0x0000ffff\n\
_08108330: .4byte gBattleMoves\n\
-_08108334: .4byte 0x02016800\n\
+_08108334: .4byte gSharedMem + 0x16800\n\
_08108338: .4byte gDynamicBasePower\n\
_0810833C: .4byte 0xfffff81c\n\
_08108340: .4byte gBattleMoveFlags\n\
@@ -1188,7 +1188,7 @@ _08108364:\n\
cmp r6, 0x3\n\
ble _08108276\n\
movs r6, 0\n\
- ldr r1, _081083A4 @ =0x02016800\n\
+ ldr r1, _081083A4 @ =gSharedMem + 0x16800\n\
ldrb r0, [r1, 0x1]\n\
lsls r0, 2\n\
add r0, sp\n\
@@ -1219,7 +1219,7 @@ _0810839A:\n\
str r0, [r5, 0x8]\n\
b _081083B8\n\
.align 2, 0\n\
-_081083A4: .4byte 0x02016800\n\
+_081083A4: .4byte gSharedMem + 0x16800\n\
_081083A8: .4byte gAIScriptPtr\n\
_081083AC:\n\
movs r0, 0x1\n\
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index 408a21f86..1a78b2863 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -801,7 +801,7 @@ _08075FDC:\n\
cmp r0, 0\n\
bne _0807601C\n\
lsls r0, r5, 2\n\
- ldr r1, _08076020 @ =0x02017800\n\
+ ldr r1, _08076020 @ =gSharedMem + 0x17800\n\
adds r0, r1\n\
ldrb r1, [r0]\n\
movs r0, 0x1\n\
@@ -825,7 +825,7 @@ _0807601C:\n\
movs r0, 0x1\n\
b _0807602E\n\
.align 2, 0\n\
-_08076020: .4byte 0x02017800\n\
+_08076020: .4byte gSharedMem + 0x17800\n\
_08076024: .4byte gSprites\n\
_08076028: .4byte gObjectBankIDs\n\
_0807602C:\n\
@@ -1533,7 +1533,7 @@ s8 sub_8076F98(s8 a)
lsls r0, r2, 1\n\
adds r0, r2\n\
lsls r0, 2\n\
- ldr r1, _08076FD8 @ =0x02017810\n\
+ ldr r1, _08076FD8 @ =gSharedMem + 0x17810\n\
adds r0, r1\n\
ldrb r1, [r0]\n\
movs r0, 0x10\n\
@@ -1550,7 +1550,7 @@ s8 sub_8076F98(s8 a)
b _0807706E\n\
.align 2, 0\n\
_08076FD4: .4byte gBattleAnimBankAttacker\n\
-_08076FD8: .4byte 0x02017810\n\
+_08076FD8: .4byte gSharedMem + 0x17810\n\
_08076FDC:\n\
bl NotInBattle\n\
lsls r0, 24\n\
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index 09837bfee..0bd2e882f 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -700,11 +700,11 @@ static void sub_8043FC0(u8 a, u8 b)
*(ptr++) = 0x13;
*(ptr++) = 0xF;
*(ptr++) = EOS;
- sub_80034D4((u8 *)0x02000000, str);
+ sub_80034D4(ewram0_9(0), str);
two = 2;
for (i = 0; i < two; i++)
- CpuCopy32((void *)(0x02000020 + i * 64), r7[i] + gSprites[a].oam.tileNum * 32, 32);
+ CpuCopy32((void *)(ewram0_9(1) + i * 64), r7[i] + gSprites[a].oam.tileNum * 32, 32);
}
#ifdef NONMATCHING
@@ -738,7 +738,7 @@ void sub_80440EC(u8 a, s16 b, u8 c)
ptr = sub_8003504(ptr, b, 0x13, 1);
*(ptr++) = 0xBA;
*(ptr++) = 0xFF;
- sub_80034D4((u8 *)0x02000000, str);
+ sub_80034D4(ewram0_9(0), str);
}
else
{
@@ -748,14 +748,14 @@ void sub_80440EC(u8 a, s16 b, u8 c)
r4 = gUnknown_0820A85C;
c = 2;
sub_8003504(ptr, b, 0xF, 1);
- sub_80034D4((u8 *)0x02000000, str);
+ sub_80034D4(ewram0_9(0), str);
}
//asm(""::"r"(a));
//_080441B6
for (i = 0; i < c; i++) // _080440BC
{
void *temp = r4[i] + gSprites[a].oam.tileNum * 32;
- CpuCopy32((void *)(0x02000020 + i * 0x40), temp, 0x20);
+ CpuCopy32((void *)(ewram0_9(1) + i * 0x40), temp, 0x20);
}
}
#else
@@ -873,7 +873,7 @@ _080441B6:\n\
lsls r0, 2\n\
adds r6, r0, r1\n\
adds r7, r4, 0\n\
- ldr r5, _08044208 @ =0x02000020\n\
+ ldr r5, _08044208 @ =gSharedMem + 0x20\n\
mov r4, r8\n\
_080441D6:\n\
ldrh r0, [r6, 0x4]\n\
@@ -899,7 +899,7 @@ _080441F0:\n\
_080441FC: .4byte gUnknown_0820A85C\n\
_08044200: .4byte gUnknown_0820A854\n\
_08044204: .4byte gSprites\n\
-_08044208: .4byte 0x02000020\n\
+_08044208: .4byte gSharedMem + 0x20\n\
_0804420C: .4byte 0x04000008\n\
.syntax divided\n");
}
@@ -939,10 +939,10 @@ static void sub_8044210(u8 a, s16 b, u8 c)
}
}
r4 = gSprites[a].data5;
- sub_80034D4((u8 *)0x02000000, str);
+ sub_80034D4(ewram0_9(0), str);
for (i = 0; i < r10; i++)
{
- CpuCopy32((void *)(0x02000020 + i * 0x40), r7[i] + gSprites[r4].oam.tileNum * 32, 0x20);
+ CpuCopy32((void *)(ewram0_9(1) + i * 0x40), r7[i] + gSprites[r4].oam.tileNum * 32, 0x20);
}
}
@@ -999,19 +999,19 @@ void sub_8044338(u8 a, struct Pokemon *pkmn)
ConvertIntToDecimalStringN(str + 9, ewram16088, 1, 2);
str[5] = 0;
str[8] = 0xBA;
- sub_80034D4((u8 *)0x02000000, str);
+ sub_80034D4(ewram0_9(0), str);
for (r7 = 0; r7 < 5; r7++)
{
if (r7 <= 1)
{
int foo = (gSprites[r5].oam.tileNum + 2 + r7);
- CpuCopy32((u8 *)0x02000020 + r7 * 0x40, (u8 *)0x06010000 + foo * 32, 32);
+ CpuCopy32(ewram0_9(1) + r7 * 0x40, (u8 *)0x06010000 + foo * 32, 32);
}
else
{
int foo = (r7 + gSprites[r5].oam.tileNum);
- CpuCopy32((u8 *)0x02000020 + r7 * 0x40, (u8 *)0x060100C0 + foo * 32, 32);
+ CpuCopy32(ewram0_9(1) + r7 * 0x40, (u8 *)0x060100C0 + foo * 32, 32);
}
}
}
@@ -1049,7 +1049,7 @@ void sub_8044338(u8 a, struct Pokemon *pkmn)
lsls r1, r0, 1\n\
adds r1, r0\n\
lsls r1, 7\n\
- ldr r3, _080443D4 @ =0x02000520\n\
+ ldr r3, _080443D4 @ =gSharedMem + 0x520\n\
adds r6, r1, r3\n\
movs r0, 0x5\n\
mov r8, r0\n\
@@ -1094,7 +1094,7 @@ _080443C8:\n\
.align 2, 0\n\
_080443CC: .4byte gUnknown_0820A864\n\
_080443D0: .4byte gSprites\n\
-_080443D4: .4byte 0x02000520\n\
+_080443D4: .4byte gSharedMem + 0x520\n\
_080443D8: .4byte gNatureNames\n\
_080443DC:\n\
adds r0, r1, 0\n\
@@ -1193,7 +1193,7 @@ _08044486:\n\
ldrh r5, [r0, 0x38]\n\
lsls r5, 24\n\
lsrs r5, 24\n\
- ldr r4, _08044504 @ =0x02000000\n\
+ ldr r4, _08044504 @ =gSharedMem\n\
ldr r2, _08044508 @ =0x00016089\n\
adds r0, r4, r2\n\
ldrb r1, [r0]\n\
@@ -1222,7 +1222,7 @@ _08044486:\n\
adds r0, r5\n\
lsls r0, 2\n\
adds r5, r0, r6\n\
- ldr r4, _08044510 @ =0x02000020\n\
+ ldr r4, _08044510 @ =gSharedMem + 0x20\n\
_080444DA:\n\
cmp r7, 0x1\n\
bgt _08044514\n\
@@ -1242,10 +1242,10 @@ _080444DA:\n\
_080444F8: .4byte 0x04000008\n\
_080444FC: .4byte gSprites\n\
_08044500: .4byte 0x06010000\n\
-_08044504: .4byte 0x02000000\n\
+_08044504: .4byte gSharedMem\n\
_08044508: .4byte 0x00016089\n\
_0804450C: .4byte 0x00016088\n\
-_08044510: .4byte 0x02000020\n\
+_08044510: .4byte gSharedMem + 0x20\n\
_08044514:\n\
ldrh r1, [r5, 0x4]\n\
lsls r1, 22\n\
@@ -2409,7 +2409,7 @@ static void sub_80451A0(u8 a, struct Pokemon *pkmn)
ptr[1] = 0x13;
ptr[2] = 0x37;
ptr[3] = EOS;
- ptr = (u8 *)0x02000520 + GetBankIdentity(gSprites[a].data6) * 0x180;
+ ptr = ewram520_2 + GetBankIdentity(gSprites[a].data6) * 0x180;
sub_80034D4(ptr, gDisplayedStringBattle);
i = 0;
@@ -2657,7 +2657,7 @@ static void sub_80458B0(u8 a)
s32 r7;
u8 *addr;
- r6 = (u8 *)0x02000520 + GetBankIdentity(gSprites[a].data6) * 0x180;
+ r6 = ewram520_2 + GetBankIdentity(gSprites[a].data6) * 0x180;
r8 = 7;
sub_80034D4(r6, BattleText_SafariBalls);
for (i = 0; i < r8; i++)
@@ -2686,10 +2686,10 @@ static void sub_8045998(u8 a)
r7 = sub_8003504(r7, gNumSafariBalls, 10, 1);
StringAppend(r7, BattleText_HighlightRed);
status = GetBankIdentity(gSprites[a].data6);
- r7 = (u8 *)0x02000520 + status * 0x180;
+ r7 = ewram520_2 + status * 0x180;
r6 = 5;
sub_80034D4(r7, gDisplayedStringBattle);
- r7 = (u8 *)0x02000520 + status * 0x180 + 32;
+ r7 = ewram520_2 + status * 0x180 + 32;
for (i = 6; i < 6 + r6; i++)
{
CpuCopy32(r7, OBJ_VRAM0 + (gSprites[a].oam.tileNum + 0x18 + MACRO1(i)) * 32, 32);
diff --git a/src/de_rom_8040FE0.c b/src/de_rom_8040FE0.c
index 8adad3245..53ad4a806 100644
--- a/src/de_rom_8040FE0.c
+++ b/src/de_rom_8040FE0.c
@@ -165,7 +165,7 @@ _0804104A:\n\
bl GetSecretBaseTrainerNameIndex\n\
lsls r0, 24\n\
lsrs r5, r0, 24\n\
- ldr r0, _08041060 @ =0x02017000\n\
+ ldr r0, _08041060 @ =gSharedMem + 0x17000\n\
ldrb r0, [r0, 0x1]\n\
lsls r0, 27\n\
lsrs r2, r0, 31\n\
@@ -173,7 +173,7 @@ _0804104A:\n\
beq _080410B8\n\
b _080410F8\n\
.align 2, 0\n\
-_08041060: .4byte 0x02017000\n\
+_08041060: .4byte gSharedMem + 0x17000\n\
_08041064:\n\
bl de_sub_81364AC\n\
lsls r0, 24\n\
diff --git a/src/engine/decompress.c b/src/engine/decompress.c
index 3e5993118..0893a8492 100644
--- a/src/engine/decompress.c
+++ b/src/engine/decompress.c
@@ -3,8 +3,9 @@
#include "data2.h"
#include "species.h"
#include "text.h"
+#include "ewram.h"
-#define WRAM 0x02000000
+#define WRAM ewram_addr // using gSharedMem doesn't match
void LZDecompressWram(const void *src, void *dest)
{
diff --git a/src/engine/trade.c b/src/engine/trade.c
index 7477b05ac..41146a22c 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -4175,7 +4175,7 @@ static __attribute__((naked)) void sub_804B41C(void)
"\tbl ResetTasks\n"
"\tbl CloseLink\n"
"\tldr r6, _0804B570 @ =gUnknown_03004828\n"
- "\tldr r5, _0804B574 @ =0x0201f000\n"
+ "\tldr r5, _0804B574 @ =gSharedMem + 0x1F000\n"
"\tstr r5, [r6]\n"
"\tbl ResetSpriteData\n"
"\tbl FreeAllSpritePalettes\n"
@@ -4277,7 +4277,7 @@ static __attribute__((naked)) void sub_804B41C(void)
"\tb _0804B76E_break\n"
"\t.align 2, 0\n"
"_0804B570: .4byte gUnknown_03004828\n"
- "_0804B574: .4byte 0x0201f000\n"
+ "_0804B574: .4byte gSharedMem + 0x1F000\n"
"_0804B578: .4byte sub_804B210\n"
"_0804B57C: .4byte gWindowConfig_81E6F84\n"
"_0804B580: .4byte gLinkType\n"
diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c
index 025d19ffc..6d105f512 100644
--- a/src/engine/trainer_card.c
+++ b/src/engine/trainer_card.c
@@ -808,7 +808,7 @@ bool8 sub_8093AF0(struct Task *task)
push {r5-r7}\n\
sub sp, 0x4\n\
mov r8, r0\n\
- ldr r1, _08093BFC @ =0x02000000\n\
+ ldr r1, _08093BFC @ =gSharedMem\n\
movs r0, 0\n\
strb r0, [r1, 0x4]\n\
mov r2, r8\n\
@@ -921,7 +921,7 @@ _08093BBE:\n\
ble _08093BBE\n\
_08093BD4:\n\
movs r0, 0x1\n\
- ldr r1, _08093BFC @ =0x02000000\n\
+ ldr r1, _08093BFC @ =gSharedMem\n\
strb r0, [r1, 0x4]\n\
mov r2, r8\n\
movs r4, 0xA\n\
@@ -942,7 +942,7 @@ _08093BEA:\n\
pop {r1}\n\
bx r1\n\
.align 2, 0\n\
-_08093BFC: .4byte 0x02000000\n\
+_08093BFC: .4byte gSharedMem\n\
_08093C00: .4byte 0xffff0000\n\
_08093C04: .4byte gUnknown_03004DE0\n\
_08093C08: .4byte 0x0000fffc\n\
@@ -970,7 +970,7 @@ bool8 sub_8093C38(struct Task *task)
push {r5-r7}\n\
sub sp, 0x4\n\
mov r8, r0\n\
- ldr r1, _08093D40 @ =0x02000000\n\
+ ldr r1, _08093D40 @ =gSharedMem\n\
movs r2, 0\n\
strb r2, [r1, 0x4]\n\
ldrh r0, [r0, 0xA]\n\
@@ -1081,7 +1081,7 @@ _08093D02:\n\
ble _08093D02\n\
_08093D18:\n\
movs r0, 0x1\n\
- ldr r1, _08093D40 @ =0x02000000\n\
+ ldr r1, _08093D40 @ =gSharedMem\n\
strb r0, [r1, 0x4]\n\
mov r2, r8\n\
movs r3, 0xA\n\
@@ -1102,7 +1102,7 @@ _08093D2E:\n\
pop {r1}\n\
bx r1\n\
.align 2, 0\n\
-_08093D40: .4byte 0x02000000\n\
+_08093D40: .4byte gSharedMem\n\
_08093D44: .4byte 0xffff0000\n\
_08093D48: .4byte gUnknown_03004DE0\n\
_08093D4C: .4byte 0x0000fffc\n\
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index 25fd63463..42bb66f6f 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -1109,7 +1109,7 @@ _0806B980:\n\
movs r3, 0x3\n\
bl sub_806BA94\n\
_0806B98C:\n\
- ldr r0, _0806B99C @ =0x0201b000\n\
+ ldr r0, _0806B99C @ =gSharedMem + 0x1B000\n\
ldr r1, _0806B9A0 @ =0x00000261\n\
adds r0, r1\n\
movs r1, 0x2\n\
@@ -1118,7 +1118,7 @@ _0806B98C:\n\
pop {r0}\n\
bx r0\n\
.align 2, 0\n\
-_0806B99C: .4byte 0x0201b000\n\
+_0806B99C: .4byte gSharedMem + 0x1B000\n\
_0806B9A0: .4byte 0x00000261\n\
.syntax divided\n");
}
@@ -2548,7 +2548,7 @@ void sub_806CF04(void)
{
asm(".syntax unified\n\
push {r4,r5,lr}\n\
- ldr r4, _0806CF94 @ =0x02001000\n\
+ ldr r4, _0806CF94 @ =gSharedMem + 0x1000\n\
ldrb r1, [r4, 0x3]\n\
lsls r0, r1, 4\n\
adds r0, r1\n\
@@ -2616,7 +2616,7 @@ void sub_806CF04(void)
pop {r0}\n\
bx r0\n\
.align 2, 0\n\
-_0806CF94: .4byte 0x02001000\n\
+_0806CF94: .4byte gSharedMem + 0x1000\n\
_0806CF98: .4byte gSprites + 0x20\n\
_0806CF9C: .4byte SpriteCB_sub_806D37C\n\
.syntax divided\n");
@@ -5033,7 +5033,7 @@ void PrintStatGrowthsInLevelUpWindow(u8 taskId) {
movs r2, 0x13\n\
mov r8, r2\n\
_0807086C:\n\
- ldr r1, _08070930 @ =0x0201c000\n\
+ ldr r1, _08070930 @ =gSharedMem + 0x1C000\n\
ldr r0, [r1]\n\
ldr r1, _08070934 @ =StatDataTypes\n\
adds r1, r7, r1\n\
@@ -5041,7 +5041,7 @@ _0807086C:\n\
bl GetMonData\n\
adds r1, r7, 0x6\n\
lsls r1, 1\n\
- ldr r2, _08070938 @ =0x0201b264\n\
+ ldr r2, _08070938 @ =gSharedMem + 0x1B264\n\
adds r1, r2, r1\n\
strh r0, [r1]\n\
lsls r6, r7, 1\n\
@@ -5123,9 +5123,9 @@ _0807086C:\n\
bx r0\n\
.align 2, 0\n\
_0807092C: .4byte gStringVar1\n\
-_08070930: .4byte 0x0201c000\n\
+_08070930: .4byte gSharedMem + 0x1C000\n\
_08070934: .4byte StatDataTypes\n\
-_08070938: .4byte 0x0201b264\n\
+_08070938: .4byte gSharedMem + 0x1B264\n\
_0807093C: .4byte StatNames\n\
_08070940: .4byte gOtherText_TallPlusAndRightArrow\n\
.syntax divided\n");
diff --git a/src/field/shop.c b/src/field/shop.c
index 67e9b006e..493d8c748 100644
--- a/src/field/shop.c
+++ b/src/field/shop.c
@@ -279,7 +279,7 @@ void BuyMenuDrawGraphics(void)
register const u32 zero asm("r6") = 0;
DmaFill32(3, zero, addr, OAM_SIZE);
LZDecompressVram(gBuyMenuFrame_Gfx, (void*)(VRAM + 0x7C00));
- LZDecompressWram(gBuyMenuFrame_Tilemap, (void *)0x02018000);
+ LZDecompressWram(gBuyMenuFrame_Tilemap, ewram18000_2);
LoadCompressedPalette(gMenuMoneyPal, 0xC0, sizeof(gMenuMoneyPal));
FreeAllSpritePalettes();
ResetPaletteFade();
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index d6b20feaa..89ec68b0a 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -3,6 +3,7 @@
#include "decompress.h"
#include "palette.h"
#include "task.h"
+#include "ewram.h"
struct UnkStruct2000000 {
/*0x00*/ u8 filler00[61];
@@ -15,8 +16,6 @@ struct UnkStruct1 {
/*0x02*/ s16 unk02;
};
-extern struct UnkStruct2000000 gSharedMem;
-
extern struct UnkStruct1 *gUnknown_083ED048[];
extern const u16 gPalette_83EDE24[];
@@ -40,7 +39,7 @@ void sub_8104CAC(u8 arg0) {
sub_8104DA4();
- task = &gTasks[gSharedMem.unk3D];
+ task = &gTasks[ewram0_8->unk3D];
task->data[1] = arg0;
i = 0;
@@ -71,9 +70,9 @@ void sub_8106448(void) {
u32 offsetRead, offsetWrite;
u32 size;
- LZDecompressWram(gSlotMachine_Gfx, (void *) 0x02010000);
+ LZDecompressWram(gSlotMachine_Gfx, ewram10000_2);
- offsetRead = 0x02010000;
+ offsetRead = (u32)ewram10000_2;
offsetWrite = BG_VRAM;
size = SLOTMACHINE_GFX_TILES * 32;
while (TRUE)
diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c
index 947dfd218..18e98ca5f 100644
--- a/src/pokemon/pokedex.c
+++ b/src/pokemon/pokedex.c
@@ -24,6 +24,7 @@
#include "task.h"
#include "trig.h"
#include "unknown_task.h"
+#include "ewram.h"
#define NATIONAL_DEX_COUNT 386
@@ -954,86 +955,86 @@ static const struct OamData gOamData_83B557C =
};
static void *const gUnknown_083B5584[] =
{
- (void *)0x02008000,
- (void *)0x0200C000,
- (void *)0x02010000,
- (void *)0x02014000,
+ ePokedexPalAddr1,
+ ePokedexPalAddr2,
+ ePokedexPalAddr3,
+ ePokedexPalAddr4,
};
static const struct SpriteFrameImage gSpriteImageTable_83B5594[] =
{
- {(u8 *)0x02008000, 0x800},
- {(u8 *)0x02008800, 0x800},
- {(u8 *)0x02009000, 0x800},
- {(u8 *)0x02009800, 0x800},
- {(u8 *)0x0200A000, 0x800},
- {(u8 *)0x0200A800, 0x800},
- {(u8 *)0x0200B000, 0x800},
- {(u8 *)0x0200B800, 0x800},
- {(u8 *)0x0200C000, 0x800},
- {(u8 *)0x0200C800, 0x800},
- {(u8 *)0x0200D000, 0x800},
- {(u8 *)0x0200D800, 0x800},
- {(u8 *)0x0200E000, 0x800},
- {(u8 *)0x0200E800, 0x800},
- {(u8 *)0x0200F000, 0x800},
- {(u8 *)0x0200F800, 0x800},
+ {ewram8000, 0x800},
+ {ewram8800, 0x800},
+ {ewram9000, 0x800},
+ {ewram9800, 0x800},
+ {ewramA000, 0x800},
+ {ewramA800, 0x800},
+ {ewramB000, 0x800},
+ {ewramB800, 0x800},
+ {ewramC000, 0x800},
+ {ewramC800, 0x800},
+ {ewramD000, 0x800},
+ {ewramD800, 0x800},
+ {ewramE000, 0x800},
+ {ewramE800, 0x800},
+ {ewramF000, 0x800},
+ {ewramF800, 0x800},
};
static const struct SpriteFrameImage gSpriteImageTable_83B5614[] =
{
- {(u8 *)0x0200C000, 0x800},
- {(u8 *)0x0200C800, 0x800},
- {(u8 *)0x0200D000, 0x800},
- {(u8 *)0x0200D800, 0x800},
- {(u8 *)0x0200E000, 0x800},
- {(u8 *)0x0200E800, 0x800},
- {(u8 *)0x0200F000, 0x800},
- {(u8 *)0x0200F800, 0x800},
- {(u8 *)0x02010000, 0x800},
- {(u8 *)0x02010800, 0x800},
- {(u8 *)0x02011000, 0x800},
- {(u8 *)0x02011800, 0x800},
- {(u8 *)0x02012000, 0x800},
- {(u8 *)0x02012800, 0x800},
- {(u8 *)0x02013000, 0x800},
- {(u8 *)0x02013800, 0x800},
+ {ewramC000, 0x800},
+ {ewramC800, 0x800},
+ {ewramD000, 0x800},
+ {ewramD800, 0x800},
+ {ewramE000, 0x800},
+ {ewramE800, 0x800},
+ {ewramF000, 0x800},
+ {ewramF800, 0x800},
+ {ewram10000, 0x800},
+ {ewram10800, 0x800},
+ {ewram11000, 0x800},
+ {ewram11800, 0x800},
+ {ewram12000, 0x800},
+ {ewram12800, 0x800},
+ {ewram13000, 0x800},
+ {ewram13800, 0x800},
};
static const struct SpriteFrameImage gSpriteImageTable_83B5694[] =
{
- {(u8 *)0x02010000, 0x800},
- {(u8 *)0x02010800, 0x800},
- {(u8 *)0x02011000, 0x800},
- {(u8 *)0x02011800, 0x800},
- {(u8 *)0x02012000, 0x800},
- {(u8 *)0x02012800, 0x800},
- {(u8 *)0x02013000, 0x800},
- {(u8 *)0x02013800, 0x800},
- {(u8 *)0x02014000, 0x800},
- {(u8 *)0x02014800, 0x800},
- {(u8 *)0x02015000, 0x800},
- {(u8 *)0x02015800, 0x800},
- {(u8 *)0x02016000, 0x800},
- {(u8 *)0x02016800, 0x800},
- {(u8 *)0x02017000, 0x800},
- {(u8 *)0x02017800, 0x800},
+ {ewram10000, 0x800},
+ {ewram10800, 0x800},
+ {ewram11000, 0x800},
+ {ewram11800, 0x800},
+ {ewram12000, 0x800},
+ {ewram12800, 0x800},
+ {ewram13000, 0x800},
+ {ewram13800, 0x800},
+ {ewram14000, 0x800},
+ {ewram14800, 0x800},
+ {ewram15000, 0x800},
+ {ewram15800, 0x800},
+ {ewram16000_2, 0x800},
+ {ewram16800, 0x800},
+ {ewram17000, 0x800},
+ {ewram17800_2, 0x800},
};
static const struct SpriteFrameImage gSpriteImageTable_83B5714[] =
{
- {(u8 *)0x02014000, 0x800},
- {(u8 *)0x02014800, 0x800},
- {(u8 *)0x02015000, 0x800},
- {(u8 *)0x02015800, 0x800},
- {(u8 *)0x02016000, 0x800},
- {(u8 *)0x02016800, 0x800},
- {(u8 *)0x02017000, 0x800},
- {(u8 *)0x02017800, 0x800},
- {(u8 *)0x02018000, 0x800},
- {(u8 *)0x02018800, 0x800},
- {(u8 *)0x02019000, 0x800},
- {(u8 *)0x02019800, 0x800},
- {(u8 *)0x0201A000, 0x800},
- {(u8 *)0x0201A800, 0x800},
- {(u8 *)0x0201B000, 0x800},
- {(u8 *)0x0201B800, 0x800},
+ {ewram14000, 0x800},
+ {ewram14800, 0x800},
+ {ewram15000, 0x800},
+ {ewram15800, 0x800},
+ {ewram16000_2, 0x800},
+ {ewram16800, 0x800},
+ {ewram17000, 0x800},
+ {ewram17800_2, 0x800},
+ {ewram18000_2, 0x800},
+ {ewram18800, 0x800},
+ {ewram19000, 0x800},
+ {ewram19800, 0x800},
+ {ewram1A000, 0x800},
+ {ewram1A800, 0x800},
+ {ewram1B000_2, 0x800},
+ {ewram1B800, 0x800},
};
static const struct SpriteFrameImage *const gUnknown_083B5794[] =
{
@@ -1275,8 +1276,8 @@ static void sub_8091564(u16 weight, u8 i, u8 i1);
static void sub_8091738(u16, u16, u16);
static void sub_80917CC(u16 i, u16 i1);
static u16 sub_8091818(u8, u16, u16, u16);
-static u16 sub_80918EC(u16 a, s16 b, s16 c, u16 d);
-static u8 sub_8091A4C(u16 gender, s16, s16, u16);
+u16 sub_80918EC(u16 a, s16 b, s16 c, u16 d);
+u8 sub_8091A4C(u16 gender, s16, s16, u16);
static void sub_8091E54(u8);
static void sub_809204C(u8);
static void sub_809207C(u8);
@@ -1433,16 +1434,16 @@ void CB2_InitPokedex(void)
{
case 0:
default:
- gPokedexView = (struct PokedexView *)0x02018000;
+ gPokedexView = ePokedexView1;
break;
case 1:
- gPokedexView = (struct PokedexView *)0x02018800;
+ gPokedexView = ePokedexView2;
break;
case 2:
- gPokedexView = (struct PokedexView *)0x02019000;
+ gPokedexView = ePokedexView3;
break;
case 3:
- gPokedexView = (struct PokedexView *)0x02019800;
+ gPokedexView = ePokedexView4;
break;
}
ClearPokedexView(gPokedexView);
@@ -4557,7 +4558,7 @@ u16 sub_80918EC(u16 num, s16 x, s16 y, u16 paletteNum)
&gMonFrontPicTable[num],
gMonFrontPicCoords[num].coords,
gMonFrontPicCoords[num].y_offset,
- (void *)0x02000000,
+ (void*)ewram_addr,
gUnknown_083B5584[paletteNum],
num);
break;
@@ -4566,7 +4567,7 @@ u16 sub_80918EC(u16 num, s16 x, s16 y, u16 paletteNum)
&gMonFrontPicTable[num],
gMonFrontPicCoords[num].coords,
gMonFrontPicCoords[num].y_offset,
- 0x02000000,
+ ewram_addr,
gUnknown_083B5584[paletteNum],
num,
gSaveBlock2.pokedex.spindaPersonality,
@@ -4577,7 +4578,7 @@ u16 sub_80918EC(u16 num, s16 x, s16 y, u16 paletteNum)
&gMonFrontPicTable[num],
gMonFrontPicCoords[num].coords,
gMonFrontPicCoords[num].y_offset,
- 0x02000000,
+ ewram_addr,
gUnknown_083B5584[paletteNum],
num,
gSaveBlock2.pokedex.unownPersonality,
@@ -4591,7 +4592,7 @@ u16 sub_80918EC(u16 num, s16 x, s16 y, u16 paletteNum)
return spriteId;
}
-static u8 sub_8091A4C(u16 gender, s16 x, s16 y, u16 paletteNum)
+u8 sub_8091A4C(u16 gender, s16 x, s16 y, u16 paletteNum)
{
u8 spriteId;
@@ -4599,7 +4600,7 @@ static u8 sub_8091A4C(u16 gender, s16 x, s16 y, u16 paletteNum)
&gTrainerFrontPicTable[gender],
gTrainerFrontPicCoords[gender].coords,
gTrainerFrontPicCoords[gender].y_offset,
- (void *)0x02000000,
+ (void*)ewram_addr,
gUnknown_083B5584[0],
gender);
sub_80918B0(gender, 0);
diff --git a/src/scene/contest_painting.c b/src/scene/contest_painting.c
index 0f745b391..2600076c3 100644
--- a/src/scene/contest_painting.c
+++ b/src/scene/contest_painting.c
@@ -109,7 +109,7 @@ void sub_8106630(u32 arg0)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
- ldr r2, _0810665C @ =0x02015de0\n\
+ ldr r2, _0810665C @ =gSharedMem + 0x15DE0\n\
subs r4, r2, 0x2\n\
subs r5, r2, 0x1\n\
ldr r3, _08106660 @ =gSaveBlock1\n\
@@ -131,7 +131,7 @@ void sub_8106630(u32 arg0)
pop {r0}\n\
bx r0\n\
.align 2, 0\n\
-_0810665C: .4byte 0x02015de0\n\
+_0810665C: .4byte gSharedMem + 0x15DE0\n\
_08106660: .4byte gSaveBlock1\n\
_08106664: .4byte 0x00002dfc\n\
.syntax divided\n");
diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c
index 742f663f6..755176c81 100644
--- a/src/scene/evolution_scene.c
+++ b/src/scene/evolution_scene.c
@@ -1520,7 +1520,7 @@ __attribute__((naked))
void unref_sub_8113B50()
{
asm(".syntax unified\n\
- push {r4-r7,lr}\n\
+ push {r4-r7,lr}\n\
mov r7, r10\n\
mov r6, r9\n\
mov r5, r8\n\
@@ -1534,7 +1534,7 @@ void unref_sub_8113B50()
str r1, [sp, 0x10]\n\
movs r2, 0\n\
str r2, [sp, 0x8]\n\
- ldr r3, _08113C60 @ =0x02014800\n\
+ ldr r3, _08113C60 @ =gSharedMem + 0x14800\n\
mov r12, r3\n\
ldr r4, _08113C64 @ =0x000018c4\n\
add r4, r12\n\
@@ -1551,7 +1551,7 @@ _08113B7C:\n\
adds r0, r3, 0x4\n\
adds r0, r1, r0\n\
strb r2, [r0]\n\
- ldr r4, _08113C6C @ =0x02014844\n\
+ ldr r4, _08113C6C @ =gSharedMem + 0x14844\n\
adds r0, r1, r4\n\
strb r2, [r0]\n\
movs r6, 0\n\
@@ -1562,7 +1562,7 @@ _08113B7C:\n\
_08113B9C:\n\
mov r0, r9\n\
adds r1, r6, r0\n\
- ldr r5, _08113C70 @ =0x020158c4\n\
+ ldr r5, _08113C70 @ =gSharedMem + 0x158C4\n\
adds r0, r1, r5\n\
strb r2, [r0]\n\
mov r5, r10\n\
@@ -1571,7 +1571,7 @@ _08113B9C:\n\
mov r5, r8\n\
adds r0, r1, r5\n\
strb r2, [r0]\n\
- ldr r5, _08113C74 @ =0x020170c4\n\
+ ldr r5, _08113C74 @ =gSharedMem + 0x170C4\n\
adds r0, r1, r5\n\
strb r2, [r0]\n\
adds r7, r3, 0\n\
@@ -1652,7 +1652,7 @@ _08113C4A:\n\
asrs r0, r6, 1\n\
lsls r0, 2\n\
add r0, r10\n\
- ldr r1, _08113C98 @ =0x020188c4\n\
+ ldr r1, _08113C98 @ =gSharedMem + 0x188C4\n\
adds r0, r1\n\
str r2, [r0]\n\
cmp r3, 0\n\
@@ -1661,12 +1661,12 @@ _08113C4A:\n\
beq _08113CC6\n\
b _08113CF4\n\
.align 2, 0\n\
-_08113C60: .4byte 0x02014800\n\
+_08113C60: .4byte gSharedMem + 0x14800\n\
_08113C64: .4byte 0x000018c4\n\
_08113C68: .4byte 0x000020c4\n\
-_08113C6C: .4byte 0x02014844\n\
-_08113C70: .4byte 0x020158c4\n\
-_08113C74: .4byte 0x020170c4\n\
+_08113C6C: .4byte gSharedMem + 0x14844\n\
+_08113C70: .4byte gSharedMem + 0x158C4\n\
+_08113C74: .4byte gSharedMem + 0x170C4\n\
_08113C78: .4byte 0x000008c4\n\
_08113C7C: .4byte 0x000030c4\n\
_08113C80: .4byte 0x000038c4\n\
@@ -1675,7 +1675,7 @@ _08113C88: .4byte 0x000070c4\n\
_08113C8C: .4byte 0x000080c4\n\
_08113C90: .4byte 0x000090c4\n\
_08113C94: .4byte 0x0000a0c4\n\
-_08113C98: .4byte 0x020188c4\n\
+_08113C98: .4byte gSharedMem + 0x188C4\n\
_08113C9C:\n\
movs r0, 0x1\n\
ands r0, r6\n\
@@ -1782,7 +1782,7 @@ _08113D4A:\n\
mov r8, r2\n\
movs r3, 0\n\
str r3, [sp, 0x8]\n\
- ldr r0, _08113D84 @ =0x02014844\n\
+ ldr r0, _08113D84 @ =gSharedMem + 0x14844\n\
movs r4, 0x82\n\
lsls r4, 6\n\
adds r4, r0\n\
@@ -1809,7 +1809,7 @@ _08113D78:\n\
beq _08113DB4\n\
b _08113DE4\n\
.align 2, 0\n\
-_08113D84: .4byte 0x02014844\n\
+_08113D84: .4byte gSharedMem + 0x14844\n\
_08113D88:\n\
adds r0, r6, 0\n\
mov r1, r9\n\
@@ -1915,9 +1915,9 @@ _08113E28:\n\
str r1, [sp, 0x8]\n\
_08113E3A:\n\
ldr r3, [sp, 0x8]\n\
- ldr r4, _08113EBC @ =0x02014804\n\
+ ldr r4, _08113EBC @ =gSharedMem + 0x14804\n\
adds r2, r3, r4\n\
- ldr r5, _08113EC0 @ =0x02014844\n\
+ ldr r5, _08113EC0 @ =gSharedMem + 0x14844\n\
adds r1, r3, r5\n\
ldrb r0, [r2]\n\
adds r3, 0x1\n\
@@ -1932,7 +1932,7 @@ _08113E52:\n\
ldrb r2, [r2]\n\
cmp r0, r2\n\
bge _08113F54\n\
- ldr r0, _08113EC4 @ =0x02014800\n\
+ ldr r0, _08113EC4 @ =gSharedMem + 0x14800\n\
adds r0, 0x4\n\
ldr r1, [sp, 0x8]\n\
adds r0, r1, r0\n\
@@ -1943,7 +1943,7 @@ _08113E66:\n\
str r2, [sp, 0x14]\n\
movs r6, 0\n\
ldr r3, [sp, 0x8]\n\
- ldr r4, _08113EC0 @ =0x02014844\n\
+ ldr r4, _08113EC0 @ =gSharedMem + 0x14844\n\
adds r0, r3, r4\n\
ldr r5, [sp, 0xC]\n\
adds r5, 0x1\n\
@@ -1951,18 +1951,18 @@ _08113E66:\n\
ldrb r0, [r0]\n\
cmp r6, r0\n\
bge _08113F3E\n\
- ldr r0, _08113EC4 @ =0x02014800\n\
+ ldr r0, _08113EC4 @ =gSharedMem + 0x14800\n\
mov r10, r0\n\
lsls r0, r3, 5\n\
ldr r2, [sp, 0xC]\n\
adds r1, r2, r0\n\
mov r9, r0\n\
- ldr r0, _08113EC4 @ =0x02014800\n\
+ ldr r0, _08113EC4 @ =gSharedMem + 0x14800\n\
adds r0, 0xC4\n\
mov r3, r9\n\
adds r7, r3, r0\n\
mov r5, r9\n\
- ldr r4, _08113EC4 @ =0x02014800\n\
+ ldr r4, _08113EC4 @ =gSharedMem + 0x14800\n\
ldr r2, _08113EC8 @ =0x000010c4\n\
adds r0, r4, r2\n\
adds r1, r0\n\
@@ -1982,9 +1982,9 @@ _08113EA4:\n\
ldrb r0, [r0]\n\
b _08113ED6\n\
.align 2, 0\n\
-_08113EBC: .4byte 0x02014804\n\
-_08113EC0: .4byte 0x02014844\n\
-_08113EC4: .4byte 0x02014800\n\
+_08113EBC: .4byte gSharedMem + 0x14804\n\
+_08113EC0: .4byte gSharedMem + 0x14844\n\
+_08113EC4: .4byte gSharedMem + 0x14800\n\
_08113EC8: .4byte 0x000010c4\n\
_08113ECC: .4byte 0x000020c4\n\
_08113ED0:\n\
@@ -2002,7 +2002,7 @@ _08113ED6:\n\
add r0, r10\n\
adds r2, r5, r0\n\
ldrb r0, [r4]\n\
- ldr r1, _08113F04 @ =0x02014800\n\
+ ldr r1, _08113F04 @ =gSharedMem + 0x14800\n\
mov r12, r1\n\
ldrb r1, [r2]\n\
cmp r0, r1\n\
@@ -2013,7 +2013,7 @@ _08113ED6:\n\
.align 2, 0\n\
_08113EFC: .4byte 0x000018c4\n\
_08113F00: .4byte 0x000028c4\n\
-_08113F04: .4byte 0x02014800\n\
+_08113F04: .4byte gSharedMem + 0x14800\n\
_08113F08:\n\
ldrb r1, [r2]\n\
ldrb r0, [r4]\n\
@@ -2039,7 +2039,7 @@ _08113F2C:\n\
adds r5, 0x1\n\
adds r6, 0x1\n\
ldr r3, [sp, 0x8]\n\
- ldr r4, _08114054 @ =0x02014844\n\
+ ldr r4, _08114054 @ =gSharedMem + 0x14844\n\
adds r0, r3, r4\n\
ldrb r0, [r0]\n\
cmp r6, r0\n\
@@ -2057,9 +2057,9 @@ _08113F3E:\n\
blt _08113E66\n\
_08113F54:\n\
movs r6, 0\n\
- ldr r2, _08114058 @ =0x02014800\n\
+ ldr r2, _08114058 @ =gSharedMem + 0x14800\n\
ldr r1, [sp, 0x8]\n\
- ldr r3, _08114054 @ =0x02014844\n\
+ ldr r3, _08114054 @ =gSharedMem + 0x14844\n\
adds r0, r1, r3\n\
adds r4, r2, 0\n\
mov r12, r4\n\
@@ -2090,15 +2090,15 @@ _08113F6E:\n\
bl sub_811430C\n\
_08113F94:\n\
adds r6, 0x1\n\
- ldr r2, _08114058 @ =0x02014800\n\
+ ldr r2, _08114058 @ =gSharedMem + 0x14800\n\
ldrb r5, [r4]\n\
cmp r6, r5\n\
blt _08113F6E\n\
_08113F9E:\n\
ldr r0, [sp, 0x8]\n\
- ldr r1, _0811405C @ =0x02014804\n\
+ ldr r1, _0811405C @ =gSharedMem + 0x14804\n\
adds r2, r0, r1\n\
- ldr r3, _08114054 @ =0x02014844\n\
+ ldr r3, _08114054 @ =gSharedMem + 0x14844\n\
adds r1, r0, r3\n\
ldrb r0, [r2]\n\
ldrb r1, [r1]\n\
@@ -2120,12 +2120,12 @@ _08113FBA:\n\
blt _08113FBA\n\
_08113FCC:\n\
ldr r0, [sp, 0x8]\n\
- ldr r1, _0811405C @ =0x02014804\n\
+ ldr r1, _0811405C @ =gSharedMem + 0x14804\n\
adds r2, r0, r1\n\
- ldr r3, _08114054 @ =0x02014844\n\
+ ldr r3, _08114054 @ =gSharedMem + 0x14844\n\
adds r1, r0, r3\n\
ldrb r0, [r2]\n\
- ldr r4, _08114058 @ =0x02014800\n\
+ ldr r4, _08114058 @ =gSharedMem + 0x14800\n\
ldrb r5, [r1]\n\
cmp r0, r5\n\
bhi _08113FE2\n\
@@ -2165,16 +2165,16 @@ _08114004:\n\
ldr r2, [sp, 0x24]\n\
adds r1, r2\n\
mov r10, r1\n\
- ldr r0, _08114058 @ =0x02014800\n\
+ ldr r0, _08114058 @ =gSharedMem + 0x14800\n\
adds r0, 0xC4\n\
adds r2, r0\n\
mov r8, r2\n\
ldr r7, [sp, 0x24]\n\
- ldr r3, _08114058 @ =0x02014800\n\
+ ldr r3, _08114058 @ =gSharedMem + 0x14800\n\
ldr r4, _08114060 @ =0x000010c4\n\
adds r0, r3, r4\n\
adds r5, r7, r0\n\
- ldr r0, _08114064 @ =0x020168c4\n\
+ ldr r0, _08114064 @ =gSharedMem + 0x168C4\n\
add r0, r10\n\
mov r12, r0\n\
ldrb r1, [r0]\n\
@@ -2190,22 +2190,22 @@ _0811403E:\n\
b _0811406E\n\
.align 2, 0\n\
_08114050: .4byte 0x000008c4\n\
-_08114054: .4byte 0x02014844\n\
-_08114058: .4byte 0x02014800\n\
-_0811405C: .4byte 0x02014804\n\
+_08114054: .4byte gSharedMem + 0x14844\n\
+_08114058: .4byte gSharedMem + 0x14800\n\
+_0811405C: .4byte gSharedMem + 0x14804\n\
_08114060: .4byte 0x000010c4\n\
-_08114064: .4byte 0x020168c4\n\
+_08114064: .4byte gSharedMem + 0x168C4\n\
_08114068:\n\
mov r4, r12\n\
ldrb r1, [r4]\n\
ldrb r0, [r5]\n\
_0811406E:\n\
subs r3, r1, r0\n\
- ldr r1, _0811408C @ =0x02014800\n\
+ ldr r1, _0811408C @ =gSharedMem + 0x14800\n\
ldr r2, _08114090 @ =0x000018c4\n\
adds r0, r1, r2\n\
adds r4, r7, r0\n\
- ldr r2, _08114094 @ =0x020170c4\n\
+ ldr r2, _08114094 @ =gSharedMem + 0x170C4\n\
add r2, r10\n\
ldrb r0, [r4]\n\
ldrb r1, [r2]\n\
@@ -2215,9 +2215,9 @@ _0811406E:\n\
ldrb r0, [r2]\n\
b _0811409C\n\
.align 2, 0\n\
-_0811408C: .4byte 0x02014800\n\
+_0811408C: .4byte gSharedMem + 0x14800\n\
_08114090: .4byte 0x000018c4\n\
-_08114094: .4byte 0x020170c4\n\
+_08114094: .4byte gSharedMem + 0x170C4\n\
_08114098:\n\
ldrb r1, [r2]\n\
ldrb r0, [r4]\n\
@@ -2246,25 +2246,25 @@ _081140B2:\n\
_081140C4:\n\
ldr r3, [sp, 0xC]\n\
add r3, r9\n\
- ldr r2, _08114164 @ =0x02014800\n\
+ ldr r2, _08114164 @ =gSharedMem + 0x14800\n\
ldr r4, _08114168 @ =0x000030c4\n\
adds r1, r2, r4\n\
adds r1, r3, r1\n\
ldr r2, [sp, 0x10]\n\
add r2, r9\n\
- ldr r5, _0811416C @ =0x020168c4\n\
+ ldr r5, _0811416C @ =gSharedMem + 0x168C4\n\
adds r0, r2, r5\n\
ldrb r0, [r0]\n\
strb r0, [r1]\n\
- ldr r0, _08114164 @ =0x02014800\n\
+ ldr r0, _08114164 @ =gSharedMem + 0x14800\n\
ldr r4, _08114170 @ =0x000038c4\n\
adds r1, r0, r4\n\
adds r1, r3, r1\n\
- ldr r5, _08114174 @ =0x020170c4\n\
+ ldr r5, _08114174 @ =gSharedMem + 0x170C4\n\
adds r2, r5\n\
ldrb r0, [r2]\n\
strb r0, [r1]\n\
- ldr r0, _08114164 @ =0x02014800\n\
+ ldr r0, _08114164 @ =gSharedMem + 0x14800\n\
adds r0, 0xC4\n\
adds r3, r0\n\
movs r0, 0x1\n\
@@ -2278,9 +2278,9 @@ _081140C4:\n\
b _08114004\n\
_08114104:\n\
movs r6, 0\n\
- ldr r4, _08114164 @ =0x02014800\n\
+ ldr r4, _08114164 @ =gSharedMem + 0x14800\n\
ldr r2, [sp, 0x8]\n\
- ldr r3, _08114178 @ =0x02014804\n\
+ ldr r3, _08114178 @ =gSharedMem + 0x14804\n\
adds r0, r2, r3\n\
ldrb r0, [r0]\n\
cmp r6, r0\n\
@@ -2325,12 +2325,12 @@ _0811411E:\n\
bl sub_81141F0\n\
b _081141B4\n\
.align 2, 0\n\
-_08114164: .4byte 0x02014800\n\
+_08114164: .4byte gSharedMem + 0x14800\n\
_08114168: .4byte 0x000030c4\n\
-_0811416C: .4byte 0x020168c4\n\
+_0811416C: .4byte gSharedMem + 0x168C4\n\
_08114170: .4byte 0x000038c4\n\
-_08114174: .4byte 0x020170c4\n\
-_08114178: .4byte 0x02014804\n\
+_08114174: .4byte gSharedMem + 0x170C4\n\
+_08114178: .4byte gSharedMem + 0x14804\n\
_0811417C: .4byte 0x000020c4\n\
_08114180: .4byte 0x000028c4\n\
_08114184:\n\
@@ -2359,9 +2359,9 @@ _08114184:\n\
bl sub_81141F0\n\
_081141B4:\n\
adds r6, 0x1\n\
- ldr r4, _081141E8 @ =0x02014800\n\
+ ldr r4, _081141E8 @ =gSharedMem + 0x14800\n\
ldr r1, [sp, 0x8]\n\
- ldr r2, _081141EC @ =0x02014804\n\
+ ldr r2, _081141EC @ =gSharedMem + 0x14804\n\
adds r0, r1, r2\n\
ldrb r0, [r0]\n\
cmp r6, r0\n\
@@ -2384,8 +2384,8 @@ _081141CE:\n\
.align 2, 0\n\
_081141E0: .4byte 0x000010c4\n\
_081141E4: .4byte 0x000018c4\n\
-_081141E8: .4byte 0x02014800\n\
-_081141EC: .4byte 0x02014804\n\
+_081141E8: .4byte gSharedMem + 0x14800\n\
+_081141EC: .4byte gSharedMem + 0x14804\n\
.syntax divided");
}
@@ -2453,7 +2453,7 @@ void unref_sub_81143CC()
sub sp, 0x14\n\
movs r0, 0x1\n\
str r0, [sp, 0x4]\n\
- ldr r0, _08114408 @ =0x02014800\n\
+ ldr r0, _08114408 @ =gSharedMem + 0x14800\n\
ldr r2, _0811440C @ =0x0000a0c4\n\
adds r1, r0, r2\n\
ldrb r3, [r1]\n\
@@ -2476,7 +2476,7 @@ _081143F2:\n\
str r1, [sp, 0x8]\n\
bl _08114D84\n\
.align 2, 0\n\
-_08114408: .4byte 0x02014800\n\
+_08114408: .4byte gSharedMem + 0x14800\n\
_0811440C: .4byte 0x0000a0c4\n\
_08114410:\n\
ldr r5, [sp]\n\
@@ -2583,7 +2583,7 @@ _081144EC: .4byte 0x000020c4\n\
_081144F0:\n\
movs r2, 0\n\
str r2, [sp, 0x4]\n\
- ldr r4, _08114568 @ =0x02014800\n\
+ ldr r4, _08114568 @ =gSharedMem + 0x14800\n\
lsls r0, r3, 1\n\
ldr r5, [sp]\n\
lsls r1, r5, 6\n\
@@ -2643,7 +2643,7 @@ _08114548:\n\
blt _0811453E\n\
b _081148D2\n\
.align 2, 0\n\
-_08114568: .4byte 0x02014800\n\
+_08114568: .4byte gSharedMem + 0x14800\n\
_0811456C: .4byte 0x000060c4\n\
_08114570: .4byte 0x000080c4\n\
_08114574: .4byte 0x000030c4\n\
@@ -2717,7 +2717,7 @@ _081145FC: .4byte 0x000020c4\n\
_08114600:\n\
movs r2, 0\n\
str r2, [sp, 0x4]\n\
- ldr r4, _08114678 @ =0x02014800\n\
+ ldr r4, _08114678 @ =gSharedMem + 0x14800\n\
lsls r0, r3, 1\n\
ldr r5, [sp]\n\
lsls r1, r5, 6\n\
@@ -2777,7 +2777,7 @@ _08114658:\n\
blt _0811464E\n\
b _081148D2\n\
.align 2, 0\n\
-_08114678: .4byte 0x02014800\n\
+_08114678: .4byte gSharedMem + 0x14800\n\
_0811467C: .4byte 0x000060c4\n\
_08114680: .4byte 0x000080c4\n\
_08114684: .4byte 0x000030c4\n\
@@ -2785,7 +2785,7 @@ _08114688: .4byte 0x000020c4\n\
_0811468C:\n\
movs r2, 0\n\
str r2, [sp, 0x4]\n\
- ldr r5, _081146C0 @ =0x02014800\n\
+ ldr r5, _081146C0 @ =gSharedMem + 0x14800\n\
mov r0, r8\n\
adds r4, r3, r0\n\
ldr r1, _081146C4 @ =0x000030c4\n\
@@ -2810,12 +2810,12 @@ _081146B4:\n\
strb r1, [r0]\n\
b _081148D2\n\
.align 2, 0\n\
-_081146C0: .4byte 0x02014800\n\
+_081146C0: .4byte gSharedMem + 0x14800\n\
_081146C4: .4byte 0x000030c4\n\
_081146C8:\n\
movs r4, 0\n\
str r4, [sp, 0x4]\n\
- ldr r5, _081146FC @ =0x02014800\n\
+ ldr r5, _081146FC @ =gSharedMem + 0x14800\n\
mov r0, r8\n\
adds r4, r3, r0\n\
ldr r1, _08114700 @ =0x000030c4\n\
@@ -2840,12 +2840,12 @@ _081146F0:\n\
strb r1, [r0]\n\
b _081148D2\n\
.align 2, 0\n\
-_081146FC: .4byte 0x02014800\n\
+_081146FC: .4byte gSharedMem + 0x14800\n\
_08114700: .4byte 0x000030c4\n\
_08114704:\n\
movs r4, 0\n\
str r4, [sp, 0x4]\n\
- ldr r5, _08114738 @ =0x02014800\n\
+ ldr r5, _08114738 @ =gSharedMem + 0x14800\n\
mov r0, r8\n\
adds r4, r3, r0\n\
ldr r1, _0811473C @ =0x000030c4\n\
@@ -2870,12 +2870,12 @@ _0811472C:\n\
strb r1, [r0]\n\
b _081148D2\n\
.align 2, 0\n\
-_08114738: .4byte 0x02014800\n\
+_08114738: .4byte gSharedMem + 0x14800\n\
_0811473C: .4byte 0x000030c4\n\
_08114740:\n\
movs r4, 0\n\
str r4, [sp, 0x4]\n\
- ldr r5, _08114774 @ =0x02014800\n\
+ ldr r5, _08114774 @ =gSharedMem + 0x14800\n\
mov r0, r8\n\
adds r4, r3, r0\n\
ldr r1, _08114778 @ =0x000030c4\n\
@@ -2900,12 +2900,12 @@ _08114768:\n\
strb r1, [r0]\n\
b _081148D2\n\
.align 2, 0\n\
-_08114774: .4byte 0x02014800\n\
+_08114774: .4byte gSharedMem + 0x14800\n\
_08114778: .4byte 0x000030c4\n\
_0811477C:\n\
movs r4, 0\n\
str r4, [sp, 0x4]\n\
- ldr r6, _081147B4 @ =0x02014800\n\
+ ldr r6, _081147B4 @ =gSharedMem + 0x14800\n\
mov r0, r8\n\
adds r5, r3, r0\n\
ldr r1, _081147B8 @ =0x000030c4\n\
@@ -2931,7 +2931,7 @@ _0811477C:\n\
strb r4, [r0]\n\
b _08114844\n\
.align 2, 0\n\
-_081147B4: .4byte 0x02014800\n\
+_081147B4: .4byte gSharedMem + 0x14800\n\
_081147B8: .4byte 0x000030c4\n\
_081147BC: .4byte 0x000020c4\n\
_081147C0:\n\
@@ -2946,7 +2946,7 @@ _081147C0:\n\
_081147D0:\n\
movs r1, 0\n\
str r1, [sp, 0x4]\n\
- ldr r6, _08114804 @ =0x02014800\n\
+ ldr r6, _08114804 @ =gSharedMem + 0x14800\n\
mov r2, r8\n\
adds r5, r3, r2\n\
ldr r0, _08114808 @ =0x000030c4\n\
@@ -2970,13 +2970,13 @@ _081147D0:\n\
movs r1, 0x2\n\
b _08114842\n\
.align 2, 0\n\
-_08114804: .4byte 0x02014800\n\
+_08114804: .4byte gSharedMem + 0x14800\n\
_08114808: .4byte 0x000030c4\n\
_0811480C: .4byte 0x000020c4\n\
_08114810:\n\
movs r0, 0\n\
str r0, [sp, 0x4]\n\
- ldr r6, _0811484C @ =0x02014800\n\
+ ldr r6, _0811484C @ =gSharedMem + 0x14800\n\
mov r1, r8\n\
adds r5, r3, r1\n\
ldr r2, _08114850 @ =0x000030c4\n\
@@ -3005,13 +3005,13 @@ _08114844:\n\
mov r10, r5\n\
b _081148D2\n\
.align 2, 0\n\
-_0811484C: .4byte 0x02014800\n\
+_0811484C: .4byte gSharedMem + 0x14800\n\
_08114850: .4byte 0x000030c4\n\
_08114854: .4byte 0x000020c4\n\
_08114858:\n\
movs r0, 0\n\
str r0, [sp, 0x4]\n\
- ldr r6, _08114894 @ =0x02014800\n\
+ ldr r6, _08114894 @ =gSharedMem + 0x14800\n\
mov r1, r8\n\
adds r5, r3, r1\n\
ldr r2, _08114898 @ =0x000030c4\n\
@@ -3040,7 +3040,7 @@ _08114882:\n\
mov r10, r4\n\
b _081148D2\n\
.align 2, 0\n\
-_08114894: .4byte 0x02014800\n\
+_08114894: .4byte gSharedMem + 0x14800\n\
_08114898: .4byte 0x000030c4\n\
_0811489C: .4byte 0x000020c4\n\
_081148A0:\n\
@@ -3073,7 +3073,7 @@ _081148C4:\n\
adds r2, r3, 0x1\n\
mov r10, r2\n\
_081148D2:\n\
- ldr r0, _081148F4 @ =0x02014800\n\
+ ldr r0, _081148F4 @ =gSharedMem + 0x14800\n\
mov r4, r8\n\
adds r1, r3, r4\n\
ldr r5, _081148F8 @ =0x000008c4\n\
@@ -3091,7 +3091,7 @@ _081148E8:\n\
ldr r0, [r0]\n\
mov pc, r0\n\
.align 2, 0\n\
-_081148F4: .4byte 0x02014800\n\
+_081148F4: .4byte gSharedMem + 0x14800\n\
_081148F8: .4byte 0x000008c4\n\
_081148FC: .4byte _08114900\n\
.align 2, 0\n\
@@ -3177,7 +3177,7 @@ _081149B4: .4byte 0x000028c4\n\
_081149B8:\n\
movs r2, 0\n\
str r2, [sp, 0x4]\n\
- ldr r4, _08114A28 @ =0x02014800\n\
+ ldr r4, _08114A28 @ =gSharedMem + 0x14800\n\
lsls r0, r3, 1\n\
ldr r5, [sp]\n\
lsls r1, r5, 6\n\
@@ -3233,7 +3233,7 @@ _08114A0C:\n\
blt _08114A02\n\
b _08114D76\n\
.align 2, 0\n\
-_08114A28: .4byte 0x02014800\n\
+_08114A28: .4byte gSharedMem + 0x14800\n\
_08114A2C: .4byte 0x000070c4\n\
_08114A30: .4byte 0x000090c4\n\
_08114A34: .4byte 0x000038c4\n\
@@ -3306,7 +3306,7 @@ _08114ABC: .4byte 0x000028c4\n\
_08114AC0:\n\
movs r2, 0\n\
str r2, [sp, 0x4]\n\
- ldr r4, _08114B30 @ =0x02014800\n\
+ ldr r4, _08114B30 @ =gSharedMem + 0x14800\n\
lsls r0, r3, 1\n\
ldr r5, [sp]\n\
lsls r1, r5, 6\n\
@@ -3362,7 +3362,7 @@ _08114B14:\n\
blt _08114B0A\n\
b _08114D76\n\
.align 2, 0\n\
-_08114B30: .4byte 0x02014800\n\
+_08114B30: .4byte gSharedMem + 0x14800\n\
_08114B34: .4byte 0x000070c4\n\
_08114B38: .4byte 0x000090c4\n\
_08114B3C: .4byte 0x000038c4\n\
@@ -3370,7 +3370,7 @@ _08114B40: .4byte 0x000028c4\n\
_08114B44:\n\
movs r2, 0\n\
str r2, [sp, 0x4]\n\
- ldr r5, _08114B70 @ =0x02014800\n\
+ ldr r5, _08114B70 @ =gSharedMem + 0x14800\n\
mov r0, r8\n\
adds r4, r3, r0\n\
ldr r1, _08114B74 @ =0x000038c4\n\
@@ -3390,13 +3390,13 @@ _08114B64:\n\
movs r1, 0x9\n\
b _08114D74\n\
.align 2, 0\n\
-_08114B70: .4byte 0x02014800\n\
+_08114B70: .4byte gSharedMem + 0x14800\n\
_08114B74: .4byte 0x000038c4\n\
_08114B78: .4byte 0x000008c4\n\
_08114B7C:\n\
movs r4, 0\n\
str r4, [sp, 0x4]\n\
- ldr r5, _08114BA8 @ =0x02014800\n\
+ ldr r5, _08114BA8 @ =gSharedMem + 0x14800\n\
mov r0, r8\n\
adds r4, r3, r0\n\
ldr r1, _08114BAC @ =0x000038c4\n\
@@ -3416,13 +3416,13 @@ _08114B9C:\n\
movs r1, 0xA\n\
b _08114D74\n\
.align 2, 0\n\
-_08114BA8: .4byte 0x02014800\n\
+_08114BA8: .4byte gSharedMem + 0x14800\n\
_08114BAC: .4byte 0x000038c4\n\
_08114BB0: .4byte 0x000008c4\n\
_08114BB4:\n\
movs r4, 0\n\
str r4, [sp, 0x4]\n\
- ldr r5, _08114BE0 @ =0x02014800\n\
+ ldr r5, _08114BE0 @ =gSharedMem + 0x14800\n\
mov r0, r8\n\
adds r4, r3, r0\n\
ldr r1, _08114BE4 @ =0x000038c4\n\
@@ -3442,13 +3442,13 @@ _08114BD4:\n\
movs r1, 0xB\n\
b _08114D74\n\
.align 2, 0\n\
-_08114BE0: .4byte 0x02014800\n\
+_08114BE0: .4byte gSharedMem + 0x14800\n\
_08114BE4: .4byte 0x000038c4\n\
_08114BE8: .4byte 0x000008c4\n\
_08114BEC:\n\
movs r4, 0\n\
str r4, [sp, 0x4]\n\
- ldr r5, _08114C18 @ =0x02014800\n\
+ ldr r5, _08114C18 @ =gSharedMem + 0x14800\n\
mov r0, r8\n\
adds r4, r3, r0\n\
ldr r1, _08114C1C @ =0x000038c4\n\
@@ -3468,13 +3468,13 @@ _08114C0C:\n\
movs r1, 0xC\n\
b _08114D74\n\
.align 2, 0\n\
-_08114C18: .4byte 0x02014800\n\
+_08114C18: .4byte gSharedMem + 0x14800\n\
_08114C1C: .4byte 0x000038c4\n\
_08114C20: .4byte 0x000008c4\n\
_08114C24:\n\
movs r4, 0\n\
str r4, [sp, 0x4]\n\
- ldr r6, _08114C58 @ =0x02014800\n\
+ ldr r6, _08114C58 @ =gSharedMem + 0x14800\n\
mov r0, r8\n\
adds r5, r3, r0\n\
ldr r1, _08114C5C @ =0x000038c4\n\
@@ -3498,7 +3498,7 @@ _08114C24:\n\
strb r5, [r0]\n\
b _08114D76\n\
.align 2, 0\n\
-_08114C58: .4byte 0x02014800\n\
+_08114C58: .4byte gSharedMem + 0x14800\n\
_08114C5C: .4byte 0x000038c4\n\
_08114C60: .4byte 0x000028c4\n\
_08114C64: .4byte 0x000008c4\n\
@@ -3513,7 +3513,7 @@ _08114C74: .4byte 0x000008c4\n\
_08114C78:\n\
movs r2, 0\n\
str r2, [sp, 0x4]\n\
- ldr r6, _08114CA8 @ =0x02014800\n\
+ ldr r6, _08114CA8 @ =gSharedMem + 0x14800\n\
mov r4, r8\n\
adds r5, r3, r4\n\
ldr r0, _08114CAC @ =0x000038c4\n\
@@ -3535,14 +3535,14 @@ _08114C78:\n\
movs r1, 0x2\n\
b _08114D74\n\
.align 2, 0\n\
-_08114CA8: .4byte 0x02014800\n\
+_08114CA8: .4byte gSharedMem + 0x14800\n\
_08114CAC: .4byte 0x000038c4\n\
_08114CB0: .4byte 0x000028c4\n\
_08114CB4: .4byte 0x000008c4\n\
_08114CB8:\n\
movs r2, 0\n\
str r2, [sp, 0x4]\n\
- ldr r6, _08114CE8 @ =0x02014800\n\
+ ldr r6, _08114CE8 @ =gSharedMem + 0x14800\n\
mov r4, r8\n\
adds r5, r3, r4\n\
ldr r0, _08114CEC @ =0x000038c4\n\
@@ -3564,14 +3564,14 @@ _08114CB8:\n\
movs r1, 0x3\n\
b _08114D74\n\
.align 2, 0\n\
-_08114CE8: .4byte 0x02014800\n\
+_08114CE8: .4byte gSharedMem + 0x14800\n\
_08114CEC: .4byte 0x000038c4\n\
_08114CF0: .4byte 0x000028c4\n\
_08114CF4: .4byte 0x000008c4\n\
_08114CF8:\n\
movs r2, 0\n\
str r2, [sp, 0x4]\n\
- ldr r6, _08114D2C @ =0x02014800\n\
+ ldr r6, _08114D2C @ =gSharedMem + 0x14800\n\
mov r4, r8\n\
adds r5, r3, r4\n\
ldr r0, _08114D30 @ =0x000038c4\n\
@@ -3596,7 +3596,7 @@ _08114D1E:\n\
strb r4, [r0]\n\
b _08114D76\n\
.align 2, 0\n\
-_08114D2C: .4byte 0x02014800\n\
+_08114D2C: .4byte gSharedMem + 0x14800\n\
_08114D30: .4byte 0x000038c4\n\
_08114D34: .4byte 0x000028c4\n\
_08114D38: .4byte 0x000008c4\n\
@@ -3633,7 +3633,7 @@ _08114D74:\n\
strb r1, [r0]\n\
_08114D76:\n\
mov r3, r10\n\
- ldr r2, _08114DB0 @ =0x02014800\n\
+ ldr r2, _08114DB0 @ =gSharedMem + 0x14800\n\
adds r0, r2, 0\n\
adds r0, 0x84\n\
ldr r4, [sp]\n\
@@ -3662,7 +3662,7 @@ _08114D9A:\n\
bx r1\n\
.align 2, 0\n\
_08114DAC: .4byte 0x000008c4\n\
-_08114DB0: .4byte 0x02014800\n\
+_08114DB0: .4byte gSharedMem + 0x14800\n\
.syntax divided");
}
@@ -3701,7 +3701,7 @@ void sub_8114E48()
adds r4, r0, 0\n\
lsls r1, 24\n\
lsrs r6, r1, 24\n\
- ldr r1, _08114E6C @ =0x02014800\n\
+ ldr r1, _08114E6C @ =gSharedMem + 0x14800\n\
ldr r2, _08114E70 @ =0x0000a0c4\n\
adds r0, r1, r2\n\
ldrb r0, [r0]\n\
@@ -3717,7 +3717,7 @@ _08114E60:\n\
movs r1, 0x1\n\
b _08114EA6\n\
.align 2, 0\n\
-_08114E6C: .4byte 0x02014800\n\
+_08114E6C: .4byte gSharedMem + 0x14800\n\
_08114E70: .4byte 0x0000a0c4\n\
_08114E74:\n\
subs r0, r4, 0x1\n\
@@ -3829,7 +3829,7 @@ _08114F26:\n\
beq _08114F7C\n\
subs r0, r4, 0x1\n\
lsls r5, r0, 7\n\
- ldr r0, _08114F68 @ =0x020188c4\n\
+ ldr r0, _08114F68 @ =gSharedMem + 0x188C4\n\
mov r12, r0\n\
_08114F42:\n\
asrs r0, r3, 1\n\
@@ -3852,7 +3852,7 @@ _08114F5E:\n\
b _08114FCA\n\
.align 2, 0\n\
_08114F64: .4byte 0x000008c4\n\
-_08114F68: .4byte 0x020188c4\n\
+_08114F68: .4byte gSharedMem + 0x188C4\n\
_08114F6C:\n\
ldrb r1, [r1]\n\
movs r0, 0xF\n\
@@ -3872,7 +3872,7 @@ _08114F7C:\n\
beq _08114FC8\n\
adds r0, r4, 0x1\n\
lsls r5, r0, 7\n\
- ldr r6, _08114FB0 @ =0x020188c4\n\
+ ldr r6, _08114FB0 @ =gSharedMem + 0x188C4\n\
adds r2, r1, 0\n\
_08114F90:\n\
asrs r0, r3, 1\n\
@@ -3891,7 +3891,7 @@ _08114F90:\n\
beq _08114FBE\n\
b _08114F5E\n\
.align 2, 0\n\
-_08114FB0: .4byte 0x020188c4\n\
+_08114FB0: .4byte gSharedMem + 0x188C4\n\
_08114FB4:\n\
ldrb r1, [r1]\n\
movs r0, 0xF\n\
diff --git a/src/scene/intro.c b/src/scene/intro.c
index c4bb1f9ea..03a573c90 100644
--- a/src/scene/intro.c
+++ b/src/scene/intro.c
@@ -20,6 +20,7 @@
#include "title_screen.h"
#include "trig.h"
#include "unknown_task.h"
+#include "ewram.h"
extern struct SpriteTemplate gUnknown_02024E8C;
extern u16 gUnknown_02039358;
@@ -765,7 +766,11 @@ const struct SpritePalette gIntro3MiscPal_Table[] =
{gIntro3Misc2Palette, 2004},
{NULL},
};
-const u32 unusedData = 0x02000000;
+
+// Game Freak probably used the raw address here.
+// Treating this like a u8 * causes the compiler
+// to remove it at link time.
+const u32 unusedSharedMemPtr = (u32)gSharedMem;
static void MainCB2_EndIntro(void);
void Task_IntroLoadPart1Graphics(u8);
@@ -1207,8 +1212,7 @@ static void Task_IntroWaitToSetupPart3DoubleFight(u8 taskId)
gTasks[taskId].func = Task_IntroLoadPart3Streaks;
}
-// TODO: use ewram define instead
-extern u8 gSharedMem[][32];
+//extern u8 gSharedMem[][32];
static void Task_IntroLoadPart3Streaks(u8 taskId)
{
@@ -1218,9 +1222,9 @@ static void Task_IntroLoadPart3Streaks(u8 taskId)
intro_reset_and_hide_bgs();
for (i = 0; i < 32; i++)
{
- gSharedMem[0][i] = 0;
- gSharedMem[1][i] = 17;
- gSharedMem[2][i] = 34;
+ ewram0arr[0][i] = 0;
+ ewram0arr[1][i] = 17;
+ ewram0arr[2][i] = 34;
}
vram = (void *)VRAM;
DmaCopy16(3, gSharedMem, vram, 0x60);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 15:54:56 +0000