ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 22:03:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary '.align' before '.pool'

Browse Source
This commit is contained in:
YamaArashi 2015-11-27 19:38:13 -08:00
parent 716991410a
commit 54640ba0bf
17 changed files with 14 additions and 23107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asm/dma3_manager.s
View File

@ -23,7 +23,6 @@ ClearDma3Requests: ; 8000BB8
strb r0, [r2] strb r0, [r2]
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end ClearDma3Requests thumb_func_end ClearDma3Requests
@ -96,7 +95,6 @@ ProcessDma3Requests: ; 8000BF0
cmp r0, 0x1 cmp r0, 0x1
beq @08000C8C beq @08000C8C
b @08000DF0 b @08000DF0
.align 2, 0
.pool .pool
@08000C80: @08000C80:
cmp r0, 0x3 cmp r0, 0x3
@ -138,7 +136,6 @@ ProcessDma3Requests: ; 8000BF0
movs r1, 0x84 movs r1, 0x84
lsls r1, 24 lsls r1, 24
b @08000D76 b @08000D76
.align 2, 0
.pool .pool
@08000CD0: @08000CD0:
mov r3, r10 mov r3, r10
@ -191,7 +188,6 @@ ProcessDma3Requests: ; 8000BF0
movs r1, 0x85 movs r1, 0x85
lsls r1, 24 lsls r1, 24
b @08000DEA b @08000DEA
.align 2, 0
.pool .pool
@08000D3C: @08000D3C:
ldr r3, [r1] ldr r3, [r1]
@ -229,7 +225,6 @@ ProcessDma3Requests: ; 8000BF0
str r0, [r4, 0x8] str r0, [r4, 0x8]
ldr r0, [r4, 0x8] ldr r0, [r4, 0x8]
b @08000DF0 b @08000DF0
.align 2, 0
.pool .pool
@08000D88: @08000D88:
mov r3, r10 mov r3, r10
@ -341,7 +336,6 @@ ProcessDma3Requests: ; 8000BF0
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end ProcessDma3Requests thumb_func_end ProcessDma3Requests
@ -387,7 +381,6 @@ RequestDma3Copy: ; 8000E68
bne @08000EC0 bne @08000EC0
strh r4, [r1, 0xA] strh r4, [r1, 0xA]
b @08000EC4 b @08000EC4
.align 2, 0
.pool .pool
@08000EC0: @08000EC0:
movs r0, 0x3 movs r0, 0x3
@ -399,7 +392,6 @@ RequestDma3Copy: ; 8000E68
lsls r0, r2, 16 lsls r0, r2, 16
asrs r0, 16 asrs r0, 16
b @08000EF0 b @08000EF0
.align 2, 0
.pool .pool
@08000ED4: @08000ED4:
adds r1, 0x10 adds r1, 0x10
@ -474,7 +466,6 @@ RequestDma3Fill: ; 8000F00
bne @08000F64 bne @08000F64
movs r0, 0x2 movs r0, 0x2
b @08000F66 b @08000F66
.align 2, 0
.pool .pool
@08000F64: @08000F64:
movs r0, 0x4 movs r0, 0x4
@ -486,7 +477,6 @@ RequestDma3Fill: ; 8000F00
lsls r0, r2, 16 lsls r0, r2, 16
asrs r0, 16 asrs r0, 16
b @08000F96 b @08000F96
.align 2, 0
.pool .pool
@08000F78: @08000F78:
adds r1, 0x10 adds r1, 0x10
@ -538,7 +528,6 @@ CheckForSpaceForDma3Request: ; 8000FA4
@08000FC4: @08000FC4:
movs r0, 0 movs r0, 0
b @08000FDC b @08000FDC
.align 2, 0
.pool .pool
@08000FCC: @08000FCC:
ldr r0, =gDma3Requests ldr r0, =gDma3Requests
@ -553,6 +542,5 @@ CheckForSpaceForDma3Request: ; 8000FA4
@08000FDC: @08000FDC:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end CheckForSpaceForDma3Request thumb_func_end CheckForSpaceForDma3Request

22532
asm/emerald.s
View File

File diff suppressed because it is too large Load Diff

76
asm/gpu_bg.s
View File

@ -9,7 +9,6 @@ gpu_init_bgs: ; 80012F0
bl gpu_sync_text_mode_and_hide_bgs bl gpu_sync_text_mode_and_hide_bgs
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_init_bgs thumb_func_end gpu_init_bgs
@ -25,7 +24,6 @@ gpu_set_bg_mode: ; 8001308
orrs r1, r0 orrs r1, r0
strh r1, [r3, 0x10] strh r1, [r3, 0x10]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end gpu_set_bg_mode thumb_func_end gpu_set_bg_mode
@ -37,7 +35,6 @@ gpu_get_bg_mode: ; 8001324
movs r0, 0x7 movs r0, 0x7
ands r0, r1 ands r0, r1
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end gpu_get_bg_mode thumb_func_end gpu_get_bg_mode
@ -57,7 +54,6 @@ gpu_reset_bg_configs: ; 8001334
bge @08001340 bge @08001340
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_reset_bg_configs thumb_func_end gpu_reset_bg_configs
@ -81,7 +77,6 @@ sub_8001354: ; 8001354
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_8001354 thumb_func_end sub_8001354
@ -243,7 +238,6 @@ gpu_bg_config_set_fields: ; 8001380
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_bg_config_set_fields thumb_func_end gpu_bg_config_set_fields
@ -276,7 +270,6 @@ gpu_bg_config_get_field: ; 80014AC
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@080014EC: @080014EC:
@ -376,7 +369,6 @@ gpu_copy_to_vram_by_bg_id: ; 8001560
beq @080015AC beq @080015AC
movs r2, 0xFF movs r2, 0xFF
b @080015DC b @080015DC
.align 2, 0
.pool .pool
@080015A4: @080015A4:
ldrb r0, [r1, 0x1] ldrb r0, [r1, 0x1]
@ -479,7 +471,6 @@ gpu_bg_show: ; 80015E8
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_bg_show thumb_func_end gpu_bg_show
@ -508,7 +499,6 @@ gpu_bg_hide: ; 8001664
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_bg_hide thumb_func_end gpu_bg_hide
@ -527,7 +517,6 @@ gpu_sync_bg_visibility_and_mode: ; 8001698
bl lcd_io_set bl lcd_io_set
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_sync_bg_visibility_and_mode thumb_func_end gpu_sync_bg_visibility_and_mode
@ -543,7 +532,6 @@ gpu_sync_text_mode_and_hide_bgs: ; 80016BC
bl lcd_io_set bl lcd_io_set
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_sync_text_mode_and_hide_bgs thumb_func_end gpu_sync_text_mode_and_hide_bgs
@ -583,7 +571,6 @@ gpu_bg_affine_set: ; 80016D8
cmp r1, 0x2 cmp r1, 0x2
beq @08001726 beq @08001726
b @08001796 b @08001796
.align 2, 0
.pool .pool
@08001720: @08001720:
cmp r6, 0x2 cmp r6, 0x2
@ -690,7 +677,6 @@ gpu_reset_bgs_and_dma3_busy_flags: ; 80017BC
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_reset_bgs_and_dma3_busy_flags thumb_func_end gpu_reset_bgs_and_dma3_busy_flags
@ -791,7 +777,6 @@ bg_vram_setup: ; 80017E8
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end bg_vram_setup thumb_func_end bg_vram_setup
@ -858,7 +843,6 @@ bg_init_bg_config_2_from_bg_config_3: ; 80018B0
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end bg_init_bg_config_2_from_bg_config_3 thumb_func_end bg_init_bg_config_2_from_bg_config_3
@ -903,7 +887,6 @@ gpu_copy_bg_tile_pattern_data_to_vram: ; 8001944
adds r0, r4 adds r0, r4
lsls r0, 21 lsls r0, 21
b @08001990 b @08001990
.align 2, 0
.pool .pool
@08001980: @08001980:
ldr r1, =0x030008f8 ldr r1, =0x030008f8
@ -930,7 +913,6 @@ gpu_copy_bg_tile_pattern_data_to_vram: ; 8001944
bne @080019B8 bne @080019B8
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
b @080019E6 b @080019E6
.align 2, 0
.pool .pool
@080019B8: @080019B8:
ldr r0, =0x03000938 ldr r0, =0x03000938
@ -963,7 +945,6 @@ gpu_copy_bg_tile_pattern_data_to_vram: ; 8001944
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end gpu_copy_bg_tile_pattern_data_to_vram thumb_func_end gpu_copy_bg_tile_pattern_data_to_vram
@ -997,7 +978,6 @@ gpu_copy_bg_tile_map_to_vram: ; 80019FC
str r0, [r2] str r0, [r2]
adds r0, r3, 0 adds r0, r3, 0
b @08001A3E b @08001A3E
.align 2, 0
.pool .pool
@08001A3C: @08001A3C:
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
@ -1006,7 +986,6 @@ gpu_copy_bg_tile_map_to_vram: ; 80019FC
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end gpu_copy_bg_tile_map_to_vram thumb_func_end gpu_copy_bg_tile_map_to_vram
@ -1051,7 +1030,6 @@ unused_copy_palette: ; 8001A4C
@08001A98: @08001A98:
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
b @08001AC8 b @08001AC8
.align 2, 0
.pool .pool
@08001AA4: @08001AA4:
ldr r4, =0x03000938 ldr r4, =0x03000938
@ -1077,7 +1055,6 @@ unused_copy_palette: ; 8001A4C
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end unused_copy_palette thumb_func_end unused_copy_palette
@ -1118,7 +1095,6 @@ is_dma3_queue_busy_with_gpu_copy: ; 8001AD4
bne @08001B1C bne @08001B1C
movs r0, 0x1 movs r0, 0x1
b @08001B2A b @08001B2A
.align 2, 0
.pool .pool
@08001B1C: @08001B1C:
ldr r0, [r4] ldr r0, [r4]
@ -1178,7 +1154,6 @@ gpu_bg_config_set_field: ; 8001B58
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08001B7C: @08001B7C:
@ -1279,7 +1254,6 @@ bg_get_field: ; 8001C1C
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08001C3C: @08001C3C:
@ -1366,7 +1340,6 @@ bg_get_field: ; 8001C1C
lsls r0, 22 lsls r0, 22
lsrs r0, 22 lsrs r0, 22
b @08001CFA b @08001CFA
.align 2, 0
.pool .pool
@08001CF8: @08001CF8:
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
@ -1374,7 +1347,6 @@ bg_get_field: ; 8001C1C
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end bg_get_field thumb_func_end bg_get_field
@ -1416,7 +1388,6 @@ bg_change_x_offset: ; 8001D04
str r6, [r0] str r6, [r0]
adds r5, r1, 0 adds r5, r1, 0
b @08001D70 b @08001D70
.align 2, 0
.pool .pool
@08001D4C: @08001D4C:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -1426,7 +1397,6 @@ bg_change_x_offset: ; 8001D04
ldr r1, [r0] ldr r1, [r0]
adds r1, r6 adds r1, r6
b @08001D6C b @08001D6C
.align 2, 0
.pool .pool
@08001D60: @08001D60:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -1449,7 +1419,6 @@ bg_change_x_offset: ; 8001D04
cmp r4, 0 cmp r4, 0
beq @08001D96 beq @08001D96
b @08001E2C b @08001E2C
.align 2, 0
.pool .pool
@08001D8C: @08001D8C:
cmp r4, 0x2 cmp r4, 0x2
@ -1465,7 +1434,6 @@ bg_change_x_offset: ; 8001D04
movs r0, 0x10 movs r0, 0x10
bl lcd_io_set bl lcd_io_set
b @08001E2C b @08001E2C
.align 2, 0
.pool .pool
@08001DAC: @08001DAC:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -1475,7 +1443,6 @@ bg_change_x_offset: ; 8001D04
movs r0, 0x14 movs r0, 0x14
bl lcd_io_set bl lcd_io_set
b @08001E2C b @08001E2C
.align 2, 0
.pool .pool
@08001DC0: @08001DC0:
cmp r0, 0 cmp r0, 0
@ -1487,7 +1454,6 @@ bg_change_x_offset: ; 8001D04
movs r0, 0x18 movs r0, 0x18
bl lcd_io_set bl lcd_io_set
b @08001E2C b @08001E2C
.align 2, 0
.pool .pool
@08001DD8: @08001DD8:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -1501,7 +1467,6 @@ bg_change_x_offset: ; 8001D04
adds r1, r4, 0 adds r1, r4, 0
bl lcd_io_set bl lcd_io_set
b @08001E2C b @08001E2C
.align 2, 0
.pool .pool
@08001DF8: @08001DF8:
cmp r0, 0 cmp r0, 0
@ -1513,7 +1478,6 @@ bg_change_x_offset: ; 8001D04
movs r0, 0x1C movs r0, 0x1C
bl lcd_io_set bl lcd_io_set
b @08001E2C b @08001E2C
.align 2, 0
.pool .pool
@08001E10: @08001E10:
cmp r0, 0x2 cmp r0, 0x2
@ -1537,7 +1501,6 @@ bg_change_x_offset: ; 8001D04
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end bg_change_x_offset thumb_func_end bg_change_x_offset
@ -1563,7 +1526,6 @@ bg_get_x_offset: ; 8001E40
adds r1, r0 adds r1, r0
ldr r0, [r1] ldr r0, [r1]
b @08001E74 b @08001E74
.align 2, 0
.pool .pool
@08001E70: @08001E70:
movs r0, 0x1 movs r0, 0x1
@ -1612,7 +1574,6 @@ bg_change_y_offset: ; 8001E7C
str r6, [r0] str r6, [r0]
adds r5, r1, 0 adds r5, r1, 0
b @08001EE8 b @08001EE8
.align 2, 0
.pool .pool
@08001EC4: @08001EC4:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -1622,7 +1583,6 @@ bg_change_y_offset: ; 8001E7C
ldr r1, [r0] ldr r1, [r0]
adds r1, r6 adds r1, r6
b @08001EE4 b @08001EE4
.align 2, 0
.pool .pool
@08001ED8: @08001ED8:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -1645,7 +1605,6 @@ bg_change_y_offset: ; 8001E7C
cmp r4, 0 cmp r4, 0
beq @08001F0E beq @08001F0E
b @08001FA4 b @08001FA4
.align 2, 0
.pool .pool
@08001F04: @08001F04:
cmp r4, 0x2 cmp r4, 0x2
@ -1661,7 +1620,6 @@ bg_change_y_offset: ; 8001E7C
movs r0, 0x12 movs r0, 0x12
bl lcd_io_set bl lcd_io_set
b @08001FA4 b @08001FA4
.align 2, 0
.pool .pool
@08001F24: @08001F24:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -1671,7 +1629,6 @@ bg_change_y_offset: ; 8001E7C
movs r0, 0x16 movs r0, 0x16
bl lcd_io_set bl lcd_io_set
b @08001FA4 b @08001FA4
.align 2, 0
.pool .pool
@08001F38: @08001F38:
cmp r0, 0 cmp r0, 0
@ -1683,7 +1640,6 @@ bg_change_y_offset: ; 8001E7C
movs r0, 0x1A movs r0, 0x1A
bl lcd_io_set bl lcd_io_set
b @08001FA4 b @08001FA4
.align 2, 0
.pool .pool
@08001F50: @08001F50:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -1697,7 +1653,6 @@ bg_change_y_offset: ; 8001E7C
adds r1, r4, 0 adds r1, r4, 0
bl lcd_io_set bl lcd_io_set
b @08001FA4 b @08001FA4
.align 2, 0
.pool .pool
@08001F70: @08001F70:
cmp r0, 0 cmp r0, 0
@ -1709,7 +1664,6 @@ bg_change_y_offset: ; 8001E7C
movs r0, 0x1E movs r0, 0x1E
bl lcd_io_set bl lcd_io_set
b @08001FA4 b @08001FA4
.align 2, 0
.pool .pool
@08001F88: @08001F88:
cmp r0, 0x2 cmp r0, 0x2
@ -1733,7 +1687,6 @@ bg_change_y_offset: ; 8001E7C
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end bg_change_y_offset thumb_func_end bg_change_y_offset
@ -1775,7 +1728,6 @@ bg_change_y_offset_to_copy_queue: ; 8001FB8
str r6, [r0] str r6, [r0]
adds r5, r1, 0 adds r5, r1, 0
b @08002024 b @08002024
.align 2, 0
.pool .pool
@08002000: @08002000:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -1785,7 +1737,6 @@ bg_change_y_offset_to_copy_queue: ; 8001FB8
ldr r1, [r0] ldr r1, [r0]
adds r1, r6 adds r1, r6
b @08002020 b @08002020
.align 2, 0
.pool .pool
@08002014: @08002014:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -1808,7 +1759,6 @@ bg_change_y_offset_to_copy_queue: ; 8001FB8
cmp r4, 0 cmp r4, 0
beq @0800204A beq @0800204A
b @080020E0 b @080020E0
.align 2, 0
.pool .pool
@08002040: @08002040:
cmp r4, 0x2 cmp r4, 0x2
@ -1824,7 +1774,6 @@ bg_change_y_offset_to_copy_queue: ; 8001FB8
movs r0, 0x12 movs r0, 0x12
bl lcd_io_set_forced_blank bl lcd_io_set_forced_blank
b @080020E0 b @080020E0
.align 2, 0
.pool .pool
@08002060: @08002060:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -1834,7 +1783,6 @@ bg_change_y_offset_to_copy_queue: ; 8001FB8
movs r0, 0x16 movs r0, 0x16
bl lcd_io_set_forced_blank bl lcd_io_set_forced_blank
b @080020E0 b @080020E0
.align 2, 0
.pool .pool
@08002074: @08002074:
cmp r0, 0 cmp r0, 0
@ -1846,7 +1794,6 @@ bg_change_y_offset_to_copy_queue: ; 8001FB8
movs r0, 0x1A movs r0, 0x1A
bl lcd_io_set_forced_blank bl lcd_io_set_forced_blank
b @080020E0 b @080020E0
.align 2, 0
.pool .pool
@0800208C: @0800208C:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -1860,7 +1807,6 @@ bg_change_y_offset_to_copy_queue: ; 8001FB8
adds r1, r4, 0 adds r1, r4, 0
bl lcd_io_set_forced_blank bl lcd_io_set_forced_blank
b @080020E0 b @080020E0
.align 2, 0
.pool .pool
@080020AC: @080020AC:
cmp r0, 0 cmp r0, 0
@ -1872,7 +1818,6 @@ bg_change_y_offset_to_copy_queue: ; 8001FB8
movs r0, 0x1E movs r0, 0x1E
bl lcd_io_set_forced_blank bl lcd_io_set_forced_blank
b @080020E0 b @080020E0
.align 2, 0
.pool .pool
@080020C4: @080020C4:
cmp r0, 0x2 cmp r0, 0x2
@ -1896,7 +1841,6 @@ bg_change_y_offset_to_copy_queue: ; 8001FB8
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end bg_change_y_offset_to_copy_queue thumb_func_end bg_change_y_offset_to_copy_queue
@ -1922,7 +1866,6 @@ bg_get_y_offset: ; 80020F4
adds r1, r0 adds r1, r0
ldr r0, [r1] ldr r0, [r1]
b @08002128 b @08002128
.align 2, 0
.pool .pool
@08002124: @08002124:
movs r0, 0x1 movs r0, 0x1
@ -1995,7 +1938,6 @@ mosaic_something: ; 8002170
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@080021A8: @080021A8:
@ -2117,7 +2059,6 @@ bg_set_tilemap: ; 8002250
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end bg_set_tilemap thumb_func_end bg_set_tilemap
@ -2147,7 +2088,6 @@ bg_unset_tilemap: ; 8002284
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end bg_unset_tilemap thumb_func_end bg_unset_tilemap
@ -2173,7 +2113,6 @@ bg_get_tilemap: ; 80022B8
adds r1, r0 adds r1, r0
ldr r0, [r1] ldr r0, [r1]
b @080022EA b @080022EA
.align 2, 0
.pool .pool
@080022E8: @080022E8:
movs r0, 0 movs r0, 0
@ -2221,7 +2160,6 @@ gpu_copy_to_wram_bg_tile_map: ; 80022F0
mov r0, r10 mov r0, r10
bl CpuSet bl CpuSet
b @08002358 b @08002358
.align 2, 0
.pool .pool
@08002340: @08002340:
ldr r0, =0x030008f8 ldr r0, =0x030008f8
@ -2243,7 +2181,6 @@ gpu_copy_to_wram_bg_tile_map: ; 80022F0
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_copy_to_wram_bg_tile_map thumb_func_end gpu_copy_to_wram_bg_tile_map
@ -2299,7 +2236,6 @@ gpu_copy_wram_bg_tilemap_to_vram: ; 800236C
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_copy_wram_bg_tilemap_to_vram thumb_func_end gpu_copy_wram_bg_tilemap_to_vram
@ -2382,7 +2318,6 @@ gpu_copy_to_iwram_tile_map_rect: ; 80023D4
cmp r3, r12 cmp r3, r12
blt @08002436 blt @08002436
b @080024C4 b @080024C4
.align 2, 0
.pool .pool
@08002470: @08002470:
mov r4, r8 mov r4, r8
@ -2438,7 +2373,6 @@ gpu_copy_to_iwram_tile_map_rect: ; 80023D4
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_copy_to_iwram_tile_map_rect thumb_func_end gpu_copy_to_iwram_tile_map_rect
@ -2651,7 +2585,6 @@ bg_copy_tilemap_rect: ; 800251C
cmp r5, r0 cmp r5, r0
blt @080025F8 blt @080025F8
b @080026EE b @080026EE
.align 2, 0
.pool .pool
@08002674: @08002674:
ldr r1, [sp, 0x10] ldr r1, [sp, 0x10]
@ -2726,7 +2659,6 @@ bg_copy_tilemap_rect: ; 800251C
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end bg_copy_tilemap_rect thumb_func_end bg_copy_tilemap_rect
@ -2809,7 +2741,6 @@ bg_fill_tilemap_rect: ; 8002704
cmp r3, r7 cmp r3, r7
blt @08002768 blt @08002768
b @080027F0 b @080027F0
.align 2, 0
.pool .pool
@080027A0: @080027A0:
adds r0, r6, 0 adds r0, r6, 0
@ -2863,7 +2794,6 @@ bg_fill_tilemap_rect: ; 8002704
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end bg_fill_tilemap_rect thumb_func_end bg_fill_tilemap_rect
@ -3039,7 +2969,6 @@ bg_write_sequence_to_wram_tile_map_rect: ; 8002840
cmp r5, r2 cmp r5, r2
blt @080028E0 blt @080028E0
b @080029D4 b @080029D4
.align 2, 0
.pool .pool
@0800295C: @0800295C:
mov r0, r9 mov r0, r9
@ -3113,7 +3042,6 @@ bg_write_sequence_to_wram_tile_map_rect: ; 8002840
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end bg_write_sequence_to_wram_tile_map_rect thumb_func_end bg_write_sequence_to_wram_tile_map_rect
@ -3298,7 +3226,6 @@ bg_copy_tilemap_entry_not_rotscale_mode: ; 8002AEC
adds r1, r2, r5 adds r1, r2, r5
lsls r1, 12 lsls r1, 12
b @08002B3A b @08002B3A
.align 2, 0
.pool .pool
@08002B14: @08002B14:
ldrh r1, [r6] ldrh r1, [r6]
@ -3314,7 +3241,6 @@ bg_copy_tilemap_entry_not_rotscale_mode: ; 8002AEC
ands r0, r1 ands r0, r1
orrs r0, r2 orrs r0, r2
b @08002B3C b @08002B3C
.align 2, 0
.pool .pool
@08002B34: @08002B34:
ldrh r0, [r4] ldrh r0, [r4]
@ -3379,7 +3305,6 @@ bg_get_type_by_bg_id: ; 8002B48
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end bg_get_type_by_bg_id thumb_func_end bg_get_type_by_bg_id
@ -3417,7 +3342,6 @@ IsTileMapOutsideWram: ; 8002BB0
beq @08002BD4 beq @08002BD4
movs r0, 0 movs r0, 0
b @08002BD6 b @08002BD6
.align 2, 0
.pool .pool
@08002BD4: @08002BD4:
movs r0, 0x1 movs r0, 0x1

89
asm/gpu_obj.s
View File

@ -23,7 +23,6 @@ reset_all_obj_data: ; 8006974
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end reset_all_obj_data thumb_func_end reset_all_obj_data
@ -65,7 +64,6 @@ call_obj_callbacks: ; 80069C0
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end call_obj_callbacks thumb_func_end call_obj_callbacks
@ -99,7 +97,6 @@ obj_sync_something: ; 8006A0C
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end obj_sync_something thumb_func_end obj_sync_something
@ -159,7 +156,6 @@ update_obj_oam_coords: ; 8006A58
ldrb r2, [r2] ldrb r2, [r2]
adds r0, r2 adds r0, r2
b @08006B08 b @08006B08
.align 2, 0
.pool .pool
@08006AD8: @08006AD8:
movs r2, 0x20 movs r2, 0x20
@ -229,7 +225,6 @@ do_something_with_obj_priorites: ; 8006B1C
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end do_something_with_obj_priorites thumb_func_end do_something_with_obj_priorites
@ -342,7 +337,6 @@ determine_visible_sprites_maybe: ; 8006B5C
cmp r0, r6 cmp r0, r6
bne @08006CF6 bne @08006CF6
b @08006CEE b @08006CEE
.align 2, 0
.pool .pool
@08006C38: @08006C38:
mov r1, r10 mov r1, r10
@ -464,7 +458,6 @@ determine_visible_sprites_maybe: ; 8006B5C
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end determine_visible_sprites_maybe thumb_func_end determine_visible_sprites_maybe
@ -506,7 +499,6 @@ copy_rotscale_coeffs_to_super_sprites: ; 8006D1C
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end copy_rotscale_coeffs_to_super_sprites thumb_func_end copy_rotscale_coeffs_to_super_sprites
@ -576,7 +568,6 @@ super_sprites_fill: ; 8006D68
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end super_sprites_fill thumb_func_end super_sprites_fill
@ -612,7 +603,6 @@ obj_add_from_template_forward_search: ; 8006DF4
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
b @08006E40 b @08006E40
.align 2, 0
.pool .pool
@08006E34: @08006E34:
adds r0, r3, 0x1 adds r0, r3, 0x1
@ -668,7 +658,6 @@ obj_add_from_template_backward_search: ; 8006E48
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
b @08006EA6 b @08006EA6
.align 2, 0
.pool .pool
@08006E98: @08006E98:
subs r0, r1, 0x1 subs r0, r1, 0x1
@ -716,7 +705,6 @@ obj_add_empty_with_callback: ; 8006EB4
str r6, [r1] str r6, [r1]
adds r0, r5, 0 adds r0, r5, 0
b @08006EF6 b @08006EF6
.align 2, 0
.pool .pool
@08006EF4: @08006EF4:
movs r0, 0x40 movs r0, 0x40
@ -823,7 +811,6 @@ template_read: ; 8006EFC
bl obj_delete bl obj_delete
movs r0, 0x40 movs r0, 0x40
b @08007040 b @08007040
.align 2, 0
.pool .pool
@08006FC8: @08006FC8:
ldr r1, =0x000003ff ldr r1, =0x000003ff
@ -846,7 +833,6 @@ template_read: ; 8006EFC
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
b @0800700C b @0800700C
.align 2, 0
.pool .pool
@08006FF8: @08006FF8:
mov r1, r8 mov r1, r8
@ -892,7 +878,6 @@ template_read: ; 8006EFC
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end template_read thumb_func_end template_read
@ -954,7 +939,6 @@ obj_add_from_template_call_callback_once: ; 8007054
@080070C0: @080070C0:
adds r0, r5, 0 adds r0, r5, 0
b @080070D8 b @080070D8
.align 2, 0
.pool .pool
@080070CC: @080070CC:
adds r0, r3, 0x1 adds r0, r3, 0x1
@ -1029,7 +1013,6 @@ obj_delete_and_free_tiles: ; 80070E8
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end obj_delete_and_free_tiles thumb_func_end obj_delete_and_free_tiles
@ -1061,7 +1044,6 @@ reset_super_sprites: ; 8007150
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end reset_super_sprites thumb_func_end reset_super_sprites
@ -1086,7 +1068,6 @@ copy_super_sprites_to_oam: ; 8007188
@080071A8: @080071A8:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end copy_super_sprites_to_oam thumb_func_end copy_super_sprites_to_oam
@ -1119,7 +1100,6 @@ copy_queue_clear: ; 80071B8
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end copy_queue_clear thumb_func_end copy_queue_clear
@ -1146,7 +1126,6 @@ reset_rotscale_coeffs: ; 80071F8
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end reset_rotscale_coeffs thumb_func_end reset_rotscale_coeffs
@ -1165,7 +1144,6 @@ rotscale_set_direct: ; 8007224
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end rotscale_set_direct thumb_func_end rotscale_set_direct
@ -1178,7 +1156,6 @@ obj_delete: ; 8007244
bl memcpy bl memcpy
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end obj_delete thumb_func_end obj_delete
@ -1216,7 +1193,6 @@ oam_center: ; 8007258
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end oam_center thumb_func_end oam_center
@ -1258,7 +1234,6 @@ gpu_tile_obj_alloc: ; 800729C
@080072DA: @080072DA:
movs r0, 0 movs r0, 0
b @080073A4 b @080073A4
.align 2, 0
.pool .pool
@080072EC: @080072EC:
movs r0, 0x1 movs r0, 0x1
@ -1369,7 +1344,6 @@ gpu_tile_obj_alloc: ; 800729C
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end gpu_tile_obj_alloc thumb_func_end gpu_tile_obj_alloc
@ -1402,7 +1376,6 @@ gpu_tile_obj_alloc_map_bit_op: ; 80073B8
ands r2, r1 ands r2, r1
strb r2, [r0] strb r2, [r0]
b @0800741C b @0800741C
.align 2, 0
.pool .pool
@080073F0: @080073F0:
cmp r1, 0x1 cmp r1, 0x1
@ -1416,7 +1389,6 @@ gpu_tile_obj_alloc_map_bit_op: ; 80073B8
orrs r2, r1 orrs r2, r1
strb r2, [r0] strb r2, [r0]
b @0800741C b @0800741C
.align 2, 0
.pool .pool
@0800740C: @0800740C:
movs r0, 0x80 movs r0, 0x80
@ -1432,7 +1404,6 @@ gpu_tile_obj_alloc_map_bit_op: ; 80073B8
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end gpu_tile_obj_alloc_map_bit_op thumb_func_end gpu_tile_obj_alloc_map_bit_op
@ -1485,7 +1456,6 @@ copy_queue_process: ; 800742C
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end copy_queue_process thumb_func_end copy_queue_process
@ -1536,7 +1506,6 @@ copy_queue_add_oam_frame: ; 8007488
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end copy_queue_add_oam_frame thumb_func_end copy_queue_add_oam_frame
@ -1579,7 +1548,6 @@ copy_queue_add: ; 80074EC
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end copy_queue_add thumb_func_end copy_queue_add
@ -1602,7 +1570,6 @@ copy_all_from_objects: ; 800753C
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end copy_all_from_objects thumb_func_end copy_all_from_objects
@ -1625,7 +1592,6 @@ copy_all_to_objects: ; 8007564
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end copy_all_to_objects thumb_func_end copy_all_to_objects
@ -1657,7 +1623,6 @@ obj_delete_all: ; 800758C
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end obj_delete_all thumb_func_end obj_delete_all
@ -1675,7 +1640,6 @@ obj_free_tiles: ; 80075C8
@080075DA: @080075DA:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end obj_free_tiles thumb_func_end obj_free_tiles
@ -1766,7 +1730,6 @@ obj_anim_step: ; 8007640
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end obj_anim_step thumb_func_end obj_anim_step
@ -1875,7 +1838,6 @@ obj_anim_image_begin: ; 8007688
orrs r0, r1 orrs r0, r1
strh r0, [r4, 0x4] strh r0, [r4, 0x4]
b @0800776C b @0800776C
.align 2, 0
.pool .pool
@0800775C: @0800775C:
mov r1, r8 mov r1, r8
@ -1975,7 +1937,6 @@ obj_anim_image_continue: ; 8007778
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end obj_anim_image_continue thumb_func_end obj_anim_image_continue
@ -2053,7 +2014,6 @@ anim_image_3: ; 8007818
orrs r0, r1 orrs r0, r1
strh r0, [r4, 0x4] strh r0, [r4, 0x4]
b @080078BA b @080078BA
.align 2, 0
.pool .pool
@080078AC: @080078AC:
mov r0, r8 mov r0, r8
@ -2173,7 +2133,6 @@ anim_image_1: ; 80078DC
orrs r0, r1 orrs r0, r1
strh r0, [r4, 0x4] strh r0, [r4, 0x4]
b @0800799A b @0800799A
.align 2, 0
.pool .pool
@0800798C: @0800798C:
mov r0, r8 mov r0, r8
@ -2393,7 +2352,6 @@ obj_anim_rotscale_begin: ; 8007A90
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end obj_anim_rotscale_begin thumb_func_end obj_anim_rotscale_begin
@ -2426,7 +2384,6 @@ obj_anim_rotscale_continue: ; 8007B24
adds r1, r4, 0 adds r1, r4, 0
bl sub_8007BD8 bl sub_8007BD8
b @08007BAA b @08007BAA
.align 2, 0
.pool .pool
@08007B60: @08007B60:
adds r0, r4, 0 adds r0, r4, 0
@ -2484,7 +2441,6 @@ obj_anim_rotscale_continue: ; 8007B24
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end obj_anim_rotscale_continue thumb_func_end obj_anim_rotscale_continue
@ -2534,7 +2490,6 @@ anim_rotscale_0: ; 8007C0C
adds r1, r3, 0 adds r1, r3, 0
bl sub_8007C7C bl sub_8007C7C
b @08007C3C b @08007C3C
.align 2, 0
.pool .pool
@08007C34: @08007C34:
adds r0, r2, 0 adds r0, r2, 0
@ -2573,7 +2528,6 @@ sub_8007C40: ; 8007C40
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_8007C40 thumb_func_end sub_8007C40
@ -2598,7 +2552,6 @@ sub_8007C7C: ; 8007C7C
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_8007C7C thumb_func_end sub_8007C7C
@ -2622,7 +2575,6 @@ obj_anim_rotscale_rewind_to_cmd00_maybe: ; 8007CAC
strb r0, [r2, 0x1] strb r0, [r2, 0x1]
adds r4, r3, 0 adds r4, r3, 0
b @08007CDC b @08007CDC
.align 2, 0
.pool .pool
@08007CD4: @08007CD4:
cmp r2, 0 cmp r2, 0
@ -2659,7 +2611,6 @@ obj_anim_rotscale_rewind_to_cmd00_maybe: ; 8007CAC
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end obj_anim_rotscale_rewind_to_cmd00_maybe thumb_func_end obj_anim_rotscale_rewind_to_cmd00_maybe
@ -2699,7 +2650,6 @@ anim_rotscale_1: ; 8007D18
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end anim_rotscale_1 thumb_func_end anim_rotscale_1
@ -2732,7 +2682,6 @@ anim_rotscale_2: ; 8007D64
add sp, 0x8 add sp, 0x8
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end anim_rotscale_2 thumb_func_end anim_rotscale_2
@ -2762,7 +2711,6 @@ anim_rotscale_3: ; 8007DA0
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end anim_rotscale_3 thumb_func_end anim_rotscale_3
@ -2782,7 +2730,6 @@ rotscale_set_indirect: ; 8007DD8
ldrh r1, [r1, 0x6] ldrh r1, [r1, 0x6]
strh r1, [r0, 0x6] strh r1, [r0, 0x6]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end rotscale_set_indirect thumb_func_end rotscale_set_indirect
@ -2922,7 +2869,6 @@ obj_update_pos2: ; 8007E54
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end obj_update_pos2 thumb_func_end obj_update_pos2
@ -3003,7 +2949,6 @@ rotscale_reset_half: ; 8007F64
strb r0, [r1, 0x2] strb r0, [r1, 0x2]
strb r0, [r1, 0x3] strb r0, [r1, 0x3]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end rotscale_reset_half thumb_func_end rotscale_reset_half
@ -3028,7 +2973,6 @@ rotscale_reset_full_1: ; 8007F80
strh r0, [r2, 0x6] strh r0, [r2, 0x6]
strh r3, [r2, 0x8] strh r3, [r2, 0x8]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end rotscale_reset_full_1 thumb_func_end rotscale_reset_full_1
@ -3053,7 +2997,6 @@ rotscale_reset_full_2: ; 8007FA8
strh r2, [r1, 0x6] strh r2, [r1, 0x6]
strh r0, [r1, 0x8] strh r0, [r1, 0x8]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end rotscale_reset_full_2 thumb_func_end rotscale_reset_full_2
@ -3075,7 +3018,6 @@ rotscale_frame_apply_absolute: ; 8007FD0
lsls r0, 8 lsls r0, 8
strh r0, [r2, 0x8] strh r0, [r2, 0x8]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end rotscale_frame_apply_absolute thumb_func_end rotscale_frame_apply_absolute
@ -3129,7 +3071,6 @@ obj_anim_rotscale_delay_progress: ; 800801C
lsrs r0, 7 lsrs r0, 7
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end obj_anim_rotscale_delay_progress thumb_func_end obj_anim_rotscale_delay_progress
@ -3199,7 +3140,6 @@ rotscale_frame_apply_relative_and_sync: ; 800804C
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end rotscale_frame_apply_relative_and_sync thumb_func_end rotscale_frame_apply_relative_and_sync
@ -3273,7 +3213,6 @@ rotscale_load_frame: ; 80080FC
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end rotscale_load_frame thumb_func_end rotscale_load_frame
@ -3458,7 +3397,6 @@ sub_8008284: ; 8008284
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_8008284 thumb_func_end sub_8008284
@ -3488,7 +3426,6 @@ sub_80082B8: ; 80082B8
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80082B8 thumb_func_end sub_80082B8
@ -3516,7 +3453,6 @@ sub_80082F0: ; 80082F0
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80082F0 thumb_func_end sub_80082F0
@ -3564,7 +3500,6 @@ sub_8008324: ; 8008324
@08008370: @08008370:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_8008324 thumb_func_end sub_8008324
@ -3591,7 +3526,6 @@ rotscale_reset_all: ; 800837C
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end rotscale_reset_all thumb_func_end rotscale_reset_all
@ -3614,7 +3548,6 @@ rotscale_alloc_entry: ; 80083B0
str r0, [r3] str r0, [r3]
adds r0, r2, 0 adds r0, r2, 0
b @080083E2 b @080083E2
.align 2, 0
.pool .pool
@080083D4: @080083D4:
adds r0, r2, 0x1 adds r0, r2, 0x1
@ -3663,7 +3596,6 @@ rotscale_free_entry: ; 80083E8
add sp, 0x4 add sp, 0x4
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end rotscale_free_entry thumb_func_end rotscale_free_entry
@ -3767,7 +3699,6 @@ sub_8008478: ; 8008478
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_8008478 thumb_func_end sub_8008478
@ -3798,7 +3729,6 @@ gpu_tile_obj_alloc_tag_and_copy_to_vram: ; 80084F8
bl CpuSet bl CpuSet
adds r0, r4, 0 adds r0, r4, 0
b @08008536 b @08008536
.align 2, 0
.pool .pool
@08008534: @08008534:
movs r0, 0 movs r0, 0
@ -3892,7 +3822,6 @@ gpu_tile_obj_free_by_tag: ; 8008568
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_tile_obj_free_by_tag thumb_func_end gpu_tile_obj_free_by_tag
@ -3926,7 +3855,6 @@ gpu_tile_obj_tags_reset: ; 80085E0
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_tile_obj_tags_reset thumb_func_end gpu_tile_obj_tags_reset
@ -3946,14 +3874,12 @@ gpu_tile_obj_tag_get_range_start: ; 8008620
adds r1, r0 adds r1, r0
ldrh r0, [r1] ldrh r0, [r1]
b @08008642 b @08008642
.align 2, 0
.pool .pool
@08008640: @08008640:
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
@08008642: @08008642:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end gpu_tile_obj_tag_get_range_start thumb_func_end gpu_tile_obj_tag_get_range_start
@ -3972,7 +3898,6 @@ gpu_tile_obj_tag_index_of: ; 800864C
bne @08008668 bne @08008668
adds r0, r1, 0 adds r0, r1, 0
b @08008674 b @08008674
.align 2, 0
.pool .pool
@08008668: @08008668:
adds r0, r1, 0x1 adds r0, r1, 0x1
@ -4008,7 +3933,6 @@ gpu_tile_obj_tag_get_by_range_start: ; 8008678
bne @080086AC bne @080086AC
ldrh r0, [r1] ldrh r0, [r1]
b @080086B8 b @080086B8
.align 2, 0
.pool .pool
@080086AC: @080086AC:
adds r0, r2, 0x1 adds r0, r2, 0x1
@ -4021,7 +3945,6 @@ gpu_tile_obj_tag_get_by_range_start: ; 8008678
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end gpu_tile_obj_tag_get_by_range_start thumb_func_end gpu_tile_obj_tag_get_by_range_start
@ -4056,7 +3979,6 @@ gpu_tile_obj_tag_add: ; 80086C4
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_tile_obj_tag_add thumb_func_end gpu_tile_obj_tag_add
@ -4084,7 +4006,6 @@ gpu_pal_allocator_reset: ; 800870C
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_pal_allocator_reset thumb_func_end gpu_pal_allocator_reset
@ -4118,7 +4039,6 @@ gpu_pal_obj_alloc_tag_and_apply: ; 8008744
bl gpu_pal_obj_load bl gpu_pal_obj_load
adds r0, r4, 0 adds r0, r4, 0
b @0800878A b @0800878A
.align 2, 0
.pool .pool
@08008788: @08008788:
movs r0, 0xFF movs r0, 0xFF
@ -4189,7 +4109,6 @@ gpu_pal_alloc_new: ; 80087D4
strh r4, [r0] strh r4, [r0]
adds r0, r2, 0 adds r0, r2, 0
b @080087FE b @080087FE
.align 2, 0
.pool .pool
@080087FC: @080087FC:
movs r0, 0xFF movs r0, 0xFF
@ -4218,7 +4137,6 @@ gpu_pal_tags_index_of: ; 8008804
bne @0800882C bne @0800882C
adds r0, r1, 0 adds r0, r1, 0
b @08008838 b @08008838
.align 2, 0
.pool .pool
@0800882C: @0800882C:
adds r0, r1, 0x1 adds r0, r1, 0x1
@ -4241,7 +4159,6 @@ gpu_pal_tag_by_index: ; 800883C
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end gpu_pal_tag_by_index thumb_func_end gpu_pal_tag_by_index
@ -4264,7 +4181,6 @@ gpu_pal_free_tag: ; 800884C
@08008868: @08008868:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end gpu_pal_free_tag thumb_func_end gpu_pal_free_tag
@ -4291,7 +4207,6 @@ super_sprite_add: ; 8008880
bcc @08008898 bcc @08008898
movs r0, 0x1 movs r0, 0x1
b @080088E0 b @080088E0
.align 2, 0
.pool .pool
@08008898: @08008898:
ldr r0, [r4, 0x18] ldr r0, [r4, 0x18]
@ -4319,7 +4234,6 @@ super_sprite_add: ; 8008880
strb r0, [r3] strb r0, [r3]
movs r0, 0 movs r0, 0
b @080088E0 b @080088E0
.align 2, 0
.pool .pool
@080088CC: @080088CC:
ldrb r1, [r3] ldrb r1, [r3]
@ -4335,7 +4249,6 @@ super_sprite_add: ; 8008880
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end super_sprite_add thumb_func_end super_sprite_add
@ -4359,7 +4272,6 @@ sub_80088EC: ; 80088EC
@08008908: @08008908:
movs r0, 0x1 movs r0, 0x1
b @08008AE6 b @08008AE6
.align 2, 0
.pool .pool
@08008910: @08008910:
adds r0, r3, 0 adds r0, r3, 0
@ -4614,6 +4526,5 @@ sub_80088EC: ; 80088EC
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end sub_80088EC thumb_func_end sub_80088EC

16
asm/gpu_reg_manager.s
View File

@ -36,7 +36,6 @@ lcd_io_copy_queue_clean: ; 8000FE4
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end lcd_io_copy_queue_clean thumb_func_end lcd_io_copy_queue_clean
@ -59,7 +58,6 @@ lcd_io_buffer_to_hardware: ; 800103C
orrs r0, r1 orrs r0, r1
strh r0, [r2] strh r0, [r2]
b @08001076 b @08001076
.align 2, 0
.pool .pool
@08001068: @08001068:
movs r0, 0x80 movs r0, 0x80
@ -72,7 +70,6 @@ lcd_io_buffer_to_hardware: ; 800103C
@08001076: @08001076:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end lcd_io_buffer_to_hardware thumb_func_end lcd_io_buffer_to_hardware
@ -101,7 +98,6 @@ lcd_io_copy_queue_process: ; 8001080
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end lcd_io_copy_queue_process thumb_func_end lcd_io_copy_queue_process
@ -138,7 +134,6 @@ lcd_io_set: ; 80010B4
adds r0, r4, 0 adds r0, r4, 0
bl lcd_io_buffer_to_hardware bl lcd_io_buffer_to_hardware
b @08001130 b @08001130
.align 2, 0
.pool .pool
@080010F8: @080010F8:
movs r0, 0 movs r0, 0
@ -176,7 +171,6 @@ lcd_io_set: ; 80010B4
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end lcd_io_set thumb_func_end lcd_io_set
@ -203,7 +197,6 @@ lcd_io_set_forced_blank: ; 8001140
adds r0, r4, 0 adds r0, r4, 0
bl lcd_io_buffer_to_hardware bl lcd_io_buffer_to_hardware
b @080011A8 b @080011A8
.align 2, 0
.pool .pool
@08001170: @08001170:
movs r0, 0 movs r0, 0
@ -241,7 +234,6 @@ lcd_io_set_forced_blank: ; 8001140
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end lcd_io_set_forced_blank thumb_func_end lcd_io_set_forced_blank
@ -256,7 +248,6 @@ lcd_io_get: ; 80011B8
bne @080011CC bne @080011CC
ldr r0, =0x04000004 ldr r0, =0x04000004
b @080011DE b @080011DE
.align 2, 0
.pool .pool
@080011CC: @080011CC:
cmp r1, 0x6 cmp r1, 0x6
@ -265,7 +256,6 @@ lcd_io_get: ; 80011B8
adds r0, r1, r0 adds r0, r1, r0
ldrh r0, [r0] ldrh r0, [r0]
b @080011E0 b @080011E0
.align 2, 0
.pool .pool
@080011DC: @080011DC:
ldr r0, =0x04000006 ldr r0, =0x04000006
@ -274,7 +264,6 @@ lcd_io_get: ; 80011B8
@080011E0: @080011E0:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end lcd_io_get thumb_func_end lcd_io_get
@ -294,7 +283,6 @@ lcd_io_set_bits: ; 80011E8
bl lcd_io_set bl lcd_io_set
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end lcd_io_set_bits thumb_func_end lcd_io_set_bits
@ -314,7 +302,6 @@ lcd_io_clear_bits: ; 8001208
bl lcd_io_set bl lcd_io_set
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end lcd_io_clear_bits thumb_func_end lcd_io_clear_bits
@ -340,7 +327,6 @@ update_hardware_IE: ; 8001228
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end update_hardware_IE thumb_func_end update_hardware_IE
@ -363,7 +349,6 @@ enable_irqs: ; 800125C
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end enable_irqs thumb_func_end enable_irqs
@ -386,7 +371,6 @@ disable_irqs: ; 8001288
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end disable_irqs thumb_func_end disable_irqs

28
asm/libagbbackup.s
View File

@ -14,7 +14,6 @@ SwitchFlashBank: ; 82E185C
lsls r1, 20 lsls r1, 20
strb r0, [r1] strb r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end SwitchFlashBank thumb_func_end SwitchFlashBank
@ -39,7 +38,6 @@ ReadFlashID: ; 82E1880
ldr r2, =0x00004e20 ldr r2, =0x00004e20
adds r0, r2, 0 adds r0, r2, 0
b @082E18B8 b @082E18B8
.align 2, 0
.pool .pool
@082E18B4: @082E18B4:
ldrh r0, [r1] ldrh r0, [r1]
@ -72,7 +70,6 @@ ReadFlashID: ; 82E1880
ldr r2, =0x00004e20 ldr r2, =0x00004e20
adds r0, r2, 0 adds r0, r2, 0
b @082E1908 b @082E1908
.align 2, 0
.pool .pool
@082E1904: @082E1904:
ldrh r0, [r1] ldrh r0, [r1]
@ -109,7 +106,6 @@ FlashTimerIntr: ; 82E191C
@082E1938: @082E1938:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end FlashTimerIntr thumb_func_end FlashTimerIntr
@ -134,7 +130,6 @@ SetFlashTimerIntr: ; 82E1944
str r0, [r2] str r0, [r2]
movs r0, 0 movs r0, 0
b @082E197A b @082E197A
.align 2, 0
.pool .pool
@082E1978: @082E1978:
movs r0, 0x1 movs r0, 0x1
@ -210,7 +205,6 @@ StartFlashTimer: ; 82E1980
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end StartFlashTimer thumb_func_end StartFlashTimer
@ -239,7 +233,6 @@ StopFlashTimer: ; 82E1A28
ldrh r0, [r0] ldrh r0, [r0]
strh r0, [r3] strh r0, [r3]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StopFlashTimer thumb_func_end StopFlashTimer
@ -266,7 +259,6 @@ SetReadFlash1: ; 82E1A70
subs r0, r1 subs r0, r1
lsls r0, 15 lsls r0, 15
b @082E1AA4 b @082E1AA4
.align 2, 0
.pool .pool
@082E1A98: @082E1A98:
ldrh r0, [r3] ldrh r0, [r3]
@ -345,7 +337,6 @@ ReadFlash: ; 82E1AD4
subs r0, r1 subs r0, r1
lsls r0, 15 lsls r0, 15
b @082E1B40 b @082E1B40
.align 2, 0
.pool .pool
@082E1B34: @082E1B34:
ldrh r0, [r3] ldrh r0, [r3]
@ -376,7 +367,6 @@ ReadFlash: ; 82E1AD4
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end ReadFlash thumb_func_end ReadFlash
@ -448,7 +438,6 @@ VerifyFlashSector: ; 82E1BA0
subs r0, r1 subs r0, r1
lsls r0, 15 lsls r0, 15
b @082E1C08 b @082E1C08
.align 2, 0
.pool .pool
@082E1BFC: @082E1BFC:
ldrh r0, [r3] ldrh r0, [r3]
@ -478,7 +467,6 @@ VerifyFlashSector: ; 82E1BA0
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end VerifyFlashSector thumb_func_end VerifyFlashSector
@ -520,7 +508,6 @@ VerifyFlashSectorFirstNBytes: ; 82E1C38
subs r0, r1 subs r0, r1
lsls r0, 15 lsls r0, 15
b @082E1CA0 b @082E1CA0
.align 2, 0
.pool .pool
@082E1C94: @082E1C94:
ldrh r0, [r3] ldrh r0, [r3]
@ -550,7 +537,6 @@ VerifyFlashSectorFirstNBytes: ; 82E1C38
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end VerifyFlashSectorFirstNBytes thumb_func_end VerifyFlashSectorFirstNBytes
@ -589,7 +575,6 @@ ProgramFlashSectorsAndVerify: ; 82E1CD0
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end ProgramFlashSectorsAndVerify thumb_func_end ProgramFlashSectorsAndVerify
@ -630,7 +615,6 @@ ProgramFlashSectorsVerifyFirstNBytes: ; 82E1D14
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end ProgramFlashSectorsVerifyFirstNBytes thumb_func_end ProgramFlashSectorsVerifyFirstNBytes
@ -651,7 +635,6 @@ IdentifyFlash: ; 82E1D5C
ldr r2, =gUnknown_089A30D0 ldr r2, =gUnknown_089A30D0
movs r4, 0x1 movs r4, 0x1
b @082E1D8A b @082E1D8A
.align 2, 0
.pool .pool
@082E1D88: @082E1D88:
adds r2, 0x4 adds r2, 0x4
@ -699,7 +682,6 @@ IdentifyFlash: ; 82E1D5C
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end IdentifyFlash thumb_func_end IdentifyFlash
@ -722,7 +704,6 @@ PollingSR_COMMON: ; 82E1DFC
ldr r1, =0x0e005555 ldr r1, =0x0e005555
mov r9, r1 mov r9, r1
b @082E1E60 b @082E1E60
.align 2, 0
.pool .pool
@082E1E28: @082E1E28:
movs r0, 0xF0 movs r0, 0xF0
@ -752,7 +733,6 @@ PollingSR_COMMON: ; 82E1DFC
orrs r7, r0 orrs r7, r0
mov r8, r7 mov r8, r7
b @082E1E88 b @082E1E88
.align 2, 0
.pool .pool
@082E1E60: @082E1E60:
ldr r1, [r6] ldr r1, [r6]
@ -829,7 +809,6 @@ EraseFlashChip: ; 82E1E9C
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end EraseFlashChip thumb_func_end EraseFlashChip
@ -846,7 +825,6 @@ EraseFlashSector: ; 82E1F10
bcc @082E1F30 bcc @082E1F30
ldr r0, =0x000080ff ldr r0, =0x000080ff
b @082E1FD0 b @082E1FD0
.align 2, 0
.pool .pool
@082E1F30: @082E1F30:
lsrs r0, r6, 4 lsrs r0, r6, 4
@ -906,7 +884,6 @@ EraseFlashSector: ; 82E1F10
lsls r0, 16 lsls r0, 16
lsrs r7, r0, 16 lsrs r7, r0, 16
b @082E1F40 b @082E1F40
.align 2, 0
.pool .pool
@082E1FC0: @082E1FC0:
ldr r2, =0x04000204 ldr r2, =0x04000204
@ -922,7 +899,6 @@ EraseFlashSector: ; 82E1F10
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end EraseFlashSector thumb_func_end EraseFlashSector
@ -981,7 +957,6 @@ ProgramFlashByte: ; 82E1FE0
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
b @082E206C b @082E206C
.align 2, 0
.pool .pool
@082E2068: @082E2068:
movs r0, 0x80 movs r0, 0x80
@ -1016,7 +991,6 @@ ProgramFlashByteInternal: ; 82E2074
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end ProgramFlashByteInternal thumb_func_end ProgramFlashByteInternal
@ -1034,7 +1008,6 @@ ProgramFlashSector: ; 82E20AC
bcc @082E20CC bcc @082E20CC
ldr r0, =0x000080ff ldr r0, =0x000080ff
b @082E2146 b @082E2146
.align 2, 0
.pool .pool
@082E20CC: @082E20CC:
adds r0, r4, 0 adds r0, r4, 0
@ -1070,7 +1043,6 @@ ProgramFlashSector: ; 82E20AC
adds r4, r0 adds r4, r0
adds r6, r1, 0 adds r6, r1, 0
b @082E212E b @082E212E
.align 2, 0
.pool .pool
@082E2124: @082E2124:
ldrh r0, [r6] ldrh r0, [r6]

1
asm/libagbsyscall.s
View File

@ -88,7 +88,6 @@ SoftReset: ; 82E70AC
mov sp, r1 mov sp, r1
swi 0x1 swi 0x1
swi 0 swi 0
.align 2, 0
.pool .pool
thumb_func_end SoftReset thumb_func_end SoftReset

35
asm/librtc.s
View File

@ -10,7 +10,6 @@ RTC_SetReadWrite: ; 82E2150
pop {r7} pop {r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end RTC_SetReadWrite thumb_func_end RTC_SetReadWrite
@ -26,7 +25,6 @@ RTC_SetReadOnly: ; 82E2168
pop {r7} pop {r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end RTC_SetReadOnly thumb_func_end RTC_SetReadOnly
@ -157,7 +155,6 @@ RTC_Reset: ; 82E2258
bne @082E2270 bne @082E2270
movs r0, 0 movs r0, 0
b @082E22D4 b @082E22D4
.align 2, 0
.pool .pool
@082E2270: @082E2270:
ldr r0, =0x03001a7e ldr r0, =0x03001a7e
@ -202,7 +199,6 @@ RTC_Reset: ; 82E2258
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r1, 0 adds r0, r1, 0
b @082E22D4 b @082E22D4
.align 2, 0
.pool .pool
@082E22D4: @082E22D4:
add sp, 0x10 add sp, 0x10
@ -212,7 +208,7 @@ RTC_Reset: ; 82E2258
thumb_func_end RTC_Reset thumb_func_end RTC_Reset
thumb_func_start RTC_GetControlReg thumb_func_start RTC_GetControlReg
; u8 RTC_GetControlReg(struct RtcInfo *rtc) ; u8 RTC_GetControlReg(struct RTCInfo *rtc)
RTC_GetControlReg: ; 82E22DC RTC_GetControlReg: ; 82E22DC
push {r4,r7,lr} push {r4,r7,lr}
sub sp, 0x8 sub sp, 0x8
@ -224,7 +220,6 @@ RTC_GetControlReg: ; 82E22DC
bne @082E22F4 bne @082E22F4
movs r0, 0 movs r0, 0
b @082E23A0 b @082E23A0
.align 2, 0
.pool .pool
@082E22F4: @082E22F4:
ldr r0, =0x03001a7e ldr r0, =0x03001a7e
@ -305,7 +300,6 @@ RTC_GetControlReg: ; 82E22DC
strb r1, [r0] strb r1, [r0]
movs r0, 0x1 movs r0, 0x1
b @082E23A0 b @082E23A0
.align 2, 0
.pool .pool
@082E23A0: @082E23A0:
add sp, 0x8 add sp, 0x8
@ -315,7 +309,7 @@ RTC_GetControlReg: ; 82E22DC
thumb_func_end RTC_GetControlReg thumb_func_end RTC_GetControlReg
thumb_func_start RTC_SetControlReg thumb_func_start RTC_SetControlReg
; u8 RTC_SetControlReg(struct RtcInfo *rtc) ; u8 RTC_SetControlReg(struct RTCInfo *rtc)
RTC_SetControlReg: ; 82E23A8 RTC_SetControlReg: ; 82E23A8
push {r4,r7,lr} push {r4,r7,lr}
sub sp, 0x8 sub sp, 0x8
@ -327,7 +321,6 @@ RTC_SetControlReg: ; 82E23A8
bne @082E23C0 bne @082E23C0
movs r0, 0 movs r0, 0
b @082E2448 b @082E2448
.align 2, 0
.pool .pool
@082E23C0: @082E23C0:
ldr r0, =0x03001a7e ldr r0, =0x03001a7e
@ -389,7 +382,6 @@ RTC_SetControlReg: ; 82E23A8
strb r1, [r0] strb r1, [r0]
movs r0, 0x1 movs r0, 0x1
b @082E2448 b @082E2448
.align 2, 0
.pool .pool
@082E2448: @082E2448:
add sp, 0x8 add sp, 0x8
@ -411,7 +403,6 @@ RTC_GetDateTime: ; 82E2450
bne @082E2468 bne @082E2468
movs r0, 0 movs r0, 0
b @082E24F8 b @082E24F8
.align 2, 0
.pool .pool
@082E2468: @082E2468:
ldr r0, =0x03001a7e ldr r0, =0x03001a7e
@ -440,7 +431,6 @@ RTC_GetDateTime: ; 82E2450
cmp r1, 0x6 cmp r1, 0x6
bls @082E24A8 bls @082E24A8
b @082E24C6 b @082E24C6
.align 2, 0
.pool .pool
@082E24A8: @082E24A8:
bl RTC_ReadByte bl RTC_ReadByte
@ -479,7 +469,6 @@ RTC_GetDateTime: ; 82E2450
strb r1, [r0] strb r1, [r0]
movs r0, 0x1 movs r0, 0x1
b @082E24F8 b @082E24F8
.align 2, 0
.pool .pool
@082E24F8: @082E24F8:
add sp, 0x8 add sp, 0x8
@ -501,7 +490,6 @@ RTC_SetDateTime: ; 82E2500
bne @082E2518 bne @082E2518
movs r0, 0 movs r0, 0
b @082E2594 b @082E2594
.align 2, 0
.pool .pool
@082E2518: @082E2518:
ldr r0, =0x03001a7e ldr r0, =0x03001a7e
@ -527,7 +515,6 @@ RTC_SetDateTime: ; 82E2500
cmp r1, 0x6 cmp r1, 0x6
bls @082E2554 bls @082E2554
b @082E2574 b @082E2574
.align 2, 0
.pool .pool
@082E2554: @082E2554:
adds r0, r7, 0x4 adds r0, r7, 0x4
@ -557,7 +544,6 @@ RTC_SetDateTime: ; 82E2500
strb r1, [r0] strb r1, [r0]
movs r0, 0x1 movs r0, 0x1
b @082E2594 b @082E2594
.align 2, 0
.pool .pool
@082E2594: @082E2594:
add sp, 0x8 add sp, 0x8
@ -579,7 +565,6 @@ RTC_GetTime: ; 82E259C
bne @082E25B4 bne @082E25B4
movs r0, 0 movs r0, 0
b @082E2648 b @082E2648
.align 2, 0
.pool .pool
@082E25B4: @082E25B4:
ldr r0, =0x03001a7e ldr r0, =0x03001a7e
@ -608,7 +593,6 @@ RTC_GetTime: ; 82E259C
cmp r1, 0x2 cmp r1, 0x2
bls @082E25F4 bls @082E25F4
b @082E2614 b @082E2614
.align 2, 0
.pool .pool
@082E25F4: @082E25F4:
bl RTC_ReadByte bl RTC_ReadByte
@ -648,7 +632,6 @@ RTC_GetTime: ; 82E259C
strb r1, [r0] strb r1, [r0]
movs r0, 0x1 movs r0, 0x1
b @082E2648 b @082E2648
.align 2, 0
.pool .pool
@082E2648: @082E2648:
add sp, 0x8 add sp, 0x8
@ -670,7 +653,6 @@ RTC_SetTime: ; 82E2650
bne @082E2668 bne @082E2668
movs r0, 0 movs r0, 0
b @082E26E4 b @082E26E4
.align 2, 0
.pool .pool
@082E2668: @082E2668:
ldr r0, =0x03001a7e ldr r0, =0x03001a7e
@ -696,7 +678,6 @@ RTC_SetTime: ; 82E2650
cmp r1, 0x2 cmp r1, 0x2
bls @082E26A4 bls @082E26A4
b @082E26C6 b @082E26C6
.align 2, 0
.pool .pool
@082E26A4: @082E26A4:
adds r0, r7, 0x4 adds r0, r7, 0x4
@ -727,7 +708,6 @@ RTC_SetTime: ; 82E2650
strb r1, [r0] strb r1, [r0]
movs r0, 0x1 movs r0, 0x1
b @082E26E4 b @082E26E4
.align 2, 0
.pool .pool
@082E26E4: @082E26E4:
add sp, 0x8 add sp, 0x8
@ -737,7 +717,7 @@ RTC_SetTime: ; 82E2650
thumb_func_end RTC_SetTime thumb_func_end RTC_SetTime
thumb_func_start RTC_SetUnknownData thumb_func_start RTC_SetUnknownData
; u8 RTC_SetUnknownData(struct RtcInfo *rtc) ; u8 RTC_SetUnknownData(struct RTCInfo *rtc)
RTC_SetUnknownData: ; 82E26EC RTC_SetUnknownData: ; 82E26EC
push {r4,r7,lr} push {r4,r7,lr}
sub sp, 0xC sub sp, 0xC
@ -749,7 +729,6 @@ RTC_SetUnknownData: ; 82E26EC
bne @082E2704 bne @082E2704
movs r0, 0 movs r0, 0
b @082E2818 b @082E2818
.align 2, 0
.pool .pool
@082E2704: @082E2704:
ldr r0, =0x03001a7e ldr r0, =0x03001a7e
@ -803,7 +782,6 @@ RTC_SetUnknownData: ; 82E26EC
adds r1, r2, 0 adds r1, r2, 0
strb r1, [r0] strb r1, [r0]
b @082E278E b @082E278E
.align 2, 0
.pool .pool
@082E2770: @082E2770:
adds r0, r7, 0 adds r0, r7, 0
@ -854,7 +832,6 @@ RTC_SetUnknownData: ; 82E26EC
cmp r1, 0x1 cmp r1, 0x1
bls @082E27D8 bls @082E27D8
b @082E27FA b @082E27FA
.align 2, 0
.pool .pool
@082E27D8: @082E27D8:
adds r0, r7, 0 adds r0, r7, 0
@ -885,7 +862,6 @@ RTC_SetUnknownData: ; 82E26EC
strb r1, [r0] strb r1, [r0]
movs r0, 0x1 movs r0, 0x1
b @082E2818 b @082E2818
.align 2, 0
.pool .pool
@082E2818: @082E2818:
add sp, 0xC add sp, 0xC
@ -975,7 +951,6 @@ RTC_WriteByte: ; 82E2820
adds r3, r2, 0 adds r3, r2, 0
strb r3, [r1] strb r3, [r1]
b @082E2832 b @082E2832
.align 2, 0
.pool .pool
@082E28BC: @082E28BC:
add sp, 0x4 add sp, 0x4
@ -1063,7 +1038,6 @@ RTC_WriteByteReversed: ; 82E28C4
adds r3, r2, 0 adds r3, r2, 0
strb r3, [r1] strb r3, [r1]
b @082E28D6 b @082E28D6
.align 2, 0
.pool .pool
@082E295C: @082E295C:
add sp, 0x4 add sp, 0x4
@ -1136,7 +1110,6 @@ RTC_ReadByte: ; 82E2964
adds r2, r1, 0 adds r2, r1, 0
strb r2, [r0] strb r2, [r0]
b @082E2970 b @082E2970
.align 2, 0
.pool .pool
@082E29E0: @082E29E0:
adds r0, r7, 0x2 adds r0, r7, 0x2
@ -1161,7 +1134,6 @@ RTC_SetReadWriteInternal: ; 82E29F0
pop {r7} pop {r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end RTC_SetReadWriteInternal thumb_func_end RTC_SetReadWriteInternal
@ -1176,6 +1148,5 @@ RTC_SetReadOnlyInternal: ; 82E2A04
pop {r7} pop {r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end RTC_SetReadOnlyInternal thumb_func_end RTC_SetReadOnlyInternal

28
asm/main.s
View File

@ -79,7 +79,6 @@ Main:
movs r0, 0 movs r0, 0
strb r0, [r6] strb r0, [r6]
b @080004B2 b @080004B2
.align 2, 0
.pool .pool
@0800048C: @0800048C:
ldr r5, =0x030022b4 ldr r5, =0x030022b4
@ -102,7 +101,6 @@ Main:
bl sound_something bl sound_something
bl wait_for_vblank bl wait_for_vblank
b @0800042A b @0800042A
.align 2, 0
.pool .pool
thumb_func_end Main thumb_func_end Main
@ -141,7 +139,6 @@ init_saveblock_ptrs_and_set_copyright_callback2: ; 80004D8
str r0, [r1] str r0, [r1]
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end init_saveblock_ptrs_and_set_copyright_callback2 thumb_func_end init_saveblock_ptrs_and_set_copyright_callback2
@ -163,7 +160,6 @@ call_callbacks: ; 800051C
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end call_callbacks thumb_func_end call_callbacks
@ -178,7 +174,6 @@ set_callback2: ; 8000540
movs r0, 0 movs r0, 0
strb r0, [r1] strb r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end set_callback2 thumb_func_end set_callback2
@ -189,7 +184,6 @@ start_timer1: ; 8000554
movs r0, 0x80 movs r0, 0x80
strh r0, [r1] strh r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end start_timer1 thumb_func_end start_timer1
@ -209,7 +203,6 @@ set_rand_seed_and_trainer_id_hi: ; 8000560
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end set_rand_seed_and_trainer_id_hi thumb_func_end set_rand_seed_and_trainer_id_hi
@ -219,7 +212,6 @@ get_trainer_id_hi: ; 8000588
ldr r0, =0x02020000 ldr r0, =0x02020000
ldrh r0, [r0] ldrh r0, [r0]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end get_trainer_id_hi thumb_func_end get_trainer_id_hi
@ -262,7 +254,6 @@ init_keypad_data: ; 80005BC
strh r0, [r1, 0x28] strh r0, [r1, 0x28]
strh r0, [r1, 0x2A] strh r0, [r1, 0x2A]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end init_keypad_data thumb_func_end init_keypad_data
@ -298,7 +289,6 @@ load_keys: ; 80005E4
strh r3, [r2, 0x30] strh r3, [r2, 0x30]
ldr r0, =0x030026fc ldr r0, =0x030026fc
b @08000632 b @08000632
.align 2, 0
.pool .pool
@08000630: @08000630:
ldr r0, =0x030022b0 ldr r0, =0x030022b0
@ -343,7 +333,6 @@ load_keys: ; 80005E4
@08000676: @08000676:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end load_keys thumb_func_end load_keys
@ -384,7 +373,6 @@ init_irq_handler: ; 8000684
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end init_irq_handler thumb_func_end init_irq_handler
@ -394,7 +382,6 @@ SetVBlankCallback: ; 80006F0
ldr r1, =0x030022c0 ldr r1, =0x030022c0
str r0, [r1, 0xC] str r0, [r1, 0xC]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end SetVBlankCallback thumb_func_end SetVBlankCallback
@ -404,7 +391,6 @@ SetHBlankCallback: ; 80006FC
ldr r1, =0x030022c0 ldr r1, =0x030022c0
str r0, [r1, 0x10] str r0, [r1, 0x10]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end SetHBlankCallback thumb_func_end SetHBlankCallback
@ -413,7 +399,6 @@ SetVCountCallback: ; 8000708
ldr r1, =0x030022c0 ldr r1, =0x030022c0
str r0, [r1, 0x14] str r0, [r1, 0x14]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end SetVCountCallback thumb_func_end SetVCountCallback
@ -426,7 +411,6 @@ restore_serial_timer3_irq_handlers: ; 8000714
ldr r1, =irq_timer3 ldr r1, =irq_timer3
str r1, [r0, 0x8] str r1, [r0, 0x8]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end restore_serial_timer3_irq_handlers thumb_func_end restore_serial_timer3_irq_handlers
@ -436,7 +420,6 @@ set_serial_callback: ; 800072C
ldr r1, =0x030022c0 ldr r1, =0x030022c0
str r0, [r1, 0x18] str r0, [r1, 0x18]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end set_serial_callback thumb_func_end set_serial_callback
@ -450,7 +433,6 @@ irq_vblank: ; 8000738
beq @0800074C beq @0800074C
bl rfu_syncVBlank__ bl rfu_syncVBlank__
b @08000758 b @08000758
.align 2, 0
.pool .pool
@0800074C: @0800074C:
ldr r0, =0x03002748 ldr r0, =0x03002748
@ -522,7 +504,6 @@ irq_vblank: ; 8000738
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end irq_vblank thumb_func_end irq_vblank
@ -535,7 +516,6 @@ flash_timeout_start_on_timer_2: ; 8000800
bl SetFlashTimerIntr bl SetFlashTimerIntr
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end flash_timeout_start_on_timer_2 thumb_func_end flash_timeout_start_on_timer_2
@ -561,7 +541,6 @@ irq_hblank: ; 8000814
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end irq_hblank thumb_func_end irq_hblank
@ -588,7 +567,6 @@ irq_vcount: ; 8000844
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end irq_vcount thumb_func_end irq_vcount
@ -614,7 +592,6 @@ irq_serial: ; 8000878
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end irq_serial thumb_func_end irq_serial
@ -649,7 +626,6 @@ wait_for_vblank: ; 80008AC
@080008D0: @080008D0:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end wait_for_vblank thumb_func_end wait_for_vblank
@ -658,7 +634,6 @@ sub_80008DC: ; 80008DC
ldr r1, =0x0203cf5c ldr r1, =0x0203cf5c
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end sub_80008DC thumb_func_end sub_80008DC
@ -668,7 +643,6 @@ sub_80008E8: ; 80008E8
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end sub_80008E8 thumb_func_end sub_80008E8
@ -717,7 +691,6 @@ do_reset: ; 80008F4
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end do_reset thumb_func_end do_reset
@ -735,6 +708,5 @@ sub_8000964: ; 8000964
add sp, 0x4 add sp, 0x4
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_8000964 thumb_func_end sub_8000964

8
asm/malloc.s
View File

@ -12,7 +12,6 @@ malloc_header: ; 8000988
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end malloc_header thumb_func_end malloc_header
@ -227,7 +226,6 @@ check_memblk_core: ; 8000AC4
@08000B0A: @08000B0A:
movs r0, 0 movs r0, 0
b @08000B16 b @08000B16
.align 2, 0
.pool .pool
@08000B14: @08000B14:
movs r0, 0x1 movs r0, 0x1
@ -248,7 +246,6 @@ init_malloc: ; 8000B1C
bl malloc_unlinked_header bl malloc_unlinked_header
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end init_malloc thumb_func_end init_malloc
@ -262,7 +259,6 @@ malloc: ; 8000B38
bl malloc_core bl malloc_core
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end malloc thumb_func_end malloc
@ -276,7 +272,6 @@ malloc_and_clear: ; 8000B4C
bl malloc_core_and_clear bl malloc_core_and_clear
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end malloc_and_clear thumb_func_end malloc_and_clear
@ -290,7 +285,6 @@ free: ; 8000B60
bl free_core bl free_core
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end free thumb_func_end free
@ -304,7 +298,6 @@ check_memblk: ; 8000B74
bl check_memblk_core bl check_memblk_core
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end check_memblk thumb_func_end check_memblk
@ -328,7 +321,6 @@ check_all_memblks: ; 8000B88
bne @08000B90 bne @08000B90
movs r0, 0x1 movs r0, 0x1
b @08000BB2 b @08000BB2
.align 2, 0
.pool .pool
@08000BB0: @08000BB0:
movs r0, 0 movs r0, 0

15
asm/multiboot.s
View File

@ -23,7 +23,6 @@ MultiBootInit: ; 81BA6D0
ldr r0, =0x0400012a ldr r0, =0x0400012a
strh r1, [r0] strh r1, [r0]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end MultiBootInit thumb_func_end MultiBootInit
@ -70,7 +69,6 @@ MultiBootMain: ; 81BA70C
movs r0, 0x8 movs r0, 0x8
eors r0, r5 eors r0, r5
b @081BAAEC b @081BAAEC
.align 2, 0
.pool .pool
@081BA760: @081BA760:
ldrb r0, [r7, 0x18] ldrb r0, [r7, 0x18]
@ -174,7 +172,6 @@ MultiBootMain: ; 81BA70C
beq @081BA82C beq @081BA82C
ldr r0, =0x00007208 ldr r0, =0x00007208
b @081BA852 b @081BA852
.align 2, 0
.pool .pool
@081BA82C: @081BA82C:
subs r5, 0x1 subs r5, 0x1
@ -221,7 +218,6 @@ MultiBootMain: ; 81BA70C
adds r0, r7, 0 adds r0, r7, 0
bl MultiBootStartProbe bl MultiBootStartProbe
b @081BA892 b @081BA892
.align 2, 0
.pool .pool
@081BA884: @081BA884:
subs r0, 0x1 subs r0, 0x1
@ -278,7 +274,6 @@ MultiBootMain: ; 81BA70C
movs r2, 0xC2 movs r2, 0xC2
lsls r2, 7 lsls r2, 7
b @081BA992 b @081BA992
.align 2, 0
.pool .pool
@081BA8F0: @081BA8F0:
movs r5, 0x3 movs r5, 0x3
@ -316,7 +311,6 @@ MultiBootMain: ; 81BA70C
cmp r5, 0 cmp r5, 0
bne @081BA904 bne @081BA904
b @081BAA90 b @081BAA90
.align 2, 0
.pool .pool
@081BA93C: @081BA93C:
movs r3, 0x1 movs r3, 0x1
@ -371,7 +365,6 @@ MultiBootMain: ; 81BA70C
adds r0, r7, 0 adds r0, r7, 0
bl MultiBootSend bl MultiBootSend
b @081BAAEC b @081BAAEC
.align 2, 0
.pool .pool
@081BA9A8: @081BA9A8:
movs r0, 0xD1 movs r0, 0xD1
@ -429,7 +422,6 @@ MultiBootMain: ; 81BA70C
adds r0, 0xB0 adds r0, 0xB0
strh r0, [r7, 0x16] strh r0, [r7, 0x16]
b @081BAAEA b @081BAAEA
.align 2, 0
.pool .pool
@081BAA18: @081BAA18:
adds r0, r7, 0 adds r0, r7, 0
@ -492,7 +484,6 @@ MultiBootMain: ; 81BA70C
strb r0, [r7, 0x1E] strb r0, [r7, 0x1E]
strb r5, [r7, 0x18] strb r5, [r7, 0x18]
b @081BA88A b @081BA88A
.align 2, 0
.pool .pool
@081BAA90: @081BAA90:
mov r1, r12 mov r1, r12
@ -576,7 +567,6 @@ MultiBootSend: ; 81BAAFC
strb r0, [r1] strb r0, [r1]
movs r0, 0 movs r0, 0
b @081BAB40 b @081BAB40
.align 2, 0
.pool .pool
@081BAB34: @081BAB34:
adds r0, r2, 0 adds r0, r2, 0
@ -650,7 +640,6 @@ MultiBootStartMaster: ; 81BAB6C
adds r0, r4, 0 adds r0, r4, 0
bl MultiBootInit bl MultiBootInit
b @081BAC28 b @081BAC28
.align 2, 0
.pool .pool
@081BABB4: @081BABB4:
adds r0, r6, r2 adds r0, r6, r2
@ -668,7 +657,6 @@ MultiBootStartMaster: ; 81BAB6C
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@081BABD8: @081BABD8:
@ -806,7 +794,6 @@ MultiBootHandShake: ; 81BAC44
adds r0, r3, 0 adds r0, r3, 0
bl MultiBootSend bl MultiBootSend
b @081BAD28 b @081BAD28
.align 2, 0
.pool .pool
@081BACD0: @081BACD0:
lsls r0, r4, 1 lsls r0, r4, 1
@ -845,7 +832,6 @@ MultiBootHandShake: ; 81BAC44
str r1, [r3] str r1, [r3]
str r1, [r3, 0x4] str r1, [r3, 0x4]
b @081BACC0 b @081BACC0
.align 2, 0
.pool .pool
@081BAD1C: @081BAD1C:
adds r0, r3, 0 adds r0, r3, 0
@ -907,6 +893,5 @@ MultiBootWaitSendDone: ; 81BAD48
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end MultiBootWaitSendDone thumb_func_end MultiBootWaitSendDone

36
asm/rtc.s
View File

@ -8,7 +8,6 @@ GameFreakRTC_ClearIME: ; 802F0CC
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end GameFreakRTC_ClearIME thumb_func_end GameFreakRTC_ClearIME
@ -20,7 +19,6 @@ GameFreakRTC_RestoreIME: ; 802F0E4
ldrh r1, [r1] ldrh r1, [r1]
strh r1, [r0] strh r1, [r0]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end GameFreakRTC_RestoreIME thumb_func_end GameFreakRTC_RestoreIME
@ -156,12 +154,11 @@ GameFreakRTC_ConvertYearMonthDayToNumDays: ; 802F154
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end GameFreakRTC_ConvertYearMonthDayToNumDays thumb_func_end GameFreakRTC_ConvertYearMonthDayToNumDays
thumb_func_start GameFreakRTC_GetNumDaysInternal thumb_func_start GameFreakRTC_GetNumDaysInternal
; u16 GameFreakRTC_GetNumDaysInternal(struct RtcInfo *rtc) ; u16 GameFreakRTC_GetNumDaysInternal(struct RTCInfo *rtc)
GameFreakRTC_GetNumDaysInternal: ; 802F1E0 GameFreakRTC_GetNumDaysInternal: ; 802F1E0
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
@ -211,7 +208,6 @@ GameFreakRTC_Init: ; 802F21C
movs r0, 0x1 movs r0, 0x1
strh r0, [r5] strh r0, [r5]
b @0802F26E b @0802F26E
.align 2, 0
.pool .pool
@0802F250: @0802F250:
movs r0, 0xF0 movs r0, 0xF0
@ -232,7 +228,6 @@ GameFreakRTC_Init: ; 802F21C
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end GameFreakRTC_Init thumb_func_end GameFreakRTC_Init
@ -242,12 +237,11 @@ GameFreakRTC_GetErrorFlags: ; 802F27C
ldr r0, =0x03000db8 ldr r0, =0x03000db8
ldrh r0, [r0] ldrh r0, [r0]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end GameFreakRTC_GetErrorFlags thumb_func_end GameFreakRTC_GetErrorFlags
thumb_func_start GameFreakRTC_GetRTCDateTime thumb_func_start GameFreakRTC_GetRTCDateTime
; void GameFreakRTC_GetRTCDateTime(struct RtcInfo *rtc) ; void GameFreakRTC_GetRTCDateTime(struct RTCInfo *rtc)
GameFreakRTC_GetRTCDateTime: ; 802F288 GameFreakRTC_GetRTCDateTime: ; 802F288
push {r4,lr} push {r4,lr}
adds r2, r0, 0 adds r2, r0, 0
@ -263,7 +257,6 @@ GameFreakRTC_GetRTCDateTime: ; 802F288
ldm r0!, {r2-r4} ldm r0!, {r2-r4}
stm r1!, {r2-r4} stm r1!, {r2-r4}
b @0802F2B2 b @0802F2B2
.align 2, 0
.pool .pool
@0802F2AC: @0802F2AC:
adds r0, r2, 0 adds r0, r2, 0
@ -275,7 +268,7 @@ GameFreakRTC_GetRTCDateTime: ; 802F288
thumb_func_end GameFreakRTC_GetRTCDateTime thumb_func_end GameFreakRTC_GetRTCDateTime
thumb_func_start GameFreakRTC_GetRTCDateTimeInternal thumb_func_start GameFreakRTC_GetRTCDateTimeInternal
; void GameFreakRTC_GetRTCDateTimeInternal(struct RtcInfo *rtc) ; void GameFreakRTC_GetRTCDateTimeInternal(struct RTCInfo *rtc)
GameFreakRTC_GetRTCDateTimeInternal: ; 802F2B8 GameFreakRTC_GetRTCDateTimeInternal: ; 802F2B8
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
@ -289,7 +282,7 @@ GameFreakRTC_GetRTCDateTimeInternal: ; 802F2B8
thumb_func_end GameFreakRTC_GetRTCDateTimeInternal thumb_func_end GameFreakRTC_GetRTCDateTimeInternal
thumb_func_start GameFreakRTC_GetControlReg thumb_func_start GameFreakRTC_GetControlReg
; void GameFreakRTC_GetControlReg(struct RtcInfo *rtc) ; void GameFreakRTC_GetControlReg(struct RTCInfo *rtc)
GameFreakRTC_GetControlReg: ; 802F2D0 GameFreakRTC_GetControlReg: ; 802F2D0
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
@ -303,7 +296,7 @@ GameFreakRTC_GetControlReg: ; 802F2D0
thumb_func_end GameFreakRTC_GetControlReg thumb_func_end GameFreakRTC_GetControlReg
thumb_func_start GameFreakRTC_GetControlRegAndRTCDateTime thumb_func_start GameFreakRTC_GetControlRegAndRTCDateTime
; void GameFreakRTC_GetControlRegAndRTCDateTime(struct RtcInfo *rtc) ; void GameFreakRTC_GetControlRegAndRTCDateTime(struct RTCInfo *rtc)
GameFreakRTC_GetControlRegAndRTCDateTime: ; 802F2E8 GameFreakRTC_GetControlRegAndRTCDateTime: ; 802F2E8
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
@ -316,7 +309,7 @@ GameFreakRTC_GetControlRegAndRTCDateTime: ; 802F2E8
thumb_func_end GameFreakRTC_GetControlRegAndRTCDateTime thumb_func_end GameFreakRTC_GetControlRegAndRTCDateTime
thumb_func_start GameFreakRTC_TestForErrors thumb_func_start GameFreakRTC_TestForErrors
; u16 GameFreakRTC_TestForErrors(struct RtcInfo *rtc) ; u16 GameFreakRTC_TestForErrors(struct RTCInfo *rtc)
GameFreakRTC_TestForErrors: ; 802F2FC GameFreakRTC_TestForErrors: ; 802F2FC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
@ -385,7 +378,6 @@ GameFreakRTC_TestForErrors: ; 802F2FC
ldr r1, [r1, 0x4] ldr r1, [r1, 0x4]
adds r0, r1 adds r0, r1
b @0802F38E b @0802F38E
.align 2, 0
.pool .pool
@0802F384: @0802F384:
ldr r0, =gDaysInEachMonth ldr r0, =gDaysInEachMonth
@ -445,7 +437,6 @@ GameFreakRTC_TestForErrors: ; 802F2FC
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end GameFreakRTC_TestForErrors thumb_func_end GameFreakRTC_TestForErrors
@ -518,9 +509,9 @@ GameFreakRTC_FormatHexTimeString: ; 802F444
bx r0 bx r0
thumb_func_end GameFreakRTC_FormatHexTimeString thumb_func_end GameFreakRTC_FormatHexTimeString
thumb_func_start GameFreakRTC_FormatHexTimeStringFromRtcInfo thumb_func_start GameFreakRTC_FormatHexTimeStringFromRTCInfo
; void GameFreakRTC_FormatHexTimeStringFromRtcInfo() ; void GameFreakRTC_FormatHexTimeStringFromRTCInfo()
GameFreakRTC_FormatHexTimeStringFromRtcInfo: ; 802F47C GameFreakRTC_FormatHexTimeStringFromRTCInfo: ; 802F47C
push {lr} push {lr}
ldr r3, =0x03000dc0 ldr r3, =0x03000dc0
ldrb r1, [r3, 0x4] ldrb r1, [r3, 0x4]
@ -529,9 +520,8 @@ GameFreakRTC_FormatHexTimeStringFromRtcInfo: ; 802F47C
bl GameFreakRTC_FormatHexTimeString bl GameFreakRTC_FormatHexTimeString
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end GameFreakRTC_FormatHexTimeStringFromRtcInfo thumb_func_end GameFreakRTC_FormatHexTimeStringFromRTCInfo
thumb_func_start GameFreakRTC_FormatDecimalYearMonthDayString thumb_func_start GameFreakRTC_FormatDecimalYearMonthDayString
; void GameFreakRTC_FormatDecimalYearMonthDayString(u8 *dest, s32 year, s32 month, s32 dayOfMonth) ; void GameFreakRTC_FormatDecimalYearMonthDayString(u8 *dest, s32 year, s32 month, s32 dayOfMonth)
@ -592,7 +582,7 @@ GameFreakRTC_FormatHexYearMonthDayString: ; 802F4CC
thumb_func_end GameFreakRTC_FormatHexYearMonthDayString thumb_func_end GameFreakRTC_FormatHexYearMonthDayString
thumb_func_start GameFreakRTC_GetRTCDelta thumb_func_start GameFreakRTC_GetRTCDelta
; void GameFreakRTC_GetRTCDelta(RtcInfo *rtc, GameDateTime *delta, GameDateTime *dateTime) ; void GameFreakRTC_GetRTCDelta(RTCInfo *rtc, GameDateTime *delta, GameDateTime *dateTime)
GameFreakRTC_GetRTCDelta: ; 802F504 GameFreakRTC_GetRTCDelta: ; 802F504
push {r4-r7,lr} push {r4-r7,lr}
adds r5, r0, 0 adds r5, r0, 0
@ -677,7 +667,6 @@ GameFreakRTC_CalcLocalDateTime: ; 802F588
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end GameFreakRTC_CalcLocalDateTime thumb_func_end GameFreakRTC_CalcLocalDateTime
@ -716,7 +705,6 @@ GameFreakRTC_CalcRTCToLocalDelta: ; 802F5C8
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end GameFreakRTC_CalcRTCToLocalDelta thumb_func_end GameFreakRTC_CalcRTCToLocalDelta
@ -805,7 +793,6 @@ GameFreakRTC_GetNumMinutes: ; 802F664
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end GameFreakRTC_GetNumMinutes thumb_func_end GameFreakRTC_GetNumMinutes
@ -819,6 +806,5 @@ GameFreakRTC_GetNumDays: ; 802F69C
lsrs r0, 16 lsrs r0, 16
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end GameFreakRTC_GetNumDays thumb_func_end GameFreakRTC_GetNumDays

26
asm/string_util.s
View File

@ -340,7 +340,6 @@ ConvertIntToDecimalString: ; 8008CC0
adds r0, r2, r6 adds r0, r2, r6
ldrb r0, [r0] ldrb r0, [r0]
b @08008D22 b @08008D22
.align 2, 0
.pool .pool
@08008D20: @08008D20:
movs r0, 0xAC movs r0, 0xAC
@ -440,7 +439,6 @@ ConvertUnsignedIntToDecimalString: ; 8008D70
adds r0, r2, r6 adds r0, r2, r6
ldrb r0, [r0] ldrb r0, [r0]
b @08008DD2 b @08008DD2
.align 2, 0
.pool .pool
@08008DD0: @08008DD0:
movs r0, 0xAC movs r0, 0xAC
@ -552,7 +550,6 @@ ConvertIntToHexString: ; 8008E20
adds r0, r4, r7 adds r0, r4, r7
ldrb r0, [r0] ldrb r0, [r0]
b @08008EAC b @08008EAC
.align 2, 0
.pool .pool
@08008E90: @08008E90:
cmp r4, 0 cmp r4, 0
@ -621,7 +618,6 @@ ExpandStringRefs: ; 8008EE0
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08008F00: @08008F00:
@ -655,7 +651,6 @@ ExpandStringRefs: ; 8008EE0
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08008F4C: @08008F4C:
@ -738,7 +733,6 @@ sub_8008FCC: ; 8008FCC
cmp r0, 0xFF cmp r0, 0xFF
bne @08009012 bne @08009012
b @0800901E b @0800901E
.align 2, 0
.pool .pool
@0800900C: @0800900C:
adds r0, r5, 0 adds r0, r5, 0
@ -765,7 +759,6 @@ sub_8008FCC: ; 8008FCC
StringRef_GetPossiblyUnusedStringVar: ; 800902C StringRef_GetPossiblyUnusedStringVar: ; 800902C
ldr r0, =0x020223ac ldr r0, =0x020223ac
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetPossiblyUnusedStringVar thumb_func_end StringRef_GetPossiblyUnusedStringVar
@ -775,7 +768,6 @@ StringRef_GetPlayerName: ; 8009034
ldr r0, =0x03005d90 ldr r0, =0x03005d90
ldr r0, [r0] ldr r0, [r0]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetPlayerName thumb_func_end StringRef_GetPlayerName
@ -784,7 +776,6 @@ StringRef_GetPlayerName: ; 8009034
StringRef_GetStringVar1: ; 8009040 StringRef_GetStringVar1: ; 8009040
ldr r0, =0x02021cc4 ldr r0, =0x02021cc4
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetStringVar1 thumb_func_end StringRef_GetStringVar1
@ -793,7 +784,6 @@ StringRef_GetStringVar1: ; 8009040
StringRef_GetStringVar2: ; 8009048 StringRef_GetStringVar2: ; 8009048
ldr r0, =0x02021dc4 ldr r0, =0x02021dc4
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetStringVar2 thumb_func_end StringRef_GetStringVar2
@ -802,7 +792,6 @@ StringRef_GetStringVar2: ; 8009048
StringRef_GetStringVar3: ; 8009050 StringRef_GetStringVar3: ; 8009050
ldr r0, =0x02021ec4 ldr r0, =0x02021ec4
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetStringVar3 thumb_func_end StringRef_GetStringVar3
@ -817,14 +806,12 @@ StringRef_GetDummiedOutGenderDependentString: ; 8009058
beq @08009070 beq @08009070
ldr r0, =gUnknown_085E821A ldr r0, =gUnknown_085E821A
b @08009072 b @08009072
.align 2, 0
.pool .pool
@08009070: @08009070:
ldr r0, =gUnknown_085E8219 ldr r0, =gUnknown_085E8219
@08009072: @08009072:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetDummiedOutGenderDependentString thumb_func_end StringRef_GetDummiedOutGenderDependentString
@ -839,14 +826,12 @@ StringRef_GetRivalName: ; 800907C
beq @08009094 beq @08009094
ldr r0, =gUnknown_085E8258 ldr r0, =gUnknown_085E8258
b @08009096 b @08009096
.align 2, 0
.pool .pool
@08009094: @08009094:
ldr r0, =gUnknown_085E8260 ldr r0, =gUnknown_085E8260
@08009096: @08009096:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetRivalName thumb_func_end StringRef_GetRivalName
@ -855,7 +840,6 @@ StringRef_GetRivalName: ; 800907C
StringRef_GetEmeraldString: ; 80090A0 StringRef_GetEmeraldString: ; 80090A0
ldr r0, =gUnknown_085E8229 ldr r0, =gUnknown_085E8229
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetEmeraldString thumb_func_end StringRef_GetEmeraldString
@ -864,7 +848,6 @@ StringRef_GetEmeraldString: ; 80090A0
StringRef_GetAquaString: ; 80090A8 StringRef_GetAquaString: ; 80090A8
ldr r0, =gUnknown_085E8231 ldr r0, =gUnknown_085E8231
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetAquaString thumb_func_end StringRef_GetAquaString
@ -873,7 +856,6 @@ StringRef_GetAquaString: ; 80090A8
StringRef_GetMagmaString: ; 80090B0 StringRef_GetMagmaString: ; 80090B0
ldr r0, =gUnknown_085E8236 ldr r0, =gUnknown_085E8236
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetMagmaString thumb_func_end StringRef_GetMagmaString
@ -882,7 +864,6 @@ StringRef_GetMagmaString: ; 80090B0
StringRef_GetArchieString: ; 80090B8 StringRef_GetArchieString: ; 80090B8
ldr r0, =gUnknown_085E823C ldr r0, =gUnknown_085E823C
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetArchieString thumb_func_end StringRef_GetArchieString
@ -891,7 +872,6 @@ StringRef_GetArchieString: ; 80090B8
StringRef_GetMaxieString: ; 80090C0 StringRef_GetMaxieString: ; 80090C0
ldr r0, =gUnknown_085E8243 ldr r0, =gUnknown_085E8243
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetMaxieString thumb_func_end StringRef_GetMaxieString
@ -900,7 +880,6 @@ StringRef_GetMaxieString: ; 80090C0
StringRef_GetKyogreString: ; 80090C8 StringRef_GetKyogreString: ; 80090C8
ldr r0, =gUnknown_085E8249 ldr r0, =gUnknown_085E8249
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetKyogreString thumb_func_end StringRef_GetKyogreString
@ -909,7 +888,6 @@ StringRef_GetKyogreString: ; 80090C8
StringRef_GetGroudonString: ; 80090D0 StringRef_GetGroudonString: ; 80090D0
ldr r0, =gUnknown_085E8250 ldr r0, =gUnknown_085E8250
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end StringRef_GetGroudonString thumb_func_end StringRef_GetGroudonString
@ -925,14 +903,12 @@ GetExpandedStringRef: ; 80090D8
ldr r0, [r0] ldr r0, [r0]
bl _call_via_r0 bl _call_via_r0
b @080090F2 b @080090F2
.align 2, 0
.pool .pool
@080090F0: @080090F0:
ldr r0, =gUnknown_085E8218 ldr r0, =gUnknown_085E8218
@080090F2: @080090F2:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end GetExpandedStringRef thumb_func_end GetExpandedStringRef
@ -1011,7 +987,6 @@ CopyStringPadded: ; 8009128
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end CopyStringPadded thumb_func_end CopyStringPadded
@ -1206,7 +1181,6 @@ GetExtendedControlCodeLength: ; 800927C
@0800928E: @0800928E:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end GetExtendedControlCodeLength thumb_func_end GetExtendedControlCodeLength

14
asm/task.s
View File

@ -42,7 +42,6 @@ clear_tasks: ; 80A8F50
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end clear_tasks thumb_func_end clear_tasks
@ -77,7 +76,6 @@ AddTask: ; 80A8FB0
strb r0, [r4, 0x4] strb r0, [r4, 0x4]
adds r0, r6, 0 adds r0, r6, 0
b @080A8FFC b @080A8FFC
.align 2, 0
.pool .pool
@080A8FF0: @080A8FF0:
adds r0, r6, 0x1 adds r0, r6, 0x1
@ -115,7 +113,6 @@ insert_task_in_order_by_priority: ; 80A9004
movs r1, 0xFF movs r1, 0xFF
strb r1, [r0, 0x6] strb r1, [r0, 0x6]
b @080A9090 b @080A9090
.align 2, 0
.pool .pool
@080A9034: @080A9034:
ldr r6, =0x03005e00 ldr r6, =0x03005e00
@ -150,7 +147,6 @@ insert_task_in_order_by_priority: ; 80A9004
@080A906C: @080A906C:
strb r4, [r3, 0x5] strb r4, [r3, 0x5]
b @080A9090 b @080A9090
.align 2, 0
.pool .pool
@080A9074: @080A9074:
ldrb r0, [r3, 0x6] ldrb r0, [r3, 0x6]
@ -205,7 +201,6 @@ remove_task: ; 80A909C
adds r0, r4 adds r0, r4
strb r3, [r0, 0x5] strb r3, [r0, 0x5]
b @080A9106 b @080A9106
.align 2, 0
.pool .pool
@080A90D4: @080A90D4:
ldrb r3, [r2, 0x6] ldrb r3, [r2, 0x6]
@ -264,7 +259,6 @@ run_active_tasks: ; 80A910C
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end run_active_tasks thumb_func_end run_active_tasks
@ -301,7 +295,6 @@ get_first_active_task: ; 80A913C
adds r0, r2, 0 adds r0, r2, 0
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end get_first_active_task thumb_func_end get_first_active_task
@ -335,7 +328,6 @@ set_task_function_and_args_14_15: ; 80A917C
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end set_task_function_and_args_14_15 thumb_func_end set_task_function_and_args_14_15
@ -364,7 +356,6 @@ set_task_function_to_args_14_15: ; 80A91B0
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end set_task_function_to_args_14_15 thumb_func_end set_task_function_to_args_14_15
@ -388,7 +379,6 @@ is_function_an_active_task: ; 80A91E4
bne @080A9208 bne @080A9208
movs r0, 0x1 movs r0, 0x1
b @080A9214 b @080A9214
.align 2, 0
.pool .pool
@080A9208: @080A9208:
adds r0, r2, 0x1 adds r0, r2, 0x1
@ -420,7 +410,6 @@ get_task_id_by_function: ; 80A921C
lsls r0, r2, 24 lsls r0, r2, 24
lsrs r0, 24 lsrs r0, 24
b @080A9246 b @080A9246
.align 2, 0
.pool .pool
@080A923C: @080A923C:
adds r1, 0x28 adds r1, 0x28
@ -459,7 +448,6 @@ sub_80A924C: ; 80A924C
adds r0, r2, 0 adds r0, r2, 0
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end sub_80A924C thumb_func_end sub_80A924C
@ -492,7 +480,6 @@ set_word_task_arg: ; 80A927C
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end set_word_task_arg thumb_func_end set_word_task_arg
@ -529,6 +516,5 @@ get_word_task_arg: ; 80A92B4
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end get_word_task_arg thumb_func_end get_word_task_arg

96
asm/text_renderer.s
View File

@ -4,7 +4,6 @@ fboxes_set_ptr: ; 80045A4
ldr r1, =0x03002f80 ldr r1, =0x03002f80
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end fboxes_set_ptr thumb_func_end fboxes_set_ptr
@ -23,7 +22,6 @@ TextBox_ResetSomeField: ; 80045B0
bge @080045BA bge @080045BA
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end TextBox_ResetSomeField thumb_func_end TextBox_ResetSomeField
@ -113,7 +111,6 @@ Print: ; 80045D0
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end Print thumb_func_end Print
@ -131,7 +128,6 @@ remo_copy: ; 800467C
bne @08004698 bne @08004698
movs r0, 0 movs r0, 0
b @08004766 b @08004766
.align 2, 0
.pool .pool
@08004698: @08004698:
ldr r0, =0x0202018c ldr r0, =0x0202018c
@ -193,7 +189,6 @@ remo_copy: ; 800467C
ldm r0!, {r2,r4,r7} ldm r0!, {r2,r4,r7}
stm r1!, {r2,r4,r7} stm r1!, {r2,r4,r7}
b @0800475E b @0800475E
.align 2, 0
.pool .pool
@08004718: @08004718:
ldr r1, =0x0202018c ldr r1, =0x0202018c
@ -202,7 +197,6 @@ remo_copy: ; 800467C
movs r4, 0 movs r4, 0
ldr r7, =0x000003ff ldr r7, =0x000003ff
b @08004732 b @08004732
.align 2, 0
.pool .pool
@0800472C: @0800472C:
adds r0, r4, 0x1 adds r0, r4, 0x1
@ -240,7 +234,6 @@ remo_copy: ; 800467C
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end remo_copy thumb_func_end remo_copy
@ -274,7 +267,6 @@ run_remoboxes: ; 8004778
cmp r4, 0 cmp r4, 0
beq @080047BE beq @080047BE
b @080047E8 b @080047E8
.align 2, 0
.pool .pool
@080047B8: @080047B8:
cmp r4, 0x3 cmp r4, 0x3
@ -296,7 +288,6 @@ run_remoboxes: ; 8004778
adds r1, r4, 0 adds r1, r4, 0
bl _call_via_r2 bl _call_via_r2
b @080047E8 b @080047E8
.align 2, 0
.pool .pool
@080047E4: @080047E4:
movs r0, 0 movs r0, 0
@ -328,7 +319,6 @@ a_pressed_maybe: ; 8004800
adds r1, r2 adds r1, r2
ldrb r0, [r1, 0x1B] ldrb r0, [r1, 0x1B]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end a_pressed_maybe thumb_func_end a_pressed_maybe
@ -355,7 +345,6 @@ fbox_exec: ; 8004818
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end fbox_exec thumb_func_end fbox_exec
@ -815,7 +804,6 @@ GenerateFontHalfRowLut: ; 8004844
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end GenerateFontHalfRowLut thumb_func_end GenerateFontHalfRowLut
@ -831,7 +819,6 @@ save_remo_colors: ; 8004BE0
ldrh r0, [r0] ldrh r0, [r0]
strb r0, [r2] strb r0, [r2]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end save_remo_colors thumb_func_end save_remo_colors
@ -1008,7 +995,6 @@ DecompressGlyphTile: ; 8004C10
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end DecompressGlyphTile thumb_func_end DecompressGlyphTile
@ -1033,19 +1019,16 @@ sub_8004D58: ; 8004D58
ldr r0, =0x030009ec ldr r0, =0x030009ec
ldrb r0, [r0] ldrb r0, [r0]
b @08004D9A b @08004D9A
.align 2, 0
.pool .pool
@08004D80: @08004D80:
ldr r0, =0x030009ea ldr r0, =0x030009ea
ldrb r0, [r0] ldrb r0, [r0]
b @08004D9A b @08004D9A
.align 2, 0
.pool .pool
@08004D8C: @08004D8C:
ldr r0, =0x030009ee ldr r0, =0x030009ee
ldrb r0, [r0] ldrb r0, [r0]
b @08004D9A b @08004D9A
.align 2, 0
.pool .pool
@08004D98: @08004D98:
movs r0, 0 movs r0, 0
@ -1174,7 +1157,6 @@ CopyGlyphToWindow: ; 8004DA0
cmp r1, r2 cmp r1, r2
bcc @08004E14 bcc @08004E14
b @080052AA b @080052AA
.align 2, 0
.pool .pool
@08004E84: @08004E84:
mov r1, r8 mov r1, r8
@ -1320,7 +1302,6 @@ CopyGlyphToWindow: ; 8004DA0
cmp r1, r2 cmp r1, r2
bcc @08004F28 bcc @08004F28
b @080052AA b @080052AA
.align 2, 0
.pool .pool
@08004F94: @08004F94:
cmp r0, 0x8 cmp r0, 0x8
@ -1467,7 +1448,6 @@ CopyGlyphToWindow: ; 8004DA0
cmp r1, r2 cmp r1, r2
bcc @08005038 bcc @08005038
b @080052AA b @080052AA
.align 2, 0
.pool .pool
@080050A4: @080050A4:
mov r1, r8 mov r1, r8
@ -1757,7 +1737,6 @@ CopyGlyphToWindow: ; 8004DA0
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end CopyGlyphToWindow thumb_func_end CopyGlyphToWindow
@ -1811,7 +1790,6 @@ Text_ClearHorizontalSpan: ; 80052C8
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Text_ClearHorizontalSpan thumb_func_end Text_ClearHorizontalSpan
@ -2084,7 +2062,6 @@ sub_80054F8: ; 80054F8
movs r0, 0 movs r0, 0
strb r0, [r2, 0x2] strb r0, [r2, 0x2]
b @08005524 b @08005524
.align 2, 0
.pool .pool
@08005514: @08005514:
ldrb r0, [r2, 0x1] ldrb r0, [r2, 0x1]
@ -2128,7 +2105,6 @@ remo_draw_bouncing_down_arrow: ; 8005528
movs r1, 0x20 movs r1, 0x20
negs r1, r1 negs r1, r1
b @080055E8 b @080055E8
.align 2, 0
.pool .pool
@08005560: @08005560:
ldrb r0, [r5, 0x4] ldrb r0, [r5, 0x4]
@ -2154,7 +2130,6 @@ remo_draw_bouncing_down_arrow: ; 8005528
@0800558A: @0800558A:
ldr r7, =gDownArrowTiles ldr r7, =gDownArrowTiles
b @08005596 b @08005596
.align 2, 0
.pool .pool
@08005594: @08005594:
ldr r7, =gDarkDownArrowTiles ldr r7, =gDarkDownArrowTiles
@ -2207,7 +2182,6 @@ remo_draw_bouncing_down_arrow: ; 8005528
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end remo_draw_bouncing_down_arrow thumb_func_end remo_draw_bouncing_down_arrow
@ -2275,7 +2249,6 @@ remo_is_it_time_to_continue_plus_down_arrow: ; 8005650
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
b @0800568E b @0800568E
.align 2, 0
.pool .pool
@08005674: @08005674:
adds r0, r2, 0 adds r0, r2, 0
@ -2294,7 +2267,6 @@ remo_is_it_time_to_continue_plus_down_arrow: ; 8005650
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end remo_is_it_time_to_continue_plus_down_arrow thumb_func_end remo_is_it_time_to_continue_plus_down_arrow
@ -2314,7 +2286,6 @@ remo_is_it_time_to_continue: ; 800569C
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
b @080056D4 b @080056D4
.align 2, 0
.pool .pool
@080056C0: @080056C0:
ldr r0, =0x030022c0 ldr r0, =0x030022c0
@ -2331,7 +2302,6 @@ remo_is_it_time_to_continue: ; 800569C
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end remo_is_it_time_to_continue thumb_func_end remo_is_it_time_to_continue
@ -2392,7 +2362,6 @@ draw_bouncing_down_arrow_2: ; 80056E0
@08005748: @08005748:
ldr r6, =gDownArrowTiles ldr r6, =gDownArrowTiles
b @08005756 b @08005756
.align 2, 0
.pool .pool
@08005754: @08005754:
ldr r6, =gDarkDownArrowTiles ldr r6, =gDarkDownArrowTiles
@ -2438,7 +2407,6 @@ draw_bouncing_down_arrow_2: ; 80056E0
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end draw_bouncing_down_arrow_2 thumb_func_end draw_bouncing_down_arrow_2
@ -2459,7 +2427,6 @@ font_render_b: ; 80057B4
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@080057D4: @080057D4:
@ -2515,7 +2482,6 @@ font_render_b: ; 80057B4
movs r0, 0 movs r0, 0
strb r0, [r6, 0x1E] strb r0, [r6, 0x1E]
b @08005B56 b @08005B56
.align 2, 0
.pool .pool
@0800584C: @0800584C:
ldr r0, =0x02022fec ldr r0, =0x02022fec
@ -2533,7 +2499,6 @@ font_render_b: ; 80057B4
beq @08005874 beq @08005874
movs r0, 0x3 movs r0, 0x3
b @08005876 b @08005876
.align 2, 0
.pool .pool
@08005874: @08005874:
ldrb r0, [r6, 0x1D] ldrb r0, [r6, 0x1D]
@ -2554,7 +2519,6 @@ font_render_b: ; 80057B4
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08005898: @08005898:
@ -2582,7 +2546,6 @@ font_render_b: ; 80057B4
ldrb r0, [r6, 0x9] ldrb r0, [r6, 0x9]
adds r0, r1 adds r0, r1
b @08005ABA b @08005ABA
.align 2, 0
.pool .pool
@080058DC: @080058DC:
ldr r0, [r6] ldr r0, [r6]
@ -2602,7 +2565,6 @@ font_render_b: ; 80057B4
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08005900: @08005900:
@ -2762,7 +2724,6 @@ font_render_b: ; 80057B4
movs r0, 0 movs r0, 0
strb r0, [r4, 0x2] strb r0, [r4, 0x2]
b @08005B56 b @08005B56
.align 2, 0
.pool .pool
@08005A58: @08005A58:
movs r0, 0x5 movs r0, 0x5
@ -2823,13 +2784,11 @@ font_render_b: ; 80057B4
ldr r0, =0x03007420 ldr r0, =0x03007420
bl MPlayStop_rev01 bl MPlayStop_rev01
b @08005A0A b @08005A0A
.align 2, 0
.pool .pool
@08005ACC: @08005ACC:
ldr r0, =0x03007420 ldr r0, =0x03007420
bl m4aMPlayContinue bl m4aMPlayContinue
b @08005A0A b @08005A0A
.align 2, 0
.pool .pool
@08005AD8: @08005AD8:
ldr r0, [r6] ldr r0, [r6]
@ -2934,7 +2893,6 @@ font_render_b: ; 80057B4
ldrb r3, [r6, 0xA] ldrb r3, [r6, 0xA]
adds r0, r3 adds r0, r3
b @08005C6A b @08005C6A
.align 2, 0
.pool .pool
@08005B90: @08005B90:
ldr r0, [r4] ldr r0, [r4]
@ -2947,7 +2905,6 @@ font_render_b: ; 80057B4
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08005BA8: @08005BA8:
@ -3019,7 +2976,6 @@ font_render_b: ; 80057B4
ldrb r0, [r6, 0x8] ldrb r0, [r6, 0x8]
adds r0, r4 adds r0, r4
b @08005C6E b @08005C6E
.align 2, 0
.pool .pool
@08005C48: @08005C48:
adds r0, r6, 0 adds r0, r6, 0
@ -3034,7 +2990,6 @@ font_render_b: ; 80057B4
adds r1, r0 adds r1, r0
ldrb r0, [r6, 0x8] ldrb r0, [r6, 0x8]
b @08005C6C b @08005C6C
.align 2, 0
.pool .pool
@08005C64: @08005C64:
ldr r0, =0x03002f90 ldr r0, =0x03002f90
@ -3049,7 +3004,6 @@ font_render_b: ; 80057B4
@08005C70: @08005C70:
movs r0, 0 movs r0, 0
b @08005D6E b @08005D6E
.align 2, 0
.pool .pool
@08005C78: @08005C78:
adds r0, r6, 0 adds r0, r6, 0
@ -3110,7 +3064,6 @@ font_render_b: ; 80057B4
movs r0, 0x4 movs r0, 0x4
strb r0, [r6, 0x1C] strb r0, [r6, 0x1C]
b @08005B56 b @08005B56
.align 2, 0
.pool .pool
@08005CF0: @08005CF0:
ldrb r0, [r6, 0x1F] ldrb r0, [r6, 0x1F]
@ -3133,7 +3086,6 @@ font_render_b: ; 80057B4
bl Window_ScrollVertically bl Window_ScrollVertically
movs r0, 0 movs r0, 0
b @08005D38 b @08005D38
.align 2, 0
.pool .pool
@08005D20: @08005D20:
ldrb r0, [r6, 0x4] ldrb r0, [r6, 0x4]
@ -3221,7 +3173,6 @@ sub_8005D74: ; 8005D74
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08005DB8: @08005DB8:
@ -3255,7 +3206,6 @@ sub_8005D74: ; 8005D74
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08005E08: @08005E08:
@ -3340,7 +3290,6 @@ GetFontWidthFunc: ; 8005EA8
bne @08005EC4 bne @08005EC4
ldr r0, [r2] ldr r0, [r2]
b @08005ED0 b @08005ED0
.align 2, 0
.pool .pool
@08005EC4: @08005EC4:
adds r2, 0x8 adds r2, 0x8
@ -3417,7 +3366,6 @@ font_get_width_of_string: ; 8005ED8
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08005F4C: @08005F4C:
@ -3454,12 +3402,10 @@ font_get_width_of_string: ; 8005ED8
@08005F90: @08005F90:
ldr r6, =0x02021cc4 ldr r6, =0x02021cc4
b @08005FA2 b @08005FA2
.align 2, 0
.pool .pool
@08005F98: @08005F98:
ldr r6, =0x02021dc4 ldr r6, =0x02021dc4
b @08005FA2 b @08005FA2
.align 2, 0
.pool .pool
@08005FA0: @08005FA0:
ldr r6, =0x02021ec4 ldr r6, =0x02021ec4
@ -3471,7 +3417,6 @@ font_get_width_of_string: ; 8005ED8
bl sub_81AFC74 bl sub_81AFC74
adds r6, r0, 0 adds r6, r0, 0
b @08005FE0 b @08005FE0
.align 2, 0
.pool .pool
@08005FB8: @08005FB8:
ldrb r0, [r6] ldrb r0, [r6]
@ -3514,7 +3459,6 @@ font_get_width_of_string: ; 8005ED8
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08006004: @08006004:
@ -3720,7 +3664,6 @@ font_render_some: ; 8006140
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@080061A0: @080061A0:
@ -3745,7 +3688,6 @@ font_render_some: ; 8006140
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@080061E0: @080061E0:
@ -3863,7 +3805,6 @@ font_render_some: ; 8006140
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end font_render_some thumb_func_end font_render_some
@ -3903,7 +3844,6 @@ TextBox_DrawKeypadIcon: ; 80062E8
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end TextBox_DrawKeypadIcon thumb_func_end TextBox_DrawKeypadIcon
@ -3915,7 +3855,6 @@ sub_8006338: ; 8006338
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end sub_8006338 thumb_func_end sub_8006338
@ -3927,7 +3866,6 @@ Font_ReturnsValueFromLUT: ; 8006348
adds r0, r1 adds r0, r1
ldrb r0, [r0, 0x2] ldrb r0, [r0, 0x2]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end Font_ReturnsValueFromLUT thumb_func_end Font_ReturnsValueFromLUT
@ -3939,7 +3877,6 @@ sub_8006358: ; 8006358
adds r0, r1 adds r0, r1
ldrb r0, [r0, 0x3] ldrb r0, [r0, 0x3]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end sub_8006358 thumb_func_end sub_8006358
@ -3950,7 +3887,6 @@ fboxes_set_default_ptr: ; 8006368
bl fboxes_set_ptr bl fboxes_set_ptr
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end fboxes_set_default_ptr thumb_func_end fboxes_set_default_ptr
@ -3969,7 +3905,6 @@ fbox_get_field: ; 8006378
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08006398: @08006398:
@ -3989,7 +3924,6 @@ fbox_get_field: ; 8006378
adds r0, r1 adds r0, r1
ldrb r0, [r0, 0x4] ldrb r0, [r0, 0x4]
b @08006456 b @08006456
.align 2, 0
.pool .pool
@080063CC: @080063CC:
ldr r1, =gFontInfos ldr r1, =gFontInfos
@ -3999,7 +3933,6 @@ fbox_get_field: ; 8006378
adds r0, r1 adds r0, r1
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
b @08006456 b @08006456
.align 2, 0
.pool .pool
@080063E0: @080063E0:
ldr r1, =gFontInfos ldr r1, =gFontInfos
@ -4009,7 +3942,6 @@ fbox_get_field: ; 8006378
adds r0, r1 adds r0, r1
ldrb r0, [r0, 0x6] ldrb r0, [r0, 0x6]
b @08006456 b @08006456
.align 2, 0
.pool .pool
@080063F4: @080063F4:
ldr r1, =gFontInfos ldr r1, =gFontInfos
@ -4019,7 +3951,6 @@ fbox_get_field: ; 8006378
adds r0, r1 adds r0, r1
ldrb r0, [r0, 0x7] ldrb r0, [r0, 0x7]
b @08006456 b @08006456
.align 2, 0
.pool .pool
@08006408: @08006408:
ldr r0, =gFontInfos ldr r0, =gFontInfos
@ -4029,7 +3960,6 @@ fbox_get_field: ; 8006378
adds r1, r0 adds r1, r0
ldrb r0, [r1, 0x8] ldrb r0, [r1, 0x8]
b @0800643C b @0800643C
.align 2, 0
.pool .pool
@0800641C: @0800641C:
ldr r0, =gFontInfos ldr r0, =gFontInfos
@ -4039,7 +3969,6 @@ fbox_get_field: ; 8006378
adds r1, r0 adds r1, r0
ldrb r0, [r1, 0x8] ldrb r0, [r1, 0x8]
b @08006454 b @08006454
.align 2, 0
.pool .pool
@08006430: @08006430:
ldr r0, =gFontInfos ldr r0, =gFontInfos
@ -4052,7 +3981,6 @@ fbox_get_field: ; 8006378
lsls r0, 28 lsls r0, 28
lsrs r0, 28 lsrs r0, 28
b @08006456 b @08006456
.align 2, 0
.pool .pool
@08006448: @08006448:
ldr r0, =gFontInfos ldr r0, =gFontInfos
@ -4066,7 +3994,6 @@ fbox_get_field: ; 8006378
@08006456: @08006456:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end fbox_get_field thumb_func_end fbox_get_field
@ -4082,7 +4009,6 @@ GetMenuCursorDimensionByFont: ; 8006460
adds r1, r2 adds r1, r2
ldrb r0, [r1] ldrb r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end GetMenuCursorDimensionByFont thumb_func_end GetMenuCursorDimensionByFont
@ -4119,7 +4045,6 @@ DecompressGlyphFont0: ; 8006478
movs r0, 0xC movs r0, 0xC
strb r0, [r4] strb r0, [r4]
b @08006534 b @08006534
.align 2, 0
.pool .pool
@080064C4: @080064C4:
lsls r1, r3, 6 lsls r1, r3, 6
@ -4143,7 +4068,6 @@ DecompressGlyphFont0: ; 8006478
adds r1, 0x40 adds r1, 0x40
bl DecompressGlyphTile bl DecompressGlyphTile
b @0800652C b @0800652C
.align 2, 0
.pool .pool
@08006500: @08006500:
adds r0, r5, 0 adds r0, r5, 0
@ -4173,7 +4097,6 @@ DecompressGlyphFont0: ; 8006478
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end DecompressGlyphFont0 thumb_func_end DecompressGlyphFont0
@ -4188,7 +4111,6 @@ GetGlyphWidthFont0: ; 8006540
adds r0, r2, r0 adds r0, r2, r0
ldrb r0, [r0] ldrb r0, [r0]
b @0800655A b @0800655A
.align 2, 0
.pool .pool
@08006558: @08006558:
movs r0, 0x8 movs r0, 0x8
@ -4230,7 +4152,6 @@ DecompressGlyphFont7: ; 8006560
adds r4, 0x81 adds r4, 0x81
strb r5, [r4] strb r5, [r4]
b @0800661C b @0800661C
.align 2, 0
.pool .pool
@080065AC: @080065AC:
lsls r1, r3, 6 lsls r1, r3, 6
@ -4254,7 +4175,6 @@ DecompressGlyphFont7: ; 8006560
adds r1, 0x40 adds r1, 0x40
bl DecompressGlyphTile bl DecompressGlyphTile
b @08006614 b @08006614
.align 2, 0
.pool .pool
@080065E8: @080065E8:
adds r0, r6, 0 adds r0, r6, 0
@ -4284,7 +4204,6 @@ DecompressGlyphFont7: ; 8006560
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end DecompressGlyphFont7 thumb_func_end DecompressGlyphFont7
@ -4299,7 +4218,6 @@ GetGlyphWidthFont7: ; 8006628
adds r0, r2, r0 adds r0, r2, r0
ldrb r0, [r0] ldrb r0, [r0]
b @08006642 b @08006642
.align 2, 0
.pool .pool
@08006640: @08006640:
movs r0, 0x8 movs r0, 0x8
@ -4342,7 +4260,6 @@ DecompressGlyphFont8: ; 8006648
movs r0, 0xC movs r0, 0xC
strb r0, [r4] strb r0, [r4]
b @08006704 b @08006704
.align 2, 0
.pool .pool
@08006694: @08006694:
lsls r1, r3, 6 lsls r1, r3, 6
@ -4366,7 +4283,6 @@ DecompressGlyphFont8: ; 8006648
adds r1, 0x40 adds r1, 0x40
bl DecompressGlyphTile bl DecompressGlyphTile
b @080066FC b @080066FC
.align 2, 0
.pool .pool
@080066D0: @080066D0:
adds r0, r5, 0 adds r0, r5, 0
@ -4396,7 +4312,6 @@ DecompressGlyphFont8: ; 8006648
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end DecompressGlyphFont8 thumb_func_end DecompressGlyphFont8
@ -4411,7 +4326,6 @@ GetGlyphWidthFont8: ; 8006710
adds r0, r2, r0 adds r0, r2, r0
ldrb r0, [r0] ldrb r0, [r0]
b @0800672A b @0800672A
.align 2, 0
.pool .pool
@08006728: @08006728:
movs r0, 0x8 movs r0, 0x8
@ -4467,7 +4381,6 @@ DecompressGlyphFont2: ; 8006730
movs r0, 0xE movs r0, 0xE
strb r0, [r1] strb r0, [r1]
b @08006810 b @08006810
.align 2, 0
.pool .pool
@080067A0: @080067A0:
lsls r1, r6, 6 lsls r1, r6, 6
@ -4491,7 +4404,6 @@ DecompressGlyphFont2: ; 8006730
adds r1, 0x40 adds r1, 0x40
bl DecompressGlyphTile bl DecompressGlyphTile
b @08006808 b @08006808
.align 2, 0
.pool .pool
@080067DC: @080067DC:
adds r0, r4, 0 adds r0, r4, 0
@ -4521,7 +4433,6 @@ DecompressGlyphFont2: ; 8006730
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end DecompressGlyphFont2 thumb_func_end DecompressGlyphFont2
@ -4534,7 +4445,6 @@ GetGlyphWidthFont2: ; 800681C
beq @08006830 beq @08006830
ldr r0, =gFont2LatinGlyphWidths ldr r0, =gFont2LatinGlyphWidths
b @08006832 b @08006832
.align 2, 0
.pool .pool
@08006830: @08006830:
ldr r0, =gFont2JapaneseGlyphWidths ldr r0, =gFont2JapaneseGlyphWidths
@ -4543,7 +4453,6 @@ GetGlyphWidthFont2: ; 800681C
ldrb r0, [r0] ldrb r0, [r0]
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end GetGlyphWidthFont2 thumb_func_end GetGlyphWidthFont2
@ -4581,7 +4490,6 @@ DecompressGlyphFont1: ; 8006840
adds r4, 0x81 adds r4, 0x81
strb r5, [r4] strb r5, [r4]
b @080068FC b @080068FC
.align 2, 0
.pool .pool
@0800688C: @0800688C:
lsls r1, r3, 6 lsls r1, r3, 6
@ -4605,7 +4513,6 @@ DecompressGlyphFont1: ; 8006840
adds r1, 0x40 adds r1, 0x40
bl DecompressGlyphTile bl DecompressGlyphTile
b @080068F4 b @080068F4
.align 2, 0
.pool .pool
@080068C8: @080068C8:
adds r0, r6, 0 adds r0, r6, 0
@ -4635,7 +4542,6 @@ DecompressGlyphFont1: ; 8006840
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end DecompressGlyphFont1 thumb_func_end DecompressGlyphFont1
@ -4650,7 +4556,6 @@ GetGlyphWidthFont1: ; 8006908
adds r0, r2, r0 adds r0, r2, r0
ldrb r0, [r0] ldrb r0, [r0]
b @08006922 b @08006922
.align 2, 0
.pool .pool
@08006920: @08006920:
movs r0, 0x8 movs r0, 0x8
@ -4693,6 +4598,5 @@ DecompressGlyphFont9: ; 8006928
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end DecompressGlyphFont9 thumb_func_end DecompressGlyphFont9

62
asm/tileset_animation.s
View File

@ -15,7 +15,6 @@ sub_80A0954: ; 80A0954
add sp, 0x4 add sp, 0x4
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A0954 thumb_func_end sub_80A0954
@ -57,7 +56,6 @@ sub_80A0980: ; 80A0980
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A0980 thumb_func_end sub_80A0980
@ -95,7 +93,6 @@ sub_80A09D0: ; 80A09D0
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A09D0 thumb_func_end sub_80A09D0
@ -164,7 +161,6 @@ sub_80A0A38: ; 80A0A38
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A0A38 thumb_func_end sub_80A0A38
@ -191,7 +187,6 @@ cur_mapheader_run_tileset1_func: ; 80A0AA8
@080A0ACE: @080A0ACE:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end cur_mapheader_run_tileset1_func thumb_func_end cur_mapheader_run_tileset1_func
@ -218,7 +213,6 @@ cur_mapheader_run_tileset2_func: ; 80A0AE4
@080A0B0A: @080A0B0A:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end cur_mapheader_run_tileset2_func thumb_func_end cur_mapheader_run_tileset2_func
@ -236,7 +230,6 @@ TilesetCb_General: ; 80A0B20
ldr r0, =sub_80A0B70 ldr r0, =sub_80A0B70
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_General thumb_func_end TilesetCb_General
@ -254,7 +247,6 @@ TilesetCb_InsideBuilding: ; 80A0B48
ldr r0, =sub_80A0BB4 ldr r0, =sub_80A0BB4
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_InsideBuilding thumb_func_end TilesetCb_InsideBuilding
@ -328,7 +320,6 @@ sub_80A0BCC: ; 80A0BCC
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A0BCC thumb_func_end sub_80A0BCC
@ -349,7 +340,6 @@ sub_80A0BF4: ; 80A0BF4
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A0BF4 thumb_func_end sub_80A0BF4
@ -370,7 +360,6 @@ sub_80A0C1C: ; 80A0C1C
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A0C1C thumb_func_end sub_80A0C1C
@ -390,7 +379,6 @@ sub_80A0C44: ; 80A0C44
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A0C44 thumb_func_end sub_80A0C44
@ -407,7 +395,6 @@ TilesetCb_Petalburg: ; 80A0C6C
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Petalburg thumb_func_end TilesetCb_Petalburg
@ -424,7 +411,6 @@ TilesetCb_Rustboro: ; 80A0C94
ldr r0, =sub_80A103C ldr r0, =sub_80A103C
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Rustboro thumb_func_end TilesetCb_Rustboro
@ -441,7 +427,6 @@ TilesetCb_Dewford: ; 80A0CC0
ldr r0, =sub_80A10B8 ldr r0, =sub_80A10B8
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Dewford thumb_func_end TilesetCb_Dewford
@ -458,7 +443,6 @@ TilesetCb_Slateport: ; 80A0CEC
ldr r0, =sub_80A10D0 ldr r0, =sub_80A10D0
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Slateport thumb_func_end TilesetCb_Slateport
@ -476,7 +460,6 @@ TilesetCb_Mauville: ; 80A0D18
ldr r0, =sub_80A10E8 ldr r0, =sub_80A10E8
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Mauville thumb_func_end TilesetCb_Mauville
@ -493,7 +476,6 @@ TilesetCb_Lavaridge: ; 80A0D48
ldr r0, =sub_80A115C ldr r0, =sub_80A115C
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Lavaridge thumb_func_end TilesetCb_Lavaridge
@ -510,7 +492,6 @@ TilesetCb_Fallarbor: ; 80A0D74
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Fallarbor thumb_func_end TilesetCb_Fallarbor
@ -527,7 +508,6 @@ TilesetCb_Fortree: ; 80A0D9C
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Fortree thumb_func_end TilesetCb_Fortree
@ -544,7 +524,6 @@ TilesetCb_Lilycove: ; 80A0DC4
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Lilycove thumb_func_end TilesetCb_Lilycove
@ -561,7 +540,6 @@ TilesetCb_Mossdeep: ; 80A0DEC
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Mossdeep thumb_func_end TilesetCb_Mossdeep
@ -578,7 +556,6 @@ TilesetCb_EverGrande: ; 80A0E14
ldr r0, =sub_80A1188 ldr r0, =sub_80A1188
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_EverGrande thumb_func_end TilesetCb_EverGrande
@ -596,7 +573,6 @@ TilesetCb_Pacifidlog: ; 80A0E40
ldr r0, =sub_80A11FC ldr r0, =sub_80A11FC
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Pacifidlog thumb_func_end TilesetCb_Pacifidlog
@ -613,7 +589,6 @@ TilesetCb_Sootopolis: ; 80A0E70
ldr r0, =sub_80A122C ldr r0, =sub_80A122C
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Sootopolis thumb_func_end TilesetCb_Sootopolis
@ -630,7 +605,6 @@ TilesetCb_BattleFrontierOutsideWest: ; 80A0E9C
ldr r0, =sub_80A127C ldr r0, =sub_80A127C
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_BattleFrontierOutsideWest thumb_func_end TilesetCb_BattleFrontierOutsideWest
@ -647,7 +621,6 @@ TilesetCb_BattleFrontierOutsideEast: ; 80A0EC8
ldr r0, =sub_80A1294 ldr r0, =sub_80A1294
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_BattleFrontierOutsideEast thumb_func_end TilesetCb_BattleFrontierOutsideEast
@ -663,7 +636,6 @@ TilesetCb_Underwater: ; 80A0EF4
ldr r0, =sub_80A1244 ldr r0, =sub_80A1244
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Underwater thumb_func_end TilesetCb_Underwater
@ -679,7 +651,6 @@ TilesetCb_SootopolisGym: ; 80A0F18
ldr r0, =sub_80A15D8 ldr r0, =sub_80A15D8
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_SootopolisGym thumb_func_end TilesetCb_SootopolisGym
@ -696,7 +667,6 @@ TilesetCb_Cave: ; 80A0F3C
ldr r0, =sub_80A1260 ldr r0, =sub_80A1260
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_Cave thumb_func_end TilesetCb_Cave
@ -712,7 +682,6 @@ TilesetCb_EliteFour: ; 80A0F68
ldr r0, =sub_80A15F0 ldr r0, =sub_80A15F0
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_EliteFour thumb_func_end TilesetCb_EliteFour
@ -729,7 +698,6 @@ TilesetCb_MauvilleGym: ; 80A0F8C
ldr r0, =sub_80A15C0 ldr r0, =sub_80A15C0
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_MauvilleGym thumb_func_end TilesetCb_MauvilleGym
@ -746,7 +714,6 @@ TilesetCb_BikeShop: ; 80A0FB8
ldr r0, =sub_80A161C ldr r0, =sub_80A161C
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_BikeShop thumb_func_end TilesetCb_BikeShop
@ -763,7 +730,6 @@ TilesetCb_BattlePyramid: ; 80A0FE4
ldr r0, =sub_80A1634 ldr r0, =sub_80A1634
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_BattlePyramid thumb_func_end TilesetCb_BattlePyramid
@ -780,7 +746,6 @@ TilesetCb_BattleDome: ; 80A1010
ldr r0, =sub_80A1658 ldr r0, =sub_80A1658
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0
.pool .pool
thumb_func_end TilesetCb_BattleDome thumb_func_end TilesetCb_BattleDome
@ -1154,7 +1119,6 @@ sub_80A12AC: ; 80A12AC
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A12AC thumb_func_end sub_80A12AC
@ -1187,7 +1151,6 @@ sub_80A12D4: ; 80A12D4
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A12D4 thumb_func_end sub_80A12D4
@ -1208,7 +1171,6 @@ sub_80A131C: ; 80A131C
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A131C thumb_func_end sub_80A131C
@ -1228,7 +1190,6 @@ sub_80A1344: ; 80A1344
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1344 thumb_func_end sub_80A1344
@ -1249,7 +1210,6 @@ sub_80A136C: ; 80A136C
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A136C thumb_func_end sub_80A136C
@ -1289,7 +1249,6 @@ sub_80A1394: ; 80A1394
movs r2, 0x80 movs r2, 0x80
bl sub_80A0980 bl sub_80A0980
b @080A141C b @080A141C
.align 2, 0
.pool .pool
@080A13F0: @080A13F0:
movs r0, 0x3 movs r0, 0x3
@ -1316,7 +1275,6 @@ sub_80A1394: ; 80A1394
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1394 thumb_func_end sub_80A1394
@ -1348,7 +1306,6 @@ sub_80A1434: ; 80A1434
@080A1464: @080A1464:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1434 thumb_func_end sub_80A1434
@ -1368,7 +1325,6 @@ sub_80A1470: ; 80A1470
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1470 thumb_func_end sub_80A1470
@ -1388,7 +1344,6 @@ sub_80A1498: ; 80A1498
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1498 thumb_func_end sub_80A1498
@ -1416,7 +1371,6 @@ sub_80A14C0: ; 80A14C0
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A14C0 thumb_func_end sub_80A14C0
@ -1436,7 +1390,6 @@ sub_80A14F8: ; 80A14F8
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A14F8 thumb_func_end sub_80A14F8
@ -1456,7 +1409,6 @@ sub_80A1520: ; 80A1520
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1520 thumb_func_end sub_80A1520
@ -1476,7 +1428,6 @@ sub_80A1548: ; 80A1548
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1548 thumb_func_end sub_80A1548
@ -1496,7 +1447,6 @@ sub_80A1570: ; 80A1570
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1570 thumb_func_end sub_80A1570
@ -1516,7 +1466,6 @@ sub_80A1598: ; 80A1598
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1598 thumb_func_end sub_80A1598
@ -1661,7 +1610,6 @@ sub_80A1688: ; 80A1688
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1688 thumb_func_end sub_80A1688
@ -1692,7 +1640,6 @@ sub_80A16B0: ; 80A16B0
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A16B0 thumb_func_end sub_80A16B0
@ -1712,7 +1659,6 @@ sub_80A16F8: ; 80A16F8
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A16F8 thumb_func_end sub_80A16F8
@ -1732,7 +1678,6 @@ sub_80A1720: ; 80A1720
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1720 thumb_func_end sub_80A1720
@ -1753,7 +1698,6 @@ sub_80A1748: ; 80A1748
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1748 thumb_func_end sub_80A1748
@ -1774,7 +1718,6 @@ sub_80A1770: ; 80A1770
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1770 thumb_func_end sub_80A1770
@ -1795,7 +1738,6 @@ sub_80A1798: ; 80A1798
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1798 thumb_func_end sub_80A1798
@ -1817,7 +1759,6 @@ sub_80A17C0: ; 80A17C0
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A17C0 thumb_func_end sub_80A17C0
@ -1839,7 +1780,6 @@ sub_80A17EC: ; 80A17EC
bl sub_80A0980 bl sub_80A0980
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A17EC thumb_func_end sub_80A17EC
@ -1882,7 +1822,6 @@ sub_80A1818: ; 80A1818
@080A1862: @080A1862:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1818 thumb_func_end sub_80A1818
@ -1929,6 +1868,5 @@ sub_80A1884: ; 80A1884
@080A18D6: @080A18D6:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end sub_80A1884 thumb_func_end sub_80A1884

47
asm/window.s
View File

@ -84,7 +84,6 @@ Window_InitFromTemplates: ; 80031C0
@08003250: @08003250:
movs r0, 0 movs r0, 0
b @08003364 b @08003364
.align 2, 0
.pool .pool
@08003268: @08003268:
ldr r0, =0x03002f70 ldr r0, =0x03002f70
@ -111,7 +110,6 @@ Window_InitFromTemplates: ; 80031C0
bne @080032A8 bne @080032A8
bl Window_FreeMemory bl Window_FreeMemory
b @08003250 b @08003250
.align 2, 0
.pool .pool
@080032A8: @080032A8:
movs r1, 0 movs r1, 0
@ -158,7 +156,6 @@ Window_InitFromTemplates: ; 80031C0
bl free bl free
str r4, [r5] str r4, [r5]
b @08003250 b @08003250
.align 2, 0
.pool .pool
@0800330C: @0800330C:
ldr r1, =0x02020004 ldr r1, =0x02020004
@ -215,7 +212,6 @@ Window_InitFromTemplates: ; 80031C0
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end Window_InitFromTemplates thumb_func_end Window_InitFromTemplates
@ -341,7 +337,6 @@ Window_AddFromTemplate: ; 8003380
@0800346A: @0800346A:
movs r0, 0xFF movs r0, 0xFF
b @080034C0 b @080034C0
.align 2, 0
.pool .pool
@08003484: @08003484:
ldr r2, =0x02020004 ldr r2, =0x02020004
@ -383,7 +378,6 @@ Window_AddFromTemplate: ; 8003380
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end Window_AddFromTemplate thumb_func_end Window_AddFromTemplate
@ -434,7 +428,6 @@ Window_AddFromTemplateWithoutAllocatingMemory: ; 80034D8
@08003528: @08003528:
movs r0, 0xFF movs r0, 0xFF
b @08003564 b @08003564
.align 2, 0
.pool .pool
@08003534: @08003534:
ldr r1, =0x02020004 ldr r1, =0x02020004
@ -465,7 +458,6 @@ Window_AddFromTemplateWithoutAllocatingMemory: ; 80034D8
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end Window_AddFromTemplateWithoutAllocatingMemory thumb_func_end Window_AddFromTemplateWithoutAllocatingMemory
@ -532,7 +524,6 @@ Window_Remove: ; 8003574
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_Remove thumb_func_end Window_Remove
@ -577,7 +568,6 @@ Window_FreeMemory: ; 8003604
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_FreeMemory thumb_func_end Window_FreeMemory
@ -612,7 +602,6 @@ Window_CopyToVram: ; 8003658
cmp r3, 0x1 cmp r3, 0x1
beq @0800369A beq @0800369A
b @080036CE b @080036CE
.align 2, 0
.pool .pool
@08003694: @08003694:
cmp r5, 0x3 cmp r5, 0x3
@ -695,7 +684,6 @@ Window_CopyRectToVram: ; 80036D8
cmp r5, 0x1 cmp r5, 0x1
beq @08003736 beq @08003736
b @08003782 b @08003782
.align 2, 0
.pool .pool
@08003730: @08003730:
cmp r5, 0x3 cmp r5, 0x3
@ -792,7 +780,6 @@ Window_WriteStandardTileMap: ; 800378C
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_WriteStandardTileMap thumb_func_end Window_WriteStandardTileMap
@ -888,7 +875,6 @@ Window_WriteStandardTileMapRectOverridePalette: ; 80037EC
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_WriteStandardTileMapRectOverridePalette thumb_func_end Window_WriteStandardTileMapRectOverridePalette
@ -929,7 +915,6 @@ Window_FillTileMap: ; 80038A4
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_FillTileMap thumb_func_end Window_FillTileMap
@ -1021,7 +1006,6 @@ Window_WriteStandardTileMapRect: ; 80038F4
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_WriteStandardTileMapRect thumb_func_end Window_WriteStandardTileMapRect
@ -1148,7 +1132,6 @@ Window_CopyPixelRectToWindow: ; 80039DC
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_CopyPixelRectToWindow thumb_func_end Window_CopyPixelRectToWindow
@ -1247,7 +1230,6 @@ Window_copy_pixels_rect_3: ; 8003A9C
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_copy_pixels_rect_3 thumb_func_end Window_copy_pixels_rect_3
@ -1316,7 +1298,6 @@ Window_FillPixelRect: ; 8003B64
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_FillPixelRect thumb_func_end Window_FillPixelRect
@ -1344,7 +1325,6 @@ Window_CopyToPixels: ; 8003BF0
adds r0, r6, 0 adds r0, r6, 0
bl CpuSet bl CpuSet
b @08003C3C b @08003C3C
.align 2, 0
.pool .pool
@08003C24: @08003C24:
ldr r1, =0x02020004 ldr r1, =0x02020004
@ -1362,7 +1342,6 @@ Window_CopyToPixels: ; 8003BF0
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_CopyToPixels thumb_func_end Window_CopyToPixels
@ -1403,7 +1382,6 @@ Window_FastFillPixels: ; 8003C48
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_FastFillPixels thumb_func_end Window_FastFillPixels
@ -1492,7 +1470,6 @@ Window_ScrollVertically: ; 8003C94
mov r1, r10 mov r1, r10
str r0, [r1] str r0, [r1]
b @08003D38 b @08003D38
.align 2, 0
.pool .pool
@08003D34: @08003D34:
mov r2, r10 mov r2, r10
@ -1973,7 +1950,6 @@ CallWindowFunction: ; 8004058
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end CallWindowFunction thumb_func_end CallWindowFunction
@ -1991,7 +1967,6 @@ Window_SetField: ; 80040A8
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@080040C4: @080040C4:
@ -2012,7 +1987,6 @@ Window_SetField: ; 80040A8
strb r2, [r0, 0x1] strb r2, [r0, 0x1]
movs r0, 0 movs r0, 0
b @08004144 b @08004144
.align 2, 0
.pool .pool
@080040F8: @080040F8:
ldr r1, =0x02020004 ldr r1, =0x02020004
@ -2023,7 +1997,6 @@ Window_SetField: ; 80040A8
strb r2, [r0, 0x2] strb r2, [r0, 0x2]
movs r0, 0 movs r0, 0
b @08004144 b @08004144
.align 2, 0
.pool .pool
@0800410C: @0800410C:
ldr r1, =0x02020004 ldr r1, =0x02020004
@ -2034,7 +2007,6 @@ Window_SetField: ; 80040A8
strb r2, [r0, 0x5] strb r2, [r0, 0x5]
movs r0, 0 movs r0, 0
b @08004144 b @08004144
.align 2, 0
.pool .pool
@08004120: @08004120:
ldr r1, =0x02020004 ldr r1, =0x02020004
@ -2045,7 +2017,6 @@ Window_SetField: ; 80040A8
strh r2, [r0, 0x6] strh r2, [r0, 0x6]
movs r0, 0 movs r0, 0
b @08004144 b @08004144
.align 2, 0
.pool .pool
@08004134: @08004134:
ldr r1, =0x02020004 ldr r1, =0x02020004
@ -2060,7 +2031,6 @@ Window_SetField: ; 80040A8
@08004144: @08004144:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end Window_SetField thumb_func_end Window_SetField
@ -2078,7 +2048,6 @@ Window_GetField: ; 800414C
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0
.pool .pool
.align 2, 0 .align 2, 0
@08004168: @08004168:
@ -2098,7 +2067,6 @@ Window_GetField: ; 800414C
adds r1, r0 adds r1, r0
ldrb r0, [r1] ldrb r0, [r1]
b @0800422A b @0800422A
.align 2, 0
.pool .pool
@0800419C: @0800419C:
ldr r0, =0x02020004 ldr r0, =0x02020004
@ -2108,7 +2076,6 @@ Window_GetField: ; 800414C
adds r1, r0 adds r1, r0
ldrb r0, [r1, 0x1] ldrb r0, [r1, 0x1]
b @0800422A b @0800422A
.align 2, 0
.pool .pool
@080041B0: @080041B0:
ldr r0, =0x02020004 ldr r0, =0x02020004
@ -2118,7 +2085,6 @@ Window_GetField: ; 800414C
adds r1, r0 adds r1, r0
ldrb r0, [r1, 0x2] ldrb r0, [r1, 0x2]
b @0800422A b @0800422A
.align 2, 0
.pool .pool
@080041C4: @080041C4:
ldr r0, =0x02020004 ldr r0, =0x02020004
@ -2128,7 +2094,6 @@ Window_GetField: ; 800414C
adds r1, r0 adds r1, r0
ldrb r0, [r1, 0x3] ldrb r0, [r1, 0x3]
b @0800422A b @0800422A
.align 2, 0
.pool .pool
@080041D8: @080041D8:
ldr r0, =0x02020004 ldr r0, =0x02020004
@ -2138,7 +2103,6 @@ Window_GetField: ; 800414C
adds r1, r0 adds r1, r0
ldrb r0, [r1, 0x4] ldrb r0, [r1, 0x4]
b @0800422A b @0800422A
.align 2, 0
.pool .pool
@080041EC: @080041EC:
ldr r0, =0x02020004 ldr r0, =0x02020004
@ -2148,7 +2112,6 @@ Window_GetField: ; 800414C
adds r1, r0 adds r1, r0
ldrb r0, [r1, 0x5] ldrb r0, [r1, 0x5]
b @0800422A b @0800422A
.align 2, 0
.pool .pool
@08004200: @08004200:
ldr r0, =0x02020004 ldr r0, =0x02020004
@ -2158,7 +2121,6 @@ Window_GetField: ; 800414C
adds r1, r0 adds r1, r0
ldrh r0, [r1, 0x6] ldrh r0, [r1, 0x6]
b @0800422A b @0800422A
.align 2, 0
.pool .pool
@08004214: @08004214:
ldr r0, =0x02020004 ldr r0, =0x02020004
@ -2169,7 +2131,6 @@ Window_GetField: ; 800414C
adds r1, r0 adds r1, r0
ldr r0, [r1] ldr r0, [r1]
b @0800422A b @0800422A
.align 2, 0
.pool .pool
@08004228: @08004228:
movs r0, 0 movs r0, 0
@ -2203,7 +2164,6 @@ GetNumActiveWindowsOnBg: ; 8004230
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end GetNumActiveWindowsOnBg thumb_func_end GetNumActiveWindowsOnBg
@ -2314,7 +2274,6 @@ Window_AddFromTemplate8Bpp: ; 8004260
@08004322: @08004322:
movs r0, 0xFF movs r0, 0xFF
b @08004356 b @08004356
.align 2, 0
.pool .pool
@08004338: @08004338:
ldr r1, =0x02020004 ldr r1, =0x02020004
@ -2340,7 +2299,6 @@ Window_AddFromTemplate8Bpp: ; 8004260
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end Window_AddFromTemplate8Bpp thumb_func_end Window_AddFromTemplate8Bpp
@ -2379,7 +2337,6 @@ Window_FillPixels8Bpp: ; 8004368
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_FillPixels8Bpp thumb_func_end Window_FillPixels8Bpp
@ -2448,7 +2405,6 @@ Window_FillPixelRect8Bpp: ; 80043A8
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_FillPixelRect8Bpp thumb_func_end Window_FillPixelRect8Bpp
@ -2549,7 +2505,6 @@ Window_CopyPixelRectToWindow4BppTo8Bpp: ; 8004434
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0
.pool .pool
thumb_func_end Window_CopyPixelRectToWindow4BppTo8Bpp thumb_func_end Window_CopyPixelRectToWindow4BppTo8Bpp
@ -2581,7 +2536,6 @@ Window_CopyToVram8Bpp: ; 8004500
cmp r2, 0x1 cmp r2, 0x1
beq @08004546 beq @08004546
b @08004570 b @08004570
.align 2, 0
.pool .pool
@08004540: @08004540:
cmp r5, 0x3 cmp r5, 0x3
@ -2638,6 +2592,5 @@ GetNumActiveWindowsOnBgDuplicate: ; 8004578
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0
.pool .pool
thumb_func_end GetNumActiveWindowsOnBgDuplicate thumb_func_end GetNumActiveWindowsOnBgDuplicate