mirror of https://github.com/zeldaret/tmc.git
Merge branch 'master' of https://github.com/zeldaret/tmc
This commit is contained in:
21aslade
commit
e241a70a31
|
|
@ -6,32 +6,6 @@
|
|||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_0805D250
|
||||
sub_0805D250: @ 0x0805D250
|
||||
push {lr}
|
||||
ldr r2, _0805D264 @ =gUnk_08108D3C
|
||||
ldrb r1, [r0, #0xa]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r2
|
||||
ldr r1, [r1]
|
||||
bl _call_via_r1
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_0805D264: .4byte gUnk_08108D3C
|
||||
|
||||
thumb_func_start sub_0805D268
|
||||
sub_0805D268: @ 0x0805D268
|
||||
push {lr}
|
||||
ldr r2, _0805D27C @ =gUnk_08108D44
|
||||
ldrb r1, [r0, #0xc]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r2
|
||||
ldr r1, [r1]
|
||||
bl _call_via_r1
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_0805D27C: .4byte gUnk_08108D44
|
||||
|
||||
thumb_func_start sub_0805D280
|
||||
sub_0805D280: @ 0x0805D280
|
||||
push {r4, lr}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,38 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_080D3D94:: @ 080D3D94
|
||||
.incbin "baserom.gba", 0x0D3D94, 0x00000E0
|
||||
|
||||
gUnk_080D3E74:: @ 080D3E74
|
||||
.incbin "baserom.gba", 0x0D3E74, 0x000001C
|
||||
|
||||
gUnk_080D3E90:: @ 080D3E90
|
||||
.incbin "baserom.gba", 0x0D3E90, 0x00000A0
|
||||
|
||||
gUnk_080D3F30:: @ 080D3F30
|
||||
.incbin "baserom.gba", 0x0D3F30, 0x00000A0
|
||||
|
||||
gUnk_080D3FD0:: @ 080D3FD0
|
||||
.incbin "baserom.gba", 0x0D3FD0, 0x00000A0
|
||||
|
||||
gUnk_080D4070:: @ 080D4070
|
||||
.incbin "baserom.gba", 0x0D4070, 0x00000A0
|
||||
|
||||
gUnk_080D4110:: @ 080D4110
|
||||
.incbin "baserom.gba", 0x0D4110, 0x0000010
|
||||
|
||||
gUnk_080D4120:: @ 080D4120
|
||||
.incbin "baserom.gba", 0x0D4120, 0x000000C
|
||||
|
||||
gUnk_080D412C:: @ 080D412C
|
||||
.incbin "baserom.gba", 0x0D412C, 0x000000C
|
||||
|
||||
gUnk_080D4138:: @ 080D4138
|
||||
.incbin "baserom.gba", 0x0D4138, 0x0000008
|
||||
|
||||
gUnk_080D4140:: @ 080D4140
|
||||
.incbin "baserom.gba", 0x0D4140, 0x0000010
|
||||
|
|
@ -4,312 +4,6 @@
|
|||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_080D3D94:: @ 080D3D94
|
||||
.incbin "baserom.gba", 0x0D3D94, 0x00000E0
|
||||
|
||||
gUnk_080D3E74:: @ 080D3E74
|
||||
.incbin "baserom.gba", 0x0D3E74, 0x000001C
|
||||
|
||||
gUnk_080D3E90:: @ 080D3E90
|
||||
.incbin "baserom.gba", 0x0D3E90, 0x00000A0
|
||||
|
||||
gUnk_080D3F30:: @ 080D3F30
|
||||
.incbin "baserom.gba", 0x0D3F30, 0x00000A0
|
||||
|
||||
gUnk_080D3FD0:: @ 080D3FD0
|
||||
.incbin "baserom.gba", 0x0D3FD0, 0x00000A0
|
||||
|
||||
gUnk_080D4070:: @ 080D4070
|
||||
.incbin "baserom.gba", 0x0D4070, 0x00000A0
|
||||
|
||||
gUnk_080D4110:: @ 080D4110
|
||||
.incbin "baserom.gba", 0x0D4110, 0x0000010
|
||||
|
||||
gUnk_080D4120:: @ 080D4120
|
||||
.incbin "baserom.gba", 0x0D4120, 0x000000C
|
||||
|
||||
gUnk_080D412C:: @ 080D412C
|
||||
.incbin "baserom.gba", 0x0D412C, 0x000000C
|
||||
|
||||
gUnk_080D4138:: @ 080D4138
|
||||
.incbin "baserom.gba", 0x0D4138, 0x0000008
|
||||
|
||||
gUnk_080D4140:: @ 080D4140
|
||||
.incbin "baserom.gba", 0x0D4140, 0x0000010
|
||||
|
||||
gUnk_080D4150:: @ 080D4150
|
||||
.incbin "baserom.gba", 0x0D4150, 0x0000020
|
||||
|
||||
gUnk_080D4170:: @ 080D4170
|
||||
.incbin "baserom.gba", 0x0D4170, 0x0000040
|
||||
|
||||
gUnk_080D41B0:: @ 080D41B0
|
||||
.incbin "baserom.gba", 0x0D41B0, 0x0000020
|
||||
|
||||
gUnk_080D41D0:: @ 080D41D0
|
||||
.incbin "baserom.gba", 0x0D41D0, 0x0000040
|
||||
|
||||
gUnk_080D4210:: @ 080D4210
|
||||
.incbin "baserom.gba", 0x0D4210, 0x0000040
|
||||
|
||||
gUnk_080D4250:: @ 080D4250
|
||||
.incbin "baserom.gba", 0x0D4250, 0x0000028
|
||||
|
||||
gUnk_080D4278:: @ 080D4278
|
||||
.incbin "baserom.gba", 0x0D4278, 0x0000008
|
||||
|
||||
gUnk_080D4280:: @ 080D4280
|
||||
.incbin "baserom.gba", 0x0D4280, 0x0000004
|
||||
|
||||
gUnk_080D4284:: @ 080D4284
|
||||
.incbin "baserom.gba", 0x0D4284, 0x0000058
|
||||
|
||||
gUnk_080D42DC:: @ 080D42DC
|
||||
.incbin "baserom.gba", 0x0D42DC, 0x0000028
|
||||
|
||||
gUnk_080D4304:: @ 080D4304
|
||||
.incbin "baserom.gba", 0x0D4304, 0x0000020
|
||||
|
||||
gUnk_080D4324:: @ 080D4324
|
||||
.incbin "baserom.gba", 0x0D4324, 0x0000020
|
||||
|
||||
gUnk_080D4344:: @ 080D4344
|
||||
.incbin "baserom.gba", 0x0D4344, 0x0000020
|
||||
|
||||
gUnk_080D4364:: @ 080D4364
|
||||
.incbin "baserom.gba", 0x0D4364, 0x0000010
|
||||
|
||||
gUnk_080D4374:: @ 080D4374
|
||||
.incbin "baserom.gba", 0x0D4374, 0x0000010
|
||||
|
||||
gUnk_080D4384:: @ 080D4384
|
||||
.incbin "baserom.gba", 0x0D4384, 0x0000010
|
||||
|
||||
gUnk_080D4394:: @ 080D4394
|
||||
.incbin "baserom.gba", 0x0D4394, 0x0000054
|
||||
|
||||
gUnk_080D43E8:: @ 080D43E8
|
||||
.incbin "baserom.gba", 0x0D43E8, 0x0000010
|
||||
|
||||
gUnk_080D43F8:: @ 080D43F8
|
||||
.incbin "baserom.gba", 0x0D43F8, 0x0000020
|
||||
|
||||
gUnk_080D4418:: @ 080D4418
|
||||
.incbin "baserom.gba", 0x0D4418, 0x0000020
|
||||
|
||||
gUnk_080D4438:: @ 080D4438
|
||||
.incbin "baserom.gba", 0x0D4438, 0x0000020
|
||||
|
||||
gUnk_080D4458:: @ 080D4458
|
||||
.incbin "baserom.gba", 0x0D4458, 0x0000010
|
||||
|
||||
gUnk_080D4468:: @ 080D4468
|
||||
.incbin "baserom.gba", 0x0D4468, 0x0000020
|
||||
|
||||
gUnk_080D4488:: @ 080D4488
|
||||
.incbin "baserom.gba", 0x0D4488, 0x0000020
|
||||
|
||||
gUnk_080D44A8:: @ 080D44A8
|
||||
.incbin "baserom.gba", 0x0D44A8, 0x0000020
|
||||
|
||||
gUnk_080D44C8:: @ 080D44C8
|
||||
.incbin "baserom.gba", 0x0D44C8, 0x0000020
|
||||
|
||||
gUnk_080D44E8:: @ 080D44E8
|
||||
.incbin "baserom.gba", 0x0D44E8, 0x0000014
|
||||
|
||||
gUnk_080D44FC:: @ 080D44FC
|
||||
.incbin "baserom.gba", 0x0D44FC, 0x0000004
|
||||
|
||||
gUnk_080D4500:: @ 080D4500
|
||||
.incbin "baserom.gba", 0x0D4500, 0x0000020
|
||||
|
||||
gUnk_080D4520:: @ 080D4520
|
||||
.incbin "baserom.gba", 0x0D4520, 0x0000004
|
||||
|
||||
gUnk_080D4524:: @ 080D4524
|
||||
.incbin "baserom.gba", 0x0D4524, 0x0000084
|
||||
|
||||
gUnk_080D45A8:: @ 080D45A8
|
||||
.incbin "baserom.gba", 0x0D45A8, 0x0000004
|
||||
|
||||
gUnk_080D45AC:: @ 080D45AC
|
||||
.incbin "baserom.gba", 0x0D45AC, 0x00000A0
|
||||
|
||||
gUnk_080D464C:: @ 080D464C
|
||||
.incbin "baserom.gba", 0x0D464C, 0x0000004
|
||||
|
||||
gUnk_080D4650:: @ 080D4650
|
||||
.incbin "baserom.gba", 0x0D4650, 0x0000094
|
||||
|
||||
gUnk_080D46E4:: @ 080D46E4
|
||||
.incbin "baserom.gba", 0x0D46E4, 0x0000004
|
||||
|
||||
gUnk_080D46E8:: @ 080D46E8
|
||||
.incbin "baserom.gba", 0x0D46E8, 0x0000008
|
||||
|
||||
gUnk_080D46F0:: @ 080D46F0
|
||||
.incbin "baserom.gba", 0x0D46F0, 0x00000E0
|
||||
|
||||
gUnk_080D47D0:: @ 080D47D0
|
||||
.incbin "baserom.gba", 0x0D47D0, 0x0000024
|
||||
|
||||
gUnk_080D47F4:: @ 080D47F4
|
||||
.incbin "baserom.gba", 0x0D47F4, 0x00000CC
|
||||
|
||||
gUnk_080D48C0:: @ 080D48C0
|
||||
.incbin "baserom.gba", 0x0D48C0, 0x0000004
|
||||
|
||||
gUnk_080D48C4:: @ 080D48C4
|
||||
.incbin "baserom.gba", 0x0D48C4, 0x0000014
|
||||
|
||||
gUnk_080D48D8:: @ 080D48D8
|
||||
.incbin "baserom.gba", 0x0D48D8, 0x0000018
|
||||
|
||||
gUnk_080D48F0:: @ 080D48F0
|
||||
.incbin "baserom.gba", 0x0D48F0, 0x0000004
|
||||
|
||||
gUnk_080D48F4:: @ 080D48F4
|
||||
.incbin "baserom.gba", 0x0D48F4, 0x00000EC
|
||||
|
||||
gUnk_080D49E0:: @ 080D49E0
|
||||
.incbin "baserom.gba", 0x0D49E0, 0x0000008
|
||||
|
||||
gUnk_080D49E8:: @ 080D49E8
|
||||
.incbin "baserom.gba", 0x0D49E8, 0x0000008
|
||||
|
||||
gUnk_080D49F0:: @ 080D49F0
|
||||
.incbin "baserom.gba", 0x0D49F0, 0x0000004
|
||||
|
||||
gUnk_080D49F4:: @ 080D49F4
|
||||
.incbin "baserom.gba", 0x0D49F4, 0x0000004
|
||||
|
||||
gUnk_080D49F8:: @ 080D49F8
|
||||
.incbin "baserom.gba", 0x0D49F8, 0x0000024
|
||||
|
||||
gUnk_080D4A1C:: @ 080D4A1C
|
||||
.incbin "baserom.gba", 0x0D4A1C, 0x0000010
|
||||
|
||||
gUnk_080D4A2C:: @ 080D4A2C
|
||||
.incbin "baserom.gba", 0x0D4A2C, 0x0000010
|
||||
|
||||
gUnk_080D4A3C:: @ 080D4A3C
|
||||
.incbin "baserom.gba", 0x0D4A3C, 0x0000010
|
||||
|
||||
gUnk_080D4A4C:: @ 080D4A4C
|
||||
.incbin "baserom.gba", 0x0D4A4C, 0x0000010
|
||||
|
||||
gUnk_080D4A5C:: @ 080D4A5C
|
||||
.incbin "baserom.gba", 0x0D4A5C, 0x0000010
|
||||
|
||||
gUnk_080D4A6C:: @ 080D4A6C
|
||||
.incbin "baserom.gba", 0x0D4A6C, 0x0000010
|
||||
|
||||
gUnk_080D4A7C:: @ 080D4A7C
|
||||
.incbin "baserom.gba", 0x0D4A7C, 0x0000010
|
||||
|
||||
gUnk_080D4A8C:: @ 080D4A8C
|
||||
.incbin "baserom.gba", 0x0D4A8C, 0x0000010
|
||||
|
||||
gUnk_080D4A9C:: @ 080D4A9C
|
||||
.incbin "baserom.gba", 0x0D4A9C, 0x0000010
|
||||
|
||||
gUnk_080D4AAC:: @ 080D4AAC
|
||||
.incbin "baserom.gba", 0x0D4AAC, 0x0000010
|
||||
|
||||
gUnk_080D4ABC:: @ 080D4ABC
|
||||
.incbin "baserom.gba", 0x0D4ABC, 0x00000C0
|
||||
|
||||
gUnk_080D4B7C:: @ 080D4B7C
|
||||
.incbin "baserom.gba", 0x0D4B7C, 0x00000C0
|
||||
|
||||
gUnk_080D4C3C:: @ 080D4C3C
|
||||
.incbin "baserom.gba", 0x0D4C3C, 0x0000040
|
||||
|
||||
gUnk_080D4C7C:: @ 080D4C7C
|
||||
.incbin "baserom.gba", 0x0D4C7C, 0x0000040
|
||||
|
||||
gUnk_080D4CBC:: @ 080D4CBC
|
||||
.incbin "baserom.gba", 0x0D4CBC, 0x00000C0
|
||||
|
||||
gUnk_080D4D7C:: @ 080D4D7C
|
||||
.incbin "baserom.gba", 0x0D4D7C, 0x0000040
|
||||
|
||||
gUnk_080D4DBC:: @ 080D4DBC
|
||||
.incbin "baserom.gba", 0x0D4DBC, 0x0000080
|
||||
|
||||
gUnk_080D4E3C:: @ 080D4E3C
|
||||
.incbin "baserom.gba", 0x0D4E3C, 0x0000040
|
||||
|
||||
gUnk_080D4E7C:: @ 080D4E7C
|
||||
.incbin "baserom.gba", 0x0D4E7C, 0x0000044
|
||||
|
||||
gUnk_080D4EC0:: @ 080D4EC0
|
||||
.incbin "baserom.gba", 0x0D4EC0, 0x0000060
|
||||
|
||||
gUnk_080D4F20:: @ 080D4F20
|
||||
.incbin "baserom.gba", 0x0D4F20, 0x0000010
|
||||
|
||||
gUnk_080D4F30:: @ 080D4F30
|
||||
.incbin "baserom.gba", 0x0D4F30, 0x0000004
|
||||
|
||||
gUnk_080D4F34:: @ 080D4F34
|
||||
.incbin "baserom.gba", 0x0D4F34, 0x0000010
|
||||
|
||||
gUnk_080D4F44:: @ 080D4F44
|
||||
.incbin "baserom.gba", 0x0D4F44, 0x0000004
|
||||
|
||||
gUnk_080D4F48:: @ 080D4F48
|
||||
.incbin "baserom.gba", 0x0D4F48, 0x0000008
|
||||
|
||||
gUnk_080D4F50:: @ 080D4F50
|
||||
.incbin "baserom.gba", 0x0D4F50, 0x0000060
|
||||
|
||||
gUnk_080D4FB0:: @ 080D4FB0
|
||||
.incbin "baserom.gba", 0x0D4FB0, 0x0000028
|
||||
|
||||
gUnk_080D4FD8:: @ 080D4FD8
|
||||
.incbin "baserom.gba", 0x0D4FD8, 0x0000008
|
||||
|
||||
gUnk_080D4FE0:: @ 080D4FE0
|
||||
.incbin "baserom.gba", 0x0D4FE0, 0x0000028
|
||||
|
||||
gUnk_080D5008:: @ 080D5008
|
||||
.incbin "baserom.gba", 0x0D5008, 0x0000008
|
||||
|
||||
gUnk_080D5010:: @ 080D5010
|
||||
.incbin "baserom.gba", 0x0D5010, 0x0000008
|
||||
|
||||
gUnk_080D5018:: @ 080D5018
|
||||
.incbin "baserom.gba", 0x0D5018, 0x0000040
|
||||
|
||||
gUnk_080D5058:: @ 080D5058
|
||||
.incbin "baserom.gba", 0x0D5058, 0x0000004
|
||||
|
||||
gUnk_080D505C:: @ 080D505C
|
||||
.incbin "baserom.gba", 0x0D505C, 0x0000008
|
||||
|
||||
gUnk_080D5064:: @ 080D5064
|
||||
.incbin "baserom.gba", 0x0D5064, 0x0000020
|
||||
|
||||
gUnk_080D5084:: @ 080D5084
|
||||
.incbin "baserom.gba", 0x0D5084, 0x0000008
|
||||
|
||||
gUnk_080D508C:: @ 080D508C
|
||||
.incbin "baserom.gba", 0x0D508C, 0x0000020
|
||||
|
||||
gUnk_080D50AC:: @ 080D50AC
|
||||
.incbin "baserom.gba", 0x0D50AC, 0x0000010
|
||||
|
||||
gUnk_080D50BC:: @ 080D50BC
|
||||
.incbin "baserom.gba", 0x0D50BC, 0x000002C
|
||||
|
||||
gUnk_080D50E8:: @ 080D50E8
|
||||
.incbin "baserom.gba", 0x0D50E8, 0x0000014
|
||||
|
||||
gUnk_080D50FC:: @ 080D50FC
|
||||
.incbin "baserom.gba", 0x0D50FC, 0x0000264
|
||||
|
||||
gUnk_080D5360:: @ 080D5360
|
||||
.incbin "baserom.gba", 0x0D5360, 0x0000040
|
||||
|
||||
27
linker.ld
27
linker.ld
|
|
@ -279,16 +279,16 @@ SECTIONS {
|
|||
/* handwritten assembly */
|
||||
asm/crt0.o(.text);
|
||||
asm/code_08000108.o(.text);
|
||||
data/data_1.o(.rodata);
|
||||
data/data_08000360.o(.rodata);
|
||||
asm/code_08000E44.o(.text);
|
||||
asm/libgcc.o(.text);
|
||||
asm/code_08000F10.o(.text);
|
||||
data/data_2.o(.rodata);
|
||||
data/data_08000F54.o(.rodata);
|
||||
asm/code_080011C4.o(.text);
|
||||
data/data_4.o(.rodata);
|
||||
data/data_080029B4.o(.rodata);
|
||||
asm/code_08003FC4.o(.text);
|
||||
asm/code_080043E8.o(.text);
|
||||
data/data_6.o(.rodata);
|
||||
data/data_08007DF4.o(.rodata);
|
||||
asm/code_0800857C.o(.text);
|
||||
asm/sub_08016AE4.o(.text);
|
||||
|
||||
|
|
@ -506,6 +506,7 @@ SECTIONS {
|
|||
asm/manager2B.o(.text);
|
||||
asm/manager2C.o(.text);
|
||||
asm/manager2D.o(.text);
|
||||
src/manager2E.o(.text);
|
||||
asm/manager2E.o(.text);
|
||||
asm/manager2F.o(.text);
|
||||
asm/manager30.o(.text);
|
||||
|
|
@ -882,22 +883,24 @@ SECTIONS {
|
|||
/* handwritten assembly in arm mode */
|
||||
asm/intr.o(.text);
|
||||
/* data */
|
||||
data/data_8.o(.rodata);
|
||||
data/data_080B2A70.o(.rodata);
|
||||
src/object.o(.rodata);
|
||||
data/data_81.o(.rodata);
|
||||
data/data_080B3054.o(.rodata);
|
||||
src/npc.o(.rodata);
|
||||
data/data_811.o(.rodata);
|
||||
data/data_080B3740.o(.rodata);
|
||||
src/trig.o(.rodata);
|
||||
data/data_82.o(.rodata);
|
||||
data/data_080C93E0.o(.rodata);
|
||||
src/enemy.o(.rodata);
|
||||
data/data_9.o(.rodata);
|
||||
data/data_080D3D94.o(.rodata);
|
||||
data/areaPropertyLists.o(.rodata);
|
||||
data/data_080D5360.o(.rodata);
|
||||
src/item.o(.rodata);
|
||||
data/data_901.o(.rodata);
|
||||
data/data_0811BD44.o(.rodata);
|
||||
src/greatFairy.o(.rodata);
|
||||
data/greatFairyAnimations.o(.rodata);
|
||||
data/data_902.o(.rodata);
|
||||
data/data_081208A0.o(.rodata);
|
||||
data/strings.o(.rodata);
|
||||
data/data_91.o(.rodata);
|
||||
data/data_089FC6C4.o(.rodata);
|
||||
} >rom
|
||||
|
||||
/* DWARF 2 sections */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
#include "global.h"
|
||||
#include "entity.h"
|
||||
|
||||
extern void (*const gUnk_08108D3C[])(Entity*);
|
||||
extern void (*const gUnk_08108D44[])(Entity*);
|
||||
|
||||
void sub_0805D250(Entity *this)
|
||||
{
|
||||
gUnk_08108D3C[this->entityType.form](this);
|
||||
}
|
||||
|
||||
void sub_0805D268(Entity *this)
|
||||
{
|
||||
gUnk_08108D44[this->action](this);
|
||||
}
|
||||
Loading…
Reference in New Issue