Game-Decompilation/katam
1
0
Fork 0
mirror of https://github.com/jiangzhengwenjz/katam.git synced 2024-11-27 07:00:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove wrong addresses in the linker script

Browse Source
This commit is contained in:
Zhengwen Jiang 2022-09-01 14:36:31 -05:00
parent 32084fc1c0
commit 2c82bc3498
16 changed files with 56 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/big_small_switch.s
View File

@ -712,7 +712,7 @@ _08119720:
mov r3, sb
muls r3, r0, r3
adds r0, r3, #0
ldr r4, _08119748 @ =gUnk_02020EEC
ldr r4, _08119748 @ =gKirbys+0xC
adds r0, r0, r4
ldr r0, [r0]
movs r1, #0x80
@ -725,7 +725,7 @@ _08119720:
_0811973C: .4byte gUnk_0203AD44
_08119740: .4byte gKirbys
_08119744: .4byte gKirbys+0x44
_08119748: .4byte gUnk_02020EEC
_08119748: .4byte gKirbys+0xC
_0811974C:
mov r1, r8
ldr r0, [r1, #8]

8
asm/boss_challenge_door.s
View File

@ -46,7 +46,7 @@ _08118B94:
adds r2, r4, #0
bl InitObject
ldr r0, [r6, #8]
ldr r1, _08118C10 @ =gUnk_0201CB40
ldr r1, _08118C10 @ =0x0201CB40
orrs r0, r1
str r0, [r6, #8]
ldr r0, [r6, #0x68]
@ -99,7 +99,7 @@ _08118B94:
pop {r1}
bx r1
.align 2, 0
_08118C10: .4byte gUnk_0201CB40
_08118C10: .4byte 0x0201CB40
_08118C14: .4byte gUnk_08351648
thumb_func_start sub_08118C18
@ -622,7 +622,7 @@ _08118FEE:
mov r1, sb
adds r2, r7, #0
bl sub_08002D40
ldr r0, _0811908C @ =gUnk_02020EEC
ldr r0, _0811908C @ =gKirbys+0xC
adds r2, r6, r0
ldr r0, [r2]
movs r1, #0x80
@ -666,7 +666,7 @@ _0811907C: .4byte gUnk_0203AD30
_08119080: .4byte gKirbys
_08119084: .4byte 0x0000065E
_08119088: .4byte gUnk_08357B24
_0811908C: .4byte gUnk_02020EEC
_0811908C: .4byte gKirbys+0xC
_08119090: .4byte sub_081191B4
thumb_func_start sub_08119094

4
asm/chest.s
View File

@ -59,7 +59,7 @@ _0800AD94:
adds r1, #0xe2
strh r0, [r1]
ldr r2, [r4, #8]
ldr r0, _0800ADD4 @ =gUnk_02018200
ldr r0, _0800ADD4 @ =0x02018200
orrs r2, r0
str r2, [r4, #8]
ldrh r1, [r5, #0x22]
@ -73,7 +73,7 @@ _0800AD94:
ands r2, r0
b _0800ADDA
.align 2, 0
_0800ADD4: .4byte gUnk_02018200
_0800ADD4: .4byte 0x02018200
_0800ADD8:
orrs r2, r3
_0800ADDA:

8
asm/code_08032E98.s
View File

@ -1557,7 +1557,7 @@ _08033AF8:
movs r4, #0xb0
lsls r4, r4, #1
adds r1, r3, r4
ldr r0, _08033B94 @ =gUnk_02020F5C
ldr r0, _08033B94 @ =gKirbys+0x7C
adds r2, r2, r0
ldr r0, [r2]
str r0, [r1]
@ -1597,7 +1597,7 @@ _08033B82:
pop {r0}
bx r0
.align 2, 0
_08033B94: .4byte gUnk_02020F5C
_08033B94: .4byte gKirbys+0x7C
_08033B98: .4byte gUnk_0203AD44
thumb_func_start sub_08033B9C
@ -12113,7 +12113,7 @@ _08038BC0:
beq _08038BD6
b _080390F4
_08038BD6:
ldr r6, _08038D68 @ =gUnk_02020F58
ldr r6, _08038D68 @ =gKirbys+0x78
adds r0, r2, r6
ldr r1, [r0]
ldr r0, _08038D64 @ =sub_080566E0
@ -12325,7 +12325,7 @@ _08038D58: .4byte gKirbys
_08038D5C: .4byte gUnk_03000510
_08038D60: .4byte 0x03800F00
_08038D64: .4byte sub_080566E0
_08038D68: .4byte gUnk_02020F58
_08038D68: .4byte gKirbys+0x78
_08038D6C: .4byte 0x00000103
_08038D70: .4byte gUnk_0203AD30
_08038D74:

4
asm/code_0806F734.s
View File

@ -49955,7 +49955,7 @@ _08087954:
ands r4, r0
rsbs r4, r4, #0
lsrs r4, r4, #0x1f
ldr r1, _08087A18 @ =gUnk_02020EEC
ldr r1, _08087A18 @ =gKirbys+0xC
adds r2, r7, r1
ldr r0, [r2]
movs r1, #0x80
@ -49990,7 +49990,7 @@ _080879FC:
.align 2, 0
_08087A10: .4byte gKirbys
_08087A14: .4byte gUnk_03000510
_08087A18: .4byte gUnk_02020EEC
_08087A18: .4byte gKirbys+0xC
_08087A1C: .4byte 0xFFFBFFFF
_08087A20: .4byte gUnk_0203AD44
_08087A24:

4
asm/code_0811C29C.s
View File

@ -173,7 +173,7 @@ _0811C3D8:
adds r2, r5, #0
bl InitObject
ldr r0, [r4, #8]
ldr r1, _0811C420 @ =gUnk_02018F40
ldr r1, _0811C420 @ =0x02018F40
orrs r0, r1
str r0, [r4, #8]
ldr r0, [r4, #0x5c]
@ -202,5 +202,5 @@ _0811C3D8:
pop {r1}
bx r1
.align 2, 0
_0811C420: .4byte gUnk_02018F40
_0811C420: .4byte 0x02018F40
_0811C424: .4byte gUnk_08351648

4
asm/code_0814A828.s
View File

@ -46,7 +46,7 @@ _0814A844:
bhs _0814A898
movs r6, #0xd4
lsls r6, r6, #1
ldr r5, _0814A8D8 @ =gUnk_02020EE8
ldr r5, _0814A8D8 @ =gKirbys+8
ldr r4, _0814A8DC @ =0xFEFFFFFF
_0814A880:
adds r0, r2, #0
@ -88,7 +88,7 @@ _0814A8C8: .4byte 0x0000012B
_0814A8CC: .4byte 0x00007FFF
_0814A8D0: .4byte gDispCnt
_0814A8D4: .4byte gUnk_0203AD30
_0814A8D8: .4byte gUnk_02020EE8
_0814A8D8: .4byte gKirbys+8
_0814A8DC: .4byte 0xFEFFFFFF
_0814A8E0: .4byte sub_0814A914
_0814A8E4: .4byte nullsub_12

12
asm/cutscene_trigger.s
View File

@ -99,7 +99,7 @@ _08020738:
adds r2, r7, #0
bl InitObject
ldr r0, [r4, #8]
ldr r1, _08020790 @ =gUnk_02018F40
ldr r1, _08020790 @ =0x02018F40
orrs r0, r1
str r0, [r4, #8]
ldr r0, [r4, #0xc]
@ -124,7 +124,7 @@ _08020738:
pop {r1}
bx r1
.align 2, 0
_08020790: .4byte gUnk_02018F40
_08020790: .4byte 0x02018F40
_08020794: .4byte gUnk_08351648
thumb_func_start sub_08020798
@ -2222,7 +2222,7 @@ _0802174E:
adds r0, #0x64
lsls r0, r0, #8
str r0, [r1]
ldr r3, _08021830 @ =gUnk_02020EE8
ldr r3, _08021830 @ =gKirbys+8
adds r2, r4, r3
ldr r1, [r2]
movs r0, #2
@ -2294,7 +2294,7 @@ _0802180C:
bx r0
.align 2, 0
_0802182C: .4byte gKirbys
_08021830: .4byte gUnk_02020EE8
_08021830: .4byte gKirbys+8
_08021834: .4byte gUnk_082DEA4C
_08021838: .4byte gUnk_082DEA4E
_0802183C: .4byte 0xFFFFCFFF
@ -6191,7 +6191,7 @@ sub_080235BC: @ 0x080235BC
adds r4, #0xb8
movs r0, #1
mov ip, r0
ldr r7, _08023604 @ =gUnk_02020EE8
ldr r7, _08023604 @ =gKirbys+8
movs r6, #0xd4
lsls r6, r6, #1
ldr r5, _08023608 @ =0xFEFFFFFF
@ -6223,7 +6223,7 @@ _080235EA:
pop {r0}
bx r0
.align 2, 0
_08023604: .4byte gUnk_02020EE8
_08023604: .4byte gKirbys+8
_08023608: .4byte 0xFEFFFFFF
thumb_func_start sub_0802360C

24
asm/kirby_cannon.s
View File

@ -604,7 +604,7 @@ _08121EB4:
ands r0, r1
cmp r0, #0
beq _08121EC4
ldr r0, _08121F14 @ =gUnk_02021088
ldr r0, _08121F14 @ =gKirbys+0x1A8
bl sub_0805BE64
_08121EC4:
ldrb r1, [r4]
@ -612,7 +612,7 @@ _08121EC4:
ands r0, r1
cmp r0, #0
beq _08121ED4
ldr r0, _08121F18 @ =gUnk_02021230
ldr r0, _08121F18 @ =gKirbys+0x350
bl sub_0805BE64
_08121ED4:
ldrb r1, [r4]
@ -620,7 +620,7 @@ _08121ED4:
ands r0, r1
cmp r0, #0
beq _08121EE4
ldr r0, _08121F1C @ =gUnk_020213D8
ldr r0, _08121F1C @ =gKirbys+0x4F8
bl sub_0805BE64
_08121EE4:
adds r0, r6, #0
@ -642,9 +642,9 @@ _08121F04: .4byte 0x0000046A
_08121F08: .4byte 0x00000612
_08121F0C: .4byte gCurLevelInfo
_08121F10: .4byte 0x0000065E
_08121F14: .4byte gUnk_02021088
_08121F18: .4byte gUnk_02021230
_08121F1C: .4byte gUnk_020213D8
_08121F14: .4byte gKirbys+0x1A8
_08121F18: .4byte gKirbys+0x350
_08121F1C: .4byte gKirbys+0x4F8
_08121F20:
adds r1, r6, #0
adds r1, #0x83
@ -812,7 +812,7 @@ _08122062:
ands r0, r1
cmp r0, #0
beq _081220A2
ldr r0, _08122140 @ =gUnk_02021088
ldr r0, _08122140 @ =gKirbys+0x1A8
adds r1, r6, #0
adds r1, #0xba
ldrh r1, [r1]
@ -844,7 +844,7 @@ _081220A2:
ands r0, r1
cmp r0, #0
beq _081220E2
ldr r0, _08122144 @ =gUnk_02021230
ldr r0, _08122144 @ =gKirbys+0x350
adds r1, r6, #0
adds r1, #0xba
ldrh r1, [r1]
@ -876,7 +876,7 @@ _081220E2:
ands r0, r1
cmp r0, #0
beq _08122122
ldr r0, _08122148 @ =gUnk_020213D8
ldr r0, _08122148 @ =gKirbys+0x4F8
mov r1, r8
adds r1, #0xba
ldrh r1, [r1]
@ -915,9 +915,9 @@ _08122122:
_08122134: .4byte sub_08122248
_08122138: .4byte 0xFFFFE000
_0812213C: .4byte gKirbys
_08122140: .4byte gUnk_02021088
_08122144: .4byte gUnk_02021230
_08122148: .4byte gUnk_020213D8
_08122140: .4byte gKirbys+0x1A8
_08122144: .4byte gKirbys+0x350
_08122148: .4byte gKirbys+0x4F8
thumb_func_start sub_0812214C
sub_0812214C: @ 0x0812214C

12
asm/large_star_stone_block.s
View File

@ -995,7 +995,7 @@ _0812093C:
adds r2, r5, #0
bl InitObject
ldr r0, [r4, #8]
ldr r1, _08120984 @ =gUnk_02018F40
ldr r1, _08120984 @ =0x02018F40
orrs r0, r1
str r0, [r4, #8]
ldr r0, [r4, #0x5c]
@ -1024,7 +1024,7 @@ _0812093C:
pop {r1}
bx r1
.align 2, 0
_08120984: .4byte gUnk_02018F40
_08120984: .4byte 0x02018F40
_08120988: .4byte gUnk_08351648
thumb_func_start sub_0812098C
@ -1506,7 +1506,7 @@ _08120D28:
adds r2, r5, #0
bl InitObject
ldr r0, [r4, #8]
ldr r1, _08120D70 @ =gUnk_02018F40
ldr r1, _08120D70 @ =0x02018F40
orrs r0, r1
str r0, [r4, #8]
ldr r0, [r4, #0x5c]
@ -1535,7 +1535,7 @@ _08120D28:
pop {r1}
bx r1
.align 2, 0
_08120D70: .4byte gUnk_02018F40
_08120D70: .4byte 0x02018F40
_08120D74: .4byte gUnk_08351648
thumb_func_start sub_08120D78
@ -1871,7 +1871,7 @@ _08120FD4:
adds r2, r5, #0
bl InitObject
ldr r0, [r4, #8]
ldr r1, _08121024 @ =gUnk_02008300
ldr r1, _08121024 @ =0x02008300
orrs r0, r1
str r0, [r4, #8]
ldr r0, [r4, #0x68]
@ -1905,7 +1905,7 @@ _08120FD4:
pop {r1}
bx r1
.align 2, 0
_08121024: .4byte gUnk_02008300
_08121024: .4byte 0x02008300
_08121028: .4byte gUnk_08351648
thumb_func_start sub_0812102C

12
asm/lava_wall.s
View File

@ -46,7 +46,7 @@ _0811C46C:
adds r2, r5, #0
bl InitObject
ldr r2, [r4, #8]
ldr r0, _0811C4A4 @ =gUnk_02008540
ldr r0, _0811C4A4 @ =0x02008540
orrs r2, r0
str r2, [r4, #8]
adds r0, r4, #0
@ -69,7 +69,7 @@ _0811C46C:
orrs r0, r1
b _0811C4B8
.align 2, 0
_0811C4A4: .4byte gUnk_02008540
_0811C4A4: .4byte 0x02008540
_0811C4A8:
movs r0, #0x80
lsls r0, r0, #2
@ -2269,7 +2269,7 @@ _0811D542:
lsls r0, r0, #0x18
cmp r0, #0
beq _0811D5C0
ldr r0, _0811D5B8 @ =gUnk_02020EEC
ldr r0, _0811D5B8 @ =gKirbys+0xC
add r0, sb
ldr r0, [r0]
movs r1, #0x80
@ -2306,7 +2306,7 @@ _0811D5A2:
b _0811D5CC
.align 2, 0
_0811D5B4: .4byte gKirbys
_0811D5B8: .4byte gUnk_02020EEC
_0811D5B8: .4byte gKirbys+0xC
_0811D5BC: .4byte gCurLevelInfo+0x1EC
_0811D5C0:
movs r1, #1
@ -2484,7 +2484,7 @@ _0811D6E4:
lsls r0, r0, #0x18
cmp r0, #0
beq _0811D770
ldr r0, _0811D768 @ =gUnk_02020EEC
ldr r0, _0811D768 @ =gKirbys+0xC
add r0, r8
ldr r0, [r0]
movs r1, #0x80
@ -2526,7 +2526,7 @@ _0811D746:
.align 2, 0
_0811D760: .4byte gUnk_0203AD44
_0811D764: .4byte gKirbys
_0811D768: .4byte gUnk_02020EEC
_0811D768: .4byte gKirbys+0xC
_0811D76C: .4byte gCurLevelInfo+0x1EC
_0811D770:
movs r1, #1

4
asm/object_spawner.s
View File

@ -509,7 +509,7 @@ _0811BE14:
adds r2, r5, #0
bl InitObject
ldr r0, [r4, #8]
ldr r1, _0811BE5C @ =gUnk_02018F40
ldr r1, _0811BE5C @ =0x02018F40
orrs r0, r1
str r0, [r4, #8]
ldr r0, [r4, #0x5c]
@ -538,7 +538,7 @@ _0811BE14:
pop {r1}
bx r1
.align 2, 0
_0811BE5C: .4byte gUnk_02018F40
_0811BE5C: .4byte 0x02018F40
_0811BE60: .4byte gUnk_08351648
thumb_func_start sub_0811BE64

4
asm/shadow_kirby.s
View File

@ -3046,7 +3046,7 @@ sub_08024F2C: @ 0x08024F2C
cmp r0, #0
bne _08024F46
ldr r0, [r2, #8]
ldr r1, _08024F4C @ =gUnk_02008340
ldr r1, _08024F4C @ =0x02008340
orrs r0, r1
str r0, [r2, #8]
ldr r0, _08024F50 @ =nullsub_114
@ -3055,7 +3055,7 @@ _08024F46:
pop {r0}
bx r0
.align 2, 0
_08024F4C: .4byte gUnk_02008340
_08024F4C: .4byte 0x02008340
_08024F50: .4byte nullsub_114
thumb_func_start sub_08024F54

4
asm/special_doors.s
View File

@ -7229,7 +7229,7 @@ _0802E2A4:
bhs _0802E2D0
movs r6, #0xd4
lsls r6, r6, #1
ldr r5, _0802E324 @ =gUnk_02020EE8
ldr r5, _0802E324 @ =gKirbys+8
movs r4, #0x80
lsls r4, r4, #0x11
_0802E2B8:
@ -7284,7 +7284,7 @@ _0802E314: .4byte gUnk_0203AD44
_0802E318: .4byte gUnk_0203AD2C
_0802E31C: .4byte gUnk_02038590
_0802E320: .4byte gUnk_082D8D28
_0802E324: .4byte gUnk_02020EE8
_0802E324: .4byte gKirbys+8
_0802E328: .4byte gUnk_0203AD10
_0802E32C: .4byte gUnk_0203AD3C
_0802E330: .4byte gUnk_0203AD24

4
asm/star_stone_block.s
View File

@ -1111,7 +1111,7 @@ _0811F16C:
adds r2, r4, #0
bl InitObject
ldr r0, [r5, #8]
ldr r1, _0811F204 @ =gUnk_02008740
ldr r1, _0811F204 @ =0x02008740
orrs r0, r1
str r0, [r5, #8]
ldr r0, [r5, #0x68]
@ -1179,7 +1179,7 @@ _0811F16C:
pop {r1}
bx r1
.align 2, 0
_0811F204: .4byte gUnk_02008740
_0811F204: .4byte 0x02008740
_0811F208: .4byte gUnk_08351648
thumb_func_start sub_0811F20C

14
linker.ld
View File

@ -12,21 +12,7 @@ MEMORY {
SECTIONS {
ewram (NOLOAD) : ALIGN(4) {
gEwramHeap = 0;
. = 0x00008300; gUnk_02008300 = .;
. = 0x00008340; gUnk_02008340 = .;
. = 0x00008540; gUnk_02008540 = .;
. = 0x00008740; gUnk_02008740 = .;
. = 0x00018200; gUnk_02018200 = .;
. = 0x00018F40; gUnk_02018F40 = .;
. = 0x0001CB40; gUnk_0201CB40 = .;
. = 0x00020EE0; gKirbys = .;
. = 0x00020EE8; gUnk_02020EE8 = .;
. = 0x00020EEC; gUnk_02020EEC = .;
. = 0x00020F58; gUnk_02020F58 = .;
. = 0x00020F5C; gUnk_02020F5C = .;
. = 0x00021088; gUnk_02021088 = .;
. = 0x00021230; gUnk_02021230 = .;
. = 0x000213D8; gUnk_020213D8 = .;
. = 0x00021580; gUnk_02021580 = .;
. = 0x00021590; gUnk_02021590 = .;
. = 0x00022120; gUnk_02022120 = .;