mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-11 15:28:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #449 from hatal175/objects4

Browse Source
This commit is contained in:
notyourav
2022-03-18 10:16:47 -07:00
committed by GitHub
parent 2c9a5be002 e017dae13e
commit d6c8cf0250
42 changed files with 1160 additions and 2196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/const/object/object96.s
-83
View File
@@ -1,83 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123FB0:: @ 08123FB0
.4byte sub_0809D91C
.4byte sub_0809D93C
.4byte 0x30300000
.4byte 0x133c3c01
.4byte 0x00010000
.4byte 0x00001800
.4byte 0x00400060
.4byte 0x00014021
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
.4byte 0x10636300
.4byte 00000000
.4byte 0x00001800
.4byte 0x00180000
.ifdef JP
.4byte 0x000000CD
.else
.ifdef DEMO_JP
.4byte 0x000000CD
.else
.ifdef EU
.4byte 0x000000CD @ TODO deduplicate
.else
.4byte 0x000000d0
.endif
.endif
.endif
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
.4byte 0x0f3c3c00
.4byte 0x00010000
.4byte 0x00001800
.4byte 0x00400060
.4byte 0x00014021
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
.4byte 0x023c3c00
.4byte 0x00010000
.4byte 0x00001800
.4byte 0x00400140
.4byte 0x00014021
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
.4byte 0x0d3c3c00
.4byte 0x00010000
.4byte 0x00001800
.4byte 0x00400060
.4byte 0x00014021
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
.4byte 0x1a3c3c00
.4byte 0x00010000
.4byte 0x00001800
.4byte 0x00400100
.4byte 0x00014021
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
.4byte 0x133c3c00
.4byte 0x00010000
.4byte 0x00001800
.4byte 0x00400060
.incbin "object96/gUnk_08123FB0.bin"
gUnk_081240B0:: @ 081240B0
.4byte sub_0809D7A8
.4byte sub_0809D824
.4byte sub_0809D860
.4byte sub_0809D8C8
data/const/object/object98.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0812418C:: @ 0812418C
.4byte sub_0809E360
.4byte sub_0809E3E4
data/const/object/objectA6.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124800:: @ 08124800
.4byte sub_0809F920
.4byte sub_0809F964
data/const/object/objectA9.s
-16
View File
@@ -1,16 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124850:: @ 08124850
.4byte sub_0809FEF8
.4byte sub_0809FF28
.4byte DeleteEntity
gUnk_0812485C:: @ 0812485C
.incbin "objectA9/gUnk_0812485C.bin"
gUnk_08124860:: @ 08124860
.incbin "objectA9/gUnk_08124860.bin"
data/const/object/objectAB.s
-10
View File
@@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0812486C:: @ 0812486C
.4byte sub_080A00F8
.4byte sub_080A012C
.4byte sub_080A0158
data/const/object/objectAD.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081248BC:: @ 081248BC
.4byte sub_080A04A4
.4byte sub_080A04E0
data/const/object/objectB4.s
-17
View File
@@ -1,17 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124B10:: @ 08124B10
.incbin "objectB4/gUnk_08124B10.bin"
gUnk_08124B20:: @ 08124B20
.4byte sub_080A0BA8
.4byte sub_080A0CE8
.4byte sub_080A0D70
.4byte sub_080A0E08
gUnk_08124B30:: @ 08124B30
.incbin "objectB4/gUnk_08124B30.bin"
data/const/object/objectB9.s
-21
View File
@@ -1,21 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124C20:: @ 08124C20
.incbin "objectB9/gUnk_08124C20.bin"
gUnk_08124C48:: @ 08124C48
.incbin "objectB9/gUnk_08124C48.bin"
gUnk_08124EA0:: @ 08124EA0
.incbin "objectB9/gUnk_08124EA0.bin"
gUnk_08124EC8:: @ 08124EC8
.incbin "objectB9/gUnk_08124EC8.bin"
gUnk_08124ECC:: @ 08124ECC
.incbin "objectB9/gUnk_08124ECC.bin"
data/scripts/hyruleTown/script_Anju.inc
+2 -2
View File
@@ -19,7 +19,7 @@ script_0801015A:
Call sub_080A1608
WaitUntilTextboxCloses
EnablePlayerControl
CallWithArg sub_080A1550, script_080101AC
CallWithArg CuccoMinigame_Init, script_080101AC
JumpIfNot script_0801015A
PlayBgm BGM_CUCCO_MINIGAME
SetRoomFlag 0x0001
@@ -49,7 +49,7 @@ script_080101AC:
Call sub_0807FB74
_0807E8E4_1
Call SetPlayerCollisionLayer1
Call sub_080A1388
Call CuccoMinigame_Cleanup
Call sub_0806EC38
BeginBlock
MoveEntityToPlayer