Merge remote-tracking branch 'upstream/master' into takkuri

This commit is contained in:
Tal Hayon
2022-01-11 12:58:21 +02:00
43 changed files with 2513 additions and 5357 deletions
-11
View File
@@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08120C80:: @ 08120C80
.incbin "barrelInside/gUnk_08120C80.bin"
gUnk_08120C92:: @ 08120C92
.incbin "barrelInside/gUnk_08120C92.bin"
-20
View File
@@ -1,20 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124ED0:: @ 08124ED0
.4byte sub_080A1704
.4byte sub_080A184C
.4byte sub_080A189C
.4byte sub_080A190C
.4byte sub_080A1990
.4byte sub_080A19FC
.4byte sub_080A1A80
.4byte sub_080A1AE8
.4byte sub_080A1B4C
.4byte sub_080A1C04
gUnk_08124EF8:: @ 08124EF8
.incbin "gyorgBossObject/gUnk_08124EF8.bin"
-10
View File
@@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123484:: @ 08123484
.incbin "steam/gUnk_08123484.bin"