mirror of
https://github.com/jiangzhengwenjz/katam.git
synced 2024-11-23 13:10:11 +00:00
More level work
This commit is contained in:
Cleverking2003
parent
fbf3c108c0
commit
81314fc691
52
asm/code.s
52
asm/code.s
@ -565,7 +565,7 @@ _080008E8:
|
||||
mov r1, sb
|
||||
strh r0, [r1]
|
||||
ldr r2, _080009D8 @ =gUnk_08D6499C
|
||||
ldr r0, _080009DC @ =gUnk_089331AC
|
||||
ldr r0, _080009DC @ =gRoomProps
|
||||
mov sl, r0
|
||||
movs r1, #0xbf
|
||||
lsls r1, r1, #3
|
||||
@ -665,7 +665,7 @@ _08000986:
|
||||
_080009D0: .4byte gCurLevelInfo
|
||||
_080009D4: .4byte gDispCnt
|
||||
_080009D8: .4byte gUnk_08D6499C
|
||||
_080009DC: .4byte gUnk_089331AC
|
||||
_080009DC: .4byte gRoomProps
|
||||
_080009E0: .4byte 0x06008000
|
||||
_080009E4: .4byte gUnk_08D63288
|
||||
_080009E8: .4byte 0x00007FFF
|
||||
@ -689,7 +689,7 @@ _080009FE:
|
||||
adds r4, r1, #0
|
||||
ands r4, r0
|
||||
strh r4, [r5, #4]
|
||||
ldr r2, _08000A4C @ =gUnk_089331AC
|
||||
ldr r2, _08000A4C @ =gRoomProps
|
||||
movs r1, #0xbf
|
||||
lsls r1, r1, #3
|
||||
adds r0, r6, r1
|
||||
@ -715,7 +715,7 @@ _080009FE:
|
||||
_08000A40: .4byte 0x0000FBFF
|
||||
_08000A44: .4byte gBgCntRegs
|
||||
_08000A48: .4byte 0x0000FFFC
|
||||
_08000A4C: .4byte gUnk_089331AC
|
||||
_08000A4C: .4byte gRoomProps
|
||||
_08000A50:
|
||||
adds r0, r3, #0
|
||||
orrs r0, r2
|
||||
@ -735,8 +735,8 @@ _08000A5C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_08000A70
|
||||
sub_08000A70: @ 0x08000A70
|
||||
thumb_func_start FillLevelInfo
|
||||
FillLevelInfo: @ 0x08000A70
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, sl
|
||||
mov r6, sb
|
||||
@ -826,7 +826,7 @@ _08000AFC:
|
||||
b _08000ED8
|
||||
_08000B1A:
|
||||
ldr r2, _08000B7C @ =gLevelInfo180Ptrs
|
||||
ldr r1, _08000B80 @ =gUnk_089331AC
|
||||
ldr r1, _08000B80 @ =gRoomProps
|
||||
lsls r4, r0, #2
|
||||
adds r0, r4, r0
|
||||
lsls r0, r0, #3
|
||||
@ -854,7 +854,7 @@ _08000B1A:
|
||||
str r4, [sp, #0x2c]
|
||||
cmp r1, r6
|
||||
beq _08000B8C
|
||||
ldr r1, _08000B88 @ =gUnk_08D637AC
|
||||
ldr r1, _08000B88 @ =gLevelObjLists
|
||||
ldrh r0, [r5, #0x1c]
|
||||
lsls r0, r0, #2
|
||||
adds r0, r0, r1
|
||||
@ -870,9 +870,9 @@ _08000B70: .4byte gCurLevelInfo
|
||||
_08000B74: .4byte 0x0000FFFF
|
||||
_08000B78: .4byte 0x000005FA
|
||||
_08000B7C: .4byte gLevelInfo180Ptrs
|
||||
_08000B80: .4byte gUnk_089331AC
|
||||
_08000B80: .4byte gRoomProps
|
||||
_08000B84: .4byte gUnk_08D64A24
|
||||
_08000B88: .4byte gUnk_08D637AC
|
||||
_08000B88: .4byte gLevelObjLists
|
||||
_08000B8C:
|
||||
mov r0, sp
|
||||
strh r1, [r0]
|
||||
@ -996,7 +996,7 @@ _08000B9E:
|
||||
str r0, [r7, #0x28]
|
||||
str r4, [r7, #0x2c]
|
||||
str r4, [r7, #0x30]
|
||||
ldr r6, _08000D50 @ =gUnk_089331AC
|
||||
ldr r6, _08000D50 @ =gRoomProps
|
||||
ldr r0, [sp, #0x2c]
|
||||
ldr r1, [sp, #0x10]
|
||||
adds r2, r0, r1
|
||||
@ -1034,7 +1034,7 @@ _08000B9E:
|
||||
movs r1, #0xf2
|
||||
lsls r1, r1, #1
|
||||
adds r5, r7, r1
|
||||
ldr r2, _08000D58 @ =gUnk_08D637AC
|
||||
ldr r2, _08000D58 @ =gLevelObjLists
|
||||
movs r0, #0xbf
|
||||
lsls r0, r0, #3
|
||||
adds r3, r7, r0
|
||||
@ -1096,9 +1096,9 @@ _08000B9E:
|
||||
.align 2, 0
|
||||
_08000D48: .4byte 0x01000010
|
||||
_08000D4C: .4byte 0xFFFF6000
|
||||
_08000D50: .4byte gUnk_089331AC
|
||||
_08000D50: .4byte gRoomProps
|
||||
_08000D54: .4byte gUnk_08D63330
|
||||
_08000D58: .4byte gUnk_08D637AC
|
||||
_08000D58: .4byte gLevelObjLists
|
||||
_08000D5C: .4byte gUnk_08D63C28
|
||||
_08000D60: .4byte 0x000005FC
|
||||
_08000D64: .4byte 0x05000010
|
||||
@ -1132,7 +1132,7 @@ _08000D86:
|
||||
ldr r0, _08000DD0 @ =0x00007FFF
|
||||
strh r0, [r3, #0x34]
|
||||
strh r0, [r3, #0x36]
|
||||
ldr r2, _08000DD4 @ =gUnk_089331AC
|
||||
ldr r2, _08000DD4 @ =gRoomProps
|
||||
ldr r1, [sp, #0x2c]
|
||||
ldr r3, [sp, #0x10]
|
||||
adds r0, r1, r3
|
||||
@ -1155,7 +1155,7 @@ _08000D86:
|
||||
b _08000E64
|
||||
.align 2, 0
|
||||
_08000DD0: .4byte 0x00007FFF
|
||||
_08000DD4: .4byte gUnk_089331AC
|
||||
_08000DD4: .4byte gRoomProps
|
||||
_08000DD8:
|
||||
movs r2, #0xd0
|
||||
lsls r2, r2, #1
|
||||
@ -1477,7 +1477,7 @@ _08001048:
|
||||
movs r0, #0
|
||||
str r0, [sp, #0x24]
|
||||
ldrb r0, [r3]
|
||||
ldr r1, _080010CC @ =gUnk_089331AC
|
||||
ldr r1, _080010CC @ =gRoomProps
|
||||
mov r8, r1
|
||||
ldr r3, [sp, #0x10]
|
||||
lsls r3, r3, #2
|
||||
@ -1543,7 +1543,7 @@ _080010B4:
|
||||
strb r2, [r0]
|
||||
b _08001106
|
||||
.align 2, 0
|
||||
_080010CC: .4byte gUnk_089331AC
|
||||
_080010CC: .4byte gRoomProps
|
||||
_080010D0: .4byte gUnk_08D63330
|
||||
_080010D4: .4byte gUnk_02024ED0
|
||||
_080010D8: .4byte gCurLevelInfo
|
||||
@ -2158,7 +2158,7 @@ sub_080015A8: @ 0x080015A8
|
||||
ldrh r0, [r0]
|
||||
lsrs r6, r0, #3
|
||||
ldr r3, _08001628 @ =gLevelInfo180Ptrs
|
||||
ldr r2, _0800162C @ =gUnk_089331AC
|
||||
ldr r2, _0800162C @ =gRoomProps
|
||||
subs r1, #0x70
|
||||
adds r0, r4, r1
|
||||
ldrh r1, [r0]
|
||||
@ -2204,7 +2204,7 @@ sub_080015A8: @ 0x080015A8
|
||||
.align 2, 0
|
||||
_08001624: .4byte gCurLevelInfo
|
||||
_08001628: .4byte gLevelInfo180Ptrs
|
||||
_0800162C: .4byte gUnk_089331AC
|
||||
_0800162C: .4byte gRoomProps
|
||||
_08001630: .4byte 0x0000065E
|
||||
_08001634: .4byte gUnk_02028EE0
|
||||
_08001638:
|
||||
@ -2774,7 +2774,7 @@ _08001A54:
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _08001AFE
|
||||
ldr r5, _08001AA0 @ =gUnk_089331AC
|
||||
ldr r5, _08001AA0 @ =gRoomProps
|
||||
movs r0, #0xbf
|
||||
lsls r0, r0, #3
|
||||
adds r3, r4, r0
|
||||
@ -2806,7 +2806,7 @@ _08001A54:
|
||||
b _08001AFE
|
||||
.align 2, 0
|
||||
_08001A9C: .4byte gBgScrollRegs
|
||||
_08001AA0: .4byte gUnk_089331AC
|
||||
_08001AA0: .4byte gRoomProps
|
||||
_08001AA4:
|
||||
ldr r1, [r4, #0xc]
|
||||
asrs r1, r1, #4
|
||||
@ -2888,7 +2888,7 @@ _08001B32:
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _08001C28
|
||||
ldr r5, _08001B8C @ =gUnk_089331AC
|
||||
ldr r5, _08001B8C @ =gRoomProps
|
||||
movs r0, #0xbf
|
||||
lsls r0, r0, #3
|
||||
adds r3, r4, r0
|
||||
@ -2922,7 +2922,7 @@ _08001B32:
|
||||
_08001B80: .4byte 0xFFFF6000
|
||||
_08001B84: .4byte 0xFFFFF600
|
||||
_08001B88: .4byte gBgScrollRegs
|
||||
_08001B8C: .4byte gUnk_089331AC
|
||||
_08001B8C: .4byte gRoomProps
|
||||
_08001B90:
|
||||
ldr r1, [r4, #0xc]
|
||||
asrs r1, r1, #4
|
||||
@ -3856,7 +3856,7 @@ _0800222C:
|
||||
cmp r2, #0
|
||||
bne _08002312
|
||||
ldr r2, _0800232C @ =gUnk_08D6499C
|
||||
ldr r1, _08002330 @ =gUnk_089331AC
|
||||
ldr r1, _08002330 @ =gRoomProps
|
||||
lsls r0, r4, #2
|
||||
adds r0, r0, r4
|
||||
lsls r0, r0, #3
|
||||
@ -3965,7 +3965,7 @@ _08002312:
|
||||
_08002324: .4byte gCurLevelInfo
|
||||
_08002328: .4byte gUnk_03000510
|
||||
_0800232C: .4byte gUnk_08D6499C
|
||||
_08002330: .4byte gUnk_089331AC
|
||||
_08002330: .4byte gRoomProps
|
||||
_08002334: .4byte 0x000005FC
|
||||
_08002338: .4byte 0x06008000
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ sub_08002BA8: @ 0x08002BA8
|
||||
lsls r3, r3, #0x18
|
||||
lsrs r4, r3, #0x18
|
||||
ldr r3, _08002BF8 @ =gUnk_08D640A4
|
||||
ldr r2, _08002BFC @ =gUnk_089331AC
|
||||
ldr r2, _08002BFC @ =gRoomProps
|
||||
lsls r1, r0, #2
|
||||
adds r1, r1, r0
|
||||
lsls r1, r1, #3
|
||||
@ -51,7 +51,7 @@ _08002BEC:
|
||||
b _08002BD4
|
||||
.align 2, 0
|
||||
_08002BF8: .4byte gUnk_08D640A4
|
||||
_08002BFC: .4byte gUnk_089331AC
|
||||
_08002BFC: .4byte gRoomProps
|
||||
_08002C00: .4byte gUnk_02028CA0
|
||||
_08002C04:
|
||||
ldrh r0, [r1, #0x24]
|
||||
@ -77,7 +77,7 @@ sub_08002C18: @ 0x08002C18
|
||||
lsls r3, r3, #0x18
|
||||
lsrs r5, r3, #0x18
|
||||
ldr r2, _08002C6C @ =gUnk_08D640A4
|
||||
ldr r1, _08002C70 @ =gUnk_089331AC
|
||||
ldr r1, _08002C70 @ =gRoomProps
|
||||
lsls r0, r4, #2
|
||||
adds r0, r0, r4
|
||||
lsls r0, r0, #3
|
||||
@ -112,7 +112,7 @@ _08002C5E:
|
||||
b _08002C46
|
||||
.align 2, 0
|
||||
_08002C6C: .4byte gUnk_08D640A4
|
||||
_08002C70: .4byte gUnk_089331AC
|
||||
_08002C70: .4byte gRoomProps
|
||||
_08002C74: .4byte gUnk_02028CA0
|
||||
_08002C78:
|
||||
lsls r0, r4, #2
|
||||
@ -751,7 +751,7 @@ _0800313C:
|
||||
b _08003268
|
||||
_08003152:
|
||||
ldr r2, _080031D0 @ =gUnk_08D63288
|
||||
ldr r1, _080031D4 @ =gUnk_089331AC
|
||||
ldr r1, _080031D4 @ =gRoomProps
|
||||
lsls r0, r3, #2
|
||||
adds r0, r0, r3
|
||||
lsls r0, r0, #3
|
||||
@ -812,7 +812,7 @@ _08003176:
|
||||
_080031C8: .4byte gCurLevelInfo
|
||||
_080031CC: .4byte gUnk_03000510
|
||||
_080031D0: .4byte gUnk_08D63288
|
||||
_080031D4: .4byte gUnk_089331AC
|
||||
_080031D4: .4byte gRoomProps
|
||||
_080031D8: .4byte 0x040000D4
|
||||
_080031DC: .4byte 0x0000063C
|
||||
_080031E0: .4byte 0x000003E7
|
||||
@ -1007,7 +1007,7 @@ _08003348:
|
||||
adds r0, r6, r3
|
||||
adds r1, r1, r0
|
||||
ldr r2, _08003374 @ =gUnk_08D64A24
|
||||
ldr r0, _08003378 @ =gUnk_089331AC
|
||||
ldr r0, _08003378 @ =gRoomProps
|
||||
ldr r4, _0800337C @ =0x00008F8E
|
||||
adds r0, r0, r4
|
||||
ldrh r0, [r0]
|
||||
@ -1020,7 +1020,7 @@ _08003348:
|
||||
.align 2, 0
|
||||
_08003370: .4byte gUnk_0203AD3C
|
||||
_08003374: .4byte gUnk_08D64A24
|
||||
_08003378: .4byte gUnk_089331AC
|
||||
_08003378: .4byte gRoomProps
|
||||
_0800337C: .4byte 0x00008F8E
|
||||
_08003380:
|
||||
ldr r7, [sp, #4]
|
||||
@ -1138,7 +1138,7 @@ sub_08003438: @ 0x08003438
|
||||
ldrh r0, [r0]
|
||||
str r0, [sp, #4]
|
||||
ldr r2, _08003578 @ =gUnk_08D6499C
|
||||
ldr r1, _0800357C @ =gUnk_089331AC
|
||||
ldr r1, _0800357C @ =gRoomProps
|
||||
lsls r0, r0, #2
|
||||
ldr r3, [sp, #4]
|
||||
adds r0, r0, r3
|
||||
@ -1277,7 +1277,7 @@ _080034EA:
|
||||
.align 2, 0
|
||||
_08003574: .4byte gCurLevelInfo
|
||||
_08003578: .4byte gUnk_08D6499C
|
||||
_0800357C: .4byte gUnk_089331AC
|
||||
_0800357C: .4byte gRoomProps
|
||||
_08003580: .4byte 0x000005FC
|
||||
_08003584: .4byte 0x06008000
|
||||
_08003588: .4byte 0x00000396
|
||||
@ -1300,7 +1300,7 @@ _080035B0:
|
||||
adds r0, r5, r3
|
||||
adds r1, r1, r0
|
||||
ldr r2, _080035E8 @ =gUnk_08D64A24
|
||||
ldr r0, _080035EC @ =gUnk_089331AC
|
||||
ldr r0, _080035EC @ =gRoomProps
|
||||
ldr r4, _080035F0 @ =0x00008F8E
|
||||
adds r0, r0, r4
|
||||
ldrh r0, [r0]
|
||||
@ -1321,7 +1321,7 @@ _080035D4:
|
||||
.align 2, 0
|
||||
_080035E4: .4byte gUnk_0203AD3C
|
||||
_080035E8: .4byte gUnk_08D64A24
|
||||
_080035EC: .4byte gUnk_089331AC
|
||||
_080035EC: .4byte gRoomProps
|
||||
_080035F0: .4byte 0x00008F8E
|
||||
|
||||
thumb_func_start sub_080035F4
|
||||
|
||||
@ -4625,7 +4625,7 @@ _0800CD50:
|
||||
adds r0, r0, r1
|
||||
ldrh r0, [r0]
|
||||
ldr r4, _0800CDDC @ =gUnk_08D63288
|
||||
ldr r3, _0800CDE0 @ =gUnk_089331AC
|
||||
ldr r3, _0800CDE0 @ =gRoomProps
|
||||
ldr r1, [sp, #0x20]
|
||||
ldrh r2, [r1]
|
||||
lsls r1, r2, #2
|
||||
@ -4674,7 +4674,7 @@ _0800CDD0: .4byte 0x00196225
|
||||
_0800CDD4: .4byte 0x3C6EF35F
|
||||
_0800CDD8: .4byte gUnk_082DDE7C
|
||||
_0800CDDC: .4byte gUnk_08D63288
|
||||
_0800CDE0: .4byte gUnk_089331AC
|
||||
_0800CDE0: .4byte gRoomProps
|
||||
_0800CDE4: .4byte sub_0800DDAC
|
||||
|
||||
thumb_func_start sub_0800CDE8
|
||||
@ -4933,7 +4933,7 @@ _0800CFC6:
|
||||
cmp r0, #0
|
||||
beq _0800D0A6
|
||||
ldr r3, _0800D050 @ =gUnk_08D63288
|
||||
ldr r2, _0800D054 @ =gUnk_089331AC
|
||||
ldr r2, _0800D054 @ =gRoomProps
|
||||
ldr r0, [sp, #4]
|
||||
adds r0, #0x60
|
||||
ldrh r1, [r0]
|
||||
@ -4988,7 +4988,7 @@ _0800CFC6:
|
||||
_0800D048: .4byte gCurLevelInfo
|
||||
_0800D04C: .4byte gUnk_0203AD3C
|
||||
_0800D050: .4byte gUnk_08D63288
|
||||
_0800D054: .4byte gUnk_089331AC
|
||||
_0800D054: .4byte gRoomProps
|
||||
_0800D058: .4byte gUnk_03002440
|
||||
_0800D05C:
|
||||
ldr r2, _0800D0DC @ =0x040000D4
|
||||
@ -8793,7 +8793,7 @@ _0800ED14:
|
||||
lsls r1, r2, #2
|
||||
add r1, r8
|
||||
lsls r1, r1, #3
|
||||
ldr r0, _0800EDEC @ =gUnk_089331AC
|
||||
ldr r0, _0800EDEC @ =gRoomProps
|
||||
adds r1, r1, r0
|
||||
ldr r0, _0800EDF0 @ =sub_08013804
|
||||
str r0, [r5]
|
||||
@ -8858,7 +8858,7 @@ _0800EDDC: .4byte 0x01000002
|
||||
_0800EDE0: .4byte 0x0100007A
|
||||
_0800EDE4: .4byte gCurLevelInfo
|
||||
_0800EDE8: .4byte gUnk_02020EE0
|
||||
_0800EDEC: .4byte gUnk_089331AC
|
||||
_0800EDEC: .4byte gRoomProps
|
||||
_0800EDF0: .4byte sub_08013804
|
||||
_0800EDF4: .4byte nullsub_104
|
||||
_0800EDF8: .4byte nullsub_105
|
||||
@ -8884,7 +8884,7 @@ sub_0800EE04: @ 0x0800EE04
|
||||
lsls r3, r1, #2
|
||||
adds r3, r3, r1
|
||||
lsls r3, r3, #3
|
||||
ldr r1, _0800EEA4 @ =gUnk_089331AC
|
||||
ldr r1, _0800EEA4 @ =gRoomProps
|
||||
adds r3, r3, r1
|
||||
ldr r1, _0800EEA8 @ =sub_08013804
|
||||
mov r4, ip
|
||||
@ -8947,7 +8947,7 @@ sub_0800EE04: @ 0x0800EE04
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800EEA0: .4byte gUnk_02038590
|
||||
_0800EEA4: .4byte gUnk_089331AC
|
||||
_0800EEA4: .4byte gRoomProps
|
||||
_0800EEA8: .4byte sub_08013804
|
||||
_0800EEAC: .4byte nullsub_104
|
||||
_0800EEB0: .4byte nullsub_105
|
||||
@ -11301,7 +11301,7 @@ sub_08010034: @ 0x08010034
|
||||
lsls r1, r1, #0x18
|
||||
lsrs r1, r1, #0x18
|
||||
ldr r5, _0801010C @ =gUnk_08D63C28
|
||||
ldr r4, _08010110 @ =gUnk_089331AC
|
||||
ldr r4, _08010110 @ =gRoomProps
|
||||
movs r3, #0xbf
|
||||
lsls r3, r3, #3
|
||||
adds r2, r0, r3
|
||||
@ -11406,7 +11406,7 @@ _08010106:
|
||||
b _080100BC
|
||||
.align 2, 0
|
||||
_0801010C: .4byte gUnk_08D63C28
|
||||
_08010110: .4byte gUnk_089331AC
|
||||
_08010110: .4byte gRoomProps
|
||||
_08010114: .4byte gRngVal
|
||||
_08010118: .4byte 0x00196225
|
||||
_0801011C: .4byte 0x3C6EF35F
|
||||
@ -22475,7 +22475,7 @@ _08015440:
|
||||
lsls r0, r1, #2
|
||||
adds r0, r0, r1
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _080154C8 @ =gUnk_089331AC
|
||||
ldr r1, _080154C8 @ =gRoomProps
|
||||
adds r0, r0, r1
|
||||
ldrh r1, [r0, #0x12]
|
||||
movs r0, #0x10
|
||||
@ -22501,7 +22501,7 @@ _080154B8: .4byte gUnk_02021580
|
||||
_080154BC: .4byte gUnk_0203AD30
|
||||
_080154C0: .4byte gUnk_02020EE0
|
||||
_080154C4: .4byte gCurLevelInfo
|
||||
_080154C8: .4byte gUnk_089331AC
|
||||
_080154C8: .4byte gRoomProps
|
||||
_080154CC: .4byte sub_0801870C
|
||||
_080154D0:
|
||||
adds r0, r5, #0
|
||||
@ -22720,7 +22720,7 @@ _08015680:
|
||||
cmp r4, #0xff
|
||||
beq _080156B6
|
||||
ldr r3, _080156C8 @ =gUnk_08D63C28
|
||||
ldr r2, _080156CC @ =gUnk_089331AC
|
||||
ldr r2, _080156CC @ =gRoomProps
|
||||
ldr r0, [r5, #0x14]
|
||||
movs r7, #0xbf
|
||||
lsls r7, r7, #3
|
||||
@ -22750,7 +22750,7 @@ _080156B6:
|
||||
.align 2, 0
|
||||
_080156C4: .4byte 0x0000FFFF
|
||||
_080156C8: .4byte gUnk_08D63C28
|
||||
_080156CC: .4byte gUnk_089331AC
|
||||
_080156CC: .4byte gRoomProps
|
||||
_080156D0:
|
||||
cmp r0, #0xff
|
||||
beq _080156EA
|
||||
@ -22833,7 +22833,7 @@ sub_080156FC: @ 0x080156FC
|
||||
lsls r0, r1, #2
|
||||
adds r0, r0, r1
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _080157A8 @ =gUnk_089331AC
|
||||
ldr r1, _080157A8 @ =gRoomProps
|
||||
adds r0, r0, r1
|
||||
ldrh r1, [r0, #0x12]
|
||||
movs r0, #0x10
|
||||
@ -22864,7 +22864,7 @@ _08015798: .4byte gUnk_02021580
|
||||
_0801579C: .4byte gUnk_0203AD30
|
||||
_080157A0: .4byte gUnk_02020EE0
|
||||
_080157A4: .4byte gCurLevelInfo
|
||||
_080157A8: .4byte gUnk_089331AC
|
||||
_080157A8: .4byte gRoomProps
|
||||
_080157AC: .4byte sub_08018758
|
||||
|
||||
thumb_func_start sub_080157B0
|
||||
@ -23389,7 +23389,7 @@ _08015B52:
|
||||
lsls r0, r1, #2
|
||||
adds r0, r0, r1
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _08015BE0 @ =gUnk_089331AC
|
||||
ldr r1, _08015BE0 @ =gRoomProps
|
||||
adds r0, r0, r1
|
||||
ldrh r1, [r0, #0x12]
|
||||
movs r0, #0x10
|
||||
@ -23417,7 +23417,7 @@ _08015BD0: .4byte gUnk_02021580
|
||||
_08015BD4: .4byte gUnk_0203AD30
|
||||
_08015BD8: .4byte gUnk_02020EE0
|
||||
_08015BDC: .4byte gCurLevelInfo
|
||||
_08015BE0: .4byte gUnk_089331AC
|
||||
_08015BE0: .4byte gRoomProps
|
||||
_08015BE4: .4byte sub_0801870C
|
||||
_08015BE8:
|
||||
adds r0, r4, #0
|
||||
@ -24655,7 +24655,7 @@ _080164D0:
|
||||
lsls r0, r1, #2
|
||||
adds r0, r0, r1
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _08016558 @ =gUnk_089331AC
|
||||
ldr r1, _08016558 @ =gRoomProps
|
||||
adds r0, r0, r1
|
||||
ldrh r1, [r0, #0x12]
|
||||
movs r0, #0x10
|
||||
@ -24681,7 +24681,7 @@ _08016548: .4byte gUnk_02021580
|
||||
_0801654C: .4byte gUnk_0203AD30
|
||||
_08016550: .4byte gUnk_02020EE0
|
||||
_08016554: .4byte gCurLevelInfo
|
||||
_08016558: .4byte gUnk_089331AC
|
||||
_08016558: .4byte gRoomProps
|
||||
_0801655C: .4byte sub_0801870C
|
||||
_08016560:
|
||||
adds r0, r4, #0
|
||||
@ -24980,7 +24980,7 @@ _0801675C:
|
||||
lsls r0, r1, #2
|
||||
adds r0, r0, r1
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _080167E4 @ =gUnk_089331AC
|
||||
ldr r1, _080167E4 @ =gRoomProps
|
||||
adds r0, r0, r1
|
||||
ldrh r1, [r0, #0x12]
|
||||
movs r0, #0x10
|
||||
@ -25004,7 +25004,7 @@ _080167D4: .4byte gUnk_02021580
|
||||
_080167D8: .4byte gUnk_0203AD30
|
||||
_080167DC: .4byte gUnk_02020EE0
|
||||
_080167E0: .4byte gCurLevelInfo
|
||||
_080167E4: .4byte gUnk_089331AC
|
||||
_080167E4: .4byte gRoomProps
|
||||
_080167E8: .4byte sub_0801870C
|
||||
_080167EC:
|
||||
adds r1, r4, #0
|
||||
@ -25322,7 +25322,7 @@ _080169F0:
|
||||
lsls r0, r1, #2
|
||||
adds r0, r0, r1
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _08016A78 @ =gUnk_089331AC
|
||||
ldr r1, _08016A78 @ =gRoomProps
|
||||
adds r0, r0, r1
|
||||
ldrh r1, [r0, #0x12]
|
||||
movs r0, #0x10
|
||||
@ -25348,7 +25348,7 @@ _08016A68: .4byte gUnk_02021580
|
||||
_08016A6C: .4byte gUnk_0203AD30
|
||||
_08016A70: .4byte gUnk_02020EE0
|
||||
_08016A74: .4byte gCurLevelInfo
|
||||
_08016A78: .4byte gUnk_089331AC
|
||||
_08016A78: .4byte gRoomProps
|
||||
_08016A7C: .4byte sub_0801870C
|
||||
_08016A80:
|
||||
mov r0, ip
|
||||
@ -25837,7 +25837,7 @@ _08016DD8:
|
||||
lsls r0, r1, #2
|
||||
adds r0, r0, r1
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _08016E60 @ =gUnk_089331AC
|
||||
ldr r1, _08016E60 @ =gRoomProps
|
||||
adds r0, r0, r1
|
||||
ldrh r1, [r0, #0x12]
|
||||
movs r0, #0x10
|
||||
@ -25861,7 +25861,7 @@ _08016E50: .4byte gUnk_02021580
|
||||
_08016E54: .4byte gUnk_0203AD30
|
||||
_08016E58: .4byte gUnk_02020EE0
|
||||
_08016E5C: .4byte gCurLevelInfo
|
||||
_08016E60: .4byte gUnk_089331AC
|
||||
_08016E60: .4byte gRoomProps
|
||||
_08016E64: .4byte sub_0801870C
|
||||
_08016E68:
|
||||
adds r0, r4, #0
|
||||
@ -26171,7 +26171,7 @@ _0801707C:
|
||||
lsls r0, r1, #2
|
||||
adds r0, r0, r1
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _08017104 @ =gUnk_089331AC
|
||||
ldr r1, _08017104 @ =gRoomProps
|
||||
adds r0, r0, r1
|
||||
ldrh r1, [r0, #0x12]
|
||||
movs r0, #0x10
|
||||
@ -26195,7 +26195,7 @@ _080170F4: .4byte gUnk_02021580
|
||||
_080170F8: .4byte gUnk_0203AD30
|
||||
_080170FC: .4byte gUnk_02020EE0
|
||||
_08017100: .4byte gCurLevelInfo
|
||||
_08017104: .4byte gUnk_089331AC
|
||||
_08017104: .4byte gRoomProps
|
||||
_08017108: .4byte sub_0801870C
|
||||
_0801710C:
|
||||
ldr r1, _08017138 @ =gUnk_082DDE84
|
||||
|
||||
@ -4056,7 +4056,7 @@ sub_0801C990: @ 0x0801C990
|
||||
orrs r0, r1
|
||||
strh r0, [r2]
|
||||
ldr r1, _0801CA10 @ =gUnk_08D64A24
|
||||
ldr r0, _0801CA14 @ =gUnk_089331AC
|
||||
ldr r0, _0801CA14 @ =gRoomProps
|
||||
ldr r2, _0801CA18 @ =0x00007D46
|
||||
adds r0, r0, r2
|
||||
ldrh r0, [r0]
|
||||
@ -4107,7 +4107,7 @@ _0801C9DA:
|
||||
.align 2, 0
|
||||
_0801CA0C: .4byte gDispCnt
|
||||
_0801CA10: .4byte gUnk_08D64A24
|
||||
_0801CA14: .4byte gUnk_089331AC
|
||||
_0801CA14: .4byte gRoomProps
|
||||
_0801CA18: .4byte 0x00007D46
|
||||
_0801CA1C: .4byte gBgScrollRegs
|
||||
_0801CA20: .4byte gBgCntRegs
|
||||
@ -4383,7 +4383,7 @@ sub_0801CC30: @ 0x0801CC30
|
||||
adds r0, r0, r1
|
||||
ldr r2, [r0]
|
||||
ldr r1, _0801CD7C @ =gUnk_08D64A24
|
||||
ldr r0, _0801CD80 @ =gUnk_089331AC
|
||||
ldr r0, _0801CD80 @ =gRoomProps
|
||||
ldr r3, _0801CD84 @ =0x00007D46
|
||||
adds r0, r0, r3
|
||||
ldrh r0, [r0]
|
||||
@ -4526,7 +4526,7 @@ sub_0801CC30: @ 0x0801CC30
|
||||
_0801CD74: .4byte gUnk_082D7850
|
||||
_0801CD78: .4byte 0x00000C18
|
||||
_0801CD7C: .4byte gUnk_08D64A24
|
||||
_0801CD80: .4byte gUnk_089331AC
|
||||
_0801CD80: .4byte gRoomProps
|
||||
_0801CD84: .4byte 0x00007D46
|
||||
_0801CD88: .4byte 0x0000FFFF
|
||||
_0801CD8C: .4byte 0x000002D3
|
||||
@ -6433,7 +6433,7 @@ _0801DAC0:
|
||||
adds r0, r7, #0
|
||||
bl sub_08153060
|
||||
ldr r1, _0801DC5C @ =gUnk_08D64A24
|
||||
ldr r0, _0801DC60 @ =gUnk_089331AC
|
||||
ldr r0, _0801DC60 @ =gRoomProps
|
||||
ldr r2, _0801DC64 @ =0x00007D46
|
||||
adds r0, r0, r2
|
||||
ldrh r0, [r0]
|
||||
@ -6492,7 +6492,7 @@ _0801DC50: .4byte 0x00007FFF
|
||||
_0801DC54: .4byte gUnk_082D7850
|
||||
_0801DC58: .4byte 0x00000C1C
|
||||
_0801DC5C: .4byte gUnk_08D64A24
|
||||
_0801DC60: .4byte gUnk_089331AC
|
||||
_0801DC60: .4byte gRoomProps
|
||||
_0801DC64: .4byte 0x00007D46
|
||||
_0801DC68: .4byte 0x00001F03
|
||||
_0801DC6C: .4byte 0x0600F800
|
||||
@ -7009,7 +7009,7 @@ sub_0801E03C: @ 0x0801E03C
|
||||
adds r0, r0, r1
|
||||
ldr r6, [r0]
|
||||
ldr r1, _0801E0A0 @ =gUnk_08D64A24
|
||||
ldr r0, _0801E0A4 @ =gUnk_089331AC
|
||||
ldr r0, _0801E0A4 @ =gRoomProps
|
||||
ldr r2, _0801E0A8 @ =0x00007D46
|
||||
adds r0, r0, r2
|
||||
ldrh r0, [r0]
|
||||
@ -7048,7 +7048,7 @@ sub_0801E03C: @ 0x0801E03C
|
||||
_0801E098: .4byte gUnk_082D7850
|
||||
_0801E09C: .4byte 0x00000C1C
|
||||
_0801E0A0: .4byte gUnk_08D64A24
|
||||
_0801E0A4: .4byte gUnk_089331AC
|
||||
_0801E0A4: .4byte gRoomProps
|
||||
_0801E0A8: .4byte 0x00007D46
|
||||
_0801E0AC: .4byte sub_0801E0B0
|
||||
|
||||
|
||||
@ -6782,7 +6782,7 @@ sub_08023068: @ 0x08023068
|
||||
asrs r0, r0, #0x10
|
||||
cmp r0, #0x3b
|
||||
ble _0802308E
|
||||
ldr r0, _08023094 @ =gUnk_089331AC
|
||||
ldr r0, _08023094 @ =gRoomProps
|
||||
ldr r1, _08023098 @ =0x00007D78
|
||||
adds r0, r0, r1
|
||||
ldrh r0, [r0]
|
||||
@ -6794,7 +6794,7 @@ _0802308E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08023094: .4byte gUnk_089331AC
|
||||
_08023094: .4byte gRoomProps
|
||||
_08023098: .4byte 0x00007D78
|
||||
_0802309C: .4byte sub_080230A0
|
||||
|
||||
|
||||
@ -1564,7 +1564,7 @@ sub_08026CC0: @ 0x08026CC0
|
||||
orrs r0, r1
|
||||
strh r0, [r2]
|
||||
ldr r1, _08026D44 @ =gUnk_08D64A24
|
||||
ldr r0, _08026D48 @ =gUnk_089331AC
|
||||
ldr r0, _08026D48 @ =gRoomProps
|
||||
ldr r2, _08026D4C @ =0x00008E4E
|
||||
adds r0, r0, r2
|
||||
ldrh r0, [r0]
|
||||
@ -1614,7 +1614,7 @@ _08026D06:
|
||||
_08026D3C: .4byte gDispCnt
|
||||
_08026D40: .4byte 0x0000F9FF
|
||||
_08026D44: .4byte gUnk_08D64A24
|
||||
_08026D48: .4byte gUnk_089331AC
|
||||
_08026D48: .4byte gRoomProps
|
||||
_08026D4C: .4byte 0x00008E4E
|
||||
_08026D50: .4byte gBgScrollRegs
|
||||
_08026D54: .4byte gBgCntRegs
|
||||
@ -6234,7 +6234,7 @@ _080291CC:
|
||||
lsls r2, r2, #1
|
||||
bl CpuSet
|
||||
ldr r1, _0802945C @ =gUnk_08D64A24
|
||||
ldr r0, _08029460 @ =gUnk_089331AC
|
||||
ldr r0, _08029460 @ =gRoomProps
|
||||
ldr r2, _08029464 @ =0x00008E4E
|
||||
adds r0, r0, r2
|
||||
ldrh r0, [r0]
|
||||
@ -6546,7 +6546,7 @@ _08029450: .4byte 0x040000D4
|
||||
_08029454: .4byte gUnk_03003860
|
||||
_08029458: .4byte gBgPalette
|
||||
_0802945C: .4byte gUnk_08D64A24
|
||||
_08029460: .4byte gUnk_089331AC
|
||||
_08029460: .4byte gRoomProps
|
||||
_08029464: .4byte 0x00008E4E
|
||||
_08029468: .4byte gBgScrollRegs
|
||||
_0802946C: .4byte gBgCntRegs
|
||||
@ -13024,7 +13024,7 @@ sub_0802C68C: @ 0x0802C68C
|
||||
push {r7}
|
||||
mov r8, r0
|
||||
ldr r1, _0802C700 @ =gUnk_08D64A24
|
||||
ldr r0, _0802C704 @ =gUnk_089331AC
|
||||
ldr r0, _0802C704 @ =gRoomProps
|
||||
ldr r2, _0802C708 @ =0x00007D46
|
||||
adds r0, r0, r2
|
||||
ldrh r0, [r0]
|
||||
@ -13076,7 +13076,7 @@ _0802C6C8:
|
||||
b _0802C742
|
||||
.align 2, 0
|
||||
_0802C700: .4byte gUnk_08D64A24
|
||||
_0802C704: .4byte gUnk_089331AC
|
||||
_0802C704: .4byte gRoomProps
|
||||
_0802C708: .4byte 0x00007D46
|
||||
_0802C70C: .4byte gBgScrollRegs
|
||||
_0802C710: .4byte gBgCntRegs
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -130183,7 +130183,7 @@ sub_08113C34: @ 0x08113C34
|
||||
push {r4, r5, lr}
|
||||
lsls r1, r1, #0x18
|
||||
ldr r2, _08113C80 @ =gUnk_08D64A24
|
||||
ldr r0, _08113C84 @ =gUnk_089331AC
|
||||
ldr r0, _08113C84 @ =gRoomProps
|
||||
ldr r3, _08113C88 @ =0x00008F8E
|
||||
adds r0, r0, r3
|
||||
ldrh r0, [r0]
|
||||
@ -130222,7 +130222,7 @@ _08113C5C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08113C80: .4byte gUnk_08D64A24
|
||||
_08113C84: .4byte gUnk_089331AC
|
||||
_08113C84: .4byte gRoomProps
|
||||
_08113C88: .4byte 0x00008F8E
|
||||
_08113C8C: .4byte 0x06000540
|
||||
|
||||
|
||||
@ -360,7 +360,7 @@ _0814AAF0: .4byte 0x00000C18
|
||||
sub_0814AAF4: @ 0x0814AAF4
|
||||
push {r4, r5, r6, r7, lr}
|
||||
ldr r1, _0814AB5C @ =gUnk_08D64A24
|
||||
ldr r0, _0814AB60 @ =gUnk_089331AC
|
||||
ldr r0, _0814AB60 @ =gRoomProps
|
||||
ldr r2, _0814AB64 @ =0x00007D46
|
||||
adds r0, r0, r2
|
||||
ldrh r0, [r0]
|
||||
@ -410,7 +410,7 @@ _0814AB2A:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0814AB5C: .4byte gUnk_08D64A24
|
||||
_0814AB60: .4byte gUnk_089331AC
|
||||
_0814AB60: .4byte gRoomProps
|
||||
_0814AB64: .4byte 0x00007D46
|
||||
_0814AB68: .4byte gBgScrollRegs
|
||||
_0814AB6C: .4byte gBgCntRegs
|
||||
@ -579,7 +579,7 @@ sub_0814ACA8: @ 0x0814ACA8
|
||||
adds r0, r0, r1
|
||||
ldr r2, [r0]
|
||||
ldr r1, _0814AD2C @ =gUnk_08D64A24
|
||||
ldr r0, _0814AD30 @ =gUnk_089331AC
|
||||
ldr r0, _0814AD30 @ =gRoomProps
|
||||
ldr r3, _0814AD34 @ =0x00007D46
|
||||
adds r0, r0, r3
|
||||
ldrh r0, [r0]
|
||||
@ -632,7 +632,7 @@ sub_0814ACA8: @ 0x0814ACA8
|
||||
_0814AD24: .4byte gUnk_082D7850
|
||||
_0814AD28: .4byte 0x00000C18
|
||||
_0814AD2C: .4byte gUnk_08D64A24
|
||||
_0814AD30: .4byte gUnk_089331AC
|
||||
_0814AD30: .4byte gRoomProps
|
||||
_0814AD34: .4byte 0x00007D46
|
||||
_0814AD38: .4byte 0x00007FFF
|
||||
_0814AD3C: .4byte 0x0000FFFF
|
||||
@ -7485,7 +7485,7 @@ _0814E368: .4byte sub_0814E36C
|
||||
sub_0814E36C: @ 0x0814E36C
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldr r0, _0814E388 @ =gUnk_089331AC
|
||||
ldr r0, _0814E388 @ =gRoomProps
|
||||
ldr r1, _0814E38C @ =0x00007D28
|
||||
adds r0, r0, r1
|
||||
ldrh r0, [r0]
|
||||
@ -7496,7 +7496,7 @@ sub_0814E36C: @ 0x0814E36C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0814E388: .4byte gUnk_089331AC
|
||||
_0814E388: .4byte gRoomProps
|
||||
_0814E38C: .4byte 0x00007D28
|
||||
_0814E390: .4byte sub_0814AF04
|
||||
|
||||
|
||||
290
data/data_2.s
290
data/data_2.s
@ -472,8 +472,294 @@ gUnk_08D63288:: @ 08D63288
|
||||
gUnk_08D63330:: @ 08D63330
|
||||
.incbin "baserom.gba", 0xD63330, 0x000047C
|
||||
|
||||
gUnk_08D637AC:: @ 08D637AC
|
||||
.incbin "baserom.gba", 0xD637AC, 0x000047C
|
||||
gLevelObjLists:: @ 08D637AC
|
||||
.word gUnk_088B4CC0
|
||||
.word gUnk_088B4E98
|
||||
.word gUnk_088B504C
|
||||
.word gUnk_088B5348
|
||||
.word gUnk_088B5444
|
||||
.word gUnk_088B54B0
|
||||
.word gUnk_088B551C
|
||||
.word gUnk_088B5588
|
||||
.word gUnk_088B55F4
|
||||
.word gUnk_088B5660
|
||||
.word gUnk_088B5914
|
||||
.word gUnk_088B5BE8
|
||||
.word gUnk_088B5D54
|
||||
.word gUnk_088B5EC0
|
||||
.word gUnk_088B6050
|
||||
.word gUnk_088B6128
|
||||
.word gUnk_088B62DC
|
||||
.word gUnk_088B6494
|
||||
.word gUnk_088B6600
|
||||
.word gUnk_088B6820
|
||||
.word gUnk_088B6940
|
||||
.word gUnk_088B6AAC
|
||||
.word gUnk_088B6BF4
|
||||
.word gUnk_088B6D60
|
||||
.word gUnk_088B6F14
|
||||
.word gUnk_088B7110
|
||||
.word gUnk_088B7378
|
||||
.word gUnk_088B7550
|
||||
.word gUnk_088B7728
|
||||
.word gUnk_088B79B8
|
||||
.word gUnk_088B7A94
|
||||
.word gUnk_088B7CDC
|
||||
.word gUnk_088B7DD8
|
||||
.word gUnk_088B7FD8
|
||||
.word gUnk_088B8288
|
||||
.word gUnk_088B8518
|
||||
.word gUnk_088B863C
|
||||
.word gUnk_088B885C
|
||||
.word gUnk_088B8A34
|
||||
.word gUnk_088B8C30
|
||||
.word gUnk_088B8E54
|
||||
.word gUnk_088B9098
|
||||
.word gUnk_088B9270
|
||||
.word gUnk_088B9448
|
||||
.word gUnk_088B9590
|
||||
.word gUnk_088B97D4
|
||||
.word gUnk_088B9A40
|
||||
.word gUnk_088B9C40
|
||||
.word gUnk_088B9E3C
|
||||
.word gUnk_088BA05C
|
||||
.word gUnk_088BA234
|
||||
.word gUnk_088BA3E8
|
||||
.word gUnk_088BA674
|
||||
.word gUnk_088BA8B8
|
||||
.word gUnk_088BAB68
|
||||
.word gUnk_088BAD20
|
||||
.word gUnk_088BAF44
|
||||
.word gUnk_088BB0FC
|
||||
.word gUnk_088BB320
|
||||
.word gUnk_088BB444
|
||||
.word gUnk_088BB71C
|
||||
.word gUnk_088BBB38
|
||||
.word gUnk_088BBC58
|
||||
.word gUnk_088BBEA0
|
||||
.word gUnk_088BC1C0
|
||||
.word gUnk_088BC54C
|
||||
.word gUnk_088BC600
|
||||
.word gUnk_088BC6B4
|
||||
.word gUnk_088BC8B0
|
||||
.word gUnk_088BC9F8
|
||||
.word gUnk_088BCC84
|
||||
.word gUnk_088BCEA8
|
||||
.word gUnk_088BD134
|
||||
.word gUnk_088BD27C
|
||||
.word gUnk_088BD2E8
|
||||
.word gUnk_088BD4A0
|
||||
.word gUnk_088BD6E8
|
||||
.word gUnk_088BD854
|
||||
.word gUnk_088BDB08
|
||||
.word gUnk_088BDD50
|
||||
.word gUnk_088BDE4C
|
||||
.word gUnk_088BDFB8
|
||||
.word gUnk_088BE1DC
|
||||
.word gUnk_088BE3FC
|
||||
.word gUnk_088BE48C
|
||||
.word gUnk_088BE540
|
||||
.word gUnk_088BE7F4
|
||||
.word gUnk_088BEA14
|
||||
.word gUnk_088BEC34
|
||||
.word gUnk_088BEE54
|
||||
.word gUnk_088BF09C
|
||||
.word gUnk_088BF2E0
|
||||
.word gUnk_088BF5B8
|
||||
.word gUnk_088BF8D8
|
||||
.word gUnk_088BFAB4
|
||||
.word gUnk_088BFD68
|
||||
.word gUnk_088BFFB0
|
||||
.word gUnk_088C0064
|
||||
.word gUnk_088C03A8
|
||||
.word gUnk_088C0614
|
||||
.word gUnk_088C0838
|
||||
.word gUnk_088C0938
|
||||
.word gUnk_088C0C0C
|
||||
.word gUnk_088C0EC0
|
||||
.word gUnk_088C0FE4
|
||||
.word gUnk_088C11E0
|
||||
.word gUnk_088C1370
|
||||
.word gUnk_088C1500
|
||||
.word gUnk_088C15FC
|
||||
.word gUnk_088C1820
|
||||
.word gUnk_088C1868
|
||||
.word gUnk_088C1B40
|
||||
.word gUnk_088C1CD0
|
||||
.word gUnk_088C1EA8
|
||||
.word gUnk_088C21EC
|
||||
.word gUnk_088C259C
|
||||
.word gUnk_088C2698
|
||||
.word gUnk_088C28BC
|
||||
.word gUnk_088C2B24
|
||||
.word gUnk_088C2D90
|
||||
.word gUnk_088C3044
|
||||
.word gUnk_088C3168
|
||||
.word gUnk_088C33F4
|
||||
.word gUnk_088C363C
|
||||
.word gUnk_088C37F0
|
||||
.word gUnk_088C3934
|
||||
.word gUnk_088C3B54
|
||||
.word gUnk_088C3EBC
|
||||
.word gUnk_088C4028
|
||||
.word gUnk_088C4368
|
||||
.word gUnk_088C4564
|
||||
.word gUnk_088C4764
|
||||
.word gUnk_088C48AC
|
||||
.word gUnk_088C4AAC
|
||||
.word gUnk_088C4B88
|
||||
.word gUnk_088C4E60
|
||||
.word gUnk_088C50A8
|
||||
.word gUnk_088C5218
|
||||
.word gUnk_088C5284
|
||||
.word gUnk_088C5338
|
||||
.word gUnk_088C5610
|
||||
.word gUnk_088C5710
|
||||
.word gUnk_088C580C
|
||||
.word gUnk_088C5AE0
|
||||
.word gUnk_088C5E90
|
||||
.word gUnk_088C5F90
|
||||
.word gUnk_088C61B0
|
||||
.word gUnk_088C6418
|
||||
.word gUnk_088C6484
|
||||
.word gUnk_088C6634
|
||||
.word gUnk_088C68C0
|
||||
.word gUnk_088C6ABC
|
||||
.word gUnk_088C6B70
|
||||
.word gUnk_088C6D68
|
||||
.word gUnk_088C6E44
|
||||
.word gUnk_088C70B0
|
||||
.word gUnk_088C73AC
|
||||
.word gUnk_088C7684
|
||||
.word gUnk_088C76CC
|
||||
.word gUnk_088C79A4
|
||||
.word gUnk_088C7D2C
|
||||
.word gUnk_088C7E08
|
||||
.word gUnk_088C81D8
|
||||
.word gUnk_088C83B0
|
||||
.word gUnk_088C86A8
|
||||
.word gUnk_088C8714
|
||||
.word gUnk_088C87C8
|
||||
.word gUnk_088C8934
|
||||
.word gUnk_088C8B9C
|
||||
.word gUnk_088C8C9C
|
||||
.word gUnk_088C8D50
|
||||
.word gUnk_088C8F74
|
||||
.word gUnk_088C90E0
|
||||
.word gUnk_088C924C
|
||||
.word gUnk_088C92DC
|
||||
.word gUnk_088C9524
|
||||
.word gUnk_088C9690
|
||||
.word gUnk_088C986C
|
||||
.word gUnk_088C9A20
|
||||
.word gUnk_088C9C40
|
||||
.word gUnk_088C9DF4
|
||||
.word gUnk_088CA03C
|
||||
.word gUnk_088CA2A8
|
||||
.word gUnk_088CA4EC
|
||||
.word gUnk_088CA854
|
||||
.word gUnk_088CAA74
|
||||
.word gUnk_088CAC70
|
||||
.word gUnk_088CB000
|
||||
.word gUnk_088CB100
|
||||
.word gUnk_088CB224
|
||||
.word gUnk_088CB3D8
|
||||
.word gUnk_088CB640
|
||||
.word gUnk_088CB95C
|
||||
.word gUnk_088CBB5C
|
||||
.word gUnk_088CBDEC
|
||||
.word gUnk_088CC078
|
||||
.word gUnk_088CC370
|
||||
.word gUnk_088CC6D8
|
||||
.word gUnk_088CC964
|
||||
.word gUnk_088CCC5C
|
||||
.word gUnk_088CCE80
|
||||
.word gUnk_088CD1E8
|
||||
.word gUnk_088CD29C
|
||||
.word gUnk_088CD454
|
||||
.word gUnk_088CD4C0
|
||||
.word gUnk_088CD72C
|
||||
.word gUnk_088CD994
|
||||
.word gUnk_088CDBB4
|
||||
.word gUnk_088CDD68
|
||||
.word gUnk_088CDEFC
|
||||
.word gUnk_088CE1D4
|
||||
.word gUnk_088CE2D4
|
||||
.word gUnk_088CE3B0
|
||||
.word gUnk_088CE618
|
||||
.word gUnk_088CE838
|
||||
.word gUnk_088CE980
|
||||
.word gUnk_088CEBC4
|
||||
.word gUnk_088CEE98
|
||||
.word gUnk_088CEF04
|
||||
.word gUnk_088CF028
|
||||
.word gUnk_088CF468
|
||||
.word gUnk_088CF688
|
||||
.word gUnk_088CF8A8
|
||||
.word gUnk_088CFB34
|
||||
.word gUnk_088CFD30
|
||||
.word gUnk_088CFE0C
|
||||
.word gUnk_088CFEE4
|
||||
.word gUnk_088CFF2C
|
||||
.word gUnk_088D016C
|
||||
.word gUnk_088D02FC
|
||||
.word gUnk_088D03D4
|
||||
.word gUnk_088D0618
|
||||
.word gUnk_088D08A8
|
||||
.word gUnk_088D0A10
|
||||
.word gUnk_088D0C30
|
||||
.word gUnk_088D0E50
|
||||
.word gUnk_088D10BC
|
||||
.word gUnk_088D1170
|
||||
.word gUnk_088D1420
|
||||
.word gUnk_088D14D4
|
||||
.word gUnk_088D15D4
|
||||
.word gUnk_088D19A8
|
||||
.word gUnk_088D1BA4
|
||||
.word gUnk_088D1FE0
|
||||
.word gUnk_088D214C
|
||||
.word gUnk_088D234C
|
||||
.word gUnk_088D25B4
|
||||
.word gUnk_088D2668
|
||||
.word gUnk_088D26B0
|
||||
.word gUnk_088D281C
|
||||
.word gUnk_088D2B18
|
||||
.word gUnk_088D2E10
|
||||
.word gUnk_088D2EC4
|
||||
.word gUnk_088D2FC4
|
||||
.word gUnk_088D3078
|
||||
.word gUnk_088D3348
|
||||
.word gUnk_088D358C
|
||||
.word gUnk_088D3914
|
||||
.word gUnk_088D3C30
|
||||
.word gUnk_088D3D0C
|
||||
.word gUnk_088D3E0C
|
||||
.word gUnk_088D3F08
|
||||
.word gUnk_088D4070
|
||||
.word gUnk_088D44D4
|
||||
.word gUnk_088D4784
|
||||
.word gUnk_088D47CC
|
||||
.word gUnk_088D4838
|
||||
.word gUnk_088D4BE4
|
||||
.word gUnk_088D5048
|
||||
.word gUnk_088D51D8
|
||||
.word gUnk_088D5220
|
||||
.word gUnk_088D5268
|
||||
.word gUnk_088D541C
|
||||
.word gUnk_088D5464
|
||||
.word gUnk_088D55AC
|
||||
.word gUnk_088D55F4
|
||||
.word gUnk_088D57D0
|
||||
.word gUnk_088D5818
|
||||
.word gUnk_088D5860
|
||||
.word gUnk_088D58A8
|
||||
.word gUnk_088D5BA0
|
||||
.word gUnk_088D5CC0
|
||||
.word gUnk_088D5D50
|
||||
.word gUnk_088D5DE0
|
||||
.word gUnk_088D5E70
|
||||
.word gUnk_088D5E94
|
||||
.word gUnk_088D618C
|
||||
|
||||
gUnk_08D63C28:: @ 08D63C28
|
||||
.incbin "baserom.gba", 0xD63C28, 0x000047C
|
||||
|
||||
@ -37716,7 +37716,10 @@ gUnk_088B4E94:: @ 088B4E94
|
||||
.incbin "baserom.gba", 0x8B4E94, 0x0000004
|
||||
|
||||
gUnk_088B4E98:: @ 088B4E98
|
||||
.incbin "baserom.gba", 0x8B4E98, 0x0000010
|
||||
.word gUnk_088B4CD0
|
||||
.word gUnk_088B4E8C
|
||||
.word gUnk_088B4E94
|
||||
.word 0x6
|
||||
|
||||
gUnk_088B4EA8:: @ 088B4EA8
|
||||
.incbin "baserom.gba", 0x8B4EA8, 0x0000198
|
||||
@ -49091,7 +49094,7 @@ gUnk_08932F8C:: @ 08932F8C
|
||||
gUnk_08933144:: @ 08933144
|
||||
.incbin "baserom.gba", 0x933144, 0x0000068
|
||||
|
||||
gUnk_089331AC:: @ 089331AC
|
||||
gRoomProps:: @ 089331AC
|
||||
.incbin "baserom.gba", 0x9331AC, 0x00001ED
|
||||
|
||||
gUnk_08933399:: @ 08933399
|
||||
@ -51912,7 +51915,7 @@ gUnk_08A3639C:: @ 08A3639C
|
||||
.incbin "baserom.gba", 0xA3639C, 0x0000010
|
||||
|
||||
gUnk_08A363AC:: @ 08A363AC
|
||||
.incbin "baserom.gba", 0xA363AC, 0x000283C
|
||||
.incbin "graphics/room_323_fg.4bpp.lz"
|
||||
|
||||
gUnk_08A38BE8:: @ 08A38BE8
|
||||
.incbin "baserom.gba", 0xA38BE8, 0x0000004
|
||||
|
||||
BIN
graphics/room_323_fg.png
Normal file
BIN
graphics/room_323_fg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.5 KiB |
@ -52,7 +52,8 @@ struct Object {
|
||||
u8 unk5;
|
||||
s16 x;
|
||||
s16 y;
|
||||
u8 fillerA[2];
|
||||
u8 unkA;
|
||||
u8 unkB;
|
||||
u8 type;
|
||||
u8 unkD;
|
||||
u8 unkE;
|
||||
@ -347,9 +348,9 @@ extern const u8 gUnk_08357F44[];
|
||||
extern const u32 gUnk_083B909C;
|
||||
|
||||
extern const struct Unk_08D60FA4* gUnk_08D60FA4[];
|
||||
extern const struct Object (*gUnk_08D637AC[])[];
|
||||
extern const struct Object (*gLevelObjLists[])[];
|
||||
extern const struct Unk_08930E5C *gUnk_08D640A4[];
|
||||
|
||||
extern const struct RoomProps gUnk_089331AC[];
|
||||
extern const struct RoomProps gRoomProps[];
|
||||
|
||||
#endif
|
||||
|
||||
@ -133,26 +133,26 @@ u8 sub_080026A8(u8 playerId, u16 x, u16 y)
|
||||
|
||||
u8 sub_080026F8(u16 roomId)
|
||||
{
|
||||
return (*gUnk_08D637AC[gUnk_089331AC[roomId].objectListIdx])[0].type;
|
||||
return (*gLevelObjLists[gRoomProps[roomId].objectListIdx])[0].type;
|
||||
}
|
||||
|
||||
u8 sub_0800271C(u16 roomId, u8 arg1)
|
||||
{
|
||||
return *(u8 *) (
|
||||
*(u32 *) &(*gUnk_08D637AC[gUnk_089331AC[roomId].objectListIdx])[0].unk4
|
||||
*(u32 *) &(*gLevelObjLists[gRoomProps[roomId].objectListIdx])[0].unk4
|
||||
+ arg1
|
||||
);
|
||||
}
|
||||
|
||||
u8 sub_08002750(u16 roomId)
|
||||
{
|
||||
return (*gUnk_08D637AC[gUnk_089331AC[roomId].objectListIdx])[0].unkD;
|
||||
return (*gLevelObjLists[gRoomProps[roomId].objectListIdx])[0].unkD;
|
||||
}
|
||||
|
||||
u8 sub_08002774(u16 roomId, u8 arg1)
|
||||
{
|
||||
return *(u8 *) (
|
||||
*(u32 *) &(*gUnk_08D637AC[gUnk_089331AC[roomId].objectListIdx])[0].y
|
||||
*(u32 *) &(*gLevelObjLists[gRoomProps[roomId].objectListIdx])[0].y
|
||||
+ arg1
|
||||
);
|
||||
}
|
||||
|
||||
@ -136,24 +136,24 @@ void sub_08002A44(u8 arg0, u16 arg1, u8 arg2)
|
||||
|
||||
u16 sub_08002A5C(u16 arg0)
|
||||
{
|
||||
return gUnk_02028CA0[gUnk_089331AC[arg0].unk24Idx] >> 0xF;
|
||||
return gUnk_02028CA0[gRoomProps[arg0].unk24Idx] >> 0xF;
|
||||
}
|
||||
|
||||
void sub_08002A80(u16 arg0)
|
||||
{
|
||||
gUnk_02028CA0[gUnk_089331AC[arg0].unk24Idx] |= 0x8000;
|
||||
gUnk_02028CA0[gRoomProps[arg0].unk24Idx] |= 0x8000;
|
||||
}
|
||||
|
||||
u8 sub_08002AAC(u16 arg0)
|
||||
{
|
||||
return gUnk_08D640A4[gUnk_089331AC[arg0].unk24Idx]->unk04;
|
||||
return gUnk_08D640A4[gRoomProps[arg0].unk24Idx]->unk04;
|
||||
}
|
||||
|
||||
u8 sub_08002AD0(u16 arg0)
|
||||
{
|
||||
u8 var0 = 0;
|
||||
u8 var1 = gUnk_08D640A4[gUnk_089331AC[arg0].unk24Idx]->unk04;
|
||||
u16 var2 = gUnk_02028CA0[gUnk_089331AC[arg0].unk24Idx];
|
||||
u8 var1 = gUnk_08D640A4[gRoomProps[arg0].unk24Idx]->unk04;
|
||||
u16 var2 = gUnk_02028CA0[gRoomProps[arg0].unk24Idx];
|
||||
u16 var3 = 0;
|
||||
|
||||
while (var3 < var1) {
|
||||
@ -169,7 +169,7 @@ u8 sub_08002AD0(u16 arg0)
|
||||
|
||||
void sub_08002B30(u16 arg0, s16 arg1, s16 arg2)
|
||||
{
|
||||
struct Unk_08930E00 *var0 = gUnk_08D640A4[gUnk_089331AC[arg0].unk24Idx]->unk00;
|
||||
struct Unk_08930E00 *var0 = gUnk_08D640A4[gRoomProps[arg0].unk24Idx]->unk00;
|
||||
u16 var1 = 0;
|
||||
|
||||
for (;;) {
|
||||
@ -178,7 +178,7 @@ void sub_08002B30(u16 arg0, s16 arg1, s16 arg2)
|
||||
var0->unk04 == arg1 &&
|
||||
var0->unk06 == arg2
|
||||
) {
|
||||
gUnk_02028CA0[gUnk_089331AC[arg0].unk24Idx] |= 1 << var1;
|
||||
gUnk_02028CA0[gRoomProps[arg0].unk24Idx] |= 1 << var1;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user