Leahnaya/pokepinballrs
1
0
Fork 0
mirror of https://github.com/pret/pokepinballrs.git synced 2026-03-21 17:24:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Decompile a couple functions in titlescreen, and label gMain

Browse Source
This commit is contained in:
Marcus Huderle 2018-10-15 19:57:26 -05:00
parent 5a87582cc1
commit c028df7ce7
24 changed files with 1972 additions and 1702 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
asm/field_select.s
View File

@ -8,7 +8,7 @@
FieldSelectMain: @ 0x08008AD4
push {lr}
ldr r1, _08008AEC @ =0x080792C0
ldr r0, _08008AF0 @ =0x0200B0C0
ldr r0, _08008AF0 @ =gMain
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@ -18,7 +18,7 @@ FieldSelectMain: @ 0x08008AD4
bx r0
.align 2, 0
_08008AEC: .4byte 0x080792C0
_08008AF0: .4byte 0x0200B0C0
_08008AF0: .4byte gMain
thumb_func_start LoadFieldSelectGraphics
LoadFieldSelectGraphics: @ 0x08008AF4
@ -58,7 +58,7 @@ LoadFieldSelectGraphics: @ 0x08008AF4
adds r1, r3, #0
orrs r0, r1
strh r0, [r2]
ldr r4, _08008BE0 @ =0x0200B0C0
ldr r4, _08008BE0 @ =gMain
ldrh r0, [r2]
strh r0, [r4, #0x16]
ldr r0, _08008BE4 @ =0x040000D4
@ -133,7 +133,7 @@ LoadFieldSelectGraphics: @ 0x08008AF4
_08008BD4: .4byte 0x04000008
_08008BD8: .4byte 0x0400000A
_08008BDC: .4byte 0x0400000C
_08008BE0: .4byte 0x0200B0C0
_08008BE0: .4byte gMain
_08008BE4: .4byte 0x040000D4
_08008BE8: .4byte gFieldSelectBGPals
_08008BEC: .4byte 0x80000100
@ -194,7 +194,7 @@ _08008C78: .4byte 0x02002850
sub_8C7C: @ 0x08008C7C
push {r4, r5, r6, r7, lr}
bl sub_8F94
ldr r7, _08008CC4 @ =0x0200B0C0
ldr r7, _08008CC4 @ =gMain
ldrh r1, [r7, #0x1c]
movs r0, #0xf
ands r0, r1
@ -230,7 +230,7 @@ _08008CB8:
beq _08008CDC
b _08008F4C
.align 2, 0
_08008CC4: .4byte 0x0200B0C0
_08008CC4: .4byte gMain
_08008CC8: .4byte 0x02002850
_08008CCC: .4byte 0x02002838
_08008CD0:
@ -273,7 +273,7 @@ _08008CFC:
strh r6, [r5, #6]
strh r0, [r5, #0xa]
_08008D1A:
ldr r2, _08008D50 @ =0x0200B0C0
ldr r2, _08008D50 @ =gMain
ldrh r1, [r2, #0x18]
movs r4, #1
adds r0, r4, #0
@ -299,7 +299,7 @@ _08008D1A:
movs r0, #3
b _08008D62
.align 2, 0
_08008D50: .4byte 0x0200B0C0
_08008D50: .4byte gMain
_08008D54: .4byte 0x02002838
_08008D58:
strh r4, [r1, #4]
@ -346,7 +346,7 @@ _08008DA6:
strh r0, [r1, #2]
strh r3, [r1, #0xc]
_08008DAA:
ldr r1, _08008DB8 @ =0x0200B0C0
ldr r1, _08008DB8 @ =gMain
ldrb r0, [r1, #4]
cmp r0, #1
bhi _08008DBC
@ -354,7 +354,7 @@ _08008DAA:
strb r0, [r1, #6]
b _08008F4C
.align 2, 0
_08008DB8: .4byte 0x0200B0C0
_08008DB8: .4byte gMain
_08008DBC:
movs r0, #1
strb r0, [r1, #6]
@ -453,7 +453,7 @@ _08008E5C:
ldrh r0, [r0]
_08008E76:
strh r0, [r5, #2]
ldr r0, _08008E98 @ =0x0200B0C0
ldr r0, _08008E98 @ =gMain
ldr r1, [r0, #0x4c]
movs r0, #1
ands r1, r0
@ -469,12 +469,12 @@ _08008E76:
b _08008EA0
.align 2, 0
_08008E94: .4byte 0x086A6B14
_08008E98: .4byte 0x0200B0C0
_08008E98: .4byte gMain
_08008E9C:
strh r1, [r3, #0xc]
strh r1, [r3, #0xa]
_08008EA0:
ldr r0, _08008ED0 @ =0x0200B0C0
ldr r0, _08008ED0 @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #0x20
ands r0, r1
@ -498,7 +498,7 @@ _08008EA0:
strh r0, [r4, #0xa]
b _08008F4C
.align 2, 0
_08008ED0: .4byte 0x0200B0C0
_08008ED0: .4byte gMain
_08008ED4: .4byte 0x02002838
_08008ED8:
movs r0, #0x10
@ -557,12 +557,12 @@ _08008F30:
ble _08008F4C
movs r0, #2
strh r0, [r1, #0x16]
ldr r1, _08008F60 @ =0x0200B0C0
ldr r1, _08008F60 @ =gMain
ldrb r0, [r1, #3]
adds r0, #1
strb r0, [r1, #3]
_08008F4C:
ldr r0, _08008F60 @ =0x0200B0C0
ldr r0, _08008F60 @ =gMain
ldr r1, _08008F5C @ =0x02002838
ldrh r1, [r1, #8]
strb r1, [r0, #4]
@ -573,7 +573,7 @@ _08008F56:
bx r0
.align 2, 0
_08008F5C: .4byte 0x02002838
_08008F60: .4byte 0x0200B0C0
_08008F60: .4byte gMain
thumb_func_start sub_8F64
sub_8F64: @ 0x08008F64
@ -582,7 +582,7 @@ sub_8F64: @ 0x08008F64
bl sub_FE04
bl m4aMPlayAllStop
bl sub_D10
ldr r1, _08008F8C @ =0x0201A4B4
ldr r1, _08008F8C @ =gAutoDisplayTitlescreenMenu
movs r0, #1
strb r0, [r1]
ldr r0, _08008F90 @ =0x02002838
@ -592,7 +592,7 @@ sub_8F64: @ 0x08008F64
bx r0
.align 2, 0
_08008F88: .4byte sub_8F94 + 1
_08008F8C: .4byte 0x0201A4B4
_08008F8C: .4byte gAutoDisplayTitlescreenMenu
_08008F90: .4byte 0x02002838
thumb_func_start sub_8F94
@ -603,7 +603,7 @@ sub_8F94: @ 0x08008F94
mov r5, r8
push {r5, r6, r7}
sub sp, #4
ldr r5, _08009254 @ =0x0200B0C0
ldr r5, _08009254 @ =gMain
ldrh r0, [r5, #0x38]
ldr r0, _08009258 @ =0x00000642
strh r0, [r5, #0x38]
@ -958,7 +958,7 @@ _08009234:
pop {r0}
bx r0
.align 2, 0
_08009254: .4byte 0x0200B0C0
_08009254: .4byte gMain
_08009258: .4byte 0x00000642
_0800925C: .4byte 0x00000808
_08009260: .4byte 0x04000050

170
asm/high_scores.s
View File

@ -8,7 +8,7 @@
HighScoresMain: @ 0x0800CE48
push {lr}
ldr r1, _0800CE60 @ =0x080793E8
ldr r0, _0800CE64 @ =0x0200B0C0
ldr r0, _0800CE64 @ =gMain
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@ -18,13 +18,13 @@ HighScoresMain: @ 0x0800CE48
bx r0
.align 2, 0
_0800CE60: .4byte 0x080793E8
_0800CE64: .4byte 0x0200B0C0
_0800CE64: .4byte gMain
thumb_func_start sub_CE68_Main
sub_CE68_Main: @ 0x0800CE68
push {lr}
ldr r1, _0800CE80 @ =0x08079424
ldr r0, _0800CE84 @ =0x0200B0C0
ldr r0, _0800CE84 @ =gMain
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@ -34,7 +34,7 @@ sub_CE68_Main: @ 0x0800CE68
bx r0
.align 2, 0
_0800CE80: .4byte 0x08079424
_0800CE84: .4byte 0x0200B0C0
_0800CE84: .4byte gMain
thumb_func_start sub_CE88
sub_CE88: @ 0x0800CE88
@ -66,7 +66,7 @@ sub_CE88: @ 0x0800CE88
adds r1, r3, #0
orrs r0, r1
strh r0, [r2]
ldr r7, _0800CF78 @ =0x0200B0C0
ldr r7, _0800CF78 @ =gMain
ldrh r0, [r2]
strh r0, [r7, #0x16]
ldr r4, _0800CF7C @ =0x040000D4
@ -150,7 +150,7 @@ _0800CF68: .4byte 0x0400000C
_0800CF6C: .4byte 0x00004006
_0800CF70: .4byte 0x0400000E
_0800CF74: .4byte 0x0000420F
_0800CF78: .4byte 0x0200B0C0
_0800CF78: .4byte gMain
_0800CF7C: .4byte 0x040000D4
_0800CF80: .4byte 0x0809DBE0
_0800CF84: .4byte 0x80000100
@ -276,7 +276,7 @@ _0800D03A:
beq _0800D090
b _0800D1C0
_0800D090:
ldr r0, _0800D0D8 @ =0x0200B0C0
ldr r0, _0800D0D8 @ =gMain
ldr r1, [r0, #0x5c]
mov r4, r8
str r1, [r4]
@ -303,7 +303,7 @@ _0800D0C8: .4byte 0x0201C18C
_0800D0CC: .4byte 0x02002884
_0800D0D0: .4byte 0x02002885
_0800D0D4: .4byte 0x0202C588
_0800D0D8: .4byte 0x0200B0C0
_0800D0D8: .4byte gMain
_0800D0DC: .4byte 0x02002882
_0800D0E0: .4byte 0x02002880
_0800D0E4:
@ -423,7 +423,7 @@ _0800D1C0:
movs r0, #3
strb r0, [r4, #0xa]
_0800D1DA:
ldr r2, _0800D208 @ =0x0200B0C0
ldr r2, _0800D208 @ =gMain
ldr r0, _0800D200 @ =0x02002882
ldrh r1, [r0]
movs r3, #0xbd
@ -444,7 +444,7 @@ _0800D1DA:
.align 2, 0
_0800D200: .4byte 0x02002882
_0800D204: .4byte 0x02002880
_0800D208: .4byte 0x0200B0C0
_0800D208: .4byte gMain
thumb_func_start sub_D20C
sub_D20C: @ 0x0800D20C
@ -516,7 +516,7 @@ _0800D284: .4byte 0x0201A4B8
_0800D288: .4byte 0x02002858
_0800D28C: .4byte 0x0202C580
_0800D290:
ldr r0, _0800D2AC @ =0x0200B0C0
ldr r0, _0800D2AC @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #3
ands r0, r1
@ -531,7 +531,7 @@ _0800D2A2:
strb r0, [r4]
b _0800D2E0
.align 2, 0
_0800D2AC: .4byte 0x0200B0C0
_0800D2AC: .4byte gMain
_0800D2B0: .4byte 0x0202C580
_0800D2B4:
ldr r0, _0800D2F4 @ =0x0201A4B8
@ -553,7 +553,7 @@ _0800D2B4:
strb r0, [r1]
ldr r0, _0800D300 @ =0x0201C18C
strb r2, [r0]
ldr r1, _0800D304 @ =0x0200B0C0
ldr r1, _0800D304 @ =gMain
movs r0, #2
strb r0, [r1, #3]
_0800D2E0:
@ -570,7 +570,7 @@ _0800D2F4: .4byte 0x0201A4B8
_0800D2F8: .4byte 0x02002858
_0800D2FC: .4byte 0x0202BEB0
_0800D300: .4byte 0x0201C18C
_0800D304: .4byte 0x0200B0C0
_0800D304: .4byte gMain
thumb_func_start sub_D308
sub_D308: @ 0x0800D308
@ -603,13 +603,13 @@ _0800D330:
strh r2, [r4, #0x1a]
movs r0, #9
bl m4aSongNumStart
ldr r1, _0800D350 @ =0x0200B0C0
ldr r1, _0800D350 @ =gMain
movs r0, #3
strb r0, [r1, #3]
b _0800D35E
.align 2, 0
_0800D34C: .4byte 0x000003E7
_0800D350: .4byte 0x0200B0C0
_0800D350: .4byte gMain
_0800D354:
ldr r0, _0800D3C8 @ =0x0000014B
bl m4aSongNumStart
@ -756,7 +756,7 @@ _0800D42C:
_0800D476:
movs r0, #9
bl m4aSongNumStart
ldr r1, _0800D4A8 @ =0x0200B0C0
ldr r1, _0800D4A8 @ =gMain
movs r0, #4
strb r0, [r1, #3]
_0800D482:
@ -778,7 +778,7 @@ _0800D482:
.align 2, 0
_0800D4A0: .4byte 0x08079870
_0800D4A4: .4byte 0x02002858
_0800D4A8: .4byte 0x0200B0C0
_0800D4A8: .4byte gMain
_0800D4AC: .4byte 0x040000D4
_0800D4B0: .4byte 0x03005C00
_0800D4B4: .4byte 0x80000800
@ -787,7 +787,7 @@ _0800D4B4: .4byte 0x80000800
sub_D4B8: @ 0x0800D4B8
push {r4, lr}
bl sub_E464
ldr r4, _0800D500 @ =0x0200B0C0
ldr r4, _0800D500 @ =gMain
ldr r0, [r4, #0x4c]
movs r1, #0xc
bl __umodsi3
@ -820,7 +820,7 @@ _0800D4E0:
strh r2, [r3]
b _0800D522
.align 2, 0
_0800D500: .4byte 0x0200B0C0
_0800D500: .4byte gMain
_0800D504: .4byte 0x02002858
_0800D508: .4byte 0x02002880
_0800D50C:
@ -866,7 +866,7 @@ _0800D544:
_0800D558:
strh r0, [r1]
_0800D55A:
ldr r4, _0800D60C @ =0x0200B0C0
ldr r4, _0800D60C @ =gMain
ldrh r1, [r4, #0x18]
movs r0, #3
ands r0, r1
@ -901,7 +901,7 @@ _0800D588:
movs r0, #5
strb r0, [r4, #3]
_0800D59E:
ldr r3, _0800D60C @ =0x0200B0C0
ldr r3, _0800D60C @ =gMain
ldrh r2, [r3, #0x1c]
movs r1, #0x88
lsls r1, r1, #2
@ -953,11 +953,11 @@ _0800D5FC:
ldrb r1, [r2]
movs r0, #0
ldrsb r0, [r2, r0]
ldr r4, _0800D60C @ =0x0200B0C0
ldr r4, _0800D60C @ =gMain
b _0800D628
.align 2, 0
_0800D608: .4byte 0x02002882
_0800D60C: .4byte 0x0200B0C0
_0800D60C: .4byte gMain
_0800D610: .4byte 0x0201B178
_0800D614: .4byte 0x0202BEBC
_0800D618: .4byte 0x02002884
@ -1042,7 +1042,7 @@ _0800D68C:
ble _0800D6B8
strh r5, [r4, #0x1c]
_0800D6B8:
ldr r0, _0800D6EC @ =0x0200B0C0
ldr r0, _0800D6EC @ =gMain
ldrh r1, [r0, #0x1c]
movs r0, #0x80
ands r0, r1
@ -1066,7 +1066,7 @@ _0800D6B8:
b _0800D718
.align 2, 0
_0800D6E8: .4byte 0x02002858
_0800D6EC: .4byte 0x0200B0C0
_0800D6EC: .4byte gMain
_0800D6F0:
movs r0, #0x40
ands r0, r1
@ -1098,7 +1098,7 @@ _0800D718:
movs r0, #9
strh r0, [r4, #0x20]
_0800D72C:
ldr r0, _0800D78C @ =0x0200B0C0
ldr r0, _0800D78C @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #0x10
ands r0, r1
@ -1143,7 +1143,7 @@ _0800D72C:
b _0800D7F6
.align 2, 0
_0800D788: .4byte 0x02002858
_0800D78C: .4byte 0x0200B0C0
_0800D78C: .4byte gMain
_0800D790: .4byte 0x0202C610
_0800D794:
movs r0, #0x20
@ -1212,7 +1212,7 @@ _0800D7F6:
ldr r0, [r1]
strh r0, [r4, #0x16]
_0800D818:
ldr r0, _0800D8FC @ =0x0200B0C0
ldr r0, _0800D8FC @ =gMain
ldrh r1, [r0, #0x18]
movs r5, #1
adds r0, r5, #0
@ -1320,13 +1320,13 @@ _0800D8CE:
cmp r3, #1
ble _0800D8AC
bl sub_52B30
ldr r1, _0800D8FC @ =0x0200B0C0
ldr r1, _0800D8FC @ =gMain
movs r0, #3
strb r0, [r1, #3]
b _0800D9B6
.align 2, 0
_0800D8F8: .4byte 0x0202C610
_0800D8FC: .4byte 0x0200B0C0
_0800D8FC: .4byte gMain
_0800D900: .4byte 0x02002858
_0800D904: .4byte 0x0201A500
_0800D908: .4byte 0x0200B134
@ -1456,20 +1456,20 @@ sub_D9F8: @ 0x0800D9F8
movs r0, #0
strb r0, [r1]
bl sub_E464
ldr r1, _0800DA1C @ =0x0200B0C0
ldr r1, _0800DA1C @ =gMain
movs r0, #6
strb r0, [r1, #3]
pop {r0}
bx r0
.align 2, 0
_0800DA18: .4byte 0x0201B124
_0800DA1C: .4byte 0x0200B0C0
_0800DA1C: .4byte gMain
thumb_func_start sub_DA20
sub_DA20: @ 0x0800DA20
push {r4, r5, lr}
bl sub_E464
ldr r4, _0800DA4C @ =0x0200B0C0
ldr r4, _0800DA4C @ =gMain
ldrh r1, [r4, #0x18]
movs r0, #2
ands r0, r1
@ -1487,7 +1487,7 @@ sub_DA20: @ 0x0800DA20
strb r0, [r4, #3]
b _0800DB2E
.align 2, 0
_0800DA4C: .4byte 0x0200B0C0
_0800DA4C: .4byte gMain
_0800DA50: .4byte 0x0201B178
_0800DA54: .4byte 0x0202BEBC
_0800DA58:
@ -1583,7 +1583,7 @@ _0800DAE8:
ldr r1, _0800DB34 @ =0x0202BEBC
movs r0, #2
strb r0, [r1]
ldr r1, _0800DB48 @ =0x0200B0C0
ldr r1, _0800DB48 @ =gMain
movs r0, #7
strb r0, [r1, #3]
movs r0, #0x8a
@ -1598,7 +1598,7 @@ _0800DB38: .4byte 0x0201A510
_0800DB3C: .4byte 0x0202ADD0
_0800DB40: .4byte 0x0202ADE4
_0800DB44: .4byte 0x0201A444
_0800DB48: .4byte 0x0200B0C0
_0800DB48: .4byte gMain
thumb_func_start sub_DB4C
sub_DB4C: @ 0x0800DB4C
@ -1612,14 +1612,14 @@ sub_DB4C: @ 0x0800DB4C
ble _0800DB66
movs r0, #0
strh r0, [r1]
ldr r1, _0800DB6C @ =0x0200B0C0
ldr r1, _0800DB6C @ =gMain
movs r0, #5
strb r0, [r1, #3]
_0800DB66:
bx lr
.align 2, 0
_0800DB68: .4byte 0x0201A444
_0800DB6C: .4byte 0x0200B0C0
_0800DB6C: .4byte gMain
thumb_func_start sub_DB70
sub_DB70: @ 0x0800DB70
@ -1667,7 +1667,7 @@ _0800DBB2:
bl sub_2B4
bl m4aMPlayAllStop
bl sub_D10
ldr r0, _0800DBF0 @ =0x0200B0C0
ldr r0, _0800DBF0 @ =gMain
strb r4, [r0, #3]
_0800DBD4:
pop {r4, r5, r6}
@ -1679,7 +1679,7 @@ _0800DBE0: .4byte 0x0201B178
_0800DBE4: .4byte 0x0202BEBC
_0800DBE8: .4byte 0x0202C550
_0800DBEC: .4byte 0x0202C610
_0800DBF0: .4byte 0x0200B0C0
_0800DBF0: .4byte gMain
thumb_func_start sub_DBF4
sub_DBF4: @ 0x0800DBF4
@ -1775,7 +1775,7 @@ _0800DC88:
bl sub_2B4
bl m4aMPlayAllStop
bl sub_D10
ldr r1, _0800DCE8 @ =0x0200B0C0
ldr r1, _0800DCE8 @ =gMain
movs r0, #0xc
strb r0, [r1, #3]
_0800DCBA:
@ -1796,14 +1796,14 @@ _0800DCD8: .4byte 0x0202BED8
_0800DCDC: .4byte 0x0201B170
_0800DCE0: .4byte 0x0200B134
_0800DCE4: .4byte 0x0202C610
_0800DCE8: .4byte 0x0200B0C0
_0800DCE8: .4byte gMain
_0800DCEC: .4byte 0x02002858
thumb_func_start sub_DCF0
sub_DCF0: @ 0x0800DCF0
push {r4, r5, lr}
bl sub_E464
ldr r5, _0800DD20 @ =0x0200B0C0
ldr r5, _0800DD20 @ =gMain
ldrh r1, [r5, #0x18]
movs r4, #1
ands r4, r1
@ -1819,7 +1819,7 @@ sub_DCF0: @ 0x0800DCF0
movs r0, #0
b _0800DD3C
.align 2, 0
_0800DD20: .4byte 0x0200B0C0
_0800DD20: .4byte gMain
_0800DD24:
movs r0, #2
ands r0, r1
@ -1848,7 +1848,7 @@ sub_DD4C: @ 0x0800DD4C
bl sub_2B4
bl m4aMPlayAllStop
bl sub_D10
ldr r1, _0800DD6C @ =0x0201A4B4
ldr r1, _0800DD6C @ =gAutoDisplayTitlescreenMenu
movs r0, #1
strb r0, [r1]
movs r0, #1
@ -1856,7 +1856,7 @@ sub_DD4C: @ 0x0800DD4C
pop {r0}
bx r0
.align 2, 0
_0800DD6C: .4byte 0x0201A4B4
_0800DD6C: .4byte gAutoDisplayTitlescreenMenu
thumb_func_start sub_DD70
sub_DD70: @ 0x0800DD70
@ -1890,7 +1890,7 @@ sub_DD70: @ 0x0800DD70
adds r1, r3, #0
orrs r0, r1
strh r0, [r2]
ldr r6, _0800DE60 @ =0x0200B0C0
ldr r6, _0800DE60 @ =gMain
ldrh r0, [r2]
strh r0, [r6, #0x16]
ldr r4, _0800DE64 @ =0x040000D4
@ -1970,7 +1970,7 @@ _0800DE50: .4byte 0x0400000C
_0800DE54: .4byte 0x00004006
_0800DE58: .4byte 0x0400000E
_0800DE5C: .4byte 0x0000420F
_0800DE60: .4byte 0x0200B0C0
_0800DE60: .4byte gMain
_0800DE64: .4byte 0x040000D4
_0800DE68: .4byte 0x0809DBE0
_0800DE6C: .4byte 0x80000100
@ -2002,7 +2002,7 @@ sub_DEB4: @ 0x0800DEB4
movs r2, #0
ldr r0, _0800DF54 @ =0x02002858
mov r8, r0
ldr r0, _0800DF58 @ =0x0200B0C0
ldr r0, _0800DF58 @ =gMain
mov ip, r0
ldr r0, _0800DF5C @ =0x0202C610
mov sl, r0
@ -2079,7 +2079,7 @@ _0800DEF4:
bx r0
.align 2, 0
_0800DF54: .4byte 0x02002858
_0800DF58: .4byte 0x0200B0C0
_0800DF58: .4byte gMain
_0800DF5C: .4byte 0x0202C610
_0800DF60: .4byte 0x02002882
_0800DF64: .4byte 0x02002880
@ -2096,18 +2096,18 @@ sub_DF68: @ 0x0800DF68
bgt _0800DF88
cmp r4, #0
beq _0800DF94
ldr r4, _0800DF84 @ =0x0200B0C0
ldr r4, _0800DF84 @ =gMain
b _0800E072
.align 2, 0
_0800DF80: .4byte 0x02002858
_0800DF84: .4byte 0x0200B0C0
_0800DF84: .4byte gMain
_0800DF88:
cmp r4, #2
beq _0800E020
ldr r4, _0800DF90 @ =0x0200B0C0
ldr r4, _0800DF90 @ =gMain
b _0800E072
.align 2, 0
_0800DF90: .4byte 0x0200B0C0
_0800DF90: .4byte gMain
_0800DF94:
ldrh r0, [r5, #0x1e]
adds r0, #1
@ -2137,7 +2137,7 @@ _0800DFC0:
movs r1, #0x96
lsls r1, r1, #2
adds r5, r0, #0
ldr r4, _0800DFE4 @ =0x0200B0C0
ldr r4, _0800DFE4 @ =gMain
cmp r2, r1
ble _0800E072
movs r0, #0
@ -2149,7 +2149,7 @@ _0800DFC0:
b _0800E072
.align 2, 0
_0800DFE0: .4byte 0x02002858
_0800DFE4: .4byte 0x0200B0C0
_0800DFE4: .4byte gMain
_0800DFE8:
ldr r2, _0800E018 @ =0x02002882
ldrh r0, [r2]
@ -2164,7 +2164,7 @@ _0800DFE8:
movs r0, #2
strb r0, [r5, #0xa]
_0800E000:
ldr r1, _0800E01C @ =0x0200B0C0
ldr r1, _0800E01C @ =gMain
ldrh r2, [r2]
movs r3, #0xbd
lsls r3, r3, #2
@ -2177,7 +2177,7 @@ _0800E000:
b _0800E072
.align 2, 0
_0800E018: .4byte 0x02002882
_0800E01C: .4byte 0x0200B0C0
_0800E01C: .4byte gMain
_0800E020:
ldrh r0, [r5, #0x1e]
adds r0, #1
@ -2208,7 +2208,7 @@ _0800E04E:
movs r1, #0x96
lsls r1, r1, #2
adds r5, r0, #0
ldr r4, _0800E0B4 @ =0x0200B0C0
ldr r4, _0800E0B4 @ =gMain
cmp r2, r1
ble _0800E072
movs r1, #0
@ -2253,7 +2253,7 @@ _0800E0A8:
bx r0
.align 2, 0
_0800E0B0: .4byte 0x02002858
_0800E0B4: .4byte 0x0200B0C0
_0800E0B4: .4byte gMain
_0800E0B8: .4byte 0x040000D4
_0800E0BC: .4byte 0x03005C00
_0800E0C0: .4byte 0x80000800
@ -2309,7 +2309,7 @@ sub_E0EC: @ 0x0800E0EC
adds r1, r3, #0
orrs r0, r1
strh r0, [r2]
ldr r6, _0800E1DC @ =0x0200B0C0
ldr r6, _0800E1DC @ =gMain
ldrh r0, [r2]
strh r0, [r6, #0x16]
ldr r4, _0800E1E0 @ =0x040000D4
@ -2389,7 +2389,7 @@ _0800E1CC: .4byte 0x0400000C
_0800E1D0: .4byte 0x00004006
_0800E1D4: .4byte 0x0400000E
_0800E1D8: .4byte 0x0000420F
_0800E1DC: .4byte 0x0200B0C0
_0800E1DC: .4byte gMain
_0800E1E0: .4byte 0x040000D4
_0800E1E4: .4byte 0x0809DBE0
_0800E1E8: .4byte 0x80000100
@ -2423,18 +2423,18 @@ sub_E230: @ 0x0800E230
bgt _0800E250
cmp r4, #0
beq _0800E25C
ldr r4, _0800E24C @ =0x0200B0C0
ldr r4, _0800E24C @ =gMain
b _0800E344
.align 2, 0
_0800E248: .4byte 0x02002858
_0800E24C: .4byte 0x0200B0C0
_0800E24C: .4byte gMain
_0800E250:
cmp r4, #2
beq _0800E2F4
ldr r4, _0800E258 @ =0x0200B0C0
ldr r4, _0800E258 @ =gMain
b _0800E344
.align 2, 0
_0800E258: .4byte 0x0200B0C0
_0800E258: .4byte gMain
_0800E25C:
ldr r0, _0800E2B0 @ =0x0202BED8
ldr r1, [r0]
@ -2467,7 +2467,7 @@ _0800E292:
movs r2, #8
ldrsh r1, [r0, r2]
adds r5, r0, #0
ldr r4, _0800E2B8 @ =0x0200B0C0
ldr r4, _0800E2B8 @ =gMain
cmp r1, #0x78
ble _0800E344
movs r0, #0
@ -2480,7 +2480,7 @@ _0800E292:
.align 2, 0
_0800E2B0: .4byte 0x0202BED8
_0800E2B4: .4byte 0x02002858
_0800E2B8: .4byte 0x0200B0C0
_0800E2B8: .4byte gMain
_0800E2BC:
ldr r2, _0800E2EC @ =0x02002882
ldrh r0, [r2]
@ -2495,7 +2495,7 @@ _0800E2BC:
movs r0, #2
strb r0, [r5, #0xa]
_0800E2D4:
ldr r1, _0800E2F0 @ =0x0200B0C0
ldr r1, _0800E2F0 @ =gMain
ldrh r2, [r2]
movs r3, #0xbd
lsls r3, r3, #2
@ -2508,7 +2508,7 @@ _0800E2D4:
b _0800E344
.align 2, 0
_0800E2EC: .4byte 0x02002882
_0800E2F0: .4byte 0x0200B0C0
_0800E2F0: .4byte gMain
_0800E2F4:
ldr r0, _0800E378 @ =0x0201B170
ldr r1, [r0]
@ -2542,7 +2542,7 @@ _0800E32C:
movs r2, #8
ldrsh r1, [r0, r2]
adds r5, r0, #0
ldr r4, _0800E380 @ =0x0200B0C0
ldr r4, _0800E380 @ =gMain
cmp r1, #0x78
ble _0800E344
movs r0, #0
@ -2580,7 +2580,7 @@ _0800E372:
.align 2, 0
_0800E378: .4byte 0x0201B170
_0800E37C: .4byte 0x02002858
_0800E380: .4byte 0x0200B0C0
_0800E380: .4byte gMain
_0800E384: .4byte 0x040000D4
_0800E388: .4byte 0x03005C00
_0800E38C: .4byte 0x80000800
@ -3362,7 +3362,7 @@ sub_E994: @ 0x0800E994
_0800E9B4: .4byte 0x0202ADE4
_0800E9B8: .4byte 0x0201A4BC
_0800E9BC:
ldr r0, _0800E9D0 @ =0x0200B0C0
ldr r0, _0800E9D0 @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #1
ands r0, r1
@ -3373,7 +3373,7 @@ _0800E9BC:
strh r0, [r1]
b _0800EAB2
.align 2, 0
_0800E9D0: .4byte 0x0200B0C0
_0800E9D0: .4byte gMain
_0800E9D4: .4byte 0x0202C5F0
_0800E9D8: .4byte 0x0000DEDE
_0800E9DC:
@ -3516,7 +3516,7 @@ sub_EAC0: @ 0x0800EAC0
_0800EAE0: .4byte 0x0202ADE4
_0800EAE4: .4byte 0x0202C598
_0800EAE8:
ldr r0, _0800EAFC @ =0x0200B0C0
ldr r0, _0800EAFC @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #1
ands r0, r1
@ -3527,7 +3527,7 @@ _0800EAE8:
strh r0, [r1]
b _0800EBDE
.align 2, 0
_0800EAFC: .4byte 0x0200B0C0
_0800EAFC: .4byte gMain
_0800EB00: .4byte 0x0202C5F0
_0800EB04: .4byte 0x0000DEDE
_0800EB08:
@ -6077,7 +6077,7 @@ sub_FEB8: @ 0x0800FEB8
str r5, [r4, #8]
ldr r0, [r4, #8]
bl sub_1050C
ldr r1, _0800FF4C @ =0x0200B0C0
ldr r1, _0800FF4C @ =gMain
movs r0, #0x80
lsls r0, r0, #0x13
ldrh r0, [r0]
@ -6103,7 +6103,7 @@ _0800FF3C: .4byte 0x80000100
_0800FF40: .4byte 0xFFFFFC00
_0800FF44: .4byte 0x81000200
_0800FF48: .4byte 0x80000200
_0800FF4C: .4byte 0x0200B0C0
_0800FF4C: .4byte gMain
_0800FF50:
ldr r0, _0800FF70 @ =0x0201AD20
_0800FF52:
@ -6764,7 +6764,7 @@ sub_10424: @ 0x08010424
ldr r0, _08010478 @ =0x0000FF7F
ands r0, r1
strh r0, [r2]
ldr r1, _0801047C @ =0x0200B0C0
ldr r1, _0801047C @ =gMain
ldrh r0, [r2]
movs r5, #0
strh r0, [r1, #0x16]
@ -6783,7 +6783,7 @@ sub_10424: @ 0x08010424
_08010470: .4byte 0x04000054
_08010474: .4byte 0x04000050
_08010478: .4byte 0x0000FF7F
_0801047C: .4byte 0x0200B0C0
_0801047C: .4byte gMain
thumb_func_start sub_10480
sub_10480: @ 0x08010480
@ -6857,17 +6857,17 @@ sub_1050C: @ 0x0801050C
ldr r0, _08010520 @ =0x0000FF7F
ands r0, r2
strh r0, [r1]
ldr r2, _08010524 @ =0x0200B0C0
ldr r2, _08010524 @ =gMain
ldrh r0, [r1]
strh r0, [r2, #0x16]
bx lr
.align 2, 0
_08010520: .4byte 0x0000FF7F
_08010524: .4byte 0x0200B0C0
_08010524: .4byte gMain
thumb_func_start sub_10528
sub_10528: @ 0x08010528
ldr r1, _08010540 @ =0x0200B0C0
ldr r1, _08010540 @ =gMain
ldrh r0, [r1, #0x16]
movs r2, #0x80
orrs r0, r2
@ -6879,7 +6879,7 @@ sub_10528: @ 0x08010528
strh r0, [r1]
bx lr
.align 2, 0
_08010540: .4byte 0x0200B0C0
_08010540: .4byte gMain
thumb_func_start sub_10544
sub_10544: @ 0x08010544

168
asm/intro.s
View File

@ -8,7 +8,7 @@
IntroMain: @ 0x0800927C
push {lr}
ldr r1, _08009294 @ =0x080792CC
ldr r0, _08009298 @ =0x0200B0C0
ldr r0, _08009298 @ =gMain
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@ -18,7 +18,7 @@ IntroMain: @ 0x0800927C
bx r0
.align 2, 0
_08009294: .4byte 0x080792CC
_08009298: .4byte 0x0200B0C0
_08009298: .4byte gMain
thumb_func_start sub_929C
sub_929C: @ 0x0800929C
@ -60,7 +60,7 @@ sub_929C: @ 0x0800929C
ldr r0, _08009334 @ =0x80000100
str r0, [r1, #8]
ldr r0, [r1, #8]
ldr r4, _08009338 @ =0x0200B0C0
ldr r4, _08009338 @ =gMain
ldrh r0, [r3]
movs r2, #0
movs r1, #0
@ -88,7 +88,7 @@ _08009328: .4byte 0x0807A0C0
_0800932C: .4byte 0x06004000
_08009330: .4byte gIntroCopyright_Pal
_08009334: .4byte 0x80000100
_08009338: .4byte 0x0200B0C0
_08009338: .4byte gMain
_0800933C: .4byte 0x0202BF10
_08009340: .4byte 0x0202C790
_08009344: .4byte sub_93F8 + 1
@ -105,7 +105,7 @@ sub_9348: @ 0x08009348
ble _08009364
movs r0, #0
strh r0, [r1]
ldr r1, _0800936C @ =0x0200B0C0
ldr r1, _0800936C @ =gMain
ldrb r0, [r1, #3]
adds r0, #1
strb r0, [r1, #3]
@ -113,7 +113,7 @@ _08009364:
bx lr
.align 2, 0
_08009368: .4byte 0x0202BF10
_0800936C: .4byte 0x0200B0C0
_0800936C: .4byte gMain
thumb_func_start sub_9370
sub_9370: @ 0x08009370
@ -121,14 +121,14 @@ sub_9370: @ 0x08009370
movs r0, #0
bl sub_FF74
bl sub_D10
ldr r1, _08009388 @ =0x0200B0C0
ldr r1, _08009388 @ =gMain
ldrb r0, [r1, #3]
adds r0, #1
strb r0, [r1, #3]
pop {r0}
bx r0
.align 2, 0
_08009388: .4byte 0x0200B0C0
_08009388: .4byte gMain
thumb_func_start sub_938C
sub_938C: @ 0x0800938C
@ -146,7 +146,7 @@ sub_938C: @ 0x0800938C
ldrh r0, [r1]
adds r0, #1
strh r0, [r1]
ldr r2, _080093CC @ =0x0200B0C0
ldr r2, _080093CC @ =gMain
ldrh r1, [r2, #0x18]
movs r0, #9
ands r0, r1
@ -161,7 +161,7 @@ _080093BA:
_080093C0: .4byte 0x080792E0
_080093C4: .4byte 0x0202C790
_080093C8: .4byte 0x0202BF10
_080093CC: .4byte 0x0200B0C0
_080093CC: .4byte gMain
thumb_func_start sub_93D0
sub_93D0: @ 0x080093D0
@ -170,7 +170,7 @@ sub_93D0: @ 0x080093D0
bl m4aMPlayAllStop
bl sub_D10
bl sub_8BC
ldr r1, _080093F4 @ =0x0201A4B4
ldr r1, _080093F4 @ =gAutoDisplayTitlescreenMenu
movs r0, #0
strb r0, [r1]
movs r0, #1
@ -178,7 +178,7 @@ sub_93D0: @ 0x080093D0
pop {r0}
bx r0
.align 2, 0
_080093F4: .4byte 0x0201A4B4
_080093F4: .4byte gAutoDisplayTitlescreenMenu
thumb_func_start sub_93F8
sub_93F8: @ 0x080093F8
@ -202,7 +202,7 @@ sub_93F8: @ 0x080093F8
ldr r0, [r1, #8]
movs r2, #0x80
lsls r2, r2, #0x13
ldr r1, _08009490 @ =0x0200B0C0
ldr r1, _08009490 @ =gMain
ldrh r0, [r1, #0x16]
strh r0, [r2]
adds r2, #0x10
@ -254,7 +254,7 @@ _08009480: .4byte 0x04000004
_08009484: .4byte 0x040000D4
_08009488: .4byte 0x03005000
_0800948C: .4byte 0x84000100
_08009490: .4byte 0x0200B0C0
_08009490: .4byte gMain
_08009494: .4byte 0x000002F6
thumb_func_start sub_9498
@ -381,7 +381,7 @@ sub_9498: @ 0x08009498
str r1, [r4, #8]
ldr r0, [r4, #8]
bl sub_96A8
ldr r1, _08009690 @ =0x0200B0C0
ldr r1, _08009690 @ =gMain
ldr r2, _08009694 @ =0x0202ADA0
ldrh r3, [r2]
movs r7, #0xba
@ -475,7 +475,7 @@ _08009680: .4byte 0x06010000
_08009684: .4byte 0x80004000
_08009688: .4byte 0x05000200
_0800968C: .4byte 0x80000100
_08009690: .4byte 0x0200B0C0
_08009690: .4byte gMain
_08009694: .4byte 0x0202ADA0
_08009698: .4byte 0x000002EA
_0800969C: .4byte 0x000002F6
@ -900,7 +900,7 @@ _080099EC:
subs r0, #1
strh r0, [r4, #2]
_08009A04:
ldr r1, _08009A9C @ =0x0200B0C0
ldr r1, _08009A9C @ =gMain
ldrh r2, [r4]
movs r3, #0xba
lsls r3, r3, #2
@ -969,7 +969,7 @@ _08009A8C: .4byte 0x05000200
_08009A90: .4byte 0x0202BF10
_08009A94: .4byte 0x0201A450
_08009A98: .4byte 0x0202ADA0
_08009A9C: .4byte 0x0200B0C0
_08009A9C: .4byte gMain
_08009AA0: .4byte 0x000002EA
_08009AA4: .4byte 0x086A7768
_08009AA8: .4byte 0x086A7788
@ -1100,7 +1100,7 @@ _08009B94:
strb r0, [r1]
_08009BB0:
bl sub_9E90
ldr r1, _08009C04 @ =0x0200B0C0
ldr r1, _08009C04 @ =gMain
ldrh r2, [r4]
movs r3, #0xba
lsls r3, r3, #2
@ -1135,7 +1135,7 @@ _08009BF4: .4byte 0x0201C1C0
_08009BF8: .4byte 0x060032C0
_08009BFC: .4byte 0x0202ADA0
_08009C00: .4byte 0x0202C790
_08009C04: .4byte 0x0200B0C0
_08009C04: .4byte gMain
_08009C08: .4byte 0x000002F2
thumb_func_start nullsub_4
@ -1170,7 +1170,7 @@ sub_9C10: @ 0x08009C10
strh r0, [r1, #0x22]
_08009C40:
bl sub_9E90
ldr r1, _08009C88 @ =0x0200B0C0
ldr r1, _08009C88 @ =gMain
ldrh r2, [r4, #0x18]
movs r3, #0xbd
lsls r3, r3, #2
@ -1202,7 +1202,7 @@ _08009C74:
_08009C7C: .4byte 0x0202ADA0
_08009C80: .4byte 0x0202BF10
_08009C84: .4byte 0x0201A450
_08009C88: .4byte 0x0200B0C0
_08009C88: .4byte gMain
_08009C8C: .4byte 0x000002F6
_08009C90: .4byte 0x0202C790
@ -1465,7 +1465,7 @@ sub_9E90: @ 0x08009E90
mov r5, r8
push {r5, r6, r7}
sub sp, #4
ldr r3, _0800A12C @ =0x0200B0C0
ldr r3, _0800A12C @ =gMain
ldrh r0, [r3, #0x38]
movs r0, #0xf1
lsls r0, r0, #4
@ -1801,7 +1801,7 @@ _0800A10A:
pop {r0}
bx r0
.align 2, 0
_0800A12C: .4byte 0x0200B0C0
_0800A12C: .4byte gMain
_0800A130: .4byte 0x0201C1B8
_0800A134: .4byte 0x0202ADD4
_0800A138: .4byte 0x04000050
@ -1901,7 +1901,7 @@ sub_A16C: @ 0x0800A16C
str r1, [r0, #8]
ldr r0, [r0, #8]
bl sub_A2A8
ldr r1, _0800A298 @ =0x0200B0C0
ldr r1, _0800A298 @ =gMain
ldr r3, _0800A29C @ =0x0202ADA0
ldrh r2, [r3]
movs r4, #0xba
@ -1956,7 +1956,7 @@ _0800A288: .4byte 0x080CC6E0
_0800A28C: .4byte 0x80001E00
_0800A290: .4byte 0x080CBCE0
_0800A294: .4byte 0x80000040
_0800A298: .4byte 0x0200B0C0
_0800A298: .4byte gMain
_0800A29C: .4byte 0x0202ADA0
_0800A2A0: .4byte 0x000002F6
_0800A2A4: .4byte 0x0202C790
@ -2033,7 +2033,7 @@ sub_A2F0: @ 0x0800A2F0
subs r0, r2, #1
strh r0, [r3, #0x12]
_0800A330:
ldr r1, _0800A38C @ =0x0200B0C0
ldr r1, _0800A38C @ =gMain
ldrh r2, [r3]
movs r4, #0xba
lsls r4, r4, #2
@ -2079,7 +2079,7 @@ _0800A37E:
.align 2, 0
_0800A384: .4byte 0x0202ADA0
_0800A388: .4byte 0x0202BF10
_0800A38C: .4byte 0x0200B0C0
_0800A38C: .4byte gMain
_0800A390: .4byte 0x000002F6
_0800A394: .4byte 0x0202C790
@ -2122,7 +2122,7 @@ sub_A39C: @ 0x0800A39C
subs r0, #1
strh r0, [r3, #0x12]
_0800A3DC:
ldr r1, _0800A430 @ =0x0200B0C0
ldr r1, _0800A430 @ =gMain
ldrh r2, [r3]
movs r4, #0xba
lsls r4, r4, #2
@ -2160,7 +2160,7 @@ _0800A3DC:
.align 2, 0
_0800A428: .4byte 0x0202ADA0
_0800A42C: .4byte 0x0202BF10
_0800A430: .4byte 0x0200B0C0
_0800A430: .4byte gMain
_0800A434: .4byte 0x000002F6
_0800A438: .4byte 0x0202C790
@ -2296,7 +2296,7 @@ sub_A454: @ 0x0800A454
ldr r0, [r0, #8]
bl sub_A628
bl sub_A87C
ldr r1, _0800A618 @ =0x0200B0C0
ldr r1, _0800A618 @ =gMain
ldr r2, _0800A61C @ =0x0202ADA0
ldrh r3, [r2]
movs r4, #0xba
@ -2371,7 +2371,7 @@ _0800A608: .4byte 0x080DF520
_0800A60C: .4byte 0x06010000
_0800A610: .4byte 0x80001000
_0800A614: .4byte 0x05000200
_0800A618: .4byte 0x0200B0C0
_0800A618: .4byte gMain
_0800A61C: .4byte 0x0202ADA0
_0800A620: .4byte 0x000002F6
_0800A624: .4byte 0x0202C790
@ -2452,7 +2452,7 @@ sub_A674: @ 0x0800A674
strb r0, [r1]
_0800A6BE:
bl sub_A87C
ldr r1, _0800A708 @ =0x0200B0C0
ldr r1, _0800A708 @ =gMain
ldrh r2, [r4]
movs r3, #0xba
lsls r3, r3, #2
@ -2485,7 +2485,7 @@ _0800A6BE:
_0800A6FC: .4byte 0x0202ADA0
_0800A700: .4byte 0x0201A450
_0800A704: .4byte 0x0202C790
_0800A708: .4byte 0x0200B0C0
_0800A708: .4byte gMain
_0800A70C: .4byte 0x000002F2
thumb_func_start sub_A710
@ -2542,7 +2542,7 @@ _0800A742:
str r1, [r0, #8]
ldr r0, [r0, #8]
_0800A776:
ldr r4, _0800A7E4 @ =0x0200B0C0
ldr r4, _0800A7E4 @ =gMain
ldrh r1, [r5]
movs r2, #0xba
lsls r2, r2, #2
@ -2590,7 +2590,7 @@ _0800A7D4: .4byte 0x040000D4
_0800A7D8: .4byte 0x0202BE70
_0800A7DC: .4byte 0x80000010
_0800A7E0: .4byte 0x05000040
_0800A7E4: .4byte 0x0200B0C0
_0800A7E4: .4byte gMain
_0800A7E8: .4byte 0x03005C00
_0800A7EC: .4byte 0x0600E000
_0800A7F0: .4byte 0x80000400
@ -2667,7 +2667,7 @@ sub_A87C: @ 0x0800A87C
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
ldr r4, _0800A92C @ =0x0200B0C0
ldr r4, _0800A92C @ =gMain
ldrh r0, [r4, #0x38]
ldr r0, _0800A930 @ =0x00001F50
strh r0, [r4, #0x38]
@ -2753,7 +2753,7 @@ _0800A91C:
pop {r0}
bx r0
.align 2, 0
_0800A92C: .4byte 0x0200B0C0
_0800A92C: .4byte gMain
_0800A930: .4byte 0x00001F50
_0800A934: .4byte 0x00000808
_0800A938: .4byte 0x04000050
@ -2851,7 +2851,7 @@ sub_A968: @ 0x0800A968
ldr r1, _0800AA94 @ =0x80000030
str r1, [r0, #8]
ldr r0, [r0, #8]
ldr r4, _0800AA98 @ =0x0200B0C0
ldr r4, _0800AA98 @ =gMain
ldrh r0, [r2]
strh r0, [r4, #0x16]
bl sub_AAA8
@ -2909,7 +2909,7 @@ _0800AA88: .4byte 0x080E1F40
_0800AA8C: .4byte 0x80002000
_0800AA90: .4byte 0x080E1540
_0800AA94: .4byte 0x80000030
_0800AA98: .4byte 0x0200B0C0
_0800AA98: .4byte gMain
_0800AA9C: .4byte 0x0202ADA0
_0800AAA0: .4byte 0x000002F6
_0800AAA4: .4byte 0x0202C790
@ -2984,7 +2984,7 @@ sub_AAF4: @ 0x0800AAF4
adds r0, r2, #1
strh r0, [r3, #0x12]
_0800AB2E:
ldr r1, _0800AB84 @ =0x0200B0C0
ldr r1, _0800AB84 @ =gMain
ldrh r2, [r3]
movs r4, #0xba
lsls r4, r4, #2
@ -3027,7 +3027,7 @@ _0800AB76:
.align 2, 0
_0800AB7C: .4byte 0x0202ADA0
_0800AB80: .4byte 0x0202BF10
_0800AB84: .4byte 0x0200B0C0
_0800AB84: .4byte gMain
_0800AB88: .4byte 0x0202C790
thumb_func_start nullsub_10
@ -3066,7 +3066,7 @@ sub_AB90: @ 0x0800AB8E
adds r0, r2, #1
strh r0, [r3, #0x12]
_0800ABCA:
ldr r1, _0800AC18 @ =0x0200B0C0
ldr r1, _0800AC18 @ =gMain
ldrh r2, [r3]
movs r4, #0xba
lsls r4, r4, #2
@ -3101,7 +3101,7 @@ _0800ABCA:
.align 2, 0
_0800AC10: .4byte 0x0202ADA0
_0800AC14: .4byte 0x0202BF10
_0800AC18: .4byte 0x0200B0C0
_0800AC18: .4byte gMain
_0800AC1C: .4byte 0x0202C790
thumb_func_start sub_AC20
@ -3231,7 +3231,7 @@ sub_AC38: @ 0x0800AC38
ldr r0, [r0, #8]
bl sub_ADFC
bl sub_B0E8
ldr r1, _0800ADEC @ =0x0200B0C0
ldr r1, _0800ADEC @ =gMain
ldr r2, _0800ADF0 @ =0x0202ADA0
ldrh r3, [r2]
movs r4, #0xba
@ -3305,7 +3305,7 @@ _0800ADDC: .4byte 0x080F2180
_0800ADE0: .4byte 0x06010000
_0800ADE4: .4byte 0x80001800
_0800ADE8: .4byte 0x05000200
_0800ADEC: .4byte 0x0200B0C0
_0800ADEC: .4byte gMain
_0800ADF0: .4byte 0x0202ADA0
_0800ADF4: .4byte 0x000002F6
_0800ADF8: .4byte 0x0202C790
@ -3439,7 +3439,7 @@ sub_AE74: @ 0x0800AE74
bl sub_10708
_0800AF02:
bl sub_B0E8
ldr r1, _0800AF74 @ =0x0200B0C0
ldr r1, _0800AF74 @ =gMain
ldrh r2, [r4]
movs r3, #0xba
lsls r3, r3, #2
@ -3489,7 +3489,7 @@ _0800AF64: .4byte 0x086A79FC
_0800AF68: .4byte 0x086A7A1C
_0800AF6C: .4byte 0x03000000
_0800AF70: .4byte 0x06002EE0
_0800AF74: .4byte 0x0200B0C0
_0800AF74: .4byte gMain
_0800AF78: .4byte 0x000002F2
_0800AF7C: .4byte 0x0202C790
@ -3558,7 +3558,7 @@ _0800AFCC:
adds r0, #2
strh r0, [r1, #2]
_0800AFFE:
ldr r1, _0800B080 @ =0x0200B0C0
ldr r1, _0800B080 @ =gMain
ldrh r2, [r3]
movs r4, #0xba
lsls r4, r4, #2
@ -3617,7 +3617,7 @@ _0800B070: .4byte 0x03000000
_0800B074: .4byte 0x06002EE0
_0800B078: .4byte 0x0202BF10
_0800B07C: .4byte 0x0201A450
_0800B080: .4byte 0x0200B0C0
_0800B080: .4byte gMain
_0800B084: .4byte 0x000002F6
_0800B088: .4byte 0x0202C790
@ -3672,7 +3672,7 @@ sub_B0E8: @ 0x0800B0E8
mov r6, sb
mov r5, r8
push {r5, r6, r7}
ldr r4, _0800B2C0 @ =0x0200B0C0
ldr r4, _0800B2C0 @ =gMain
ldrh r0, [r4, #0x38]
movs r0, #0xf1
lsls r0, r0, #4
@ -3908,7 +3908,7 @@ _0800B2A2:
pop {r0}
bx r0
.align 2, 0
_0800B2C0: .4byte 0x0200B0C0
_0800B2C0: .4byte gMain
_0800B2C4: .4byte 0x00000808
_0800B2C8: .4byte 0x04000050
_0800B2CC: .4byte 0x086A79EC
@ -4036,7 +4036,7 @@ sub_B2F8: @ 0x0800B2F8
str r2, [r0, #8]
ldr r0, [r0, #8]
bl sub_B4A0
ldr r1, _0800B490 @ =0x0200B0C0
ldr r1, _0800B490 @ =gMain
ldr r2, _0800B494 @ =0x0202ADA0
ldrh r3, [r2]
movs r4, #0xba
@ -4107,7 +4107,7 @@ _0800B480: .4byte 0x080FFFC0
_0800B484: .4byte 0x06010000
_0800B488: .4byte 0x80000800
_0800B48C: .4byte 0x05000200
_0800B490: .4byte 0x0200B0C0
_0800B490: .4byte gMain
_0800B494: .4byte 0x0202ADA0
_0800B498: .4byte 0x000002F6
_0800B49C: .4byte 0x0202C790
@ -4279,7 +4279,7 @@ _0800B5C2:
movs r0, #8
strh r0, [r5, #0x1c]
_0800B5EE:
ldr r1, _0800B6A8 @ =0x0200B0C0
ldr r1, _0800B6A8 @ =gMain
ldrh r2, [r5]
movs r3, #0xba
lsls r3, r3, #2
@ -4368,7 +4368,7 @@ _0800B698: .4byte 0x086A7AC0
_0800B69C: .4byte 0x0202C548
_0800B6A0: .4byte 0x086A7AE4
_0800B6A4: .4byte 0x0202BF10
_0800B6A8: .4byte 0x0200B0C0
_0800B6A8: .4byte gMain
_0800B6AC: .4byte 0x000002F2
_0800B6B0: .4byte 0x086A7B34
_0800B6B4: .4byte 0x0202BEB4
@ -4430,7 +4430,7 @@ _0800B6FC:
movs r0, #8
strh r0, [r3, #0x1c]
_0800B728:
ldr r1, _0800B790 @ =0x0200B0C0
ldr r1, _0800B790 @ =gMain
ldrh r2, [r3]
movs r4, #0xba
lsls r4, r4, #2
@ -4479,7 +4479,7 @@ _0800B77C:
_0800B784: .4byte 0x086A7AE4
_0800B788: .4byte 0x0202BF10
_0800B78C: .4byte 0x0202ADA0
_0800B790: .4byte 0x0200B0C0
_0800B790: .4byte gMain
_0800B794: .4byte 0x000002EA
_0800B798: .4byte 0x0202A578
_0800B79C: .4byte 0x0202C790
@ -4919,7 +4919,7 @@ sub_BA3C: @ 0x0800BA3C
str r1, [r0, #4]
str r4, [r0, #8]
ldr r0, [r0, #8]
ldr r4, _0800BBD0 @ =0x0200B0C0
ldr r4, _0800BBD0 @ =gMain
ldrh r0, [r2]
strh r0, [r4, #0x16]
bl sub_BBE0
@ -4992,7 +4992,7 @@ _0800BBC0: .4byte 0x800000B0
_0800BBC4: .4byte 0x0810CA00
_0800BBC8: .4byte 0x06010000
_0800BBCC: .4byte 0x05000200
_0800BBD0: .4byte 0x0200B0C0
_0800BBD0: .4byte gMain
_0800BBD4: .4byte 0x0202ADA0
_0800BBD8: .4byte 0x000002F6
_0800BBDC: .4byte 0x0202C790
@ -5084,7 +5084,7 @@ _0800BC88:
ldrh r0, [r4, #0x26]
subs r0, #1
strh r0, [r4, #0x26]
ldr r1, _0800BCDC @ =0x0200B0C0
ldr r1, _0800BCDC @ =gMain
ldrh r2, [r4, #0x18]
movs r3, #0xbc
lsls r3, r3, #2
@ -5118,7 +5118,7 @@ _0800BCC8:
_0800BCD0: .4byte 0x0202ADA0
_0800BCD4: .4byte 0x0202BF10
_0800BCD8: .4byte 0x0000FFFD
_0800BCDC: .4byte 0x0200B0C0
_0800BCDC: .4byte gMain
_0800BCE0: .4byte 0x000002F6
_0800BCE4: .4byte 0x0202C790
@ -5180,7 +5180,7 @@ _0800BD4C:
ldrh r0, [r4, #0x26]
subs r0, #1
strh r0, [r4, #0x26]
ldr r1, _0800BDB4 @ =0x0200B0C0
ldr r1, _0800BDB4 @ =gMain
ldrh r2, [r4, #0x18]
movs r3, #0xbc
lsls r3, r3, #2
@ -5223,7 +5223,7 @@ _0800BDA4: .4byte 0x0202ADA0
_0800BDA8: .4byte 0x0202BF10
_0800BDAC: .4byte 0x0000FFFD
_0800BDB0: .4byte 0x0000FFFA
_0800BDB4: .4byte 0x0200B0C0
_0800BDB4: .4byte gMain
_0800BDB8: .4byte 0x000002F6
_0800BDBC: .4byte 0x0202C790
@ -5306,7 +5306,7 @@ _0800BE4C:
ldrh r0, [r4, #0x26]
subs r0, #1
strh r0, [r4, #0x26]
ldr r1, _0800BEC4 @ =0x0200B0C0
ldr r1, _0800BEC4 @ =gMain
ldrh r2, [r4, #0x18]
movs r3, #0xbc
lsls r3, r3, #2
@ -5357,7 +5357,7 @@ _0800BEB4: .4byte 0x0202ADA0
_0800BEB8: .4byte 0x0202BF10
_0800BEBC: .4byte 0x0000FFFD
_0800BEC0: .4byte 0x0000FFFA
_0800BEC4: .4byte 0x0200B0C0
_0800BEC4: .4byte gMain
_0800BEC8: .4byte 0x000002F6
_0800BECC: .4byte 0x0202C790
@ -5462,7 +5462,7 @@ _0800BF86:
ldrh r0, [r4, #0x26]
subs r0, #1
strh r0, [r4, #0x26]
ldr r1, _0800C00C @ =0x0200B0C0
ldr r1, _0800C00C @ =gMain
ldrh r2, [r4, #0x18]
movs r3, #0xbc
lsls r3, r3, #2
@ -5517,7 +5517,7 @@ _0800BFFC: .4byte 0x0000FFFD
_0800C000: .4byte 0x0000FFFA
_0800C004: .4byte 0x0201A450
_0800C008: .4byte 0x0000FFFC
_0800C00C: .4byte 0x0200B0C0
_0800C00C: .4byte gMain
_0800C010: .4byte 0x000002F6
_0800C014: .4byte 0x0202C790
@ -5570,7 +5570,7 @@ _0800C05C:
subs r0, #1
strh r0, [r1]
_0800C074:
ldr r1, _0800C0B0 @ =0x0200B0C0
ldr r1, _0800C0B0 @ =gMain
ldrh r2, [r4, #0x24]
movs r3, #0xbd
lsls r3, r3, #2
@ -5597,7 +5597,7 @@ _0800C09C:
_0800C0A4: .4byte 0x0201A450
_0800C0A8: .4byte 0x0202C5E4
_0800C0AC: .4byte 0x0202ADD8
_0800C0B0: .4byte 0x0200B0C0
_0800C0B0: .4byte gMain
_0800C0B4: .4byte 0x000002F6
_0800C0B8: .4byte 0x0202C790
@ -5834,7 +5834,7 @@ sub_C228: @ 0x0800C228
str r1, [r0, #4]
str r2, [r0, #8]
ldr r0, [r0, #8]
ldr r1, _0800C2E8 @ =0x0200B0C0
ldr r1, _0800C2E8 @ =gMain
ldrh r0, [r3]
strh r0, [r1, #0x16]
bl sub_C2F0
@ -5862,7 +5862,7 @@ _0800C2D8: .4byte 0x08112840
_0800C2DC: .4byte 0x06010000
_0800C2E0: .4byte 0x80001600
_0800C2E4: .4byte 0x05000200
_0800C2E8: .4byte 0x0200B0C0
_0800C2E8: .4byte gMain
_0800C2EC: .4byte 0x0202C790
thumb_func_start sub_C2F0
@ -6548,7 +6548,7 @@ sub_C814: @ 0x0800C814
str r0, [r1, #8]
ldr r0, [r1, #8]
movs r5, #0
ldr r6, _0800C92C @ =0x0200B0C0
ldr r6, _0800C92C @ =gMain
movs r1, #0xb8
mov sb, r1
movs r4, #0
@ -6669,7 +6669,7 @@ _0800C8B8:
.align 2, 0
_0800C924: .4byte 0x040000D4
_0800C928: .4byte 0x85000100
_0800C92C: .4byte 0x0200B0C0
_0800C92C: .4byte gMain
_0800C930: .4byte 0x00000302
_0800C934: .4byte 0x000002FA
_0800C938: .4byte 0xFFFFFE00
@ -6731,7 +6731,7 @@ sub_C948: @ 0x0800C948
str r1, [r0, #4]
str r2, [r0, #8]
ldr r0, [r0, #8]
ldr r4, _0800CA18 @ =0x0200B0C0
ldr r4, _0800CA18 @ =gMain
ldrh r0, [r3]
strh r0, [r4, #0x16]
bl sub_CA28
@ -6768,7 +6768,7 @@ _0800CA08: .4byte 0x08118680
_0800CA0C: .4byte 0x06010000
_0800CA10: .4byte 0x80003800
_0800CA14: .4byte 0x05000200
_0800CA18: .4byte 0x0200B0C0
_0800CA18: .4byte gMain
_0800CA1C: .4byte 0x0202ADA0
_0800CA20: .4byte 0x000002F6
_0800CA24: .4byte 0x0202C790
@ -6867,7 +6867,7 @@ sub_CAA0: @ 0x0800CAA0
movs r0, #1
strh r0, [r5, #8]
_0800CAEA:
ldr r0, _0800CB5C @ =0x0200B0C0
ldr r0, _0800CB5C @ =gMain
ldrh r1, [r4]
movs r2, #0xbd
lsls r2, r2, #2
@ -6921,7 +6921,7 @@ _0800CB4C: .4byte 0x0201A450
_0800CB50: .4byte 0x086A7D4C
_0800CB54: .4byte 0x0202A578
_0800CB58: .4byte 0x0202BF10
_0800CB5C: .4byte 0x0200B0C0
_0800CB5C: .4byte gMain
_0800CB60: .4byte 0x0202C5E4
_0800CB64: .4byte 0x0202ADD8
_0800CB68: .4byte 0x0202C790
@ -6932,7 +6932,7 @@ sub_CB6C: @ 0x0800CB6C
ldrh r1, [r0]
subs r1, #0x24
strh r1, [r0]
ldr r0, _0800CB98 @ =0x0200B0C0
ldr r0, _0800CB98 @ =gMain
movs r2, #0xbd
lsls r2, r2, #2
adds r0, r0, r2
@ -6950,7 +6950,7 @@ _0800CB90:
bx lr
.align 2, 0
_0800CB94: .4byte 0x0202ADA0
_0800CB98: .4byte 0x0200B0C0
_0800CB98: .4byte gMain
_0800CB9C: .4byte 0x0202BF10
_0800CBA0: .4byte 0x0202C790
@ -7031,7 +7031,7 @@ _0800CC30:
ldrh r1, [r0]
subs r1, #0x24
strh r1, [r0]
ldr r0, _0800CC84 @ =0x0200B0C0
ldr r0, _0800CC84 @ =gMain
movs r2, #0xbd
lsls r2, r2, #2
adds r0, r0, r2
@ -7063,7 +7063,7 @@ _0800CC74: .4byte 0x05000200
_0800CC78: .4byte 0x0202BF10
_0800CC7C: .4byte 0x0202A56C
_0800CC80: .4byte 0x0202ADA0
_0800CC84: .4byte 0x0200B0C0
_0800CC84: .4byte gMain
_0800CC88: .4byte 0x0202A578
_0800CC8C: .4byte 0x0202C790
@ -7125,14 +7125,14 @@ sub_CCF8: @ 0x0800CCF8
bl sub_2B4
bl m4aMPlayAllStop
bl sub_D10
ldr r1, _0800CD14 @ =0x0200B0C0
ldr r1, _0800CD14 @ =gMain
ldrb r0, [r1, #3]
adds r0, #1
strb r0, [r1, #3]
pop {r0}
bx r0
.align 2, 0
_0800CD14: .4byte 0x0200B0C0
_0800CD14: .4byte gMain
thumb_func_start sub_CD18
sub_CD18: @ 0x0800CD18

108
asm/options.s
View File

@ -8,7 +8,7 @@
OptionsMain: @ 0x08051220
push {lr}
ldr r1, _08051238 @ =0x08527F08
ldr r0, _0805123C @ =0x0200B0C0
ldr r0, _0805123C @ =gMain
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@ -18,7 +18,7 @@ OptionsMain: @ 0x08051220
bx r0
.align 2, 0
_08051238: .4byte 0x08527F08
_0805123C: .4byte 0x0200B0C0
_0805123C: .4byte gMain
thumb_func_start sub_51240
sub_51240: @ 0x08051240
@ -52,7 +52,7 @@ sub_51240: @ 0x08051240
adds r1, r3, #0
orrs r0, r1
strh r0, [r2]
ldr r0, _08051360 @ =0x0200B0C0
ldr r0, _08051360 @ =gMain
mov sb, r0
ldrh r0, [r2]
mov r1, sb
@ -123,14 +123,14 @@ _080512F8:
str r0, [r5, #4]
str r6, [r5, #8]
ldr r0, [r5, #8]
ldr r0, _080513A0 @ =0x0852B668
ldr r0, _080513A0 @ =gGBAButtonIcons_Pals
str r0, [r5]
ldr r0, _080513A4 @ =0x05000200
str r0, [r5, #4]
ldr r0, _080513A8 @ =0x80000030
str r0, [r5, #8]
ldr r0, [r5, #8]
ldr r0, _080513AC @ =0x0852B868
ldr r0, _080513AC @ =gOptionsSprites_Gfx
str r0, [r5]
ldr r0, _080513B0 @ =0x06010000
str r0, [r5, #4]
@ -157,7 +157,7 @@ _080512F8:
.align 2, 0
_08051358: .4byte 0x04000008
_0805135C: .4byte 0x0400000A
_08051360: .4byte 0x0200B0C0
_08051360: .4byte gMain
_08051364: .4byte 0x040000D4
_08051368: .4byte 0x0852B468
_0805136C: .4byte 0x80000100
@ -173,10 +173,10 @@ _08051390: .4byte 0x80000400
_08051394: .4byte 0x02019C0C
_08051398: .4byte 0x0852A048
_0805139C: .4byte 0x06000800
_080513A0: .4byte 0x0852B668
_080513A0: .4byte gGBAButtonIcons_Pals
_080513A4: .4byte 0x05000200
_080513A8: .4byte 0x80000030
_080513AC: .4byte 0x0852B868
_080513AC: .4byte gOptionsSprites_Gfx
_080513B0: .4byte 0x06010000
_080513B4: .4byte 0x80001010
@ -335,7 +335,7 @@ _080514DC: @ jump table
.4byte _08051A08 @ case 3
.4byte _08051AB8 @ case 4
_080514F0:
ldr r0, _08051514 @ =0x0200B0C0
ldr r0, _08051514 @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #0x40
ands r0, r1
@ -353,7 +353,7 @@ _080514F0:
movs r0, #0xd
b _0805156A
.align 2, 0
_08051514: .4byte 0x0200B0C0
_08051514: .4byte gMain
_08051518: .4byte 0x02002920
_0805151C:
cmp r0, #0
@ -396,7 +396,7 @@ _0805155E:
_0805156A:
strh r0, [r4, #0xa]
_0805156C:
ldr r0, _080515E8 @ =0x0200B0C0
ldr r0, _080515E8 @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #0x10
ands r0, r1
@ -416,7 +416,7 @@ _0805156C:
adds r0, #0xd
strh r0, [r4, #0xa]
_08051594:
ldr r0, _080515E8 @ =0x0200B0C0
ldr r0, _080515E8 @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #0x20
ands r0, r1
@ -439,7 +439,7 @@ _08051594:
subs r0, #0xd
strh r0, [r4, #0xa]
_080515C2:
ldr r4, _080515E8 @ =0x0200B0C0
ldr r4, _080515E8 @ =gMain
ldrh r1, [r4, #0x18]
movs r0, #1
ands r0, r1
@ -460,7 +460,7 @@ _080515DC:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080515E8: .4byte 0x0200B0C0
_080515E8: .4byte gMain
_080515EC: .4byte 0x02019C0C
_080515F0: .4byte 0x02002920
_080515F4: .4byte _080515F8
@ -663,7 +663,7 @@ _08051786:
.align 2, 0
_080517A4: .4byte 0x00000143
_080517A8:
ldr r1, _080517C8 @ =0x0200B0C0
ldr r1, _080517C8 @ =gMain
ldrh r2, [r1, #0x1c]
movs r0, #0x20
ands r0, r2
@ -680,7 +680,7 @@ _080517A8:
subs r0, #1
b _080517E6
.align 2, 0
_080517C8: .4byte 0x0200B0C0
_080517C8: .4byte gMain
_080517CC: .4byte 0x02002920
_080517D0:
movs r0, #0x10
@ -756,7 +756,7 @@ _08051828:
movs r1, #0xa
bl __modsi3
strb r0, [r5, #0x14]
ldr r0, _08051884 @ =0x0200B0C0
ldr r0, _08051884 @ =gMain
ldrh r1, [r0, #0x18]
movs r4, #1
ands r4, r1
@ -773,7 +773,7 @@ _08051828:
b _080518AA
.align 2, 0
_08051880: .4byte 0x02002920
_08051884: .4byte 0x0200B0C0
_08051884: .4byte gMain
_08051888: .4byte 0x08527D22
_0805188C:
movs r0, #2
@ -790,7 +790,7 @@ _0805188C:
strb r1, [r0]
strh r4, [r5]
_080518AA:
ldr r0, _080518CC @ =0x0200B0C0
ldr r0, _080518CC @ =gMain
ldr r0, [r0, #0x4c]
movs r1, #7
ands r0, r1
@ -808,10 +808,10 @@ _080518C0:
ldrsh r0, [r1, r3]
b _080519F4
.align 2, 0
_080518CC: .4byte 0x0200B0C0
_080518CC: .4byte gMain
_080518D0: .4byte 0x02002920
_080518D4:
ldr r1, _080518F4 @ =0x0200B0C0
ldr r1, _080518F4 @ =gMain
ldrh r2, [r1, #0x1c]
movs r0, #0x20
ands r0, r2
@ -828,7 +828,7 @@ _080518D4:
subs r0, #1
b _08051912
.align 2, 0
_080518F4: .4byte 0x0200B0C0
_080518F4: .4byte gMain
_080518F8: .4byte 0x02002920
_080518FC:
movs r0, #0x10
@ -904,7 +904,7 @@ _08051954:
movs r1, #0xa
bl __modsi3
strb r0, [r5, #0x17]
ldr r0, _080519B0 @ =0x0200B0C0
ldr r0, _080519B0 @ =gMain
ldrh r1, [r0, #0x18]
movs r4, #1
ands r4, r1
@ -921,7 +921,7 @@ _08051954:
b _080519D6
.align 2, 0
_080519AC: .4byte 0x02002920
_080519B0: .4byte 0x0200B0C0
_080519B0: .4byte gMain
_080519B4: .4byte 0x08527D66
_080519B8:
movs r0, #2
@ -938,7 +938,7 @@ _080519B8:
strb r1, [r0]
strh r4, [r5]
_080519D6:
ldr r0, _08051A00 @ =0x0200B0C0
ldr r0, _08051A00 @ =gMain
ldr r0, [r0, #0x4c]
movs r1, #7
ands r0, r1
@ -963,10 +963,10 @@ _080519FA:
strh r0, [r1, #0x18]
b _08051B98
.align 2, 0
_08051A00: .4byte 0x0200B0C0
_08051A00: .4byte gMain
_08051A04: .4byte 0x02002920
_08051A08:
ldr r0, _08051A2C @ =0x0200B0C0
ldr r0, _08051A2C @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #0x40
ands r0, r1
@ -983,7 +983,7 @@ _08051A08:
subs r0, #1
b _08051A50
.align 2, 0
_08051A2C: .4byte 0x0200B0C0
_08051A2C: .4byte gMain
_08051A30: .4byte 0x02002920
_08051A34:
movs r0, #0x80
@ -1002,7 +1002,7 @@ _08051A34:
_08051A50:
strh r0, [r4, #0xa]
_08051A52:
ldr r0, _08051A7C @ =0x0200B0C0
ldr r0, _08051A7C @ =gMain
ldrh r1, [r0, #0x18]
movs r4, #1
ands r4, r1
@ -1021,7 +1021,7 @@ _08051A52:
b _08051A96
.align 2, 0
_08051A78: .4byte 0x02002920
_08051A7C: .4byte 0x0200B0C0
_08051A7C: .4byte gMain
_08051A80:
movs r0, #2
ands r0, r1
@ -1034,7 +1034,7 @@ _08051A80:
strh r0, [r1, #0xa]
strh r4, [r1]
_08051A96:
ldr r0, _08051AB4 @ =0x0200B0C0
ldr r0, _08051AB4 @ =gMain
ldr r0, [r0, #0x4c]
movs r1, #7
ands r0, r1
@ -1048,7 +1048,7 @@ _08051A96:
b _08051B98
.align 2, 0
_08051AB0: .4byte 0x02002920
_08051AB4: .4byte 0x0200B0C0
_08051AB4: .4byte gMain
_08051AB8:
ldr r4, _08051BF4 @ =0x02002920
ldrh r0, [r4, #8]
@ -1065,7 +1065,7 @@ _08051AB8:
subs r0, r0, r1
strh r0, [r4, #6]
_08051AD4:
ldr r0, _08051BF8 @ =0x0200B0C0
ldr r0, _08051BF8 @ =gMain
ldrh r1, [r0, #0x18]
ldr r0, _08051BFC @ =0x000003F7
ands r0, r1
@ -1213,7 +1213,7 @@ _08051BE8:
b _08051C2E
.align 2, 0
_08051BF4: .4byte 0x02002920
_08051BF8: .4byte 0x0200B0C0
_08051BF8: .4byte gMain
_08051BFC: .4byte 0x000003F7
_08051C00: .4byte 0x02031AF0
_08051C04: .4byte 0x0200B134
@ -1251,7 +1251,7 @@ sub_51C3C: @ 0x08051C3C
cmp r0, #0
beq _08051C56
bl sub_1198
ldr r1, _08051C5C @ =0x0200B0C0
ldr r1, _08051C5C @ =gMain
ldrb r0, [r1, #3]
adds r0, #1
strb r0, [r1, #3]
@ -1259,7 +1259,7 @@ _08051C56:
pop {r0}
bx r0
.align 2, 0
_08051C5C: .4byte 0x0200B0C0
_08051C5C: .4byte gMain
thumb_func_start sub_51C60
sub_51C60: @ 0x08051C60
@ -1274,7 +1274,7 @@ sub_51C60: @ 0x08051C60
bl sub_2B4
bl m4aMPlayAllStop
bl sub_D10
ldr r1, _08051C98 @ =0x0201A4B4
ldr r1, _08051C98 @ =gAutoDisplayTitlescreenMenu
movs r0, #1
strb r0, [r1]
movs r0, #1
@ -1284,7 +1284,7 @@ sub_51C60: @ 0x08051C60
.align 2, 0
_08051C90: .4byte 0x0200B134
_08051C94: .4byte 0x02002920
_08051C98: .4byte 0x0201A4B4
_08051C98: .4byte gAutoDisplayTitlescreenMenu
thumb_func_start sub_51C9C
sub_51C9C: @ 0x08051C9C
@ -2261,7 +2261,7 @@ _0805236C:
ldrb r7, [r7, #4]
adds r0, r0, r7
strb r0, [r1]
ldr r0, _080524B8 @ =0x0200B0C0
ldr r0, _080524B8 @ =gMain
ldr r0, [r0, #0x4c]
movs r1, #0x12
bl __umodsi3
@ -2315,7 +2315,7 @@ _080524A8: .4byte 0xFFFFFE00
_080524AC: .4byte 0x02002920
_080524B0: .4byte 0x0200C948
_080524B4: .4byte 0x0200CA00
_080524B8: .4byte 0x0200B0C0
_080524B8: .4byte gMain
thumb_func_start sub_524BC
sub_524BC: @ 0x080524BC
@ -2326,7 +2326,7 @@ sub_524BC: @ 0x080524BC
adds r2, r1, #0
cmp r0, #1
bgt _08052514
ldr r0, _08052520 @ =0x0200B0C0
ldr r0, _08052520 @ =gMain
ldrh r0, [r0, #0x1c]
ldr r4, _08052524 @ =0x000003F7
ands r4, r0
@ -2371,7 +2371,7 @@ _08052514:
bx r0
.align 2, 0
_0805251C: .4byte 0x02002920
_08052520: .4byte 0x0200B0C0
_08052520: .4byte gMain
_08052524: .4byte 0x000003F7
thumb_func_start sub_52528
@ -2500,7 +2500,7 @@ _080525EC: @ jump table
.4byte _080527C0 @ case 4
.4byte _08052814 @ case 5
_08052604:
ldr r0, _080526BC @ =0x0200B0C0
ldr r0, _080526BC @ =gMain
mov ip, r0
ldr r6, _080526C0 @ =0x086BB910
ldrh r5, [r6, #0x28]
@ -2593,12 +2593,12 @@ _080526AA:
ble _080526AA
b _080528A2
.align 2, 0
_080526BC: .4byte 0x0200B0C0
_080526BC: .4byte gMain
_080526C0: .4byte 0x086BB910
_080526C4: .4byte 0x02031B18
_080526C8: .4byte 0x08527EFE
_080526CC:
ldr r4, _08052718 @ =0x0200B0C0
ldr r4, _08052718 @ =gMain
ldr r5, _0805271C @ =0x086BB910
ldrh r1, [r5, #0x28]
adds r0, r4, #0
@ -2636,10 +2636,10 @@ _080526CC:
adds r0, #2
b _080528A0
.align 2, 0
_08052718: .4byte 0x0200B0C0
_08052718: .4byte gMain
_0805271C: .4byte 0x086BB910
_08052720:
ldr r3, _08052768 @ =0x0200B0C0
ldr r3, _08052768 @ =gMain
ldr r4, _0805276C @ =0x086BB910
ldrh r1, [r4, #0x28]
adds r0, r3, #0
@ -2675,10 +2675,10 @@ _08052720:
ldrh r1, [r4, #8]
b _08052802
.align 2, 0
_08052768: .4byte 0x0200B0C0
_08052768: .4byte gMain
_0805276C: .4byte 0x086BB910
_08052770:
ldr r4, _080527B8 @ =0x0200B0C0
ldr r4, _080527B8 @ =gMain
ldr r5, _080527BC @ =0x086BB910
adds r0, r5, #0
adds r0, #0x48
@ -2715,10 +2715,10 @@ _08052770:
adds r0, #2
b _080528A0
.align 2, 0
_080527B8: .4byte 0x0200B0C0
_080527B8: .4byte gMain
_080527BC: .4byte 0x086BB910
_080527C0:
ldr r3, _0805280C @ =0x0200B0C0
ldr r3, _0805280C @ =gMain
ldr r4, _08052810 @ =0x086BB910
adds r0, r4, #0
adds r0, #0x48
@ -2758,10 +2758,10 @@ _08052802:
strh r2, [r0]
b _080528A2
.align 2, 0
_0805280C: .4byte 0x0200B0C0
_0805280C: .4byte gMain
_08052810: .4byte 0x086BB910
_08052814:
ldr r2, _080528A8 @ =0x0200B0C0
ldr r2, _080528A8 @ =gMain
movs r1, #0xa2
lsls r1, r1, #1
adds r0, r2, r1
@ -2838,4 +2838,4 @@ _080528A2:
pop {r0}
bx r0
.align 2, 0
_080528A8: .4byte 0x0200B0C0
_080528A8: .4byte gMain

90
asm/pokedex.s
View File

@ -8,7 +8,7 @@
PokedexMain: @ 0x08003DAC
push {lr}
ldr r1, _08003DC4 @ =0x0805C880
ldr r0, _08003DC8 @ =0x0200B0C0
ldr r0, _08003DC8 @ =gMain
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@ -18,7 +18,7 @@ PokedexMain: @ 0x08003DAC
bx r0
.align 2, 0
_08003DC4: .4byte 0x0805C880
_08003DC8: .4byte 0x0200B0C0
_08003DC8: .4byte gMain
thumb_func_start sub_3DCC
sub_3DCC: @ 0x08003DCC
@ -63,7 +63,7 @@ sub_3DCC: @ 0x08003DCC
adds r1, r3, #0
orrs r0, r1
strh r0, [r2]
ldr r7, _08003F40 @ =0x0200B0C0
ldr r7, _08003F40 @ =gMain
ldrh r0, [r2]
strh r0, [r7, #0x16]
ldr r4, _08003F44 @ =0x040000D4
@ -191,7 +191,7 @@ _08003F30: .4byte 0x0400000A
_08003F34: .4byte 0x0400000C
_08003F38: .4byte 0x0400000E
_08003F3C: .4byte 0x0000020F
_08003F40: .4byte 0x0200B0C0
_08003F40: .4byte gMain
_08003F44: .4byte 0x040000D4
_08003F48: .4byte 0x08082720
_08003F4C: .4byte 0x06004000
@ -409,7 +409,7 @@ _08004146:
thumb_func_start sub_4150
sub_4150: @ 0x08004150
push {r4, r5, r6, r7, lr}
ldr r4, _08004174 @ =0x0200B0C0
ldr r4, _08004174 @ =gMain
ldrh r2, [r4, #0x1c]
movs r0, #4
ands r0, r2
@ -425,7 +425,7 @@ sub_4150: @ 0x08004150
bl sub_4D74
b _080041A8
.align 2, 0
_08004174: .4byte 0x0200B0C0
_08004174: .4byte gMain
_08004178: .4byte 0x0202BF04
_0800417C:
movs r0, #0x80
@ -460,7 +460,7 @@ _080041B6:
strb r1, [r0]
bl sub_5064
_080041BE:
ldr r3, _08004204 @ =0x0200B0C0
ldr r3, _08004204 @ =gMain
ldrh r1, [r3, #0x18]
movs r0, #1
ands r0, r1
@ -496,7 +496,7 @@ _080041CC:
b _08004388
.align 2, 0
_08004200: .4byte 0x02019C24
_08004204: .4byte 0x0200B0C0
_08004204: .4byte gMain
_08004208: .4byte 0x0202C5E8
_0800420C: .4byte 0x0202A1C0
_08004210: .4byte 0x0202ADE0
@ -584,7 +584,7 @@ _080042B6:
strh r2, [r0]
ldr r0, _0800431C @ =0x0202BF0C
strh r2, [r0]
ldr r5, _08004320 @ =0x0200B0C0
ldr r5, _08004320 @ =gMain
ldrh r1, [r5, #0x18]
movs r0, #1
ands r0, r1
@ -620,7 +620,7 @@ _08004310: .4byte 0x0202A55C
_08004314: .4byte 0x0202A568
_08004318: .4byte 0x0201A440
_0800431C: .4byte 0x0202BF0C
_08004320: .4byte 0x0200B0C0
_08004320: .4byte gMain
_08004324: .4byte 0x0202C5E8
_08004328: .4byte 0x0202A1C0
_0800432C: .4byte 0x0202ADE0
@ -723,7 +723,7 @@ _080043F0:
ldr r0, _08004420 @ =0x80000400
str r0, [r1, #8]
ldr r0, [r1, #8]
ldr r1, _08004424 @ =0x0200B0C0
ldr r1, _08004424 @ =gMain
movs r0, #1
strb r0, [r1, #3]
pop {r0}
@ -734,7 +734,7 @@ _08004414: .4byte 0x0202C58C
_08004418: .4byte 0x040000D4
_0800441C: .4byte 0x03005C00
_08004420: .4byte 0x80000400
_08004424: .4byte 0x0200B0C0
_08004424: .4byte gMain
thumb_func_start sub_4428
sub_4428: @ 0x08004428
@ -870,7 +870,7 @@ _080044F0:
movs r2, #0x7f
movs r3, #0xa
bl sub_5291C
ldr r1, _080045A0 @ =0x0200B0C0
ldr r1, _080045A0 @ =gMain
movs r0, #5
strb r0, [r1, #3]
_08004538:
@ -904,7 +904,7 @@ _08004590: .4byte 0x0202C794
_08004594: .4byte 0x02032EE0
_08004598: .4byte 0x0000FFFF
_0800459C: .4byte 0x086A3700
_080045A0: .4byte 0x0200B0C0
_080045A0: .4byte gMain
thumb_func_start sub_45A4
sub_45A4: @ 0x080045A4
@ -946,7 +946,7 @@ _080045E8:
ldr r0, _08004634 @ =0x0202BE20
movs r6, #0
strh r6, [r0]
ldr r0, _08004638 @ =0x0200B0C0
ldr r0, _08004638 @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #0x40
ands r0, r1
@ -976,7 +976,7 @@ _08004628: .4byte 0x0000FFFF
_0800462C: .4byte 0x0202BEF4
_08004630: .4byte 0x0202C5AC
_08004634: .4byte 0x0202BE20
_08004638: .4byte 0x0200B0C0
_08004638: .4byte gMain
_0800463C: .4byte 0x0202ADE0
_08004640: .4byte 0x0202C794
_08004644:
@ -1007,7 +1007,7 @@ _08004670:
ldrb r0, [r4]
strb r0, [r1]
_0800467A:
ldr r6, _080046C8 @ =0x0200B0C0
ldr r6, _080046C8 @ =gMain
ldrh r1, [r6, #0x18]
movs r4, #1
ands r4, r1
@ -1042,7 +1042,7 @@ _0800467A:
_080046BC: .4byte 0x0202ADE0
_080046C0: .4byte 0x0202C794
_080046C4: .4byte 0x02019C28
_080046C8: .4byte 0x0200B0C0
_080046C8: .4byte gMain
_080046CC:
movs r0, #0x69
bl m4aSongNumStart
@ -1089,7 +1089,7 @@ _08004728:
movs r0, #4
strb r0, [r6, #3]
_08004730:
ldr r0, _08004784 @ =0x0200B0C0
ldr r0, _08004784 @ =gMain
ldrh r1, [r0, #0x1c]
movs r0, #4
ands r0, r1
@ -1126,7 +1126,7 @@ _08004774: .4byte 0x0202C794
_08004778: .4byte 0x0202C5E8
_0800477C: .4byte 0x0202BEF4
_08004780: .4byte 0x0201C1B4
_08004784: .4byte 0x0200B0C0
_08004784: .4byte gMain
_08004788: .4byte 0x0202A1C0
_0800478C: .4byte 0x0202ADE0
_08004790: .4byte 0x086A61BC
@ -1350,7 +1350,7 @@ _080048F2:
str r0, [r2, #4]
str r1, [r2, #8]
ldr r0, [r2, #8]
ldr r1, _080049A4 @ =0x0200B0C0
ldr r1, _080049A4 @ =gMain
movs r0, #1
strb r0, [r1, #3]
_0800495A:
@ -1377,7 +1377,7 @@ _08004994: .4byte 0x0202BF04
_08004998: .4byte 0x03000000
_0800499C: .4byte 0x81000C00
_080049A0: .4byte 0x06005C00
_080049A4: .4byte 0x0200B0C0
_080049A4: .4byte gMain
thumb_func_start sub_49A8
sub_49A8: @ 0x080049A8
@ -1388,20 +1388,20 @@ sub_49A8: @ 0x080049A8
movs r0, #0
strb r0, [r1]
bl sub_599C
ldr r1, _080049CC @ =0x0200B0C0
ldr r1, _080049CC @ =gMain
movs r0, #7
strb r0, [r1, #3]
pop {r0}
bx r0
.align 2, 0
_080049C8: .4byte 0x0201B124
_080049CC: .4byte 0x0200B0C0
_080049CC: .4byte gMain
thumb_func_start sub_49D0
sub_49D0: @ 0x080049D0
push {r4, r5, lr}
bl sub_599C
ldr r5, _08004A08 @ =0x0200B0C0
ldr r5, _08004A08 @ =gMain
ldrh r1, [r5, #0x18]
movs r0, #2
ands r0, r1
@ -1424,7 +1424,7 @@ sub_49D0: @ 0x080049D0
strb r4, [r5, #3]
b _08004AF2
.align 2, 0
_08004A08: .4byte 0x0200B0C0
_08004A08: .4byte gMain
_08004A0C: .4byte 0x0202BEC4
_08004A10: .4byte 0x0202BEFC
_08004A14: .4byte 0x0202BF04
@ -1522,7 +1522,7 @@ _08004AAC:
ldr r1, _08004AF8 @ =0x0202BEFC
movs r0, #2
strb r0, [r1]
ldr r1, _08004B0C @ =0x0200B0C0
ldr r1, _08004B0C @ =gMain
movs r0, #8
strb r0, [r1, #3]
movs r0, #0x8a
@ -1537,7 +1537,7 @@ _08004AFC: .4byte 0x0201A510
_08004B00: .4byte 0x0202ADD0
_08004B04: .4byte 0x0201B128
_08004B08: .4byte 0x0201A444
_08004B0C: .4byte 0x0200B0C0
_08004B0C: .4byte gMain
thumb_func_start sub_4B10
sub_4B10: @ 0x08004B10
@ -1551,14 +1551,14 @@ sub_4B10: @ 0x08004B10
ble _08004B2A
movs r0, #0
strh r0, [r1]
ldr r1, _08004B30 @ =0x0200B0C0
ldr r1, _08004B30 @ =gMain
movs r0, #6
strb r0, [r1, #3]
_08004B2A:
bx lr
.align 2, 0
_08004B2C: .4byte 0x0201A444
_08004B30: .4byte 0x0200B0C0
_08004B30: .4byte gMain
thumb_func_start sub_4B34
sub_4B34: @ 0x08004B34
@ -1600,7 +1600,7 @@ _08004B70:
bl sub_2B4
bl m4aMPlayAllStop
bl sub_D10
ldr r1, _08004BB0 @ =0x0200B0C0
ldr r1, _08004BB0 @ =gMain
movs r0, #0
strb r0, [r1, #3]
_08004B90:
@ -1614,7 +1614,7 @@ _08004BA0: .4byte 0x0202BF04
_08004BA4: .4byte 0x0202A588
_08004BA8: .4byte 0x0202A1C0
_08004BAC: .4byte 0x0202A390
_08004BB0: .4byte 0x0200B0C0
_08004BB0: .4byte gMain
thumb_func_start sub_4BB4
sub_4BB4: @ 0x08004BB4
@ -1688,7 +1688,7 @@ _08004C2A:
bl sub_2B4
bl m4aMPlayAllStop
bl sub_D10
ldr r1, _08004C78 @ =0x0200B0C0
ldr r1, _08004C78 @ =gMain
movs r0, #0
strb r0, [r1, #3]
_08004C4E:
@ -1707,14 +1707,14 @@ _08004C68: .4byte 0x0202A588
_08004C6C: .4byte 0x0202A390
_08004C70: .4byte 0x0202A1C0
_08004C74: .4byte 0x0200B134
_08004C78: .4byte 0x0200B0C0
_08004C78: .4byte gMain
_08004C7C: .4byte 0x0201B120
thumb_func_start sub_4C80
sub_4C80: @ 0x08004C80
push {r4, r5, r6, r7, lr}
bl sub_51FC
ldr r7, _08004CF8 @ =0x0200B0C0
ldr r7, _08004CF8 @ =gMain
ldrh r1, [r7, #0x18]
movs r6, #1
movs r5, #1
@ -1764,12 +1764,12 @@ _08004CC2:
bl sub_2B4
bl m4aMPlayAllStop
bl sub_D10
ldr r1, _08004CF8 @ =0x0200B0C0
ldr r1, _08004CF8 @ =gMain
movs r0, #0
strb r0, [r1, #3]
b _08004D38
.align 2, 0
_08004CF8: .4byte 0x0200B0C0
_08004CF8: .4byte gMain
_08004CFC: .4byte 0x0202A1C0
_08004D00: .4byte 0x0202A390
_08004D04: .4byte 0x0202BEC4
@ -1809,7 +1809,7 @@ sub_4D50: @ 0x08004D50
bl sub_2B4
bl m4aMPlayAllStop
bl sub_D10
ldr r1, _08004D70 @ =0x0201A4B4
ldr r1, _08004D70 @ =gAutoDisplayTitlescreenMenu
movs r0, #1
strb r0, [r1]
movs r0, #1
@ -1817,7 +1817,7 @@ sub_4D50: @ 0x08004D50
pop {r0}
bx r0
.align 2, 0
_08004D70: .4byte 0x0201A4B4
_08004D70: .4byte gAutoDisplayTitlescreenMenu
thumb_func_start sub_4D74
sub_4D74: @ 0x08004D74
@ -2107,7 +2107,7 @@ _08004FC4: .4byte 0x0202A57C
thumb_func_start sub_4FC8
sub_4FC8: @ 0x08004FC8
push {r4, r5, lr}
ldr r5, _08005048 @ =0x0200B0C0
ldr r5, _08005048 @ =gMain
ldrh r2, [r5, #0x1c]
movs r1, #0x88
lsls r1, r1, #2
@ -2171,7 +2171,7 @@ _08005040:
pop {r0}
bx r0
.align 2, 0
_08005048: .4byte 0x0200B0C0
_08005048: .4byte gMain
_0800504C: .4byte 0x02002830
_08005050: .4byte 0x02002831
_08005054: .4byte 0x0202BEC4
@ -4006,7 +4006,7 @@ sub_5EEC: @ 0x08005EEC
_08005F0C: .4byte 0x0201B128
_08005F10: .4byte 0x0201C1BC
_08005F14:
ldr r0, _08005F28 @ =0x0200B0C0
ldr r0, _08005F28 @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #1
ands r0, r1
@ -4017,7 +4017,7 @@ _08005F14:
strh r0, [r1]
b _08006136
.align 2, 0
_08005F28: .4byte 0x0200B0C0
_08005F28: .4byte gMain
_08005F2C: .4byte 0x0202C5F0
_08005F30: .4byte 0x0000FEFE
_08005F34:
@ -4311,7 +4311,7 @@ sub_6144: @ 0x08006144
_08006164: .4byte 0x0201B128
_08006168: .4byte 0x0202C544
_0800616C:
ldr r0, _08006180 @ =0x0200B0C0
ldr r0, _08006180 @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #1
ands r0, r1
@ -4322,7 +4322,7 @@ _0800616C:
strh r0, [r1]
b _0800638E
.align 2, 0
_08006180: .4byte 0x0200B0C0
_08006180: .4byte gMain
_08006184: .4byte 0x0202C5F0
_08006188: .4byte 0x0000FEFE
_0800618C:

4
asm/rom_1068C.s
View File

@ -198,7 +198,7 @@ sub_10798: @ 0x08010798
str r5, [r4, #8]
ldr r0, [r4, #8]
bl sub_1050C
ldr r1, _08010834 @ =0x0200B0C0
ldr r1, _08010834 @ =gMain
movs r0, #0x80
lsls r0, r0, #0x13
ldrh r0, [r0]
@ -225,7 +225,7 @@ _08010824: .4byte 0x00007FFF
_08010828: .4byte 0xFFFFFC00
_0801082C: .4byte 0x81000200
_08010830: .4byte 0x80000200
_08010834: .4byte 0x0200B0C0
_08010834: .4byte gMain
_08010838:
ldr r0, _0801085C @ =0x0201AD20
_0801083A:

2036
asm/rom_11B9C.s
View File

File diff suppressed because it is too large Load Diff

56
asm/rom_24C.s
View File

@ -27,7 +27,7 @@ sub_24C: @ 0x0800024C
ldr r0, _080002AC @ =0x0000FF7F
ands r0, r1
strh r0, [r2]
ldr r1, _080002B0 @ =0x0200B0C0
ldr r1, _080002B0 @ =gMain
ldrh r0, [r2]
strh r0, [r1, #0x16]
movs r5, #0
@ -53,7 +53,7 @@ _08000282:
_080002A4: .4byte 0x04000050
_080002A8: .4byte 0x04000054
_080002AC: .4byte 0x0000FF7F
_080002B0: .4byte 0x0200B0C0
_080002B0: .4byte gMain
thumb_func_start sub_2B4
sub_2B4: @ 0x080002B4
@ -84,7 +84,7 @@ _080002DA:
lsrs r4, r4, #0x10
cmp r4, #0xf
bls _080002DA
ldr r1, _0800034C @ =0x0200B0C0
ldr r1, _0800034C @ =gMain
ldrh r0, [r1, #0x16]
movs r3, #0x80
movs r2, #0
@ -132,7 +132,7 @@ _080002DA:
.align 2, 0
_08000344: .4byte 0x04000050
_08000348: .4byte 0x04000054
_0800034C: .4byte 0x0200B0C0
_0800034C: .4byte gMain
_08000350: .4byte 0x8100C000
_08000354: .4byte 0x04000010
@ -253,7 +253,7 @@ _08000434: .4byte 0x000001FF
thumb_func_start sub_438
sub_438: @ 0x08000438
push {r4, r5, r6, lr}
ldr r4, _0800048C @ =0x0200B0C0
ldr r4, _0800048C @ =gMain
ldrh r0, [r4, #0x16]
movs r2, #0x80
movs r6, #0
@ -292,7 +292,7 @@ sub_438: @ 0x08000438
pop {r0}
bx r0
.align 2, 0
_0800048C: .4byte 0x0200B0C0
_0800048C: .4byte gMain
thumb_func_start sub_490
sub_490: @ 0x08000490
@ -377,7 +377,7 @@ sub_518: @ 0x08000518
str r0, [r1, #8]
ldr r0, [r1, #8]
movs r1, #0
ldr r6, _08000570 @ =0x0200B0C0
ldr r6, _08000570 @ =gMain
movs r5, #0xba
lsls r5, r5, #2
movs r3, #0
@ -405,7 +405,7 @@ _0800053E:
_08000564: .4byte 0x040000D4
_08000568: .4byte 0x03005C00
_0800056C: .4byte 0x81000600
_08000570: .4byte 0x0200B0C0
_08000570: .4byte gMain
_08000574: .4byte 0x000002EA
thumb_func_start sub_578
@ -416,7 +416,7 @@ sub_578: @ 0x08000578
mov r5, r8
push {r5, r6, r7}
movs r5, #0
ldr r6, _08000660 @ =0x0200B0C0
ldr r6, _08000660 @ =gMain
movs r0, #0xb8
mov sb, r0
movs r4, #0
@ -530,7 +530,7 @@ _08000600:
pop {r0}
bx r0
.align 2, 0
_08000660: .4byte 0x0200B0C0
_08000660: .4byte gMain
_08000664: .4byte 0x00000302
_08000668: .4byte 0x000002FA
_0800066C: .4byte 0xFFFFFE00
@ -950,7 +950,7 @@ AgbMain: @ 0x0800095C
bl sub_B54
bl sub_FE8
ldr r5, _080009B4 @ =gMainFuncs
ldr r4, _080009B8 @ =0x0200B0C0
ldr r4, _080009B8 @ =gMain
_08000988:
bl ReadKeys
ldrb r0, [r4, #2]
@ -967,12 +967,12 @@ _080009A8: .4byte 0x03005400
_080009AC: .4byte 0x84000200
_080009B0: .4byte 0x03007FFC
_080009B4: .4byte gMainFuncs
_080009B8: .4byte 0x0200B0C0
_080009B8: .4byte gMain
thumb_func_start sub_9BC_Main
sub_9BC_Main: @ 0x080009BC
push {r4, lr}
ldr r4, _080009DC @ =0x0200B0C0
ldr r4, _080009DC @ =gMain
ldrb r0, [r4, #3]
cmp r0, #0
beq _080009E0
@ -984,7 +984,7 @@ sub_9BC_Main: @ 0x080009BC
bl sub_23C
b _080009FC
.align 2, 0
_080009DC: .4byte 0x0200B0C0
_080009DC: .4byte gMain
_080009E0:
bl sub_CBC
bl sub_24C
@ -1033,7 +1033,7 @@ sub_A20: @ 0x08000A20
ldrh r1, [r2]
movs r0, #2
ands r0, r1
ldr r3, _08000A80 @ =0x0200B0C0
ldr r3, _08000A80 @ =gMain
cmp r0, #0
bne _08000A46
movs r4, #2
@ -1071,7 +1071,7 @@ _08000A46:
.align 2, 0
_08000A78: .4byte 0x03007FF8
_08000A7C: .4byte 0x04000004
_08000A80: .4byte 0x0200B0C0
_08000A80: .4byte gMain
_08000A84: .4byte 0x04000010
_08000A88: .4byte 0x04000012
_08000A8C:
@ -1207,7 +1207,7 @@ _08000B88: .4byte 0x000045B6
thumb_func_start sub_B8C
sub_B8C: @ 0x08000B8C
push {lr}
ldr r0, _08000BB8 @ =0x0200B0C0
ldr r0, _08000BB8 @ =gMain
movs r1, #0
strb r1, [r0, #2]
strb r1, [r0, #3]
@ -1226,7 +1226,7 @@ sub_B8C: @ 0x08000B8C
pop {r0}
bx r0
.align 2, 0
_08000BB8: .4byte 0x0200B0C0
_08000BB8: .4byte gMain
thumb_func_start sub_BBC
sub_BBC: @ 0x08000BBC
@ -1262,7 +1262,7 @@ _08000BFC: .4byte 0x086A4AA0
thumb_func_start sub_C00
sub_C00: @ 0x08000C00
ldr r2, _08000C14 @ =0x0200B0C0
ldr r2, _08000C14 @ =gMain
ldr r1, [r2, #0x48]
ldr r0, _08000C18 @ =0x41C64E6D
muls r0, r1, r0
@ -1273,7 +1273,7 @@ sub_C00: @ 0x08000C00
ands r0, r1
bx lr
.align 2, 0
_08000C14: .4byte 0x0200B0C0
_08000C14: .4byte gMain
_08000C18: .4byte 0x41C64E6D
_08000C1C: .4byte 0x00003039
_08000C20: .4byte 0x0000FFFF
@ -1341,7 +1341,7 @@ ReadKeys: @ 0x08000C8C
mvns r2, r2
lsls r2, r2, #0x10
lsrs r2, r2, #0x10
ldr r3, _08000CB8 @ =0x0200B0C0
ldr r3, _08000CB8 @ =gMain
ldrh r4, [r3, #0x1c]
adds r1, r2, #0
eors r1, r4
@ -1356,7 +1356,7 @@ ReadKeys: @ 0x08000C8C
bx r0
.align 2, 0
_08000CB4: .4byte 0x04000130
_08000CB8: .4byte 0x0200B0C0
_08000CB8: .4byte gMain
thumb_func_start sub_CBC
sub_CBC: @ 0x08000CBC
@ -1467,7 +1467,7 @@ sub_D74: @ 0x08000D74
beq _08000D9C
bl _call_via_r2
_08000D9C:
ldr r1, _08000DC0 @ =0x0200B0C0
ldr r1, _08000DC0 @ =gMain
ldr r0, [r1, #0x4c]
adds r0, #1
str r0, [r1, #0x4c]
@ -1480,7 +1480,7 @@ _08000DB0: .4byte 0x0200FB98
_08000DB4: .4byte 0x02017BD0
_08000DB8: .4byte 0x02019BE0
_08000DBC: .4byte 0x0200FBA0
_08000DC0: .4byte 0x0200B0C0
_08000DC0: .4byte gMain
thumb_func_start sub_DC4
sub_DC4: @ 0x08000DC4
@ -1502,7 +1502,7 @@ sub_DC4: @ 0x08000DC4
str r0, [r1, #8]
ldr r0, [r1, #8]
subs r1, #0xd4
ldr r2, _08000E8C @ =0x0200B0C0
ldr r2, _08000E8C @ =gMain
ldrh r0, [r2, #0x16]
strh r0, [r1]
adds r1, #0x10
@ -1581,7 +1581,7 @@ _08000E7C: .4byte 0x04000004
_08000E80: .4byte 0x040000D4
_08000E84: .4byte 0x03005000
_08000E88: .4byte 0x84000100
_08000E8C: .4byte 0x0200B0C0
_08000E8C: .4byte gMain
thumb_func_start sub_E90
sub_E90: @ 0x08000E90
@ -2969,7 +2969,7 @@ sub_19CC: @ 0x080019CC
bl CpuSet
movs r1, #0x80
lsls r1, r1, #0x13
ldr r2, _08001A74 @ =0x0200B0C0
ldr r2, _08001A74 @ =gMain
ldrh r0, [r2, #0x16]
strh r0, [r1]
adds r1, #0x10
@ -3036,7 +3036,7 @@ _08001A64:
.align 2, 0
_08001A6C: .4byte 0x04000004
_08001A70: .4byte 0x03005000
_08001A74: .4byte 0x0200B0C0
_08001A74: .4byte gMain
thumb_func_start sub_1A78
sub_1A78: @ 0x08001A78

36
asm/rom_25A4.s
View File

@ -8,7 +8,7 @@
sub_25A4_Main: @ 0x080025A4
push {lr}
ldr r1, _080025BC @ =0x0805C750
ldr r0, _080025C0 @ =0x0200B0C0
ldr r0, _080025C0 @ =gMain
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@ -18,7 +18,7 @@ sub_25A4_Main: @ 0x080025A4
bx r0
.align 2, 0
_080025BC: .4byte 0x0805C750
_080025C0: .4byte 0x0200B0C0
_080025C0: .4byte gMain
thumb_func_start sub_25C4
sub_25C4: @ 0x080025C4
@ -58,7 +58,7 @@ sub_25C4: @ 0x080025C4
adds r1, r3, #0
orrs r0, r1
strh r0, [r2]
ldr r4, _080026B4 @ =0x0200B0C0
ldr r4, _080026B4 @ =gMain
ldrh r0, [r2]
strh r0, [r4, #0x16]
ldr r0, _080026B8 @ =0x040000D4
@ -134,7 +134,7 @@ sub_25C4: @ 0x080025C4
_080026A8: .4byte 0x04000008
_080026AC: .4byte 0x0400000A
_080026B0: .4byte 0x0400000C
_080026B4: .4byte 0x0200B0C0
_080026B4: .4byte gMain
_080026B8: .4byte 0x040000D4
_080026BC: .4byte 0x0807C2E0
_080026C0: .4byte 0x80000100
@ -221,7 +221,7 @@ _08002788:
_0800278E:
b _0800296E
_08002790:
ldr r0, _080027B8 @ =0x0200B0C0
ldr r0, _080027B8 @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #0x20
ands r0, r1
@ -240,7 +240,7 @@ _08002790:
subs r0, #1
b _080027E0
.align 2, 0
_080027B8: .4byte 0x0200B0C0
_080027B8: .4byte gMain
_080027BC: .4byte 0x0201A4F8
_080027C0:
movs r0, #0x10
@ -261,7 +261,7 @@ _080027C0:
_080027E0:
strb r0, [r4]
_080027E2:
ldr r0, _08002808 @ =0x0200B0C0
ldr r0, _08002808 @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #0x40
ands r0, r1
@ -279,7 +279,7 @@ _080027E2:
b _08002828
.align 2, 0
_08002804: .4byte 0x0201A4F8
_08002808: .4byte 0x0200B0C0
_08002808: .4byte gMain
_0800280C:
movs r0, #0x80
ands r0, r1
@ -297,7 +297,7 @@ _0800280C:
_08002828:
strb r0, [r4]
_0800282A:
ldr r4, _08002870 @ =0x0200B0C0
ldr r4, _08002870 @ =gMain
ldrh r1, [r4, #0x18]
movs r5, #1
movs r0, #1
@ -331,13 +331,13 @@ _08002858:
b _0800296E
.align 2, 0
_0800286C: .4byte 0x0201A4F8
_08002870: .4byte 0x0200B0C0
_08002870: .4byte gMain
_08002874: .4byte 0x0202BED0
_08002878: .4byte 0x0201A4B0
_0800287C: .4byte 0x0202A560
_08002880: .4byte 0x0202BEE4
_08002884:
ldr r5, _08002904 @ =0x0200B0C0
ldr r5, _08002904 @ =gMain
ldrh r1, [r5, #0x18]
movs r0, #0x30
ands r0, r1
@ -401,7 +401,7 @@ _080028E4:
strh r0, [r2]
b _0800296E
.align 2, 0
_08002904: .4byte 0x0200B0C0
_08002904: .4byte gMain
_08002908: .4byte 0x0201A4C0
_0800290C: .4byte 0x0202A560
_08002910: .4byte 0x0202BE1C
@ -431,7 +431,7 @@ _0800291C:
asrs r0, r0, #0x10
cmp r0, #5
ble _0800296E
ldr r1, _08002980 @ =0x0200B0C0
ldr r1, _08002980 @ =gMain
strb r3, [r1, #0xd]
ldr r2, _08002984 @ =0x086A4CF0
ldr r0, _08002988 @ =0x0201A4F8
@ -457,7 +457,7 @@ _0800296E:
_08002974: .4byte 0x0202A560
_08002978: .4byte 0x0202BEE8
_0800297C: .4byte 0x0202BE1C
_08002980: .4byte 0x0200B0C0
_08002980: .4byte gMain
_08002984: .4byte 0x086A4CF0
_08002988: .4byte 0x0201A4F8
_0800298C: .4byte 0x0202BEE4
@ -469,7 +469,7 @@ sub_2990: @ 0x08002990
bl sub_FE04
bl m4aMPlayAllStop
bl sub_D10
ldr r1, _080029C0 @ =0x0201A4B4
ldr r1, _080029C0 @ =gAutoDisplayTitlescreenMenu
movs r0, #1
strb r0, [r1]
ldr r0, _080029C4 @ =0x0202BEE4
@ -483,7 +483,7 @@ sub_2990: @ 0x08002990
bx r0
.align 2, 0
_080029BC: .4byte sub_29C8 + 1
_080029C0: .4byte 0x0201A4B4
_080029C0: .4byte gAutoDisplayTitlescreenMenu
_080029C4: .4byte 0x0202BEE4
thumb_func_start sub_29C8
@ -494,7 +494,7 @@ sub_29C8: @ 0x080029C8
mov r5, r8
push {r5, r6, r7}
sub sp, #0x18
ldr r1, _08002C14 @ =0x0200B0C0
ldr r1, _08002C14 @ =gMain
ldrh r0, [r1, #0x38]
ldr r0, _08002C18 @ =0x00000C14
strh r0, [r1, #0x38]
@ -791,7 +791,7 @@ _08002BF0:
pop {r0}
bx r0
.align 2, 0
_08002C14: .4byte 0x0200B0C0
_08002C14: .4byte gMain
_08002C18: .4byte 0x00000C14
_08002C1C: .4byte 0x00000808
_08002C20: .4byte 0x04000050

50
asm/rom_2C58.s
View File

@ -8,7 +8,7 @@
EReaderMain: @ 0x08002C58
push {lr}
ldr r1, _08002C70 @ =0x0805C75C
ldr r0, _08002C74 @ =0x0200B0C0
ldr r0, _08002C74 @ =gMain
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@ -18,7 +18,7 @@ EReaderMain: @ 0x08002C58
bx r0
.align 2, 0
_08002C70: .4byte 0x0805C75C
_08002C74: .4byte 0x0200B0C0
_08002C74: .4byte gMain
thumb_func_start sub_2C78
sub_2C78: @ 0x08002C78
@ -51,7 +51,7 @@ sub_2C78: @ 0x08002C78
adds r1, r3, #0
orrs r0, r1
strh r0, [r2]
ldr r6, _08002D88 @ =0x0200B0C0
ldr r6, _08002D88 @ =gMain
movs r0, #0xba
lsls r0, r0, #2
adds r1, r6, r0
@ -150,7 +150,7 @@ sub_2C78: @ 0x08002C78
.align 2, 0
_08002D80: .4byte 0x04000008
_08002D84: .4byte 0x0400000A
_08002D88: .4byte 0x0200B0C0
_08002D88: .4byte gMain
_08002D8C: .4byte 0x0000FFE8
_08002D90: .4byte 0x040000D4
_08002D94: .4byte 0x08081D20
@ -298,7 +298,7 @@ _08002EE6:
subs r0, r0, r1
strb r0, [r2]
_08002EF0:
ldr r7, _08002F30 @ =0x0200B0C0
ldr r7, _08002F30 @ =gMain
ldrh r1, [r7, #0x18]
movs r0, #1
ands r0, r1
@ -328,7 +328,7 @@ _08002EF0:
b _08002F90
.align 2, 0
_08002F2C: .4byte 0x0202C5A4
_08002F30: .4byte 0x0200B0C0
_08002F30: .4byte gMain
_08002F34: .4byte 0x0202C604
_08002F38: .4byte 0x086A551A
_08002F3C: .4byte 0x0202AD90
@ -429,7 +429,7 @@ sub_2FC0: @ 0x08002FC0
strb r0, [r1]
movs r0, #0x76
bl m4aSongNumStart
ldr r1, _08003040 @ =0x0200B0C0
ldr r1, _08003040 @ =gMain
movs r0, #3
strb r0, [r1, #3]
_08003012:
@ -451,7 +451,7 @@ _08003030: .4byte 0x086A550C
_08003034: .4byte 0x0201B174
_08003038: .4byte 0x0201B124
_0800303C: .4byte 0x0202C584
_08003040: .4byte 0x0200B0C0
_08003040: .4byte gMain
_08003044: .4byte 0x0202A58C
_08003048: .4byte 0x0202BEC0
@ -459,7 +459,7 @@ _08003048: .4byte 0x0202BEC0
sub_304C: @ 0x0800304C
push {r4, r5, lr}
bl sub_3AB4
ldr r5, _08003114 @ =0x0200B0C0
ldr r5, _08003114 @ =gMain
ldrh r1, [r5, #0x18]
movs r0, #2
ands r0, r1
@ -552,7 +552,7 @@ _080030F4:
strb r0, [r3, #3]
b _0800316C
.align 2, 0
_08003114: .4byte 0x0200B0C0
_08003114: .4byte gMain
_08003118: .4byte 0x0202ADD0
_0800311C: .4byte 0x0202BEC8
_08003120: .4byte 0x0202C5F0
@ -580,7 +580,7 @@ _0800313C:
movs r0, #0xd
strb r0, [r1]
bl sub_377C
ldr r1, _080031FC @ =0x0200B0C0
ldr r1, _080031FC @ =gMain
movs r0, #4
strb r0, [r1, #3]
movs r0, #0x8a
@ -636,7 +636,7 @@ _08003192:
movs r0, #0xd
strb r0, [r1]
bl sub_377C
ldr r1, _080031FC @ =0x0200B0C0
ldr r1, _080031FC @ =gMain
movs r0, #4
strb r0, [r1, #3]
movs r0, #0x8a
@ -652,7 +652,7 @@ _080031EC: .4byte 0x0202BEC0
_080031F0: .4byte 0x0202C604
_080031F4: .4byte 0x0202C5A4
_080031F8: .4byte 0x0202AD90
_080031FC: .4byte 0x0200B0C0
_080031FC: .4byte gMain
_08003200: .4byte 0x0202ADD0
_08003204: .4byte 0x0201A444
@ -760,7 +760,7 @@ _080032D6:
subs r0, r0, r1
strb r0, [r2]
_080032E0:
ldr r7, _08003320 @ =0x0200B0C0
ldr r7, _08003320 @ =gMain
ldrh r1, [r7, #0x18]
movs r0, #1
ands r0, r1
@ -790,7 +790,7 @@ _080032E0:
b _0800336E
.align 2, 0
_0800331C: .4byte 0x0202C5A4
_08003320: .4byte 0x0200B0C0
_08003320: .4byte gMain
_08003324: .4byte 0x0202C604
_08003328: .4byte 0x086A551A
_0800332C: .4byte 0x0202AD90
@ -883,7 +883,7 @@ _080033E8:
bl sub_2B4
bl m4aMPlayAllStop
bl sub_D10
ldr r1, _0800342C @ =0x0200B0C0
ldr r1, _0800342C @ =gMain
movs r0, #6
strb r0, [r1, #3]
_080033FE:
@ -911,7 +911,7 @@ _08003420:
pop {r0}
bx r0
.align 2, 0
_0800342C: .4byte 0x0200B0C0
_0800342C: .4byte gMain
_08003430: .4byte 0x0202A58C
_08003434: .4byte 0x0201A44C
_08003438: .4byte 0x0202BEC0
@ -947,7 +947,7 @@ sub_343C: @ 0x0800343C
adds r1, r3, #0
orrs r0, r1
strh r0, [r2]
ldr r6, _08003558 @ =0x0200B0C0
ldr r6, _08003558 @ =gMain
movs r0, #0xba
lsls r0, r0, #2
adds r1, r6, r0
@ -1052,7 +1052,7 @@ sub_343C: @ 0x0800343C
.align 2, 0
_08003550: .4byte 0x04000008
_08003554: .4byte 0x0400000A
_08003558: .4byte 0x0200B0C0
_08003558: .4byte gMain
_0800355C: .4byte 0x0000FFE8
_08003560: .4byte 0x040000D4
_08003564: .4byte 0x08081D20
@ -1167,7 +1167,7 @@ _0800366E:
subs r0, r0, r1
strb r0, [r2]
_08003678:
ldr r2, _080036B8 @ =0x0200B0C0
ldr r2, _080036B8 @ =gMain
ldrh r1, [r2, #0x18]
movs r0, #1
ands r0, r1
@ -1197,7 +1197,7 @@ _08003678:
b _0800371A
.align 2, 0
_080036B4: .4byte 0x0202C5A4
_080036B8: .4byte 0x0200B0C0
_080036B8: .4byte gMain
_080036BC: .4byte 0x0202C604
_080036C0: .4byte 0x086A551A
_080036C4: .4byte 0x0202AD90
@ -1269,7 +1269,7 @@ sub_374C: @ 0x0800374C
bl sub_2B4
bl m4aMPlayAllStop
bl sub_D10
ldr r1, _08003774 @ =0x0201A4B4
ldr r1, _08003774 @ =gAutoDisplayTitlescreenMenu
movs r0, #1
strb r0, [r1]
ldr r0, _08003778 @ =0x0202BEF8
@ -1282,7 +1282,7 @@ sub_374C: @ 0x0800374C
pop {r0}
bx r0
.align 2, 0
_08003774: .4byte 0x0201A4B4
_08003774: .4byte gAutoDisplayTitlescreenMenu
_08003778: .4byte 0x0202BEF8
thumb_func_start sub_377C
@ -1977,7 +1977,7 @@ _08003CD4: .4byte 0x0202C5F0
thumb_func_start sub_3CD8
sub_3CD8: @ 0x08003CD8
push {r4, lr}
ldr r0, _08003D24 @ =0x0200B0C0
ldr r0, _08003D24 @ =gMain
ldrh r1, [r0, #0x18]
movs r0, #1
ands r0, r1
@ -2017,7 +2017,7 @@ _08003D0A:
ldrh r1, [r1, #4]
b _08003D4E
.align 2, 0
_08003D24: .4byte 0x0200B0C0
_08003D24: .4byte gMain
_08003D28: .4byte 0x0202A564
_08003D2C: .4byte 0x0202ADE8
_08003D30: .4byte 0x0202A58C

4
asm/rom_528AC.s
View File

@ -190,7 +190,7 @@ _08052A14: .4byte 0x08533F60
sub_52A18: @ 0x08052A18
push {r4, lr}
bl sub_555BC
ldr r4, _08052A4C @ =0x0200B0C0
ldr r4, _08052A4C @ =gMain
movs r0, #0
strb r0, [r4, #0xc]
bl sub_52A68
@ -208,7 +208,7 @@ sub_52A18: @ 0x08052A18
bl sub_52C64
b _08052A5E
.align 2, 0
_08052A4C: .4byte 0x0200B0C0
_08052A4C: .4byte gMain
_08052A50:
ldr r1, _08052A64 @ =0x00000143
adds r0, r4, r1

432
asm/titlescreen.s
View File

File diff suppressed because it is too large Load Diff

7
asmdiff.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
$OBJDUMP $OPTIONS baserom.gba > baserom.dump
$OBJDUMP $OPTIONS pokepinballrs.gba > pokepinballrs.dump
diff baserom.dump pokepinballrs.dump

28
data/rom.s
View File

@ -1,7 +1,23 @@
.section .rodata
@ field select palettes 0xA8840
.incbin "baserom.gba", 0x55A68, 0x7A0C0 - 0x55A68
.incbin "baserom.gba", 0x55A68, 0x79890 - 0x55A68
gTitlescreenStateFuncs:: @ 0x08079890
.4byte LoadTitlescreenGraphics
.4byte sub_10BB8
.4byte sub_10CF0
.4byte sub_10E00
.4byte sub_10EF4
.4byte sub_110FC
.4byte sub_11320
.4byte sub_11020
.4byte sub_11228
.4byte sub_10D84
.4byte sub_11428
.4byte sub_114B4
.incbin "baserom.gba", 0x798C0, 0x7A0C0 - 0x798C0
gIntroCopyright_Gfx:: @ 0x0807A0C0
.incbin "graphics/intro/copyright.4bpp"
@ -45,7 +61,15 @@ gIntroScene1Sprites_Gfx:: @ 0x080C3CE0
.include "data/graphics/mon_portraits.inc"
.incbin "baserom.gba", 0x4ECF6C, 0x6A4AD8 - 0x4ECF6C
.incbin "baserom.gba", 0x4ECF6C, 0x52B668 - 0x4ECF6C
gGBAButtonIcons_Pals:: @ 0x0852B668
.incbin "graphics/gba_buttons.gbapal"
gOptionsSprites_Gfx:: @ 0x0852B868
.incbin "graphics/options/sprites.4bpp"
.incbin "baserom.gba", 0x52D888, 0x6A4AD8 - 0x52D888
gMainFuncs:: @ 0x086A4AD8
.4byte IntroMain

259
graphics/gba_buttons.pal Normal file
View File

@ -0,0 +1,259 @@
JASC-PAL
0100
256
248 96 248
248 248 248
208 208 208
168 168 168
136 136 136
88 88 88
248 240 16
168 136 8
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
248 96 248
248 248 248
128 72 0
248 160 0
248 112 0
248 208 128
48 80 152
248 232 0
248 208 0
224 224 224
248 248 248
120 120 120
184 184 184
0 0 0
248 0 0
0 0 0
248 96 248
248 248 248
248 168 96
248 128 16
216 72 0
136 72 0
248 216 64
192 152 24
128 104 16
248 224 136
192 168 96
120 104 64
184 184 184
200 200 200
48 80 152
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/options/sprites.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

3
graphics_rules.mk
View File

@ -4,6 +4,9 @@ MON_HATCH_SPRITES_DIR := graphics/mon_hatch_sprites
graphics/field_select/sprites.4bpp: graphics/field_select/sprites.png
$(GFX) $< $@ -num_tiles 513
graphics/options/sprites.4bpp: graphics/options/sprites.png
$(GFX) $< $@ -num_tiles 257
$(MON_PORTRAITS_DIR)/%.4bpp: $(MON_PORTRAITS_DIR)/%.png
$(GFX) $< $@ -mwidth 2 -mheight 2

26
include/m4a.h Executable file
View File

@ -0,0 +1,26 @@
#ifndef GUARD_M4A_H
#define GUARD_M4A_H
#include "gba/m4a_internal.h"
void m4aSoundVSync(void);
void m4aSoundVSyncOn(void);
void m4aSoundInit(void);
void m4aSoundMain(void);
void m4aSongNumStart(u16);
void m4aSongNumStop(u16 n);
void m4aMPlayAllStop(void);
void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo);
void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed);
void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed);
void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed);
void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo);
extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern struct MusicPlayerInfo gMPlayInfo_SE1;
extern struct MusicPlayerInfo gMPlayInfo_SE2;
extern struct MusicPlayerInfo gMPlayInfo_SE3;
extern struct SoundInfo gSoundInfo;
#endif //GUARD_M4A_H

22
include/main.h Executable file
View File

@ -0,0 +1,22 @@
#ifndef GUARD_MAIN_H
#define GUARD_MAIN_H
#include "global.h"
typedef void (*StateFunc)(void);
struct Main
{
/*0x00*/u8 filler0[0x2];
/*0x02*/u8 mainState;
/*0x03*/u8 subState;
/*0x04*/u8 filler4[0x12];
/*0x16*/u16 unk16;
/*0x18*/u8 filler18[0x28];
/*0x40*/int unk40;
};
extern struct Main gMain;
extern StateFunc gMainFuncs[];
#endif // GUARD_MAIN_H

16
include/titlescreen.h Executable file
View File

@ -0,0 +1,16 @@
#ifndef GUARD_TITLESCREEN_H
#define GUARD_TITLESCREEN_H
struct UnkStruct2002888
{
/*0x00*/u8 filler0[0x9];
/*0x09*/u8 unk9;
/*0x0A*/u8 fillerA[0x1];
/*0x0B*/u8 unkB;
};
extern struct UnkStruct2002888 gUnknown_2002888;
extern s8 gAutoDisplayTitlescreenMenu;
extern u8 gUnknown_202BE24;
#endif // GUARD_TITLESCREEN_H

1
ld_script.txt
View File

@ -36,6 +36,7 @@ SECTIONS
asm/intro.o(.text);
asm/high_scores.o(.text);
asm/rom_1068C.o(.text);
src/titlescreen.o(.text);
asm/titlescreen.o(.text);
asm/rom_11B9C.o(.text);
asm/options.o(.text);

16
src/main.c
View File

@ -1,16 +1,8 @@
#include "global.h"
#include "main.h"
struct UnkStruct_200B0C0
void sub_23C(u8 mainState)
{
u8 filler0[0x2];
u8 unk2;
u8 unk3;
};
extern struct UnkStruct_200B0C0 gUnknown_0200B0C0;
void sub_23C(u8 arg0)
{
gUnknown_0200B0C0.unk2 = arg0;
gUnknown_0200B0C0.unk3 = 0;
gMain.mainState = mainState;
gMain.subState = 0;
}

80
src/titlescreen.c Executable file
View File

@ -0,0 +1,80 @@
#include "global.h"
#include "titlescreen.h"
#include "m4a.h"
#include "main.h"
extern StateFunc gTitlescreenStateFuncs[];
extern const u8 gTitlescreenBg_Gfx[];
extern const u16 gTitlescreenBg_Pals[];
extern const u8 gTitlescreenBgTilemap[];
extern const u16 gTitlescreenSprites_Pals[];
extern const u8 gTitlescreenSpritesSavedGame_Gfx[];
extern const u8 gTitlescreenSpritesNoSavedGame_Gfx[];
extern const u8 gGBAButtonIcons_Pals[];
extern const u8 gOptionsSprites_Gfx[];
extern void sub_438(void);
extern void sub_CBC(void);
extern void sub_FD5C(void (*func)(void));
extern void sub_11640(void);
extern void sub_52C44(void);
extern void sub_10AC0(void);
void TitlescreenMain(void)
{
gTitlescreenStateFuncs[gMain.subState]();
}
void LoadTitlescreenGraphics(void)
{
int autoDisplayMenu;
sub_438();
REG_DISPCNT = DISPCNT_OBJ_ON| DISPCNT_FORCED_BLANK;
REG_BG1CNT = BGCNT_256COLOR | BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(0);
REG_DISPCNT |= DISPCNT_BG1_ON;
gMain.unk16 = REG_DISPCNT;
DmaCopy16(3, gTitlescreenBg_Gfx, (void *)BG_CHAR_ADDR(1), 0xA000);
DmaCopy16(3, gTitlescreenBg_Pals, (void *)BG_PLTT, BG_PLTT_SIZE);
DmaCopy16(3, gTitlescreenBgTilemap, (void *)BG_SCREEN_ADDR(0), BG_SCREEN_SIZE);
sub_52C44();
if (gMain.unk40 == 1)
{
DmaCopy16(3, gTitlescreenSprites_Pals, (void *)OBJ_PLTT, 0xA0);
DmaCopy16(3, gTitlescreenSpritesSavedGame_Gfx, (void *)BG_CHAR_ADDR(4), 0x7000);
DmaCopy16(3, gGBAButtonIcons_Pals, (void *)(OBJ_PLTT + 0xA0), 0x40);
DmaCopy16(3, gOptionsSprites_Gfx, (void *)OBJ_VRAM0 + 0x7000, 0x400);
}
else
{
DmaCopy16(3, gTitlescreenSprites_Pals, (void *)OBJ_PLTT, 0xA0);
DmaCopy16(3, gTitlescreenSpritesNoSavedGame_Gfx, (void *)BG_CHAR_ADDR(4), 0x7000);
DmaCopy16(3, gGBAButtonIcons_Pals, (void *)(OBJ_PLTT + 0xA0), 0x40);
DmaCopy16(3, gOptionsSprites_Gfx, (void *)OBJ_VRAM0 + 0x7000, 0x400);
}
sub_10AC0();
autoDisplayMenu = gAutoDisplayTitlescreenMenu;
if (autoDisplayMenu == 1)
{
gUnknown_202BE24 = 0;
gUnknown_2002888.unk9 = 0;
gUnknown_2002888.unkB = autoDisplayMenu;
gMain.subState = 3;
sub_CBC();
sub_FD5C(NULL);
}
else
{
gMain.subState = 1;
sub_CBC();
sub_FD5C(sub_11640);
}
m4aSongNumStart(1);
}

20
sym_ewram.txt
View File

@ -1,4 +1,8 @@
.space 0x2958
.space 0x2888
gUnknown_2002888: @ 0x2002888
.space 0xD0
gUnknown_02002958: @ 0x2002958
@ -8,9 +12,19 @@ gIntrTable: @ 0x2003060
.space 0x8060
gUnknown_0200B0C0: @ 0x200B0C0
gMain: @ 0x200B0C0
.space 0x26A70
.space 0xF3F4
gAutoDisplayTitlescreenMenu: @ 0x201A4B4
.space 4
.space 0x1196C
gUnknown_202BE24: @ 0x202BE24
.space 4
.space 0x5D08
gSoundInfo: @ 0x2031B30