Merge branch 'demo-jp' into asset-extraction

This commit is contained in:
octorock
2021-10-23 14:16:44 +02:00
50 changed files with 6898 additions and 15095 deletions
-24
View File
@@ -1,24 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1888:: @ 080D1888
.4byte sub_080456E8
.4byte sub_08045700
.4byte sub_080456E8
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte nullsub_173
gUnk_080D18A0:: @ 080D18A0
.4byte sub_080457E4
.4byte sub_0804586C
.4byte sub_080458C4
.4byte sub_08045938
.4byte sub_08045984
gUnk_080D18B4:: @ 080D18B4
.incbin "enemy5A/gUnk_080D18B4.bin"
-26
View File
@@ -1,26 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1D48:: @ 080D1D48
.4byte sub_080482EC
.4byte sub_08048330
.4byte sub_0804835C
.4byte sub_08048388
.4byte sub_080483F8
.4byte sub_08048438
.4byte sub_08048478
.4byte sub_080484E8
.4byte sub_08048550
.4byte sub_080485A0
gUnk_080D1D70:: @ 080D1D70
.incbin "enemy5F/gUnk_080D1D70.bin"
gUnk_080D1D78:: @ 080D1D78
.incbin "enemy5F/gUnk_080D1D78.bin"
gUnk_080D1D98:: @ 080D1D98
.incbin "enemy5F/gUnk_080D1D98.bin"
-170
View File
@@ -1,170 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1230:: @ 080D1230
.4byte sub_08042570
.4byte sub_08042588
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte nullsub_170
gUnk_080D1248:: @ 080D1248
.4byte sub_0804259C
.4byte sub_08044078
.4byte sub_08044078
.4byte sub_08044078
.4byte sub_080440CC
gUnk_080D125C:: @ 080D125C
.4byte sub_080425B4
.4byte sub_08042654
.4byte sub_08042818
.4byte sub_08042870
.4byte sub_08042A3C
.4byte sub_08042C14
.4byte sub_0804325C
.4byte sub_08043420
.4byte sub_08043680
gUnk_080D1280:: @ 080D1280
.incbin "vaatiArm/gUnk_080D1280.bin"
gUnk_080D1284:: @ 080D1284
.incbin "vaatiArm/gUnk_080D1284.bin"
gUnk_080D1286:: @ 080D1286
.incbin "vaatiArm/gUnk_080D1286.bin"
gUnk_080D1290:: @ 080D1290
.4byte sub_08042894
.4byte sub_080428AC
.4byte sub_080428FC
.4byte sub_08042944
.4byte sub_08042970
.4byte sub_080429D4
.4byte sub_080429FC
gUnk_080D12AC:: @ 080D12AC
.incbin "vaatiArm/gUnk_080D12AC.bin"
gUnk_080D12B0:: @ 080D12B0
.incbin "vaatiArm/gUnk_080D12B0.bin"
gUnk_080D12B2:: @ 080D12B2
.incbin "vaatiArm/gUnk_080D12B2.bin"
gUnk_080D12B4:: @ 080D12B4
.incbin "vaatiArm/gUnk_080D12B4.bin"
gUnk_080D12B6:: @ 080D12B6
.incbin "vaatiArm/gUnk_080D12B6.bin"
gUnk_080D12B8:: @ 080D12B8
.4byte sub_08042A6C
.4byte sub_08042A88
.4byte sub_08042AEC
.4byte sub_08042B20
gUnk_080D12C8:: @ 080D12C8
.incbin "vaatiArm/gUnk_080D12C8.bin"
gUnk_080D12CA:: @ 080D12CA
.incbin "vaatiArm/gUnk_080D12CA.bin"
gUnk_080D12D0:: @ 080D12D0
.4byte sub_08042C34
.4byte sub_08042D24
.4byte sub_08042D6C
.4byte sub_08042E30
.4byte sub_08042EF4
.4byte sub_08042FD8
.4byte sub_08043048
.4byte sub_080430D0
.4byte sub_08043130
.4byte sub_080431E8
gUnk_080D12F8:: @ 080D12F8
.incbin "vaatiArm/gUnk_080D12F8.bin"
gUnk_080D1300:: @ 080D1300
.incbin "vaatiArm/gUnk_080D1300.bin"
gUnk_080D1304:: @ 080D1304
.incbin "vaatiArm/gUnk_080D1304.bin"
gUnk_080D130C:: @ 080D130C
.incbin "vaatiArm/gUnk_080D130C.bin"
gUnk_080D1310:: @ 080D1310
.incbin "vaatiArm/gUnk_080D1310.bin"
gUnk_080D1314:: @ 080D1314
.4byte sub_080432A8
.4byte sub_0804334C
gUnk_080D131C:: @ 080D131C
.incbin "vaatiArm/gUnk_080D131C.bin"
gUnk_080D1320:: @ 080D1320
.4byte sub_08043440
.4byte sub_08043490
.4byte sub_08043520
.4byte sub_0804355C
.4byte sub_08043580
.4byte sub_080435F4
gUnk_080D1338:: @ 080D1338
.incbin "vaatiArm/gUnk_080D1338.bin"
gUnk_080D133C:: @ 080D133C
.incbin "vaatiArm/gUnk_080D133C.bin"
gUnk_080D1340:: @ 080D1340
.incbin "vaatiArm/gUnk_080D1340.bin"
gUnk_080D1348:: @ 080D1348
.4byte sub_08043698
.4byte sub_080436C0
.4byte sub_08043700
.4byte sub_08043738
.4byte sub_08043770
gUnk_080D135C:: @ 080D135C
.incbin "vaatiArm/gUnk_080D135C.bin"
gUnk_080D1362:: @ 080D1362
.incbin "vaatiArm/gUnk_080D1362.bin"
gUnk_080D13B2:: @ 080D13B2
.incbin "vaatiArm/gUnk_080D13B2.bin"
gUnk_080D13B7:: @ 080D13B7
.incbin "vaatiArm/gUnk_080D13B7.bin"
gUnk_080D13D8:: @ 080D13D8
.incbin "vaatiArm/gUnk_080D13D8.bin"
gUnk_080D13E0:: @ 080D13E0
.incbin "vaatiArm/gUnk_080D13E0.bin"
gUnk_080D13E3:: @ 080D13E3
.incbin "vaatiArm/gUnk_080D13E3.bin"
gUnk_080D13E9:: @ 080D13E9
.incbin "vaatiArm/gUnk_080D13E9.bin"
gUnk_080D13EC:: @ 080D13EC
.incbin "vaatiArm/gUnk_080D13EC.bin"
gUnk_080D1400:: @ 080D1400
.incbin "vaatiArm/gUnk_080D1400.bin"
gUnk_080D1414:: @ 080D1414
.incbin "vaatiArm/gUnk_080D1414.bin"
gUnk_080D1419:: @ 080D1419
.incbin "vaatiArm/gUnk_080D1419.bin"
-39
View File
@@ -1,39 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CDE34:: @ 080CDE34
.4byte sub_0802EC98
.4byte sub_0802ECC0
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte sub_0802EC98
gUnk_080CDE4C:: @ 080CDE4C
.4byte sub_0802ED74
.4byte sub_0802EE20
.4byte sub_0802EEB8
.4byte sub_0802EF1C
gUnk_080CDE5C:: @ 080CDE5C
.4byte sub_0802ED8C
.4byte sub_0802EE10
gUnk_080CDE64:: @ 080CDE64
.4byte sub_0802EE38
.4byte sub_0802EE8C
gUnk_080CDE6C:: @ 080CDE6C
.incbin "vaatiEyesMacro/gUnk_080CDE6C.bin"
gUnk_080CDE70:: @ 080CDE70
.incbin "vaatiEyesMacro/gUnk_080CDE70.bin"
gUnk_080CDE90:: @ 080CDE90
.incbin "vaatiEyesMacro/gUnk_080CDE90.bin"
gUnk_080CDE98:: @ 080CDE98
.incbin "vaatiEyesMacro/gUnk_080CDE98.bin"
-25
View File
@@ -1,25 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D0648:: @ 080D0648
.4byte sub_0803E0C4
.4byte sub_0803E0DC
.4byte sub_08001328
.4byte sub_0803E188
.4byte sub_08001242
.4byte nullsub_19
gUnk_080D0660:: @ 080D0660
.4byte sub_0803E1A8
.4byte sub_0803E258
.4byte sub_0803E2A8
.4byte sub_0803E2D0
.4byte sub_0803E314
.4byte sub_0803E340
.4byte sub_0803E370
.4byte sub_0803E398
.4byte sub_0803E3D4
.4byte sub_0803E3FC
-49
View File
@@ -1,49 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D0470:: @ 080D0470
.4byte sub_0803D134
.4byte sub_0803D264
.4byte sub_0803D408
.4byte sub_0803D560
.4byte sub_0803D658
.4byte sub_0803D700
.4byte sub_0803D830
.4byte sub_0803D8FC
gUnk_080D0490:: @ 080D0490
.4byte sub_0803D974
.4byte sub_0803D9BC
gUnk_080D0498:: @ 080D0498
.4byte sub_0803DAA8
.4byte sub_0803DAE4
gUnk_080D04A0:: @ 080D04A0
.4byte sub_0803DB88
.4byte sub_0803DBB8
gUnk_080D04A8:: @ 080D04A8
.incbin "vaatiRebornEnemy/gUnk_080D04A8.bin"
gUnk_080D04AC:: @ 080D04AC
.incbin "vaatiRebornEnemy/gUnk_080D04AC.bin"
gUnk_080D04C0:: @ 080D04C0
.incbin "vaatiRebornEnemy/gUnk_080D04C0.bin"
gUnk_080D04C8:: @ 080D04C8
.incbin "vaatiRebornEnemy/gUnk_080D04C8.bin"
gUnk_080D04D0:: @ 080D04D0
.ifdef EU
.incbin "vaatiRebornEnemy/gUnk_080D04D0_EU.bin"
.else
.incbin "vaatiRebornEnemy/gUnk_080D04D0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
gUnk_080D04D3:: @ 080D04D3
.incbin "vaatiRebornEnemy/gUnk_080D04D3.bin"
-62
View File
@@ -1,62 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D0ABC:: @ 080D0ABC
.ifdef EU
.incbin "vaatiTransfigured/gUnk_080D0ABC_EU.bin"
.else
.incbin "vaatiTransfigured/gUnk_080D0ABC_1_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
gUnk_080D0ABF:: @ 080D0ABF
.incbin "vaatiTransfigured/gUnk_080D0ABF.bin"
gUnk_080D0AC8:: @ 080D0AC8
.4byte sub_0803F818
.4byte sub_0803F914
.4byte sub_0803FAC8
.4byte sub_0803FAD0
.4byte sub_0803FD50
.4byte sub_0803FE90
.4byte sub_0803FF7C
.4byte sub_0804006C
gUnk_080D0AE8:: @ 080D0AE8
.4byte sub_08040130
.4byte sub_0804015C
gUnk_080D0AF0:: @ 080D0AF0
.4byte sub_080401E0
.4byte sub_08040268
.4byte sub_0804038C
gUnk_080D0AFC:: @ 080D0AFC
.4byte sub_080403CC
.4byte sub_080403EC
gUnk_080D0B04:: @ 080D0B04
.4byte sub_0804041C
.4byte sub_0804044C
gUnk_080D0B0C:: @ 080D0B0C
.4byte sub_080404D0
.4byte sub_0804051C
.4byte sub_080405D8
gUnk_080D0B18:: @ 080D0B18
.incbin "vaatiTransfigured/gUnk_080D0B18.bin"
gUnk_080D0B58:: @ 080D0B58
.incbin "vaatiTransfigured/gUnk_080D0B58.bin"
gUnk_080D0B64:: @ 080D0B64
.incbin "vaatiTransfigured/gUnk_080D0B64.bin"
gUnk_080D0B74:: @ 080D0B74
.incbin "vaatiTransfigured/gUnk_080D0B74.bin"
gUnk_080D0B84:: @ 080D0B84
.incbin "vaatiTransfigured/gUnk_080D0B84.bin"
-56
View File
@@ -1,56 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D0E1C:: @ 080D0E1C
.4byte sub_080413A0
.4byte sub_08042428
.4byte sub_080424A0
.4byte sub_0804250C
gUnk_080D0E2C:: @ 080D0E2C
.4byte sub_080413C0
.4byte sub_08041490
.4byte sub_080415E8
.4byte sub_08041618
.4byte sub_080416A4
.4byte sub_080416DC
.4byte sub_080417AC
.4byte sub_08041828
.4byte sub_08041880
.4byte sub_08041904
.4byte sub_0804197C
.4byte sub_08041A00
.4byte sub_08041AF4
.4byte sub_08041BD0
gUnk_080D0E64:: @ 080D0E64
.incbin "vaatiWrath/gUnk_080D0E64.bin"
gUnk_080D0E68:: @ 080D0E68
.4byte sub_08041BE8
.4byte sub_08041CD0
.4byte sub_08041D14
.4byte sub_08041D84
.4byte sub_08041E20
.4byte sub_08041E50
gUnk_080D0E80:: @ 080D0E80
.incbin "vaatiWrath/gUnk_080D0E80.bin"
gUnk_080D0E90:: @ 080D0E90
.incbin "vaatiWrath/gUnk_080D0E90.bin"
gUnk_080D0EA0:: @ 080D0EA0
.incbin "vaatiWrath/gUnk_080D0EA0.bin"
gUnk_080D0EA8:: @ 080D0EA8
.incbin "vaatiWrath/gUnk_080D0EA8.bin"
gUnk_080D0EAC:: @ 080D0EAC
.incbin "vaatiWrath/gUnk_080D0EAC.bin"
gUnk_080D0EB0:: @ 080D0EB0
.incbin "vaatiWrath/gUnk_080D0EB0.bin"
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08110734:: @ 08110734
.4byte sub_08066A94
.4byte sub_08066ACC
-12
View File
@@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08112F78:: @ 08112F78
.4byte sub_0806B67C
.4byte sub_0806B7BC
gUnk_08112F80:: @ 08112F80
.incbin "vaatiReborn/gUnk_08112F80.bin"