diff options
author | Cameron Hall <cameronghall@cox.net> | 2019-08-04 10:41:23 -0500 |
---|---|---|
committer | Cameron Hall <cameronghall@cox.net> | 2019-08-04 10:41:23 -0500 |
commit | a2331ea91e3bf6c1736643b8d99e80d735f6fe3f (patch) | |
tree | 1d48ce2ccee47caba7e66647b887705211491c8c | |
parent | 3c23dc2aa09f26e958fa7b8ae8ede3c36337d2af (diff) |
convert hardcoded IWRAM addresses to symbols in asm
-rwxr-xr-x | asm/ereader.s | 36 | ||||
-rwxr-xr-x | asm/high_scores.s | 84 | ||||
-rwxr-xr-x | asm/intro.s | 24 | ||||
-rwxr-xr-x | asm/options.s | 4 | ||||
-rwxr-xr-x | asm/pokedex.s | 232 | ||||
-rwxr-xr-x | asm/rom_1068C.s | 4 | ||||
-rwxr-xr-x | asm/rom_11B9C.s | 24 | ||||
-rwxr-xr-x | asm/rom_3219C.s | 104 | ||||
-rwxr-xr-x | asm/rom_9BC.s | 4 | ||||
-rwxr-xr-x | ld_script.txt | 1 | ||||
-rw-r--r-- | undefined_iwram.txt | 11 |
11 files changed, 270 insertions, 258 deletions
diff --git a/asm/ereader.s b/asm/ereader.s index 8315ef0..b5a612c 100755 --- a/asm/ereader.s +++ b/asm/ereader.s @@ -82,7 +82,7 @@ sub_2C78: @ 0x08002C78 ldr r0, [r4, #8] ldr r0, _08002DA8 @ =gUnknown_08080500 str r0, [r4] - ldr r0, _08002DAC @ =0x03000000 + ldr r0, _08002DAC @ =gUnknown_03000000 mov r8, r0 str r0, [r4, #4] ldr r1, _08002DB0 @ =0x80001800 @@ -159,7 +159,7 @@ _08002D9C: .4byte gUnknown_080897E0 _08002DA0: .4byte 0x05000040 _08002DA4: .4byte 0x80000010 _08002DA8: .4byte gUnknown_08080500 -_08002DAC: .4byte 0x03000000 +_08002DAC: .4byte gUnknown_03000000 _08002DB0: .4byte 0x80001800 _08002DB4: .4byte gUnknown_0807DD00 _08002DB8: .4byte 0x80000400 @@ -375,7 +375,7 @@ _08002F8E: _08002F90: bl sub_394C ldr r1, _08002FB0 @ =0x040000D4 - ldr r0, _08002FB4 @ =0x03000000 + ldr r0, _08002FB4 @ =gUnknown_03000000 str r0, [r1] ldr r0, _08002FB8 @ =0x06004000 str r0, [r1, #4] @@ -388,7 +388,7 @@ _08002F90: .align 2, 0 _08002FAC: .4byte gUnknown_0202BEF8 _08002FB0: .4byte 0x040000D4 -_08002FB4: .4byte 0x03000000 +_08002FB4: .4byte gUnknown_03000000 _08002FB8: .4byte 0x06004000 _08002FBC: .4byte 0x80001800 @@ -824,7 +824,7 @@ _08003358: _0800336E: bl sub_394C ldr r1, _08003390 @ =0x040000D4 - ldr r0, _08003394 @ =0x03000000 + ldr r0, _08003394 @ =gUnknown_03000000 str r0, [r1] ldr r0, _08003398 @ =0x06004000 str r0, [r1, #4] @@ -838,7 +838,7 @@ _0800336E: _08003388: .4byte gUnknown_0202A580 _0800338C: .4byte gUnknown_0202C5A4 _08003390: .4byte 0x040000D4 -_08003394: .4byte 0x03000000 +_08003394: .4byte gUnknown_03000000 _08003398: .4byte 0x06004000 _0800339C: .4byte 0x80001800 @@ -978,7 +978,7 @@ sub_343C: @ 0x0800343C ldr r0, [r4, #8] ldr r0, _08003578 @ =gUnknown_08080500 str r0, [r4] - ldr r0, _0800357C @ =0x03000000 + ldr r0, _0800357C @ =gUnknown_03000000 mov r8, r0 str r0, [r4, #4] ldr r1, _08003580 @ =0x80001800 @@ -1061,7 +1061,7 @@ _0800356C: .4byte gUnknown_080897E0 _08003570: .4byte 0x05000040 _08003574: .4byte 0x80000010 _08003578: .4byte gUnknown_08080500 -_0800357C: .4byte 0x03000000 +_0800357C: .4byte gUnknown_03000000 _08003580: .4byte 0x80001800 _08003584: .4byte gUnknown_0807DD00 _08003588: .4byte 0x80000400 @@ -1245,7 +1245,7 @@ _08003704: _0800371A: bl sub_394C ldr r1, _0800373C @ =0x040000D4 - ldr r0, _08003740 @ =0x03000000 + ldr r0, _08003740 @ =gUnknown_03000000 str r0, [r1] ldr r0, _08003744 @ =0x06004000 str r0, [r1, #4] @@ -1259,7 +1259,7 @@ _0800371A: _08003734: .4byte gUnknown_0202A580 _08003738: .4byte gUnknown_0202C5A4 _0800373C: .4byte 0x040000D4 -_08003740: .4byte 0x03000000 +_08003740: .4byte gUnknown_03000000 _08003744: .4byte 0x06004000 _08003748: .4byte 0x80001800 @@ -1289,7 +1289,7 @@ _08003778: .4byte gUnknown_0202BEF8 sub_377C: @ 0x0800377C push {r4, r5, r6, r7, lr} movs r1, #0 - ldr r7, _080037AC @ =0x03001800 + ldr r7, _080037AC @ =gUnknown_03001800 _08003782: movs r5, #0 lsls r0, r1, #0xb @@ -1312,7 +1312,7 @@ _0800378A: pop {r0} bx r0 .align 2, 0 -_080037AC: .4byte 0x03001800 +_080037AC: .4byte gUnknown_03001800 _080037B0: .4byte gUnknown_080ACC60 thumb_func_start sub_37B4 @@ -1348,7 +1348,7 @@ _080037E0: ldr r1, _08003820 @ =gUnknown_080ACC60 adds r0, r0, r1 lsls r1, r5, #5 - ldr r2, _08003824 @ =0x03001800 + ldr r2, _08003824 @ =gUnknown_03001800 adds r1, r1, r2 adds r1, r6, r1 movs r2, #1 @@ -1371,7 +1371,7 @@ _080037E0: _08003818: .4byte gUnknown_086A4CF8 _0800381C: .4byte 0x0000FFF0 _08003820: .4byte gUnknown_080ACC60 -_08003824: .4byte 0x03001800 +_08003824: .4byte gUnknown_03001800 thumb_func_start sub_3828 sub_3828: @ 0x08003828 @@ -1414,7 +1414,7 @@ sub_3828: @ 0x08003828 adds r0, r0, r1 lsls r6, r6, #0xb lsls r2, r2, #5 - ldr r1, _0800389C @ =0x03001800 + ldr r1, _0800389C @ =gUnknown_03001800 adds r2, r2, r1 adds r6, r6, r2 adds r1, r6, #0 @@ -1428,7 +1428,7 @@ sub_3828: @ 0x08003828 _08003890: .4byte gUnknown_086A4CF8 _08003894: .4byte 0x0000FFF0 _08003898: .4byte gUnknown_080ACC60 -_0800389C: .4byte 0x03001800 +_0800389C: .4byte gUnknown_03001800 thumb_func_start sub_38A0 sub_38A0: @ 0x080038A0 @@ -1453,7 +1453,7 @@ sub_38A0: @ 0x080038A0 adds r6, r6, r1 lsls r4, r4, #0xb asrs r0, r0, #0x13 - ldr r1, _080038EC @ =0x03001800 + ldr r1, _080038EC @ =gUnknown_03001800 adds r0, r0, r1 adds r4, r4, r0 adds r0, r6, #0 @@ -1466,7 +1466,7 @@ sub_38A0: @ 0x080038A0 bx r0 .align 2, 0 _080038E8: .4byte gUnknown_080ACC60 -_080038EC: .4byte 0x03001800 +_080038EC: .4byte gUnknown_03001800 thumb_func_start sub_38F0 sub_38F0: @ 0x080038F0 diff --git a/asm/high_scores.s b/asm/high_scores.s index 654b3cb..225b4bc 100755 --- a/asm/high_scores.s +++ b/asm/high_scores.s @@ -95,7 +95,7 @@ sub_CE88: @ 0x0800CE88 ldr r0, [r4, #8] ldr r0, _0800CFA0 @ =gUnknown_080947A0 str r0, [r4] - ldr r6, _0800CFA4 @ =0x03005C00 + ldr r6, _0800CFA4 @ =gUnknown_03005C00 str r6, [r4, #4] ldr r5, _0800CFA8 @ =0x80000800 str r5, [r4, #8] @@ -162,7 +162,7 @@ _0800CF94: .4byte gUnknown_0809AFC0 _0800CF98: .4byte 0x0600C000 _0800CF9C: .4byte 0x80001600 _0800CFA0: .4byte gUnknown_080947A0 -_0800CFA4: .4byte 0x03005C00 +_0800CFA4: .4byte gUnknown_03005C00 _0800CFA8: .4byte 0x80000800 _0800CFAC: .4byte gUnknown_08099FC0 _0800CFB0: .4byte 0x06001000 @@ -762,7 +762,7 @@ _0800D476: strb r0, [r1, #3] _0800D482: ldr r1, _0800D4AC @ =0x040000D4 - ldr r0, _0800D4B0 @ =0x03005C00 + ldr r0, _0800D4B0 @ =gUnknown_03005C00 str r0, [r1] movs r0, #0xc0 lsls r0, r0, #0x13 @@ -781,7 +781,7 @@ _0800D4A0: .4byte gUnknown_08079870 _0800D4A4: .4byte gUnknown_02002858 _0800D4A8: .4byte gMain _0800D4AC: .4byte 0x040000D4 -_0800D4B0: .4byte 0x03005C00 +_0800D4B0: .4byte gUnknown_03005C00 _0800D4B4: .4byte 0x80000800 thumb_func_start sub_D4B8 @@ -1418,7 +1418,7 @@ _0800D9B2: strh r0, [r4, #0x16] _0800D9B6: ldr r1, _0800D9E8 @ =0x040000D4 - ldr r0, _0800D9EC @ =0x03005C00 + ldr r0, _0800D9EC @ =gUnknown_03005C00 str r0, [r1] movs r0, #0xc0 lsls r0, r0, #0x13 @@ -1444,7 +1444,7 @@ _0800D9D8: .align 2, 0 _0800D9E4: .4byte gUnknown_0202C610 _0800D9E8: .4byte 0x040000D4 -_0800D9EC: .4byte 0x03005C00 +_0800D9EC: .4byte gUnknown_03005C00 _0800D9F0: .4byte 0x80000800 _0800D9F4: .4byte gUnknown_02002858 @@ -1919,7 +1919,7 @@ sub_DD70: @ 0x0800DD70 ldr r0, [r4, #8] ldr r0, _0800DE88 @ =gUnknown_080947A0 str r0, [r4] - ldr r0, _0800DE8C @ =0x03005C00 + ldr r0, _0800DE8C @ =gUnknown_03005C00 mov r8, r0 str r0, [r4, #4] ldr r5, _0800DE90 @ =0x80000800 @@ -1982,7 +1982,7 @@ _0800DE7C: .4byte gUnknown_0809AFC0 _0800DE80: .4byte 0x0600C000 _0800DE84: .4byte 0x80001600 _0800DE88: .4byte gUnknown_080947A0 -_0800DE8C: .4byte 0x03005C00 +_0800DE8C: .4byte gUnknown_03005C00 _0800DE90: .4byte 0x80000800 _0800DE94: .4byte gUnknown_08099FC0 _0800DE98: .4byte 0x06001000 @@ -2226,7 +2226,7 @@ _0800E072: adds r0, #1 strh r0, [r5, #8] ldr r1, _0800E0B8 @ =0x040000D4 - ldr r0, _0800E0BC @ =0x03005C00 + ldr r0, _0800E0BC @ =gUnknown_03005C00 str r0, [r1] movs r0, #0xc0 lsls r0, r0, #0x13 @@ -2256,7 +2256,7 @@ _0800E0A8: _0800E0B0: .4byte gUnknown_02002858 _0800E0B4: .4byte gMain _0800E0B8: .4byte 0x040000D4 -_0800E0BC: .4byte 0x03005C00 +_0800E0BC: .4byte gUnknown_03005C00 _0800E0C0: .4byte 0x80000800 thumb_func_start sub_E0C4 @@ -2338,7 +2338,7 @@ sub_E0EC: @ 0x0800E0EC ldr r0, [r4, #8] ldr r0, _0800E204 @ =gUnknown_080947A0 str r0, [r4] - ldr r0, _0800E208 @ =0x03005C00 + ldr r0, _0800E208 @ =gUnknown_03005C00 mov r8, r0 str r0, [r4, #4] ldr r5, _0800E20C @ =0x80000800 @@ -2401,7 +2401,7 @@ _0800E1F8: .4byte gUnknown_0809AFC0 _0800E1FC: .4byte 0x0600C000 _0800E200: .4byte 0x80001600 _0800E204: .4byte gUnknown_080947A0 -_0800E208: .4byte 0x03005C00 +_0800E208: .4byte gUnknown_03005C00 _0800E20C: .4byte 0x80000800 _0800E210: .4byte gUnknown_08099FC0 _0800E214: .4byte 0x06001000 @@ -2556,7 +2556,7 @@ _0800E344: adds r0, #1 strh r0, [r5, #8] ldr r1, _0800E384 @ =0x040000D4 - ldr r0, _0800E388 @ =0x03005C00 + ldr r0, _0800E388 @ =gUnknown_03005C00 str r0, [r1] movs r0, #0xc0 lsls r0, r0, #0x13 @@ -2583,7 +2583,7 @@ _0800E378: .4byte gUnknown_0201B170 _0800E37C: .4byte gUnknown_02002858 _0800E380: .4byte gMain _0800E384: .4byte 0x040000D4 -_0800E388: .4byte 0x03005C00 +_0800E388: .4byte gUnknown_03005C00 _0800E38C: .4byte 0x80000800 thumb_func_start sub_E390 @@ -5281,7 +5281,7 @@ sub_F8B0: @ 0x0800F8B0 _0800F8BC: cmp r1, #0 bne _0800F93C - ldr r0, _0800F924 @ =0x03005C00 + ldr r0, _0800F924 @ =gUnknown_03005C00 ldr r7, _0800F928 @ =0x000090EA ldr r6, _0800F92C @ =0x0000912A ldr r1, _0800F930 @ =gUnknown_086A7FA4 @@ -5307,7 +5307,7 @@ _0800F8E8: subs r4, #1 cmp r4, #0 bge _0800F8D4 - ldr r0, _0800F924 @ =0x03005C00 + ldr r0, _0800F924 @ =gUnknown_03005C00 ldr r7, _0800F934 @ =0x0000910A ldr r6, _0800F938 @ =0x0000914A ldr r1, _0800F930 @ =gUnknown_086A7FA4 @@ -5335,7 +5335,7 @@ _0800F918: bge _0800F904 b _0800FAC2 .align 2, 0 -_0800F924: .4byte 0x03005C00 +_0800F924: .4byte gUnknown_03005C00 _0800F928: .4byte 0x000090EA _0800F92C: .4byte 0x0000912A _0800F930: .4byte gUnknown_086A7FA4 @@ -5348,7 +5348,7 @@ _0800F93C: adds r3, r0, #0 adds r3, #0xc adds r6, r1, #0 - ldr r1, _0800F9B4 @ =0x03005C00 + ldr r1, _0800F9B4 @ =gUnknown_03005C00 ldr r0, _0800F9B8 @ =0x0000916A mov ip, r0 ldr r7, _0800F9BC @ =0x000091AA @@ -5379,7 +5379,7 @@ _0800F972: lsls r0, r0, #5 adds r3, r0, #0 adds r3, #0xc - ldr r1, _0800F9B4 @ =0x03005C00 + ldr r1, _0800F9B4 @ =gUnknown_03005C00 ldr r7, _0800F9C4 @ =0x0000918A ldr r6, _0800F9C8 @ =0x000091CA ldr r2, _0800F9C0 @ =gUnknown_086A7FA4 @@ -5407,7 +5407,7 @@ _0800F9AA: bge _0800F996 b _0800FAC2 .align 2, 0 -_0800F9B4: .4byte 0x03005C00 +_0800F9B4: .4byte gUnknown_03005C00 _0800F9B8: .4byte 0x0000916A _0800F9BC: .4byte 0x000091AA _0800F9C0: .4byte gUnknown_086A7FA4 @@ -5416,7 +5416,7 @@ _0800F9C8: .4byte 0x000091CA _0800F9CC: cmp r1, #0 bne _0800FA54 - ldr r0, _0800FA34 @ =0x03005C00 + ldr r0, _0800FA34 @ =gUnknown_03005C00 ldr r7, _0800FA38 @ =0x000090EA ldr r6, _0800FA3C @ =0x0000912A ldr r1, _0800FA40 @ =gUnknown_086A7FA4 @@ -5442,7 +5442,7 @@ _0800F9F8: subs r4, #1 cmp r4, #0 bge _0800F9E4 - ldr r0, _0800FA34 @ =0x03005C00 + ldr r0, _0800FA34 @ =gUnknown_03005C00 ldr r7, _0800FA48 @ =0x0000910A ldr r6, _0800FA4C @ =0x0000914A ldr r1, _0800FA40 @ =gUnknown_086A7FA4 @@ -5470,7 +5470,7 @@ _0800FA28: bge _0800FA14 b _0800FAC2 .align 2, 0 -_0800FA34: .4byte 0x03005C00 +_0800FA34: .4byte gUnknown_03005C00 _0800FA38: .4byte 0x000090EA _0800FA3C: .4byte 0x0000912A _0800FA40: .4byte gUnknown_086A7FA4 @@ -5482,7 +5482,7 @@ _0800FA54: lsls r0, r1, #1 lsls r3, r0, #6 adds r6, r0, #0 - ldr r1, _0800FAC8 @ =0x03005C00 + ldr r1, _0800FAC8 @ =gUnknown_03005C00 ldr r0, _0800FACC @ =0x0000916A mov ip, r0 ldr r7, _0800FAD0 @ =0x000091AA @@ -5511,7 +5511,7 @@ _0800FA86: cmp r4, #0 bge _0800FA72 lsls r3, r6, #6 - ldr r1, _0800FAC8 @ =0x03005C00 + ldr r1, _0800FAC8 @ =gUnknown_03005C00 ldr r7, _0800FADC @ =0x0000918A ldr r6, _0800FAE0 @ =0x000091CA ldr r2, _0800FAD4 @ =gUnknown_086A7FA4 @@ -5543,7 +5543,7 @@ _0800FAC2: pop {r0} bx r0 .align 2, 0 -_0800FAC8: .4byte 0x03005C00 +_0800FAC8: .4byte gUnknown_03005C00 _0800FACC: .4byte 0x0000916A _0800FAD0: .4byte 0x000091AA _0800FAD4: .4byte gUnknown_086A7FA4 @@ -5563,7 +5563,7 @@ sub_FAE8: @ 0x0800FAE8 _0800FAF4: cmp r1, #0 bne _0800FB74 - ldr r0, _0800FB5C @ =0x03005C00 + ldr r0, _0800FB5C @ =gUnknown_03005C00 ldr r7, _0800FB60 @ =0x000090EA ldr r6, _0800FB64 @ =0x0000912A ldr r1, _0800FB68 @ =gUnknown_086A7FA8 @@ -5589,7 +5589,7 @@ _0800FB20: subs r4, #1 cmp r4, #0 bge _0800FB0C - ldr r0, _0800FB5C @ =0x03005C00 + ldr r0, _0800FB5C @ =gUnknown_03005C00 ldr r7, _0800FB6C @ =0x0000910A ldr r6, _0800FB70 @ =0x0000914A ldr r1, _0800FB68 @ =gUnknown_086A7FA8 @@ -5617,7 +5617,7 @@ _0800FB50: bge _0800FB3C b _0800FCFA .align 2, 0 -_0800FB5C: .4byte 0x03005C00 +_0800FB5C: .4byte gUnknown_03005C00 _0800FB60: .4byte 0x000090EA _0800FB64: .4byte 0x0000912A _0800FB68: .4byte gUnknown_086A7FA8 @@ -5630,7 +5630,7 @@ _0800FB74: adds r3, r0, #0 adds r3, #0xc adds r6, r1, #0 - ldr r1, _0800FBEC @ =0x03005C00 + ldr r1, _0800FBEC @ =gUnknown_03005C00 ldr r0, _0800FBF0 @ =0x0000916A mov ip, r0 ldr r7, _0800FBF4 @ =0x000091AA @@ -5661,7 +5661,7 @@ _0800FBAA: lsls r0, r0, #5 adds r3, r0, #0 adds r3, #0xc - ldr r1, _0800FBEC @ =0x03005C00 + ldr r1, _0800FBEC @ =gUnknown_03005C00 ldr r7, _0800FBFC @ =0x0000918A ldr r6, _0800FC00 @ =0x000091CA ldr r2, _0800FBF8 @ =gUnknown_086A7FA8 @@ -5689,7 +5689,7 @@ _0800FBE2: bge _0800FBCE b _0800FCFA .align 2, 0 -_0800FBEC: .4byte 0x03005C00 +_0800FBEC: .4byte gUnknown_03005C00 _0800FBF0: .4byte 0x0000916A _0800FBF4: .4byte 0x000091AA _0800FBF8: .4byte gUnknown_086A7FA8 @@ -5698,7 +5698,7 @@ _0800FC00: .4byte 0x000091CA _0800FC04: cmp r1, #0 bne _0800FC8C - ldr r0, _0800FC6C @ =0x03005C00 + ldr r0, _0800FC6C @ =gUnknown_03005C00 ldr r7, _0800FC70 @ =0x000090EA ldr r6, _0800FC74 @ =0x0000912A ldr r1, _0800FC78 @ =gUnknown_086A7FA8 @@ -5724,7 +5724,7 @@ _0800FC30: subs r4, #1 cmp r4, #0 bge _0800FC1C - ldr r0, _0800FC6C @ =0x03005C00 + ldr r0, _0800FC6C @ =gUnknown_03005C00 ldr r7, _0800FC80 @ =0x0000910A ldr r6, _0800FC84 @ =0x0000914A ldr r1, _0800FC78 @ =gUnknown_086A7FA8 @@ -5752,7 +5752,7 @@ _0800FC60: bge _0800FC4C b _0800FCFA .align 2, 0 -_0800FC6C: .4byte 0x03005C00 +_0800FC6C: .4byte gUnknown_03005C00 _0800FC70: .4byte 0x000090EA _0800FC74: .4byte 0x0000912A _0800FC78: .4byte gUnknown_086A7FA8 @@ -5764,7 +5764,7 @@ _0800FC8C: lsls r0, r1, #1 lsls r3, r0, #6 adds r6, r0, #0 - ldr r1, _0800FD00 @ =0x03005C00 + ldr r1, _0800FD00 @ =gUnknown_03005C00 ldr r0, _0800FD04 @ =0x0000916A mov ip, r0 ldr r7, _0800FD08 @ =0x000091AA @@ -5793,7 +5793,7 @@ _0800FCBE: cmp r4, #0 bge _0800FCAA lsls r3, r6, #6 - ldr r1, _0800FD00 @ =0x03005C00 + ldr r1, _0800FD00 @ =gUnknown_03005C00 ldr r7, _0800FD14 @ =0x0000918A ldr r6, _0800FD18 @ =0x000091CA ldr r2, _0800FD0C @ =gUnknown_086A7FA8 @@ -5825,7 +5825,7 @@ _0800FCFA: pop {r0} bx r0 .align 2, 0 -_0800FD00: .4byte 0x03005C00 +_0800FD00: .4byte gUnknown_03005C00 _0800FD04: .4byte 0x0000916A _0800FD08: .4byte 0x000091AA _0800FD0C: .4byte gUnknown_086A7FA8 @@ -6954,7 +6954,7 @@ _080105CC: adds r6, r1, #1 cmp r2, ip bge _080105FA - ldr r7, _08010614 @ =0x03005C00 + ldr r7, _08010614 @ =gUnknown_03005C00 lsls r0, r1, #5 mov r1, r8 adds r5, r1, r0 @@ -6989,7 +6989,7 @@ _08010602: pop {r0} bx r0 .align 2, 0 -_08010614: .4byte 0x03005C00 +_08010614: .4byte gUnknown_03005C00 thumb_func_start sub_10618 sub_10618: @ 0x08010618 @@ -7006,7 +7006,7 @@ sub_10618: @ 0x08010618 movs r1, #0 cmp r1, ip bge _08010678 - ldr r0, _08010688 @ =0x03005C00 + ldr r0, _08010688 @ =gUnknown_03005C00 mov sl, r0 lsls r0, r3, #5 adds r0, r0, r2 @@ -7053,4 +7053,4 @@ _08010678: pop {r0} bx r0 .align 2, 0 -_08010688: .4byte 0x03005C00 +_08010688: .4byte gUnknown_03005C00 diff --git a/asm/intro.s b/asm/intro.s index 9eff3c4..99be7e0 100755 --- a/asm/intro.s +++ b/asm/intro.s @@ -2256,7 +2256,7 @@ sub_A454: @ 0x0800A454 ldr r1, [r0, #8] ldr r1, _0800A5E8 @ =gUnknown_080DD520 str r1, [r0] - ldr r1, _0800A5EC @ =0x03005C00 + ldr r1, _0800A5EC @ =gUnknown_03005C00 str r1, [r0, #4] str r2, [r0, #8] ldr r1, [r0, #8] @@ -2360,7 +2360,7 @@ _0800A5DC: .4byte 0x0600E800 _0800A5E0: .4byte gUnknown_080D5900 _0800A5E4: .4byte 0x0600F800 _0800A5E8: .4byte gUnknown_080DD520 -_0800A5EC: .4byte 0x03005C00 +_0800A5EC: .4byte gUnknown_03005C00 _0800A5F0: .4byte gUnknown_080DDD20 _0800A5F4: .4byte gUnknown_0201B180 _0800A5F8: .4byte gUnknown_080D6100 @@ -2566,7 +2566,7 @@ _0800A776: cmp r0, #2 bne _0800A7F4 ldr r1, _0800A7D4 @ =0x040000D4 - ldr r0, _0800A7E8 @ =0x03005C00 + ldr r0, _0800A7E8 @ =gUnknown_03005C00 str r0, [r1] ldr r0, _0800A7EC @ =0x0600E000 str r0, [r1, #4] @@ -2591,7 +2591,7 @@ _0800A7D8: .4byte gUnknown_0202BE70 _0800A7DC: .4byte 0x80000010 _0800A7E0: .4byte 0x05000040 _0800A7E4: .4byte gMain -_0800A7E8: .4byte 0x03005C00 +_0800A7E8: .4byte gUnknown_03005C00 _0800A7EC: .4byte 0x0600E000 _0800A7F0: .4byte 0x80000400 _0800A7F4: @@ -3204,7 +3204,7 @@ sub_AC38: @ 0x0800AC38 ldr r1, [r0, #8] ldr r1, _0800ADC8 @ =gUnknown_080BD4C0 str r1, [r0] - ldr r1, _0800ADCC @ =0x03000000 + ldr r1, _0800ADCC @ =gUnknown_03000000 str r1, [r0, #4] ldr r1, _0800ADD0 @ =0x80002000 str r1, [r0, #8] @@ -3297,7 +3297,7 @@ _0800ADBC: .4byte 0x0600F000 _0800ADC0: .4byte gUnknown_080EC960 _0800ADC4: .4byte 0x80001400 _0800ADC8: .4byte gUnknown_080BD4C0 -_0800ADCC: .4byte 0x03000000 +_0800ADCC: .4byte gUnknown_03000000 _0800ADD0: .4byte 0x80002000 _0800ADD4: .4byte gUnknown_080E9F60 _0800ADD8: .4byte 0x800000C0 @@ -3333,7 +3333,7 @@ sub_ADFC: @ 0x0800ADFC strh r5, [r4, #8] strh r5, [r4, #0xa] strh r5, [r4, #4] - ldr r0, _0800AE64 @ =0x03002300 + ldr r0, _0800AE64 @ =gUnknown_03002300 ldr r1, _0800AE68 @ =0x06002EE0 movs r2, #8 movs r3, #8 @@ -3360,7 +3360,7 @@ _0800AE54: .4byte gUnknown_0201A450 _0800AE58: .4byte 0x0000FFBC _0800AE5C: .4byte gUnknown_0202ADA0 _0800AE60: .4byte 0x0000FF58 -_0800AE64: .4byte 0x03002300 +_0800AE64: .4byte gUnknown_03002300 _0800AE68: .4byte 0x06002EE0 _0800AE6C: .4byte gUnknown_0202BF10 _0800AE70: .4byte gUnknown_0202A578 @@ -3431,7 +3431,7 @@ sub_AE74: @ 0x0800AE74 movs r1, #0 ldrsh r0, [r0, r1] lsls r0, r0, #1 - ldr r1, _0800AF6C @ =0x03000000 + ldr r1, _0800AF6C @ =gUnknown_03000000 adds r0, r0, r1 ldr r1, _0800AF70 @ =0x06002EE0 movs r2, #8 @@ -3487,7 +3487,7 @@ _0800AF5C: .4byte gUnknown_0201A450 _0800AF60: .4byte gUnknown_0202ADA0 _0800AF64: .4byte gUnknown_086A79FC _0800AF68: .4byte gUnknown_086A7A1C -_0800AF6C: .4byte 0x03000000 +_0800AF6C: .4byte gUnknown_03000000 _0800AF70: .4byte 0x06002EE0 _0800AF74: .4byte gMain _0800AF78: .4byte 0x000002F2 @@ -3526,7 +3526,7 @@ sub_AF80: @ 0x0800AF80 movs r4, #0 ldrsh r0, [r0, r4] lsls r0, r0, #1 - ldr r1, _0800B070 @ =0x03000000 + ldr r1, _0800B070 @ =gUnknown_03000000 adds r0, r0, r1 ldr r1, _0800B074 @ =0x06002EE0 movs r2, #8 @@ -3613,7 +3613,7 @@ _0800B05C: _0800B064: .4byte gUnknown_0202ADA0 _0800B068: .4byte gUnknown_086A79FC _0800B06C: .4byte gUnknown_086A7A1C -_0800B070: .4byte 0x03000000 +_0800B070: .4byte gUnknown_03000000 _0800B074: .4byte 0x06002EE0 _0800B078: .4byte gUnknown_0202BF10 _0800B07C: .4byte gUnknown_0201A450 diff --git a/asm/options.s b/asm/options.s index 3b2f62a..9f4587b 100755 --- a/asm/options.s +++ b/asm/options.s @@ -82,7 +82,7 @@ sub_51240: @ 0x08051240 ldr r0, [r5, #8] ldr r0, _08051388 @ =gUnknown_08528028 str r0, [r5] - ldr r7, _0805138C @ =0x03005C00 + ldr r7, _0805138C @ =gUnknown_03005C00 str r7, [r5, #4] ldr r6, _08051390 @ =0x80000400 str r6, [r5, #8] @@ -168,7 +168,7 @@ _0805137C: .4byte gUnknown_0852A848 _08051380: .4byte 0x06008000 _08051384: .4byte 0x80000600 _08051388: .4byte gUnknown_08528028 -_0805138C: .4byte 0x03005C00 +_0805138C: .4byte gUnknown_03005C00 _08051390: .4byte 0x80000400 _08051394: .4byte gGameBoyPlayerEnabled _08051398: .4byte gUnknown_0852A048 diff --git a/asm/pokedex.s b/asm/pokedex.s index 7cc9eb5..52e0daf 100755 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -91,7 +91,7 @@ sub_3DCC: @ 0x08003DCC ldr r0, [r4, #8] ldr r0, _08003F68 @ =gUnknown_08081F20 str r0, [r4] - ldr r0, _08003F6C @ =0x03005C00 + ldr r0, _08003F6C @ =gUnknown_03005C00 mov sl, r0 str r0, [r4, #4] ldr r2, _08003F70 @ =0x80000400 @@ -202,7 +202,7 @@ _08003F5C: .4byte 0x80000A00 _08003F60: .4byte gUnknown_08089760 _08003F64: .4byte 0x80000100 _08003F68: .4byte gUnknown_08081F20 -_08003F6C: .4byte 0x03005C00 +_08003F6C: .4byte gUnknown_03005C00 _08003F70: .4byte 0x80000400 _08003F74: .4byte gUnknown_08087340 _08003F78: .4byte gUnknown_02019C40 @@ -676,7 +676,7 @@ _08004388: _08004398: bl sub_51FC ldr r1, _080043C8 @ =0x040000D4 - ldr r0, _080043CC @ =0x03005C00 + ldr r0, _080043CC @ =gUnknown_03005C00 str r0, [r1] movs r0, #0xc0 lsls r0, r0, #0x13 @@ -694,7 +694,7 @@ _080043BC: .4byte gUnknown_0202BF04 _080043C0: .4byte gUnknown_0202A588 _080043C4: .4byte gUnknown_0202C58C _080043C8: .4byte 0x040000D4 -_080043CC: .4byte 0x03005C00 +_080043CC: .4byte gUnknown_03005C00 _080043D0: .4byte 0x80000400 thumb_func_start sub_43D4 @@ -715,7 +715,7 @@ sub_43D4: @ 0x080043D4 _080043F0: bl sub_51FC ldr r1, _08004418 @ =0x040000D4 - ldr r0, _0800441C @ =0x03005C00 + ldr r0, _0800441C @ =gUnknown_03005C00 str r0, [r1] movs r0, #0xc0 lsls r0, r0, #0x13 @@ -732,7 +732,7 @@ _080043F0: _08004410: .4byte gUnknown_0202A588 _08004414: .4byte gUnknown_0202C58C _08004418: .4byte 0x040000D4 -_0800441C: .4byte 0x03005C00 +_0800441C: .4byte gUnknown_03005C00 _08004420: .4byte 0x80000400 _08004424: .4byte gMain @@ -751,7 +751,7 @@ sub_4428: @ 0x08004428 mov sl, r1 ldr r6, _08004554 @ =gUnknown_0805C7C0 mov sb, r6 - ldr r0, _08004558 @ =0x03005C00 + ldr r0, _08004558 @ =gUnknown_03005C00 mov r8, r0 adds r5, r7, #0 ldr r4, _0800455C @ =gUnknown_0805C840 @@ -804,7 +804,7 @@ _0800444A: movs r0, #0x59 strh r0, [r1] ldr r2, _08004560 @ =0x040000D4 - ldr r0, _08004558 @ =0x03005C00 + ldr r0, _08004558 @ =gUnknown_03005C00 str r0, [r2] movs r0, #0xc0 lsls r0, r0, #0x13 @@ -886,7 +886,7 @@ _08004548: .4byte gUnknown_0202A558 _0800454C: .4byte gUnknown_02019C40 _08004550: .4byte gUnknown_0805C780 _08004554: .4byte gUnknown_0805C7C0 -_08004558: .4byte 0x03005C00 +_08004558: .4byte gUnknown_03005C00 _0800455C: .4byte gUnknown_0805C840 _08004560: .4byte 0x040000D4 _08004564: .4byte 0x80000400 @@ -1237,7 +1237,7 @@ sub_4860: @ 0x08004860 ldr r7, _08004970 @ =gUnknown_0202A558 ldr r1, _08004974 @ =gUnknown_0805C800 mov sb, r1 - ldr r0, _08004978 @ =0x03005C00 + ldr r0, _08004978 @ =gUnknown_03005C00 mov sl, r0 mov r6, r8 adds r5, r7, #0 @@ -1276,7 +1276,7 @@ _08004886: cmp r0, #7 bgt _080048F2 movs r3, #0 - ldr r0, _08004978 @ =0x03005C00 + ldr r0, _08004978 @ =gUnknown_03005C00 mov ip, r0 adds r6, r7, #0 ldr r5, _08004980 @ =gUnknown_0202A590 @@ -1338,7 +1338,7 @@ _080048F2: mov r0, sp strh r3, [r0] str r0, [r2] - ldr r0, _08004998 @ =0x03000000 + ldr r0, _08004998 @ =gUnknown_03000000 str r0, [r2, #4] ldr r1, _0800499C @ =0x81000C00 str r1, [r2, #8] @@ -1366,7 +1366,7 @@ _0800495A: _0800496C: .4byte gUnknown_02019C40 _08004970: .4byte gUnknown_0202A558 _08004974: .4byte gUnknown_0805C800 -_08004978: .4byte 0x03005C00 +_08004978: .4byte gUnknown_03005C00 _0800497C: .4byte gUnknown_0805C7C0 _08004980: .4byte gUnknown_0202A590 _08004984: .4byte 0x040000D4 @@ -1374,7 +1374,7 @@ _08004988: .4byte 0x06000800 _0800498C: .4byte 0x80000400 _08004990: .4byte gUnknown_0202A588 _08004994: .4byte gUnknown_0202BF04 -_08004998: .4byte 0x03000000 +_08004998: .4byte gUnknown_03000000 _0800499C: .4byte 0x81000C00 _080049A0: .4byte 0x06005C00 _080049A4: .4byte gMain @@ -5197,7 +5197,7 @@ sub_681C: @ 0x0800681C ldr r2, _08006884 @ =0x040000D4 add r1, sp, #8 str r1, [r2] - ldr r1, _08006888 @ =0x03000000 + ldr r1, _08006888 @ =gUnknown_03000000 str r1, [r2, #4] ldr r1, _0800688C @ =0x81000400 str r1, [r2, #8] @@ -5238,7 +5238,7 @@ sub_681C: @ 0x0800681C b _080068BE .align 2, 0 _08006884: .4byte 0x040000D4 -_08006888: .4byte 0x03000000 +_08006888: .4byte gUnknown_03000000 _0800688C: .4byte 0x81000400 _08006890: .4byte gUnknown_0202A1C0 _08006894: @@ -5353,7 +5353,7 @@ _0800693A: adds r6, #1 cmp r6, #9 ble _08006924 - ldr r4, _080069B8 @ =0x03000000 + ldr r4, _080069B8 @ =gUnknown_03000000 ldr r1, _080069BC @ =0x06004C00 adds r0, r4, #0 movs r2, #8 @@ -5380,7 +5380,7 @@ _080069A8: .4byte gUnknown_08090780 _080069AC: .4byte gUnknown_0202BE30 _080069B0: .4byte 0x80000010 _080069B4: .4byte gUnknown_0201B130 -_080069B8: .4byte 0x03000000 +_080069B8: .4byte gUnknown_03000000 _080069BC: .4byte 0x06004C00 _080069C0: .4byte 0x81000400 _080069C4: @@ -5457,7 +5457,7 @@ _08006A1A: adds r6, #1 cmp r6, #0xa ble _08006A04 - ldr r4, _08006A98 @ =0x03000000 + ldr r4, _08006A98 @ =gUnknown_03000000 ldr r1, _08006A9C @ =0x06004D00 adds r0, r4, #0 movs r2, #9 @@ -5483,7 +5483,7 @@ _08006A88: .4byte gUnknown_08090780 _08006A8C: .4byte gUnknown_0202BE30 _08006A90: .4byte 0x80000010 _08006A94: .4byte gUnknown_0201B130 -_08006A98: .4byte 0x03000000 +_08006A98: .4byte gUnknown_03000000 _08006A9C: .4byte 0x06004D00 _08006AA0: .4byte 0x81000400 _08006AA4: @@ -5743,7 +5743,7 @@ sub_6CA0: @ 0x08006CA0 ldr r1, _08006D2C @ =0x040000D4 add r0, sp, #8 str r0, [r1] - ldr r0, _08006D30 @ =0x03000000 + ldr r0, _08006D30 @ =gUnknown_03000000 str r0, [r1, #4] ldr r0, _08006D34 @ =0x81000400 str r0, [r1, #8] @@ -5798,7 +5798,7 @@ _08006CE0: b _08006D68 .align 2, 0 _08006D2C: .4byte 0x040000D4 -_08006D30: .4byte 0x03000000 +_08006D30: .4byte gUnknown_03000000 _08006D34: .4byte 0x81000400 _08006D38: .4byte gUnknown_0202A1C0 _08006D3C: @@ -5957,7 +5957,7 @@ _08006E28: movs r3, #0xc0 lsls r3, r3, #0x13 adds r1, r1, r3 - ldr r0, _08006EBC @ =0x03000000 + ldr r0, _08006EBC @ =gUnknown_03000000 movs r2, #8 movs r3, #2 bl sub_10708 @@ -5967,7 +5967,7 @@ _08006E28: ldr r1, _08006EA0 @ =0x040000D4 add r4, sp, #8 str r4, [r1] - ldr r0, _08006EBC @ =0x03000000 + ldr r0, _08006EBC @ =gUnknown_03000000 str r0, [r1, #4] ldr r0, _08006EC0 @ =0x81000400 str r0, [r1, #8] @@ -5986,7 +5986,7 @@ _08006EAC: .4byte gUnknown_0202BE30 _08006EB0: .4byte 0x80000010 _08006EB4: .4byte gUnknown_0201B130 _08006EB8: .4byte gUnknown_086A64F0 -_08006EBC: .4byte 0x03000000 +_08006EBC: .4byte gUnknown_03000000 _08006EC0: .4byte 0x81000400 _08006EC4: mov r2, r8 @@ -6254,7 +6254,7 @@ sub_70E0: @ 0x080070E0 strh r3, [r2] ldr r3, _080071B4 @ =0x040000D4 str r2, [r3] - ldr r2, _080071B8 @ =0x03000000 + ldr r2, _080071B8 @ =gUnknown_03000000 str r2, [r3, #4] ldr r2, _080071BC @ =0x81000C00 str r2, [r3, #8] @@ -6334,7 +6334,7 @@ _08007156: cmp r7, #2 ble _08007114 ldr r1, _080071B4 @ =0x040000D4 - ldr r0, _080071B8 @ =0x03000000 + ldr r0, _080071B8 @ =gUnknown_03000000 str r0, [r1] ldr r0, _080071D4 @ =0x06005C00 str r0, [r1, #4] @@ -6351,7 +6351,7 @@ _08007156: bx r0 .align 2, 0 _080071B4: .4byte 0x040000D4 -_080071B8: .4byte 0x03000000 +_080071B8: .4byte gUnknown_03000000 _080071BC: .4byte 0x81000C00 _080071C0: .4byte gUnknown_0805C8F6 _080071C4: .4byte gUnknown_08090780 @@ -6431,7 +6431,7 @@ _0800726C: movs r7, #0 adds r0, r2, #1 mov ip, r0 - ldr r1, _080072E0 @ =0x03000000 + ldr r1, _080072E0 @ =gUnknown_03000000 mov sb, r1 movs r0, #0xff mov sl, r0 @@ -6487,14 +6487,14 @@ _08007290: ble _08007290 bl _080088C8 .align 2, 0 -_080072E0: .4byte 0x03000000 +_080072E0: .4byte gUnknown_03000000 _080072E4: .4byte gUnknown_0201B130 _080072E8: .4byte gUnknown_0202BE30 _080072EC: movs r7, #0 adds r0, r2, #1 mov ip, r0 - ldr r1, _08007388 @ =0x03000000 + ldr r1, _08007388 @ =gUnknown_03000000 mov sl, r1 ldr r0, _0800738C @ =gUnknown_0201B130 mov sb, r0 @@ -6570,7 +6570,7 @@ _0800730C: ble _0800730C bl _080088C8 .align 2, 0 -_08007388: .4byte 0x03000000 +_08007388: .4byte gUnknown_03000000 _0800738C: .4byte gUnknown_0201B130 _08007390: .4byte gUnknown_0202BE30 _08007394: .4byte 0x00000FFF @@ -6588,7 +6588,7 @@ _08007398: ldr r0, _08007444 @ =gUnknown_0202BE30 mov r8, r0 lsls r0, r2, #1 - ldr r2, _08007448 @ =0x03000000 + ldr r2, _08007448 @ =gUnknown_03000000 adds r6, r0, r2 lsls r1, r1, #1 adds r5, r1, r2 @@ -6604,7 +6604,7 @@ _080073BA: strh r0, [r6] add r4, ip lsls r3, r4, #1 - ldr r1, _08007448 @ =0x03000000 + ldr r1, _08007448 @ =gUnknown_03000000 adds r3, r3, r1 mov r2, r8 ldrh r0, [r2] @@ -6632,7 +6632,7 @@ _080073BA: lsls r1, r1, #2 adds r4, r4, r1 lsls r4, r4, #1 - ldr r2, _08007448 @ =0x03000000 + ldr r2, _08007448 @ =gUnknown_03000000 adds r4, r4, r2 mov r1, sb ldrh r0, [r1] @@ -6661,7 +6661,7 @@ _080073BA: .align 2, 0 _08007440: .4byte gUnknown_0201B130 _08007444: .4byte gUnknown_0202BE30 -_08007448: .4byte 0x03000000 +_08007448: .4byte gUnknown_03000000 _0800744C: movs r7, #0 adds r0, r2, #1 @@ -6677,7 +6677,7 @@ _0800744C: ldr r0, _08007538 @ =gUnknown_0202BE30 mov sl, r0 lsls r0, r2, #1 - ldr r2, _0800753C @ =0x03000000 + ldr r2, _0800753C @ =gUnknown_03000000 adds r0, r0, r2 mov r8, r0 ldr r0, _08007540 @ =gUnknown_0201B130 @@ -6698,7 +6698,7 @@ _08007476: mov r0, ip adds r4, r5, r0 lsls r3, r4, #1 - ldr r1, _0800753C @ =0x03000000 + ldr r1, _0800753C @ =gUnknown_03000000 adds r3, r3, r1 mov r2, sl ldrh r0, [r2] @@ -6715,7 +6715,7 @@ _08007476: strh r1, [r3] add r5, sb lsls r2, r5, #1 - ldr r0, _0800753C @ =0x03000000 + ldr r0, _0800753C @ =gUnknown_03000000 adds r2, r2, r0 mov r0, sl ldrh r1, [r0, #2] @@ -6737,7 +6737,7 @@ _08007476: lsls r0, r0, #2 adds r4, r4, r0 lsls r4, r4, #1 - ldr r1, _0800753C @ =0x03000000 + ldr r1, _0800753C @ =gUnknown_03000000 adds r4, r4, r1 ldrh r0, [r2] ldr r1, _08007544 @ =0x0000FFF0 @@ -6758,7 +6758,7 @@ _08007476: lsls r1, r1, #2 adds r5, r5, r1 lsls r5, r5, #1 - ldr r2, _0800753C @ =0x03000000 + ldr r2, _0800753C @ =gUnknown_03000000 adds r5, r5, r2 ldrh r1, [r3] movs r0, #0xf0 @@ -6783,7 +6783,7 @@ _08007476: bl _080088C8 .align 2, 0 _08007538: .4byte gUnknown_0202BE30 -_0800753C: .4byte 0x03000000 +_0800753C: .4byte gUnknown_03000000 _08007540: .4byte gUnknown_0201B130 _08007544: .4byte 0x0000FFF0 _08007548: @@ -6792,7 +6792,7 @@ _08007548: mov ip, r0 adds r2, #0x10 mov sb, r2 - ldr r1, _080075B4 @ =0x03000000 + ldr r1, _080075B4 @ =gUnknown_03000000 mov r8, r1 movs r2, #0x80 lsls r2, r2, #2 @@ -6841,7 +6841,7 @@ _08007560: ble _08007560 bl _080088C8 .align 2, 0 -_080075B4: .4byte 0x03000000 +_080075B4: .4byte gUnknown_03000000 _080075B8: .4byte gUnknown_0201B130 _080075BC: .4byte gUnknown_0202BE30 _080075C0: @@ -6850,7 +6850,7 @@ _080075C0: mov ip, r1 adds r2, #0x10 mov sb, r2 - ldr r2, _0800765C @ =0x03000000 + ldr r2, _0800765C @ =gUnknown_03000000 mov sl, r2 ldr r0, _08007660 @ =gUnknown_0201B130 mov r8, r0 @@ -6923,7 +6923,7 @@ _080075D4: ble _080075D4 bl _080088C8 .align 2, 0 -_0800765C: .4byte 0x03000000 +_0800765C: .4byte gUnknown_03000000 _08007660: .4byte gUnknown_0201B130 _08007664: .4byte gUnknown_0202BE30 _08007668: .4byte 0x00000FFF @@ -6933,7 +6933,7 @@ _0800766C: mov ip, r0 adds r2, #0x10 mov sb, r2 - ldr r1, _08007708 @ =0x03000000 + ldr r1, _08007708 @ =gUnknown_03000000 mov sl, r1 ldr r2, _0800770C @ =gUnknown_0201B130 mov r8, r2 @@ -7006,7 +7006,7 @@ _08007680: ble _08007680 bl _080088C8 .align 2, 0 -_08007708: .4byte 0x03000000 +_08007708: .4byte gUnknown_03000000 _0800770C: .4byte gUnknown_0201B130 _08007710: .4byte gUnknown_0202BE30 _08007714: @@ -7018,7 +7018,7 @@ _08007714: mov sb, r1 adds r2, #0x11 str r2, [sp] - ldr r2, _080077FC @ =0x03000000 + ldr r2, _080077FC @ =gUnknown_03000000 mov sl, r2 movs r0, #2 str r0, [sp, #4] @@ -7127,7 +7127,7 @@ _08007734: ble _08007734 bl _080088C8 .align 2, 0 -_080077FC: .4byte 0x03000000 +_080077FC: .4byte gUnknown_03000000 _08007800: .4byte gUnknown_0202BE30 _08007804: .4byte gUnknown_0201B130 _08007808: .4byte 0x0000FFF0 @@ -7164,7 +7164,7 @@ _08007850: movs r7, #0 adds r0, r2, #1 mov ip, r0 - ldr r1, _080078C4 @ =0x03000000 + ldr r1, _080078C4 @ =gUnknown_03000000 mov sb, r1 movs r0, #0xf mov sl, r0 @@ -7220,14 +7220,14 @@ _08007874: ble _08007874 bl _080088C8 .align 2, 0 -_080078C4: .4byte 0x03000000 +_080078C4: .4byte gUnknown_03000000 _080078C8: .4byte gUnknown_0201B130 _080078CC: .4byte gUnknown_0202BE30 _080078D0: movs r7, #0 adds r0, r2, #1 mov ip, r0 - ldr r1, _0800796C @ =0x03000000 + ldr r1, _0800796C @ =gUnknown_03000000 mov sl, r1 ldr r0, _08007970 @ =gUnknown_0201B130 mov sb, r0 @@ -7303,7 +7303,7 @@ _080078F0: ble _080078F0 bl _080088C8 .align 2, 0 -_0800796C: .4byte 0x03000000 +_0800796C: .4byte gUnknown_03000000 _08007970: .4byte gUnknown_0201B130 _08007974: .4byte gUnknown_0202BE30 _08007978: .4byte 0x00000FFF @@ -7311,7 +7311,7 @@ _0800797C: movs r7, #0 adds r1, r2, #1 mov ip, r1 - ldr r0, _08007A1C @ =0x03000000 + ldr r0, _08007A1C @ =gUnknown_03000000 mov sl, r0 ldr r1, _08007A20 @ =gUnknown_0201B130 mov sb, r1 @@ -7389,7 +7389,7 @@ _0800799E: ble _0800799E bl _080088C8 .align 2, 0 -_08007A1C: .4byte 0x03000000 +_08007A1C: .4byte gUnknown_03000000 _08007A20: .4byte gUnknown_0201B130 _08007A24: .4byte gUnknown_0202BE30 _08007A28: @@ -7406,7 +7406,7 @@ _08007A28: ldr r0, _08007AD0 @ =gUnknown_0202BE30 mov r8, r0 lsls r0, r2, #1 - ldr r2, _08007AD4 @ =0x03000000 + ldr r2, _08007AD4 @ =gUnknown_03000000 adds r6, r0, r2 lsls r1, r1, #1 adds r5, r1, r2 @@ -7422,7 +7422,7 @@ _08007A4A: strh r0, [r6] add r4, ip lsls r3, r4, #1 - ldr r1, _08007AD4 @ =0x03000000 + ldr r1, _08007AD4 @ =gUnknown_03000000 adds r3, r3, r1 mov r2, r8 ldrh r0, [r2] @@ -7449,7 +7449,7 @@ _08007A4A: lsls r1, r1, #2 adds r4, r4, r1 lsls r4, r4, #1 - ldr r2, _08007AD4 @ =0x03000000 + ldr r2, _08007AD4 @ =gUnknown_03000000 adds r4, r4, r2 mov r1, sb ldrh r0, [r1] @@ -7477,7 +7477,7 @@ _08007A4A: .align 2, 0 _08007ACC: .4byte gUnknown_0201B130 _08007AD0: .4byte gUnknown_0202BE30 -_08007AD4: .4byte 0x03000000 +_08007AD4: .4byte gUnknown_03000000 _08007AD8: .4byte 0x0000FFF0 _08007ADC: movs r7, #0 @@ -7485,7 +7485,7 @@ _08007ADC: mov ip, r0 adds r2, #0x10 mov sb, r2 - ldr r1, _08007B48 @ =0x03000000 + ldr r1, _08007B48 @ =gUnknown_03000000 mov r8, r1 movs r2, #0x80 lsls r2, r2, #2 @@ -7534,7 +7534,7 @@ _08007AF4: ble _08007AF4 bl _080088C8 .align 2, 0 -_08007B48: .4byte 0x03000000 +_08007B48: .4byte gUnknown_03000000 _08007B4C: .4byte gUnknown_0201B130 _08007B50: .4byte gUnknown_0202BE30 _08007B54: @@ -7543,7 +7543,7 @@ _08007B54: mov ip, r1 adds r2, #0x10 mov sb, r2 - ldr r2, _08007BF0 @ =0x03000000 + ldr r2, _08007BF0 @ =gUnknown_03000000 mov sl, r2 ldr r0, _08007BF4 @ =gUnknown_0201B130 mov r8, r0 @@ -7616,7 +7616,7 @@ _08007B68: ble _08007B68 bl _080088C8 .align 2, 0 -_08007BF0: .4byte 0x03000000 +_08007BF0: .4byte gUnknown_03000000 _08007BF4: .4byte gUnknown_0201B130 _08007BF8: .4byte gUnknown_0202BE30 _08007BFC: .4byte 0x00000FFF @@ -7626,7 +7626,7 @@ _08007C00: mov ip, r0 adds r2, #0x10 mov sb, r2 - ldr r1, _08007C9C @ =0x03000000 + ldr r1, _08007C9C @ =gUnknown_03000000 mov sl, r1 ldr r2, _08007CA0 @ =gUnknown_0201B130 mov r8, r2 @@ -7699,7 +7699,7 @@ _08007C14: ble _08007C14 bl _080088C8 .align 2, 0 -_08007C9C: .4byte 0x03000000 +_08007C9C: .4byte gUnknown_03000000 _08007CA0: .4byte gUnknown_0201B130 _08007CA4: .4byte gUnknown_0202BE30 _08007CA8: @@ -7708,7 +7708,7 @@ _08007CA8: mov ip, r0 adds r2, #0x10 mov sb, r2 - ldr r1, _08007D40 @ =0x03000000 + ldr r1, _08007D40 @ =gUnknown_03000000 mov sl, r1 ldr r2, _08007D44 @ =gUnknown_0201B130 mov r8, r2 @@ -7779,7 +7779,7 @@ _08007CBC: ble _08007CBC bl _080088C8 .align 2, 0 -_08007D40: .4byte 0x03000000 +_08007D40: .4byte gUnknown_03000000 _08007D44: .4byte gUnknown_0201B130 _08007D48: .4byte gUnknown_0202BE30 _08007D4C: .4byte 0x0000FFF0 @@ -7814,7 +7814,7 @@ _08007D74: @ jump table .4byte _08008110 @ case 7 _08007D94: movs r7, #0 - ldr r1, _08007DCC @ =0x03000000 + ldr r1, _08007DCC @ =gUnknown_03000000 lsls r0, r2, #1 adds r3, r0, r1 ldr r5, _08007DD0 @ =gUnknown_0202BE30 @@ -7841,14 +7841,14 @@ _08007DA8: ble _08007DA8 bl _080088C8 .align 2, 0 -_08007DCC: .4byte 0x03000000 +_08007DCC: .4byte gUnknown_03000000 _08007DD0: .4byte gUnknown_0202BE30 _08007DD4: .4byte gUnknown_0201B130 _08007DD8: movs r7, #0 adds r0, r2, #1 mov ip, r0 - ldr r1, _08007E64 @ =0x03000000 + ldr r1, _08007E64 @ =gUnknown_03000000 mov sb, r1 movs r0, #0xf0 lsls r0, r0, #8 @@ -7915,7 +7915,7 @@ _08007DFC: ble _08007DFC bl _080088C8 .align 2, 0 -_08007E64: .4byte 0x03000000 +_08007E64: .4byte gUnknown_03000000 _08007E68: .4byte gUnknown_0202BE30 _08007E6C: .4byte 0x00000FFF _08007E70: .4byte gUnknown_0201B130 @@ -7923,7 +7923,7 @@ _08007E74: movs r7, #0 adds r1, r2, #1 mov ip, r1 - ldr r0, _08007F00 @ =0x03000000 + ldr r0, _08007F00 @ =gUnknown_03000000 mov sb, r0 movs r1, #0xff lsls r1, r1, #8 @@ -7990,14 +7990,14 @@ _08007E98: ble _08007E98 bl _080088C8 .align 2, 0 -_08007F00: .4byte 0x03000000 +_08007F00: .4byte gUnknown_03000000 _08007F04: .4byte gUnknown_0202BE30 _08007F08: .4byte gUnknown_0201B130 _08007F0C: movs r7, #0 adds r1, r2, #1 mov ip, r1 - ldr r0, _08007F94 @ =0x03000000 + ldr r0, _08007F94 @ =gUnknown_03000000 mov sb, r0 ldr r1, _08007F98 @ =0x0000FFF0 mov sl, r1 @@ -8063,7 +8063,7 @@ _08007F2E: ble _08007F2E bl _080088C8 .align 2, 0 -_08007F94: .4byte 0x03000000 +_08007F94: .4byte gUnknown_03000000 _08007F98: .4byte 0x0000FFF0 _08007F9C: .4byte gUnknown_0202BE30 _08007FA0: .4byte gUnknown_0201B130 @@ -8071,7 +8071,7 @@ _08007FA4: movs r7, #0 adds r2, #1 mov ip, r2 - ldr r1, _08007FE8 @ =0x03000000 + ldr r1, _08007FE8 @ =gUnknown_03000000 mov r8, r1 ldr r6, _08007FEC @ =gUnknown_0202BE30 lsls r0, r2, #1 @@ -8102,7 +8102,7 @@ _08007FB6: ble _08007FB6 bl _080088C8 .align 2, 0 -_08007FE8: .4byte 0x03000000 +_08007FE8: .4byte gUnknown_03000000 _08007FEC: .4byte gUnknown_0202BE30 _08007FF0: .4byte gUnknown_0201B130 _08007FF4: @@ -8111,7 +8111,7 @@ _08007FF4: mov ip, r0 adds r2, #0x10 mov sb, r2 - ldr r1, _08008074 @ =0x03000000 + ldr r1, _08008074 @ =gUnknown_03000000 mov r8, r1 movs r2, #0x80 lsls r2, r2, #2 @@ -8171,7 +8171,7 @@ _0800800A: ble _0800800A bl _080088C8 .align 2, 0 -_08008074: .4byte 0x03000000 +_08008074: .4byte gUnknown_03000000 _08008078: .4byte gUnknown_0202BE30 _0800807C: .4byte 0x00000FFF _08008080: .4byte gUnknown_0201B130 @@ -8181,7 +8181,7 @@ _08008084: mov ip, r0 adds r2, #0x10 mov sb, r2 - ldr r1, _08008104 @ =0x03000000 + ldr r1, _08008104 @ =gUnknown_03000000 mov r8, r1 movs r2, #0x80 lsls r2, r2, #2 @@ -8241,7 +8241,7 @@ _0800809A: ble _0800809A bl _080088C8 .align 2, 0 -_08008104: .4byte 0x03000000 +_08008104: .4byte gUnknown_03000000 _08008108: .4byte gUnknown_0202BE30 _0800810C: .4byte gUnknown_0201B130 _08008110: @@ -8250,7 +8250,7 @@ _08008110: mov ip, r0 adds r2, #0x10 mov sb, r2 - ldr r1, _0800818C @ =0x03000000 + ldr r1, _0800818C @ =gUnknown_03000000 mov r8, r1 movs r2, #0x80 lsls r2, r2, #2 @@ -8308,7 +8308,7 @@ _08008126: ble _08008126 b _080088C8 .align 2, 0 -_0800818C: .4byte 0x03000000 +_0800818C: .4byte gUnknown_03000000 _08008190: .4byte gUnknown_0202BE30 _08008194: .4byte 0x0000FFF0 _08008198: .4byte gUnknown_0201B130 @@ -8343,7 +8343,7 @@ _080081C0: @ jump table .4byte _080084F4 @ case 7 _080081E0: movs r7, #0 - ldr r1, _08008220 @ =0x03000000 + ldr r1, _08008220 @ =gUnknown_03000000 ldr r6, _08008224 @ =0x00000FFF lsls r0, r2, #1 adds r4, r0, r1 @@ -8376,13 +8376,13 @@ _080081F4: ble _080081F4 b _080088C8 .align 2, 0 -_08008220: .4byte 0x03000000 +_08008220: .4byte gUnknown_03000000 _08008224: .4byte 0x00000FFF _08008228: .4byte gUnknown_0202BE30 _0800822C: .4byte gUnknown_0201B130 _08008230: movs r7, #0 - ldr r1, _08008274 @ =0x03000000 + ldr r1, _08008274 @ =gUnknown_03000000 ldr r6, _08008278 @ =0x00000FFF lsls r0, r2, #1 adds r4, r0, r1 @@ -8417,7 +8417,7 @@ _08008244: ble _08008244 b _080088C8 .align 2, 0 -_08008274: .4byte 0x03000000 +_08008274: .4byte gUnknown_03000000 _08008278: .4byte 0x00000FFF _0800827C: .4byte gUnknown_0202BE30 _08008280: .4byte gUnknown_0201B130 @@ -8425,7 +8425,7 @@ _08008284: movs r7, #0 adds r1, r2, #1 mov ip, r1 - ldr r0, _0800830C @ =0x03000000 + ldr r0, _0800830C @ =gUnknown_03000000 mov sb, r0 movs r1, #0xf0 lsls r1, r1, #4 @@ -8492,14 +8492,14 @@ _080082A8: ble _080082A8 b _080088C8 .align 2, 0 -_0800830C: .4byte 0x03000000 +_0800830C: .4byte gUnknown_03000000 _08008310: .4byte gUnknown_0202BE30 _08008314: .4byte gUnknown_0201B130 _08008318: movs r7, #0 adds r1, r2, #1 mov ip, r1 - ldr r0, _080083A0 @ =0x03000000 + ldr r0, _080083A0 @ =gUnknown_03000000 mov sb, r0 movs r1, #0xff lsls r1, r1, #4 @@ -8566,14 +8566,14 @@ _0800833C: ble _0800833C b _080088C8 .align 2, 0 -_080083A0: .4byte 0x03000000 +_080083A0: .4byte gUnknown_03000000 _080083A4: .4byte gUnknown_0202BE30 _080083A8: .4byte gUnknown_0201B130 _080083AC: movs r7, #0 adds r2, #1 mov ip, r2 - ldr r1, _080083FC @ =0x03000000 + ldr r1, _080083FC @ =gUnknown_03000000 mov sb, r1 ldr r2, _08008400 @ =0x00000FFF mov r8, r2 @@ -8612,7 +8612,7 @@ _080083C6: ble _080083C6 b _080088C8 .align 2, 0 -_080083FC: .4byte 0x03000000 +_080083FC: .4byte gUnknown_03000000 _08008400: .4byte 0x00000FFF _08008404: .4byte gUnknown_0202BE30 _08008408: .4byte gUnknown_0201B130 @@ -8620,7 +8620,7 @@ _0800840C: movs r7, #0 adds r2, #1 mov ip, r2 - ldr r6, _08008458 @ =0x03000000 + ldr r6, _08008458 @ =gUnknown_03000000 ldr r2, _0800845C @ =0x00000FFF mov r8, r2 ldr r5, _08008460 @ =gUnknown_0202BE30 @@ -8657,7 +8657,7 @@ _0800841A: ble _0800841A b _080088C8 .align 2, 0 -_08008458: .4byte 0x03000000 +_08008458: .4byte gUnknown_03000000 _0800845C: .4byte 0x00000FFF _08008460: .4byte gUnknown_0202BE30 _08008464: .4byte gUnknown_0201B130 @@ -8667,7 +8667,7 @@ _08008468: mov ip, r0 adds r2, #0x10 mov sb, r2 - ldr r1, _080084E8 @ =0x03000000 + ldr r1, _080084E8 @ =gUnknown_03000000 mov r8, r1 movs r2, #0x80 lsls r2, r2, #2 @@ -8727,7 +8727,7 @@ _0800847E: ble _0800847E b _080088C8 .align 2, 0 -_080084E8: .4byte 0x03000000 +_080084E8: .4byte gUnknown_03000000 _080084EC: .4byte gUnknown_0202BE30 _080084F0: .4byte gUnknown_0201B130 _080084F4: @@ -8736,7 +8736,7 @@ _080084F4: mov ip, r0 adds r2, #0x10 mov sb, r2 - ldr r1, _08008574 @ =0x03000000 + ldr r1, _08008574 @ =gUnknown_03000000 mov r8, r1 movs r2, #0x80 lsls r2, r2, #2 @@ -8796,7 +8796,7 @@ _0800850A: ble _0800850A b _080088C8 .align 2, 0 -_08008574: .4byte 0x03000000 +_08008574: .4byte gUnknown_03000000 _08008578: .4byte gUnknown_0202BE30 _0800857C: .4byte gUnknown_0201B130 _08008580: @@ -8830,7 +8830,7 @@ _080085A4: @ jump table .4byte _08008850 @ case 7 _080085C4: movs r7, #0 - ldr r1, _08008604 @ =0x03000000 + ldr r1, _08008604 @ =gUnknown_03000000 movs r6, #0xff lsls r0, r2, #1 adds r4, r0, r1 @@ -8863,12 +8863,12 @@ _080085D8: ble _080085D8 b _080088C8 .align 2, 0 -_08008604: .4byte 0x03000000 +_08008604: .4byte gUnknown_03000000 _08008608: .4byte gUnknown_0202BE30 _0800860C: .4byte gUnknown_0201B130 _08008610: movs r7, #0 - ldr r1, _08008654 @ =0x03000000 + ldr r1, _08008654 @ =gUnknown_03000000 movs r6, #0xff lsls r0, r2, #1 adds r4, r0, r1 @@ -8903,12 +8903,12 @@ _08008624: ble _08008624 b _080088C8 .align 2, 0 -_08008654: .4byte 0x03000000 +_08008654: .4byte gUnknown_03000000 _08008658: .4byte gUnknown_0202BE30 _0800865C: .4byte gUnknown_0201B130 _08008660: movs r7, #0 - ldr r1, _080086A4 @ =0x03000000 + ldr r1, _080086A4 @ =gUnknown_03000000 movs r6, #0xff lsls r0, r2, #1 adds r4, r0, r1 @@ -8943,14 +8943,14 @@ _08008674: ble _08008674 b _080088C8 .align 2, 0 -_080086A4: .4byte 0x03000000 +_080086A4: .4byte gUnknown_03000000 _080086A8: .4byte gUnknown_0202BE30 _080086AC: .4byte gUnknown_0201B130 _080086B0: movs r7, #0 adds r1, r2, #1 mov ip, r1 - ldr r0, _08008738 @ =0x03000000 + ldr r0, _08008738 @ =gUnknown_03000000 mov sb, r0 movs r1, #0xf0 mov sl, r1 @@ -9016,14 +9016,14 @@ _080086D2: ble _080086D2 b _080088C8 .align 2, 0 -_08008738: .4byte 0x03000000 +_08008738: .4byte gUnknown_03000000 _0800873C: .4byte gUnknown_0202BE30 _08008740: .4byte gUnknown_0201B130 _08008744: movs r7, #0 adds r2, #1 mov ip, r2 - ldr r1, _08008794 @ =0x03000000 + ldr r1, _08008794 @ =gUnknown_03000000 mov sb, r1 movs r2, #0xff mov r8, r2 @@ -9062,14 +9062,14 @@ _0800875E: ble _0800875E b _080088C8 .align 2, 0 -_08008794: .4byte 0x03000000 +_08008794: .4byte gUnknown_03000000 _08008798: .4byte gUnknown_0202BE30 _0800879C: .4byte gUnknown_0201B130 _080087A0: movs r7, #0 adds r2, #1 mov ip, r2 - ldr r6, _080087EC @ =0x03000000 + ldr r6, _080087EC @ =gUnknown_03000000 movs r2, #0xff mov r8, r2 ldr r5, _080087F0 @ =gUnknown_0202BE30 @@ -9106,14 +9106,14 @@ _080087AE: ble _080087AE b _080088C8 .align 2, 0 -_080087EC: .4byte 0x03000000 +_080087EC: .4byte gUnknown_03000000 _080087F0: .4byte gUnknown_0202BE30 _080087F4: .4byte gUnknown_0201B130 _080087F8: movs r7, #0 adds r2, #1 mov ip, r2 - ldr r6, _08008844 @ =0x03000000 + ldr r6, _08008844 @ =gUnknown_03000000 movs r2, #0xff mov r8, r2 ldr r5, _08008848 @ =gUnknown_0202BE30 @@ -9150,7 +9150,7 @@ _08008806: ble _08008806 b _080088C8 .align 2, 0 -_08008844: .4byte 0x03000000 +_08008844: .4byte gUnknown_03000000 _08008848: .4byte gUnknown_0202BE30 _0800884C: .4byte gUnknown_0201B130 _08008850: @@ -9159,7 +9159,7 @@ _08008850: mov ip, r0 adds r2, #0x10 mov sb, r2 - ldr r1, _080088D8 @ =0x03000000 + ldr r1, _080088D8 @ =gUnknown_03000000 mov r8, r1 movs r2, #0x80 lsls r2, r2, #2 @@ -9225,7 +9225,7 @@ _080088C8: pop {r0} bx r0 .align 2, 0 -_080088D8: .4byte 0x03000000 +_080088D8: .4byte gUnknown_03000000 _080088DC: .4byte gUnknown_0202BE30 _080088E0: .4byte gUnknown_0201B130 diff --git a/asm/rom_1068C.s b/asm/rom_1068C.s index 5a3aa1e..37c7a85 100755 --- a/asm/rom_1068C.s +++ b/asm/rom_1068C.s @@ -33,7 +33,7 @@ _080106B2: lsls r0, r2, #5 mov r1, sl adds r5, r1, r0 - ldr r0, _08010700 @ =0x03005C00 + ldr r0, _08010700 @ =gUnknown_03005C00 mov ip, r0 ldr r1, _08010704 @ =0x00000FFF mov r8, r1 @@ -69,7 +69,7 @@ _080106F0: pop {r0} bx r0 .align 2, 0 -_08010700: .4byte 0x03005C00 +_08010700: .4byte gUnknown_03005C00 _08010704: .4byte 0x00000FFF thumb_func_start sub_10708 diff --git a/asm/rom_11B9C.s b/asm/rom_11B9C.s index 4f7f0f0..3907dd0 100755 --- a/asm/rom_11B9C.s +++ b/asm/rom_11B9C.s @@ -42946,7 +42946,7 @@ _0802758E: movs r2, #0 lsls r0, r1, #0x10 asrs r0, r0, #0x10 - ldr r5, _0802769C @ =0x03005C00 + ldr r5, _0802769C @ =gUnknown_03005C00 mov r8, r5 cmp r2, r0 bgt _080275F0 @@ -43000,7 +43000,7 @@ _08027600: movs r2, #0 lsls r0, r0, #0x10 asrs r0, r0, #0x10 - ldr r3, _0802769C @ =0x03005C00 + ldr r3, _0802769C @ =gUnknown_03005C00 mov r8, r3 cmp r2, r0 bgt _08027654 @@ -43070,7 +43070,7 @@ _0802768C: .4byte gUnknown_020314E0 _08027690: .4byte 0x000006C4 _08027694: .4byte 0x004C4B40 _08027698: .4byte gMain -_0802769C: .4byte 0x03005C00 +_0802769C: .4byte gUnknown_03005C00 _080276A0: .4byte 0x040000D4 _080276A4: .4byte 0x06002000 _080276A8: .4byte 0x80000400 @@ -52096,7 +52096,7 @@ _0802C0A6: movs r1, #0 lsls r0, r5, #0x10 asrs r0, r0, #0x10 - ldr r2, _0802C21C @ =0x03005C00 + ldr r2, _0802C21C @ =gUnknown_03005C00 mov r8, r2 cmp r1, r0 bgt _0802C10C @@ -52154,7 +52154,7 @@ _0802C11C: movs r1, #0 lsls r0, r0, #0x10 asrs r0, r0, #0x10 - ldr r2, _0802C21C @ =0x03005C00 + ldr r2, _0802C21C @ =gUnknown_03005C00 mov r8, r2 cmp r1, r0 bgt _0802C176 @@ -52271,7 +52271,7 @@ _0802C20C: .4byte 0x0000132C _0802C210: .4byte 0x000005A6 _0802C214: .4byte gMain _0802C218: .4byte 0x000006C4 -_0802C21C: .4byte 0x03005C00 +_0802C21C: .4byte gUnknown_03005C00 _0802C220: .4byte 0x040000D4 _0802C224: .4byte 0x06002000 _0802C228: .4byte 0x80000400 @@ -54384,7 +54384,7 @@ _0802D2D0: movs r3, #0 lsrs r5, r0, #0x10 asrs r0, r0, #0x10 - ldr r4, _0802D394 @ =0x03005C00 + ldr r4, _0802D394 @ =gUnknown_03005C00 mov sb, r4 cmp r3, r0 bgt _0802D320 @@ -54464,7 +54464,7 @@ _0802D384: .4byte gUnknown_0815A6A4 _0802D388: .4byte 0x050003C0 _0802D38C: .4byte 0x80000010 _0802D390: .4byte gMain -_0802D394: .4byte 0x03005C00 +_0802D394: .4byte gUnknown_03005C00 _0802D398: .4byte 0x06002000 _0802D39C: .4byte 0x80000400 _0802D3A0: @@ -54473,7 +54473,7 @@ _0802D3A0: cmp r3, r0 bhi _0802D3F6 movs r3, #0 - ldr r4, _0802D484 @ =0x03005C00 + ldr r4, _0802D484 @ =gUnknown_03005C00 mov sb, r4 mov r5, sb movs r4, #0xc1 @@ -54587,7 +54587,7 @@ _0802D428: ble _0802D428 b _0802D53E .align 2, 0 -_0802D484: .4byte 0x03005C00 +_0802D484: .4byte gUnknown_03005C00 _0802D488: .4byte 0x040000D4 _0802D48C: .4byte 0x06002000 _0802D490: .4byte 0x80000400 @@ -55687,7 +55687,7 @@ _0802DD32: bne _0802DD84 movs r1, #0xf0 lsls r1, r1, #0x11 - ldr r4, _0802DE1C @ =0x03005C00 + ldr r4, _0802DE1C @ =gUnknown_03005C00 mov sb, r4 ldr r3, _0802DE14 @ =0x000001FF ldr r2, _0802DE20 @ =0x0000033F @@ -55792,7 +55792,7 @@ _0802DE0C: .4byte gUnknown_086B4112 _0802DE10: .4byte 0xFFFFFE00 _0802DE14: .4byte 0x000001FF _0802DE18: .4byte gUnknown_020314E0 -_0802DE1C: .4byte 0x03005C00 +_0802DE1C: .4byte gUnknown_03005C00 _0802DE20: .4byte 0x0000033F _0802DE24: .4byte 0x040000D4 _0802DE28: .4byte 0x06002000 diff --git a/asm/rom_3219C.s b/asm/rom_3219C.s index 7e6322c..7bf28fc 100755 --- a/asm/rom_3219C.s +++ b/asm/rom_3219C.s @@ -10048,7 +10048,7 @@ _080375AE: asrs r1, r0, #0x10 cmp r2, r1 bge _0803763A - ldr r0, _08037818 @ =0x03006400 + ldr r0, _08037818 @ =gUnknown_03006400 ldr r3, _0803781C @ =0xFFFFF800 adds r7, r0, r3 movs r6, #0x80 @@ -10080,7 +10080,7 @@ _0803763A: ldr r2, _08037820 @ =0x0000027F cmp r0, r2 bgt _08037662 - ldr r5, _08037824 @ =0x03005C00 + ldr r5, _08037824 @ =gUnknown_03005C00 movs r4, #0x80 lsls r4, r4, #3 ldr r3, _08037828 @ =0x000003FF @@ -10117,7 +10117,7 @@ _08037662: mov sb, r1 ldr r0, [sp] lsls r1, r0, #0x10 - ldr r2, _08037824 @ =0x03005C00 + ldr r2, _08037824 @ =gUnknown_03005C00 mov r8, r2 ldr r0, _08037830 @ =gUnknown_08327994 mov ip, r0 @@ -10173,7 +10173,7 @@ _080376F0: asrs r0, r0, #0x10 cmp r2, r0 bge _08037726 - ldr r7, _08037824 @ =0x03005C00 + ldr r7, _08037824 @ =gUnknown_03005C00 ldr r6, _08037834 @ =0x000004C3 ldr r5, _08037830 @ =gUnknown_08327994 movs r4, #0xbb @@ -10208,7 +10208,7 @@ _08037726: movs r3, #0 ldr r0, [sp] lsls r1, r0, #0x10 - ldr r2, _08037824 @ =0x03005C00 + ldr r2, _08037824 @ =gUnknown_03005C00 mov ip, r2 ldr r0, _08037830 @ =gUnknown_08327994 mov r8, r0 @@ -10271,7 +10271,7 @@ _080377AC: asrs r0, r0, #0x10 cmp r2, r0 bge _080377E2 - ldr r7, _08037824 @ =0x03005C00 + ldr r7, _08037824 @ =gUnknown_03005C00 ldr r6, _08037840 @ =0x000005F7 ldr r5, _08037830 @ =gUnknown_08327994 movs r4, #0xbb @@ -10296,7 +10296,7 @@ _080377C2: blt _080377C2 _080377E2: ldr r1, _08037844 @ =0x040000D4 - ldr r3, _08037818 @ =0x03006400 + ldr r3, _08037818 @ =gUnknown_03006400 str r3, [r1] ldr r0, _08037848 @ =0x06001000 str r0, [r1, #4] @@ -10317,10 +10317,10 @@ _08037808: .4byte gMain _0803780C: .4byte 0x0000040E _08037810: .4byte gUnknown_086AEA60 _08037814: .4byte gUnknown_086AEA50 -_08037818: .4byte 0x03006400 +_08037818: .4byte gUnknown_03006400 _0803781C: .4byte 0xFFFFF800 _08037820: .4byte 0x0000027F -_08037824: .4byte 0x03005C00 +_08037824: .4byte gUnknown_03005C00 _08037828: .4byte 0x000003FF _0803782C: .4byte 0xFFF60000 _08037830: .4byte gUnknown_08327994 @@ -16970,7 +16970,7 @@ _0803AED2: lsls r0, r0, #1 adds r0, r0, r4 movs r2, #0 - ldr r3, _0803B0D4 @ =0x03006C00 + ldr r3, _0803B0D4 @ =gUnknown_03006C00 mov r8, r3 ldr r1, _0803B0D8 @ =gUnknown_086AEEDE mov sl, r1 @@ -17210,7 +17210,7 @@ _0803B0C4: .4byte gUnknown_086AEEE6 _0803B0C8: .4byte gUnknown_020314E0 _0803B0CC: .4byte 0x0000044C _0803B0D0: .4byte gUnknown_086AEED6 -_0803B0D4: .4byte 0x03006C00 +_0803B0D4: .4byte gUnknown_03006C00 _0803B0D8: .4byte gUnknown_086AEEDE _0803B0DC: .4byte 0xFFFFF000 _0803B0E0: .4byte gUnknown_08333004 @@ -32894,7 +32894,7 @@ _08042FB4: bl sub_44D58 bl sub_45E08 movs r5, #0 - ldr r6, _080431DC @ =0x03005C00 + ldr r6, _080431DC @ =gUnknown_03005C00 movs r4, #0x80 lsls r4, r4, #3 movs r3, #0x80 @@ -32914,7 +32914,7 @@ _080430C2: cmp r1, r2 ble _080430C2 ldr r1, _080431E4 @ =0x040000D4 - ldr r2, _080431E8 @ =0x03006400 + ldr r2, _080431E8 @ =gUnknown_03006400 str r2, [r1] ldr r0, _080431EC @ =0x06001000 str r0, [r1, #4] @@ -33028,10 +33028,10 @@ _080431CC: .4byte 0x0000052C _080431D0: .4byte 0x0000052E _080431D4: .4byte 0x0000054B _080431D8: .4byte 0x0000057A -_080431DC: .4byte 0x03005C00 +_080431DC: .4byte gUnknown_03005C00 _080431E0: .4byte 0x000007FF _080431E4: .4byte 0x040000D4 -_080431E8: .4byte 0x03006400 +_080431E8: .4byte gUnknown_03006400 _080431EC: .4byte 0x06001000 _080431F0: .4byte 0x80000800 _080431F4: .4byte 0x00001C42 @@ -38451,7 +38451,7 @@ sub_45E08: @ 0x08045E08 adds r0, r0, r4 movs r2, #0x80 lsls r2, r2, #0x11 - ldr r1, _08045E78 @ =0x03006C00 + ldr r1, _08045E78 @ =gUnknown_03006C00 mov ip, r1 ldr r7, _08045E7C @ =0xFFFFF000 add r7, ip @@ -38492,7 +38492,7 @@ _08045E3A: .align 2, 0 _08045E70: .4byte gUnknown_086AEED6 _08045E74: .4byte gMain -_08045E78: .4byte 0x03006C00 +_08045E78: .4byte gUnknown_03006C00 _08045E7C: .4byte 0xFFFFF000 _08045E80: .4byte gUnknown_0837A4E8 _08045E84: .4byte 0x000003FF @@ -40594,7 +40594,7 @@ _0804710C: .4byte gUnknown_020314E0 sub_47110: @ 0x08047110 push {r4, r5, lr} movs r0, #0 - ldr r5, _08047148 @ =0x03005C00 + ldr r5, _08047148 @ =gUnknown_03005C00 adds r4, r5, #0 ldr r3, _0804714C @ =0x000001FF ldr r2, _08047150 @ =0x000007FF @@ -40621,7 +40621,7 @@ _0804711C: pop {r0} bx r0 .align 2, 0 -_08047148: .4byte 0x03005C00 +_08047148: .4byte gUnknown_03005C00 _0804714C: .4byte 0x000001FF _08047150: .4byte 0x000007FF _08047154: .4byte 0x040000D4 @@ -40897,7 +40897,7 @@ sub_47344: @ 0x08047344 adds r7, #0x39 add r0, sp, #0x38 mov r8, r0 - ldr r0, _08047450 @ =0x03005C00 + ldr r0, _08047450 @ =gUnknown_03005C00 movs r3, #0 movs r2, #0xd0 lsls r2, r2, #3 @@ -41001,7 +41001,7 @@ _08047432: .align 2, 0 _08047448: .4byte gUnknown_08137DBE _0804744C: .4byte gUnknown_08137DE8 -_08047450: .4byte 0x03005C00 +_08047450: .4byte gUnknown_03005C00 _08047454: .4byte gUnknown_020314E0 _08047458: .4byte 0x0000132C _0804745C: .4byte gMain @@ -41030,7 +41030,7 @@ _08047482: movs r2, #0 bl sub_678 _08047490: - ldr r4, _080474E4 @ =0x03005C00 + ldr r4, _080474E4 @ =gUnknown_03005C00 ldr r5, _080474E0 @ =gMain movs r2, #0xc1 lsls r2, r2, #8 @@ -41071,7 +41071,7 @@ _080474CC: .align 2, 0 _080474DC: .4byte gUnknown_08137E00 _080474E0: .4byte gMain -_080474E4: .4byte 0x03005C00 +_080474E4: .4byte gUnknown_03005C00 _080474E8: .4byte 0x040000D4 _080474EC: .4byte 0x06002000 _080474F0: .4byte 0x80000400 @@ -42413,7 +42413,7 @@ _08047FB8: .4byte 0x000005F7 thumb_func_start sub_47FBC sub_47FBC: @ 0x08047FBC - ldr r3, _08047FE4 @ =0x03005C00 + ldr r3, _08047FE4 @ =gUnknown_03005C00 ldr r2, _08047FE8 @ =0x000001FF movs r0, #0xd0 lsls r0, r0, #3 @@ -42434,7 +42434,7 @@ _08047FC8: ldr r0, [r1, #8] bx lr .align 2, 0 -_08047FE4: .4byte 0x03005C00 +_08047FE4: .4byte gUnknown_03005C00 _08047FE8: .4byte 0x000001FF _08047FEC: .4byte 0x040000D4 _08047FF0: .4byte 0x06002000 @@ -48067,7 +48067,7 @@ _0804ADDE: cmp r0, #0 beq _0804AE38 movs r4, #0 - ldr r7, _0804AE28 @ =0x03006280 + ldr r7, _0804AE28 @ =gUnknown_03006280 ldr r0, _0804AE2C @ =0xFFFFF980 adds r6, r7, r0 ldr r5, _0804AE30 @ =0x0000034A @@ -48092,13 +48092,13 @@ _0804ADFE: _0804AE1C: .4byte gUnknown_020314E0 _0804AE20: .4byte gUnknown_020028D8 _0804AE24: .4byte gMain -_0804AE28: .4byte 0x03006280 +_0804AE28: .4byte gUnknown_03006280 _0804AE2C: .4byte 0xFFFFF980 _0804AE30: .4byte 0x0000034A _0804AE34: .4byte 0xFFFFC156 _0804AE38: movs r4, #0 - ldr r7, _0804AE70 @ =0x03006280 + ldr r7, _0804AE70 @ =gUnknown_03006280 ldr r0, _0804AE74 @ =0xFFFFF980 adds r5, r7, r0 ldr r3, _0804AE78 @ =0x0000034A @@ -48128,7 +48128,7 @@ _0804AE5C: pop {r0} bx r0 .align 2, 0 -_0804AE70: .4byte 0x03006280 +_0804AE70: .4byte gUnknown_03006280 _0804AE74: .4byte 0xFFFFF980 _0804AE78: .4byte 0x0000034A _0804AE7C: .4byte 0x000001FF @@ -48483,7 +48483,7 @@ _0804B15A: cmp r0, #0 beq _0804B1B8 movs r4, #0 - ldr r7, _0804B1A8 @ =0x03006240 + ldr r7, _0804B1A8 @ =gUnknown_03006240 ldr r0, _0804B1AC @ =0xFFFFF9C0 adds r6, r7, r0 ldr r5, _0804B1B0 @ =0x0000032B @@ -48510,13 +48510,13 @@ _0804B198: .4byte 0x0000132C _0804B19C: .4byte 0x00001334 _0804B1A0: .4byte gUnknown_020028D8 _0804B1A4: .4byte gMain -_0804B1A8: .4byte 0x03006240 +_0804B1A8: .4byte gUnknown_03006240 _0804B1AC: .4byte 0xFFFFF9C0 _0804B1B0: .4byte 0x0000032B _0804B1B4: .4byte 0xFFFFC156 _0804B1B8: movs r4, #0 - ldr r7, _0804B1F0 @ =0x03006240 + ldr r7, _0804B1F0 @ =gUnknown_03006240 ldr r3, _0804B1F4 @ =0xFFFFF9C0 adds r5, r7, r3 ldr r3, _0804B1F8 @ =0x0000032B @@ -48546,7 +48546,7 @@ _0804B1DC: pop {r0} bx r0 .align 2, 0 -_0804B1F0: .4byte 0x03006240 +_0804B1F0: .4byte gUnknown_03006240 _0804B1F4: .4byte 0xFFFFF9C0 _0804B1F8: .4byte 0x0000032B _0804B1FC: .4byte 0x000001FF @@ -49419,7 +49419,7 @@ _0804B902: ldr r4, _0804B958 @ =gUnknown_020314E0 mov sl, r4 adds r7, r0, #0 - ldr r5, _0804B964 @ =0x03005C00 + ldr r5, _0804B964 @ =gUnknown_03005C00 mov sb, r5 cmp r1, #1 bhi _0804B9A0 @@ -49460,7 +49460,7 @@ _0804B918: _0804B958: .4byte gUnknown_020314E0 _0804B95C: .4byte gMain _0804B960: .4byte 0x0000029E -_0804B964: .4byte 0x03005C00 +_0804B964: .4byte gUnknown_03005C00 _0804B968: .4byte 0x040000D4 _0804B96C: .4byte gUnknown_0200FBB0 _0804B970: .4byte 0x06008000 @@ -49490,7 +49490,7 @@ _0804B988: ble _0804B918 _0804B9A0: movs r5, #0 - ldr r4, _0804BA44 @ =0x03005C00 + ldr r4, _0804BA44 @ =gUnknown_03005C00 ldr r3, _0804BA48 @ =0x000001FF ldr r2, _0804BA4C @ =0x000007FF _0804B9A8: @@ -49571,7 +49571,7 @@ _0804B9FC: _0804BA38: .4byte gUnknown_020030A0 _0804BA3C: .4byte 0x06008000 _0804BA40: .4byte 0x80000200 -_0804BA44: .4byte 0x03005C00 +_0804BA44: .4byte gUnknown_03005C00 _0804BA48: .4byte 0x000001FF _0804BA4C: .4byte 0x000007FF _0804BA50: .4byte 0x040000D4 @@ -51744,7 +51744,7 @@ sub_4CD60: @ 0x0804CD60 mov r6, r8 push {r6, r7} movs r2, #0 - ldr r3, _0804CE5C @ =0x03006400 + ldr r3, _0804CE5C @ =gUnknown_03006400 ldr r6, _0804CE60 @ =gMain movs r0, #0x80 lsls r0, r0, #4 @@ -51870,7 +51870,7 @@ _0804CE28: pop {r0} bx r0 .align 2, 0 -_0804CE5C: .4byte 0x03006400 +_0804CE5C: .4byte gUnknown_03006400 _0804CE60: .4byte gMain _0804CE64: .4byte gUnknown_084B77EC _0804CE68: .4byte 0xFFFFF800 @@ -52121,7 +52121,7 @@ _0804CF9C: adds r0, #5 strh r0, [r4, #0x16] movs r3, #0 - ldr r1, _0804D304 @ =0x03005C00 + ldr r1, _0804D304 @ =gUnknown_03005C00 mov sl, r1 movs r4, #0x1e _0804D09C: @@ -52150,7 +52150,7 @@ _0804D0C0: asrs r0, r3, #0x10 cmp r0, #0xb bgt _0804D10A - ldr r5, _0804D304 @ =0x03005C00 + ldr r5, _0804D304 @ =gUnknown_03005C00 asrs r6, r1, #0x10 _0804D0CE: asrs r3, r3, #0x10 @@ -52428,7 +52428,7 @@ _0804D2F4: .4byte 0x00002710 _0804D2F8: .4byte 0x00989680 _0804D2FC: .4byte 0x000F4240 _0804D300: .4byte 0x000186A0 -_0804D304: .4byte 0x03005C00 +_0804D304: .4byte gUnknown_03005C00 _0804D308: .4byte 0x000007C1 _0804D30C: .4byte 0xFFFFC160 _0804D310: .4byte 0x000007E1 @@ -52483,7 +52483,7 @@ _0804D384: strh r0, [r1] _0804D394: ldr r1, _0804D3C0 @ =0x040000D4 - ldr r0, _0804D3C4 @ =0x03006B80 + ldr r0, _0804D3C4 @ =gUnknown_03006B80 str r0, [r1] ldr r0, _0804D3C8 @ =0x06002F80 str r0, [r1, #4] @@ -52503,7 +52503,7 @@ _0804D3B4: .4byte 0x00000FBA _0804D3B8: .4byte 0x0000C19E _0804D3BC: .4byte 0x00000FFA _0804D3C0: .4byte 0x040000D4 -_0804D3C4: .4byte 0x03006B80 +_0804D3C4: .4byte gUnknown_03006B80 _0804D3C8: .4byte 0x06002F80 _0804D3CC: .4byte 0x80000040 @@ -52588,7 +52588,7 @@ _0804D40E: cmp r0, #3 bne _0804D4F4 movs r1, #0 - ldr r6, _0804D4D4 @ =0x03005EC0 + ldr r6, _0804D4D4 @ =gUnknown_03005EC0 ldr r5, _0804D4D8 @ =0xFFFFFD40 adds r3, r6, r5 ldr r5, _0804D4DC @ =0x00000179 @@ -52635,7 +52635,7 @@ _0804D47E: _0804D4C8: .4byte gUnknown_020314E0 _0804D4CC: .4byte 0x00000296 _0804D4D0: .4byte gMain -_0804D4D4: .4byte 0x03005EC0 +_0804D4D4: .4byte gUnknown_03005EC0 _0804D4D8: .4byte 0xFFFFFD40 _0804D4DC: .4byte 0x00000179 _0804D4E0: .4byte 0x000001FF @@ -52651,7 +52651,7 @@ _0804D4F4: b _0804D542 _0804D500: movs r1, #0 - ldr r4, _0804D578 @ =0x03005C00 + ldr r4, _0804D578 @ =gUnknown_03005C00 _0804D504: lsls r2, r1, #0x10 asrs r2, r2, #0x10 @@ -52686,7 +52686,7 @@ _0804D504: ble _0804D504 _0804D542: ldr r1, _0804D58C @ =0x040000D4 - ldr r0, _0804D590 @ =0x03005EC0 + ldr r0, _0804D590 @ =gUnknown_03005EC0 str r0, [r1] ldr r0, _0804D594 @ =0x060022C0 str r0, [r1, #4] @@ -52714,13 +52714,13 @@ _0804D556: ldr r0, _0804D5A4 @ =gUnknown_086B0884 b _0804D5AC .align 2, 0 -_0804D578: .4byte 0x03005C00 +_0804D578: .4byte gUnknown_03005C00 _0804D57C: .4byte 0x00000179 _0804D580: .4byte 0xFFFFC140 _0804D584: .4byte 0x00000199 _0804D588: .4byte 0xFFFFC141 _0804D58C: .4byte 0x040000D4 -_0804D590: .4byte 0x03005EC0 +_0804D590: .4byte gUnknown_03005EC0 _0804D594: .4byte 0x060022C0 _0804D598: .4byte 0x80000040 _0804D59C: .4byte gUnknown_020314E0 @@ -52813,7 +52813,7 @@ sub_4D648: @ 0x0804D648 ldr r2, _0804D6A4 @ =0x00000296 adds r0, r0, r2 strh r1, [r0] - ldr r6, _0804D6A8 @ =0x03005EC0 + ldr r6, _0804D6A8 @ =gUnknown_03005EC0 ldr r0, _0804D6AC @ =0xFFFFFD40 adds r3, r6, r0 ldr r5, _0804D6B0 @ =0x00000179 @@ -52849,7 +52849,7 @@ _0804D66C: .align 2, 0 _0804D6A0: .4byte gUnknown_020314E0 _0804D6A4: .4byte 0x00000296 -_0804D6A8: .4byte 0x03005EC0 +_0804D6A8: .4byte gUnknown_03005EC0 _0804D6AC: .4byte 0xFFFFFD40 _0804D6B0: .4byte 0x00000179 _0804D6B4: .4byte 0x00000199 diff --git a/asm/rom_9BC.s b/asm/rom_9BC.s index edc9a10..d351e33 100755 --- a/asm/rom_9BC.s +++ b/asm/rom_9BC.s @@ -814,7 +814,7 @@ sub_1A78: @ 0x08001A78 ldr r3, _08001A98 @ =0x04000208 movs r0, #0 strh r0, [r3] - ldr r2, _08001A9C @ =0x03007FF8 + ldr r2, _08001A9C @ =gUnknown_03007FF8 ldrh r0, [r2] movs r1, #1 orrs r0, r1 @@ -824,7 +824,7 @@ sub_1A78: @ 0x08001A78 bx r0 .align 2, 0 _08001A98: .4byte 0x04000208 -_08001A9C: .4byte 0x03007FF8 +_08001A9C: .4byte gUnknown_03007FF8 thumb_func_start nullsub_15 nullsub_15: @ 0x08001AA0 diff --git a/ld_script.txt b/ld_script.txt index c1c495d..b5a1049 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -75,4 +75,5 @@ SECTIONS } INCLUDE ../../undefined_ewram.txt +INCLUDE ../../undefined_iwram.txt INCLUDE ../../undefined_rom.txt diff --git a/undefined_iwram.txt b/undefined_iwram.txt new file mode 100644 index 0000000..f379272 --- /dev/null +++ b/undefined_iwram.txt @@ -0,0 +1,11 @@ +gUnknown_03000000 = 0x03000000; +gUnknown_03001800 = 0x03001800; +gUnknown_03002300 = 0x03002300; +gUnknown_03005C00 = 0x03005C00; +gUnknown_03005EC0 = 0x03005EC0; +gUnknown_03006240 = 0x03006240; +gUnknown_03006280 = 0x03006280; +gUnknown_03006400 = 0x03006400; +gUnknown_03006B80 = 0x03006B80; +gUnknown_03006C00 = 0x03006C00; +gUnknown_03007FF8 = 0x03007FF8; |