mirror of
https://github.com/zeldaret/tmc
synced 2026-08-09 02:48:23 -04:00
Merge branch 'master' into asset-extraction
This commit is contained in:
+15
-13
@@ -3,20 +3,22 @@
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
.4byte sub_08016B30
|
||||
.4byte sub_08016B30
|
||||
.4byte sub_08016B30
|
||||
|
||||
gUnk_080B2A70:: @ 080B2A70
|
||||
.4byte DummyIntr
|
||||
.4byte DummyIntr
|
||||
.4byte DummyIntr
|
||||
.4byte HBlankIntr
|
||||
.4byte sub_08016B6C
|
||||
.4byte sub_08016B30
|
||||
.4byte sub_08016B30
|
||||
.4byte sub_08016B30
|
||||
.4byte sub_08016B30
|
||||
.4byte sub_08016B30
|
||||
.4byte sub_08016B30
|
||||
.4byte sub_08016B30
|
||||
.4byte sub_08016B30
|
||||
.4byte sub_08016B30
|
||||
.4byte VBlankIntr
|
||||
.4byte DummyIntr
|
||||
.4byte DummyIntr
|
||||
.4byte DummyIntr
|
||||
.4byte DummyIntr
|
||||
.4byte DummyIntr
|
||||
.4byte DummyIntr
|
||||
.4byte DummyIntr
|
||||
.4byte DummyIntr
|
||||
.4byte DummyIntr
|
||||
|
||||
unusedLabel_0B21D0::
|
||||
@ TODO contains some pointers to iwram
|
||||
|
||||
@@ -4,34 +4,6 @@
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_080B3740:: @ 080B3740
|
||||
.incbin "data_080B3740/gUnk_080B3740.bin"
|
||||
|
||||
gUnk_080B3744:: @ 080B3744
|
||||
.4byte sub_08018308
|
||||
.4byte sub_08017AD8
|
||||
.4byte sub_08017AD8
|
||||
.4byte sub_08017ADC
|
||||
.4byte sub_08017B58
|
||||
.4byte sub_08017EB0
|
||||
.4byte sub_08017F3C
|
||||
.4byte sub_08017F40
|
||||
.4byte sub_0801802C
|
||||
.4byte sub_08017DD4
|
||||
.4byte sub_080180E8
|
||||
.4byte sub_08017BBC
|
||||
.4byte sub_08017C40
|
||||
.4byte sub_08017D6C
|
||||
.4byte sub_08017D28
|
||||
.4byte sub_08018168
|
||||
.4byte sub_08018228
|
||||
.4byte sub_08018250
|
||||
.4byte sub_08018288
|
||||
.4byte sub_080182A8
|
||||
.4byte sub_08017B1C
|
||||
.4byte sub_08017CBC
|
||||
.4byte sub_08017E88
|
||||
|
||||
gUnk_080B37A0:: @ 080B37A0
|
||||
.ifdef EU
|
||||
@ TODO only small differences
|
||||
|
||||
+14
-2
@@ -4,8 +4,20 @@
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_080B7B74:: @ 080B7B74
|
||||
.incbin "data_080B7B74/gUnk_080B7B74.bin"
|
||||
@ FIXME add to asset configurations
|
||||
@gUnk_080B7B74:: @ 080B7B74
|
||||
@ .incbin "data_080B7B74/gUnk_080B7B74.bin"
|
||||
|
||||
gCollisionMtx:: @ 080B7B74
|
||||
.incbin "baserom.gba", 0x0B7B74, 0x00004BA
|
||||
|
||||
gUnk_080B802E:: @ 080B802E
|
||||
.incbin "baserom.gba", 0x0B802E, 0x0002292
|
||||
|
||||
gUnk_080BA2C0:: @ 080BA2C0
|
||||
.incbin "baserom.gba", 0x0BA2C0, 0x0000FE0
|
||||
|
||||
gUnk_080BB2A0:: @ 080BB2A0
|
||||
.ifdef EU
|
||||
.incbin "data_080B7B74/gUnk_080B7B74_1_EU.bin"
|
||||
.else
|
||||
|
||||
Reference in New Issue
Block a user