mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-05 17:44:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tal Hayon
2022-01-11 12:58:21 +02:00
parent c3bada6cd0 688508b1af
commit d852efec29
43 changed files with 2513 additions and 5357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/const/enemy/bombarossa.s
-11
View File
@@ -3,14 +3,3 @@
.section .rodata
.align 2
gUnk_080CEB38:: @ 080CEB38
.4byte sub_080333D4
.4byte sub_08033448
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte nullsub_158
gUnk_080CEB50:: @ 080CEB50
.incbin "bombarossa/gUnk_080CEB50.bin"
data/const/enemy/bowMoblin.s
-33
View File
@@ -1,33 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CFF78:: @ 080CFF78
.4byte sub_0803C180
.4byte sub_0803C198
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte nullsub_168
gUnk_080CFF90:: @ 080CFF90
.4byte sub_0803C1E0
.4byte sub_0803C234
.4byte sub_0803C2DC
.4byte sub_0803C344
.4byte sub_0803C400
gUnk_080CFFA4:: @ 080CFFA4
.incbin "bowMoblin/gUnk_080CFFA4.bin"
gUnk_080CFFAC:: @ 080CFFAC
.incbin "bowMoblin/gUnk_080CFFAC.bin"
gUnk_080CFFBC:: @ 080CFFBC
.incbin "bowMoblin/gUnk_080CFFBC.bin"
gUnk_080CFFC4:: @ 080CFFC4
.incbin "bowMoblin/gUnk_080CFFC4.bin"
data/const/enemy/curtain.s
-19
View File
@@ -1,19 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1CC8:: @ 080D1CC8
.4byte sub_080481D0
.4byte sub_080481E8
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte nullsub_26
gUnk_080D1CE0:: @ 080D1CE0
.4byte sub_08048224
.4byte sub_08048268
.4byte sub_08048294
.4byte nullsub_27
data/const/enemy/gyorgChild.s
-29
View File
@@ -1,29 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1E6C:: @ 080D1E6C
.4byte sub_08048684
.4byte sub_0804869C
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte sub_080486AC
gUnk_080D1E84:: @ 080D1E84
.4byte sub_080486F4
.4byte sub_0804877C
.4byte sub_0804882C
.4byte sub_08048904
gUnk_080D1E94:: @ 080D1E94
.4byte sub_080486D0
.4byte sub_080486D8
.4byte sub_080486E0
gUnk_080D1EA0:: @ 080D1EA0
.incbin "gyorgChild/gUnk_080D1EA0.bin"
data/const/enemy/gyorgFemale.s
-95
View File
@@ -1,95 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1A64:: @ 080D1A64
.4byte sub_0804614C
.4byte sub_0804625C
.4byte sub_0804632C
.4byte sub_080463E4
gUnk_080D1A74:: @ 080D1A74
.4byte gUnk_080D1A94
.4byte gUnk_080D1AAC
.4byte gUnk_080D1AC4
.4byte gUnk_080D1ADC
gUnk_080D1A84:: @ 080D1A84
.incbin "gyorgFemale/gUnk_080D1A84.bin"
gUnk_080D1A94:: @ 080D1A94
.ifdef JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1A94_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1A94_1_DEMO_JP.bin"
.else
.ifdef EU
.incbin "gyorgFemale/gUnk_080D1A94_2_EU.bin"
.else
.incbin "gyorgFemale/gUnk_080D1A94_3_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_080D1AAC:: @ 080D1AAC
.ifdef JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1AAC_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1AAC_1_DEMO_JP.bin"
.else
.ifdef EU
.incbin "gyorgFemale/gUnk_080D1AAC_2_EU.bin"
.else
.incbin "gyorgFemale/gUnk_080D1AAC_3_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_080D1AC4:: @ 080D1AC4
.ifdef JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1AC4_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1AC4_1_DEMO_JP.bin"
.else
.ifdef EU
.incbin "gyorgFemale/gUnk_080D1AC4_2_EU.bin"
.else
.incbin "gyorgFemale/gUnk_080D1AC4_3_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_080D1ADC:: @ 080D1ADC
.ifdef JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1ADC_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1ADC_1_DEMO_JP.bin"
.else
.ifdef EU
.incbin "gyorgFemale/gUnk_080D1ADC_2_EU.bin"
.else
.incbin "gyorgFemale/gUnk_080D1ADC_3_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_080D1AF4:: @ 080D1AF4
.incbin "gyorgFemale/gUnk_080D1AF4.bin"
gUnk_080D1AF8:: @ 080D1AF8
.incbin "gyorgFemale/gUnk_080D1AF8.bin"
data/const/enemy/gyorgFemaleEye.s
-29
View File
@@ -1,29 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1F64:: @ 080D1F64
.4byte sub_080489B4
.4byte sub_080489CC
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte sub_080489B4
gUnk_080D1F7C:: @ 080D1F7C
.4byte sub_08048AF0
.4byte sub_08048B2C
.4byte sub_08048B84
.4byte sub_08048BB0
.4byte sub_08048CEC
gUnk_080D1F90:: @ 080D1F90
.incbin "gyorgFemaleEye/gUnk_080D1F90.bin"
gUnk_080D2010:: @ 080D2010
.incbin "gyorgFemaleEye/gUnk_080D2010.bin"
gUnk_080D2030:: @ 080D2030
.incbin "gyorgFemaleEye/gUnk_080D2030.bin"
data/const/enemy/gyorgFemaleMouth.s
-42
View File
@@ -1,42 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D28AC:: @ 080D28AC
.4byte gUnk_080D28DC
.4byte gUnk_080D28E4
.4byte gUnk_080D28EC
.4byte gUnk_080D28F4
.4byte gUnk_080D28FC
.4byte gUnk_080D2904
.4byte gUnk_080D290C
.4byte gUnk_080D2914
gUnk_080D28CC:: @ 080D28CC
.incbin "gyorgFemaleMouth/gUnk_080D28CC.bin"
gUnk_080D28DC:: @ 080D28DC
.incbin "gyorgFemaleMouth/gUnk_080D28DC.bin"
gUnk_080D28E4:: @ 080D28E4
.incbin "gyorgFemaleMouth/gUnk_080D28E4.bin"
gUnk_080D28EC:: @ 080D28EC
.incbin "gyorgFemaleMouth/gUnk_080D28EC.bin"
gUnk_080D28F4:: @ 080D28F4
.incbin "gyorgFemaleMouth/gUnk_080D28F4.bin"
gUnk_080D28FC:: @ 080D28FC
.incbin "gyorgFemaleMouth/gUnk_080D28FC.bin"
gUnk_080D2904:: @ 080D2904
.incbin "gyorgFemaleMouth/gUnk_080D2904.bin"
gUnk_080D290C:: @ 080D290C
.incbin "gyorgFemaleMouth/gUnk_080D290C.bin"
gUnk_080D2914:: @ 080D2914
.incbin "gyorgFemaleMouth/gUnk_080D2914.bin"
data/const/enemy/octorokGolden.s
-24
View File
@@ -1,24 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CF46C:: @ 080CF46C
.4byte sub_08037C84
.4byte sub_08037C9C
.4byte sub_08001324
.4byte sub_08037CC0
.4byte sub_08001242
.4byte sub_08037C84
gUnk_080CF484:: @ 080CF484
.4byte sub_08037CE4
.4byte sub_08037D0C
.4byte sub_08037D54
gUnk_080CF490:: @ 080CF490
.incbin "octorokGolden/gUnk_080CF490.bin"
gUnk_080CF498:: @ 080CF498
.incbin "octorokGolden/gUnk_080CF498.bin"
data/const/object/barrelInside.s
-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"
data/const/object/gyorgBossObject.s
-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"
data/const/object/steam.s
-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"