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

merge master

Browse Source
This commit is contained in:
Henny022p
2022-01-31 17:30:51 +01:00
parent 9b60d9c5e2 2b8d880ffc
commit 2a53ee4bf2
545 changed files with 17306 additions and 89017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/animations/object/pressurePlate.s
-27
View File
@@ -1,27 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@ .align 2
gSpriteAnimations_PressurePlate_0:: @ 08120BF1
.include "animations/gSpriteAnimations_PressurePlate_0.s"
gSpriteAnimations_PressurePlate_1:: @ 08120BF5
.include "animations/gSpriteAnimations_PressurePlate_1.s"
gSpriteAnimations_PressurePlate_2:: @ 08120BF9
.include "animations/gSpriteAnimations_PressurePlate_2.s"
gSpriteAnimations_PressurePlate_3:: @ 08120BFD
.include "animations/gSpriteAnimations_PressurePlate_3.s"
gSpriteAnimations_PressurePlate_4:: @ 08120C01
.include "animations/gSpriteAnimations_PressurePlate_4.s"
gSpriteAnimations_PressurePlate:: @ 08120C08
.4byte gSpriteAnimations_PressurePlate_0
.4byte gSpriteAnimations_PressurePlate_1
.4byte gSpriteAnimations_PressurePlate_2
.4byte gSpriteAnimations_PressurePlate_3
.4byte gSpriteAnimations_PressurePlate_4
data/const/enemy/ballChainSoldier.s
-30
View File
@@ -4,36 +4,6 @@
.section .rodata
.align 2
gUnk_080D06E0:: @ 080D06E0
.4byte sub_0803E538
.4byte sub_0803E550
.4byte sub_0803E560
.4byte sub_0803E570
.4byte sub_08001242
.4byte nullsub_20
gUnk_080D06F8:: @ 080D06F8
.4byte sub_0803E580
.4byte sub_0803E5E8
.4byte sub_0803E61C
.4byte sub_0803E66C
.4byte sub_0803E6B4
.4byte sub_0803E6E0
.4byte sub_0803E71C
.4byte sub_0803E75C
.4byte sub_0803E7B4
.4byte sub_0803E7CC
.4byte sub_0803E818
gUnk_080D0724:: @ 080D0724
.incbin "ballChainSoldier/gUnk_080D0724.bin"
gUnk_080D0728:: @ 080D0728
.incbin "ballChainSoldier/gUnk_080D0728.bin"
gUnk_080D0730:: @ 080D0730
.incbin "ballChainSoldier/gUnk_080D0730.bin"
gSpriteAnimations_BallChainSoldier_3:: @ 080D0738
.include "animations/gSpriteAnimations_BallChainSoldier_3.s"
data/const/enemy/bombarossa.s
-5
View File
@@ -1,5 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
data/const/enemy/cuccoAggr.s
-53
View File
@@ -1,53 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CF778:: @ 080CF778
.4byte sub_08038CF8
.4byte sub_08038D10
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte nullsub_165
gUnk_080CF790:: @ 080CF790
.4byte sub_08038D78
.4byte sub_08038DA0
.4byte sub_08038DC0
.4byte sub_08038EE0
.4byte sub_08038F20
.4byte sub_08038F44
.4byte sub_08038FA0
gUnk_080CF7AC:: @ 080CF7AC
.4byte sub_08038DD8
.4byte sub_08038E18
.4byte sub_08038EAC
.4byte sub_08038ED0
gUnk_080CF7BC:: @ 080CF7BC
.incbin "cuccoAggr/gUnk_080CF7BC.bin"
gUnk_080CF7BE:: @ 080CF7BE
.incbin "cuccoAggr/gUnk_080CF7BE.bin"
gUnk_080CF7C2:: @ 080CF7C2
.incbin "cuccoAggr/gUnk_080CF7C2.bin"
gUnk_080CF7C4:: @ 080CF7C4
.incbin "cuccoAggr/gUnk_080CF7C4.bin"
gUnk_080CF824:: @ 080CF824
.incbin "cuccoAggr/gUnk_080CF824.bin"
gUnk_080CF828:: @ 080CF828
.incbin "cuccoAggr/gUnk_080CF828.bin"
gUnk_080CF82C:: @ 080CF82C
.incbin "cuccoAggr/gUnk_080CF82C.bin"
gUnk_080CF82E:: @ 080CF82E
.incbin "cuccoAggr/gUnk_080CF82E.bin"
data/const/enemy/enemy49.s
-17
View File
@@ -1,17 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D0448:: @ 080D0448
.4byte sub_0803CE98
.4byte sub_0803CF24
.4byte sub_0803CF38
.4byte sub_0803CF94
gUnk_080D0458:: @ 080D0458
.incbin "enemy49/gUnk_080D0458.bin"
gUnk_080D0468:: @ 080D0468
.incbin "enemy49/gUnk_080D0468.bin"
data/const/enemy/enemy66.s
-10
View File
@@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D2ABC:: @ 080D2ABC
.incbin "enemy66/gUnk_080D2ABC.bin"
.4byte sub_08029270
.incbin "enemy66/gUnk_080D2ABC_1.bin"
data/const/enemy/gibdo.s
-25
View File
@@ -1,25 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gGibdo:: @ 080CF294
.4byte Gibdo_OnTick+1
.4byte sub_080374A4
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte nullsub_162
gUnk_080CF2AC:: @ 080CF2AC
.4byte sub_08037558
.4byte sub_08037580
.4byte sub_080375A4
.4byte sub_080375F8
.4byte sub_08037624
.4byte sub_08037690
.4byte sub_080376D0
.4byte sub_0803773C
.4byte sub_0803775C
data/const/enemy/spinyBeetle.s
-27
View File
@@ -1,27 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
unusedLabel_0CEBDC::
.incbin "spinyBeetle/unusedLabel_0CEBDC.bin"
gUnk_080CEBEC:: @ 080CEBEC
.4byte sub_080337BC
.4byte sub_080337D4
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08033870
.4byte nullsub_159
gUnk_080CEC04:: @ 080CEC04
.4byte sub_08033890
.4byte sub_08033958
.4byte sub_08033A7C
.4byte sub_08033ACC
.4byte sub_08033B44
.4byte sub_08033C94
gUnk_080CEC1C:: @ 080CEC1C
.incbin "spinyBeetle/gUnk_080CEC1C.bin"
data/const/manager/manager1.s
-27
View File
@@ -1,27 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08107C1C:: @ 08107C1C
.incbin "manager1/gUnk_08107C1C.bin"
gUnk_08107C30:: @ 08107C30
.incbin "manager1/gUnk_08107C30.bin"
gUnk_08107C40:: @ 08107C40
.incbin "manager1/gUnk_08107C40.bin"
gUnk_08107C48:: @ 08107C48
.4byte nullsub_494
.4byte nullsub_494
.4byte sub_080573AC
.4byte nullsub_494
.4byte sub_08057450
gUnk_08107C5C:: @ 08107C5C
.4byte sub_08057118
.4byte sub_08057174
.4byte sub_0805728C
.4byte sub_080572D4
data/const/object/bigPushableLever.s
-19
View File
@@ -1,19 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081236DC:: @ 081236DC
.4byte sub_08098EF8
.4byte sub_08098F14
.4byte sub_08098F90
gUnk_081236E8:: @ 081236E8
.incbin "bigPushableLever/gUnk_081236E8.bin"
gUnk_081236EC:: @ 081236EC
.incbin "bigPushableLever/gUnk_081236EC.bin"
gUnk_081236F4:: @ 081236F4
.incbin "bigPushableLever/gUnk_081236F4.bin"
data/const/object/hittableLever.s
-12
View File
@@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121178:: @ 08121178
.4byte sub_0808A71C
.4byte sub_0808A778
gUnk_08121180:: @ 08121180
.incbin "hittableLever/gUnk_08121180.bin"
data/const/object/object2A.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08120DD0:: @ 08120DD0
.4byte sub_08089B18
.4byte sub_08089BA0
data/const/object/pressurePlate.s
-13
View File
@@ -1,13 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08120BE0:: @ 08120BE0
.4byte sub_08088840
.4byte sub_0808886C
.4byte sub_080888F4
gUnk_08120BEC:: @ 08120BEC
.incbin "PressurePlate/gUnk_08120BEC.bin"
data/const/object/pullableLever.s
-27
View File
@@ -1,27 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08122294:: @ 08122294
.4byte sub_08091264
.4byte sub_08091338
.4byte sub_08091360
gUnk_081222A0:: @ 081222A0
.4byte sub_08091444
.4byte sub_08091470
gUnk_081222A8:: @ 081222A8
.incbin "pullableLever/gUnk_081222A8.bin"
gUnk_081222B0:: @ 081222B0
.4byte sub_08091380
.4byte sub_08091438
gUnk_081222B8:: @ 081222B8
.incbin "pullableLever/gUnk_081222B8.bin"
gUnk_081222C0:: @ 081222C0
.incbin "pullableLever/gUnk_081222C0.bin"
data/const/object/pushableLever.s
-19
View File
@@ -1,19 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123494:: @ 08123494
.4byte sub_08098278
.4byte sub_08098294
.4byte sub_08098304
gUnk_081234A0:: @ 081234A0
.incbin "pushableLever/gUnk_081234A0.bin"
gUnk_081234A4:: @ 081234A4
.incbin "pushableLever/gUnk_081234A4.bin"
gUnk_081234AC:: @ 081234AC
.incbin "pushableLever/gUnk_081234AC.bin"
data/data_081146D0.s
-15
View File
@@ -36,18 +36,3 @@ gUnk_08114F30:: @ 08114F30
gUnk_08114F34:: @ 08114F34
.incbin "data_081146D0/gUnk_08114F34.bin"
gUnk_08114F38:: @ 08114F38
.incbin "data_081146D0/gUnk_08114F38.bin"
gUnk_08114F58:: @ 08114F58
.incbin "data_081146D0/gUnk_08114F58.bin"
gUnk_08114F78:: @ 08114F78
.incbin "data_081146D0/gUnk_08114F78.bin"
gUnk_08114F80:: @ 08114F80
.incbin "data_081146D0/gUnk_08114F80.bin"
gPlayerHitbox:: @ 08114F88
.incbin "data_081146D0/gPlayerHitbox.bin"
data/gfx/gfx_and_palettes.s
+23 -24
View File
@@ -5487,69 +5487,68 @@ fixedTypeGfx_197::
fixedTypeGfx_198::
.incbin "gfx/fixedTypeGfx_198.4bpp"
gfx_unknown_20::
@ TODO move those imports to gfx.json and assets/folder?
gUnk_086926A0:: @ 086926A0
.incbin "data_08132B30/gUnk_086926A0.bin"
.incbin "gfx/gUnk_086926A0.bin"
gUnk_08692780:: @ 08692780
.incbin "data_08132B30/gUnk_08692780.bin"
.incbin "gfx/gUnk_08692780.bin"
gUnk_08692860:: @ 08692860
.incbin "data_08132B30/gUnk_08692860.bin"
.incbin "gfx/gUnk_08692860.bin"
gUnk_08692940:: @ 08692940
.incbin "data_08132B30/gUnk_08692940.bin"
.incbin "gfx/gUnk_08692940.bin"
gUnk_08692A20:: @ 08692A20
.incbin "data_08132B30/gUnk_08692A20.bin"
.incbin "gfx/gUnk_08692A20.bin"
gUnk_08692B00:: @ 08692B00
.incbin "data_08132B30/gUnk_08692B00.bin"
.incbin "gfx/gUnk_08692B00.bin"
gUnk_08692BE0:: @ 08692BE0
.incbin "data_08132B30/gUnk_08692BE0.bin"
.incbin "gfx/gUnk_08692BE0.bin"
gUnk_08692CC0:: @ 08692CC0
.incbin "data_08132B30/gUnk_08692CC0.bin"
.incbin "gfx/gUnk_08692CC0.bin"
gUnk_08692DA0:: @ 08692DA0
.incbin "data_08132B30/gUnk_08692DA0.bin"
.incbin "gfx/gUnk_08692DA0.bin"
gUnk_08692E80:: @ 08692E80
.incbin "data_08132B30/gUnk_08692E80.bin"
.incbin "gfx/gUnk_08692E80.bin"
gUnk_08692F60:: @ 08692F60
.incbin "data_08132B30/gUnk_08692F60.bin"
.incbin "gfx/gUnk_08692F60.bin"
@ TODO 08692FA0 to 086A2A3F is .incbin "graphics/font.4bpp"
.incbin "data_08132B30/gUnk_08692F60_1.bin"
.incbin "gfx/gUnk_08692F60_1.bin"
gUnk_08696F60:: @ 08696F60
.incbin "data_08132B30/gUnk_08696F60.bin"
.incbin "gfx/gUnk_08696F60.bin"
gUnk_086978E0:: @ 086978E0
.incbin "data_08132B30/gUnk_086978E0.bin"
.incbin "gfx/gUnk_086978E0.bin"
gUnk_086998E0:: @ 086998E0
.incbin "data_08132B30/gUnk_086998E0.bin"
.incbin "gfx/gUnk_086998E0.bin"
gUnk_086A18E0:: @ 086A18E0
.incbin "data_08132B30/gUnk_086A18E0.bin"
.incbin "gfx/gUnk_086A18E0.bin"
.incbin "data_08132B30/gUnk_086A18E0_1.bin"
.incbin "gfx/gUnk_086A18E0_1.bin"
gUnk_086A2A60:: @ 086A2A60
.incbin "data_08132B30/gUnk_086A2A60.bin"
.incbin "gfx/gUnk_086A2A60.bin"
gUnk_086A2EE0:: @ 086A2EE0
.incbin "data_08132B30/gUnk_086A2EE0.bin"
.incbin "gfx/gUnk_086A2EE0.bin"
gUnk_086AAEE0:: @ 086AAEE0
.incbin "data_08132B30/gUnk_086AAEE0.bin"
.incbin "gfx/gUnk_086AAEE0.bin"
@ TODO background graphics?
@ TODO check http://kylehalladay.com/blog/tutorial/gba/2017/04/11/GBA-By-Example-3.html
@ TODO contains credits images?
gUnk_086D4460:: @ 086D4460
.incbin "data_08132B30/gUnk_086D4460.bin"
.incbin "gfx/gUnk_086D4460.bin"
@ TODO 0x800 of this might be backgrond?
@ TODO 0x800 of this might be background?
gUnk_086E8460:: @ 086E8460
.incbin "data_08132B30/gUnk_086E8460.bin"
.incbin "gfx/gUnk_086E8460.bin"
gGfx_38_0::
.incbin "gfx/gGfx_38_0.4bpp"
gGfx_36_0::
data/map/map_data.s
+249
View File
File diff suppressed because it is too large Load Diff
data/scripts/hyruleTown/script_Carlov.inc
+1 -1
View File
@@ -46,7 +46,7 @@ script_080144C0:
script_080144C8:
ModRupees 0xfff6
MessageFromTarget 0x420c
PlaySound SFX_10C
PlaySound SFX_BUTTON_PRESS
Wait 0x0018
SetRoomFlag 0x0000
SetLocalFlag 0x0092
data/sound/sounds.s
+2 -2
View File
@@ -232,7 +232,7 @@
.include "sounds/sfx109.s"
.include "sounds/sfx10A.s"
.include "sounds/sfx10B.s"
.include "sounds/sfx10C.s"
.include "sounds/sfxButtonPress.s"
.include "sounds/sfx10D.s"
.include "sounds/sfx10E.s"
.include "sounds/sfx10F.s"
@@ -327,7 +327,7 @@
.include "sounds/sfx168.s"
.include "sounds/sfx169.s"
.include "sounds/sfx16A.s"
.include "sounds/sfx16B.s"
.include "sounds/sfxPressurePlate.s"
.include "sounds/sfx16C.s"
.include "sounds/sfx16D.s"
.include "sounds/sfx16E.s"