diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-12-02 10:09:01 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-12-02 10:11:51 -0500 |
commit | 993df493cd566fb086960ffd763965e130e0a8b9 (patch) | |
tree | fb83123feb68199d68e2b46138aaf2987537d19d | |
parent | 884f1934e8bf34813701f745140f1d8429e8beaf (diff) |
use the .pool directive for mevent_8145654.s
-rw-r--r-- | asm/mevent_8145654.s | 400 |
1 files changed, 154 insertions, 246 deletions
diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 51e90677a..00676462f 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -9,15 +9,14 @@ sub_814571C: @ 814571C push {r4-r6,lr} sub sp, 0x24 - ldr r5, _08145730 @ =gUnknown_203F3C8 + ldr r5, =gUnknown_203F3C8 ldr r0, [r5] cmp r0, 0 bne _08145734 movs r0, 0x1 negs r0, r0 b _08145930 - .align 2, 0 -_08145730: .4byte gUnknown_203F3C8 + .pool _08145734: movs r4, 0xBA lsls r4, 1 @@ -28,12 +27,11 @@ _08145734: b _08145908 _08145742: lsls r0, 2 - ldr r1, _0814574C @ =_08145750 + ldr r1, =_08145750 adds r0, r1 ldr r0, [r0] mov pc, r0 - .align 2, 0 -_0814574C: .4byte _08145750 + .pool .align 2, 0 _08145750: .4byte _08145770 @@ -91,7 +89,7 @@ _08145790: bl CopyBgTilemapBufferToVram movs r0, 0x2 bl CopyBgTilemapBufferToVram - ldr r5, _0814582C @ =gUnknown_203F3C8 + ldr r5, =gUnknown_203F3C8 ldr r0, [r5] movs r1, 0xB8 lsls r1, 1 @@ -104,7 +102,7 @@ _08145790: movs r2, 0 movs r3, 0x8 bl decompress_and_copy_tile_data_to_vram - ldr r4, _08145830 @ =gUnknown_8467074 + ldr r4, =gUnknown_8467074 adds r0, r4, 0 bl AddWindow ldr r1, [r5] @@ -129,21 +127,19 @@ _08145790: adds r1, r2 strh r0, [r1] b _0814591E - .align 2, 0 -_0814582C: .4byte gUnknown_203F3C8 -_08145830: .4byte gUnknown_8467074 + .pool _08145834: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 bne _0814592E - ldr r2, _081458A0 @ =gPaletteFade + ldr r2, =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r5, _081458A4 @ =gUnknown_203F3C8 + ldr r5, =gUnknown_203F3C8 ldr r0, [r5] movs r4, 0xB8 lsls r4, 1 @@ -157,7 +153,7 @@ _08145834: adds r4, r1, r4 ldr r0, [r4] ldr r0, [r0, 0x8] - ldr r4, _081458A8 @ =0x0000045c + ldr r4, =0x0000045c adds r1, r4 bl LZ77UnCompWram ldr r1, [r5] @@ -182,10 +178,7 @@ _08145834: movs r0, 0x2 bl CopyBgTilemapBufferToVram b _0814591E - .align 2, 0 -_081458A0: .4byte gPaletteFade -_081458A4: .4byte gUnknown_203F3C8 -_081458A8: .4byte 0x0000045c + .pool _081458AC: bl sub_8145A98 b _0814591E @@ -207,7 +200,7 @@ _081458D2: bl ShowBg movs r0, 0x2 bl ShowBg - ldr r2, _08145904 @ =gPaletteFade + ldr r2, =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -222,8 +215,7 @@ _081458D2: bl BeginNormalPaletteFade bl UpdatePaletteFade b _0814591E - .align 2, 0 -_08145904: .4byte gPaletteFade + .pool _08145908: bl UpdatePaletteFade lsls r0, 24 @@ -236,7 +228,7 @@ _08145908: movs r0, 0x1 b _08145930 _0814591E: - ldr r0, _08145938 @ =gUnknown_203F3C8 + ldr r0, =gUnknown_203F3C8 ldr r1, [r0] movs r0, 0xBA lsls r0, 1 @@ -251,8 +243,7 @@ _08145930: pop {r4-r6} pop {r1} bx r1 - .align 2, 0 -_08145938: .4byte gUnknown_203F3C8 + .pool thumb_func_end sub_814571C thumb_func_start sub_814593C @@ -260,15 +251,14 @@ sub_814593C: @ 814593C push {r4,r5,lr} sub sp, 0x8 adds r2, r0, 0 - ldr r5, _08145950 @ =gUnknown_203F3C8 + ldr r5, =gUnknown_203F3C8 ldr r0, [r5] cmp r0, 0 bne _08145954 movs r0, 0x1 negs r0, r0 b _08145A8C - .align 2, 0 -_08145950: .4byte gUnknown_203F3C8 + .pool _08145954: movs r4, 0xBA lsls r4, 1 @@ -279,12 +269,11 @@ _08145954: b _08145A64 _08145962: lsls r0, 2 - ldr r1, _0814596C @ =_08145970 + ldr r1, =_08145970 adds r0, r1 ldr r0, [r0] mov pc, r0 - .align 2, 0 -_0814596C: .4byte _08145970 + .pool .align 2, 0 _08145970: .4byte _0814598C @@ -345,7 +334,7 @@ _081459F2: bl HideBg movs r0, 0x2 bl HideBg - ldr r4, _08145A2C @ =gUnknown_203F3C8 + ldr r4, =gUnknown_203F3C8 ldr r0, [r4] movs r1, 0xBD lsls r1, 1 @@ -365,20 +354,18 @@ _081459F2: ldrb r0, [r0] bl RemoveWindow b _08145A7A - .align 2, 0 -_08145A2C: .4byte gUnknown_203F3C8 + .pool _08145A30: bl sub_81461D8 bl FreeMonIconPalettes b _08145A7A _08145A3A: - ldr r0, _08145A48 @ =gUnknown_203F3B8 + ldr r0, =gUnknown_203F3B8 ldrb r0, [r0] adds r1, r2, 0 bl sub_8142344 b _08145A7A - .align 2, 0 -_08145A48: .4byte gUnknown_203F3B8 + .pool _08145A4C: movs r0, 0 bl CopyBgTilemapBufferToVram @@ -402,7 +389,7 @@ _08145A64: movs r0, 0x1 b _08145A8C _08145A7A: - ldr r0, _08145A94 @ =gUnknown_203F3C8 + ldr r0, =gUnknown_203F3C8 ldr r1, [r0] movs r0, 0xBA lsls r0, 1 @@ -417,8 +404,7 @@ _08145A8C: pop {r4,r5} pop {r1} bx r1 - .align 2, 0 -_08145A94: .4byte gUnknown_203F3C8 + .pool thumb_func_end sub_814593C thumb_func_start sub_8145A98 @@ -434,15 +420,15 @@ sub_8145A98: @ 8145A98 movs r1, 0 movs r2, 0x6 bl memset - ldr r4, _08145B7C @ =gUnknown_203F3C8 + ldr r4, =gUnknown_203F3C8 ldr r1, [r4] - ldr r2, _08145B80 @ =0x0000018b + ldr r2, =0x0000018b adds r0, r1, r2 adds r1, 0xA movs r2, 0x28 bl memcpy ldr r0, [r4] - ldr r3, _08145B84 @ =0x000001b3 + ldr r3, =0x000001b3 adds r1, r0, r3 movs r0, 0xFF strb r0, [r1] @@ -462,13 +448,13 @@ sub_8145A98: @ 8145A98 strb r1, [r0] ldr r1, [r4] ldr r0, [r1, 0x4] - ldr r2, _08145B88 @ =0x000f423f + ldr r2, =0x000f423f cmp r0, r2 bls _08145AF4 str r2, [r1, 0x4] _08145AF4: ldr r1, [r4] - ldr r2, _08145B8C @ =0x000001dd + ldr r2, =0x000001dd adds r0, r1, r2 ldr r1, [r1, 0x4] movs r2, 0 @@ -504,7 +490,7 @@ _08145B06: lsrs r5, r0, 16 cmp r5, 0x3 bls _08145B06 - ldr r6, _08145B7C @ =gUnknown_203F3C8 + ldr r6, =gUnknown_203F3C8 ldr r1, [r6] movs r3, 0xA2 lsls r3, 2 @@ -532,18 +518,13 @@ _08145B06: cmp r0, 0 beq _08145B96 b _08145D08 - .align 2, 0 -_08145B7C: .4byte gUnknown_203F3C8 -_08145B80: .4byte 0x0000018b -_08145B84: .4byte 0x000001b3 -_08145B88: .4byte 0x000f423f -_08145B8C: .4byte 0x000001dd + .pool _08145B90: cmp r0, 0x2 beq _08145BC8 b _08145D08 _08145B96: - ldr r2, _08145BB0 @ =0x000002b1 + ldr r2, =0x000002b1 adds r0, r1, r2 movs r3, 0x91 lsls r3, 1 @@ -551,24 +532,21 @@ _08145B96: movs r2, 0x28 bl memcpy ldr r1, [r6] - ldr r0, _08145BB4 @ =0x000002d9 + ldr r0, =0x000002d9 adds r1, r0 b _08145BBC - .align 2, 0 -_08145BB0: .4byte 0x000002b1 -_08145BB4: .4byte 0x000002d9 + .pool _08145BB8: - ldr r2, _08145BC4 @ =0x000002b1 + ldr r2, =0x000002b1 adds r1, r2 _08145BBC: ldrb r0, [r1] orrs r0, r4 strb r0, [r1] b _08145D08 - .align 2, 0 -_08145BC4: .4byte 0x000002b1 + .pool _08145BC8: - ldr r3, _08145C84 @ =0x000002b1 + ldr r3, =0x000002b1 adds r0, r1, r3 ldrb r1, [r0] orrs r1, r7 @@ -579,7 +557,7 @@ _08145BC8: lsls r4, 1 adds r0, r1, r4 ldrh r0, [r0] - ldr r2, _08145C88 @ =0x000003e7 + ldr r2, =0x000003e7 cmp r0, r2 bls _08145BE6 adds r0, r2, 0 @@ -632,12 +610,12 @@ _08145C0E: bls _08145C0E movs r5, 0 movs r6, 0 - ldr r1, _08145C8C @ =gUnknown_203F3C8 + ldr r1, =gUnknown_203F3C8 mov r8, r1 movs r2, 0x91 lsls r2, 1 mov r10, r2 - ldr r7, _08145C90 @ =0x00000175 + ldr r7, =0x00000175 movs r3, 0xB7 lsls r3, 2 mov r9, r3 @@ -650,14 +628,14 @@ _08145C56: ldrb r3, [r0] cmp r3, 0xF7 beq _08145C98 - ldr r1, _08145C90 @ =0x00000175 + ldr r1, =0x00000175 adds r0, r2, r1 ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 lsls r0, 4 adds r0, r6, r0 - ldr r4, _08145C94 @ =0x000002dd + ldr r4, =0x000002dd adds r1, r2, r4 adds r1, r0 strb r3, [r1] @@ -665,12 +643,7 @@ _08145C56: lsls r0, 16 lsrs r6, r0, 16 b _08145CFE - .align 2, 0 -_08145C84: .4byte 0x000002b1 -_08145C88: .4byte 0x000003e7 -_08145C8C: .4byte gUnknown_203F3C8 -_08145C90: .4byte 0x00000175 -_08145C94: .4byte 0x000002dd + .pool _08145C98: adds r0, r5, 0x1 adds r0, r1, r0 @@ -754,7 +727,7 @@ sub_8145D18: @ 8145D18 mov r8, r4 movs r0, 0 str r0, [sp, 0xC] - ldr r7, _08145D60 @ =gUnknown_203F3C8 + ldr r7, =gUnknown_203F3C8 ldr r0, [r7] lsls r1, r4, 1 movs r2, 0xBB @@ -777,8 +750,7 @@ sub_8145D18: @ 8145D18 beq _08145D70 mov r9, r6 b _08146038 - .align 2, 0 -_08145D60: .4byte gUnknown_203F3C8 + .pool _08145D64: mov r0, r8 cmp r0, 0x2 @@ -799,13 +771,13 @@ _08145D70: lsrs r0, 28 lsls r1, r0, 1 adds r1, r0 - ldr r0, _08145E34 @ =gUnknown_8467068 + ldr r0, =gUnknown_8467068 mov r8, r0 add r1, r8 str r1, [sp] ldr r1, [sp, 0xC] str r1, [sp, 0x4] - ldr r0, _08145E38 @ =0x0000018b + ldr r0, =0x0000018b adds r2, r0 str r2, [sp, 0x8] adds r0, r5, 0 @@ -873,7 +845,7 @@ _08145E06: str r0, [sp] ldr r0, [sp, 0xC] str r0, [sp, 0x4] - ldr r1, _08145E3C @ =0x000001dd + ldr r1, =0x000001dd adds r0, r2, r1 str r0, [sp, 0x8] adds r0, r5, 0 @@ -882,10 +854,7 @@ _08145E06: movs r3, 0x11 bl box_print b _08146038 - .align 2, 0 -_08145E34: .4byte gUnknown_8467068 -_08145E38: .4byte 0x0000018b -_08145E3C: .4byte 0x000001dd + .pool _08145E40: mov r9, r6 _08145E42: @@ -896,7 +865,7 @@ _08145E42: adds r3, 0x2 lsls r3, 24 lsrs r3, 24 - ldr r0, _08145E9C @ =gUnknown_203F3C8 + ldr r0, =gUnknown_203F3C8 ldr r2, [r0] movs r1, 0xB8 lsls r1, 1 @@ -906,7 +875,7 @@ _08145E42: lsrs r0, 4 lsls r1, r0, 1 adds r1, r0 - ldr r0, _08145EA0 @ =gUnknown_8467068 + ldr r0, =gUnknown_8467068 adds r1, r0 str r1, [sp] movs r0, 0 @@ -933,11 +902,9 @@ _08145E42: cmp r4, 0x3 ble _08145E42 b _08146038 - .align 2, 0 -_08145E9C: .4byte gUnknown_203F3C8 -_08145EA0: .4byte gUnknown_8467068 + .pool _08145EA4: - ldr r4, _08145F2C @ =gUnknown_8467070 + ldr r4, =gUnknown_8467070 ldr r2, [r7] ldrb r0, [r2, 0x8] lsls r0, 30 @@ -953,7 +920,7 @@ _08145EA4: lsrs r0, 28 lsls r1, r0, 1 adds r1, r0 - ldr r0, _08145F30 @ =gUnknown_8467068 + ldr r0, =gUnknown_8467068 mov r10, r0 add r1, r10 str r1, [sp] @@ -993,7 +960,7 @@ _08145EA4: str r0, [sp] ldr r0, [sp, 0xC] str r0, [sp, 0x4] - ldr r1, _08145F34 @ =0x000002b1 + ldr r1, =0x000002b1 adds r0, r2, r1 str r0, [sp, 0x8] adds r0, r5, 0 @@ -1002,10 +969,7 @@ _08145EA4: bl box_print mov r9, r6 b _08146038 - .align 2, 0 -_08145F2C: .4byte gUnknown_8467070 -_08145F30: .4byte gUnknown_8467068 -_08145F34: .4byte 0x000002b1 + .pool _08145F38: movs r2, 0 mov r8, r2 @@ -1021,7 +985,7 @@ _08145F38: lsls r0, 24 lsrs r2, r0, 24 ldr r0, [r7] - ldr r1, _08146054 @ =0x00000175 + ldr r1, =0x00000175 adds r0, r1 mov r9, r6 ldr r1, [sp, 0xC] @@ -1047,7 +1011,7 @@ _08145F6E: lsrs r1, 28 lsls r0, r1, 1 adds r0, r1 - ldr r1, _08146058 @ =gUnknown_8467068 + ldr r1, =gUnknown_8467068 adds r0, r1 str r0, [sp] movs r0, 0 @@ -1070,7 +1034,7 @@ _08145F6E: bl box_print ldr r1, [r7] adds r0, r1, r5 - ldr r2, _0814605C @ =0x00000306 + ldr r2, =0x00000306 adds r0, r2 ldrb r0, [r0] cmp r0, 0xFF @@ -1094,7 +1058,7 @@ _08145F6E: lsrs r1, 28 lsls r0, r1, 1 adds r0, r1 - ldr r1, _08146058 @ =gUnknown_8467068 + ldr r1, =gUnknown_8467068 adds r0, r1 str r0, [sp] movs r0, 0 @@ -1127,7 +1091,7 @@ _08146022: str r0, [sp, 0xC] asrs r1, 24 ldr r0, [r7] - ldr r2, _08146054 @ =0x00000175 + ldr r2, =0x00000175 adds r0, r2 ldrb r0, [r0] cmp r1, r0 @@ -1145,10 +1109,7 @@ _08146038: pop {r4-r7} pop {r0} bx r0 - .align 2, 0 -_08146054: .4byte 0x00000175 -_08146058: .4byte gUnknown_8467068 -_0814605C: .4byte 0x00000306 + .pool thumb_func_end sub_8145D18 thumb_func_start sub_8146060 @@ -1160,7 +1121,7 @@ sub_8146060: @ 8146060 push {r5-r7} sub sp, 0x8 movs r7, 0 - ldr r4, _081461BC @ =gUnknown_203F3C8 + ldr r4, =gUnknown_203F3C8 ldr r0, [r4] movs r1, 0xBE lsls r1, 1 @@ -1177,7 +1138,7 @@ sub_8146060: @ 8146060 bl sub_8096FD4 lsls r0, 16 lsrs r0, 16 - ldr r1, _081461C0 @ =SpriteCallbackDummy + ldr r1, =SpriteCallbackDummy str r7, [sp] str r7, [sp, 0x4] movs r2, 0xDC @@ -1188,7 +1149,7 @@ sub_8146060: @ 8146060 lsls r3, 1 adds r1, r3 strb r0, [r1] - ldr r2, _081461C4 @ =gSprites + ldr r2, =gSprites ldr r0, [r4] adds r0, r3 ldrb r1, [r0] @@ -1213,7 +1174,7 @@ _081460C8: ands r0, r1 cmp r0, 0x1 bne _081461AC - ldr r0, _081461C8 @ =gUnknown_8467F58 + ldr r0, =gUnknown_8467F58 bl sub_800F034 ldr r0, [r4] movs r1, 0xB8 @@ -1223,7 +1184,7 @@ _081460C8: ldrb r0, [r0, 0x1] lsrs r0, 4 lsls r0, 3 - ldr r1, _081461CC @ =gUnknown_8467F60 + ldr r1, =gUnknown_8467F60 adds r0, r1 bl LoadSpritePalette ldr r0, [r4] @@ -1231,7 +1192,7 @@ _081460C8: cmp r7, r0 bcs _081461AC adds r6, r4, 0 - ldr r2, _081461D0 @ =0x0000017d + ldr r2, =0x0000017d mov r10, r2 movs r3, 0 mov r9, r3 @@ -1257,7 +1218,7 @@ _0814610E: lsls r1, r7, 5 movs r0, 0xD8 subs r5, r0, r1 - ldr r0, _081461D4 @ =gUnknown_8467FA0 + ldr r0, =gUnknown_8467FA0 adds r1, r5, 0 movs r2, 0x90 movs r3, 0x8 @@ -1280,7 +1241,7 @@ _0814610E: mov r2, r9 str r2, [sp] str r2, [sp, 0x4] - ldr r1, _081461C0 @ =SpriteCallbackDummy + ldr r1, =SpriteCallbackDummy adds r2, r5, 0 movs r3, 0x88 bl sub_8096ECC @@ -1297,7 +1258,7 @@ _0814610E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081461C4 @ =gSprites + ldr r1, =gSprites adds r0, r1 ldrb r2, [r0, 0x5] movs r3, 0xD @@ -1324,21 +1285,14 @@ _081461AC: pop {r4-r7} pop {r0} bx r0 - .align 2, 0 -_081461BC: .4byte gUnknown_203F3C8 -_081461C0: .4byte SpriteCallbackDummy -_081461C4: .4byte gSprites -_081461C8: .4byte gUnknown_8467F58 -_081461CC: .4byte gUnknown_8467F60 -_081461D0: .4byte 0x0000017d -_081461D4: .4byte gUnknown_8467FA0 + .pool thumb_func_end sub_8146060 thumb_func_start sub_81461D8 sub_81461D8: @ 81461D8 push {r4-r7,lr} movs r6, 0 - ldr r4, _0814627C @ =gUnknown_203F3C8 + ldr r4, =gUnknown_203F3C8 ldr r0, [r4] movs r2, 0xBE lsls r2, 1 @@ -1350,7 +1304,7 @@ sub_81461D8: @ 81461D8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08146280 @ =gSprites + ldr r1, =gSprites adds r0, r1 bl sub_8097070 _081461FC: @@ -1369,7 +1323,7 @@ _081461FC: _08146214: ldr r0, [r7] lsls r4, r6, 1 - ldr r1, _08146284 @ =0x0000017d + ldr r1, =0x0000017d adds r0, r1 adds r1, r0, r4 ldrb r0, [r1] @@ -1379,11 +1333,11 @@ _08146214: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _08146280 @ =gSprites + ldr r5, =gSprites adds r0, r5 bl DestroySprite ldr r1, [r7] - ldr r2, _08146284 @ =0x0000017d + ldr r2, =0x0000017d adds r0, r1, r2 adds r0, r4 ldrb r0, [r0] @@ -1417,10 +1371,7 @@ _08146274: pop {r4-r7} pop {r0} bx r0 - .align 2, 0 -_0814627C: .4byte gUnknown_203F3C8 -_08146280: .4byte gSprites -_08146284: .4byte 0x0000017d + .pool thumb_func_end sub_81461D8 thumb_func_start sub_8146288 @@ -1429,8 +1380,8 @@ sub_8146288: @ 8146288 adds r4, r0, 0 cmp r4, 0 beq _0814629E - ldr r5, _081462A4 @ =gUnknown_203F3CC - ldr r0, _081462A8 @ =0x000013a4 + ldr r5, =gUnknown_203F3CC + ldr r0, =0x000013a4 bl AllocZeroed str r0, [r5] cmp r0, 0 @@ -1438,9 +1389,7 @@ sub_8146288: @ 8146288 _0814629E: movs r0, 0 b _081462DC - .align 2, 0 -_081462A4: .4byte gUnknown_203F3CC -_081462A8: .4byte 0x000013a4 + .pool _081462AC: movs r6, 0xDE lsls r6, 1 @@ -1458,10 +1407,10 @@ _081462C4: adds r3, r2, r6 ldrb r0, [r2, 0x3] lsls r0, 4 - ldr r1, _081462E4 @ =gUnknown_8468720 + ldr r1, =gUnknown_8468720 adds r0, r1 str r0, [r3] - ldr r0, _081462E8 @ =0x000001c1 + ldr r0, =0x000001c1 adds r1, r2, r0 movs r0, 0xFF strb r0, [r1] @@ -1470,19 +1419,17 @@ _081462DC: pop {r4-r6} pop {r1} bx r1 - .align 2, 0 -_081462E4: .4byte gUnknown_8468720 -_081462E8: .4byte 0x000001c1 + .pool thumb_func_end sub_8146288 thumb_func_start sub_81462EC sub_81462EC: @ 81462EC push {r4,lr} - ldr r4, _08146310 @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r0, [r4] cmp r0, 0 beq _08146308 - ldr r2, _08146314 @ =0x000013a4 + ldr r2, =0x000013a4 movs r1, 0 bl memset ldr r0, [r4] @@ -1493,9 +1440,7 @@ _08146308: pop {r4} pop {r0} bx r0 - .align 2, 0 -_08146310: .4byte gUnknown_203F3CC -_08146314: .4byte 0x000013a4 + .pool thumb_func_end sub_81462EC thumb_func_start sub_8146318 @@ -1506,15 +1451,14 @@ sub_8146318: @ 8146318 mov r5, r8 push {r5-r7} sub sp, 0x24 - ldr r5, _08146334 @ =gUnknown_203F3CC + ldr r5, =gUnknown_203F3CC ldr r0, [r5] cmp r0, 0 bne _08146338 movs r0, 0x1 negs r0, r0 b _081465EE - .align 2, 0 -_08146334: .4byte gUnknown_203F3CC + .pool _08146338: movs r4, 0xE0 lsls r4, 1 @@ -1526,12 +1470,11 @@ _08146338: b _081465B8 _08146348: lsls r0, 2 - ldr r1, _08146354 @ =_08146358 + ldr r1, =_08146358 adds r0, r1 ldr r0, [r0] mov pc, r0 - .align 2, 0 -_08146354: .4byte _08146358 + .pool .align 2, 0 _08146358: .4byte _08146374 @@ -1576,7 +1519,7 @@ _08146392: movs r0, 0x40 movs r1, 0xF0 bl SetGpuReg - ldr r1, _081463E8 @ =0x00001a98 + ldr r1, =0x00001a98 movs r0, 0x44 bl SetGpuReg movs r0, 0x48 @@ -1590,8 +1533,7 @@ _08146392: movs r0, 0 bl SetGpuRegBits b _081465D2 - .align 2, 0 -_081463E8: .4byte 0x00001a98 + .pool _081463EC: movs r5, 0x1E str r5, [sp] @@ -1631,7 +1573,7 @@ _081463EC: bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - ldr r5, _0814648C @ =gUnknown_203F3CC + ldr r5, =gUnknown_203F3CC ldr r0, [r5] movs r1, 0xDE lsls r1, 1 @@ -1644,7 +1586,7 @@ _081463EC: movs r2, 0 movs r3, 0x8 bl decompress_and_copy_tile_data_to_vram - ldr r4, _08146490 @ =gUnknown_8468040 + ldr r4, =gUnknown_8468040 adds r0, r4, 0 bl AddWindow ldr r1, [r5] @@ -1661,9 +1603,7 @@ _081463EC: adds r1, r3 strh r0, [r1] b _081465D2 - .align 2, 0 -_0814648C: .4byte gUnknown_203F3CC -_08146490: .4byte gUnknown_8468040 + .pool _08146494: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -1672,12 +1612,12 @@ _08146494: beq _081464A2 b _081465EC _081464A2: - ldr r2, _0814653C @ =gPaletteFade + ldr r2, =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r0, _08146540 @ =gUnknown_203F3CC + ldr r0, =gUnknown_203F3CC mov r8, r0 ldr r0, [r0] movs r4, 0xDE @@ -1742,9 +1682,7 @@ _081464A2: movs r0, 0x3 bl CopyBgTilemapBufferToVram b _081465D2 - .align 2, 0 -_0814653C: .4byte gPaletteFade -_08146540: .4byte gUnknown_203F3CC + .pool _08146544: bl sub_8146980 b _081465D2 @@ -1762,12 +1700,12 @@ _0814655C: bl ShowBg movs r0, 0x3 bl ShowBg - ldr r2, _081465AC @ =gPaletteFade + ldr r2, =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] - ldr r4, _081465B0 @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r1, [r4] movs r3, 0xE5 lsls r3, 2 @@ -1777,7 +1715,7 @@ _0814655C: adds r1, r2 bl AddScrollIndicatorArrowPair ldr r1, [r4] - ldr r3, _081465B4 @ =0x000001c1 + ldr r3, =0x000001c1 adds r2, r1, r3 movs r1, 0 strb r0, [r2] @@ -1789,10 +1727,7 @@ _0814655C: bl BeginNormalPaletteFade bl UpdatePaletteFade b _081465D2 - .align 2, 0 -_081465AC: .4byte gPaletteFade -_081465B0: .4byte gUnknown_203F3CC -_081465B4: .4byte 0x000001c1 + .pool _081465B8: bl UpdatePaletteFade lsls r0, 24 @@ -1807,7 +1742,7 @@ _081465B8: movs r0, 0x1 b _081465EE _081465D2: - ldr r0, _08146600 @ =gUnknown_203F3CC + ldr r0, =gUnknown_203F3CC ldr r2, [r0] movs r0, 0xE0 lsls r0, 1 @@ -1831,8 +1766,7 @@ _081465EE: pop {r4-r7} pop {r1} bx r1 - .align 2, 0 -_08146600: .4byte gUnknown_203F3CC + .pool thumb_func_end sub_8146318 thumb_func_start sub_8146604 @@ -1840,15 +1774,14 @@ sub_8146604: @ 8146604 push {r4,r5,lr} sub sp, 0x8 adds r2, r0, 0 - ldr r5, _08146618 @ =gUnknown_203F3CC + ldr r5, =gUnknown_203F3CC ldr r0, [r5] cmp r0, 0 bne _0814661C movs r0, 0x1 negs r0, r0 b _081467E0 - .align 2, 0 -_08146618: .4byte gUnknown_203F3CC + .pool _0814661C: movs r4, 0xE0 lsls r4, 1 @@ -1860,12 +1793,11 @@ _0814661C: b _081467AA _0814662C: lsls r0, 2 - ldr r1, _08146638 @ =_0814663C + ldr r1, =_0814663C adds r0, r1 ldr r0, [r0] mov pc, r0 - .align 2, 0 -_08146638: .4byte _0814663C + .pool .align 2, 0 _0814663C: .4byte _08146658 @@ -1958,7 +1890,7 @@ _0814670C: bl HideBg movs r0, 0x2 bl HideBg - ldr r4, _08146738 @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r0, [r4] movs r1, 0xE5 lsls r1, 1 @@ -1972,8 +1904,7 @@ _0814670C: ldrb r0, [r0] bl RemoveWindow b _081467C4 - .align 2, 0 -_08146738: .4byte gUnknown_203F3CC + .pool _0814673C: movs r0, 0x2 movs r1, 0 @@ -1983,31 +1914,28 @@ _0814673C: movs r1, 0 movs r2, 0 bl ChangeBgY - ldr r4, _08146770 @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r0, [r4] - ldr r2, _08146774 @ =0x000001c1 + ldr r2, =0x000001c1 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF beq _081467C4 bl RemoveScrollIndicatorArrowPair ldr r0, [r4] - ldr r2, _08146774 @ =0x000001c1 + ldr r2, =0x000001c1 adds r1, r0, r2 movs r0, 0xFF strb r0, [r1] b _081467C4 - .align 2, 0 -_08146770: .4byte gUnknown_203F3CC -_08146774: .4byte 0x000001c1 + .pool _08146778: - ldr r0, _08146784 @ =gUnknown_203F3B8 + ldr r0, =gUnknown_203F3B8 ldrb r0, [r0] adds r1, r2, 0 bl sub_8142344 b _081467C4 - .align 2, 0 -_08146784: .4byte gUnknown_203F3B8 + .pool _08146788: bl sub_8142420 movs r0, 0 @@ -2036,7 +1964,7 @@ _081467AA: movs r0, 0x1 b _081467E0 _081467C4: - ldr r0, _081467E8 @ =gUnknown_203F3CC + ldr r0, =gUnknown_203F3CC ldr r2, [r0] movs r0, 0xE0 lsls r0, 1 @@ -2056,14 +1984,13 @@ _081467E0: pop {r4,r5} pop {r1} bx r1 - .align 2, 0 -_081467E8: .4byte gUnknown_203F3CC + .pool thumb_func_end sub_8146604 thumb_func_start sub_81467EC sub_81467EC: @ 81467EC push {r4,r5,lr} - ldr r4, _0814682C @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r2, [r4] movs r5, 0xE0 lsls r5, 1 @@ -2073,14 +2000,14 @@ sub_81467EC: @ 81467EC ands r0, r1 cmp r0, 0 bne _08146826 - ldr r0, _08146830 @ =0x000001c1 + ldr r0, =0x000001c1 adds r1, r2, r0 ldrb r0, [r1] cmp r0, 0xFF beq _08146826 bl RemoveScrollIndicatorArrowPair ldr r0, [r4] - ldr r2, _08146830 @ =0x000001c1 + ldr r2, =0x000001c1 adds r1, r0, r2 movs r0, 0xFF strb r0, [r1] @@ -2094,15 +2021,13 @@ _08146826: pop {r4,r5} pop {r0} bx r0 - .align 2, 0 -_0814682C: .4byte gUnknown_203F3CC -_08146830: .4byte 0x000001c1 + .pool thumb_func_end sub_81467EC thumb_func_start sub_8146834 sub_8146834: @ 8146834 push {r4,lr} - ldr r4, _0814687C @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r2, [r4] movs r1, 0xE0 lsls r1, 1 @@ -2120,7 +2045,7 @@ sub_8146834: @ 8146834 adds r1, r2, r3 bl AddScrollIndicatorArrowPair ldr r1, [r4] - ldr r2, _08146880 @ =0x000001c1 + ldr r2, =0x000001c1 adds r1, r2 strb r0, [r1] ldr r1, [r4] @@ -2136,9 +2061,7 @@ _08146874: pop {r4} pop {r0} bx r0 - .align 2, 0 -_0814687C: .4byte gUnknown_203F3CC -_08146880: .4byte 0x000001c1 + .pool thumb_func_end sub_8146834 thumb_func_start sub_8146884 @@ -2147,7 +2070,7 @@ sub_8146884: @ 8146884 lsls r0, 16 lsrs r4, r0, 16 adds r3, r4, 0 - ldr r2, _081468B0 @ =gUnknown_203F3CC + ldr r2, =gUnknown_203F3CC ldr r0, [r2] mov r12, r0 movs r0, 0xE1 @@ -2164,8 +2087,7 @@ sub_8146884: @ 8146884 _081468AA: movs r0, 0xFF b _0814697A - .align 2, 0 -_081468B0: .4byte gUnknown_203F3CC + .pool _081468B4: cmp r4, 0x2 beq _081468D0 @@ -2201,15 +2123,14 @@ _081468D4: ands r0, r1 cmp r0, 0 bne _081468AA - ldr r2, _08146900 @ =0x000001c3 + ldr r2, =0x000001c3 add r2, r12 ldrb r1, [r2] movs r0, 0x2 negs r0, r0 ands r0, r1 b _08146932 - .align 2, 0 -_08146900: .4byte 0x000001c3 + .pool _08146904: movs r0, 0xE3 lsls r0, 1 @@ -2229,7 +2150,7 @@ _08146904: ands r0, r1 cmp r0, 0 bne _081468AA - ldr r2, _08146974 @ =0x000001c3 + ldr r2, =0x000001c3 add r2, r12 ldrb r0, [r2] movs r1, 0x1 @@ -2268,8 +2189,7 @@ _08146932: beq _08146978 movs r0, 0x3 b _0814697A - .align 2, 0 -_08146974: .4byte 0x000001c3 + .pool _08146978: movs r0, 0x2 _0814697A: @@ -2282,7 +2202,7 @@ _0814697A: sub_8146980: @ 8146980 push {r4-r6,lr} movs r5, 0 - ldr r4, _08146A20 @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r1, [r4] movs r2, 0xE7 lsls r2, 1 @@ -2304,14 +2224,14 @@ _081469A4: lsls r1, 3 adds r4, r1, r5 adds r0, r4, r2 - ldr r3, _08146A24 @ =0x000001f7 + ldr r3, =0x000001f7 adds r0, r3 adds r1, r2 adds r1, 0x2C movs r2, 0x28 bl memcpy ldr r0, [r6] - ldr r1, _08146A28 @ =0x0000021f + ldr r1, =0x0000021f adds r0, r1 adds r0, r4 movs r1, 0xFF @@ -2319,7 +2239,7 @@ _081469A4: cmp r5, 0x7 bls _081469E8 ldr r1, [r6] - ldr r2, _08146A24 @ =0x000001f7 + ldr r2, =0x000001f7 adds r0, r1, r2 adds r0, r4 ldrb r0, [r0] @@ -2337,12 +2257,12 @@ _081469E8: lsrs r5, r0, 24 cmp r5, 0x9 bls _081469A4 - ldr r2, _08146A20 @ =gUnknown_203F3CC + ldr r2, =gUnknown_203F3CC ldr r1, [r2] movs r4, 0xE5 lsls r4, 2 adds r1, r4 - ldr r0, _08146A2C @ =gUnknown_8468050 + ldr r0, =gUnknown_8468050 ldm r0!, {r3-r5} stm r1!, {r3-r5} ldr r0, [r0] @@ -2359,11 +2279,7 @@ _081469E8: pop {r4-r6} pop {r0} bx r0 - .align 2, 0 -_08146A20: .4byte gUnknown_203F3CC -_08146A24: .4byte 0x000001f7 -_08146A28: .4byte 0x0000021f -_08146A2C: .4byte gUnknown_8468050 + .pool thumb_func_end sub_8146980 thumb_func_start sub_8146A30 @@ -2373,7 +2289,7 @@ sub_8146A30: @ 8146A30 push {r7} sub sp, 0xC movs r5, 0 - ldr r6, _08146B4C @ =gUnknown_203F3CC + ldr r6, =gUnknown_203F3CC ldr r0, [r6] movs r7, 0xE4 lsls r7, 1 @@ -2433,7 +2349,7 @@ _08146AA0: lsrs r1, 28 lsls r3, r1, 1 adds r3, r1 - ldr r1, _08146B50 @ =gUnknown_8468038 + ldr r1, =gUnknown_8468038 adds r3, r1 str r3, [sp] str r5, [sp, 0x4] @@ -2443,7 +2359,7 @@ _08146AA0: movs r3, 0x6 bl box_print _08146AD0: - ldr r6, _08146B4C @ =gUnknown_203F3CC + ldr r6, =gUnknown_203F3CC ldr r4, [r6] movs r1, 0xE5 lsls r1, 1 @@ -2461,7 +2377,7 @@ _08146AD0: lsrs r1, 4 lsls r2, r1, 1 adds r2, r1 - ldr r1, _08146B50 @ =gUnknown_8468038 + ldr r1, =gUnknown_8468038 adds r2, r1 str r2, [sp] movs r1, 0 @@ -2470,7 +2386,7 @@ _08146AD0: adds r1, r5 lsls r1, 3 adds r1, r5 - ldr r2, _08146B54 @ =0x000001f7 + ldr r2, =0x000001f7 adds r1, r2 adds r4, r1 str r4, [sp, 0x8] @@ -2502,16 +2418,13 @@ _08146AD0: pop {r4-r7} pop {r0} bx r0 - .align 2, 0 -_08146B4C: .4byte gUnknown_203F3CC -_08146B50: .4byte gUnknown_8468038 -_08146B54: .4byte 0x000001f7 + .pool thumb_func_end sub_8146A30 thumb_func_start sub_8146B58 sub_8146B58: @ 8146B58 push {r4-r6,lr} - ldr r0, _08146B90 @ =gUnknown_203F3CC + ldr r0, =gUnknown_203F3CC ldr r1, [r0] movs r2, 0xE1 lsls r2, 1 @@ -2519,7 +2432,7 @@ sub_8146B58: @ 8146B58 ldrb r0, [r0] lsrs r4, r0, 1 lsls r4, 8 - ldr r6, _08146B94 @ =0x000001c3 + ldr r6, =0x000001c3 adds r0, r1, r6 ldrb r1, [r0] movs r0, 0x1 @@ -2535,9 +2448,7 @@ sub_8146B58: @ 8146B58 movs r2, 0x1 bl ChangeBgY b _08146BAC - .align 2, 0 -_08146B90: .4byte gUnknown_203F3CC -_08146B94: .4byte 0x000001c3 + .pool _08146B98: movs r0, 0x2 adds r1, r4, 0 @@ -2548,9 +2459,9 @@ _08146B98: movs r2, 0x2 bl ChangeBgY _08146BAC: - ldr r3, _08146BF0 @ =gUnknown_203F3CC + ldr r3, =gUnknown_203F3CC ldr r0, [r3] - ldr r2, _08146BF4 @ =0x000001c3 + ldr r2, =0x000001c3 adds r5, r0, r2 ldrb r4, [r5] lsrs r1, r4, 1 @@ -2582,9 +2493,7 @@ _08146BAC: ldrh r0, [r1] adds r0, 0x1 b _08146C02 - .align 2, 0 -_08146BF0: .4byte gUnknown_203F3CC -_08146BF4: .4byte 0x000001c3 + .pool _08146BF8: movs r2, 0xE3 lsls r2, 1 @@ -2603,7 +2512,7 @@ _08146C02: ands r0, r1 strb r0, [r2] ldr r0, [r3] - ldr r1, _08146C2C @ =0x000001c3 + ldr r1, =0x000001c3 adds r2, r0, r1 ldrb r1, [r2] movs r0, 0x1 @@ -2613,8 +2522,7 @@ _08146C24: pop {r4-r6} pop {r0} bx r0 - .align 2, 0 -_08146C2C: .4byte 0x000001c3 + .pool thumb_func_end sub_8146B58 .align 2, 0 @ Don't pad with nop. |