mirror of
https://github.com/jiangzhengwenjz/katam.git
synced 2024-11-23 21:20:19 +00:00
Requested changes
This commit is contained in:
parent
e0c7e1e174
commit
00add3aeb2
132
asm/code.s
132
asm/code.s
@ -386,7 +386,7 @@ _080004E0:
|
||||
strh r0, [r1, #6]
|
||||
ldr r0, _08000690 @ =0x00001D09
|
||||
strh r0, [r1, #4]
|
||||
ldr r0, _08000694 @ =gOffsetRegs
|
||||
ldr r0, _08000694 @ =gBgScrollRegs
|
||||
strh r4, [r0]
|
||||
strh r4, [r0, #2]
|
||||
strh r4, [r0, #0xc]
|
||||
@ -590,7 +590,7 @@ _08000678:
|
||||
_08000688: .4byte gBgCntRegs
|
||||
_0800068C: .4byte 0x00001F03
|
||||
_08000690: .4byte 0x00001D09
|
||||
_08000694: .4byte gOffsetRegs
|
||||
_08000694: .4byte gBgScrollRegs
|
||||
_08000698: .4byte gUnk_03002E60
|
||||
_0800069C: .4byte gUnk_082D8D74
|
||||
_080006A0: .4byte gUnk_02028EE0
|
||||
@ -648,7 +648,7 @@ _0800071C:
|
||||
ldr r0, _08000788 @ =gBldRegs
|
||||
mov sb, r0
|
||||
adds r7, r4, #4
|
||||
ldr r5, _0800078C @ =gOffsetRegs
|
||||
ldr r5, _0800078C @ =gBgScrollRegs
|
||||
adds r0, r5, #2
|
||||
mov r8, r0
|
||||
ldr r0, _08000790 @ =gBgCntRegs
|
||||
@ -694,7 +694,7 @@ _0800073A:
|
||||
.align 2, 0
|
||||
_08000784: .4byte gDispCnt
|
||||
_08000788: .4byte gBldRegs
|
||||
_0800078C: .4byte gOffsetRegs
|
||||
_0800078C: .4byte gBgScrollRegs
|
||||
_08000790: .4byte gBgCntRegs
|
||||
_08000794: .4byte gUnk_03002E60
|
||||
|
||||
@ -743,7 +743,7 @@ _080007D4:
|
||||
mov sl, r0
|
||||
ldr r1, _0800089C @ =gBgCntRegs
|
||||
mov r8, r1
|
||||
ldr r4, _080008A0 @ =gOffsetRegs
|
||||
ldr r4, _080008A0 @ =gBgScrollRegs
|
||||
adds r7, r4, #2
|
||||
mov r6, ip
|
||||
adds r6, #4
|
||||
@ -824,7 +824,7 @@ _08000890: .4byte gUnk_082D8D74
|
||||
_08000894: .4byte gDispCnt
|
||||
_08000898: .4byte gBldRegs
|
||||
_0800089C: .4byte gBgCntRegs
|
||||
_080008A0: .4byte gOffsetRegs
|
||||
_080008A0: .4byte gBgScrollRegs
|
||||
_080008A4: .4byte gUnk_02023530
|
||||
_080008A8: .4byte 0x00007FFF
|
||||
|
||||
@ -921,7 +921,7 @@ _0800094E:
|
||||
lsls r1, r1, #1
|
||||
adds r0, r6, r1
|
||||
strh r5, [r0]
|
||||
ldr r4, _080009EC @ =gOffsetRegs
|
||||
ldr r4, _080009EC @ =gBgScrollRegs
|
||||
mov r2, r8
|
||||
strh r2, [r4, #0xc]
|
||||
strh r2, [r4, #0xe]
|
||||
@ -984,7 +984,7 @@ _080009DC: .4byte gUnk_089331AC
|
||||
_080009E0: .4byte 0x06008000
|
||||
_080009E4: .4byte gUnk_08D63288
|
||||
_080009E8: .4byte 0x00007FFF
|
||||
_080009EC: .4byte gOffsetRegs
|
||||
_080009EC: .4byte gBgScrollRegs
|
||||
_080009F0: .4byte 0x0000FFFF
|
||||
_080009F4:
|
||||
mov r2, sb
|
||||
@ -3072,7 +3072,7 @@ sub_080019F8: @ 0x080019F8
|
||||
strh r0, [r5, #0x32]
|
||||
strh r2, [r3]
|
||||
strh r2, [r1]
|
||||
ldr r3, _08001A9C @ =gOffsetRegs
|
||||
ldr r3, _08001A9C @ =gBgScrollRegs
|
||||
ldrh r2, [r5, #0x30]
|
||||
movs r1, #7
|
||||
adds r0, r1, #0
|
||||
@ -3120,7 +3120,7 @@ _08001A54:
|
||||
str r0, [r4, #0x38]
|
||||
b _08001AFE
|
||||
.align 2, 0
|
||||
_08001A9C: .4byte gOffsetRegs
|
||||
_08001A9C: .4byte gBgScrollRegs
|
||||
_08001AA0: .4byte gUnk_089331AC
|
||||
_08001AA4:
|
||||
ldr r1, [r4, #0xc]
|
||||
@ -3182,7 +3182,7 @@ _08001AFE:
|
||||
ldr r0, [r4, #0x38]
|
||||
asrs r3, r0, #8
|
||||
strh r3, [r6, #0x32]
|
||||
ldr r5, _08001B88 @ =gOffsetRegs
|
||||
ldr r5, _08001B88 @ =gBgScrollRegs
|
||||
strh r2, [r5]
|
||||
strh r3, [r5, #2]
|
||||
ldrh r1, [r6, #0x2e]
|
||||
@ -3236,7 +3236,7 @@ _08001B32:
|
||||
.align 2, 0
|
||||
_08001B80: .4byte 0xFFFF6000
|
||||
_08001B84: .4byte 0xFFFFF600
|
||||
_08001B88: .4byte gOffsetRegs
|
||||
_08001B88: .4byte gBgScrollRegs
|
||||
_08001B8C: .4byte gUnk_089331AC
|
||||
_08001B90:
|
||||
ldr r1, [r4, #0xc]
|
||||
@ -3300,7 +3300,7 @@ _08001BEA:
|
||||
asrs r3, r0, #8
|
||||
mov r1, r8
|
||||
strh r3, [r1, #0x32]
|
||||
ldr r4, _08001C3C @ =gOffsetRegs
|
||||
ldr r4, _08001C3C @ =gBgScrollRegs
|
||||
strh r2, [r4, #8]
|
||||
strh r3, [r4, #0xa]
|
||||
ldrh r1, [r1, #0x2e]
|
||||
@ -3325,7 +3325,7 @@ _08001C28:
|
||||
.align 2, 0
|
||||
_08001C34: .4byte 0xFFFF6000
|
||||
_08001C38: .4byte 0xFFFFF600
|
||||
_08001C3C: .4byte gOffsetRegs
|
||||
_08001C3C: .4byte gBgScrollRegs
|
||||
|
||||
thumb_func_start sub_08001C40
|
||||
sub_08001C40: @ 0x08001C40
|
||||
@ -55667,7 +55667,7 @@ _0801A50C:
|
||||
subs r0, #1
|
||||
strh r0, [r2, #4]
|
||||
_0801A52E:
|
||||
ldr r1, _0801A5B0 @ =gOffsetRegs
|
||||
ldr r1, _0801A5B0 @ =gBgScrollRegs
|
||||
ldrh r0, [r1, #8]
|
||||
adds r0, #2
|
||||
strh r0, [r1, #8]
|
||||
@ -55730,7 +55730,7 @@ _0801A59C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0801A5AC: .4byte gBldRegs
|
||||
_0801A5B0: .4byte gOffsetRegs
|
||||
_0801A5B0: .4byte gBgScrollRegs
|
||||
_0801A5B4: .4byte gUnk_02038580
|
||||
|
||||
thumb_func_start sub_0801A5B8
|
||||
@ -60347,7 +60347,7 @@ sub_0801C8DC: @ 0x0801C8DC
|
||||
adds r1, r3, #0
|
||||
orrs r0, r1
|
||||
strh r0, [r2]
|
||||
ldr r0, _0801C968 @ =gOffsetRegs
|
||||
ldr r0, _0801C968 @ =gBgScrollRegs
|
||||
movs r3, #0
|
||||
movs r1, #0
|
||||
strh r1, [r0, #0xc]
|
||||
@ -60405,7 +60405,7 @@ sub_0801C8DC: @ 0x0801C8DC
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0801C964: .4byte gDispCnt
|
||||
_0801C968: .4byte gOffsetRegs
|
||||
_0801C968: .4byte gBgScrollRegs
|
||||
_0801C96C: .4byte gBgCntRegs
|
||||
_0801C970: .4byte 0x00001E0A
|
||||
_0801C974: .4byte 0x06008000
|
||||
@ -60437,7 +60437,7 @@ sub_0801C990: @ 0x0801C990
|
||||
lsls r0, r0, #2
|
||||
adds r0, r0, r1
|
||||
ldr r7, [r0]
|
||||
ldr r1, _0801CA1C @ =gOffsetRegs
|
||||
ldr r1, _0801CA1C @ =gBgScrollRegs
|
||||
movs r0, #0
|
||||
strh r0, [r1]
|
||||
strh r0, [r1, #2]
|
||||
@ -60483,7 +60483,7 @@ _0801CA0C: .4byte gDispCnt
|
||||
_0801CA10: .4byte gUnk_08D64A24
|
||||
_0801CA14: .4byte gUnk_089331AC
|
||||
_0801CA18: .4byte 0x00007D46
|
||||
_0801CA1C: .4byte gOffsetRegs
|
||||
_0801CA1C: .4byte gBgScrollRegs
|
||||
_0801CA20: .4byte gBgCntRegs
|
||||
_0801CA24: .4byte 0x00001F03
|
||||
_0801CA28: .4byte 0x0600F800
|
||||
@ -62748,7 +62748,7 @@ _0801DAC0:
|
||||
str r2, [r1, #8]
|
||||
adds r0, r1, #0
|
||||
bl sub_08155128
|
||||
ldr r5, _0801DC34 @ =gOffsetRegs
|
||||
ldr r5, _0801DC34 @ =gBgScrollRegs
|
||||
strh r4, [r5, #0xc]
|
||||
strh r4, [r5, #0xe]
|
||||
ldr r6, _0801DC38 @ =gBgCntRegs
|
||||
@ -62855,7 +62855,7 @@ _0801DC24: .4byte sub_0801E030
|
||||
_0801DC28: .4byte 0x06012000
|
||||
_0801DC2C: .4byte 0x000002B9
|
||||
_0801DC30: .4byte 0x0000FFC0
|
||||
_0801DC34: .4byte gOffsetRegs
|
||||
_0801DC34: .4byte gBgScrollRegs
|
||||
_0801DC38: .4byte gBgCntRegs
|
||||
_0801DC3C: .4byte 0x00001E0A
|
||||
_0801DC40: .4byte 0x06008000
|
||||
@ -64321,7 +64321,7 @@ sub_0801E754: @ 0x0801E754
|
||||
movs r2, #0
|
||||
ldr r0, _0801E7C8 @ =0x00001F0B
|
||||
strh r0, [r1]
|
||||
ldr r0, _0801E7CC @ =gOffsetRegs
|
||||
ldr r0, _0801E7CC @ =gBgScrollRegs
|
||||
strh r2, [r0]
|
||||
strh r2, [r0, #2]
|
||||
ldr r5, _0801E7D0 @ =gUnk_03002440
|
||||
@ -64348,7 +64348,7 @@ _0801E7BC: .4byte gUnk_082DE8AC
|
||||
_0801E7C0: .4byte gUnk_08D60A80
|
||||
_0801E7C4: .4byte gBgCntRegs
|
||||
_0801E7C8: .4byte 0x00001F0B
|
||||
_0801E7CC: .4byte gOffsetRegs
|
||||
_0801E7CC: .4byte gBgScrollRegs
|
||||
_0801E7D0: .4byte gUnk_03002440
|
||||
_0801E7D4: .4byte gUnk_082D7850
|
||||
_0801E7D8:
|
||||
@ -64418,7 +64418,7 @@ _0801E818:
|
||||
movs r4, #0
|
||||
ldr r1, _0801E98C @ =0x00001E0E
|
||||
strh r1, [r6, #2]
|
||||
ldr r5, _0801E990 @ =gOffsetRegs
|
||||
ldr r5, _0801E990 @ =gBgScrollRegs
|
||||
strh r4, [r5, #4]
|
||||
ldr r1, _0801E994 @ =0x0600CC80
|
||||
bl LZ77UnCompVram
|
||||
@ -64563,7 +64563,7 @@ _0801E980: .4byte gUnk_082DE93C
|
||||
_0801E984: .4byte gUnk_08D60A80
|
||||
_0801E988: .4byte gBgCntRegs
|
||||
_0801E98C: .4byte 0x00001E0E
|
||||
_0801E990: .4byte gOffsetRegs
|
||||
_0801E990: .4byte gBgScrollRegs
|
||||
_0801E994: .4byte 0x0600CC80
|
||||
_0801E998: .4byte 0x0600DF20
|
||||
_0801E99C: .4byte 0x85000008
|
||||
@ -65061,7 +65061,7 @@ sub_0801ED94: @ 0x0801ED94
|
||||
movs r2, #0
|
||||
ldr r0, _0801EDCC @ =0x00001F0A
|
||||
strh r0, [r3]
|
||||
ldr r1, _0801EDD0 @ =gOffsetRegs
|
||||
ldr r1, _0801EDD0 @ =gBgScrollRegs
|
||||
strh r2, [r1]
|
||||
strh r2, [r1, #2]
|
||||
movs r0, #0xa8
|
||||
@ -65076,7 +65076,7 @@ sub_0801ED94: @ 0x0801ED94
|
||||
_0801EDC4: .4byte gDispCnt
|
||||
_0801EDC8: .4byte gBgCntRegs
|
||||
_0801EDCC: .4byte 0x00001F0A
|
||||
_0801EDD0: .4byte gOffsetRegs
|
||||
_0801EDD0: .4byte gBgScrollRegs
|
||||
_0801EDD4: .4byte 0x00001C0D
|
||||
_0801EDD8:
|
||||
ldr r0, _0801EDF0 @ =0x00001C01
|
||||
@ -65732,7 +65732,7 @@ sub_0801F2E8: @ 0x0801F2E8
|
||||
movs r2, #0
|
||||
ldr r0, _0801F320 @ =0x00001F0A
|
||||
strh r0, [r3]
|
||||
ldr r1, _0801F324 @ =gOffsetRegs
|
||||
ldr r1, _0801F324 @ =gBgScrollRegs
|
||||
strh r2, [r1]
|
||||
strh r2, [r1, #2]
|
||||
movs r0, #0xa8
|
||||
@ -65747,7 +65747,7 @@ sub_0801F2E8: @ 0x0801F2E8
|
||||
_0801F318: .4byte gDispCnt
|
||||
_0801F31C: .4byte gBgCntRegs
|
||||
_0801F320: .4byte 0x00001F0A
|
||||
_0801F324: .4byte gOffsetRegs
|
||||
_0801F324: .4byte gBgScrollRegs
|
||||
_0801F328: .4byte 0x00001C0D
|
||||
_0801F32C:
|
||||
ldr r0, _0801F344 @ =0x00001C01
|
||||
@ -66501,7 +66501,7 @@ sub_0801F8EC: @ 0x0801F8EC
|
||||
movs r4, #0
|
||||
ldr r1, _0801F9D0 @ =0x00001E0E
|
||||
strh r1, [r2, #2]
|
||||
ldr r1, _0801F9D4 @ =gOffsetRegs
|
||||
ldr r1, _0801F9D4 @ =gBgScrollRegs
|
||||
strh r4, [r1, #4]
|
||||
ldr r1, _0801F9D8 @ =0x0600CC80
|
||||
bl LZ77UnCompVram
|
||||
@ -66584,7 +66584,7 @@ _0801F9C4: .4byte gUnk_082DE96C
|
||||
_0801F9C8: .4byte gUnk_08D60A80
|
||||
_0801F9CC: .4byte gBgCntRegs
|
||||
_0801F9D0: .4byte 0x00001E0E
|
||||
_0801F9D4: .4byte gOffsetRegs
|
||||
_0801F9D4: .4byte gBgScrollRegs
|
||||
_0801F9D8: .4byte 0x0600CC80
|
||||
_0801F9DC: .4byte 0x040000D4
|
||||
_0801F9E0: .4byte 0x0600DF20
|
||||
@ -67244,7 +67244,7 @@ sub_0801FEC0: @ 0x0801FEC0
|
||||
ldr r2, _0801FEF0 @ =0x0000F9FF
|
||||
ands r1, r2
|
||||
strh r1, [r3]
|
||||
ldr r2, _0801FEF4 @ =gOffsetRegs
|
||||
ldr r2, _0801FEF4 @ =gBgScrollRegs
|
||||
movs r1, #0
|
||||
strh r1, [r2, #8]
|
||||
strh r1, [r2, #0xa]
|
||||
@ -67259,7 +67259,7 @@ sub_0801FEC0: @ 0x0801FEC0
|
||||
.align 2, 0
|
||||
_0801FEEC: .4byte gDispCnt
|
||||
_0801FEF0: .4byte 0x0000F9FF
|
||||
_0801FEF4: .4byte gOffsetRegs
|
||||
_0801FEF4: .4byte gBgScrollRegs
|
||||
_0801FEF8: .4byte sub_0801F8EC
|
||||
|
||||
thumb_func_start sub_0801FEFC
|
||||
@ -78957,7 +78957,7 @@ sub_080257A8: @ 0x080257A8
|
||||
ldr r1, _080258DC @ =0x00001F03
|
||||
ldr r2, _080258E0 @ =gBgCntRegs
|
||||
strh r1, [r2]
|
||||
ldr r1, _080258E4 @ =gOffsetRegs
|
||||
ldr r1, _080258E4 @ =gBgScrollRegs
|
||||
mov r8, r1
|
||||
strh r4, [r1]
|
||||
strh r4, [r1, #2]
|
||||
@ -79086,7 +79086,7 @@ _080258D4: .4byte gBldRegs
|
||||
_080258D8: .4byte gDispCnt
|
||||
_080258DC: .4byte 0x00001F03
|
||||
_080258E0: .4byte gBgCntRegs
|
||||
_080258E4: .4byte gOffsetRegs
|
||||
_080258E4: .4byte gBgScrollRegs
|
||||
_080258E8: .4byte 0x0600F800
|
||||
_080258EC: .4byte 0x0000028A
|
||||
_080258F0: .4byte 0x00007FFF
|
||||
@ -79123,7 +79123,7 @@ sub_08025914: @ 0x08025914
|
||||
ldr r1, _08025A48 @ =0x00001F03
|
||||
ldr r2, _08025A4C @ =gBgCntRegs
|
||||
strh r1, [r2]
|
||||
ldr r1, _08025A50 @ =gOffsetRegs
|
||||
ldr r1, _08025A50 @ =gBgScrollRegs
|
||||
mov r8, r1
|
||||
strh r4, [r1]
|
||||
strh r4, [r1, #2]
|
||||
@ -79252,7 +79252,7 @@ _08025A40: .4byte gBldRegs
|
||||
_08025A44: .4byte gDispCnt
|
||||
_08025A48: .4byte 0x00001F03
|
||||
_08025A4C: .4byte gBgCntRegs
|
||||
_08025A50: .4byte gOffsetRegs
|
||||
_08025A50: .4byte gBgScrollRegs
|
||||
_08025A54: .4byte 0x0600F800
|
||||
_08025A58: .4byte 0x0000028B
|
||||
_08025A5C: .4byte 0x00007FFF
|
||||
@ -81029,7 +81029,7 @@ _080267D8:
|
||||
ldr r0, [r2]
|
||||
adds r0, r0, r1
|
||||
str r0, [r2]
|
||||
ldr r1, _08026888 @ =gOffsetRegs
|
||||
ldr r1, _08026888 @ =gBgScrollRegs
|
||||
ldr r0, [r3]
|
||||
asrs r0, r0, #8
|
||||
strh r0, [r1, #4]
|
||||
@ -81085,7 +81085,7 @@ _08026878: .4byte 0x040000D4
|
||||
_0802687C: .4byte gUnk_03003860
|
||||
_08026880: .4byte 0x0000035E
|
||||
_08026884: .4byte 0x000002E2
|
||||
_08026888: .4byte gOffsetRegs
|
||||
_08026888: .4byte gBgScrollRegs
|
||||
_0802688C: .4byte gUnk_08D5FE14
|
||||
_08026890: .4byte 0x0000034E
|
||||
_08026894: .4byte 0x000003FF
|
||||
@ -81270,7 +81270,7 @@ sub_08026940: @ 0x08026940
|
||||
movs r2, #0xca
|
||||
lsls r2, r2, #1
|
||||
adds r4, r7, r2
|
||||
ldr r0, _08026B40 @ =gOffsetRegs
|
||||
ldr r0, _08026B40 @ =gBgScrollRegs
|
||||
mov sb, r0
|
||||
strh r5, [r0, #4]
|
||||
strh r5, [r0, #6]
|
||||
@ -81414,7 +81414,7 @@ sub_08026940: @ 0x08026940
|
||||
_08026B34: .4byte gDispCnt
|
||||
_08026B38: .4byte 0x0000039D
|
||||
_08026B3C: .4byte 0x00002020
|
||||
_08026B40: .4byte gOffsetRegs
|
||||
_08026B40: .4byte gBgScrollRegs
|
||||
_08026B44: .4byte 0x00001F02
|
||||
_08026B48: .4byte gBgCntRegs
|
||||
_08026B4C: .4byte 0x0600F800
|
||||
@ -81610,7 +81610,7 @@ sub_08026CC0: @ 0x08026CC0
|
||||
lsls r0, r0, #2
|
||||
adds r0, r0, r1
|
||||
ldr r5, [r0]
|
||||
ldr r1, _08026D50 @ =gOffsetRegs
|
||||
ldr r1, _08026D50 @ =gBgScrollRegs
|
||||
movs r0, #0
|
||||
strh r0, [r1, #8]
|
||||
strh r0, [r1, #0xa]
|
||||
@ -81655,7 +81655,7 @@ _08026D40: .4byte 0x0000F9FF
|
||||
_08026D44: .4byte gUnk_08D64A24
|
||||
_08026D48: .4byte gUnk_089331AC
|
||||
_08026D4C: .4byte 0x00008E4E
|
||||
_08026D50: .4byte gOffsetRegs
|
||||
_08026D50: .4byte gBgScrollRegs
|
||||
_08026D54: .4byte gBgCntRegs
|
||||
_08026D58: .4byte 0x00001E07
|
||||
_08026D5C: .4byte 0x06004000
|
||||
@ -82169,7 +82169,7 @@ sub_08027108: @ 0x08027108
|
||||
movs r2, #0xca
|
||||
lsls r2, r2, #1
|
||||
adds r4, r5, r2
|
||||
ldr r0, _080271EC @ =gOffsetRegs
|
||||
ldr r0, _080271EC @ =gBgScrollRegs
|
||||
strh r1, [r0, #4]
|
||||
strh r1, [r0, #6]
|
||||
ldr r2, _080271F0 @ =gBgCntRegs
|
||||
@ -82231,7 +82231,7 @@ _080271DC: .4byte 0xFFFF8FFF
|
||||
_080271E0: .4byte 0xFFFC7FFF
|
||||
_080271E4: .4byte 0xFEFFFFFF
|
||||
_080271E8: .4byte 0x000002E2
|
||||
_080271EC: .4byte gOffsetRegs
|
||||
_080271EC: .4byte gBgScrollRegs
|
||||
_080271F0: .4byte gBgCntRegs
|
||||
_080271F4: .4byte 0x00001F02
|
||||
_080271F8: .4byte 0x0600F800
|
||||
@ -82547,7 +82547,7 @@ sub_08027444: @ 0x08027444
|
||||
movs r0, #0xea
|
||||
lsls r0, r0, #1
|
||||
adds r4, r6, r0
|
||||
ldr r0, _08027508 @ =gOffsetRegs
|
||||
ldr r0, _08027508 @ =gBgScrollRegs
|
||||
strh r5, [r0, #8]
|
||||
strh r5, [r0, #0xa]
|
||||
ldr r1, _0802750C @ =gBgCntRegs
|
||||
@ -82618,7 +82618,7 @@ sub_08027444: @ 0x08027444
|
||||
_080274FC: .4byte gDispCnt
|
||||
_08027500: .4byte 0x0000FDFF
|
||||
_08027504: .4byte gBldRegs
|
||||
_08027508: .4byte gOffsetRegs
|
||||
_08027508: .4byte gBgScrollRegs
|
||||
_0802750C: .4byte gBgCntRegs
|
||||
_08027510: .4byte 0x00001E07
|
||||
_08027514: .4byte 0x06004000
|
||||
@ -86281,7 +86281,7 @@ _080291CC:
|
||||
adds r0, r0, r1
|
||||
ldr r0, [r0]
|
||||
mov r8, r0
|
||||
ldr r1, _08029468 @ =gOffsetRegs
|
||||
ldr r1, _08029468 @ =gBgScrollRegs
|
||||
movs r0, #0
|
||||
strh r0, [r1, #8]
|
||||
strh r0, [r1, #0xa]
|
||||
@ -86587,7 +86587,7 @@ _08029458: .4byte gBgPalette
|
||||
_0802945C: .4byte gUnk_08D64A24
|
||||
_08029460: .4byte gUnk_089331AC
|
||||
_08029464: .4byte 0x00008E4E
|
||||
_08029468: .4byte gOffsetRegs
|
||||
_08029468: .4byte gBgScrollRegs
|
||||
_0802946C: .4byte gBgCntRegs
|
||||
_08029470: .4byte 0x00001E07
|
||||
_08029474: .4byte 0x06004000
|
||||
@ -86920,7 +86920,7 @@ sub_080296EC: @ 0x080296EC
|
||||
lsls r0, r0, #2
|
||||
adds r0, r0, r1
|
||||
ldrh r2, [r0]
|
||||
ldr r0, _080297DC @ =gOffsetRegs
|
||||
ldr r0, _080297DC @ =gBgScrollRegs
|
||||
strh r5, [r0]
|
||||
strh r5, [r0, #2]
|
||||
ldr r1, _080297E0 @ =gBgCntRegs
|
||||
@ -87000,7 +87000,7 @@ _080297C8:
|
||||
_080297D0: .4byte gDispCnt
|
||||
_080297D4: .4byte gBldRegs
|
||||
_080297D8: .4byte 0x00000641
|
||||
_080297DC: .4byte gOffsetRegs
|
||||
_080297DC: .4byte gBgScrollRegs
|
||||
_080297E0: .4byte gBgCntRegs
|
||||
_080297E4: .4byte 0x00001D0D
|
||||
_080297E8: .4byte 0x0600C000
|
||||
@ -91612,7 +91612,7 @@ _0802BAEA:
|
||||
ldr r0, [r2]
|
||||
subs r0, r0, r1
|
||||
str r0, [r2]
|
||||
ldr r1, _0802BB88 @ =gOffsetRegs
|
||||
ldr r1, _0802BB88 @ =gBgScrollRegs
|
||||
asrs r0, r0, #9
|
||||
strh r0, [r1]
|
||||
_0802BB12:
|
||||
@ -91673,7 +91673,7 @@ _0802BB12:
|
||||
.align 2, 0
|
||||
_0802BB80: .4byte gUnk_030039FC
|
||||
_0802BB84: .4byte gUnk_0300000C
|
||||
_0802BB88: .4byte gOffsetRegs
|
||||
_0802BB88: .4byte gBgScrollRegs
|
||||
_0802BB8C: .4byte 0x000002BA
|
||||
_0802BB90: .4byte gUnk_030068D8
|
||||
_0802BB94: .4byte 0x00196225
|
||||
@ -91853,7 +91853,7 @@ sub_0802BCEC: @ 0x0802BCEC
|
||||
movs r5, #0xca
|
||||
lsls r5, r5, #1
|
||||
adds r4, r7, r5
|
||||
ldr r0, _0802BE08 @ =gOffsetRegs
|
||||
ldr r0, _0802BE08 @ =gBgScrollRegs
|
||||
movs r3, #0
|
||||
movs r2, #0
|
||||
strh r2, [r0]
|
||||
@ -91979,7 +91979,7 @@ _0802BD74:
|
||||
b _0802BE70
|
||||
.align 2, 0
|
||||
_0802BE04: .4byte gDispCnt
|
||||
_0802BE08: .4byte gOffsetRegs
|
||||
_0802BE08: .4byte gBgScrollRegs
|
||||
_0802BE0C: .4byte gBgCntRegs
|
||||
_0802BE10: .4byte 0x00001F0A
|
||||
_0802BE14: .4byte 0x06008000
|
||||
@ -92988,7 +92988,7 @@ sub_0802C5E4: @ 0x0802C5E4
|
||||
movs r0, #0xca
|
||||
lsls r0, r0, #1
|
||||
adds r4, r5, r0
|
||||
ldr r0, _0802C664 @ =gOffsetRegs
|
||||
ldr r0, _0802C664 @ =gBgScrollRegs
|
||||
movs r3, #0
|
||||
movs r1, #0
|
||||
strh r1, [r0]
|
||||
@ -93045,7 +93045,7 @@ sub_0802C5E4: @ 0x0802C5E4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0802C664: .4byte gOffsetRegs
|
||||
_0802C664: .4byte gBgScrollRegs
|
||||
_0802C668: .4byte gBgCntRegs
|
||||
_0802C66C: .4byte 0x00001F0A
|
||||
_0802C670: .4byte 0x06008000
|
||||
@ -93070,7 +93070,7 @@ sub_0802C68C: @ 0x0802C68C
|
||||
lsls r0, r0, #2
|
||||
adds r0, r0, r1
|
||||
ldr r5, [r0]
|
||||
ldr r1, _0802C70C @ =gOffsetRegs
|
||||
ldr r1, _0802C70C @ =gBgScrollRegs
|
||||
movs r0, #0
|
||||
strh r0, [r1, #4]
|
||||
strh r0, [r1, #6]
|
||||
@ -93117,7 +93117,7 @@ _0802C6C8:
|
||||
_0802C700: .4byte gUnk_08D64A24
|
||||
_0802C704: .4byte gUnk_089331AC
|
||||
_0802C708: .4byte 0x00007D46
|
||||
_0802C70C: .4byte gOffsetRegs
|
||||
_0802C70C: .4byte gBgScrollRegs
|
||||
_0802C710: .4byte gBgCntRegs
|
||||
_0802C714: .4byte 0x00001E03
|
||||
_0802C718: .4byte 0x0600F000
|
||||
@ -93177,7 +93177,7 @@ sub_0802C770: @ 0x0802C770
|
||||
adds r1, r3, #0
|
||||
orrs r0, r1
|
||||
strh r0, [r2]
|
||||
ldr r6, _0802C8A8 @ =gOffsetRegs
|
||||
ldr r6, _0802C8A8 @ =gBgScrollRegs
|
||||
movs r0, #0
|
||||
mov r8, r0
|
||||
movs r4, #0
|
||||
@ -93315,7 +93315,7 @@ sub_0802C770: @ 0x0802C770
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0802C8A4: .4byte gDispCnt
|
||||
_0802C8A8: .4byte gOffsetRegs
|
||||
_0802C8A8: .4byte gBgScrollRegs
|
||||
_0802C8AC: .4byte 0x00001F09
|
||||
_0802C8B0: .4byte gBgCntRegs
|
||||
_0802C8B4: .4byte 0x06008000
|
||||
@ -93803,7 +93803,7 @@ sub_0802CC7C: @ 0x0802CC7C
|
||||
adds r1, r1, r0
|
||||
adds r1, r1, r3
|
||||
ldrh r2, [r1]
|
||||
ldr r0, _0802CD78 @ =gOffsetRegs
|
||||
ldr r0, _0802CD78 @ =gBgScrollRegs
|
||||
strh r5, [r0, #8]
|
||||
strh r5, [r0, #0xa]
|
||||
ldr r1, _0802CD7C @ =gBgCntRegs
|
||||
@ -93888,7 +93888,7 @@ _0802CD68: .4byte gBldRegs
|
||||
_0802CD6C: .4byte 0x00001344
|
||||
_0802CD70: .4byte gUnk_082EB640
|
||||
_0802CD74: .4byte gUnk_08D60A80
|
||||
_0802CD78: .4byte gOffsetRegs
|
||||
_0802CD78: .4byte gBgScrollRegs
|
||||
_0802CD7C: .4byte gBgCntRegs
|
||||
_0802CD80: .4byte 0x0600E800
|
||||
_0802CD84: .4byte 0x00007FFF
|
||||
@ -96686,7 +96686,7 @@ _0802E1C8:
|
||||
lsls r0, r0, #1
|
||||
adds r0, r0, r2
|
||||
ldrh r3, [r0]
|
||||
ldr r0, _0802E254 @ =gOffsetRegs
|
||||
ldr r0, _0802E254 @ =gBgScrollRegs
|
||||
strh r1, [r0, #0xc]
|
||||
strh r1, [r0, #0xe]
|
||||
ldr r2, _0802E258 @ =gBgCntRegs
|
||||
@ -96739,7 +96739,7 @@ _0802E1C8:
|
||||
_0802E248: .4byte sub_0802E3C8
|
||||
_0802E24C: .4byte gUnk_082EB6D0
|
||||
_0802E250: .4byte gUnk_08D60A80
|
||||
_0802E254: .4byte gOffsetRegs
|
||||
_0802E254: .4byte gBgScrollRegs
|
||||
_0802E258: .4byte gBgCntRegs
|
||||
_0802E25C: .4byte 0x00001E0A
|
||||
_0802E260: .4byte 0x06008000
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1638,7 +1638,7 @@ _08153654:
|
||||
movs r0, #0x40
|
||||
ands r0, r2
|
||||
ldrh r3, [r6, #0x30]
|
||||
ldr r1, _08153724 @ =gOffsetRegs
|
||||
ldr r1, _08153724 @ =gBgScrollRegs
|
||||
mov sb, r1
|
||||
lsls r4, r4, #2
|
||||
mov r8, r4
|
||||
@ -1746,7 +1746,7 @@ _081536DE:
|
||||
mov r8, r0
|
||||
b _0815372C
|
||||
.align 2, 0
|
||||
_08153724: .4byte gOffsetRegs
|
||||
_08153724: .4byte gBgScrollRegs
|
||||
_08153728:
|
||||
movs r2, #0
|
||||
mov r8, r2
|
||||
@ -3190,7 +3190,7 @@ _081541CE:
|
||||
subs r0, r0, r1
|
||||
movs r1, #0x10
|
||||
bl Mod
|
||||
ldr r4, _08154268 @ =gOffsetRegs
|
||||
ldr r4, _08154268 @ =gBgScrollRegs
|
||||
lsls r5, r7, #2
|
||||
adds r1, r5, r4
|
||||
strh r0, [r1]
|
||||
@ -3259,7 +3259,7 @@ _08154234:
|
||||
.align 2, 0
|
||||
_08154260: .4byte gUnk_03003674
|
||||
_08154264: .4byte gDispCnt
|
||||
_08154268: .4byte gOffsetRegs
|
||||
_08154268: .4byte gBgScrollRegs
|
||||
_0815426C: .4byte gBgCntRegs
|
||||
_08154270: .4byte 0x0000FFFC
|
||||
_08154274: .4byte 0xFBFFFFFF
|
||||
|
@ -18,7 +18,7 @@ struct Unk_030023F4 {
|
||||
u16 unk2;
|
||||
};
|
||||
|
||||
struct TransformRegs {
|
||||
struct BgAffineRegs {
|
||||
u16 unk0;
|
||||
u16 unk2;
|
||||
u16 unk4;
|
||||
@ -62,7 +62,7 @@ extern u8 gUnk_030024E4;
|
||||
extern u16 gBldRegs[3];
|
||||
extern u8 gUnk_030024F0;
|
||||
extern u8 gUnk_03002514;
|
||||
extern struct TransformRegs gTransformRegs;
|
||||
extern struct BgAffineRegs gBgAffineRegs;
|
||||
extern u32 gUnk_03002540;
|
||||
extern u16 gUnk_03002544;
|
||||
extern u8 gUnk_03002548;
|
||||
@ -71,7 +71,7 @@ extern u8 gUnk_03002550;
|
||||
extern u32 gUnk_03002554;
|
||||
extern u8 gUnk_03002558;
|
||||
extern u8 gUnk_03002760[2][0x280];
|
||||
extern u8 gObjPalette[0x200];
|
||||
extern u16 gObjPalette[0x100];
|
||||
extern u32 gUnk_03002E64;
|
||||
extern u16 gWinRegs[6];
|
||||
extern u8 gUnk_03002E80[];
|
||||
@ -89,14 +89,14 @@ extern u8 gUnk_030035E0[];
|
||||
extern u16 gUnk_030035EC;
|
||||
extern u32 gUnk_03003670;
|
||||
extern u16 gUnk_0300367C;
|
||||
extern u16 gOffsetRegs[8];
|
||||
extern u16 gBgScrollRegs[8];
|
||||
extern u16 gDispCnt;
|
||||
extern u8 gUnk_030036A0[];
|
||||
extern u8 gUnk_030036B0[];
|
||||
extern u8 gUnk_030036C4;
|
||||
extern u32 gUnk_030036C8;
|
||||
extern u8 gUnk_03003790;
|
||||
extern u8 gBgPalette[0x200];
|
||||
extern u16 gBgPalette[0x100];
|
||||
extern u8 gUnk_030039A0;
|
||||
extern u8 gUnk_030039A4;
|
||||
extern u16 gPrevInput;
|
||||
@ -111,7 +111,7 @@ extern u8 gUnk_03006078;
|
||||
extern u8 gUnk_0300607C;
|
||||
extern u8 gUnk_03006080[];
|
||||
extern u32 gUnk_030060A0;
|
||||
extern u8 gOamBuffer[0x200];
|
||||
extern u8 gOamBuffer[OAM_SIZE];
|
||||
extern u8 gUnk_030068B0;
|
||||
extern u16 gUnk_030068B4;
|
||||
extern u16 gUnk_030068B8;
|
||||
@ -123,9 +123,6 @@ extern struct Unk_03006CB0 gUnk_03006CB0;
|
||||
extern IntrFunc gIntrTable[];
|
||||
extern IntrFunc gUnk_030017F0;
|
||||
|
||||
extern const u8 RomHeaderMagic;
|
||||
extern const u32 RomHeaderGameCode;
|
||||
|
||||
extern void GameLoop(void);
|
||||
extern void sub_08151DC4(void);
|
||||
extern void GameInit(void);
|
||||
|
@ -177,7 +177,7 @@ SECTIONS {
|
||||
. = 0x000024F0; gUnk_030024F0 = .;
|
||||
. = 0x00002500; gUnk_03002500 = .;
|
||||
. = 0x00002514; gUnk_03002514 = .;
|
||||
. = 0x00002520; gTransformRegs = .;
|
||||
. = 0x00002520; gBgAffineRegs = .;
|
||||
. = 0x00002540; gUnk_03002540 = .;
|
||||
. = 0x00002544; gUnk_03002544 = .;
|
||||
. = 0x00002548; gUnk_03002548 = .;
|
||||
@ -220,7 +220,7 @@ SECTIONS {
|
||||
. = 0x00003674; gUnk_03003674 = .;
|
||||
. = 0x00003678; gUnk_03003678 = .;
|
||||
. = 0x0000367C; gUnk_0300367C = .;
|
||||
. = 0x00003680; gOffsetRegs = .;
|
||||
. = 0x00003680; gBgScrollRegs = .;
|
||||
. = 0x00003690; gDispCnt = .;
|
||||
. = 0x000036A0; gUnk_030036A0 = .;
|
||||
. = 0x000036B0; gUnk_030036B0 = .;
|
||||
|
58
src/main.c
58
src/main.c
@ -8,6 +8,8 @@
|
||||
#define GetBit(x, y) ((x) >> (y) & 1)
|
||||
extern FuncType_08D5FDD4 const gUnk_08D5FDD4[];
|
||||
extern IntrFunc const gIntrTableTemplate[];
|
||||
extern const u8 RomHeaderMagic;
|
||||
extern const u32 RomHeaderGameCode;
|
||||
|
||||
void GameInit(void) {
|
||||
s16 i;
|
||||
@ -21,7 +23,7 @@ void GameInit(void) {
|
||||
gUnk_03002440 = 0x200;
|
||||
}
|
||||
|
||||
if (gInput == 0xf) {
|
||||
if (gInput == (START_BUTTON | SELECT_BUTTON | B_BUTTON | A_BUTTON)) {
|
||||
gUnk_03002440 |= 0x1000;
|
||||
}
|
||||
else {
|
||||
@ -43,16 +45,16 @@ void GameInit(void) {
|
||||
DmaFill32(3, 0, gUnk_03002E80, 0x10);
|
||||
DmaWait(3);
|
||||
gUnk_030060A0 = 0;
|
||||
DmaFill32(3, 0, gOffsetRegs, 0x10);
|
||||
DmaFill32(3, 0, gBgScrollRegs, sizeof(gBgScrollRegs));
|
||||
DmaWait(3);
|
||||
gUnk_030023F4.unk0 = 0;
|
||||
gUnk_030023F4.unk2 = 0;
|
||||
gDispCnt = 0x80;
|
||||
gDispCnt = DISPCNT_FORCED_BLANK;
|
||||
DmaFill32(3, 0, gUnk_03002EC0, 0x300);
|
||||
DmaWait(3);
|
||||
gUnk_030024F0 = 0;
|
||||
gUnk_03003A00 = 0;
|
||||
DmaFill16(3, 0x200, gOamBuffer, 0x400);
|
||||
DmaFill16(3, 0x200, gOamBuffer, OAM_SIZE);
|
||||
DmaWait(3);
|
||||
DmaFill16(3, 0x200, gUnk_030031C0, 0x400);
|
||||
DmaWait(3);
|
||||
@ -60,23 +62,23 @@ void GameInit(void) {
|
||||
DmaWait(3);
|
||||
DmaFill32(3, ~0, gUnk_03006080, 0x20);
|
||||
DmaWait(3);
|
||||
DmaFill32(3, 0, gObjPalette, 0x200);
|
||||
DmaFill32(3, 0, gObjPalette, OBJ_PLTT_SIZE);
|
||||
DmaWait(3);
|
||||
DmaFill32(3, 0, gBgPalette, 0x200);
|
||||
DmaFill32(3, 0, gBgPalette, BG_PLTT_SIZE);
|
||||
DmaWait(3);
|
||||
sub_08158870();
|
||||
gTransformRegs.unk0 = 0x100;
|
||||
gTransformRegs.unk2 = 0;
|
||||
gTransformRegs.unk4 = 0;
|
||||
gTransformRegs.unk6 = 0x100;
|
||||
gTransformRegs.unk8 = 0;
|
||||
gTransformRegs.unkC = 0;
|
||||
gTransformRegs.unk10 = 0x100;
|
||||
gTransformRegs.unk12 = 0;
|
||||
gTransformRegs.unk14 = 0;
|
||||
gTransformRegs.unk16 = 0x100;
|
||||
gTransformRegs.unk18 = 0;
|
||||
gTransformRegs.unk1C = 0;
|
||||
gBgAffineRegs.unk0 = 0x100;
|
||||
gBgAffineRegs.unk2 = 0;
|
||||
gBgAffineRegs.unk4 = 0;
|
||||
gBgAffineRegs.unk6 = 0x100;
|
||||
gBgAffineRegs.unk8 = 0;
|
||||
gBgAffineRegs.unkC = 0;
|
||||
gBgAffineRegs.unk10 = 0x100;
|
||||
gBgAffineRegs.unk12 = 0;
|
||||
gBgAffineRegs.unk14 = 0;
|
||||
gBgAffineRegs.unk16 = 0x100;
|
||||
gBgAffineRegs.unk18 = 0;
|
||||
gBgAffineRegs.unk1C = 0;
|
||||
gUnk_03002514 = 0;
|
||||
gUnk_03002544 = 0;
|
||||
gUnk_030023F0 = 0x100;
|
||||
@ -244,10 +246,10 @@ void sub_08151DC4(void) {
|
||||
gUnk_03002440 ^= 2;
|
||||
}
|
||||
|
||||
DmaCopy32(3, gWinRegs, (void*)REG_ADDR_WIN0H, 0xc);
|
||||
DmaCopy16(3, gBldRegs, (void*)REG_ADDR_BLDCNT, 6);
|
||||
DmaCopy16(3, gOffsetRegs, (void*)REG_ADDR_BG0HOFS, 0x10);
|
||||
DmaCopy32(3, &gTransformRegs, (void*)REG_ADDR_BG2PA, sizeof(gTransformRegs));
|
||||
DmaCopy32(3, gWinRegs, (void*)REG_ADDR_WIN0H, sizeof(gWinRegs));
|
||||
DmaCopy16(3, gBldRegs, (void*)REG_ADDR_BLDCNT, sizeof(gBldRegs));
|
||||
DmaCopy16(3, gBgScrollRegs, (void*)REG_ADDR_BG0HOFS, sizeof(gBgScrollRegs));
|
||||
DmaCopy32(3, &gBgAffineRegs, (void*)REG_ADDR_BG2PA, sizeof(gBgAffineRegs));
|
||||
|
||||
if (gUnk_03002440 & 8) {
|
||||
REG_IE |= INTR_FLAG_HBLANK;
|
||||
@ -330,7 +332,7 @@ void sub_08152098(void) {
|
||||
void sub_08152178(void) {
|
||||
u8 i, j = 0;
|
||||
REG_DISPCNT = gDispCnt;
|
||||
CpuCopy32(gBgCntRegs, (void*)REG_ADDR_BG0CNT, 8);
|
||||
CpuCopy32(gBgCntRegs, (void*)REG_ADDR_BG0CNT, sizeof(gBgCntRegs));
|
||||
|
||||
if (gUnk_03002440 & 1) {
|
||||
CpuFastCopy(gBgPalette, (void*)BG_PLTT, BG_PLTT_SIZE);
|
||||
@ -342,10 +344,10 @@ void sub_08152178(void) {
|
||||
gUnk_03002440 ^= 2;
|
||||
}
|
||||
|
||||
CpuCopy32(gWinRegs, (void*)REG_ADDR_WIN0H, 0xc);
|
||||
CpuCopy16(gBldRegs, (void*)REG_ADDR_BLDCNT, 6);
|
||||
CpuCopy16(gOffsetRegs, (void*)REG_ADDR_BG0HOFS, 0x10);
|
||||
CpuCopy32(&gTransformRegs, (void*)REG_ADDR_BG2PA, sizeof(gTransformRegs));
|
||||
CpuCopy32(gWinRegs, (void*)REG_ADDR_WIN0H, sizeof(gWinRegs));
|
||||
CpuCopy16(gBldRegs, (void*)REG_ADDR_BLDCNT, sizeof(gBldRegs));
|
||||
CpuCopy16(gBgScrollRegs, (void*)REG_ADDR_BG0HOFS, sizeof(gBgScrollRegs));
|
||||
CpuCopy32(&gBgAffineRegs, (void*)REG_ADDR_BG2PA, sizeof(gBgAffineRegs));
|
||||
|
||||
if (gUnk_03002440 & 8) {
|
||||
REG_IE |= INTR_FLAG_HBLANK;
|
||||
@ -630,7 +632,7 @@ void sub_08152968(void) {
|
||||
}
|
||||
|
||||
gUnk_03002440 &= ~4;
|
||||
CpuFastFill(0x200, gOamBuffer, 0x400);
|
||||
CpuFastFill(0x200, gOamBuffer, OAM_SIZE);
|
||||
gUnk_03006070 = 0;
|
||||
gUnk_03002440 &= ~0x10;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user