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

Merge pull request #574 from octorock/data

Browse Source 
Extract some data
This commit is contained in:
notyourav
2022-10-08 18:41:48 -07:00
committed by GitHub
parent 756a8a89da 67467fd831
commit c851c7876c
224 changed files with 13873 additions and 28227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/scripts.inc
+1 -1
View File
@@ -750,7 +750,7 @@
.2byte 0x0488
.endm
.macro _0807F0B4 s:req
.macro SetScrollSpeed s:req
.2byte 0x0889
.2byte \s
.endm
asm/non_matching/objectUtils/sub_080A2BE4.inc → asm/non_matching/objectUtils/SyncPlayerToPlatform.inc
View File
asm/non_matching/scroll/sub_08080CB4.inc
+2 -2
View File
@@ -17,7 +17,7 @@
_08080CD4:
ldrb r0, [r4, #0xb]
lsls r0, r0, #3
ldr r1, _08080CEC @ =gUnk_080C9CBC
ldr r1, _08080CEC @ =gKinstoneWorldEvents
adds r0, r0, r1
ldrb r0, [r0]
movs r1, #0xf
@@ -27,7 +27,7 @@ _08080CD4:
strb r0, [r4, #0x1a]
b _08080E00
.align 2, 0
_08080CEC: .4byte gUnk_080C9CBC
_08080CEC: .4byte gKinstoneWorldEvents
_08080CF0:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
asm/src/code_080043E8.s
+2
View File
@@ -374,6 +374,8 @@ gUnk_080046A4:: @ 080046A4
gUnk_080047F6:: @ 080047F6
.incbin "code_080043E8/gUnk_080047F6.bin"
@ TODO PlayerMacros
gUnk_080049D6:: @ 080049D6
.incbin "code_080043E8/gUnk_080049D6.bin"
assets/assets.json
-19361
View File
File diff suppressed because it is too large Load Diff
assets/gfx.json
+2130 -48
View File
File diff suppressed because it is too large Load Diff
data/animations/npc/bladeBrothers.s
+4
View File
@@ -4,6 +4,10 @@
.section .rodata
@ .align 2
gSpriteAnimations_BladeBrothers_1_1:: @ 0811176C
.include "animations/gSpriteAnimations_BladeBrothers_1_1.s"
gSpriteAnimations_BladeBrothers_1_0:: @ 08111771
.include "animations/gSpriteAnimations_BladeBrothers_1_0.s"
data/animations/npc/kid.s
+1
View File
@@ -90,6 +90,7 @@ gSpriteAnimations_Kid:: @ 0810C1E4
.4byte gSpriteAnimations_Kid_0
.4byte 00000000
@ TODO data of an unused entity?
gUnk_0810C268:: @ 0810C268
.4byte sub_08062AD0
.4byte sub_08062AD4
data/animations/npc/sturgeon.s
+13 -1
View File
@@ -4,6 +4,18 @@
.section .rodata
.align 2
gSpriteAnimations_Sturgeon_4:: @ 0810FB24
.include "animations/gSpriteAnimations_Sturgeon_4.s"
gSpriteAnimations_Sturgeon_5:: @ 0810FB39
.include "animations/gSpriteAnimations_Sturgeon_5.s"
gSpriteAnimations_Sturgeon_6:: @ 0810FB4E
.include "animations/gSpriteAnimations_Sturgeon_6.s"
gSpriteAnimations_Sturgeon_7:: @ 0810FB63
.include "animations/gSpriteAnimations_Sturgeon_7.s"
gSpriteAnimations_Sturgeon_0:: @ 0810FB78
.include "animations/gSpriteAnimations_Sturgeon_0.s"
@@ -33,4 +45,4 @@ gSpriteAnimations_Sturgeon:: @ 0810FBD0
.4byte gSpriteAnimations_Sturgeon_7
.4byte gSpriteAnimations_Sturgeon_8
.4byte gSpriteAnimations_Sturgeon_9
.4byte 00000000
.4byte 00000000
data/const/objectUtils.s → data/animations/spriteAnimations166.s
-11
View File
@@ -4,13 +4,6 @@
.section .rodata
.align 2
@ physics.c, dust.c, lilypadLarge.c, pullableMushroom.c, playerItemGust.c
gUnk_08126EE4:: @ 08126EE4
.incbin "data_08125104/gUnk_08126EE4.bin"
@ itemLantern.c
gUnk_08126EEC:: @ 08126EEC
.incbin "data_08125104/gUnk_08126EEC.bin"
gSpriteAnimations_166_0:: @ 08126EF4
.include "animations/gSpriteAnimations_166_0.s"
@@ -139,7 +132,3 @@ gSpriteAnimations_166:: @ 0812714C
.4byte gSpriteAnimations_166_29
.4byte gSpriteAnimations_166_30
.4byte 00000000
@ playerItemBoomerang.c
gUnk_081271CC:: @ 081271CC
.incbin "data_08125104/gUnk_081271CC.bin"
data/animations/spriteAnimations322.s
+394
View File
@@ -0,0 +1,394 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gSpriteAnimations_322_0:: @ 080FDD14
.include "animations/gSpriteAnimations_322_0.s"
gSpriteAnimations_322_1:: @ 080FDD19
.include "animations/gSpriteAnimations_322_1.s"
gSpriteAnimations_322_2:: @ 080FDD1E
.include "animations/gSpriteAnimations_322_2.s"
gSpriteAnimations_322_3:: @ 080FDD23
.include "animations/gSpriteAnimations_322_3.s"
gSpriteAnimations_322_4:: @ 080FDD28
.include "animations/gSpriteAnimations_322_4.s"
gSpriteAnimations_322_6:: @ 080FDD2D
.include "animations/gSpriteAnimations_322_6.s"
gSpriteAnimations_322_7:: @ 080FDD32
.include "animations/gSpriteAnimations_322_7.s"
gSpriteAnimations_322_8:: @ 080FDD37
.include "animations/gSpriteAnimations_322_8.s"
gSpriteAnimations_322_9:: @ 080FDD48
.include "animations/gSpriteAnimations_322_9.s"
gSpriteAnimations_322_10:: @ 080FDD4D
.include "animations/gSpriteAnimations_322_10.s"
gSpriteAnimations_322_11:: @ 080FDD52
.include "animations/gSpriteAnimations_322_11.s"
gSpriteAnimations_322_12:: @ 080FDD57
.include "animations/gSpriteAnimations_322_12.s"
gSpriteAnimations_322_13:: @ 080FDD5C
.include "animations/gSpriteAnimations_322_13.s"
gSpriteAnimations_322_14:: @ 080FDD61
.include "animations/gSpriteAnimations_322_14.s"
gSpriteAnimations_322_15:: @ 080FDD92
.include "animations/gSpriteAnimations_322_15.s"
gSpriteAnimations_322_5:: @ 080FDD97
.include "animations/gSpriteAnimations_322_5.s"
gSpriteAnimations_322_17:: @ 080FDDA8
.include "animations/gSpriteAnimations_322_17.s"
gSpriteAnimations_322_18:: @ 080FDDAD
.include "animations/gSpriteAnimations_322_18.s"
gSpriteAnimations_322_19:: @ 080FDDB2
.include "animations/gSpriteAnimations_322_19.s"
gSpriteAnimations_322_20:: @ 080FDDB7
.include "animations/gSpriteAnimations_322_20.s"
gSpriteAnimations_322_21:: @ 080FDDBC
.include "animations/gSpriteAnimations_322_21.s"
gSpriteAnimations_322_22:: @ 080FDDC1
.include "animations/gSpriteAnimations_322_22.s"
gSpriteAnimations_322_23:: @ 080FDDC6
.include "animations/gSpriteAnimations_322_23.s"
gSpriteAnimations_322_28:: @ 080FDDCB
.include "animations/gSpriteAnimations_322_28.s"
gSpriteAnimations_322_38:: @ 080FDDD0
.include "animations/gSpriteAnimations_322_38.s"
gSpriteAnimations_322_39:: @ 080FDDD5
.include "animations/gSpriteAnimations_322_39.s"
gSpriteAnimations_322_34:: @ 080FDDDA
.include "animations/gSpriteAnimations_322_34.s"
gSpriteAnimations_322_35:: @ 080FDDDF
.include "animations/gSpriteAnimations_322_35.s"
gSpriteAnimations_322_40:: @ 080FDDE4
.include "animations/gSpriteAnimations_322_40.s"
gSpriteAnimations_322_41:: @ 080FDDF5
.include "animations/gSpriteAnimations_322_41.s"
gSpriteAnimations_322_42:: @ 080FDE0E
.include "animations/gSpriteAnimations_322_42.s"
gSpriteAnimations_322_43:: @ 080FDE27
.include "animations/gSpriteAnimations_322_43.s"
gSpriteAnimations_322_44:: @ 080FDE40
.include "animations/gSpriteAnimations_322_44.s"
gSpriteAnimations_322_45:: @ 080FDE59
.include "animations/gSpriteAnimations_322_45.s"
gSpriteAnimations_322_46:: @ 080FDE72
.include "animations/gSpriteAnimations_322_46.s"
gSpriteAnimations_322_36:: @ 080FDE8B
.include "animations/gSpriteAnimations_322_36.s"
gSpriteAnimations_322_37:: @ 080FDE90
.include "animations/gSpriteAnimations_322_37.s"
gSpriteAnimations_322_54:: @ 080FDE95
.include "animations/gSpriteAnimations_322_54.s"
gSpriteAnimations_322_33:: @ 080FDE9A
.include "animations/gSpriteAnimations_322_33.s"
gSpriteAnimations_322_47:: @ 080FDE9F
.include "animations/gSpriteAnimations_322_47.s"
gSpriteAnimations_322_48:: @ 080FDEA4
.include "animations/gSpriteAnimations_322_48.s"
gSpriteAnimations_322_49:: @ 080FDEA9
.include "animations/gSpriteAnimations_322_49.s"
gSpriteAnimations_322_52:: @ 080FDEAE
.include "animations/gSpriteAnimations_322_52.s"
gSpriteAnimations_322_53:: @ 080FDEB3
.include "animations/gSpriteAnimations_322_53.s"
gSpriteAnimations_322_24:: @ 080FDEB8
.include "animations/gSpriteAnimations_322_24.s"
gSpriteAnimations_322_58:: @ 080FDEBD
.include "animations/gSpriteAnimations_322_58.s"
gSpriteAnimations_322_59:: @ 080FDEC2
.include "animations/gSpriteAnimations_322_59.s"
gSpriteAnimations_322_25:: @ 080FDEC7
.include "animations/gSpriteAnimations_322_25.s"
gSpriteAnimations_322_60:: @ 080FDECC
.include "animations/gSpriteAnimations_322_60.s"
gSpriteAnimations_322_55:: @ 080FDED1
.include "animations/gSpriteAnimations_322_55.s"
gSpriteAnimations_322_68:: @ 080FDED6
.include "animations/gSpriteAnimations_322_68.s"
gSpriteAnimations_322_69:: @ 080FDEDB
.include "animations/gSpriteAnimations_322_69.s"
gSpriteAnimations_322_26:: @ 080FDEE0
.include "animations/gSpriteAnimations_322_26.s"
gSpriteAnimations_322_64:: @ 080FDEE5
.include "animations/gSpriteAnimations_322_64.s"
gSpriteAnimations_322_65:: @ 080FDEEA
.include "animations/gSpriteAnimations_322_65.s"
gSpriteAnimations_322_66:: @ 080FDEEF
.include "animations/gSpriteAnimations_322_66.s"
gSpriteAnimations_322_67:: @ 080FDEF4
.include "animations/gSpriteAnimations_322_67.s"
gSpriteAnimations_322_71:: @ 080FDEF9
.include "animations/gSpriteAnimations_322_71.s"
gSpriteAnimations_322_81:: @ 080FDEFE
.include "animations/gSpriteAnimations_322_81.s"
gSpriteAnimations_322_82:: @ 080FDF03
.include "animations/gSpriteAnimations_322_82.s"
gSpriteAnimations_322_83:: @ 080FDF08
.include "animations/gSpriteAnimations_322_83.s"
gSpriteAnimations_322_84:: @ 080FDF0D
.include "animations/gSpriteAnimations_322_84.s"
gSpriteAnimations_322_95:: @ 080FDF12
.include "animations/gSpriteAnimations_322_95.s"
gSpriteAnimations_322_96:: @ 080FDF17
.include "animations/gSpriteAnimations_322_96.s"
gSpriteAnimations_322_98:: @ 080FDF28
.include "animations/gSpriteAnimations_322_98.s"
gSpriteAnimations_322_99:: @ 080FDF45
.include "animations/gSpriteAnimations_322_99.s"
gSpriteAnimations_322_87:: @ 080FDF4A
.include "animations/gSpriteAnimations_322_87.s"
gSpriteAnimations_322_104:: @ 080FDF4F
.include "animations/gSpriteAnimations_322_104.s"
gSpriteAnimations_322_105:: @ 080FDF54
.include "animations/gSpriteAnimations_322_105.s"
gSpriteAnimations_322_106:: @ 080FDF59
.include "animations/gSpriteAnimations_322_106.s"
gSpriteAnimations_322_107:: @ 080FDF5E
.include "animations/gSpriteAnimations_322_107.s"
gSpriteAnimations_322_93:: @ 080FDF63
.include "animations/gSpriteAnimations_322_93.s"
gSpriteAnimations_322_94:: @ 080FDF68
.include "animations/gSpriteAnimations_322_94.s"
gSpriteAnimations_322_63:: @ 080FDF6D
.include "animations/gSpriteAnimations_322_63.s"
gSpriteAnimations_322_100:: @ 080FDF72
.include "animations/gSpriteAnimations_322_100.s"
gSpriteAnimations_322_101:: @ 080FDF77
.include "animations/gSpriteAnimations_322_101.s"
gSpriteAnimations_322_102:: @ 080FDF7C
.include "animations/gSpriteAnimations_322_102.s"
gSpriteAnimations_322_103:: @ 080FDF81
.include "animations/gSpriteAnimations_322_103.s"
gSpriteAnimations_322_91:: @ 080FDF86
.include "animations/gSpriteAnimations_322_91.s"
gSpriteAnimations_322_92:: @ 080FDF8F
.include "animations/gSpriteAnimations_322_92.s"
gSpriteAnimations_322_108:: @ 080FDF94
.include "animations/gSpriteAnimations_322_108.s"
gSpriteAnimations_322_109:: @ 080FDF99
.include "animations/gSpriteAnimations_322_109.s"
gSpriteAnimations_322_110:: @ 080FDF9E
.include "animations/gSpriteAnimations_322_110.s"
gSpriteAnimations_322_111:: @ 080FDFA3
.include "animations/gSpriteAnimations_322_111.s"
gSpriteAnimations_322_112:: @ 080FDFA8
.include "animations/gSpriteAnimations_322_112.s"
gSpriteAnimations_322_72:: @ 080FDFC1
.include "animations/gSpriteAnimations_322_72.s"
gSpriteAnimations_322_97:: @ 080FDFC6
.include "animations/gSpriteAnimations_322_97.s"
gSpriteAnimations_322_61:: @ 080FDFCB
.include "animations/gSpriteAnimations_322_61.s"
gSpriteAnimations_322_62:: @ 080FDFD0
.include "animations/gSpriteAnimations_322_62.s"
@ subtask2.c, ui.c, pause_menu.c
gSpriteAnimations_322:: @ 080FDFD8
.4byte gSpriteAnimations_322_0
.4byte gSpriteAnimations_322_1
.4byte gSpriteAnimations_322_2
.4byte gSpriteAnimations_322_3
.4byte gSpriteAnimations_322_4
.4byte gSpriteAnimations_322_5
.4byte gSpriteAnimations_322_6
.4byte gSpriteAnimations_322_7
.4byte gSpriteAnimations_322_8
.4byte gSpriteAnimations_322_9
.4byte gSpriteAnimations_322_10
.4byte gSpriteAnimations_322_11
.4byte gSpriteAnimations_322_12
.4byte gSpriteAnimations_322_13
.4byte gSpriteAnimations_322_14
.4byte gSpriteAnimations_322_15
.4byte gSpriteAnimations_322_5
.4byte gSpriteAnimations_322_17
.4byte gSpriteAnimations_322_18
.4byte gSpriteAnimations_322_19
.4byte gSpriteAnimations_322_20
.4byte gSpriteAnimations_322_21
.4byte gSpriteAnimations_322_22
.4byte gSpriteAnimations_322_23
.4byte gSpriteAnimations_322_24
.4byte gSpriteAnimations_322_25
.4byte gSpriteAnimations_322_26
.4byte gSpriteAnimations_322_5
.4byte gSpriteAnimations_322_28
.4byte gSpriteAnimations_322_28
.4byte gSpriteAnimations_322_28
.4byte gSpriteAnimations_322_28
.4byte gSpriteAnimations_322_28
.4byte gSpriteAnimations_322_33
.4byte gSpriteAnimations_322_34
.4byte gSpriteAnimations_322_35
.4byte gSpriteAnimations_322_36
.4byte gSpriteAnimations_322_37
.4byte gSpriteAnimations_322_38
.4byte gSpriteAnimations_322_39
.4byte gSpriteAnimations_322_40
.4byte gSpriteAnimations_322_41
.4byte gSpriteAnimations_322_42
.4byte gSpriteAnimations_322_43
.4byte gSpriteAnimations_322_44
.4byte gSpriteAnimations_322_45
.4byte gSpriteAnimations_322_46
.4byte gSpriteAnimations_322_47
.4byte gSpriteAnimations_322_48
.4byte gSpriteAnimations_322_49
.4byte gSpriteAnimations_322_5
.4byte gSpriteAnimations_322_5
.4byte gSpriteAnimations_322_52
.4byte gSpriteAnimations_322_53
.4byte gSpriteAnimations_322_54
.4byte gSpriteAnimations_322_55
.4byte gSpriteAnimations_322_25
.4byte gSpriteAnimations_322_24
.4byte gSpriteAnimations_322_58
.4byte gSpriteAnimations_322_59
.4byte gSpriteAnimations_322_60
.4byte gSpriteAnimations_322_61
.4byte gSpriteAnimations_322_62
.4byte gSpriteAnimations_322_63
.4byte gSpriteAnimations_322_64
.4byte gSpriteAnimations_322_65
.4byte gSpriteAnimations_322_66
.4byte gSpriteAnimations_322_67
.4byte gSpriteAnimations_322_68
.4byte gSpriteAnimations_322_69
.4byte gSpriteAnimations_322_26
.4byte gSpriteAnimations_322_71
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_71
.4byte gSpriteAnimations_322_81
.4byte gSpriteAnimations_322_82
.4byte gSpriteAnimations_322_83
.4byte gSpriteAnimations_322_84
.4byte gSpriteAnimations_322_84
.4byte gSpriteAnimations_322_84
.4byte gSpriteAnimations_322_87
.4byte gSpriteAnimations_322_87
.4byte gSpriteAnimations_322_87
.4byte gSpriteAnimations_322_5
.4byte gSpriteAnimations_322_91
.4byte gSpriteAnimations_322_92
.4byte gSpriteAnimations_322_93
.4byte gSpriteAnimations_322_94
.4byte gSpriteAnimations_322_95
.4byte gSpriteAnimations_322_96
.4byte gSpriteAnimations_322_97
.4byte gSpriteAnimations_322_98
.4byte gSpriteAnimations_322_99
.4byte gSpriteAnimations_322_100
.4byte gSpriteAnimations_322_101
.4byte gSpriteAnimations_322_102
.4byte gSpriteAnimations_322_103
.4byte gSpriteAnimations_322_104
.4byte gSpriteAnimations_322_105
.4byte gSpriteAnimations_322_106
.4byte gSpriteAnimations_322_107
.4byte gSpriteAnimations_322_108
.4byte gSpriteAnimations_322_109
.4byte gSpriteAnimations_322_110
.4byte gSpriteAnimations_322_111
.4byte gSpriteAnimations_322_112
.4byte gSpriteAnimations_322_112
.4byte gSpriteAnimations_322_112
.4byte gSpriteAnimations_322_0
.4byte gSpriteAnimations_322_0
.4byte gSpriteAnimations_322_0
.4byte 00000000
data/const/collisionMatrix.s
+36
View File
@@ -0,0 +1,36 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ before: playerItemCellOverwriteSet
@ collision.c
gCollisionMtx:: @ 080B7B74
.incbin "data_080B7B74/gCollisionMtx.bin"
.incbin "data_080B7B74/gUnk_080B802E.bin"
.incbin "data_080B7B74/gUnk_080BA2C0.bin"
.ifdef EU
.incbin "data_080B7B74/gUnk_080B7B74_1_EU.bin"
.else
.incbin "data_080B7B74/gUnk_080B7B74_2_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
.incbin "data_080B7B74/gUnk_080B7B74_3.bin"
.ifdef JP
@ TODO only small differences
.incbin "data_080B7B74/gUnk_080B7B74_4_JP.bin"
.else
.ifdef EU
@ TODO only small differences
.incbin "data_080B7B74/gUnk_080B7B74_5_EU.bin"
.else
.incbin "data_080B7B74/gUnk_080B7B74_6_USA-DEMO_USA-DEMO_JP.bin"
.endif
.endif
.ifdef EU
@ TODO only small differences
.incbin "data_080B7B74/gUnk_080B7B74_7_EU.bin"
.else
.incbin "data_080B7B74/gUnk_080B7B74_8_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
.incbin "data_080B7B74/gUnk_080B7B74_9.bin"
data/const/enemyUtils.s
-29
View File
@@ -1,29 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ before: enemy66.c
@ in here: enemyUtils.c, createEnemy.c, enterPortalSubtask.c, room.c roomInit.c, fade.c
@ after: fileselect.c
@ enemyUtils.c
gUnk_080D3D94:: @ 080D3D94
.incbin "data_080D3D94/gUnk_080D3D94.bin"
@ enemyUtils.c
gUnk_080D3E74:: @ 080D3E74
.incbin "data_080D3D94/gUnk_080D3E74.bin"
gUnk_080D3E90:: @ 080D3E90
.incbin "data_080D3D94/gUnk_080D3E90.bin"
gUnk_080D3F30:: @ 080D3F30
.incbin "data_080D3D94/gUnk_080D3F30.bin"
gUnk_080D3FD0:: @ 080D3FD0
.incbin "data_080D3D94/gUnk_080D3FD0.bin"
gUnk_080D4070:: @ 080D4070
.incbin "data_080D3D94/gUnk_080D4070.bin"
data/const/enterPortalSubtask.s
-32
View File
@@ -1,32 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ enterPortalSubtask.c
gUnk_080D4110:: @ 080D4110
.4byte gUnk_080D3E90
.4byte gUnk_080D3F30
.4byte gUnk_080D3FD0
.4byte gUnk_080D4070
@ enterPortalSubtask.c
gUnk_080D4120:: @ 080D4120
.4byte sub_0804AAD4
.4byte sub_0804AB04
.4byte sub_0804AB24
@ enterPortalSubtask.c
gUnk_080D412C:: @ 080D412C
.4byte sub_0804AB70
.4byte sub_0804AC1C
.4byte sub_0804ACC8
@ enterPortalSubtask.c
gUnk_080D4138:: @ 080D4138
.incbin "data_080D3D94/gUnk_080D4138.bin"
@ enterPortalSubtask.c
gUnk_080D4140:: @ 080D4140
.incbin "data_080D3D94/gUnk_080D4140.bin"
data/const/entity.s
-12
View File
@@ -378,15 +378,3 @@ gUnk_08109194:: @ 08109194
.4byte gUnk_08109158
.4byte gUnk_08109178
.4byte gUnk_0810918C
@ beanstalkSubtask.c, room.c
gUnk_081091E4:: @ 081091E4
.incbin "data_08108E6C/gUnk_081091E4.bin"
@ entity.c
gUnk_081091EE:: @ 081091EE
.incbin "data_08108E6C/gUnk_081091EE.bin"
@ entity.c
gUnk_081091F8:: @ 081091F8
.incbin "data_08108E6C/gUnk_081091F8.bin"
data/const/fade.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080FC3C4:: @ 080FC3C4
.incbin "data_080D5360/gUnk_080FC3C4.bin"
data/const/figurine_menu.s
-57
View File
@@ -1,57 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ figurine_menu.c, pause_menu.c
gUnk_08128A38:: @ 08128A38
.incbin "data_08127280/gUnk_08128A38.bin"
.4byte PauseMenu_Variant0
.incbin "data_08127280/gUnk_08128A38_1.bin"
.4byte PauseMenu_ItemMenu
.incbin "data_08127280/gUnk_08128A38_2.bin"
.4byte PauseMenu2
.incbin "data_08127280/gUnk_08128A38_3.bin"
.4byte PauseMenu_Variant0
.incbin "data_08127280/gUnk_08128A38_4.bin"
.4byte sub_080A6270
.incbin "data_08127280/gUnk_08128A38_5.bin"
.4byte sub_080A5BF0
.incbin "data_08127280/gUnk_08128A38_6.bin"
.4byte sub_080A6608
.incbin "data_08127280/gUnk_08128A38_7.bin"
.4byte sub_080A6008
.incbin "data_08127280/gUnk_08128A38_8.bin"
.4byte sub_080A60E0
.incbin "data_08127280/gUnk_08128A38_9.bin"
.4byte sub_080A5AD8
.incbin "data_08127280/gUnk_08128A38_10.bin"
.4byte sub_080A5990
.incbin "data_08127280/gUnk_08128A38_11.bin"
.4byte sub_080A5990
.incbin "data_08127280/gUnk_08128A38_12.bin"
.4byte PauseMenu_Variant0
.incbin "data_08127280/gUnk_08128A38_13.bin"
.4byte PauseMenu_Variant0
.incbin "data_08127280/gUnk_08128A38_14.bin"
.4byte PauseMenu_Variant0
.incbin "data_08127280/gUnk_08128A38_15.bin"
.4byte PauseMenu_Variant0
.incbin "data_08127280/gUnk_08128A38_16.bin"
.4byte PauseMenu_Variant0
.incbin "data_08127280/gUnk_08128A38_17.bin"
.4byte PauseMenu_Variant0
.incbin "data_08127280/gUnk_08128A38_18.bin"
.4byte PauseMenu_Variant0
.incbin "data_08127280/gUnk_08128A38_19.bin"
.4byte PauseMenu_Variant0
@ figurine_menu.c
gUnk_08128AD8:: @ 08128AD8
.ifdef EU
@ TODO only small differences
.incbin "data_08127280/gUnk_08128AD8_EU.bin"
.else
.incbin "data_08127280/gUnk_08128AD8_1_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
data/const/fileselect_after.s
-63
View File
@@ -1,63 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ fileselect.c
gUnk_080FC908:: @ 080FC908
.4byte sub_08050888
.4byte sub_080508E4
.4byte sub_08050910
@ fileselect.c
gUnk_080FC914:: @ 080FC914
.incbin "data_080FC8A4/gUnk_080FC914.bin"
gUnk_080FC93C:: @ 080FC93C
.4byte sub_08050C54
.4byte sub_08050D68
gUnk_080FC944:: @ 080FC944
.4byte sub_08050DB8
.4byte sub_08050DE4
.4byte sub_08050E88
gUnk_080FC950:: @ 080FC950
.4byte sub_08050EB8
.4byte sub_08050EF4
.4byte sub_08050FFC
.4byte sub_0805103C
gUnk_080FC960:: @ 080FC960
.4byte sub_08051090
.4byte sub_080610B8
.4byte sub_0805138C
.4byte sub_0805144C
gUnk_080FC970:: @ 080FC970
.incbin "data_080FC8A4/gUnk_080FC970.bin"
gUnk_080FC980:: @ 080FC980
.incbin "data_080FC8A4/gUnk_080FC980.bin"
gUnk_080FC9A0:: @ 080FC9A0
.incbin "data_080FC8A4/gUnk_080FC9A0.bin"
gUnk_080FC9B0:: @ 080FC9B0
.4byte sub_080513A8
.4byte sub_080513C0
.4byte sub_0805141C
gUnk_080FC9BC:: @ 080FC9BC
.4byte sub_080515c8
.4byte sub_080515D4
.4byte sub_080516E0
@ fileselect.c
gUnk_080FC9C8:: @ 080FC9C8
.4byte sub_08051738
.4byte sub_080517EC
.4byte sub_08051874
.4byte sub_080518E4
data/const/fileselect_before.s
-28
View File
@@ -1,28 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ figurine_menu.c, figurineDevice.c
gUnk_080FC3E4:: @ 080FC3E4
.ifdef JP
@ TODO only small differences
.incbin "data_080D5360/gUnk_080FC3E4_JP.bin"
.else
.ifdef EU
@ TODO only small differences
.incbin "data_080D5360/gUnk_080FC3E4_1_EU.bin"
.else
.incbin "data_080D5360/gUnk_080FC3E4_2_USA-DEMO_USA-DEMO_JP.bin"
.endif
.endif
@ fileselect.c
gUnk_080FC844:: @ 080FC844
.incbin "data_080D5360/gUnk_080FC844.bin"
@ fileselect.c
gUnk_080FC85C:: @ 080FC85C
.incbin "data_080D5360/gUnk_080FC85C.bin"
data/const/game.s
-649
View File
@@ -1,649 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ game.c
gUnk_080FCB94:: @ 080FCB94
.incbin "data_080FC8A4/gUnk_080FCB94.bin"
gUnk_080FCBB4:: @ 080FCBB4
.4byte sub_080535AC
.4byte sub_080535F4
.4byte nullsub_481
.4byte sub_08053618
gUnk_080FCBC4:: @ 080FCBC4
.incbin "data_080FC8A4/gUnk_080FCBC4.bin"
.4byte script_IntroCameraTarget
.incbin "data_080FC8A4/gUnk_080FCBC4_1.bin"
.4byte script_ZeldaMoveToLinksHouse
.incbin "data_080FC8A4/gUnk_080FCBC4_2.bin"
.4byte script_HouseDoorIntro
.incbin "data_080FC8A4/gUnk_080FCBC4_3.bin"
.4byte script_CutsceneOrchestratorIntro2
.incbin "data_080FC8A4/gUnk_080FCBC4_4.bin"
gUnk_080FCC14:: @ 080FCC14
.incbin "data_080FC8A4/gUnk_080FCC14.bin"
.4byte script_CutsceneOrchestratorIntro
.incbin "data_080FC8A4/gUnk_080FCC14_1.bin"
.4byte script_SmithIntro
.incbin "data_080FC8A4/gUnk_080FCC14_2.bin"
.4byte script_ZeldaIntro
.incbin "data_080FC8A4/gUnk_080FCC14_3.bin"
gUnk_080FCC54:: @ 080FCC54
.incbin "data_080FC8A4/gUnk_080FCC54.bin"
.4byte script_ZeldaLeaveLinksHouse
.incbin "data_080FC8A4/gUnk_080FCC54_1.bin"
gUnk_080FCC84:: @ 080FCC84
.incbin "data_080FC8A4/gUnk_080FCC84.bin"
gUnk_080FCC9C:: @ 080FCC9C
.incbin "data_080FC8A4/gUnk_080FCC9C.bin"
gUnk_080FCCB4:: @ 080FCCB4
.4byte gUnk_080FCC84
.incbin "data_080FC8A4/gUnk_080FCCB4.bin"
.4byte gUnk_080FCC84
.incbin "data_080FC8A4/gUnk_080FCCB4_1.bin"
.4byte gUnk_080FCC9C
.incbin "data_080FC8A4/gUnk_080FCCB4_2.bin"
.4byte gUnk_080FCC9C
.incbin "data_080FC8A4/gUnk_080FCCB4_3.bin"
.4byte gUnk_080FCC84
.incbin "data_080FC8A4/gUnk_080FCCB4_4.bin"
.4byte gUnk_080FCC84
.incbin "data_080FC8A4/gUnk_080FCCB4_5.bin"
gUnk_080FCCFC:: @ 080FCCFC
.4byte sub_08053758
.4byte sub_08053800
.4byte sub_08053894
.4byte sub_08053800
.4byte sub_08053894
.4byte sub_08053800
.4byte sub_08053894
.4byte sub_08053800
.4byte sub_08053894
.4byte sub_08053800
.4byte sub_08053904
.4byte sub_08053974
.4byte nullsub_482
.4byte sub_080539BC
.4byte nullsub_482
gUnk_080FCD38:: @ 080FCD38
.4byte sub_0805370C
.4byte nullsub_482
gUnk_080FCD40:: @ 080FCD40
.4byte sub_08053758
.4byte sub_08053800
.4byte sub_08053894
.4byte sub_08053800
.4byte sub_08053894
.4byte sub_08053800
.4byte sub_08053894
.4byte sub_08053800
.4byte sub_08053894
.4byte sub_08053800
.4byte sub_08053894
.4byte sub_08053800
.4byte sub_08053894
.4byte sub_080539F4
.4byte sub_08053A1C
.4byte sub_08053A5C
.4byte sub_08053A90
gUnk_080FCD84:: @ 080FCD84
.incbin "data_080FC8A4/gUnk_080FCD84.bin"
.4byte script_CutsceneOrchestratorMinishVaati
.incbin "data_080FC8A4/gUnk_080FCD84_1.bin"
.4byte script_MinishEzlo
.incbin "data_080FC8A4/gUnk_080FCD84_2.bin"
.4byte script_CutsceneMiscObjectMinishCap
.incbin "data_080FC8A4/gUnk_080FCD84_3.bin"
.4byte script_Vaati
.incbin "data_080FC8A4/gUnk_080FCD84_4.bin"
gUnk_080FCDD4:: @ 080FCDD4
.4byte sub_08053ACC
.4byte sub_08053B00
.4byte sub_08053B10
gUnk_080FCDE0:: @ 080FCDE0
.incbin "data_080FC8A4/gUnk_080FCDE0.bin"
.4byte script_CutsceneOrchestratorTakeoverCutscene
.incbin "data_080FC8A4/gUnk_080FCDE0_1.bin"
.4byte script_KingDaltusTakeover
.incbin "data_080FC8A4/gUnk_080FCDE0_2.bin"
.4byte script_VaatiTakeover
.incbin "data_080FC8A4/gUnk_080FCDE0_3.bin"
.4byte script_ZeldaStoneTakeover
.incbin "data_080FC8A4/gUnk_080FCDE0_4.bin"
gUnk_080FCE30:: @ 080FCE30
.incbin "data_080FC8A4/gUnk_080FCE30.bin"
.4byte script_MinisterPothoTakeover
.incbin "data_080FC8A4/gUnk_080FCE30_1.bin"
.4byte script_GuardTakeover
.incbin "data_080FC8A4/gUnk_080FCE30_2.bin"
.4byte script_GuardTakeover
.incbin "data_080FC8A4/gUnk_080FCE30_3.bin"
.4byte script_GuardTakeover
.incbin "data_080FC8A4/gUnk_080FCE30_4.bin"
.4byte script_GuardTakeover
.incbin "data_080FC8A4/gUnk_080FCE30_5.bin"
.4byte script_GuardTakeover
.incbin "data_080FC8A4/gUnk_080FCE30_6.bin"
.4byte script_GuardTakeover
.incbin "data_080FC8A4/gUnk_080FCE30_7.bin"
gUnk_080FCEB0:: @ 080FCEB0
.4byte sub_08053B74
.4byte sub_08053BAC
.4byte sub_08053BBC
gUnk_080FCEBC:: @ 080FCEBC
.incbin "data_080FC8A4/gUnk_080FCEBC.bin"
.4byte script_ZeldaStoneInDHC
.incbin "data_080FC8A4/gUnk_080FCEBC_1.bin"
.4byte script_ZeldaStoneDHC
.incbin "data_080FC8A4/gUnk_080FCEBC_2.bin"
gUnk_080FCEEC:: @ 080FCEEC
.4byte sub_08053C20
.4byte nullsub_483
.4byte sub_08053C60
gUnk_080FCEF8:: @ 080FCEF8
.4byte sub_08053CAC
.4byte sub_08053CAC
.4byte sub_08053E58
gUnk_080FCF04:: @ 080FCF04
.4byte gUnk_080FCF24
.4byte 0x00001c58
.4byte gUnk_080FCF44
.4byte 0x00002058
.4byte gUnk_080FCF64
.4byte 0x00001d58
.4byte gUnk_080FCF84
.4byte 0x00002258
gUnk_080FCF24:: @ 080FCF24
.incbin "data_080FC8A4/gUnk_080FCF24.bin"
gUnk_080FCF44:: @ 080FCF44
.incbin "data_080FC8A4/gUnk_080FCF44.bin"
gUnk_080FCF64:: @ 080FCF64
.incbin "data_080FC8A4/gUnk_080FCF64.bin"
gUnk_080FCF84:: @ 080FCF84
.incbin "data_080FC8A4/gUnk_080FCF84.bin"
gUnk_080FCFA4:: @ 080FCFA4
.4byte sub_08053CC8
.4byte sub_08053D34
.4byte sub_08053D90
.4byte sub_08053DB4
.4byte sub_08053E30
gUnk_080FCFB8:: @ 080FCFB8
.4byte gUnk_080FCFE8
.4byte gUnk_080FD008
.4byte 0x10100e88
.4byte gUnk_080FD028
.4byte gUnk_080FD048
.4byte 0x10101088
.4byte gUnk_080FD078
.4byte gUnk_080FD098
.4byte 0x10101388
.4byte gUnk_080FD0C8
.4byte gUnk_080FD0E8
.4byte 0x10101588
gUnk_080FCFE8:: @ 080FCFE8
.incbin "data_080FC8A4/gUnk_080FCFE8.bin"
gUnk_080FD008:: @ 080FD008
.incbin "data_080FC8A4/gUnk_080FD008.bin"
gUnk_080FD028:: @ 080FD028
.incbin "data_080FC8A4/gUnk_080FD028.bin"
gUnk_080FD048:: @ 080FD048
.incbin "data_080FC8A4/gUnk_080FD048.bin"
gUnk_080FD078:: @ 080FD078
.incbin "data_080FC8A4/gUnk_080FD078.bin"
gUnk_080FD098:: @ 080FD098
.incbin "data_080FC8A4/gUnk_080FD098.bin"
gUnk_080FD0C8:: @ 080FD0C8
.incbin "data_080FC8A4/gUnk_080FD0C8.bin"
gUnk_080FD0E8:: @ 080FD0E8
.incbin "data_080FC8A4/gUnk_080FD0E8.bin"
gUnk_080FD108:: @ 080FD108
.4byte sub_08053E74
.4byte sub_08053EC4
.4byte sub_08053EFC
.4byte sub_08053F20
.4byte sub_08053EC4
.4byte sub_08053EFC
.4byte sub_08053F20
.4byte sub_08053EC4
.4byte sub_08053EFC
.4byte sub_08053F20
.4byte sub_08053EC4
.4byte sub_08053F88
gUnk_080FD138:: @ 080FD138
.4byte sub_080536D4
.4byte sub_08053B58
.4byte sub_0805373C
.4byte sub_08053AB0
.4byte sub_080536F0
.4byte sub_08053C04
gHitbox_0:: @ 080FD150
.incbin "data_080FC8A4/gHitbox_0.bin"
gHitbox_30:: @ 080FD158
.incbin "data_080FC8A4/gHitbox_30.bin"
gHitbox_31:: @ 080FD160
.incbin "data_080FC8A4/gHitbox_31.bin"
gHitbox_1:: @ 080FD168
.incbin "data_080FC8A4/gHitbox_1.bin"
gHitbox_2:: @ 080FD170
.incbin "data_080FC8A4/gHitbox_2.bin"
gUnk_080FD178:: @ 080FD178
.incbin "data_080FC8A4/gUnk_080FD178.bin"
gHitbox_3:: @ 080FD180
.incbin "data_080FC8A4/gHitbox_3.bin"
gHitbox_4:: @ 080FD188
.incbin "data_080FC8A4/gHitbox_4.bin"
gUnk_080FD190:: @ 080FD190
.incbin "data_080FC8A4/gUnk_080FD190.bin"
gHitbox_5:: @ 080FD198
.incbin "data_080FC8A4/gHitbox_5.bin"
gHitbox_6:: @ 080FD1A0
.incbin "data_080FC8A4/gHitbox_6.bin"
gUnk_080FD1A8:: @ 080FD1A8
.incbin "data_080FC8A4/gUnk_080FD1A8.bin"
gUnk_080FD1B4:: @ 080FD1B4
.incbin "data_080FC8A4/gUnk_080FD1B4.bin"
gHitbox_7:: @ 080FD1C4
.incbin "data_080FC8A4/gHitbox_7.bin"
gHitbox_8:: @ 080FD1CC
.incbin "data_080FC8A4/gHitbox_8.bin"
gUnk_080FD1D4:: @ 080FD1D4
.incbin "data_080FC8A4/gUnk_080FD1D4.bin"
gUnk_080FD1DC:: @ 080FD1DC
.incbin "data_080FC8A4/gUnk_080FD1DC.bin"
gUnk_080FD1E4:: @ 080FD1E4
.incbin "data_080FC8A4/gUnk_080FD1E4.bin"
gUnk_080FD1EC:: @ 080FD1EC
.incbin "data_080FC8A4/gUnk_080FD1EC.bin"
gUnk_080FD1F4:: @ 080FD1F4
.incbin "data_080FC8A4/gUnk_080FD1F4.bin"
gUnk_080FD1FC:: @ 080FD1FC
.incbin "data_080FC8A4/gUnk_080FD1FC.bin"
gUnk_080FD204:: @ 080FD204
.incbin "data_080FC8A4/gUnk_080FD204.bin"
gUnk_080FD20C:: @ 080FD20C
.incbin "data_080FC8A4/gUnk_080FD20C.bin"
gUnk_080FD214:: @ 080FD214
.incbin "data_080FC8A4/gUnk_080FD214.bin"
gUnk_080FD21C:: @ 080FD21C
.incbin "data_080FC8A4/gUnk_080FD21C.bin"
gUnk_080FD224:: @ 080FD224
.incbin "data_080FC8A4/gUnk_080FD224.bin"
gUnk_080FD22C:: @ 080FD22C
.incbin "data_080FC8A4/gUnk_080FD22C.bin"
gUnk_080FD238:: @ 080FD238
.incbin "data_080FC8A4/gUnk_080FD238.bin"
gUnk_080FD240:: @ 080FD240
.incbin "data_080FC8A4/gUnk_080FD240.bin"
gUnk_080FD248:: @ 080FD248
.incbin "data_080FC8A4/gUnk_080FD248.bin"
gHitbox_9:: @ 080FD250
.incbin "data_080FC8A4/gHitbox_9.bin"
gUnk_080FD258:: @ 080FD258
.incbin "data_080FC8A4/gUnk_080FD258.bin"
gUnk_080FD260:: @ 080FD260
.incbin "data_080FC8A4/gUnk_080FD260.bin"
gHitbox_10:: @ 080FD268
.incbin "data_080FC8A4/gHitbox_10.bin"
gUnk_080FD270:: @ 080FD270
.incbin "data_080FC8A4/gUnk_080FD270.bin"
gUnk_080FD278:: @ 080FD278
.incbin "data_080FC8A4/gUnk_080FD278.bin"
gUnk_080FD280:: @ 080FD280
.incbin "data_080FC8A4/gUnk_080FD280.bin"
gUnk_080FD288:: @ 080FD288
.incbin "data_080FC8A4/gUnk_080FD288.bin"
gUnk_080FD290:: @ 080FD290
.incbin "data_080FC8A4/gUnk_080FD290.bin"
gUnk_080FD298:: @ 080FD298
.incbin "data_080FC8A4/gUnk_080FD298.bin"
gUnk_080FD2A0:: @ 080FD2A0
.incbin "data_080FC8A4/gUnk_080FD2A0.bin"
gUnk_080FD2A8:: @ 080FD2A8
.incbin "data_080FC8A4/gUnk_080FD2A8.bin"
gHitbox_11:: @ 080FD2B0
.incbin "data_080FC8A4/gHitbox_11.bin"
gHitbox_12:: @ 080FD2B8
.incbin "data_080FC8A4/gHitbox_12.bin"
gHitbox_13:: @ 080FD2C0
.incbin "data_080FC8A4/gHitbox_13.bin"
gHitbox_14:: @ 080FD2C8
.incbin "data_080FC8A4/gHitbox_14.bin"
gUnk_080FD2D0:: @ 080FD2D0
.incbin "data_080FC8A4/gUnk_080FD2D0.bin"
gUnk_080FD2D8:: @ 080FD2D8
.incbin "data_080FC8A4/gUnk_080FD2D8.bin"
gUnk_080FD2E0:: @ 080FD2E0
.incbin "data_080FC8A4/gUnk_080FD2E0.bin"
gUnk_080FD2E8:: @ 080FD2E8
.incbin "data_080FC8A4/gUnk_080FD2E8.bin"
gUnk_080FD2F0:: @ 080FD2F0
.incbin "data_080FC8A4/gUnk_080FD2F0.bin"
gHitbox_15:: @ 080FD2F8
.incbin "data_080FC8A4/gHitbox_15.bin"
gHitbox_16:: @ 080FD300
.incbin "data_080FC8A4/gHitbox_16.bin"
gUnk_080FD308:: @ 080FD308
.incbin "data_080FC8A4/gUnk_080FD308.bin"
gUnk_080FD310:: @ 080FD310
.incbin "data_080FC8A4/gUnk_080FD310.bin"
gHitbox_17:: @ 080FD318
.incbin "data_080FC8A4/gHitbox_17.bin"
gUnk_080FD320:: @ 080FD320
.incbin "data_080FC8A4/gUnk_080FD320.bin"
gUnk_080FD328:: @ 080FD328
.incbin "data_080FC8A4/gUnk_080FD328.bin"
gUnk_080FD330:: @ 080FD330
.incbin "data_080FC8A4/gUnk_080FD330.bin"
gHitbox_18:: @ 080FD338
.incbin "data_080FC8A4/gHitbox_18.bin"
gUnk_080FD340:: @ 080FD340
.incbin "data_080FC8A4/gUnk_080FD340.bin"
gUnk_080FD34C:: @ 080FD34C
.incbin "data_080FC8A4/gUnk_080FD34C.bin"
gUnk_080FD354:: @ 080FD354
.incbin "data_080FC8A4/gUnk_080FD354.bin"
gUnk_080FD35C:: @ 080FD35C
.incbin "data_080FC8A4/gUnk_080FD35C.bin"
gUnk_080FD364:: @ 080FD364
.incbin "data_080FC8A4/gUnk_080FD364.bin"
gUnk_080FD36C:: @ 080FD36C
.incbin "data_080FC8A4/gUnk_080FD36C.bin"
gUnk_080FD374:: @ 080FD374
.incbin "data_080FC8A4/gUnk_080FD374.bin"
gUnk_080FD37C:: @ 080FD37C
.incbin "data_080FC8A4/gUnk_080FD37C.bin"
gUnk_080FD384:: @ 080FD384
.incbin "data_080FC8A4/gUnk_080FD384.bin"
gUnk_080FD38C:: @ 080FD38C
.incbin "data_080FC8A4/gUnk_080FD38C.bin"
gUnk_080FD394:: @ 080FD394
.incbin "data_080FC8A4/gUnk_080FD394.bin"
gUnk_080FD39C:: @ 080FD39C
.incbin "data_080FC8A4/gUnk_080FD39C.bin"
gUnk_080FD3A4:: @ 080FD3A4
.incbin "data_080FC8A4/gUnk_080FD3A4.bin"
gUnk_080FD3AC:: @ 080FD3AC
.incbin "data_080FC8A4/gUnk_080FD3AC.bin"
gUnk_080FD3B4:: @ 080FD3B4
.incbin "data_080FC8A4/gUnk_080FD3B4.bin"
gUnk_080FD3BC:: @ 080FD3BC
.incbin "data_080FC8A4/gUnk_080FD3BC.bin"
gUnk_080FD3C4:: @ 080FD3C4
.incbin "data_080FC8A4/gUnk_080FD3C4.bin"
gUnk_080FD3CC:: @ 080FD3CC
.incbin "data_080FC8A4/gUnk_080FD3CC.bin"
gUnk_080FD3DC:: @ 080FD3DC
.incbin "data_080FC8A4/gUnk_080FD3DC.bin"
gUnk_080FD3E4:: @ 080FD3E4
.incbin "data_080FC8A4/gUnk_080FD3E4.bin"
gUnk_080FD3EC:: @ 080FD3EC
.incbin "data_080FC8A4/gUnk_080FD3EC.bin"
gUnk_080FD3F4:: @ 080FD3F4
.incbin "data_080FC8A4/gUnk_080FD3F4.bin"
gUnk_080FD3FC:: @ 080FD3FC
.incbin "data_080FC8A4/gUnk_080FD3FC.bin"
gUnk_080FD408:: @ 080FD408
.incbin "data_080FC8A4/gUnk_080FD408.bin"
gHitbox_19:: @ 080FD410
.incbin "data_080FC8A4/gHitbox_19.bin"
gUnk_080FD41C:: @ 080FD41C
.incbin "data_080FC8A4/gUnk_080FD41C.bin"
gUnk_080FD424:: @ 080FD424
.incbin "data_080FC8A4/gUnk_080FD424.bin"
gUnk_080FD42C:: @ 080FD42C
.incbin "data_080FC8A4/gUnk_080FD42C.bin"
gUnk_080FD434:: @ 080FD434
.incbin "data_080FC8A4/gUnk_080FD434.bin"
gUnk_080FD43C:: @ 080FD43C
.incbin "data_080FC8A4/gUnk_080FD43C.bin"
gHitbox_20:: @ 080FD448
.incbin "data_080FC8A4/gHitbox_20.bin"
gUnk_080FD450:: @ 080FD450
.incbin "data_080FC8A4/gUnk_080FD450.bin"
gHitbox_21:: @ 080FD458
.incbin "data_080FC8A4/gHitbox_21.bin"
gHitbox_22:: @ 080FD460
.incbin "data_080FC8A4/gHitbox_22.bin"
gHitbox_23:: @ 080FD468
.incbin "data_080FC8A4/gHitbox_23.bin"
gHitbox_32:: @ 080FD470
.incbin "data_080FC8A4/gHitbox_32.bin"
gHitbox_24:: @ 080FD480
.incbin "data_080FC8A4/gHitbox_24.bin"
gUnk_080FD488:: @ 080FD488
.incbin "data_080FC8A4/gUnk_080FD488.bin"
gUnk_080FD490:: @ 080FD490
.incbin "data_080FC8A4/gUnk_080FD490.bin"
gHitbox_25:: @ 080FD498
.incbin "data_080FC8A4/gHitbox_25.bin"
gHitbox_26:: @ 080FD4A4
.incbin "data_080FC8A4/gHitbox_26.bin"
gUnk_080FD4B8:: @ 080FD4B8
.incbin "data_080FC8A4/gUnk_080FD4B8.bin"
gUnk_080FD4C0:: @ 080FD4C0
.incbin "data_080FC8A4/gUnk_080FD4C0.bin"
gUnk_080FD4C8:: @ 080FD4C8
.incbin "data_080FC8A4/gUnk_080FD4C8.bin"
gUnk_080FD4D0:: @ 080FD4D0
.incbin "data_080FC8A4/gUnk_080FD4D0.bin"
gUnk_080FD4D8:: @ 080FD4D8
.incbin "data_080FC8A4/gUnk_080FD4D8.bin"
gUnk_080FD4E0:: @ 080FD4E0
.incbin "data_080FC8A4/gUnk_080FD4E0.bin"
gUnk_080FD4E8:: @ 080FD4E8
.incbin "data_080FC8A4/gUnk_080FD4E8.bin"
gUnk_080FD4F0:: @ 080FD4F0
.incbin "data_080FC8A4/gUnk_080FD4F0.bin"
gUnk_080FD4F8:: @ 080FD4F8
.incbin "data_080FC8A4/gUnk_080FD4F8.bin"
gUnk_080FD500:: @ 080FD500
.incbin "data_080FC8A4/gUnk_080FD500.bin"
gUnk_080FD508:: @ 080FD508
.incbin "data_080FC8A4/gUnk_080FD508.bin"
gUnk_080FD510:: @ 080FD510
.incbin "data_080FC8A4/gUnk_080FD510.bin"
gUnk_080FD518:: @ 080FD518
.incbin "data_080FC8A4/gUnk_080FD518.bin"
gUnk_080FD520:: @ 080FD520
.incbin "data_080FC8A4/gUnk_080FD520.bin"
gHitbox_27:: @ 080FD528
.incbin "data_080FC8A4/gHitbox_27.bin"
gUnk_080FD530:: @ 080FD530
.incbin "data_080FC8A4/gUnk_080FD530.bin"
gUnk_080FD538:: @ 080FD538
.incbin "data_080FC8A4/gUnk_080FD538.bin"
gUnk_080FD544:: @ 080FD544
.incbin "data_080FC8A4/gUnk_080FD544.bin"
gHitbox_28:: @ 080FD54C
.incbin "data_080FC8A4/gHitbox_28.bin"
gUnk_080FD558:: @ 080FD558
.incbin "data_080FC8A4/gUnk_080FD558.bin"
gUnk_080FD560:: @ 080FD560
.incbin "data_080FC8A4/gUnk_080FD560.bin"
gHitbox_29:: @ 080FD568
.incbin "data_080FC8A4/gHitbox_29.bin"
gUnk_080FD570:: @ 080FD570
.incbin "data_080FC8A4/gUnk_080FD570.bin"
gUnk_080FD578:: @ 080FD578
.incbin "data_080FC8A4/gUnk_080FD578.bin"
gUnk_080FD580:: @ 080FD580
.incbin "data_080FC8A4/gUnk_080FD580.bin"
gUnk_080FD588:: @ 080FD588
.incbin "data_080FC8A4/gUnk_080FD588.bin"
gWalletSizes:: @ 080FD590
.incbin "data_080FC8A4/gWalletSizes.bin"
gBombBagSizes:: @ 080FD5A0
.incbin "data_080FC8A4/gBombBagSizes.bin"
gQuiverSizes:: @ 080FD5A4
.incbin "data_080FC8A4/gQuiverSizes.bin"
@ game.c
gUnk_080FD5A8:: @ 080FD5A8
.incbin "data_080FC8A4/gUnk_080FD5A8.bin"
data/const/game_2.s
+1 -479
View File
@@ -4,486 +4,8 @@
.section .rodata
.align 2
@ game.c, linkHoldingItem.c
gUnk_080FD964:: @ 080FD964
.ifdef EU
@ TODO only small differences
.incbin "data_080FC8A4/gUnk_080FD964_EU.bin"
.else
.incbin "data_080FC8A4/gUnk_080FD964_1_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
gSpriteAnimations_322_0:: @ 080FDD14
.include "animations/gSpriteAnimations_322_0.s"
gSpriteAnimations_322_1:: @ 080FDD19
.include "animations/gSpriteAnimations_322_1.s"
gSpriteAnimations_322_2:: @ 080FDD1E
.include "animations/gSpriteAnimations_322_2.s"
gSpriteAnimations_322_3:: @ 080FDD23
.include "animations/gSpriteAnimations_322_3.s"
gSpriteAnimations_322_4:: @ 080FDD28
.include "animations/gSpriteAnimations_322_4.s"
gSpriteAnimations_322_6:: @ 080FDD2D
.include "animations/gSpriteAnimations_322_6.s"
gSpriteAnimations_322_7:: @ 080FDD32
.include "animations/gSpriteAnimations_322_7.s"
gSpriteAnimations_322_8:: @ 080FDD37
.include "animations/gSpriteAnimations_322_8.s"
gSpriteAnimations_322_9:: @ 080FDD48
.include "animations/gSpriteAnimations_322_9.s"
gSpriteAnimations_322_10:: @ 080FDD4D
.include "animations/gSpriteAnimations_322_10.s"
gSpriteAnimations_322_11:: @ 080FDD52
.include "animations/gSpriteAnimations_322_11.s"
gSpriteAnimations_322_12:: @ 080FDD57
.include "animations/gSpriteAnimations_322_12.s"
gSpriteAnimations_322_13:: @ 080FDD5C
.include "animations/gSpriteAnimations_322_13.s"
gSpriteAnimations_322_14:: @ 080FDD61
.include "animations/gSpriteAnimations_322_14.s"
gSpriteAnimations_322_15:: @ 080FDD92
.include "animations/gSpriteAnimations_322_15.s"
gSpriteAnimations_322_5:: @ 080FDD97
.include "animations/gSpriteAnimations_322_5.s"
gSpriteAnimations_322_17:: @ 080FDDA8
.include "animations/gSpriteAnimations_322_17.s"
gSpriteAnimations_322_18:: @ 080FDDAD
.include "animations/gSpriteAnimations_322_18.s"
gSpriteAnimations_322_19:: @ 080FDDB2
.include "animations/gSpriteAnimations_322_19.s"
gSpriteAnimations_322_20:: @ 080FDDB7
.include "animations/gSpriteAnimations_322_20.s"
gSpriteAnimations_322_21:: @ 080FDDBC
.include "animations/gSpriteAnimations_322_21.s"
gSpriteAnimations_322_22:: @ 080FDDC1
.include "animations/gSpriteAnimations_322_22.s"
gSpriteAnimations_322_23:: @ 080FDDC6
.include "animations/gSpriteAnimations_322_23.s"
gSpriteAnimations_322_28:: @ 080FDDCB
.include "animations/gSpriteAnimations_322_28.s"
gSpriteAnimations_322_38:: @ 080FDDD0
.include "animations/gSpriteAnimations_322_38.s"
gSpriteAnimations_322_39:: @ 080FDDD5
.include "animations/gSpriteAnimations_322_39.s"
gSpriteAnimations_322_34:: @ 080FDDDA
.include "animations/gSpriteAnimations_322_34.s"
gSpriteAnimations_322_35:: @ 080FDDDF
.include "animations/gSpriteAnimations_322_35.s"
gSpriteAnimations_322_40:: @ 080FDDE4
.include "animations/gSpriteAnimations_322_40.s"
gSpriteAnimations_322_41:: @ 080FDDF5
.include "animations/gSpriteAnimations_322_41.s"
gSpriteAnimations_322_42:: @ 080FDE0E
.include "animations/gSpriteAnimations_322_42.s"
gSpriteAnimations_322_43:: @ 080FDE27
.include "animations/gSpriteAnimations_322_43.s"
gSpriteAnimations_322_44:: @ 080FDE40
.include "animations/gSpriteAnimations_322_44.s"
gSpriteAnimations_322_45:: @ 080FDE59
.include "animations/gSpriteAnimations_322_45.s"
gSpriteAnimations_322_46:: @ 080FDE72
.include "animations/gSpriteAnimations_322_46.s"
gSpriteAnimations_322_36:: @ 080FDE8B
.include "animations/gSpriteAnimations_322_36.s"
gSpriteAnimations_322_37:: @ 080FDE90
.include "animations/gSpriteAnimations_322_37.s"
gSpriteAnimations_322_54:: @ 080FDE95
.include "animations/gSpriteAnimations_322_54.s"
gSpriteAnimations_322_33:: @ 080FDE9A
.include "animations/gSpriteAnimations_322_33.s"
gSpriteAnimations_322_47:: @ 080FDE9F
.include "animations/gSpriteAnimations_322_47.s"
gSpriteAnimations_322_48:: @ 080FDEA4
.include "animations/gSpriteAnimations_322_48.s"
gSpriteAnimations_322_49:: @ 080FDEA9
.include "animations/gSpriteAnimations_322_49.s"
gSpriteAnimations_322_52:: @ 080FDEAE
.include "animations/gSpriteAnimations_322_52.s"
gSpriteAnimations_322_53:: @ 080FDEB3
.include "animations/gSpriteAnimations_322_53.s"
gSpriteAnimations_322_24:: @ 080FDEB8
.include "animations/gSpriteAnimations_322_24.s"
gSpriteAnimations_322_58:: @ 080FDEBD
.include "animations/gSpriteAnimations_322_58.s"
gSpriteAnimations_322_59:: @ 080FDEC2
.include "animations/gSpriteAnimations_322_59.s"
gSpriteAnimations_322_25:: @ 080FDEC7
.include "animations/gSpriteAnimations_322_25.s"
gSpriteAnimations_322_60:: @ 080FDECC
.include "animations/gSpriteAnimations_322_60.s"
gSpriteAnimations_322_55:: @ 080FDED1
.include "animations/gSpriteAnimations_322_55.s"
gSpriteAnimations_322_68:: @ 080FDED6
.include "animations/gSpriteAnimations_322_68.s"
gSpriteAnimations_322_69:: @ 080FDEDB
.include "animations/gSpriteAnimations_322_69.s"
gSpriteAnimations_322_26:: @ 080FDEE0
.include "animations/gSpriteAnimations_322_26.s"
gSpriteAnimations_322_64:: @ 080FDEE5
.include "animations/gSpriteAnimations_322_64.s"
gSpriteAnimations_322_65:: @ 080FDEEA
.include "animations/gSpriteAnimations_322_65.s"
gSpriteAnimations_322_66:: @ 080FDEEF
.include "animations/gSpriteAnimations_322_66.s"
gSpriteAnimations_322_67:: @ 080FDEF4
.include "animations/gSpriteAnimations_322_67.s"
gSpriteAnimations_322_71:: @ 080FDEF9
.include "animations/gSpriteAnimations_322_71.s"
gSpriteAnimations_322_81:: @ 080FDEFE
.include "animations/gSpriteAnimations_322_81.s"
gSpriteAnimations_322_82:: @ 080FDF03
.include "animations/gSpriteAnimations_322_82.s"
gSpriteAnimations_322_83:: @ 080FDF08
.include "animations/gSpriteAnimations_322_83.s"
gSpriteAnimations_322_84:: @ 080FDF0D
.include "animations/gSpriteAnimations_322_84.s"
gSpriteAnimations_322_95:: @ 080FDF12
.include "animations/gSpriteAnimations_322_95.s"
gSpriteAnimations_322_96:: @ 080FDF17
.include "animations/gSpriteAnimations_322_96.s"
gSpriteAnimations_322_98:: @ 080FDF28
.include "animations/gSpriteAnimations_322_98.s"
gSpriteAnimations_322_99:: @ 080FDF45
.include "animations/gSpriteAnimations_322_99.s"
gSpriteAnimations_322_87:: @ 080FDF4A
.include "animations/gSpriteAnimations_322_87.s"
gSpriteAnimations_322_104:: @ 080FDF4F
.include "animations/gSpriteAnimations_322_104.s"
gSpriteAnimations_322_105:: @ 080FDF54
.include "animations/gSpriteAnimations_322_105.s"
gSpriteAnimations_322_106:: @ 080FDF59
.include "animations/gSpriteAnimations_322_106.s"
gSpriteAnimations_322_107:: @ 080FDF5E
.include "animations/gSpriteAnimations_322_107.s"
gSpriteAnimations_322_93:: @ 080FDF63
.include "animations/gSpriteAnimations_322_93.s"
gSpriteAnimations_322_94:: @ 080FDF68
.include "animations/gSpriteAnimations_322_94.s"
gSpriteAnimations_322_63:: @ 080FDF6D
.include "animations/gSpriteAnimations_322_63.s"
gSpriteAnimations_322_100:: @ 080FDF72
.include "animations/gSpriteAnimations_322_100.s"
gSpriteAnimations_322_101:: @ 080FDF77
.include "animations/gSpriteAnimations_322_101.s"
gSpriteAnimations_322_102:: @ 080FDF7C
.include "animations/gSpriteAnimations_322_102.s"
gSpriteAnimations_322_103:: @ 080FDF81
.include "animations/gSpriteAnimations_322_103.s"
gSpriteAnimations_322_91:: @ 080FDF86
.include "animations/gSpriteAnimations_322_91.s"
gSpriteAnimations_322_92:: @ 080FDF8F
.include "animations/gSpriteAnimations_322_92.s"
gSpriteAnimations_322_108:: @ 080FDF94
.include "animations/gSpriteAnimations_322_108.s"
gSpriteAnimations_322_109:: @ 080FDF99
.include "animations/gSpriteAnimations_322_109.s"
gSpriteAnimations_322_110:: @ 080FDF9E
.include "animations/gSpriteAnimations_322_110.s"
gSpriteAnimations_322_111:: @ 080FDFA3
.include "animations/gSpriteAnimations_322_111.s"
gSpriteAnimations_322_112:: @ 080FDFA8
.include "animations/gSpriteAnimations_322_112.s"
gSpriteAnimations_322_72:: @ 080FDFC1
.include "animations/gSpriteAnimations_322_72.s"
gSpriteAnimations_322_97:: @ 080FDFC6
.include "animations/gSpriteAnimations_322_97.s"
gSpriteAnimations_322_61:: @ 080FDFCB
.include "animations/gSpriteAnimations_322_61.s"
gSpriteAnimations_322_62:: @ 080FDFD0
.include "animations/gSpriteAnimations_322_62.s"
@ subtask2.c, ui.c, pause_menu.c
gSpriteAnimations_322:: @ 080FDFD8
.4byte gSpriteAnimations_322_0
.4byte gSpriteAnimations_322_1
.4byte gSpriteAnimations_322_2
.4byte gSpriteAnimations_322_3
.4byte gSpriteAnimations_322_4
.4byte gSpriteAnimations_322_5
.4byte gSpriteAnimations_322_6
.4byte gSpriteAnimations_322_7
.4byte gSpriteAnimations_322_8
.4byte gSpriteAnimations_322_9
.4byte gSpriteAnimations_322_10
.4byte gSpriteAnimations_322_11
.4byte gSpriteAnimations_322_12
.4byte gSpriteAnimations_322_13
.4byte gSpriteAnimations_322_14
.4byte gSpriteAnimations_322_15
.4byte gSpriteAnimations_322_5
.4byte gSpriteAnimations_322_17
.4byte gSpriteAnimations_322_18
.4byte gSpriteAnimations_322_19
.4byte gSpriteAnimations_322_20
.4byte gSpriteAnimations_322_21
.4byte gSpriteAnimations_322_22
.4byte gSpriteAnimations_322_23
.4byte gSpriteAnimations_322_24
.4byte gSpriteAnimations_322_25
.4byte gSpriteAnimations_322_26
.4byte gSpriteAnimations_322_5
.4byte gSpriteAnimations_322_28
.4byte gSpriteAnimations_322_28
.4byte gSpriteAnimations_322_28
.4byte gSpriteAnimations_322_28
.4byte gSpriteAnimations_322_28
.4byte gSpriteAnimations_322_33
.4byte gSpriteAnimations_322_34
.4byte gSpriteAnimations_322_35
.4byte gSpriteAnimations_322_36
.4byte gSpriteAnimations_322_37
.4byte gSpriteAnimations_322_38
.4byte gSpriteAnimations_322_39
.4byte gSpriteAnimations_322_40
.4byte gSpriteAnimations_322_41
.4byte gSpriteAnimations_322_42
.4byte gSpriteAnimations_322_43
.4byte gSpriteAnimations_322_44
.4byte gSpriteAnimations_322_45
.4byte gSpriteAnimations_322_46
.4byte gSpriteAnimations_322_47
.4byte gSpriteAnimations_322_48
.4byte gSpriteAnimations_322_49
.4byte gSpriteAnimations_322_5
.4byte gSpriteAnimations_322_5
.4byte gSpriteAnimations_322_52
.4byte gSpriteAnimations_322_53
.4byte gSpriteAnimations_322_54
.4byte gSpriteAnimations_322_55
.4byte gSpriteAnimations_322_25
.4byte gSpriteAnimations_322_24
.4byte gSpriteAnimations_322_58
.4byte gSpriteAnimations_322_59
.4byte gSpriteAnimations_322_60
.4byte gSpriteAnimations_322_61
.4byte gSpriteAnimations_322_62
.4byte gSpriteAnimations_322_63
.4byte gSpriteAnimations_322_64
.4byte gSpriteAnimations_322_65
.4byte gSpriteAnimations_322_66
.4byte gSpriteAnimations_322_67
.4byte gSpriteAnimations_322_68
.4byte gSpriteAnimations_322_69
.4byte gSpriteAnimations_322_26
.4byte gSpriteAnimations_322_71
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_72
.4byte gSpriteAnimations_322_71
.4byte gSpriteAnimations_322_81
.4byte gSpriteAnimations_322_82
.4byte gSpriteAnimations_322_83
.4byte gSpriteAnimations_322_84
.4byte gSpriteAnimations_322_84
.4byte gSpriteAnimations_322_84
.4byte gSpriteAnimations_322_87
.4byte gSpriteAnimations_322_87
.4byte gSpriteAnimations_322_87
.4byte gSpriteAnimations_322_5
.4byte gSpriteAnimations_322_91
.4byte gSpriteAnimations_322_92
.4byte gSpriteAnimations_322_93
.4byte gSpriteAnimations_322_94
.4byte gSpriteAnimations_322_95
.4byte gSpriteAnimations_322_96
.4byte gSpriteAnimations_322_97
.4byte gSpriteAnimations_322_98
.4byte gSpriteAnimations_322_99
.4byte gSpriteAnimations_322_100
.4byte gSpriteAnimations_322_101
.4byte gSpriteAnimations_322_102
.4byte gSpriteAnimations_322_103
.4byte gSpriteAnimations_322_104
.4byte gSpriteAnimations_322_105
.4byte gSpriteAnimations_322_106
.4byte gSpriteAnimations_322_107
.4byte gSpriteAnimations_322_108
.4byte gSpriteAnimations_322_109
.4byte gSpriteAnimations_322_110
.4byte gSpriteAnimations_322_111
.4byte gSpriteAnimations_322_112
.4byte gSpriteAnimations_322_112
.4byte gSpriteAnimations_322_112
.4byte gSpriteAnimations_322_0
.4byte gSpriteAnimations_322_0
.4byte gSpriteAnimations_322_0
.4byte 00000000
@ game.c
gUnk_080FE1B4:: @ 080FE1B4
.incbin "data_080FC8A4/gUnk_080FE1B4.bin"
gUnk_080FE1C6:: @ 080FE1C6
.incbin "data_080FC8A4/gUnk_080FE1C6.bin"
gUnk_080FE1DD:: @ 080FE1DD
.incbin "data_080FC8A4/gUnk_080FE1DD.bin"
gUnk_080FE2A0:: @ 080FE2A0
.4byte sub_0805488C
.4byte sub_080548E8
.4byte sub_08054920
@ game.c
gUnk_080FE2AC:: @ 080FE2AC
.4byte sub_08055D80
.4byte sub_08054E00
.4byte sub_080558EC
.4byte sub_08054CE8
.4byte sub_08054C04
.4byte sub_08055168
.4byte sub_080552FC
.4byte sub_08055BB0
.4byte sub_08055414
.4byte sub_080559E0
.4byte sub_0805559C
.4byte sub_080554FC
.4byte sub_08055818
.4byte sub_08055094
.4byte sub_080550F8
.4byte sub_080556F4
.4byte sub_08055038
.4byte sub_08054F90
.4byte sub_08054F90
.4byte sub_08054D90
.4byte sub_08055888
.4byte sub_08055690
.4byte sub_08055E08
.4byte sub_080557B4
.4byte sub_08055CD8
.4byte sub_08055AD0
.4byte sub_08055D80
.4byte sub_08055D80
.4byte sub_08055D80
@ game.c, kinstone.c, subtask2.c
gUnk_080FE320:: @ 080FE320
.ifdef JP
@ TODO only small differences
.incbin "data_080FC8A4/gUnk_080FE320_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "data_080FC8A4/gUnk_080FE320_1_DEMO_JP.bin"
.else
.ifdef EU
.incbin "data_080FC8A4/gUnk_080FE320_2_EU.bin"
.else
.incbin "data_080FC8A4/gUnk_080FE320_3_USA-DEMO_USA.bin"
.endif
.endif
.endif
.ifdef JP
@ TODO only small differences
.incbin "data_080FC8A4/gUnk_080FE320_4_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "data_080FC8A4/gUnk_080FE320_5_DEMO_JP.bin"
.else
.ifdef EU
.incbin "data_080FC8A4/gUnk_080FE320_6_EU.bin"
.else
.incbin "data_080FC8A4/gUnk_080FE320_7_USA-DEMO_USA.bin"
.endif
.endif
.endif
@ kinstone.c, subtask.c
@ kinstone.c, worldEvent2.c
gUnk_080FEAC8:: @ 080FEAC8
.incbin "data_080FC8A4/gUnk_080FEAC8.bin"
.ifdef JP
data/const/manager/enterRoomTextboxManager.s
+5 -5
View File
@@ -4,12 +4,12 @@
.section .rodata
.align 2
gUnk_08108DE8:: @ 08108DE8
.incbin "enterRoomTextboxManager/gUnk_08108DE8.bin"
@ gUnk_08108DE8:: @ 08108DE8
@ .incbin "enterRoomTextboxManager/gUnk_08108DE8.bin"
EnterRoomTextboxManager_Actions:: @ 08108E28
.4byte sub_0805E140
.4byte sub_0805E18C
@ EnterRoomTextboxManager_Actions:: @ 08108E28
@ .4byte sub_0805E140
@ .4byte sub_0805E18C
gUnk_08108E30:: @ 08108E30
.incbin "enterRoomTextboxManager/gUnk_08108E30.bin"
data/const/movement.s
-14
View File
@@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08133368:: @ 08133368
.ifdef EU
@ TODO only small differences
.incbin "data_08132B30/gUnk_08133368_EU.bin"
.else
.incbin "data_08132B30/gUnk_08133368_1_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
data/const/npc/bladeBrothers.s
-76
View File
@@ -1,76 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081115C0:: @ 081115C0
.4byte sub_08068A1C
.4byte sub_08068A4C
.4byte sub_08068AA4
.4byte sub_08068ADC
gUnk_081115D0:: @ 081115D0
.4byte sub_08068AFC
.4byte sub_08068b2c
.4byte sub_08068B70
gUnk_081115DC:: @ 081115DC
.incbin "bladeBrothers/gUnk_081115DC.bin"
BladeBrothers_PlayerMacros:: @ 081115EC
.4byte gUnk_08004A0C
.4byte gUnk_08004A16
.4byte gUnk_08004A24
.4byte gUnk_08004A32
.4byte gUnk_08004A48
.4byte gUnk_08004A72
.4byte gUnk_08004A8C
.4byte gUnk_08004AA6
.4byte 00000000
.incbin "bladeBrothers/BladeBrothers_PlayerMacros.bin"
BladeBrothers_EquippedItem:: @ 08111618
.incbin "bladeBrothers/BladeBrothers_EquippedItem.bin"
gUnk_08111623:: @ 08111623
.incbin "bladeBrothers/gUnk_08111623.bin"
gUnk_0811162B:: @ 0811162B
.incbin "bladeBrothers/gUnk_0811162B.bin"
gUnk_08111664:: @ 08111664
.incbin "bladeBrothers/gUnk_08111664.bin"
gUnk_0811167A:: @ 0811167A
.incbin "bladeBrothers/gUnk_0811167A.bin"
gUnk_08111690:: @ 08111690
.incbin "bladeBrothers/gUnk_08111690.bin"
gUnk_081116A6:: @ 081116A6
.incbin "bladeBrothers/gUnk_081116A6.bin"
gUnk_081116BC:: @ 081116BC
.incbin "bladeBrothers/gUnk_081116BC.bin"
gUnk_081116D2:: @ 081116D2
.incbin "bladeBrothers/gUnk_081116D2.bin"
gUnk_081116E8:: @ 081116E8
.incbin "bladeBrothers/gUnk_081116E8.bin"
gUnk_081116FE:: @ 081116FE
.incbin "bladeBrothers/gUnk_081116FE.bin"
gUnk_08111714:: @ 08111714
.incbin "bladeBrothers/gUnk_08111714.bin"
gUnk_0811172A:: @ 0811172A
.incbin "bladeBrothers/gUnk_0811172A.bin"
gUnk_08111740:: @ 08111740
.incbin "bladeBrothers/gUnk_08111740.bin"
gSpriteAnimations_BladeBrothers_1_1:: @ 0811176C
.include "animations/gSpriteAnimations_BladeBrothers_1_1.s"
data/const/npc/dog.s
-80
View File
@@ -1,80 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08111D58:: @ 08111D58
.ifdef EU
@ TODO only small differences
.incbin "dog/gUnk_08111D58_EU.bin"
.else
.incbin "dog/gUnk_08111D58_1_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
gUnk_08111D88:: @ 08111D88
.4byte sub_08069B44
.4byte sub_08069C40
.4byte sub_08069D54
.4byte sub_08069DF8
.4byte sub_08069E44
.4byte sub_08069E50
.4byte sub_08069ECC
.4byte sub_08069EE0
gUnk_08111DA8:: @ 08111DA8
.incbin "dog/gUnk_08111DA8.bin"
gUnk_08111DB0:: @ 08111DB0
.incbin "dog/gUnk_08111DB0.bin"
gUnk_08111E30:: @ 08111E30
.incbin "dog/gUnk_08111E30.bin"
gUnk_08111E34:: @ 08111E34
.incbin "dog/gUnk_08111E34.bin"
.4byte sub_0806A0A4
.incbin "dog/gUnk_08111E34_1.bin"
.4byte sub_0806A0A4
.incbin "dog/gUnk_08111E34_2.bin"
.4byte sub_0806A0A4
.incbin "dog/gUnk_08111E34_3.bin"
.4byte sub_0806A0A4
.incbin "dog/gUnk_08111E34_4.bin"
.4byte sub_0806A0A4
.incbin "dog/gUnk_08111E34_5.bin"
.4byte sub_0806A0A4
.incbin "dog/gUnk_08111E34_6.bin"
.4byte sub_0806A0A4
.incbin "dog/gUnk_08111E34_7.bin"
.4byte sub_0806A0A4
.incbin "dog/gUnk_08111E34_8.bin"
.4byte sub_0806A0A4
.incbin "dog/gUnk_08111E34_9.bin"
.4byte sub_0806A0A4
.incbin "dog/gUnk_08111E34_10.bin"
.4byte sub_0806A144
.incbin "dog/gUnk_08111E34_11.bin"
.4byte sub_0806A144
.incbin "dog/gUnk_08111E34_12.bin"
.4byte sub_0806A144
.incbin "dog/gUnk_08111E34_13.bin"
.4byte sub_0806A144
.incbin "dog/gUnk_08111E34_14.bin"
.4byte sub_0806A144
.incbin "dog/gUnk_08111E34_15.bin"
.4byte sub_0806A144
.incbin "dog/gUnk_08111E34_16.bin"
.4byte sub_0806A144
.incbin "dog/gUnk_08111E34_17.bin"
.4byte sub_0806A144
.incbin "dog/gUnk_08111E34_18.bin"
.4byte sub_0806A144
.incbin "dog/gUnk_08111E34_19.bin"
.4byte sub_0806A144
gUnk_08111F74:: @ 08111F74
.incbin "dog/gUnk_08111F74.bin"
gUnk_08111FD8:: @ 08111FD8
.incbin "dog/gUnk_08111FD8.bin"
data/const/npc/forestMinish.s
-110
View File
@@ -1,110 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08109C98:: @ 08109C98
.incbin "forestMinish/gUnk_08109C98.bin"
gUnk_08109D18:: @ 08109D18
.4byte script_BombMinish
.4byte script_BombMinishKinstone
.4byte script_ForestMinish12
.4byte script_ForestMinish13
.4byte script_ForestMinish14
.4byte script_ForestMinish15
.4byte script_ForestMinish16
.4byte script_ForestMinish17
.4byte script_ForestMinish18
.4byte script_ForestMinish19
.4byte script_ForestMinish20
.4byte script_ForestMinish21
.4byte script_ForestMinish1
.4byte script_ForestMinish1
.4byte script_ForestMinish1
.4byte script_ForestMinish2
.4byte script_ForestMinish3
.4byte script_ForestMinish1
.4byte script_ForestMinish1
.4byte script_ForestMinish1
.4byte script_ForestMinish1
.4byte script_ForestMinish1
.4byte script_ForestMinish10
.4byte script_ForestMinish4
.4byte script_ForestMinish4
.4byte script_ForestMinish4
.4byte script_ForestMinish4
.4byte script_ForestMinish4
.4byte script_ForestMinish4
.4byte script_ForestMinish4
.4byte script_ForestMinish4
.4byte script_ForestMinish4
.4byte script_ForestMinish4
.4byte script_ForestMinish4
.4byte script_ForestMinish4
.4byte script_ForestMinish4
.4byte script_ForestMinish11
.4byte script_ForestMinish11
.4byte script_ForestMinish11
.4byte script_ForestMinish5
.4byte script_ForestMinish6
.4byte script_ForestMinish7
.4byte script_ForestMinish8
.4byte script_ForestMinish9
gUnk_08109DC8:: @ 08109DC8
.incbin "forestMinish/gUnk_08109DC8.bin"
.ifdef JP
@ TODO only small differences
.incbin "forestMinish/gUnk_08109DC8_1_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "forestMinish/gUnk_08109DC8_2_DEMO_JP.bin"
.else
.ifdef EU
.incbin "forestMinish/gUnk_08109DC8_3_EU.bin"
.else
.incbin "forestMinish/gUnk_08109DC8_4_USA-DEMO_USA.bin"
.endif
.endif
.endif
.ifdef JP
@ TODO only small differences
.incbin "forestMinish/gUnk_08109DC8_5_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "forestMinish/gUnk_08109DC8_6_DEMO_JP.bin"
.else
.ifdef EU
.incbin "forestMinish/gUnk_08109DC8_7_EU.bin"
.else
.incbin "forestMinish/gUnk_08109DC8_8_USA-DEMO_USA.bin"
.endif
.endif
.endif
.incbin "forestMinish/gUnk_08109DC8_9.bin"
.4byte sub_080601D4
.incbin "forestMinish/gUnk_08109DC8_10.bin"
.4byte sub_080601D4
.incbin "forestMinish/gUnk_08109DC8_11.bin"
.4byte sub_080601D4
.incbin "forestMinish/gUnk_08109DC8_12.bin"
.4byte sub_080601D4
.incbin "forestMinish/gUnk_08109DC8_13.bin"
gUnk_0810A348:: @ 0810A348
.incbin "forestMinish/gUnk_0810A348.bin"
gUnk_0810A354:: @ 0810A354
.incbin "forestMinish/gUnk_0810A354.bin"
gUnk_0810A35A:: @ 0810A35A
.incbin "forestMinish/gUnk_0810A35A.bin"
gUnk_0810A362:: @ 0810A362
.incbin "forestMinish/gUnk_0810A362.bin"
data/const/npc/gorman.s
-40
View File
@@ -1,40 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08111C3C:: @ 08111C3C
.incbin "gorman/gUnk_08111C3C.bin"
gUnk_08111C48:: @ 08111C48
.4byte sub_080697C4
.4byte sub_080697EC
gUnk_08111C50:: @ 08111C50
.incbin "gorman/gUnk_08111C50.bin"
gUnk_08111C5C:: @ 08111C5C
.incbin "gorman/gUnk_08111C5C.bin"
gUnk_08111C74:: @ 08111C74
.incbin "gorman/gUnk_08111C74.bin"
gUnk_08111C84:: @ 08111C84
.incbin "gorman/gUnk_08111C84.bin"
gUnk_08111C8C:: @ 08111C8C
.incbin "gorman/gUnk_08111C8C.bin"
gUnk_08111C9C:: @ 08111C9C
.incbin "gorman/gUnk_08111C9C.bin"
gUnk_08111CA8:: @ 08111CA8
.incbin "gorman/gUnk_08111CA8.bin"
gUnk_08111CB4:: @ 08111CB4
.incbin "gorman/gUnk_08111CB4.bin"
gUnk_08111CB8:: @ 08111CB8
.incbin "gorman/gUnk_08111CB8.bin"
data/const/npc/guard.s
-19
View File
@@ -4,25 +4,6 @@
.section .rodata
.align 2
gUnk_0810CF4C:: @ 0810CF4C
.incbin "guard/gUnk_0810CF4C.bin"
gUnk_0810D0A4:: @ 0810D0A4
.incbin "guard/gUnk_0810D0A4.bin"
gUnk_0810F524:: @ 0810F524
.incbin "guard/gUnk_0810F524.bin"
gUnk_0810F544:: @ 0810F544
.4byte sub_08063E90
.4byte sub_08063F20
.4byte sub_08063F78
gUnk_0810F550:: @ 0810F550
.4byte sub_08063D44
.4byte sub_08063DC8
.4byte sub_08063E54
.4byte sub_08063E6C
gUnk_0810F560:: @ 0810F560
.incbin "guard/gUnk_0810F560.bin"
data/const/npc/kid.s
-61
View File
@@ -1,61 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0810BD7C:: @ 0810BD7C
.incbin "kid/gUnk_0810BD7C.bin"
gUnk_0810BD8C:: @ 0810BD8C
.incbin "kid/gUnk_0810BD8C.bin"
gUnk_0810BD9C:: @ 0810BD9C
.incbin "kid/gUnk_0810BD9C.bin"
gUnk_0810BDAC:: @ 0810BDAC
.incbin "kid/gUnk_0810BDAC.bin"
gUnk_0810BDB8:: @ 0810BDB8
.incbin "kid/gUnk_0810BDB8.bin"
gUnk_0810BDC4:: @ 0810BDC4
.4byte gUnk_0810BD7C
.4byte gUnk_0810BD7C
.4byte gUnk_0810BD7C
.4byte gUnk_0810BD7C
.4byte gUnk_0810BD8C
.4byte gUnk_0810BD8C
.4byte gUnk_0810BD9C
.4byte gUnk_0810BDAC
.4byte gUnk_0810BDB8
gUnk_0810BDE8:: @ 0810BDE8
.incbin "kid/gUnk_0810BDE8.bin"
gUnk_0810BE0C:: @ 0810BE0C
.4byte sub_080620F4
gUnk_0810BE10:: @ 0810BE10
.4byte sub_08062130
.4byte sub_08062194
.incbin "kid/gUnk_0810BE10.bin"
.ifdef JP
@ TODO only small differences
.incbin "kid/gUnk_0810BE10_1_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "kid/gUnk_0810BE10_2_DEMO_JP.bin"
.else
.ifdef EU
.incbin "kid/gUnk_0810BE10_3_EU.bin"
.else
.incbin "kid/gUnk_0810BE10_4_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_0810C0A0:: @ 0810C0A0
.incbin "kid/gUnk_0810C0A0.bin"
data/const/npc/postman.s
-286
View File
@@ -1,286 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0810A66C:: @ 0810A66C
.incbin "postman/gUnk_0810A66C.bin"
gUnk_0810A768:: @ 0810A768
.incbin "postman/gUnk_0810A768.bin"
gUnk_0810A76D:: @ 0810A76D
.incbin "postman/gUnk_0810A76D.bin"
gUnk_0810A772:: @ 0810A772
.incbin "postman/gUnk_0810A772.bin"
gUnk_0810A777:: @ 0810A777
.incbin "postman/gUnk_0810A777.bin"
gUnk_0810A77D:: @ 0810A77D
.incbin "postman/gUnk_0810A77D.bin"
gUnk_0810A783:: @ 0810A783
.incbin "postman/gUnk_0810A783.bin"
gUnk_0810A789:: @ 0810A789
.incbin "postman/gUnk_0810A789.bin"
gUnk_0810A78E:: @ 0810A78E
.incbin "postman/gUnk_0810A78E.bin"
gUnk_0810A794:: @ 0810A794
.incbin "postman/gUnk_0810A794.bin"
gUnk_0810A79A:: @ 0810A79A
.incbin "postman/gUnk_0810A79A.bin"
gUnk_0810A7A0:: @ 0810A7A0
.incbin "postman/gUnk_0810A7A0.bin"
gUnk_0810A7A6:: @ 0810A7A6
.incbin "postman/gUnk_0810A7A6.bin"
gUnk_0810A7AC:: @ 0810A7AC
.incbin "postman/gUnk_0810A7AC.bin"
gUnk_0810A7B3:: @ 0810A7B3
.incbin "postman/gUnk_0810A7B3.bin"
gUnk_0810A7B9:: @ 0810A7B9
.incbin "postman/gUnk_0810A7B9.bin"
gUnk_0810A7BF:: @ 0810A7BF
.incbin "postman/gUnk_0810A7BF.bin"
gUnk_0810A7C5:: @ 0810A7C5
.incbin "postman/gUnk_0810A7C5.bin"
gUnk_0810A7CA:: @ 0810A7CA
.incbin "postman/gUnk_0810A7CA.bin"
gUnk_0810A7D0:: @ 0810A7D0
.incbin "postman/gUnk_0810A7D0.bin"
gUnk_0810A7D6:: @ 0810A7D6
.incbin "postman/gUnk_0810A7D6.bin"
gUnk_0810A7DB:: @ 0810A7DB
.incbin "postman/gUnk_0810A7DB.bin"
gUnk_0810A7E0:: @ 0810A7E0
.incbin "postman/gUnk_0810A7E0.bin"
gUnk_0810A7E5:: @ 0810A7E5
.incbin "postman/gUnk_0810A7E5.bin"
gUnk_0810A7F5:: @ 0810A7F5
.incbin "postman/gUnk_0810A7F5.bin"
gUnk_0810A805:: @ 0810A805
.incbin "postman/gUnk_0810A805.bin"
gUnk_0810A80D:: @ 0810A80D
.incbin "postman/gUnk_0810A80D.bin"
gUnk_0810A815:: @ 0810A815
.incbin "postman/gUnk_0810A815.bin"
gUnk_0810A81A:: @ 0810A81A
.incbin "postman/gUnk_0810A81A.bin"
gUnk_0810A81F:: @ 0810A81F
.incbin "postman/gUnk_0810A81F.bin"
gUnk_0810A825:: @ 0810A825
.incbin "postman/gUnk_0810A825.bin"
gUnk_0810A82A:: @ 0810A82A
.incbin "postman/gUnk_0810A82A.bin"
gUnk_0810A82F:: @ 0810A82F
.incbin "postman/gUnk_0810A82F.bin"
gUnk_0810A835:: @ 0810A835
.incbin "postman/gUnk_0810A835.bin"
gUnk_0810A83B:: @ 0810A83B
.incbin "postman/gUnk_0810A83B.bin"
gUnk_0810A841:: @ 0810A841
.incbin "postman/gUnk_0810A841.bin"
gUnk_0810A848:: @ 0810A848
.incbin "postman/gUnk_0810A848.bin"
gUnk_0810A84F:: @ 0810A84F
.incbin "postman/gUnk_0810A84F.bin"
gUnk_0810A85E:: @ 0810A85E
.incbin "postman/gUnk_0810A85E.bin"
gUnk_0810A86D:: @ 0810A86D
.incbin "postman/gUnk_0810A86D.bin"
gUnk_0810A872:: @ 0810A872
.incbin "postman/gUnk_0810A872.bin"
gUnk_0810A877:: @ 0810A877
.incbin "postman/gUnk_0810A877.bin"
gUnk_0810A87C:: @ 0810A87C
.incbin "postman/gUnk_0810A87C.bin"
gUnk_0810A881:: @ 0810A881
.incbin "postman/gUnk_0810A881.bin"
gUnk_0810A886:: @ 0810A886
.incbin "postman/gUnk_0810A886.bin"
gUnk_0810A88B:: @ 0810A88B
.incbin "postman/gUnk_0810A88B.bin"
gUnk_0810A891:: @ 0810A891
.incbin "postman/gUnk_0810A891.bin"
gUnk_0810A897:: @ 0810A897
.incbin "postman/gUnk_0810A897.bin"
gUnk_0810A89C:: @ 0810A89C
.incbin "postman/gUnk_0810A89C.bin"
gUnk_0810A8A2:: @ 0810A8A2
.incbin "postman/gUnk_0810A8A2.bin"
gUnk_0810A8A7:: @ 0810A8A7
.incbin "postman/gUnk_0810A8A7.bin"
gUnk_0810A8AC:: @ 0810A8AC
.incbin "postman/gUnk_0810A8AC.bin"
gUnk_0810A8B1:: @ 0810A8B1
.incbin "postman/gUnk_0810A8B1.bin"
gUnk_0810A8B6:: @ 0810A8B6
.incbin "postman/gUnk_0810A8B6.bin"
gUnk_0810A8BB:: @ 0810A8BB
.incbin "postman/gUnk_0810A8BB.bin"
gUnk_0810A8C0:: @ 0810A8C0
.incbin "postman/gUnk_0810A8C0.bin"
gUnk_0810A8CB:: @ 0810A8CB
.incbin "postman/gUnk_0810A8CB.bin"
gUnk_0810A8D6:: @ 0810A8D6
.incbin "postman/gUnk_0810A8D6.bin"
gUnk_0810A8DB:: @ 0810A8DB
.incbin "postman/gUnk_0810A8DB.bin"
gUnk_0810A8E0:: @ 0810A8E0
.incbin "postman/gUnk_0810A8E0.bin"
gUnk_0810A8E9:: @ 0810A8E9
.incbin "postman/gUnk_0810A8E9.bin"
gUnk_0810A8F2:: @ 0810A8F2
.incbin "postman/gUnk_0810A8F2.bin"
gUnk_0810A8F9:: @ 0810A8F9
.incbin "postman/gUnk_0810A8F9.bin"
gUnk_0810A900:: @ 0810A900
.incbin "postman/gUnk_0810A900.bin"
gUnk_0810A905:: @ 0810A905
.incbin "postman/gUnk_0810A905.bin"
gUnk_0810A90B:: @ 0810A90B
.incbin "postman/gUnk_0810A90B.bin"
gUnk_0810A911:: @ 0810A911
.incbin "postman/gUnk_0810A911.bin"
gUnk_0810A918:: @ 0810A918
.4byte gUnk_0810A768
.4byte gUnk_0810A768
.4byte gUnk_0810A76D
.4byte gUnk_0810A772
.4byte gUnk_0810A777
.4byte gUnk_0810A77D
.4byte gUnk_0810A783
.4byte gUnk_0810A789
.4byte gUnk_0810A78E
.4byte gUnk_0810A794
.4byte gUnk_0810A79A
.4byte gUnk_0810A7A0
.4byte gUnk_0810A7A6
.4byte gUnk_0810A7AC
.4byte gUnk_0810A7B3
.4byte gUnk_0810A7B9
.4byte gUnk_0810A7BF
.4byte gUnk_0810A7C5
.4byte gUnk_0810A7CA
.4byte gUnk_0810A7D0
.4byte gUnk_0810A7D6
.4byte gUnk_0810A7DB
.4byte gUnk_0810A7E0
.4byte gUnk_0810A7E5
.4byte gUnk_0810A7F5
.4byte gUnk_0810A805
.4byte gUnk_0810A80D
.4byte gUnk_0810A815
.4byte gUnk_0810A81A
.4byte gUnk_0810A81F
.4byte gUnk_0810A825
.4byte gUnk_0810A82A
.4byte gUnk_0810A82F
.4byte gUnk_0810A835
.4byte gUnk_0810A83B
.4byte gUnk_0810A841
.4byte gUnk_0810A848
.4byte gUnk_0810A84F
.4byte gUnk_0810A85E
.4byte gUnk_0810A86D
.4byte gUnk_0810A872
.4byte gUnk_0810A877
.4byte gUnk_0810A87C
.4byte gUnk_0810A881
.4byte gUnk_0810A886
.4byte gUnk_0810A88B
.4byte gUnk_0810A891
.4byte gUnk_0810A897
.4byte gUnk_0810A89C
.4byte gUnk_0810A8A2
.4byte gUnk_0810A8A7
.4byte gUnk_0810A8AC
.4byte gUnk_0810A8B1
.4byte gUnk_0810A8B6
.4byte gUnk_0810A8BB
.4byte gUnk_0810A8C0
.4byte gUnk_0810A8CB
.4byte gUnk_0810A8D6
.4byte gUnk_0810A8DB
.4byte gUnk_0810A8E0
.4byte gUnk_0810A8E9
.4byte gUnk_0810A8F2
.4byte gUnk_0810A8F9
.4byte gUnk_0810A900
.4byte gUnk_0810A905
.4byte gUnk_0810A90B
.4byte gUnk_0810A911
gUnk_0810AA24:: @ 0810AA24
.4byte sub_08060428
.4byte sub_0806045C
.4byte sub_080604C8
gUnk_0810AA30:: @ 0810AA30
.incbin "postman/gUnk_0810AA30.bin"
gUnk_0810AA70:: @ 0810AA70
.incbin "postman/gUnk_0810AA70.bin"
data/const/npc/sittingPerson.s
-60
View File
@@ -1,60 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0810CB78:: @ 0810CB78
.incbin "sittingPerson/gUnk_0810CB78.bin"
gUnk_0810CBC0:: @ 0810CBC0
.incbin "sittingPerson/gUnk_0810CBC0.bin"
SittingPersion_Actions:: @ 0810CBD8
.4byte SittingPersion_Init
.4byte sub_080637B8
.4byte sub_08063830
gUnk_0810CBE4:: @ 0810CBE4
.incbin "sittingPerson/gUnk_0810CBE4.bin"
gUnk_0810CC04:: @ 0810CC04
.incbin "sittingPerson/gUnk_0810CC04.bin"
gUnk_0810CC08:: @ 0810CC08
.incbin "sittingPerson/gUnk_0810CC08.bin"
.4byte sub_0806387C
.incbin "sittingPerson/gUnk_0810CC08_1.bin"
.4byte sub_0806387C
.incbin "sittingPerson/gUnk_0810CC08_2.bin"
.4byte sub_0806387C
.incbin "sittingPerson/gUnk_0810CC08_3.bin"
.4byte sub_0806387C
.incbin "sittingPerson/gUnk_0810CC08_4.bin"
.4byte sub_0806387C
.incbin "sittingPerson/gUnk_0810CC08_5.bin"
.4byte sub_0806387C
.incbin "sittingPerson/gUnk_0810CC08_6.bin"
.4byte sub_0806387C
.incbin "sittingPerson/gUnk_0810CC08_7.bin"
.4byte sub_0806387C
.incbin "sittingPerson/gUnk_0810CC08_8.bin"
.4byte sub_0806390C
.incbin "sittingPerson/gUnk_0810CC08_9.bin"
.4byte sub_0806390C
.incbin "sittingPerson/gUnk_0810CC08_10.bin"
.4byte sub_0806390C
.incbin "sittingPerson/gUnk_0810CC08_11.bin"
.4byte sub_0806390C
.incbin "sittingPerson/gUnk_0810CC08_12.bin"
.4byte sub_0806390C
.incbin "sittingPerson/gUnk_0810CC08_13.bin"
.4byte sub_0806390C
.incbin "sittingPerson/gUnk_0810CC08_14.bin"
.4byte sub_0806390C
.incbin "sittingPerson/gUnk_0810CC08_15.bin"
.4byte sub_0806390C
.incbin "sittingPerson/gUnk_0810CC08_16.bin"
gUnk_0810CD88:: @ 0810CD88
.incbin "sittingPerson/gUnk_0810CD88.bin"
data/const/npc/sturgeon.s
+7 -19
View File
@@ -4,29 +4,17 @@
.section .rodata
.align 2
gUnk_0810FA38:: @ 0810FA38
.incbin "sturgeon/gUnk_0810FA38.bin"
@ gUnk_0810FA38:: @ 0810FA38
@ .incbin "sturgeon/gUnk_0810FA38.bin"
gUnk_0810FA44:: @ 0810FA44
.4byte sub_08064B44
.4byte sub_08064B88
.4byte sub_08064C2C
.4byte sub_08064C50
@ gUnk_0810FA44:: @ 0810FA44
@ .4byte sub_08064B44
@ .4byte sub_08064B88
@ .4byte sub_08064C2C
@ .4byte sub_08064C50
gUnk_0810FA54:: @ 0810FA54
.incbin "sturgeon/gUnk_0810FA54.bin"
gUnk_0810FA5A:: @ 0810FA5A
.incbin "sturgeon/gUnk_0810FA5A.bin"
gSpriteAnimations_Sturgeon_4:: @ 0810FB24
.include "animations/gSpriteAnimations_Sturgeon_4.s"
gSpriteAnimations_Sturgeon_5:: @ 0810FB39
.include "animations/gSpriteAnimations_Sturgeon_5.s"
gSpriteAnimations_Sturgeon_6:: @ 0810FB4E
.include "animations/gSpriteAnimations_Sturgeon_6.s"
gSpriteAnimations_Sturgeon_7:: @ 0810FB63
.include "animations/gSpriteAnimations_Sturgeon_7.s"
data/const/npcUtils.s
-14
View File
@@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ script.c, librarians.c, cutsceneMiscObject.c
gUnk_08114F30:: @ 08114F30
.incbin "data_081146D0/gUnk_08114F30.bin"
@ script.c, cutsceneMiscObject.c
gUnk_08114F34:: @ 08114F34
.incbin "data_081146D0/gUnk_08114F34.bin"
data/const/playerItem/playerItemBow.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ Probably belongs to collision.c, but needs to be placed at the end of playerItemBow.c or start of playerItemSwordBeam.c
gUnk_080B3E80:: @ 080B3E80
.incbin "data_080B3E70/gUnk_080B3E80.bin"
data/const/playerItem/playerItemCellOverwriteSet.s
+1 -1
View File
@@ -2,7 +2,7 @@
.include "constants/constants.inc"
.section .rodata
.align 2
@.align 2
@ before: playerItemBottle
@ after: playerItemCellOverwriteSet
data/const/playerItem/playerItemShield.s
-34
View File
@@ -1,34 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081271D4:: @ 081271D4
.4byte sub_080A2D98
.4byte sub_080A2E00
gUnk_081271DC:: @ 081271DC
.incbin "playerItemShield/gUnk_081271DC.bin"
gUnk_08127220:: @ 08127220
.incbin "playerItemShield/gUnk_08127220.bin"
gUnk_08127240:: @ 08127240
.4byte gUnk_08127250
.4byte gUnk_08127258
.4byte gUnk_08127260
.4byte gUnk_08127268
gUnk_08127250:: @ 08127250
.incbin "playerItemShield/gUnk_08127250.bin"
gUnk_08127258:: @ 08127258
.incbin "playerItemShield/gUnk_08127258.bin"
gUnk_08127260:: @ 08127260
.incbin "playerItemShield/gUnk_08127260.bin"
gUnk_08127268:: @ 08127268
.incbin "playerItemShield/gUnk_08127268.bin"
data/const/playerUtils.s
-198
View File
@@ -1,198 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ playerUtils.c
gCreateItemsFuncs:: @ 0811BFC8
.4byte CreateItemNone
.4byte CreateItem1
.4byte CreateItem2
.4byte CreateItem3
.4byte CreateItem4
.4byte CreateItem5
gUnk_0811BFE0:: @ 0811BFE0
.incbin "data_0811BE38/gUnk_0811BFE0.bin"
gPlayerChargeActions:: @ 0811BFE8
.4byte sub_08078008
.4byte sub_08078124
.4byte sub_08078140
.4byte sub_08078070
.4byte sub_080780E0
.4byte sub_08078108
gUnk_0811C000:: @ 0811C000
.incbin "data_0811BE38/gUnk_0811C000.bin"
gUnk_0811C00C:: @ 0811C00C
.incbin "data_0811BE38/gUnk_0811C00C.bin"
gUnk_0811C014:: @ 0811C014
.incbin "data_0811BE38/gUnk_0811C014.bin"
gUnk_0811C01C:: @ 0811C01C
.incbin "data_0811BE38/gUnk_0811C01C.bin"
gUnk_0811C070:: @ 0811C070
.incbin "data_0811BE38/gUnk_0811C070.bin"
gUnk_0811C090:: @ 0811C090
.incbin "data_0811BE38/gUnk_0811C090.bin"
gUnk_0811C0B0:: @ 0811C0B0
.4byte gUnk_0811C070
.4byte gUnk_0811C090
gUnk_0811C0B8:: @ 0811C0B8
.incbin "data_0811BE38/gUnk_0811C0B8.bin"
gUnk_0811C0C8:: @ 0811C0C8
.incbin "data_0811BE38/gUnk_0811C0C8.bin"
gUnk_0811C0D8:: @ 0811C0D8
.incbin "data_0811BE38/gUnk_0811C0D8.bin"
gUnk_0811C0E8:: @ 0811C0E8
.4byte gUnk_0811C0B8
.4byte gUnk_0811C0D8
.4byte gUnk_0811C0B8
.4byte gUnk_0811C0C8
gUnk_0811C0F8:: @ 0811C0F8
.incbin "data_0811BE38/gUnk_0811C0F8.bin"
gUnk_0811C100:: @ 0811C100
.incbin "data_0811BE38/gUnk_0811C100.bin"
gUnk_0811C108:: @ 0811C108
.incbin "data_0811BE38/gUnk_0811C108.bin"
gUnk_0811C110:: @ 0811C110
.incbin "data_0811BE38/gUnk_0811C110.bin"
gUnk_0811C118:: @ 0811C118
.incbin "data_0811BE38/gUnk_0811C118.bin"
gUnk_0811C120:: @ 0811C120
.4byte SurfaceAction_DoNothing
.4byte SurfaceAction_Pit
.4byte 00000000
.4byte 00000000
.4byte SurfaceAction_SlopeGndGndVertical
.4byte SurfaceAction_SlopeGndGndHorizontal
.4byte SurfaceAction_6
.4byte SurfaceAction_7
.4byte SurfaceAction_MinishDoorFront
.4byte SurfaceAction_MinishDoorBack
.4byte SurfaceAction_A
.4byte SurfaceAction_B
.4byte SurfaceAction_SlopeGndWater
.4byte SurfaceAction_ConveyerNorth
.4byte SurfaceAction_ConveyerSouth
.4byte SurfaceAction_ConveyerWest
.4byte SurfaceAction_ConveyerEast
.4byte SurfaceAction_Swamp
.4byte SurfaceAction_DoNothing
.4byte SurfaceAction_DoNothing
.4byte SurfaceAction_14
.4byte SurfaceAction_CloneTile
.4byte SurfaceAction_16
.4byte SurfaceAction_Ice
.4byte SurfaceAction_ShallowWater
.4byte SurfaceAction_Water
.4byte SurfaceAction_Button
.4byte SurfaceAction_1B
.4byte SurfaceAction_1C
.4byte 00000000
.4byte SurfaceAction_Ladder
.4byte 00000000
.4byte SurfaceAction_20
.4byte SurfaceAction_16
.4byte SurfaceAction_22
.4byte SurfaceAction_6
.4byte SurfaceAction_6
.4byte SurfaceAction_Dust
.4byte SurfaceAction_26
.4byte SurfaceAction_Hole
.4byte SurfaceAction_SlopeGndGndVertical
.4byte SurfaceAction_SlopeGndGndHorizontal
.4byte SurfaceAction_AutoLadder
.4byte SurfaceAction_ClimbWall
.4byte SurfaceAction_2C
.4byte SurfaceAction_Dust
gUnk_0811C1D8:: @ 0811C1D8
.4byte gUnk_0811C240
.4byte gUnk_0811C24A
.4byte gUnk_0811C254
.4byte gUnk_0811C25E
gUnk_0811C1E8:: @ 0811C1E8
.4byte gUnk_0811C1F8
.4byte gUnk_0811C20A
.4byte gUnk_0811C21C
.4byte gUnk_0811C22E
gUnk_0811C1F8:: @ 0811C1F8
.incbin "data_0811BE38/gUnk_0811C1F8.bin"
gUnk_0811C20A:: @ 0811C20A
.incbin "data_0811BE38/gUnk_0811C20A.bin"
gUnk_0811C21C:: @ 0811C21C
.incbin "data_0811BE38/gUnk_0811C21C.bin"
gUnk_0811C22E:: @ 0811C22E
.incbin "data_0811BE38/gUnk_0811C22E.bin"
gUnk_0811C240:: @ 0811C240
.incbin "data_0811BE38/gUnk_0811C240.bin"
gUnk_0811C24A:: @ 0811C24A
.incbin "data_0811BE38/gUnk_0811C24A.bin"
gUnk_0811C254:: @ 0811C254
.incbin "data_0811BE38/gUnk_0811C254.bin"
gUnk_0811C25E:: @ 0811C25E
.incbin "data_0811BE38/gUnk_0811C25E.bin"
gUnk_0811C268:: @ 0811C268
.incbin "data_0811BE38/gUnk_0811C268.bin"
gUnk_0811C27C:: @ 0811C27C
.4byte sub_0807B114
.4byte sub_0807B128
gUnk_0811C284:: @ 0811C284
.4byte sub_0807B1A8
.4byte sub_0807B144
.4byte nullsub_506
.4byte sub_0807B178
.4byte sub_0807B2F8
gUnk_0811C298:: @ 0811C298
.4byte sub_0807B1DC
.4byte sub_0807B1EC
.4byte sub_0807B21C
.4byte sub_0807B264
.4byte sub_0807B2B8
gUnk_0811C2AC:: @ 0811C2AC
.incbin "data_0811BE38/gUnk_0811C2AC.bin"
gUnk_0811C2CC:: @ 0811C2CC
.incbin "data_0811BE38/gUnk_0811C2CC.bin"
gUnk_0811C2EC:: @ 0811C2EC
.incbin "data_0811BE38/gUnk_0811C2EC.bin"
gUnk_0811C456:: @ 0811C456
.incbin "data_0811BE38/gUnk_0811C456.bin"
@ playerUtils.c
gUnk_0811C466:: @ 0811C466
.incbin "data_0811BE38/gUnk_0811C466.bin"
data/const/sub_08055E08.s
-16
View File
@@ -1,16 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ sub_08055E08.c
gUnk_080FF400:: @ 080FF400
.incbin "data_080FEEB8/gUnk_080FF400.bin"
.4byte script_StampKinstone
.incbin "data_080FEEB8/gUnk_080FF400_1.bin"
@ sub_08055E08.c
gUnk_080FF420:: @ 080FF420
.4byte sub_08055E24
.4byte nullsub_493
data/const/subtask.s
+108 -230
View File
@@ -4,270 +4,148 @@
.section .rodata
.align 2
@ subtask.c
gUnk_080FEEB8:: @ 080FEEB8
.4byte sub_08054C20
.4byte sub_08054C58
.4byte sub_08054C88
.4byte sub_08054CC0
@ subtask2.c
gUnk_08128C00:: @ 08128C00
.incbin "data_08127280/gUnk_08128C00.bin"
gUnk_080FEEC8:: @ 080FEEC8
.4byte sub_08054D04
.4byte sub_08054D3C
.4byte sub_08054D74
gUnk_08128C04:: @ 08128C04
.incbin "data_08127280/gUnk_08128C04.bin"
gUnk_080FEED4:: @ 080FEED4
.incbin "data_080FEEB8/gUnk_080FEED4.bin"
.4byte script_BigGoronKinstone1
.incbin "data_080FEEB8/gUnk_080FEED4_1.bin"
.4byte script_BigGoronKinstone2
.incbin "data_080FEEB8/gUnk_080FEED4_2.bin"
.4byte script_BigGoronKinstone3
.incbin "data_080FEEB8/gUnk_080FEED4_3.bin"
gUnk_08128C14:: @ 08128C14
.incbin "data_08127280/gUnk_08128C14.bin"
gUnk_080FEF34:: @ 080FEF34
.4byte sub_08054DAC
.4byte nullsub_484
gUnk_08128C94:: @ 08128C94
.incbin "data_08127280/gUnk_08128C94.bin"
gUnk_080FEF3C:: @ 080FEF3C
.4byte sub_08054E1C
.4byte sub_08054E5C
.4byte sub_08054E9C
gUnk_08128D14:: @ 08128D14
.4byte sub_080A59AC
.4byte sub_080A59C8
.4byte sub_080A5A54
.4byte sub_080A5A90
gUnk_080FEF48:: @ 080FEF48
.incbin "data_080FEEB8/gUnk_080FEF48.bin"
.4byte script_GoronKinstone
.ifdef JP
.incbin "data_080FEEB8/gUnk_080FEF48_1_JP.bin"
.else
.ifdef DEMO_JP
.incbin "data_080FEEB8/gUnk_080FEF48_2_DEMO_JP.bin"
.else
.ifdef EU
.incbin "data_080FEEB8/gUnk_080FEF48_3_EU.bin"
.else
.incbin "data_080FEEB8/gUnk_080FEF48_4_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_08128D24:: @ 08128D24
.4byte sub_080A5AF4
.4byte sub_080A5B34
.4byte sub_080A5BB8
gUnk_080FEF78:: @ 080FEF78
.incbin "data_080FEEB8/gUnk_080FEF78.bin"
.4byte script_Goron1Kinstone2
.incbin "data_080FEEB8/gUnk_080FEF78_1.bin"
.4byte script_Goron2Kinstone2
.incbin "data_080FEEB8/gUnk_080FEF78_2.bin"
gUnk_08128D30:: @ 08128D30
.4byte sub_080A5C44
.4byte sub_080A5C9C
gUnk_080FEFA8:: @ 080FEFA8
.incbin "data_080FEEB8/gUnk_080FEFA8.bin"
.4byte script_Goron1Kinstone3
.incbin "data_080FEEB8/gUnk_080FEFA8_1.bin"
.4byte script_Goron2Kinstone3
.incbin "data_080FEEB8/gUnk_080FEFA8_2.bin"
.4byte script_Goron3Kinstone3
.incbin "data_080FEEB8/gUnk_080FEFA8_3.bin"
gUnk_08128D38:: @ 08128D38
.incbin "data_08127280/gUnk_08128D38.bin"
gUnk_080FEFE8:: @ 080FEFE8
.incbin "data_080FEEB8/gUnk_080FEFE8.bin"
.4byte script_Goron1Kinstone4
.incbin "data_080FEEB8/gUnk_080FEFE8_1.bin"
.4byte script_Goron2Kinstone4
.incbin "data_080FEEB8/gUnk_080FEFE8_2.bin"
.4byte script_Goron2Kinstone4
.incbin "data_080FEEB8/gUnk_080FEFE8_3.bin"
.4byte script_Goron4Kinstone4
.incbin "data_080FEEB8/gUnk_080FEFE8_4.bin"
gUnk_08128D3C:: @ 08128D3C
.incbin "data_08127280/gUnk_08128D3C.bin"
gUnk_080FF038:: @ 080FF038
.incbin "data_080FEEB8/gUnk_080FF038.bin"
.4byte script_Goron1Kinstone5
.incbin "data_080FEEB8/gUnk_080FF038_1.bin"
.4byte script_Goron2Kinstone5
.incbin "data_080FEEB8/gUnk_080FF038_2.bin"
.4byte script_Goron2Kinstone5
.incbin "data_080FEEB8/gUnk_080FF038_3.bin"
.4byte script_Goron2Kinstone5
.incbin "data_080FEEB8/gUnk_080FF038_4.bin"
.4byte script_Goron5Kinstone5
.incbin "data_080FEEB8/gUnk_080FF038_5.bin"
gUnk_08128D43:: @ 08128D43
.incbin "data_08127280/gUnk_08128D43.bin"
gUnk_080FF098:: @ 080FF098
.incbin "data_080FEEB8/gUnk_080FF098.bin"
.4byte script_Goron1Kinstone6
.incbin "data_080FEEB8/gUnk_080FF098_1.bin"
.4byte script_Goron2Kinstone6
.incbin "data_080FEEB8/gUnk_080FF098_2.bin"
.4byte script_Goron2Kinstone6
.incbin "data_080FEEB8/gUnk_080FF098_3.bin"
.4byte script_Goron2Kinstone6
.incbin "data_080FEEB8/gUnk_080FF098_4.bin"
.4byte script_Goron2Kinstone6
.incbin "data_080FEEB8/gUnk_080FF098_5.bin"
.4byte script_Goron6Kindstone6
.incbin "data_080FEEB8/gUnk_080FF098_6.bin"
gUnk_08128D51:: @ 08128D51
.incbin "data_08127280/gUnk_08128D51.bin"
gUnk_080FF108:: @ 080FF108
.4byte gUnk_080FEF48
.4byte gUnk_080FEF78
.4byte gUnk_080FEFA8
.4byte gUnk_080FEFE8
.4byte gUnk_080FF038
.4byte gUnk_080FF098
gUnk_08128D58:: @ 08128D58
.4byte sub_080A6024
.4byte sub_080A6044
gUnk_080FF120:: @ 080FF120
.4byte sub_08054FAC
.4byte sub_08055014
gUnk_08128D60:: @ 08128D60
.incbin "data_08127280/gUnk_08128D60.bin"
gUnk_080FF128:: @ 080FF128
.incbin "data_080FEEB8/gUnk_080FF128.bin"
.4byte script_GoronMerchantArriving
.incbin "data_080FEEB8/gUnk_080FF128_1.bin"
gUnk_08128D70:: @ 08128D70
.incbin "data_08127280/gUnk_08128D70.bin"
gUnk_080FF148:: @ 080FF148
.4byte sub_08055054
.4byte sub_0805508C
.4byte sub_08055090
gUnk_08128DB0:: @ 08128DB0
.4byte sub_080A6108
.4byte sub_080A612C
gUnk_080FF154:: @ 080FF154
.incbin "data_080FEEB8/gUnk_080FF154.bin"
.4byte script_MutohKinstone
.incbin "data_080FEEB8/gUnk_080FF154_1.bin"
gUnk_08128DB8:: @ 08128DB8
.incbin "data_08127280/gUnk_08128DB8.bin"
gUnk_080FF174:: @ 080FF174
.4byte sub_080550B0
.4byte nullsub_487
gUnk_08128DBC:: @ 08128DBC
.incbin "data_08127280/gUnk_08128DBC.bin"
gUnk_080FF17C:: @ 080FF17C
.incbin "data_080FEEB8/gUnk_080FF17C.bin"
.4byte script_GhostBrotherKinstone
.incbin "data_080FEEB8/gUnk_080FF17C_1.bin"
gUnk_08128DCC:: @ 08128DCC
.4byte sub_080A6290
.4byte sub_080A62E0
gUnk_080FF1CC:: @ 080FF1CC
.4byte sub_08055114
.4byte nullsub_488
gUnk_08128DD4:: @ 08128DD4
.incbin "data_08127280/gUnk_08128DD4.bin"
gUnk_080FF1D4:: @ 080FF1D4
.incbin "data_080FEEB8/gUnk_080FF1D4.bin"
gUnk_08128DD8:: @ 08128DD8
.incbin "data_08127280/gUnk_08128DD8.bin"
gUnk_080FF1F4:: @ 080FF1F4
.4byte sub_08055184
.4byte sub_08055224
.4byte sub_0805524C
.4byte sub_080552E0
gUnk_08128DE8:: @ 08128DE8
.incbin "data_08127280/gUnk_08128DE8.bin"
gUnk_080FF204:: @ 080FF204
.incbin "data_080FEEB8/gUnk_080FF204.bin"
Subtask_MapHint_Functions:: @ 08128E70
.4byte Subtask_MapHint_0
.4byte Subtask_MapHint_1
gUnk_080FF228:: @ 080FF228
.4byte sub_08055318
.4byte sub_08055350
.4byte sub_08055380
.4byte sub_080553B8
gUnk_08128E78:: @ 08128E78
.4byte sub_080A6650
.4byte sub_080A667C
gUnk_080FF238:: @ 080FF238
.4byte sub_08055430
.4byte sub_08055468
.4byte sub_08055498
.4byte sub_080554D4
gUnk_08128E80:: @ 08128E80
.incbin "data_08127280/gUnk_08128E80.bin"
gUnk_080FF248:: @ 080FF248
.4byte sub_08055518
.4byte sub_08055548
.4byte sub_08055580
gUnk_08128E84:: @ 08128E84
.incbin "data_08127280/gUnk_08128E84.bin"
gUnk_080FF254:: @ 080FF254
.4byte sub_080555B8
.4byte sub_0805560C
.4byte sub_08055634
.4byte sub_08055674
gUnk_08128E94:: @ 08128E94
.incbin "data_08127280/gUnk_08128E94.bin"
gUnk_080FF264:: @ 080FF264
.incbin "data_080FEEB8/gUnk_080FF264.bin"
.4byte script_CarlovKinstone
.incbin "data_080FEEB8/gUnk_080FF264_1.bin"
gUnk_08128F1C:: @ 08128F1C
.4byte sub_080A6B04
.4byte sub_080A6C1C
gUnk_080FF284:: @ 080FF284
.4byte sub_080556AC
.4byte nullsub_489
Subtask_FastTravel_Functions:: @ 08128F24
.4byte Subtask_FastTravel_0
.4byte Subtask_FastTravel_1
.4byte Subtask_FastTravel_2
.4byte Subtask_FastTravel_3
.4byte Subtask_FastTravel_4
gUnk_080FF28C:: @ 080FF28C
.4byte sub_08055710
.4byte sub_0805576C
.4byte sub_08055798
gUnk_08128F38:: @ 08128F38
.incbin "data_08127280/gUnk_08128F38.bin"
gUnk_080FF298:: @ 080FF298
.incbin "data_080FEEB8/gUnk_080FF298.bin"
gUnk_08128F4C:: @ 08128F4C
.incbin "data_08127280/gUnk_08128F4C.bin"
gUnk_080FF2B8:: @ 080FF2B8
.4byte sub_080557D0
.4byte nullsub_490
gUnk_08128F58:: @ 08128F58
.incbin "data_08127280/gUnk_08128F58.bin"
gUnk_080FF2C0:: @ 080FF2C0
.incbin "data_080FEEB8/gUnk_080FF2C0.bin"
.4byte script_GormanFirstAppearance
.incbin "data_080FEEB8/gUnk_080FF2C0_1.bin"
gUnk_08128FA8:: @ 08128FA8
.incbin "data_08127280/gUnk_08128FA8.bin"
gUnk_080FF300:: @ 080FF300
.4byte sub_08055834
.4byte nullsub_491
gUnk_08128FC0:: @ 08128FC0
.incbin "data_08127280/gUnk_08128FC0.bin"
gUnk_080FF308:: @ 080FF308
.incbin "data_080FEEB8/gUnk_080FF308.bin"
.4byte script_SyrupKinstone
.incbin "data_080FEEB8/gUnk_080FF308_1.bin"
gUnk_08128FD8:: @ 08128FD8
.incbin "data_08127280/gUnk_08128FD8.bin"
gUnk_080FF328:: @ 080FF328
.4byte sub_080558A4
.4byte nullsub_492
gUnk_08128FF0:: @ 08128FF0
.incbin "data_08127280/gUnk_08128FF0.bin"
gUnk_080FF330:: @ 080FF330
.4byte sub_08055908
.4byte sub_08055948
.4byte sub_08055978
gUnk_08129004:: @ 08129004
.incbin "data_08127280/gUnk_08129004.bin"
gUnk_080FF33C:: @ 080FF33C
.incbin "data_080FEEB8/gUnk_080FF33C.bin"
gUnk_0812901C:: @ 0812901C
.4byte Subtask_FadeIn
.4byte Subtask_Init
.4byte Subtask_Update
.4byte Subtask_FadeOut
.4byte Subtask_Die
gUnk_080FF35C:: @ 080FF35C
.4byte sub_080559FC
.4byte sub_08055A3C
.4byte sub_08055A6C
.4byte sub_08055AA8
gUnk_080FF36C:: @ 080FF36C
.4byte sub_08055AEC
.4byte sub_08055B38
.4byte sub_08055B54
gUnk_080FF378:: @ 080FF378
.incbin "data_080FEEB8/gUnk_080FF378.bin"
.4byte script_KinstoneSparkKinstoneSpark
.incbin "data_080FEEB8/gUnk_080FF378_1.bin"
.4byte script_KinstoneSparkKinstoneSparkFromBottom
.incbin "data_080FEEB8/gUnk_080FF378_2.bin"
.4byte script_KinstoneSparkKinstoneSparkGoronMerchang
.incbin "data_080FEEB8/gUnk_080FF378_3.bin"
.4byte script_KinstoneSparkKinstoneSparkGoron
.incbin "data_080FEEB8/gUnk_080FF378_4.bin"
gUnk_080FF3C8:: @ 080FF3C8
.4byte sub_08055BCC
.4byte sub_08055C04
.4byte sub_08055C34
.4byte sub_08055CB0
.4byte 0x000000ff
.4byte 00000000
.4byte 00000000
.4byte 00000000
@ subtask.c
gUnk_080FF3E8:: @ 080FF3E8
.4byte sub_08055CF4
.4byte sub_08055D2C
.4byte sub_08055D64
@ subtask.c
gUnk_080FF3F4:: @ 080FF3F4
.4byte sub_08055D9C
.4byte sub_08055DC0
.4byte sub_08055DEC
@ subtask2.c
gSubtasks:: @ 08129030
.4byte Subtask_Exit
.4byte Subtask_PauseMenu
.4byte Subtask_Exit
.4byte Subtask_MapHint
.4byte Subtask_KinstoneMenu
.4byte Subtask_AuxCutscene
.4byte Subtask_PortalCutscene
.4byte Subtask_FigurineMenu
.4byte Subtask_WorldEvent
.4byte Subtask_FastTravel
.4byte Subtask_LocalMapHint
data/const/subtask2.s
-151
View File
@@ -1,151 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ subtask2.c
gUnk_08128C00:: @ 08128C00
.incbin "data_08127280/gUnk_08128C00.bin"
gUnk_08128C04:: @ 08128C04
.incbin "data_08127280/gUnk_08128C04.bin"
gUnk_08128C14:: @ 08128C14
.incbin "data_08127280/gUnk_08128C14.bin"
gUnk_08128C94:: @ 08128C94
.incbin "data_08127280/gUnk_08128C94.bin"
gUnk_08128D14:: @ 08128D14
.4byte sub_080A59AC
.4byte sub_080A59C8
.4byte sub_080A5A54
.4byte sub_080A5A90
gUnk_08128D24:: @ 08128D24
.4byte sub_080A5AF4
.4byte sub_080A5B34
.4byte sub_080A5BB8
gUnk_08128D30:: @ 08128D30
.4byte sub_080A5C44
.4byte sub_080A5C9C
gUnk_08128D38:: @ 08128D38
.incbin "data_08127280/gUnk_08128D38.bin"
gUnk_08128D3C:: @ 08128D3C
.incbin "data_08127280/gUnk_08128D3C.bin"
gUnk_08128D43:: @ 08128D43
.incbin "data_08127280/gUnk_08128D43.bin"
gUnk_08128D51:: @ 08128D51
.incbin "data_08127280/gUnk_08128D51.bin"
gUnk_08128D58:: @ 08128D58
.4byte sub_080A6024
.4byte sub_080A6044
gUnk_08128D60:: @ 08128D60
.incbin "data_08127280/gUnk_08128D60.bin"
gUnk_08128D70:: @ 08128D70
.incbin "data_08127280/gUnk_08128D70.bin"
gUnk_08128DB0:: @ 08128DB0
.4byte sub_080A6108
.4byte sub_080A612C
gUnk_08128DB8:: @ 08128DB8
.incbin "data_08127280/gUnk_08128DB8.bin"
gUnk_08128DBC:: @ 08128DBC
.incbin "data_08127280/gUnk_08128DBC.bin"
gUnk_08128DCC:: @ 08128DCC
.4byte sub_080A6290
.4byte sub_080A62E0
gUnk_08128DD4:: @ 08128DD4
.incbin "data_08127280/gUnk_08128DD4.bin"
gUnk_08128DD8:: @ 08128DD8
.incbin "data_08127280/gUnk_08128DD8.bin"
gUnk_08128DE8:: @ 08128DE8
.incbin "data_08127280/gUnk_08128DE8.bin"
gUnk_08128E70:: @ 08128E70
.4byte sub_080A6534
.4byte sub_080A65AC
gUnk_08128E78:: @ 08128E78
.4byte sub_080A6650
.4byte sub_080A667C
gUnk_08128E80:: @ 08128E80
.incbin "data_08127280/gUnk_08128E80.bin"
gUnk_08128E84:: @ 08128E84
.incbin "data_08127280/gUnk_08128E84.bin"
gUnk_08128E94:: @ 08128E94
.incbin "data_08127280/gUnk_08128E94.bin"
gUnk_08128F1C:: @ 08128F1C
.4byte sub_080A6B04
.4byte sub_080A6C1C
gUnk_08128F24:: @ 08128F24
.4byte sub_080A6CA8
.4byte sub_080A6CD8
.4byte sub_080A6DD0
.4byte sub_080A6DF8
.4byte sub_080A6E44
gUnk_08128F38:: @ 08128F38
.incbin "data_08127280/gUnk_08128F38.bin"
gUnk_08128F4C:: @ 08128F4C
.incbin "data_08127280/gUnk_08128F4C.bin"
gUnk_08128F58:: @ 08128F58
.incbin "data_08127280/gUnk_08128F58.bin"
gUnk_08128FA8:: @ 08128FA8
.incbin "data_08127280/gUnk_08128FA8.bin"
gUnk_08128FC0:: @ 08128FC0
.incbin "data_08127280/gUnk_08128FC0.bin"
gUnk_08128FD8:: @ 08128FD8
.incbin "data_08127280/gUnk_08128FD8.bin"
gUnk_08128FF0:: @ 08128FF0
.incbin "data_08127280/gUnk_08128FF0.bin"
gUnk_08129004:: @ 08129004
.incbin "data_08127280/gUnk_08129004.bin"
gUnk_0812901C:: @ 0812901C
.4byte Subtask_FadeIn
.4byte Subtask_Init
.4byte Subtask_Update
.4byte Subtask_FadeOut
.4byte Subtask_Die
@ subtask2.c
gSubtasks:: @ 08129030
.4byte Subtask_Exit
.4byte Subtask_PauseMenu
.4byte Subtask_Exit
.4byte Subtask_MapHint
.4byte Subtask_KinstoneMenu
.4byte Subtask_AuxCutscene
.4byte Subtask_PortalCutscene
.4byte Subtask_FigurineMenu
.4byte Subtask_WorldEvent
.4byte Subtask_FastTravel
.4byte Subtask_LocalMapHint
data/const/ui.s
-29
View File
@@ -8,35 +8,6 @@
@ afterwards on data side: sineTable.c
@ after: octorok.c
@ collision.c
gCollisionMtx:: @ 080B7B74
.incbin "data_080B7B74/gCollisionMtx.bin"
.incbin "data_080B7B74/gUnk_080B802E.bin"
.incbin "data_080B7B74/gUnk_080BA2C0.bin"
.ifdef EU
.incbin "data_080B7B74/gUnk_080B7B74_1_EU.bin"
.else
.incbin "data_080B7B74/gUnk_080B7B74_2_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
.incbin "data_080B7B74/gUnk_080B7B74_3.bin"
.ifdef JP
@ TODO only small differences
.incbin "data_080B7B74/gUnk_080B7B74_4_JP.bin"
.else
.ifdef EU
@ TODO only small differences
.incbin "data_080B7B74/gUnk_080B7B74_5_EU.bin"
.else
.incbin "data_080B7B74/gUnk_080B7B74_6_USA-DEMO_USA-DEMO_JP.bin"
.endif
.endif
.ifdef EU
@ TODO only small differences
.incbin "data_080B7B74/gUnk_080B7B74_7_EU.bin"
.else
.incbin "data_080B7B74/gUnk_080B7B74_8_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
.incbin "data_080B7B74/gUnk_080B7B74_9.bin"
@ ui.c const
data/gfx/gfx_and_palettes.s
+744 -50
View File
@@ -23,8 +23,10 @@ gPalette_7::
.incbin "palettes/gPalette_7.gbapal"
gPalette_8::
.incbin "palettes/gPalette_8.gbapal"
gfx_unknown_0::
.incbin "assets/gfx_unknown_0.bin"
gPalette_9::
.incbin "palettes/gPalette_9.gbapal"
gPalette_10::
.incbin "palettes/gPalette_10.gbapal"
gPalette_11::
.incbin "palettes/gPalette_11.gbapal"
gPalette_12::
@@ -33,8 +35,290 @@ gPalette_13::
.incbin "palettes/gPalette_13.gbapal"
gPalette_14::
.incbin "palettes/gPalette_14.gbapal"
gfx_unknown_1::
.incbin "assets/gfx_unknown_1.bin"
gPalette_15::
.incbin "palettes/gPalette_15.gbapal"
gPalette_16::
.incbin "palettes/gPalette_16.gbapal"
gPalette_17::
.incbin "palettes/gPalette_17.gbapal"
gPalette_18::
.incbin "palettes/gPalette_18.gbapal"
gPalette_19::
.incbin "palettes/gPalette_19.gbapal"
gPalette_20::
.incbin "palettes/gPalette_20.gbapal"
gPalette_21::
.incbin "palettes/gPalette_21.gbapal"
gPalette_22::
.incbin "palettes/gPalette_22.gbapal"
gPalette_23::
.incbin "palettes/gPalette_23.gbapal"
gPalette_24::
.incbin "palettes/gPalette_24.gbapal"
gPalette_25::
.incbin "palettes/gPalette_25.gbapal"
gPalette_26::
.incbin "palettes/gPalette_26.gbapal"
gPalette_27::
.incbin "palettes/gPalette_27.gbapal"
gPalette_28::
.incbin "palettes/gPalette_28.gbapal"
gPalette_29::
.incbin "palettes/gPalette_29.gbapal"
gPalette_30::
.incbin "palettes/gPalette_30.gbapal"
gPalette_31::
.incbin "palettes/gPalette_31.gbapal"
gPalette_32::
.incbin "palettes/gPalette_32.gbapal"
gPalette_33::
.incbin "palettes/gPalette_33.gbapal"
gPalette_34::
.incbin "palettes/gPalette_34.gbapal"
gPalette_35::
.incbin "palettes/gPalette_35.gbapal"
gPalette_36::
.incbin "palettes/gPalette_36.gbapal"
gPalette_37::
.incbin "palettes/gPalette_37.gbapal"
gPalette_38::
.incbin "palettes/gPalette_38.gbapal"
gPalette_39::
.incbin "palettes/gPalette_39.gbapal"
gPalette_40::
.incbin "palettes/gPalette_40.gbapal"
gPalette_41::
.incbin "palettes/gPalette_41.gbapal"
gPalette_42::
.incbin "palettes/gPalette_42.gbapal"
gPalette_43::
.incbin "palettes/gPalette_43.gbapal"
gPalette_44::
.incbin "palettes/gPalette_44.gbapal"
gPalette_45::
.incbin "palettes/gPalette_45.gbapal"
gPalette_46::
.incbin "palettes/gPalette_46.gbapal"
gPalette_47::
.incbin "palettes/gPalette_47.gbapal"
gPalette_48::
.incbin "palettes/gPalette_48.gbapal"
gPalette_49::
.incbin "palettes/gPalette_49.gbapal"
gPalette_50::
.incbin "palettes/gPalette_50.gbapal"
gPalette_51::
.incbin "palettes/gPalette_51.gbapal"
gPalette_52::
.incbin "palettes/gPalette_52.gbapal"
gPalette_53::
.incbin "palettes/gPalette_53.gbapal"
gPalette_54::
.incbin "palettes/gPalette_54.gbapal"
gPalette_55::
.incbin "palettes/gPalette_55.gbapal"
gPalette_56::
.incbin "palettes/gPalette_56.gbapal"
gPalette_57::
.incbin "palettes/gPalette_57.gbapal"
gPalette_58::
.incbin "palettes/gPalette_58.gbapal"
gPalette_59::
.incbin "palettes/gPalette_59.gbapal"
gPalette_60::
.incbin "palettes/gPalette_60.gbapal"
gPalette_61::
.incbin "palettes/gPalette_61.gbapal"
gPalette_62::
.incbin "palettes/gPalette_62.gbapal"
gPalette_63::
.incbin "palettes/gPalette_63.gbapal"
gPalette_64::
.incbin "palettes/gPalette_64.gbapal"
gPalette_65::
.incbin "palettes/gPalette_65.gbapal"
gPalette_66::
.incbin "palettes/gPalette_66.gbapal"
gPalette_67::
.incbin "palettes/gPalette_67.gbapal"
gPalette_68::
.incbin "palettes/gPalette_68.gbapal"
gPalette_69::
.incbin "palettes/gPalette_69.gbapal"
gPalette_70::
.incbin "palettes/gPalette_70.gbapal"
gPalette_71::
.incbin "palettes/gPalette_71.gbapal"
gPalette_72::
.incbin "palettes/gPalette_72.gbapal"
gPalette_73::
.incbin "palettes/gPalette_73.gbapal"
gPalette_74::
.incbin "palettes/gPalette_74.gbapal"
gPalette_75::
.incbin "palettes/gPalette_75.gbapal"
gPalette_76::
.incbin "palettes/gPalette_76.gbapal"
gPalette_77::
.incbin "palettes/gPalette_77.gbapal"
gPalette_78::
.incbin "palettes/gPalette_78.gbapal"
gPalette_79::
.incbin "palettes/gPalette_79.gbapal"
gPalette_80::
.incbin "palettes/gPalette_80.gbapal"
gPalette_81::
.incbin "palettes/gPalette_81.gbapal"
gPalette_82::
.incbin "palettes/gPalette_82.gbapal"
gPalette_83::
.incbin "palettes/gPalette_83.gbapal"
gPalette_84::
.incbin "palettes/gPalette_84.gbapal"
gPalette_85::
.incbin "palettes/gPalette_85.gbapal"
gPalette_86::
.incbin "palettes/gPalette_86.gbapal"
gPalette_87::
.incbin "palettes/gPalette_87.gbapal"
gPalette_88::
.incbin "palettes/gPalette_88.gbapal"
gPalette_89::
.incbin "palettes/gPalette_89.gbapal"
gPalette_90::
.incbin "palettes/gPalette_90.gbapal"
gPalette_91::
.incbin "palettes/gPalette_91.gbapal"
gPalette_92::
.incbin "palettes/gPalette_92.gbapal"
gPalette_93::
.incbin "palettes/gPalette_93.gbapal"
gPalette_94::
.incbin "palettes/gPalette_94.gbapal"
gPalette_95::
.incbin "palettes/gPalette_95.gbapal"
gPalette_96::
.incbin "palettes/gPalette_96.gbapal"
gPalette_97::
.incbin "palettes/gPalette_97.gbapal"
gPalette_98::
.incbin "palettes/gPalette_98.gbapal"
gPalette_99::
.incbin "palettes/gPalette_99.gbapal"
gPalette_100::
.incbin "palettes/gPalette_100.gbapal"
gPalette_101::
.incbin "palettes/gPalette_101.gbapal"
gPalette_102::
.incbin "palettes/gPalette_102.gbapal"
gPalette_103::
.incbin "palettes/gPalette_103.gbapal"
gPalette_104::
.incbin "palettes/gPalette_104.gbapal"
gPalette_105::
.incbin "palettes/gPalette_105.gbapal"
gPalette_106::
.incbin "palettes/gPalette_106.gbapal"
gPalette_107::
.incbin "palettes/gPalette_107.gbapal"
gPalette_108::
.incbin "palettes/gPalette_108.gbapal"
gPalette_109::
.incbin "palettes/gPalette_109.gbapal"
gPalette_110::
.incbin "palettes/gPalette_110.gbapal"
gPalette_111::
.incbin "palettes/gPalette_111.gbapal"
gPalette_112::
.incbin "palettes/gPalette_112.gbapal"
gPalette_113::
.incbin "palettes/gPalette_113.gbapal"
gPalette_114::
.incbin "palettes/gPalette_114.gbapal"
gPalette_115::
.incbin "palettes/gPalette_115.gbapal"
gPalette_116::
.incbin "palettes/gPalette_116.gbapal"
gPalette_117::
.incbin "palettes/gPalette_117.gbapal"
gPalette_118::
.incbin "palettes/gPalette_118.gbapal"
gPalette_119::
.incbin "palettes/gPalette_119.gbapal"
gPalette_120::
.incbin "palettes/gPalette_120.gbapal"
gPalette_121::
.incbin "palettes/gPalette_121.gbapal"
gPalette_122::
.incbin "palettes/gPalette_122.gbapal"
gPalette_123::
.incbin "palettes/gPalette_123.gbapal"
gPalette_124::
.incbin "palettes/gPalette_124.gbapal"
gPalette_125::
.incbin "palettes/gPalette_125.gbapal"
gPalette_126::
.incbin "palettes/gPalette_126.gbapal"
gPalette_127::
.incbin "palettes/gPalette_127.gbapal"
gPalette_128::
.incbin "palettes/gPalette_128.gbapal"
gPalette_129::
.incbin "palettes/gPalette_129.gbapal"
gPalette_130::
.incbin "palettes/gPalette_130.gbapal"
gPalette_131::
.incbin "palettes/gPalette_131.gbapal"
gPalette_132::
.incbin "palettes/gPalette_132.gbapal"
gPalette_133::
.incbin "palettes/gPalette_133.gbapal"
gPalette_134::
.incbin "palettes/gPalette_134.gbapal"
gPalette_135::
.incbin "palettes/gPalette_135.gbapal"
gPalette_136::
.incbin "palettes/gPalette_136.gbapal"
gPalette_137::
.incbin "palettes/gPalette_137.gbapal"
gPalette_138::
.incbin "palettes/gPalette_138.gbapal"
gPalette_139::
.incbin "palettes/gPalette_139.gbapal"
gPalette_140::
.incbin "palettes/gPalette_140.gbapal"
gPalette_141::
.incbin "palettes/gPalette_141.gbapal"
gPalette_142::
.incbin "palettes/gPalette_142.gbapal"
gPalette_143::
.incbin "palettes/gPalette_143.gbapal"
gPalette_144::
.incbin "palettes/gPalette_144.gbapal"
gPalette_145::
.incbin "palettes/gPalette_145.gbapal"
gPalette_146::
.incbin "palettes/gPalette_146.gbapal"
gPalette_147::
.incbin "palettes/gPalette_147.gbapal"
gPalette_148::
.incbin "palettes/gPalette_148.gbapal"
gPalette_149::
.incbin "palettes/gPalette_149.gbapal"
gPalette_150::
.incbin "palettes/gPalette_150.gbapal"
gPalette_151::
.incbin "palettes/gPalette_151.gbapal"
gPalette_152::
.incbin "palettes/gPalette_152.gbapal"
gPalette_153::
.incbin "palettes/gPalette_153.gbapal"
gPalette_154::
.incbin "palettes/gPalette_154.gbapal"
gPalette_155::
.incbin "palettes/gPalette_155.gbapal"
gPalette_156::
.incbin "palettes/gPalette_156.gbapal"
gPalette_157::
.incbin "palettes/gPalette_157.gbapal"
gPalette_158::
@@ -51,8 +335,378 @@ gPalette_163::
.incbin "palettes/gPalette_163.gbapal"
gPalette_164::
.incbin "palettes/gPalette_164.gbapal"
gfx_unknown_2::
.incbin "assets/gfx_unknown_2.bin"
gPalette_165::
.incbin "palettes/gPalette_165.gbapal"
gPalette_166::
.incbin "palettes/gPalette_166.gbapal"
gPalette_167::
.incbin "palettes/gPalette_167.gbapal"
gPalette_168::
.incbin "palettes/gPalette_168.gbapal"
gPalette_169::
.incbin "palettes/gPalette_169.gbapal"
gPalette_170::
.incbin "palettes/gPalette_170.gbapal"
gPalette_171::
.incbin "palettes/gPalette_171.gbapal"
gPalette_172::
.incbin "palettes/gPalette_172.gbapal"
gPalette_173::
.incbin "palettes/gPalette_173.gbapal"
gPalette_174::
.incbin "palettes/gPalette_174.gbapal"
gPalette_175::
.incbin "palettes/gPalette_175.gbapal"
gPalette_176::
.incbin "palettes/gPalette_176.gbapal"
gPalette_177::
.incbin "palettes/gPalette_177.gbapal"
gPalette_178::
.incbin "palettes/gPalette_178.gbapal"
gPalette_179::
.incbin "palettes/gPalette_179.gbapal"
gPalette_180::
.incbin "palettes/gPalette_180.gbapal"
gPalette_181::
.incbin "palettes/gPalette_181.gbapal"
gPalette_182::
.incbin "palettes/gPalette_182.gbapal"
gPalette_183::
.incbin "palettes/gPalette_183.gbapal"
gPalette_184::
.incbin "palettes/gPalette_184.gbapal"
gPalette_185::
.incbin "palettes/gPalette_185.gbapal"
gPalette_186::
.incbin "palettes/gPalette_186.gbapal"
gPalette_187::
.incbin "palettes/gPalette_187.gbapal"
gPalette_188::
.incbin "palettes/gPalette_188.gbapal"
gPalette_189::
.incbin "palettes/gPalette_189.gbapal"
gPalette_190::
.incbin "palettes/gPalette_190.gbapal"
gPalette_191::
.incbin "palettes/gPalette_191.gbapal"
gPalette_192::
.incbin "palettes/gPalette_192.gbapal"
gPalette_193::
.incbin "palettes/gPalette_193.gbapal"
gPalette_194::
.incbin "palettes/gPalette_194.gbapal"
gPalette_195::
.incbin "palettes/gPalette_195.gbapal"
gPalette_196::
.incbin "palettes/gPalette_196.gbapal"
gPalette_197::
.incbin "palettes/gPalette_197.gbapal"
gPalette_198::
.incbin "palettes/gPalette_198.gbapal"
gPalette_199::
.incbin "palettes/gPalette_199.gbapal"
gPalette_200::
.incbin "palettes/gPalette_200.gbapal"
gPalette_201::
.incbin "palettes/gPalette_201.gbapal"
gPalette_202::
.incbin "palettes/gPalette_202.gbapal"
gPalette_203::
.incbin "palettes/gPalette_203.gbapal"
gPalette_204::
.incbin "palettes/gPalette_204.gbapal"
gPalette_205::
.incbin "palettes/gPalette_205.gbapal"
gPalette_206::
.incbin "palettes/gPalette_206.gbapal"
gPalette_207::
.incbin "palettes/gPalette_207.gbapal"
gPalette_208::
.incbin "palettes/gPalette_208.gbapal"
gPalette_209::
.incbin "palettes/gPalette_209.gbapal"
gPalette_210::
.incbin "palettes/gPalette_210.gbapal"
gPalette_211::
.incbin "palettes/gPalette_211.gbapal"
gPalette_212::
.incbin "palettes/gPalette_212.gbapal"
gPalette_213::
.incbin "palettes/gPalette_213.gbapal"
gPalette_214::
.incbin "palettes/gPalette_214.gbapal"
gPalette_215::
.incbin "palettes/gPalette_215.gbapal"
gPalette_216::
.incbin "palettes/gPalette_216.gbapal"
gPalette_217::
.incbin "palettes/gPalette_217.gbapal"
gPalette_218::
.incbin "palettes/gPalette_218.gbapal"
gPalette_219::
.incbin "palettes/gPalette_219.gbapal"
gPalette_220::
.incbin "palettes/gPalette_220.gbapal"
gPalette_221::
.incbin "palettes/gPalette_221.gbapal"
gPalette_222::
.incbin "palettes/gPalette_222.gbapal"
gPalette_223::
.incbin "palettes/gPalette_223.gbapal"
gPalette_224::
.incbin "palettes/gPalette_224.gbapal"
gPalette_225::
.incbin "palettes/gPalette_225.gbapal"
gPalette_226::
.incbin "palettes/gPalette_226.gbapal"
gPalette_227::
.incbin "palettes/gPalette_227.gbapal"
gPalette_228::
.incbin "palettes/gPalette_228.gbapal"
gPalette_229::
.incbin "palettes/gPalette_229.gbapal"
gPalette_230::
.incbin "palettes/gPalette_230.gbapal"
gPalette_231::
.incbin "palettes/gPalette_231.gbapal"
gPalette_232::
.incbin "palettes/gPalette_232.gbapal"
gPalette_233::
.incbin "palettes/gPalette_233.gbapal"
gPalette_234::
.incbin "palettes/gPalette_234.gbapal"
gPalette_235::
.incbin "palettes/gPalette_235.gbapal"
gPalette_236::
.incbin "palettes/gPalette_236.gbapal"
gPalette_237::
.incbin "palettes/gPalette_237.gbapal"
gPalette_238::
.incbin "palettes/gPalette_238.gbapal"
gPalette_239::
.incbin "palettes/gPalette_239.gbapal"
gPalette_240::
.incbin "palettes/gPalette_240.gbapal"
gPalette_241::
.incbin "palettes/gPalette_241.gbapal"
gPalette_242::
.incbin "palettes/gPalette_242.gbapal"
gPalette_243::
.incbin "palettes/gPalette_243.gbapal"
gPalette_244::
.incbin "palettes/gPalette_244.gbapal"
gPalette_245::
.incbin "palettes/gPalette_245.gbapal"
gPalette_246::
.incbin "palettes/gPalette_246.gbapal"
gPalette_247::
.incbin "palettes/gPalette_247.gbapal"
gPalette_248::
.incbin "palettes/gPalette_248.gbapal"
gPalette_249::
.incbin "palettes/gPalette_249.gbapal"
gPalette_250::
.incbin "palettes/gPalette_250.gbapal"
gPalette_251::
.incbin "palettes/gPalette_251.gbapal"
gPalette_252::
.incbin "palettes/gPalette_252.gbapal"
gPalette_253::
.incbin "palettes/gPalette_253.gbapal"
gPalette_254::
.incbin "palettes/gPalette_254.gbapal"
gPalette_255::
.incbin "palettes/gPalette_255.gbapal"
gPalette_256::
.incbin "palettes/gPalette_256.gbapal"
gPalette_257::
.incbin "palettes/gPalette_257.gbapal"
gPalette_258::
.incbin "palettes/gPalette_258.gbapal"
gPalette_259::
.incbin "palettes/gPalette_259.gbapal"
gPalette_260::
.incbin "palettes/gPalette_260.gbapal"
gPalette_261::
.incbin "palettes/gPalette_261.gbapal"
gPalette_262::
.incbin "palettes/gPalette_262.gbapal"
gPalette_263::
.incbin "palettes/gPalette_263.gbapal"
gPalette_264::
.incbin "palettes/gPalette_264.gbapal"
gPalette_265::
.incbin "palettes/gPalette_265.gbapal"
gPalette_266::
.incbin "palettes/gPalette_266.gbapal"
gPalette_267::
.incbin "palettes/gPalette_267.gbapal"
gPalette_268::
.incbin "palettes/gPalette_268.gbapal"
gPalette_269::
.incbin "palettes/gPalette_269.gbapal"
gPalette_270::
.incbin "palettes/gPalette_270.gbapal"
gPalette_271::
.incbin "palettes/gPalette_271.gbapal"
gPalette_272::
.incbin "palettes/gPalette_272.gbapal"
gPalette_273::
.incbin "palettes/gPalette_273.gbapal"
gPalette_274::
.incbin "palettes/gPalette_274.gbapal"
gPalette_275::
.incbin "palettes/gPalette_275.gbapal"
gPalette_276::
.incbin "palettes/gPalette_276.gbapal"
gPalette_277::
.incbin "palettes/gPalette_277.gbapal"
gPalette_278::
.incbin "palettes/gPalette_278.gbapal"
gPalette_279::
.incbin "palettes/gPalette_279.gbapal"
gPalette_280::
.incbin "palettes/gPalette_280.gbapal"
gPalette_281::
.incbin "palettes/gPalette_281.gbapal"
gPalette_282::
.incbin "palettes/gPalette_282.gbapal"
gPalette_283::
.incbin "palettes/gPalette_283.gbapal"
gPalette_284::
.incbin "palettes/gPalette_284.gbapal"
gPalette_285::
.incbin "palettes/gPalette_285.gbapal"
gPalette_286::
.incbin "palettes/gPalette_286.gbapal"
gPalette_287::
.incbin "palettes/gPalette_287.gbapal"
gPalette_288::
.incbin "palettes/gPalette_288.gbapal"
gPalette_289::
.incbin "palettes/gPalette_289.gbapal"
gPalette_290::
.incbin "palettes/gPalette_290.gbapal"
gPalette_291::
.incbin "palettes/gPalette_291.gbapal"
gPalette_292::
.incbin "palettes/gPalette_292.gbapal"
gPalette_293::
.incbin "palettes/gPalette_293.gbapal"
gPalette_294::
.incbin "palettes/gPalette_294.gbapal"
gPalette_295::
.incbin "palettes/gPalette_295.gbapal"
gPalette_296::
.incbin "palettes/gPalette_296.gbapal"
gPalette_297::
.incbin "palettes/gPalette_297.gbapal"
gPalette_298::
.incbin "palettes/gPalette_298.gbapal"
gPalette_299::
.incbin "palettes/gPalette_299.gbapal"
gPalette_300::
.incbin "palettes/gPalette_300.gbapal"
gPalette_301::
.incbin "palettes/gPalette_301.gbapal"
gPalette_302::
.incbin "palettes/gPalette_302.gbapal"
gPalette_303::
.incbin "palettes/gPalette_303.gbapal"
gPalette_304::
.incbin "palettes/gPalette_304.gbapal"
gPalette_305::
.incbin "palettes/gPalette_305.gbapal"
gPalette_306::
.incbin "palettes/gPalette_306.gbapal"
gPalette_307::
.incbin "palettes/gPalette_307.gbapal"
gPalette_308::
.incbin "palettes/gPalette_308.gbapal"
gPalette_309::
.incbin "palettes/gPalette_309.gbapal"
gPalette_310::
.incbin "palettes/gPalette_310.gbapal"
gPalette_311::
.incbin "palettes/gPalette_311.gbapal"
gPalette_312::
.incbin "palettes/gPalette_312.gbapal"
gPalette_313::
.incbin "palettes/gPalette_313.gbapal"
gPalette_314::
.incbin "palettes/gPalette_314.gbapal"
gPalette_315::
.incbin "palettes/gPalette_315.gbapal"
gPalette_316::
.incbin "palettes/gPalette_316.gbapal"
gPalette_317::
.incbin "palettes/gPalette_317.gbapal"
gPalette_318::
.incbin "palettes/gPalette_318.gbapal"
gPalette_319::
.incbin "palettes/gPalette_319.gbapal"
gPalette_320::
.incbin "palettes/gPalette_320.gbapal"
gPalette_321::
.incbin "palettes/gPalette_321.gbapal"
gPalette_322::
.incbin "palettes/gPalette_322.gbapal"
gfx_unknown_0::
.incbin "assets/gfx_unknown_0.bin"
gPalette_327::
.incbin "palettes/gPalette_327.gbapal"
gPalette_328::
.incbin "palettes/gPalette_328.gbapal"
gPalette_329::
.incbin "palettes/gPalette_329.gbapal"
gPalette_330::
.incbin "palettes/gPalette_330.gbapal"
gPalette_331::
.incbin "palettes/gPalette_331.gbapal"
gPalette_332::
.incbin "palettes/gPalette_332.gbapal"
gPalette_333::
.incbin "palettes/gPalette_333.gbapal"
gPalette_334::
.incbin "palettes/gPalette_334.gbapal"
gPalette_335::
.incbin "palettes/gPalette_335.gbapal"
gPalette_336::
.incbin "palettes/gPalette_336.gbapal"
gPalette_337::
.incbin "palettes/gPalette_337.gbapal"
gPalette_338::
.incbin "palettes/gPalette_338.gbapal"
gPalette_339::
.incbin "palettes/gPalette_339.gbapal"
gPalette_340::
.incbin "palettes/gPalette_340.gbapal"
gPalette_341::
.incbin "palettes/gPalette_341.gbapal"
gPalette_342::
.incbin "palettes/gPalette_342.gbapal"
gPalette_343::
.incbin "palettes/gPalette_343.gbapal"
gPalette_344::
.incbin "palettes/gPalette_344.gbapal"
gPalette_345::
.incbin "palettes/gPalette_345.gbapal"
gPalette_346::
.incbin "palettes/gPalette_346.gbapal"
gPalette_347::
.incbin "palettes/gPalette_347.gbapal"
gPalette_348::
.incbin "palettes/gPalette_348.gbapal"
gPalette_349::
.incbin "palettes/gPalette_349.gbapal"
gPalette_350::
.incbin "palettes/gPalette_350.gbapal"
gPalette_351::
.incbin "palettes/gPalette_351.gbapal"
gPalette_352::
.incbin "palettes/gPalette_352.gbapal"
gPalette_353::
.incbin "palettes/gPalette_353.gbapal"
gPalette_354::
.incbin "palettes/gPalette_354.gbapal"
gPalette_355::
@@ -651,8 +1305,8 @@ gPalette_651::
.incbin "palettes/gPalette_651.gbapal"
gPalette_652::
.incbin "palettes/gPalette_652.gbapal"
gfx_unknown_3::
.incbin "assets/gfx_unknown_3.bin"
gfx_unknown_1::
.incbin "assets/gfx_unknown_1.bin"
gPalette_666::
.incbin "palettes/gPalette_666.gbapal"
gPalette_667::
@@ -679,8 +1333,10 @@ gPalette_677::
.incbin "palettes/gPalette_677.gbapal"
gPalette_678::
.incbin "palettes/gPalette_678.gbapal"
gfx_unknown_4::
.incbin "assets/gfx_unknown_4.bin"
gPalette_679::
.incbin "palettes/gPalette_679.gbapal"
gPalette_680::
.incbin "palettes/gPalette_680.gbapal"
bgAnim_57_0::
.incbin "palettes/bgAnim_57_0.gbapal"
bgAnim_57_1::
@@ -1835,8 +2491,8 @@ gPalette_1259::
.incbin "palettes/gPalette_1259.gbapal"
gPalette_1260::
.incbin "palettes/gPalette_1260.gbapal"
gfx_unknown_5::
.incbin "assets/gfx_unknown_5.bin"
gPalette_1261::
.incbin "palettes/gPalette_1261.gbapal"
gPalette_1262::
.incbin "palettes/gPalette_1262.gbapal"
gPalette_1263::
@@ -3105,8 +3761,8 @@ gPalette_1894::
.incbin "palettes/gPalette_1894.gbapal"
gPalette_1895::
.incbin "palettes/gPalette_1895.gbapal"
gfx_unknown_6::
.incbin "assets/gfx_unknown_6.bin"
gfx_unknown_2::
.incbin "assets/gfx_unknown_2.bin"
gPalette_1908::
.incbin "palettes/gPalette_1908.gbapal"
gPalette_1909::
@@ -3571,8 +4227,12 @@ gPalette_2138::
.incbin "palettes/gPalette_2138.gbapal"
gPalette_2139::
.incbin "palettes/gPalette_2139.gbapal"
gfx_unknown_7::
.incbin "assets/gfx_unknown_7.bin"
gPalette_2140::
.incbin "palettes/gPalette_2140.gbapal"
gPalette_2141::
.incbin "palettes/gPalette_2141.gbapal"
gPalette_2142::
.incbin "palettes/gPalette_2142.gbapal"
gPalette_2143::
.incbin "palettes/gPalette_2143.gbapal"
gPalette_2144::
@@ -3605,8 +4265,12 @@ gPalette_2157::
.incbin "palettes/gPalette_2157.gbapal"
gPalette_2158::
.incbin "palettes/gPalette_2158.gbapal"
gfx_unknown_8::
.incbin "assets/gfx_unknown_8.bin"
gPalette_2159::
.incbin "palettes/gPalette_2159.gbapal"
gPalette_2160::
.incbin "palettes/gPalette_2160.gbapal"
gPalette_2161::
.incbin "palettes/gPalette_2161.gbapal"
gPalette_2162::
.incbin "palettes/gPalette_2162.gbapal"
gPalette_2163::
@@ -3639,8 +4303,12 @@ gPalette_2176::
.incbin "palettes/gPalette_2176.gbapal"
gPalette_2177::
.incbin "palettes/gPalette_2177.gbapal"
gfx_unknown_9::
.incbin "assets/gfx_unknown_9.bin"
gPalette_2178::
.incbin "palettes/gPalette_2178.gbapal"
gPalette_2179::
.incbin "palettes/gPalette_2179.gbapal"
gPalette_2180::
.incbin "palettes/gPalette_2180.gbapal"
gPalette_2181::
.incbin "palettes/gPalette_2181.gbapal"
gPalette_2182::
@@ -3673,8 +4341,12 @@ gPalette_2195::
.incbin "palettes/gPalette_2195.gbapal"
gPalette_2196::
.incbin "palettes/gPalette_2196.gbapal"
gfx_unknown_10::
.incbin "assets/gfx_unknown_10.bin"
gPalette_2197::
.incbin "palettes/gPalette_2197.gbapal"
gPalette_2198::
.incbin "palettes/gPalette_2198.gbapal"
gPalette_2199::
.incbin "palettes/gPalette_2199.gbapal"
gUnk_085B4180::
.incbin "assets/gUnk_085B4180.bin"
gPalette_2204::
@@ -3693,8 +4365,12 @@ gPalette_2210::
.incbin "palettes/gPalette_2210.gbapal"
gPalette_2211::
.incbin "palettes/gPalette_2211.gbapal"
gfx_unknown_11::
.incbin "assets/gfx_unknown_11.bin"
gPalette_2212::
.incbin "palettes/gPalette_2212.gbapal"
gPalette_2213::
.incbin "palettes/gPalette_2213.gbapal"
gPalette_2214::
.incbin "palettes/gPalette_2214.gbapal"
gPalette_2215::
.incbin "palettes/gPalette_2215.gbapal"
gPalette_2216::
@@ -3783,8 +4459,12 @@ gPalette_2257::
.incbin "palettes/gPalette_2257.gbapal"
gPalette_2258::
.incbin "palettes/gPalette_2258.gbapal"
gfx_unknown_12::
.incbin "assets/gfx_unknown_12.bin"
gPalette_2259::
.incbin "palettes/gPalette_2259.gbapal"
gPalette_2260::
.incbin "palettes/gPalette_2260.gbapal"
gfx_unknown_3::
.incbin "assets/gfx_unknown_3.bin"
gPalette_2293::
.incbin "palettes/gPalette_2293.gbapal"
gPalette_2294::
@@ -4349,8 +5029,8 @@ gPalette_3390::
.incbin "palettes/gPalette_3390.gbapal"
gPalette_3391::
.incbin "palettes/gPalette_3391.gbapal"
gfx_unknown_13::
.incbin "assets/gfx_unknown_13.bin"
gfx_unknown_4::
.incbin "assets/gfx_unknown_4.bin"
gPalette_3396::
.incbin "palettes/gPalette_3396.gbapal"
gPalette_3397::
@@ -4419,8 +5099,20 @@ gPalette_3428::
.incbin "palettes/gPalette_3428.gbapal"
gPalette_3429::
.incbin "palettes/gPalette_3429.gbapal"
gfx_unknown_14::
.incbin "assets/gfx_unknown_14.bin"
gPalette_3430::
.incbin "palettes/gPalette_3430.gbapal"
gPalette_3431::
.incbin "palettes/gPalette_3431.gbapal"
gPalette_3432::
.incbin "palettes/gPalette_3432.gbapal"
gPalette_3433::
.incbin "palettes/gPalette_3433.gbapal"
gPalette_3434::
.incbin "palettes/gPalette_3434.gbapal"
gPalette_3435::
.incbin "palettes/gPalette_3435.gbapal"
gPalette_3436::
.incbin "palettes/gPalette_3436.gbapal"
gPalette_3437::
.incbin "palettes/gPalette_3437.gbapal"
gPalette_3438::
@@ -5037,8 +5729,10 @@ bgAnim_79_14::
.incbin "palettes/bgAnim_79_14.gbapal"
bgAnim_79_15::
.incbin "palettes/bgAnim_79_15.gbapal"
gfx_unknown_15::
.incbin "assets/gfx_unknown_15.bin"
gPalette_3773::
.incbin "palettes/gPalette_3773.gbapal"
gPalette_3774::
.incbin "palettes/gPalette_3774.gbapal"
gGfx_89_3::
.incbin "gfx/gGfx_89_3.4bpp"
gGfx_24_0::
@@ -6081,8 +6775,8 @@ fixedTypeGfx_243::
.incbin "gfx/fixedTypeGfx_243.4bpp"
fixedTypeGfx_398::
.incbin "gfx/fixedTypeGfx_398.4bpp"
gfx_unknown_16::
.incbin "assets/gfx_unknown_16.bin"
gfx_unknown_5::
.incbin "assets/gfx_unknown_5.bin"
fixedTypeGfx_496::
.incbin "gfx/fixedTypeGfx_496.4bpp"
fixedTypeGfx_456::
@@ -6948,8 +7642,8 @@ gGfx_21_0::
.incbin "gfx/gGfx_21_0.4bpp"
gGfx_48_0::
.incbin "gfx/gGfx_48_0.4bpp"
gfx_unknown_17::
.incbin "assets/gfx_unknown_17.bin"
gfx_unknown_6::
.incbin "assets/gfx_unknown_6.bin"
gGfx_47_0::
.incbin "gfx/gGfx_47_0.4bpp"
gGfx_49_0::
@@ -6968,8 +7662,8 @@ gGfx_76_0::
.incbin "gfx/gGfx_76_0.4bpp"
gGfx_77_0::
.incbin "gfx/gGfx_77_0.4bpp"
gfx_unknown_18::
.incbin "assets/gfx_unknown_18.bin"
gfx_unknown_7::
.incbin "assets/gfx_unknown_7.bin"
gGfx_78_0::
.incbin "gfx/gGfx_78_0.4bpp"
gGfx_54_0::
@@ -7346,12 +8040,12 @@ gGfx_2_4::
.incbin "gfx/gGfx_2_4.4bpp"
fixedTypeGfx_511::
.incbin "gfx/fixedTypeGfx_511.4bpp"
gfx_unknown_19::
.incbin "assets/gfx_unknown_19.bin"
gfx_unknown_8::
.incbin "assets/gfx_unknown_8.bin"
fixedTypeGfx_512::
.incbin "gfx/fixedTypeGfx_512.4bpp"
gfx_unknown_20::
.incbin "assets/gfx_unknown_20.bin"
gfx_unknown_9::
.incbin "assets/gfx_unknown_9.bin"
fixedTypeGfx_513::
.incbin "gfx/fixedTypeGfx_513.4bpp"
fixedTypeGfx_514::
@@ -7435,8 +8129,8 @@ gGfx_10_0::
.ifndef EU
gGfx_11_1::
.incbin "gfx/gGfx_11_1.4bpp"
gfx_unknown_21::
.incbin "assets/gfx_unknown_21.bin"
gfx_unknown_10::
.incbin "assets/gfx_unknown_10.bin"
.endif
gGfx_88_0::
.incbin "gfx/gGfx_88_0.4bpp"
@@ -7564,8 +8258,8 @@ gGfx_92_0::
.incbin "gfx/gGfx_92_0.4bpp"
gGfx_92_2::
.incbin "gfx/gGfx_92_2.4bpp"
gfx_unknown_22::
.incbin "assets/gfx_unknown_22.bin"
gfx_unknown_11::
.incbin "assets/gfx_unknown_11.bin"
gGfx_92_4::
.incbin "gfx/gGfx_92_4.4bpp"
gGfx_92_1::
@@ -7610,8 +8304,8 @@ gGfx_96_1::
.incbin "gfx/gGfx_96_1.4bpp"
gGfx_102_1::
.incbin "gfx/gGfx_102_1.4bpp"
gfx_unknown_23::
.incbin "assets/gfx_unknown_23.bin"
gfx_unknown_12::
.incbin "assets/gfx_unknown_12.bin"
gGfx_105_1::
.incbin "gfx/gGfx_105_1.4bpp"
gGfx_113_1::
@@ -7737,5 +8431,5 @@ gGfx_132_0::
.align 2
fixedTypeGfx_214::
.incbin "gfx/fixedTypeGfx_214.4bpp.lz"
gfx_unknown_24::
.incbin "assets/gfx_unknown_24.bin"
gfx_unknown_13::
.incbin "assets/gfx_unknown_13.bin"
data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc
+2 -2
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_CutsceneOrchestratorGreatWhirlwindRevealed
BeginBlock
Call SetPriorityHighest
SetEntitySpeed 0x0700
_0807F0B4 0x0007
SetScrollSpeed 7
CameraTargetEntity
Call sub_0807FBC4
EndBlock
@@ -14,7 +14,7 @@ SCRIPT_START script_CutsceneOrchestratorGreatWhirlwindRevealed
SetSyncFlag 0x0000000a
WaitForSyncFlagAndClear 0x00000004
_0807EEB4
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
Call sub_0807FBCC
EnablePlayerControl
data/scripts/cloudTops/script_Npc4EFirstCloud.inc
+1 -1
View File
@@ -24,7 +24,7 @@ script_0800D650:
Call sub_0807FBC4
Call sub_0807FBA0
SetEntitySpeed 0x0700
_0807F0B4 0x0007
SetScrollSpeed 7
CameraTargetEntity
_0807EDD4 0x01e8, 0x01b8
Wait 0x003c
data/scripts/cloudTops/script_Npc4EKinstoneFused.inc
+1 -1
View File
@@ -1,7 +1,7 @@
@ Cloud Tops NPC4E after Kinstone has been fused
SCRIPT_START script_Npc4EKinstoneFused
_0807EEB4
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
Call sub_0807FBCC
EnablePlayerControl
data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc
+2 -2
View File
@@ -62,7 +62,7 @@ script_08012566:
StartPlayerScript script_PlayerEzloBeingBullied
WaitForSyncFlagAndClear 0x00000001
SetEntityPositionRelative 0x0388, 0x0168
_0807F0B4 0x0001
SetScrollSpeed 1
CameraTargetEntity
Wait 0x005a
SetSyncFlag 0x00000004
@@ -113,7 +113,7 @@ script_08012566:
Wait 0x003c
PlayBGM
Call sub_0806DCA0
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
Call EnablePauseMenu
EnablePlayerControl
data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc
+1 -1
View File
@@ -12,7 +12,7 @@ SCRIPT_START script_Npc4EOutsideLinksHouse
WaitForFadeFinish
SetSyncFlag 0x00000001
WaitForSyncFlagAndClear 0x00000002
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
Call EnablePauseMenu
EnablePlayerControl
data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc
+2 -2
View File
@@ -9,7 +9,7 @@ script_08008E12:
SetPlayerIdle
Call WaitForPlayerNormal
Call DisablePauseMenuAndPutAwayItems
_0807F0B4 0x0001
SetScrollSpeed 1
CameraTargetEntity
WaitForPlayerEnterRoom
Wait 0x003c
@@ -66,7 +66,7 @@ script_08008E12:
_0807E8E4_0
SetSyncFlag 0x00000080
WaitForSyncFlagAndClear 0x00000100
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
SetGlobalFlag TABIDACHI
Call sub_0806DCC0
data/scripts/cutscene/introBusinessScrub/script_080157AC.inc
+3 -3
View File
@@ -20,7 +20,7 @@ script_080157DA:
SetSyncFlag 0x00000001
WaitForSyncFlagAndClear 0x00000002
StartPlayerScript script_PlayerIntroBusinessScrub1
_0807F0B4 0x0001
SetScrollSpeed 1
SetEntityPositionRelative 0x0248, 0x0218
CameraTargetEntity
Call WaitForCameraTouchRoomBorder
@@ -50,7 +50,7 @@ script_08015888:
JumpIf script_08015888
SetPlayerIdle
Call DisablePauseMenuAndPutAwayItems
_0807F0B4 0x0002
SetScrollSpeed 2
SetEntityPositionRelative 0x0248, 0x0208
CameraTargetEntity
StartPlayerScript script_PlayerIntroBusinessScrub3
@@ -68,7 +68,7 @@ script_08015888:
Call sub_08066FB8
Call EnablePauseMenu
EnablePlayerControl
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
DoPostScriptAction 0x0006
SCRIPT_END
data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
+1 -1
View File
@@ -31,7 +31,7 @@ SCRIPT_START script_Npc4EMonsters
Call SetPlayerActionNormal
CallWithArg EquipItem, ITEM_SHIELD
CallWithArg SetPlayerMacro, gUnk_080049F6
_0807F0B4 0x0001
SetScrollSpeed 1
SetEntityPositionRelative 0x01f8, 0x0068
SetSyncFlag 0x00000004
Wait 0x001e
data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
+3 -3
View File
@@ -34,10 +34,10 @@ SCRIPT_START script_Npc4EIntroCastle
StartPlayerScript script_PlayerAtIntroCeremony
WaitForSyncFlagAndClear 0x00000400
SetEntityPositionRelative 0x01f8, 0x0050
_0807F0B4 0x0007
SetScrollSpeed 7
CameraTargetEntity
Wait 0x000a
_0807F0B4 0x0001
SetScrollSpeed 1
SetFadeTime 0x0001
SetFade4
SetSyncFlag 0x0002a800
@@ -67,7 +67,7 @@ SCRIPT_START script_Npc4EIntroCastle
MessageFromTargetPos TEXT_PROLOGUE, 0x3a, 0x000c
WaitUntilTextboxCloses
SetEntityPositionRelative 0x01f8, 0x01c0
_0807F0B4 0x0004
SetScrollSpeed 4
Wait 0x0078
SetSyncFlag 0x00280000
WaitForSyncFlagAndClear 0x00500000
data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
+5 -5
View File
@@ -11,12 +11,12 @@ SCRIPT_START script_Npc4EIntroTown
WaitForFadeFinish
StartPlayerScript script_PlayerIntro1
SetSyncFlag 0x00000002
_0807F0B4 0x0001
SetScrollSpeed 1
SetEntityPositionRelative 0x00c8, 0x0218
Call WaitForCameraTouchRoomBorder
Wait 0x0064
@ Camera reaches center of town square
_0807F0B4 0x0002
SetScrollSpeed 2
SetEntityPositionRelative 0x00c8, 0x0368
Call WaitForCameraTouchRoomBorder
WaitForSyncFlagAndClear 0x00000001
@@ -27,7 +27,7 @@ SCRIPT_START script_Npc4EIntroTown
SetSyncFlag 0x00000002
WaitForSyncFlagAndClear 0x00000004
@ Zelda ran off. Give control to the player
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
Call EnablePauseMenu
EnablePlayerControl
@@ -85,7 +85,7 @@ SCRIPT_START script_Npc4EIntroTown
WaitUntilTextboxCloses
StartPlayerScript script_PlayerIntro5
SetEntityPositionRelative 0x00f0, 0x0258
_0807F0B4 0x0001
SetScrollSpeed 1
CameraTargetEntity
Wait 0x001e
Call sub_08063C2C
@@ -161,7 +161,7 @@ SCRIPT_START script_Npc4EIntroTown
@ Give control back to the player
CallWithArg SetPlayerMacro, 0x00000000
Call NPC4E_RestoreEquippedItems
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
Wait 0x000a
SetSyncFlag 0x00000002
data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc
+1 -1
View File
@@ -1,7 +1,7 @@
@ Hyrule Town NPC4E Kinstone Cutscene
SCRIPT_START script_Npc4EFirstKinstone
BeginBlock
_0807F0B4 0x0001
SetScrollSpeed 1
CameraTargetPlayer
EndBlock
script_0800F09A:
data/scripts/cutscene/originStory/script_CutsceneOrchestratorMinishVaati.inc
+2 -2
View File
@@ -1,7 +1,7 @@
@ Ezlo Cutscene CUTSCENE_ORCHESTRATOR MinishVaati
SCRIPT_START script_CutsceneOrchestratorMinishVaati
BeginBlock
_0807F0B4 0x0007
SetScrollSpeed 7
SetEntityPositionRelative 0x0078, 0x0068
CameraTargetEntity
EndBlock
@@ -16,7 +16,7 @@ SCRIPT_START script_CutsceneOrchestratorMinishVaati
WaitForSyncFlagAndClear 0x00001000
SetSyncFlag 0x00000880
WaitForSyncFlagAndClear 0x00001100
_0807F0B4 0x0004
SetScrollSpeed 4
SetEntityPositionRelative 0x0078, 0x0090
MessageFromTargetPos TEXT_VAATI, 0x30, 0x0002
WaitUntilTextboxCloses
data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc
+5 -5
View File
@@ -11,7 +11,7 @@ script_08014FCC:
Call WaitForPlayerNormal
Call DisablePauseMenuAndPutAwayItems
StopBgm
_0807F0B4 0x0001
SetScrollSpeed 1
CameraTargetEntity
StartPlayerScript script_PlayerAtVaatisAppearance
WaitForSyncFlagAndClear 0x00000001
@@ -39,7 +39,7 @@ script_08014FCC:
StopBgm
StartPlayerScript script_PlayerTryToFollowVaati
CameraTargetEntity
_0807F0B4 0x0003
SetScrollSpeed 3
SetEntityPositionRelative 0x01f8, 0x0148
WaitForSyncFlagAndClear 0x00000001
Call sub_0804F6A8
@@ -105,7 +105,7 @@ script_08015104:
PlaySound SFX_10B
Wait 0x003c
PlaySound SFX_SECRET
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
SetLocalFlag SOUGEN_06_SAIKAI
EzloMessage TEXT_VAATI, 0x0c
@@ -120,7 +120,7 @@ script_08015104:
SetPlayerIdle
CallWithArg SetPlayerFlag, PL_NO_CAP
MoveEntityToPlayer
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetEntity
SetFadeTime 0x0100
SetFade4
@@ -139,7 +139,7 @@ script_08015104:
EzloMessage TEXT_VAATI, 0x15
EndBlock
WaitUntilTextboxCloses
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
Call EnableRandomDrops
PlayBGM
data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc
+1 -1
View File
@@ -11,7 +11,7 @@ SCRIPT_START script_Npc4EFixedEverything
PlaySound SFX_APPARATE
EndBlock
Wait 0x0078
_0807F0B4 0x0001
SetScrollSpeed 1
SetEntityPositionRelative 0x0088, 0x0078
Call WaitForCameraTouchRoomBorder
MessageFromTargetPos TEXT_VAATI2, 0x64, 0x0000
data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
+1 -1
View File
@@ -59,7 +59,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing
Call sub_0807FB94 @ Roll Credits
MoveEntityToPlayer
Call sub_0807F844
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
SetSyncFlag 0x80000000
SetFade4
data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeoverCutscene.inc
+5 -5
View File
@@ -1,7 +1,7 @@
@ Western Wood Cutscene CUTSCENE_ORCHESTRATOR in Castle
SCRIPT_START script_CutsceneOrchestratorTakeoverCutscene
BeginBlock
_0807F0B4 0x0007
SetScrollSpeed 7
SetEntityPositionRelative 0x0088, 0x0068
CameraTargetEntity
EndBlock
@@ -9,26 +9,26 @@ SCRIPT_START script_CutsceneOrchestratorTakeoverCutscene
SetFade4
WaitForFadeFinish
Wait 0x003c
_0807F0B4 0x0004
SetScrollSpeed 4
SetEntityPositionRelative 0x0088, 0x00e0
CameraTargetEntity
Wait 0x003c
PlayBgm BGM_VAATI_THEME
SetSyncFlag 0x00000010
WaitForSyncFlagAndClear 0x00000020
_0807F0B4 0x0004
SetScrollSpeed 4
SetEntityPositionRelative 0x0088, 0x0070
CameraTargetEntity
Wait 0x003c
SetSyncFlag 0x00000004
WaitForSyncFlagAndClear 0x00000008
_0807F0B4 0x0004
SetScrollSpeed 4
SetEntityPositionRelative 0x0088, 0x00e0
CameraTargetEntity
Wait 0x003c
SetSyncFlag 0x00000010
WaitForSyncFlagAndClear 0x00000020
_0807F0B4 0x0004
SetScrollSpeed 4
SetEntityPositionRelative 0x0088, 0x0070
CameraTargetEntity
Wait 0x003c
data/scripts/dhc/script_CutsceneOrchestratorVaatiWithZelda.inc
+2 -2
View File
@@ -11,7 +11,7 @@ script_0800DA64:
_0807E8E4_0
Call CreatePlayerExclamationMark
Wait 0x003c
_0807F0B4 0x0004
SetScrollSpeed 4
SetEntityPositionRelative 0x0078, 0x0080
CameraTargetEntity
Call WaitForCameraTouchRoomBorder
@@ -25,7 +25,7 @@ script_0800DA64:
WaitUntilTextboxCloses
_0807E8E4_0
CallWithArg SetPlayerPos, 0x00780138
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
Call WaitForCameraTouchRoomBorder
SetRoomFlag 0x0000
data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc
+1 -1
View File
@@ -8,7 +8,7 @@ script_0800DB7C:
SetPlayerIdle
Call WaitForPlayerNormal
Call DisablePauseMenuAndPutAwayItems
_0807F0B4 0x0001
SetScrollSpeed 1
SetEntityPositionRelative 0x0078, 0x0078
CameraTargetEntity
Call WaitForCameraTouchRoomBorder
data/scripts/dhc/script_Vaati1Intro.inc
+2 -2
View File
@@ -14,7 +14,7 @@ SCRIPT_START script_Vaati1Intro
Call CreatePlayerExclamationMark
Wait 0x003c
_0807E8E4_0
_0807F0B4 0x0001
SetScrollSpeed 1
CameraTargetEntity
Call WaitForCameraTouchRoomBorder
Call Vaati_Apparate
@@ -29,7 +29,7 @@ SCRIPT_START script_Vaati1Intro
SetRoomFlag 0x0000
DoPostScriptAction 0x0008
Wait 0x0080
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
Call WaitForCameraTouchRoomBorder
SetLocalFlag 0x0078
data/scripts/hyruleTown/script_CutsceneOrchestratorAllBooksCollected.inc
+2 -2
View File
@@ -2,14 +2,14 @@
SCRIPT_START script_CutsceneOrchestratorAllBooksCollected
BeginBlock
SetEntityPositionRelative 0x0068, 0x0068
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetEntity
EndBlock
Wait 0x001e
SetSyncFlag 0x00000002
WaitForSyncFlag 0x00000001
Wait 0x000f
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
Wait 0x001e
SetSyncFlag 0x00000004
data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc
+4 -4
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_Npc4EFinalSwordRumble
Call CreatePlayerExclamationMark
Wait 0x003c
.ifdef EU
_0807F0B4 0x0007
SetScrollSpeed 7
SetEntityPositionRelative 0x00e8, 0x00a8
CameraTargetEntity
Wait 0x003c
@@ -13,19 +13,19 @@ SCRIPT_START script_Npc4EFinalSwordRumble
CallWithArg DeleteRepeatedSoundManager, 0x00000001
_0807F0C8 0x0000, 0x0000
Wait 0x003c
_0807F0B4 0x0004
SetScrollSpeed 4
SetEntityPositionRelative 0x00e8, 0x0050
CameraTargetEntity
Wait 0x003c
LoadRoomEntityList gUnk_080F55D8
Wait 0x0078
_0807F0B4 0x0007
SetScrollSpeed 7
MoveEntityToPlayer
CameraTargetEntity
Wait 0x003c
EzloMessage TEXT_PANEL_TUTORIAL, 0x02
WaitUntilTextboxCloses
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
SetLocalFlag 0x007c
Call sub_08053250
data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc
+2 -2
View File
@@ -9,12 +9,12 @@ script_08013CA6:
Call DisablePauseMenuAndPutAwayItems
Call CreatePlayerExclamationMark
Wait 0x003c
_0807F0B4 0x0001
SetScrollSpeed 1
SetEntityPositionRelative 0x00e8, 0x0138
CameraTargetEntity
Call WaitForCameraTouchRoomBorder
Wait 0x0078
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
Call WaitForCameraTouchRoomBorder
EzloMessage TEXT_PANEL_TUTORIAL, 0x04
data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc
+2 -2
View File
@@ -2,7 +2,7 @@
SCRIPT_START script_Npc4ESpawnTextBoard
Call CreatePlayerExclamationMark
Wait 0x003c
_0807F0B4 0x0007
SetScrollSpeed 7
SetEntityPositionRelative 0x00e8, 0x00a8
CameraTargetEntity
Wait 0x003c
@@ -14,7 +14,7 @@ SCRIPT_START script_Npc4ESpawnTextBoard
WaitForSyncFlagAndClear 0x00000002
EzloMessage TEXT_PANEL_TUTORIAL, 0x01
WaitUntilTextboxCloses
_0807F0B4 0x0004
SetScrollSpeed 4
CameraTargetPlayer
SetLocalFlag 0x007a
Call sub_08053250
data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+1 -1
View File
@@ -79,7 +79,7 @@ script_080138D0:
WaitUntilTextboxCloses
SetSyncFlag 0x00040000
.ifndef EU
_0807F0B4 0x0002
SetScrollSpeed 2
SetEntityPositionRelative 0x00e8, 0x00d8
CameraTargetEntity
.endif
data/scripts/unused/script_08016482.inc
+1 -1
View File
@@ -75,7 +75,7 @@ SCRIPT_START script_08016482
InitItemGetSequence ITEM_SMITH_SWORD
CameraTargetEntity
CameraTargetPlayer
_0807F0B4 0x0007
SetScrollSpeed 7
_0807F0C8 0x003c, 0x0003
SCRIPT_END
.2byte 0x0000
data/scripts/veilFalls/script_BigGoron3.inc
+3 -3
View File
@@ -9,7 +9,7 @@ script_0800934E:
SetPlayerIdle
Call DisablePauseMenuAndPutAwayItems
Call sub_0806D638
_0807F0B4 0x0001
SetScrollSpeed 1
CameraTargetEntity
CheckGlobalFlag GAMECLEAR
JumpIf script_BigGoronTalk
@@ -18,10 +18,10 @@ script_0800934E:
script_08009376:
WaitUntilTextboxCloses
Call sub_0806D640
_0807F0B4 0x0001
SetScrollSpeed 1
CameraTargetPlayer
Wait 0x002d
_0807F0B4 0x0004
SetScrollSpeed 4
EnablePlayerControl
Call EnablePauseMenu
Jump script_0800934E
include/beanstalkSubtask.h
+6
View File
@@ -18,4 +18,10 @@ typedef struct {
u16 tileIndex;
} struct_080B44D0;
typedef struct {
u32 src;
void* dest;
u32 size;
} struct_08109194;
#endif // BEANSTALKSUBTASK_H
include/color.h
+1 -1
View File
@@ -7,7 +7,7 @@ typedef struct {
u8 _0_0 : 4;
u8 _0_4 : 4;
u8 _1;
u16 _2;
u16 objPaletteId;
} Palette;
extern Palette gPaletteList[0x10];
include/common.h
+1 -18
View File
@@ -17,24 +17,7 @@ typedef struct {
} Input;
extern Input gInput; /**< Input instance. */
typedef struct {
u8 evt_type;
u8 entity_idx;
u8 area;
u8 room;
u16 _4;
u16 _6;
u16 x;
u16 y;
u16 _c;
u16 _e;
u8 _10;
u8 _11;
u16 flag;
} struct_080FE320;
extern struct_080FE320 gUnk_080FE320[];
void LoadPalettes(const u8*, s32, s32);
void LoadPalettes(const u8* src, s32 destPaletteNum, s32 numPalettes);
/**
* Loads a packed group of palettes.
include/cutscene.h
+23
View File
@@ -0,0 +1,23 @@
#ifndef CUTSCENE_H
#define CUTSCENE_H
#include "room.h"
typedef struct {
const EntityData* entityData;
u8 area;
u8 room;
s8 scrollX;
s8 scrollY;
} struct_080FCF04;
typedef struct {
const EntityData* entityData1;
const EntityData* entityData2;
u8 area;
u8 room;
s8 scrollX;
s8 scrollY;
} struct_080FCFB8;
#endif // CUTSCENE_H
include/enemyUtils.h
+11
View File
@@ -0,0 +1,11 @@
#ifndef ENEMYUTILS_H
#define ENEMYUTILS_H
#include "global.h"
typedef struct {
u8 unk_0;
u8 unk_1;
} PACKED struct_080D3D94;
#endif // ENEMYUTILS_H
include/enterPortalSubtask.h
+11
View File
@@ -0,0 +1,11 @@
#ifndef ENTERPORTALSUBTASK_H
#define ENTERPORTALSUBTASK_H
#include "global.h"
typedef struct {
u8 paletteGroup;
u8 gfxGroup;
} PACKED struct_080D4138;
#endif // ENTERPORTALSUBTASK_H
include/entity.h
+5 -1
View File
@@ -254,7 +254,7 @@ void InitAnimationForceUpdate(Entity* entity, u32 animIndex);
void UpdateAnimationSingleFrame(Entity* entity);
void UpdateSpriteForCollisionLayer(Entity* entity);
void GetNextFrame(Entity* entity);
u32 LoadExtraSpriteData(Entity* entity, const SpriteLoadData* spriteData);
bool32 LoadExtraSpriteData(Entity* entity, const SpriteLoadData* spriteData);
void SetExtraSpriteFrame(Entity*, u32, u32);
void SetSpriteSubEntryOffsetData1(Entity*, u32, u32);
void SetSpriteSubEntryOffsetData2(Entity*, u32, u32);
@@ -549,5 +549,9 @@ extern u8 gManagerCount;
#define Direction8FromAnimationState(expr) ((expr) << 2)
///@}
extern void DeleteAllEntities(void);
#endif // ENTITY_H
// clang-format on
include/figurineMenu.h
+32
View File
@@ -0,0 +1,32 @@
#ifndef FIGURINEMENU_H
#define FIGURINEMENU_H
#include "global.h"
typedef struct {
u8 paletteGroup;
u8 gfxGroup;
u16 unk2;
u16 bg1Control;
u16 bg2Control;
} struct_08128AD8;
enum enum_080FC3E4 {
// CheckLocalFlagByBank
UNK_6_8 = 8,
UNK_6_40 = 0x40, // 64
// CheckKinstoneFused
UNK_6_10 = 0x10, // 16
// CheckKinstoneFused multiple with unk_4 as index
UNK_6_20 = 0x20, // 32
};
typedef struct {
u32 bank;
u16 flag;
u8 unk_6; /**< @see enum_080FC3E4 */
u8 type; /**< Type of the OBJECT_A2 that is spawned. */
} struct_080FC3E4;
extern const struct_080FC3E4 gUnk_080FC3E4[];
#endif // FIGURINEMENU_H
include/fileselect.h
+1 -2
View File
@@ -52,7 +52,7 @@ extern struct_02019EE0 gMapDataBottomSpecial;
// TODO size: 0x8000 from ClearTilemaps?
extern void sub_08056FEC(u32, struct_020227E8*);
extern u32 sub_0805F46C(u32, const Font*);
extern u32 ShowTextBox(u32 textIndexOrPtr, const Font* font);
extern void ClearTilemaps(void);
extern void ResetSaveFile(u32);
extern WStruct* sub_0805F2C8(void);
@@ -67,7 +67,6 @@ extern const Font gUnk_080FC844;
extern const u16 gUnk_080FC85C[][3];
extern void (*const gUnk_080FC908[])(void);
extern const u8 gGlobalGfxAndPalettes[];
extern void (*const gUnk_080FC93C[])();
extern u32 gUsedPalettes;
extern u8 gTextGfxBuffer[];
extern u8 gUnk_02022030;
include/functions.h
+5 -3
View File
@@ -21,12 +21,12 @@ extern void CreateItemOnGround(Entity*);
extern void CreateMagicSparkles(u32, u32, u32);
extern void CreateMinishEntrance(u32 tile);
extern u32 CreateRandomItemDrop(Entity*, u32);
extern void DrawDirect(u32, u32);
extern void DrawDirect(u32 spriteIndex, u32 frameIndex);
extern void DrawEntities(void);
extern bool32 EntityWithinDistance(Entity*, s32, s32, s32);
extern void FlushSprites(void);
extern LayerStruct* GetLayerByIndex(u32);
extern u32 GetTileIndex(u32, u32);
extern u32 GetTileIndex(u32 tilePos, u32 layer);
extern u32 GiveItem(u32, u32);
extern bool32 LoadFixedGFX(Entity*, u32);
extern void LoadResources(void);
@@ -45,6 +45,8 @@ extern void TryLoadPrologueHyruleTown(void);
extern void UnloadGFXSlots(Entity*);
extern void UnloadOBJPalette(Entity*);
extern void UpdateDisplayControls(void);
extern void ClearBgAnimations(void);
extern void SetBGDefaults(void);
// Unidentified
extern void sub_08000148(u32, u32, u32);
@@ -90,7 +92,7 @@ extern void sub_08057688(void);
extern void sub_080580B0(u32);
extern void sub_08058324(u32);
extern void sub_08059278(void);
extern void sub_0805B4D0(u32);
extern void LoadStaticBackground(u32);
extern void sub_0805BC4C(void);
extern void sub_0805EC60(Entity*);
extern void InitPlayerMacro(PlayerMacroEntry*);
include/game.h
+61 -1
View File
@@ -3,6 +3,7 @@
#include "global.h"
#include "area.h"
#include "structures.h"
/**
* Change the light level of the room.
@@ -83,7 +84,10 @@ u32 AreaAllowsWarp(void);
void sub_08052878(void);
#endif
void sub_080526F8(s32 a1);
/**
* Modify the number of keys the player has for the current dungeon.
*/
void ModDungeonKeys(s32 keys);
/**
* Check if the current dungeon has a map item.
@@ -295,4 +299,60 @@ typedef struct {
} struct_08127F94;
extern struct_08127F94 gUnk_08127F94[];
typedef struct {
const Font* font;
u16 width;
u16 height;
u16 transitionTimer;
u16 fadeSpeed;
} struct_080FCCB4;
typedef struct {
u16 itemPrice;
u16 unused;
u16 saleItemConfirmMessageId;
u16 gotItemMessageId;
} struct_080FD964;
extern const struct_080FD964 gUnk_080FD964[];
// Defined in gameUtils.c
extern void ResetTmpFlags(void);
extern void UpdateFakeScroll(void);
extern void UpdatePlayerMapCoords(void);
extern void CreateMiscManager(void);
extern void CheckAreaDiscovery(void);
extern void UpdateTimerCallbacks(void);
extern void DecreasePortalTimer(void);
extern bool32 CheckRoomExit(void);
extern bool32 CheckGameOver(void);
extern void InitializePlayer(void);
extern void LoadRoomBgm(void);
extern void sub_0805329C(void);
extern void UpdatePlayerRoomStatus(void);
extern void sub_08054524(void);
extern void sub_08052FF4(u32 area, u32 room);
extern void InitScriptData(void);
extern void LoadItemGfx(void);
// Defined in playerUtils.c
extern void CloneMapData(void);
extern void InitializeCamera(void);
extern void ForceSetPlayerState(u32);
extern void sub_080186D4(void);
extern void sub_0806F364(void);
extern void UpdateRoomTracker(void);
extern void GenerateAreaHint(void);
extern void sub_0801AE44(bool32 loadGfx);
extern void sub_080ADE24(void);
extern void CleanUpGFXSlots(void);
void sub_08051F9C(u32 a1, u32 a2, u32 a3, u32 a4);
extern void UpdateBgAnimations(void);
extern void UpdateScroll(void);
extern void sub_08018710(u32);
extern void sub_0806F38C(void);
extern void sub_08052010(void);
void ModArrows(s32);
bool32 ItemIsBottle(u32);
void ModShells(s32);
#endif // GAME_H
include/global.h
+9 -1
View File
@@ -4,6 +4,9 @@
/**
* @defgroup Tasks Tasks
* @defgroup Subtasks Subtasks
* @brief Subtasks override the game task for short periods.
* @defgroup WorldEvents World Events
* @brief Cutscenes that happen after a kinstone fusion.
*/
/**
@@ -18,7 +21,7 @@
* @defgroup NPCs NPCs
* @defgroup Items Items
* @defgroup Managers Managers
* @brief Entities with a smaller footprint of 0x40 bytes
* @brief Entities with a smaller footprint of 0x40 bytes.
*/
///@}
@@ -99,6 +102,11 @@ typedef union {
} HALF;
} Coords;
typedef struct {
s8 x;
s8 y;
} PACKED Coords8;
union SplitWord {
s32 WORD;
u32 WORD_U;
include/hitbox.h
+13 -19
View File
@@ -22,40 +22,36 @@ extern const Hitbox gHitbox_15;
extern const Hitbox gHitbox_16;
extern const Hitbox gHitbox_17;
extern const Hitbox gHitbox_18;
extern const Hitbox gHitbox_19;
extern const Hitbox3D gHitbox_19;
extern const Hitbox gHitbox_20;
extern const Hitbox gHitbox_21;
extern const Hitbox gHitbox_22;
extern const Hitbox gHitbox_23;
extern const Hitbox gHitbox_24;
extern const Hitbox gHitbox_25;
extern const Hitbox gHitbox_26;
extern const Hitbox3D gHitbox_25;
extern const Hitbox3D gHitbox_26;
extern const Hitbox gHitbox_27;
extern const Hitbox gHitbox_28;
extern const Hitbox3D gHitbox_28;
extern const Hitbox gHitbox_29;
extern const Hitbox gHitbox_30;
extern const Hitbox gHitbox_31;
extern const Hitbox gHitbox_32;
extern const Hitbox gUnk_080FD178;
extern const Hitbox gUnk_080FD190;
extern const Hitbox gUnk_080FD1A8;
extern const Hitbox gUnk_080FD1A8;
extern const Hitbox gUnk_080FD1A8;
extern const Hitbox gUnk_080FD1A8;
extern const Hitbox3D gUnk_080FD1A8;
extern const Hitbox gUnk_080FD1B4;
extern const Hitbox gUnk_080FD1D4;
extern const Hitbox gUnk_080FD1DC;
extern const Hitbox gUnk_080FD1E4;
extern const Hitbox gUnk_080FD1E4;
extern const Hitbox gUnk_080FD1EC;
extern const Hitbox gUnk_080FD1F4;
extern const Hitbox gUnk_080FD1F4;
extern const Hitbox gUnk_080FD1FC;
extern const Hitbox gUnk_080FD204;
extern const Hitbox gUnk_080FD20C;
extern const Hitbox gUnk_080FD214;
extern const Hitbox gUnk_080FD21C;
extern const Hitbox gUnk_080FD224;
extern const Hitbox gUnk_080FD22C;
extern const Hitbox3D gUnk_080FD22C;
extern const Hitbox gUnk_080FD238;
extern const Hitbox gUnk_080FD240;
extern const Hitbox gUnk_080FD248;
@@ -64,6 +60,7 @@ extern const Hitbox gUnk_080FD260;
extern const Hitbox gUnk_080FD270;
extern const Hitbox gUnk_080FD278;
extern const Hitbox gUnk_080FD280;
extern const Hitbox gUnk_080FD288;
extern const Hitbox gUnk_080FD290;
extern const Hitbox gUnk_080FD298;
extern const Hitbox gUnk_080FD2A0;
@@ -71,21 +68,19 @@ extern const Hitbox gUnk_080FD2A8;
extern const Hitbox gUnk_080FD2D0;
extern const Hitbox gUnk_080FD2D8;
extern const Hitbox gUnk_080FD2E0;
extern const Hitbox gUnk_080FD2E8;
extern const Hitbox gUnk_080FD2F0;
extern const Hitbox gUnk_080FD308;
extern const Hitbox gUnk_080FD310;
extern const Hitbox gUnk_080FD320;
extern const Hitbox gUnk_080FD328;
extern const Hitbox gUnk_080FD330;
extern const Hitbox gUnk_080FD340;
extern const Hitbox gUnk_080FD340;
extern const Hitbox3D gUnk_080FD340;
extern const Hitbox gUnk_080FD34C;
extern const Hitbox gUnk_080FD354;
extern const Hitbox gUnk_080FD35C;
extern const Hitbox gUnk_080FD35C;
extern const Hitbox gUnk_080FD364;
extern const Hitbox gUnk_080FD36C;
extern const Hitbox gUnk_080FD36C;
extern const Hitbox gUnk_080FD374;
extern const Hitbox gUnk_080FD37C;
extern const Hitbox gUnk_080FD384;
@@ -102,13 +97,13 @@ extern const Hitbox gUnk_080FD3DC;
extern const Hitbox gUnk_080FD3E4;
extern const Hitbox gUnk_080FD3EC;
extern const Hitbox gUnk_080FD3F4;
extern const Hitbox gUnk_080FD3FC;
extern const Hitbox3D gUnk_080FD3FC;
extern const Hitbox gUnk_080FD408;
extern const Hitbox gUnk_080FD41C;
extern const Hitbox gUnk_080FD424;
extern const Hitbox gUnk_080FD42C;
extern const Hitbox gUnk_080FD434;
extern const Hitbox gUnk_080FD43C;
extern const Hitbox3D gUnk_080FD43C;
extern const Hitbox gUnk_080FD450;
extern const Hitbox gUnk_080FD488;
extern const Hitbox gUnk_080FD490;
@@ -127,8 +122,7 @@ extern const Hitbox gUnk_080FD510;
extern const Hitbox gUnk_080FD518;
extern const Hitbox gUnk_080FD520;
extern const Hitbox gUnk_080FD530;
extern const Hitbox gUnk_080FD538;
extern const Hitbox gUnk_080FD538;
extern const Hitbox3D gUnk_080FD538;
extern const Hitbox gUnk_080FD544;
extern const Hitbox gUnk_080FD558;
extern const Hitbox gUnk_080FD560;
include/itemMetaData.h
+1 -1
View File
@@ -28,7 +28,7 @@ typedef enum {
typedef struct ItemMetaData {
u8 menuSlot;
u8 unk1;
u8 unk2;
u8 unk2; // parameter? number of bombs, type of dungeon item
u8 unk3; // flags? bit 0x2 makes pickup cutscene appear every time
u8 textId;
u8 textCategory;
include/kinstone.h
+84 -8
View File
@@ -10,7 +10,7 @@ typedef struct {
u8 _0;
u8 action;
u8 _2;
u8 _3;
u8 kinstoneId;
u8 prevUpdatePriority;
u8 _5;
u16 textIndex;
@@ -22,16 +22,17 @@ static_assert(sizeof(FuseInfo) == 0x10);
extern FuseInfo gFuseInfo;
typedef struct {
u8 unk0;
u8 objPalette;
u8 unk1;
u8 unk2;
u8 unk3;
u8 evt_type;
u8 subtask; // SUBTASK_WORLDEVENT or 0
u8 worldEventId;
u8 unk5;
u8 unk6;
u8 unk7;
} struct_080C9CBC;
extern const struct_080C9CBC gUnk_080C9CBC[];
u8 unk7; // TODO flag if it shows a map hint?
} KinstoneWorldEvent;
// Indexed by kinstoneId
extern const KinstoneWorldEvent gKinstoneWorldEvents[];
typedef enum {
KINSTONE_0,
@@ -130,7 +131,7 @@ typedef enum {
KINSTONE_5D,
KINSTONE_5E,
KINSTONE_5F,
} KinstoneFlag;
} KinstoneId;
typedef struct {
u8 unk0; /**< Bank or 0xfd or 0xfe or 0xff */
@@ -139,4 +140,79 @@ typedef struct {
u8 unk3; /**< Offset on the gfx id? */
} struct_gUnk_080B3D20;
enum {
WORLD_EVENT_0,
WORLD_EVENT_1,
WORLD_EVENT_2,
WORLD_EVENT_3,
WORLD_EVENT_4,
WORLD_EVENT_5,
// TODO add all and use them in gKinstoneWorldEvents
} worldEventId;
enum {
CND_0,
/**< Always false. */ // CND_FALSE
CND_1, // local flag // CND_FLAG
CND_2, // f CND_INVENTORY != 0
CND_3, // 0x10 CND_INVENTORY == 1
CND_4, // 0x11 CND_INVENTORY == 2
CND_5, // SORA_10_H00
CND_6, // SORA_11_H00
CND_7, // SORA_12_T00
CND_8, // SORA_13_H00
CND_9, // SORA_14_T00
CND_10, // KS_B15
} WorldEvent_Condition;
enum {
WORLD_EVENT_TYPE_0, // Does nothing
WORLD_EVENT_TYPE_1, // LoadRoomEntity after checking GlobalFlag
WORLD_EVENT_TYPE_2, // sub_08018BB4
WORLD_EVENT_TYPE_3, // LoadRoomEntity after checking InventoryValue
WORLD_EVENT_TYPE_4, // sub_08018A58
WORLD_EVENT_TYPE_5, // sub_08018B50
WORLD_EVENT_TYPE_6, // sub_08018AB4
WORLD_EVENT_TYPE_7, // LoadRoomEntity or sub_080189EC
WORLD_EVENT_TYPE_8, // set a tile type
WORLD_EVENT_TYPE_9, // LoadRoomEntity and set some tile type
WORLD_EVENT_TYPE_BEANSTALK,
WORLD_EVENT_TYPE_11, // LoadRoomEntity and set gRoomVars.field_0x8c
WORLD_EVENT_TYPE_12,
WORLD_EVENT_TYPE_13,
WORLD_EVENT_TYPE_14,
WORLD_EVENT_TYPE_15, // Load different room entity depending on if fused
WORLD_EVENT_TYPE_16,
WORLD_EVENT_TYPE_17, // Set local flag, LoadroomEntityList
WORLD_EVENT_TYPE_18,
WORLD_EVENT_TYPE_19,
WORLD_EVENT_TYPE_20,
WORLD_EVENT_TYPE_21,
WORLD_EVENT_TYPE_22,
WORLD_EVENT_TYPE_23,
WORLD_EVENT_TYPE_24, // LoadRoomEntityList
WORLD_EVENT_TYPE_25, // LoadRoomEntity, set type depending of if kinstone is fused
// The following do nothing.
WORLD_EVENT_TYPE_26,
WORLD_EVENT_TYPE_27,
WORLD_EVENT_TYPE_28
} WorldEventType;
typedef struct {
u8 type;
u8 entity_idx;
u8 area;
u8 room;
u16 offsetX; /**< Scroll offset X from the room origin. */
u16 offsetY; /**< Scroll offset Y from the room origin. */
u16 x; /**< X position of the actual event. */
u16 y; /**< Y position of the actual event. */
u16 _c; // see sub_080A6A80, related to _0 and _2 of gUnk_08127F94
u16 _e; // see sub_080A6A80, related to _1 and _3 of gUnk_08127F94
u8 condition; // TODO some sort of flag determining what type the bank&flag are? see sub_0801E8D4
u8 bank; /**< @see LocalBanks */
u16 flag;
} WorldEvent;
extern const WorldEvent gWorldEvents[];
#endif // KINSTONE_H
include/menu.h
+2
View File
@@ -126,4 +126,6 @@ extern Menu gMenu;
#define gFigurineMenu (*(FigurineMenu*)&gMenu)
#define gPauseMenu (*(PauseMenu*)&gMenu)
extern u8 gUpdateVisibleTiles;
#endif // MENU_H
include/pauseMenu.h
+43
View File
@@ -0,0 +1,43 @@
#ifndef PAUSEMENU_H
#define PAUSEMENU_H
#include "subtask.h"
Subtask PauseMenu_Variant0;
Subtask PauseMenu_Variant1;
Subtask PauseMenu_Variant2;
Subtask PauseMenu_Variant3;
Subtask PauseMenu_Variant4;
Subtask PauseMenu_Variant5;
Subtask PauseMenu_ItemMenu;
Subtask PauseMenu_ItemMenu_Draw;
Subtask PauseMenu_ItemMenu_Init;
Subtask PauseMenu_ItemMenu_Update;
Subtask PauseMenu2;
typedef enum {
PauseMenuScreen_0,
PauseMenuScreen_1, // Items
PauseMenuScreen_2, // Quest Status
PauseMenuScreen_3,
PauseMenuScreen_4, // Map
PauseMenuScreen_5,
PauseMenuScreen_6, // Map Detail
PauseMenuScreen_7, // Kinstone Pieces
PauseMenuScreen_8, // Sword Techniques
PauseMenuScreen_9,
PauseMenuScreen_10,
PauseMenuScreen_11,
PauseMenuScreen_12,
PauseMenuScreen_13,
PauseMenuScreen_14,
PauseMenuScreen_15,
PauseMenuScreen_16,
PauseMenuScreen_17,
PauseMenuScreen_18,
PauseMenuScreen_19,
} PauseMenuScreen;
#endif // PAUSEMENU_H
include/player.h
+4 -4
View File
@@ -398,9 +398,9 @@ typedef struct {
extern void (*const gPlayerItemFunctions[])(Entity*);
extern u8 gBombBagSizes[];
extern u8 gQuiverSizes[];
extern u16 gWalletSizes[];
extern const s16 gWalletSizes[];
extern const u8 gBombBagSizes[];
extern const u8 gQuiverSizes[];
extern Entity* gPlayerClones[];
extern PlayerState gPlayerState;
@@ -541,7 +541,7 @@ extern void sub_08008AC6(Entity*);
extern void sub_08008AA0(Entity*);
// zelda.c
void SetZeldaFollowTarget(Entity*);
void SetZeldaFollowTarget(Entity* target);
#define COPY_FLAG_FROM_TO(base, src, dest) (base) = ((base) & ~(dest)) | (((dest) * ((base) & (src))) / src)
include/room.h
+13 -9
View File
@@ -25,30 +25,33 @@ enum RoomReloadType {
typedef struct {
/*0x00*/ u16 reload_flags;
/*0x02*/ u8 unk3;
/*0x03*/ u8 unk4;
/*0x02*/ u8 scrollAction;
/*0x03*/ u8 scrollSubAction;
/*0x04*/ u8 area;
/*0x05*/ u8 room;
/*0x06*/ u16 origin_x;
/*0x08*/ u16 origin_y;
/*0x0A*/ s16 scroll_x;
/*0x0C*/ s16 scroll_y;
/*0x0E*/ u8 unk5;
/*0x0E*/ u8 scrollSpeed; /**< Pixels per frame that the camera can scroll. */
/*0x0F*/ u8 scroll_flags; // 0x2 = ??, 0x4 = camera scrolling
/*0x10*/ u8 scroll_direction;
/*0x11*/ s8 oam_offset_x;
/*0x12*/ s8 oam_offset_y;
/*0x13*/ u8 unk13;
/*0x13*/ u8 unk_13;
/*0x14*/ u8 shake_magnitude;
/*0x15*/ u8 unk7;
/*0x15*/ u8 unk_15;
/*0x16*/ u16 shake_duration;
/*0x18*/ u16 filler2[3];
/*0x18*/ u16 unk_18; // progress during transition in same area?
/*0x1A*/ u16 unk_1a; // calculated from unk_18
/*0x1C*/ u16 unk_1c; // 0, 0xff
/*0x1E*/ u16 width;
/*0x20*/ u16 height;
/*0x22*/ u16 filler3;
/*0x22*/ u16 unk_22; // so far always 0xffff
/*0x24*/ s8 aff_x;
/*0x25*/ s8 aff_y;
/*0x26*/ u8 filler26[2];
/*0x26*/ u8 unk_26;
/*0x27*/ u8 unk_27;
/*0x28*/ union SplitWord bg3OffsetX;
/*0x2C*/ union SplitWord bg3OffsetY;
/*0x30*/ Entity* camera_target;
@@ -220,7 +223,7 @@ typedef enum {
extern void** gCurrentRoomProperties;
void SetTileType(u32, u32, u32);
void SetTileType(u32 tileType, u32 position, u32 layer);
void InitScreenShake(u32 time, u32 magnitude);
void CallRoomProp5And7(void);
@@ -230,6 +233,7 @@ void* GetCurrentRoomProperty(u32);
void LoadRoomTileEntities();
Entity* LoadRoomEntity(const EntityData*);
void LoadRoomEntityList(const EntityData* listPtr);
void* GetRoomProperty(u32 area, u32 room, u32 property);
bool32 LoadFixedGFX(Entity*, u32);
void UnloadGFXSlots(Entity*);
include/save.h
+13 -13
View File
@@ -39,7 +39,7 @@ typedef struct {
/*0x003*/ u8 brightness; /**< Brightness. */
/*0x004*/ u8 filler4[0x2];
/*0x006*/ u8 saw_staffroll;
/*0x007*/ u8 unk7;
/*0x007*/ u8 unk7; // TODO rolling barrel state?
/*0x008*/ u8 global_progress; /**< @see UpdateGlobalProgress */
/*0x009*/ u8 field_0x9[0x17];
/*0x020*/ u16 field_0x20;
@@ -55,19 +55,19 @@ typedef struct {
/*0x088*/ PlayerRoomStatus saved_status; /**< Player room status. */
/*0x0A8*/ Stats stats; /**< Player stats. */
/*0x0D0*/ u8 fillerD0[34];
u8 inventory[36];
/*0x0F2*/ u8 inventory[36];
/*0x116*/ u8 didAllFusions;
/*0x117*/ u8 unk117;
/*0x118*/ u8 unk118[0x13];
/*0x12B*/ u8 unk12B[0x16];
/*0x141*/ u8 unk141[128];
/*0x1C1*/ u8 unk1C1[128];
/*0x241*/ u8 unk241[13];
/*0x24E*/ u8 unk24E[14];
/*0x25C*/ u8 flags[0x200]; /**< Flags. */
/*0x45C*/ u8 unk45C[0x10];
/*0x46C*/ u8 unk46C[0x10];
/*0x46C*/ u8 unk47C[0x10];
/*0x117*/ u8 fusedKinstoneCount;
/*0x118*/ u8 unk118[0x13]; // TODO also related to kinstones
/*0x12B*/ u8 unk12B[0x16]; // TODO also related to kinstones
/*0x141*/ u8 unk141[128]; // TODO sub_08064F28 and also the goddesses, indexed by sub_08002632
/*0x1C1*/ u8 unk1C1[128]; // TODO also related to kinstones, see sub_0801E6C8 0x80 available kinstone fusions?
/*0x241*/ u8 fusedKinstones[13]; /**< Bitfield for fused kinstones. @see CheckKinstoneFused */
/*0x24E*/ u8 unk24E[14]; // TODO something else with kinstones @see sub_0801E810
/*0x25C*/ u8 flags[0x200]; /**< Flags. */
/*0x45C*/ u8 dungeonKeys[0x10]; // TODO Indexed by dungeon id, keys per dungeon
/*0x46C*/ u8 dungeonItems[0x10]; // TODO items in the dungeon. 4: compass, 2: big key, 1: small key
/*0x46C*/ u8 dungeonWarps[0x10]; // TODO indexed by dungeon id, EnableDungeonWarp, IsDungeonWarpActive
/*0x48C*/ u32 timers[7];
/*0x4A8*/ u32 demo_timer; /**< Demo timer. */
/*0x4AC*/ u8 filler4ac[0x8];
include/script.h
+8 -5
View File
@@ -11,8 +11,10 @@ enum SetMessageValueIndex {
SMV_FIELD_0X1C,
};
typedef u16 Script;
typedef struct ScriptExecutionContext {
/*0x00*/ u16* scriptInstructionPointer;
/*0x00*/ Script* scriptInstructionPointer;
/*0x04*/ u32 intVariable;
/*0x08*/ u32 postScriptActions;
/*0x0C*/ u8 unk_0C[0x4]; // unused
@@ -47,18 +49,19 @@ extern u32 GetNextScriptCommandWordAfterCommandMetadata(u16*);
extern u32 GetNextScriptCommandHalfwordAfterCommandMetadata(u16*);
void UnloadCutsceneData(Entity* entity);
void StartPlayerScript(u16*);
void StartPlayerScript(Script* script);
void sub_0807DD50(Entity* entity);
void sub_0807DD64(Entity* entity);
void sub_0807DD80(Entity* entity, u16* script);
void sub_0807DD80(Entity* entity, Script* script);
void sub_0807DEDC(Entity*, ScriptExecutionContext*, u32, u32);
ScriptExecutionContext* StartCutscene(Entity* entity, u16* script);
ScriptExecutionContext* StartCutscene(Entity* entity, Script* script);
void ExecuteScriptForEntity(Entity* entity, void (*postScriptCallback)(Entity*, ScriptExecutionContext*));
void HandlePostScriptActions(Entity* entity, ScriptExecutionContext* context);
void HandleEntity0x82Actions(Entity* entity);
void sub_0807DD94(Entity*, void (*function)(Entity*, ScriptExecutionContext*));
ScriptExecutionContext* CreateScriptExecutionContext(void);
void InitScriptForEntity(Entity* entity, ScriptExecutionContext* context, u16* script);
void InitScriptForEntity(Entity* entity, ScriptExecutionContext* context, Script* script);
#endif // SCRIPT_H
include/structures.h
+22 -9
View File
@@ -106,9 +106,9 @@ typedef struct {
u8 unk_c;
u8 unk_d;
u16 rupees;
u8 unk_10;
u8 unk_10; // TODO drawing keys dirty flag or something?
u8 unk_11;
u8 unk_12;
u8 dungeonKeys;
s8 unk_13;
s8 unk_14;
u8 unk_15;
@@ -200,19 +200,21 @@ typedef struct {
} PriorityHandler;
extern PriorityHandler gPriorityHandler;
extern struct {
typedef struct {
u8 disabled;
u8 unk1;
u8 unk2[0xf];
u8 screen;
u8 unk2[0xf]; // cursor positions on the different screens
u8 unk11;
u8 unk12;
u8 unk13;
s8 unk14;
s8 screen2;
u8 unk15;
s8 unk16;
u8 unk17;
} gPauseMenuOptions;
static_assert(sizeof(gPauseMenuOptions) == 0x18);
} PauseMenuOptions;
extern PauseMenuOptions gPauseMenuOptions;
static_assert(sizeof(PauseMenuOptions) == 0x18);
typedef struct {
u8 unk00 : 1;
@@ -268,7 +270,7 @@ typedef struct {
typedef struct {
/*0x00*/ u8 unk_0;
/*0x01*/ u8 unk_1;
/*0x02*/ u8 unk_2;
/*0x02*/ u8 unk_2; // TODO kinstoneId, sub_0801DFB4
/*0x03*/ u8 unk_3;
/*0x04*/ u8* unk_4;
/*0x08*/ struct_03003DF8 array[0x20];
@@ -345,4 +347,15 @@ typedef struct {
static_assert(sizeof(ItemDefinition) == 0xc);
typedef struct {
u8 frame;
u8 frameIndex;
} PACKED FrameStruct;
typedef struct {
s8 x;
s8 y;
s8 width;
s8 height;
} Rect;
#endif // STRUCTURES_H
include/subtask.h
+68 -2
View File
@@ -2,6 +2,8 @@
#define SUBTASK_H
#include "global.h"
#include "game.h"
#include "room.h"
/** Subtasks override the game task for short periods */
typedef enum {
@@ -44,11 +46,75 @@ extern void sub_080A4D34(void);
extern void sub_080A4E90(u8);
extern void sub_080A4E84(u8);
extern const struct {
typedef struct {
u8 unk0;
u8 unk1;
// u8 pad[2];
void (*func)(void);
} gUnk_08128A38[];
} struct_08128A38;
extern const struct_08128A38 gUnk_08128A38[];
typedef struct {
u8 item;
u8 unk1;
u8 frameIndex;
u8 unk3;
u8 unk4;
s8 unk5;
u16 textIndex;
} struct_gUnk_08128D70;
extern const struct_gUnk_08128D70 gUnk_08128D70[];
typedef struct {
u8 frameIndex;
u8 unk1;
u8 unk2;
u8 unk3;
u16 unk4;
u16 unk6;
} struct_gUnk_08128F58;
extern struct_gUnk_08128F58 gUnk_08128F58[];
// Functions used in world events.
extern void sub_08055B70(u32 param_1, u32 param_2, u32 param_3, u32 param_4);
extern void sub_0801876C(u32, u32);
extern void sub_080553E0(u32);
extern void sub_08054974(u32, u32);
extern void sub_0804B0E8(u32, u32);
// Functions used in subtasks.
void sub_080A4DB8(u32);
void sub_080A6290(void);
void sub_080A66D0();
void sub_080A67C4(u32);
void sub_080A6FB4(u32, u32);
void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4);
u32 sub_080A6F40();
s32 sub_080A69E0();
struct_08127F94* sub_080A6A80(u32 param_1, u32 param_2);
void sub_080A6498(void);
void sub_080A71F4(const ScreenTransitionData* exitTransition);
void sub_080A6F6C(u32 textIndexOrPtr);
typedef struct {
u8 unk0;
u8 unk1;
u8 unk2;
u8 unk3;
u8 unk4;
s8 unk5;
u8 unk6;
u8 unk7;
} struct_gUnk_08128E94;
extern const struct_gUnk_08128E94 gUnk_08128E94[];
#ifdef EU
#define DRAW_DIRECT_SPRITE_INDEX 0x1fa
#else
#define DRAW_DIRECT_SPRITE_INDEX 0x1fb
#endif
#endif // SUBTASK_H
include/subtask2.h
+12
View File
@@ -0,0 +1,12 @@
#ifndef SUBTASK2_H
#define SUBTASK2_H
void PauseMenu_Screen_4(void);
void PauseMenu_Screen_5(void);
void PauseMenu_Screen_6(void);
void PauseMenu_Screen_7(void);
void PauseMenu_Screen_8(void);
void PauseMenu_Screen_9(void);
void PauseMenu_Screen_10(void);
#endif // SUBTASK2_H
linker.ld
+104 -33
View File
@@ -73,7 +73,7 @@ SECTIONS {
. = 0x00024030; gMessageChoices = .;
. = 0x00024048; gUnk_02024048 = .;
. = 0x00024050; gRoomMemory = .;
. = 0x00024090; gUnk_02024090 = .;
. = 0x00024090; gPaletteBufferBackup = .;
. = 0x00024490; gGFXSlots = .;
. = 0x000246B0; gUnk_020246B0 = .;
. = 0x00025EB0; gMapBottom = .;
@@ -95,6 +95,7 @@ SECTIONS {
. = 0x00034CF0; gUnk_02034CF0 = .;
. = 0x00034D30; gUnk_02034D30 = .;
. = 0x00034DF0; gUnk_02034DF0 = .;
. = 0x00034E4E; gUnk_02034E4E = .;
. = 0x0003508E; gUnk_0203508E = .;
. = 0x000350E2; gUnk_020350E2 = .;
. = 0x000350F0; gUnk_020350F0 = .;
@@ -405,9 +406,38 @@ SECTIONS {
src/fade.o(.text);
src/fileselect.o(.text);
src/game.o(.text);
src/subtask/subtaskAuxCutscene.o(.text);
src/gameOverTask.o(.text);
src/gameUtils.o(.text);
src/cutscene.o(.text);
src/itemUtils.o(.text);
src/subtask/subtaskWorldEvent.o(.text);
src/playerItem/playerItemLantern.o(.text);
src/subtask.o(.text);
src/sub_08055E08.o(.text);
src/worldEvent/worldEvent4.o(.text);
src/worldEvent/worldEvent3.o(.text);
src/worldEvent/worldEvent19.o(.text);
src/worldEvent/worldEvent1.o(.text);
src/worldEvent/worldEvent17.o(.text);
src/worldEvent/worldEvent16.o(.text);
src/worldEvent/worldEvent13.o(.text);
src/worldEvent/worldEvent14.o(.text);
src/worldEvent/worldEvent5.o(.text);
src/worldEvent/worldEvent6.o(.text);
src/worldEvent/worldEvent8.o(.text);
src/worldEvent/worldEvent11.o(.text);
src/worldEvent/worldEvent10.o(.text);
src/worldEvent/worldEvent21.o(.text);
src/worldEvent/worldEvent15.o(.text);
src/worldEvent/worldEvent23.o(.text);
src/worldEvent/worldEvent12.o(.text);
src/worldEvent/worldEvent20.o(.text);
src/worldEvent/worldEvent2.o(.text);
src/worldEvent/worldEvent9.o(.text);
src/worldEvent/worldEvent25.o(.text);
src/worldEvent/worldEvent7.o(.text);
src/worldEvent/worldEvent24.o(.text);
src/worldEvent/worldEvent0.o(.text);
src/worldEvent/worldEvent22.o(.text);
src/main.o(.text);
src/message.o(.text);
src/manager/lightRayManager.o(.text);
@@ -790,10 +820,14 @@ SECTIONS {
#endif
src/sound.o(.text);
src/staffroll.o(.text);
src/menu/kinstone_menu.o(.text);
src/menu/figurine_menu.o(.text);
src/menu/pause_menu.o(.text);
src/subtask2.o(.text);
src/menu/kinstoneMenu.o(.text);
src/menu/figurineMenu.o(.text);
src/menu/pauseMenu.o(.text);
src/subtask/subtaskMapHint.o(.text);
src/menu/pauseMenuScreen6.o(.text);
src/subtask/subtaskLocalMapHint.o(.text);
src/subtask/subtaskFastTravel.o(.text);
src/subtask.o(.text);
src/playerItem/playerItemSword.o(.text);
src/playerItemUtils.o(.text);
src/projectileUtils.o(.text);
@@ -862,7 +896,6 @@ SECTIONS {
src/kinstone.o(.rodata);
src/playerItem/playerItemGustBig.o(.rodata);
src/playerItem/playerItemBow.o(.rodata);
data/const/playerItem/playerItemBow.o(.rodata);
src/playerItem/playerItemSwordBeam.o(.rodata);
data/const/beanstalkSubtask.o(.rodata);
src/beanstalkSubtask.o(.rodata);
@@ -873,6 +906,7 @@ SECTIONS {
src/playerItem/playerItemBottle.o(.rodata);
data/const/playerItem/playerItemCellOverwriteSet.o(.rodata);
src/playerItem/playerItemCellOverwriteSet.o(.rodata);
data/const/collisionMatrix.o(.rodata);
data/const/ui.o(.rodata);
src/sineTable.o(.rodata);
data/const/common.o(.rodata);
@@ -1059,20 +1093,49 @@ SECTIONS {
src/enemy/treeItem.o(.rodata);
src/enemy/enemy66.o(.rodata);
src/enemy.o(.rodata);
data/const/enemyUtils.o(.rodata);
data/const/enterPortalSubtask.o(.rodata);
src/enemyUtils.o(.rodata);
src/enterPortalSubtask.o(.rodata);
data/map/entity_headers.o(.rodata);
data/const/fade.o(.rodata);
data/const/fileselect_before.o(.rodata);
src/fade.o(.rodata);
src/fileselect.o(.rodata);
data/const/fileselect_after.o(.rodata);
src/game.o(.rodata);
data/const/game.o(.rodata);
src/subtask/subtaskAuxCutscene.o(.rodata);
src/gameOverTask.o(.rodata);
src/gameUtils.o(.rodata);
src/cutscene.o(.rodata);
src/data/hitbox.o(.rodata);
src/itemUtils.o(.rodata);
src/subtask/subtaskWorldEvent.o(.rodata);
src/itemMetaData.o(.rodata);
data/animations/spriteAnimations322.o(.rodata);
src/gameData.o(.rodata);
data/const/game_2.o(.rodata);
src/playerItem/playerItemLantern.o(.rodata);
data/const/subtask.o(.rodata);
data/const/sub_08055E08.o(.rodata);
src/worldEvent/worldEvent4.o(.rodata);
src/worldEvent/worldEvent3.o(.rodata);
src/worldEvent/worldEvent19.o(.rodata);
src/worldEvent/worldEvent1.o(.rodata);
src/worldEvent/worldEvent17.o(.rodata);
src/worldEvent/worldEvent16.o(.rodata);
src/worldEvent/worldEvent13.o(.rodata);
src/worldEvent/worldEvent14.o(.rodata);
src/worldEvent/worldEvent5.o(.rodata);
src/worldEvent/worldEvent6.o(.rodata);
src/worldEvent/worldEvent8.o(.rodata);
src/worldEvent/worldEvent11.o(.rodata);
src/worldEvent/worldEvent10.o(.rodata);
src/worldEvent/worldEvent21.o(.rodata);
src/worldEvent/worldEvent15.o(.rodata);
src/worldEvent/worldEvent23.o(.rodata);
src/worldEvent/worldEvent12.o(.rodata);
src/worldEvent/worldEvent20.o(.rodata);
src/worldEvent/worldEvent2.o(.rodata);
src/worldEvent/worldEvent9.o(.rodata);
src/worldEvent/worldEvent25.o(.rodata);
src/worldEvent/worldEvent7.o(.rodata);
src/worldEvent/worldEvent24.o(.rodata);
src/worldEvent/worldEvent0.o(.rodata);
src/worldEvent/worldEvent22.o(.rodata);
data/gfx/palette_groups.o(.rodata);
data/gfx/gfx_groups.o(.rodata);
src/main.o(.rodata);
@@ -1121,8 +1184,10 @@ SECTIONS {
src/manager/repeatedSoundManager.o(.rodata);
src/manager/vaati3StartManager.o(.rodata);
src/manager/floatingPlatformManager.o(.rodata);
src/manager/enterRoomTextboxManager.o(.rodata);
data/const/manager/enterRoomTextboxManager.o(.rodata);
data/const/entity.o(.rodata);
src/entity.o(.rodata);
src/code_0805EC04.o(.rodata);
data/const/text.o(.rodata);
src/debug.o(.rodata);
@@ -1130,15 +1195,15 @@ SECTIONS {
data/animations/npc/gentari.o(.rodata);
src/npc/festari.o(.rodata);
data/animations/npc/festari.o(.rodata);
data/const/npc/forestMinish.o(.rodata);
src/npc/forestMinish.o(.rodata);
data/animations/npc/forestMinish.o(.rodata);
data/const/npc/postman.o(.rodata);
src/npc/postman.o(.rodata);
data/animations/npc/postman.o(.rodata);
src/npc/npc5.o(.rodata);
data/animations/npc/npc5.o(.rodata);
data/const/npc/townsperson.o(.rodata);
data/animations/npc/townsperson.o(.rodata);
data/const/npc/kid.o(.rodata);
src/npc/kid.o(.rodata);
data/animations/npc/kid.o(.rodata);
src/npc/npc9.o(.rodata);
data/animations/npc/npc9.o(.rodata);
@@ -1158,10 +1223,11 @@ SECTIONS {
data/animations/npc/beedle.o(.rodata);
src/npc/brocco.o(.rodata);
data/animations/npc/brocco.o(.rodata);
data/const/npc/sittingPerson.o(.rodata);
src/npc/sittingPerson.o(.rodata);
data/animations/npc/sittingPerson.o(.rodata);
src/npc/pina.o(.rodata);
data/animations/npc/pina.o(.rodata);
src/npc/guard.o(.rodata);
data/const/npc/guard.o(.rodata);
src/npc/guardWithSpear.o(.rodata);
data/animations/npc/guardWithSpear.o(.rodata);
@@ -1170,6 +1236,7 @@ SECTIONS {
data/animations/npc/din.o(.rodata);
data/animations/npc/nayru.o(.rodata);
data/animations/npc/farore.o(.rodata);
src/npc/sturgeon.o(.rodata);
data/const/npc/sturgeon.o(.rodata);
data/animations/npc/sturgeon.o(.rodata);
src/npc/tingleSiblings.o(.rodata);
@@ -1210,7 +1277,7 @@ SECTIONS {
data/animations/npc/mountainMinish.o(.rodata);
src/npc/melari.o(.rodata);
data/animations/npc/melari.o(.rodata);
data/const/npc/bladeBrothers.o(.rodata);
src/npc/bladeBrothers.o(.rodata);
data/animations/npc/bladeBrothers.o(.rodata);
src/npc/cow.o(.rodata);
data/animations/npc/cow.o(.rodata);
@@ -1218,9 +1285,9 @@ SECTIONS {
data/animations/npc/goron.o(.rodata);
src/npc/goronMerchant.o(.rodata);
data/animations/npc/goronMerchant.o(.rodata);
data/const/npc/gorman.o(.rodata);
src/npc/gorman.o(.rodata);
data/animations/npc/gorman.o(.rodata);
data/const/npc/dog.o(.rodata);
src/npc/dog.o(.rodata);
data/animations/npc/dog.o(.rodata);
src/npc/syrup.o(.rodata);
data/animations/npc/syrup.o(.rodata);
@@ -1277,7 +1344,6 @@ SECTIONS {
src/npc/npc58.o(.rodata);
src/npcDefinitions.o(.rodata);
src/npcUtils.o(.rodata);
data/const/npcUtils.o(.rodata);
src/physics.o(.rodata);
src/playerHitbox.o(.rodata);
data/gfx/sprite_frames.o(.rodata);
@@ -1300,7 +1366,7 @@ SECTIONS {
src/item/itemJarEmpty.o(.rodata);
data/item.o(.rodata);
src/itemDefinitions.o(.rodata);
data/const/playerUtils.o(.rodata);
src/playerUtils.o(.rodata);
data/map/room_headers.o(.rodata);
src/flags.o(.rodata);
src/save.o(.rodata);
@@ -1542,20 +1608,25 @@ SECTIONS {
src/object/linkAnimation.o(.rodata);
src/objectDefinitions.o(.rodata);
src/playerItemDefinitions.o(.rodata);
data/const/objectUtils.o(.rodata);
data/const/playerItem/playerItemShield.o(.rodata);
src/objectUtils.o(.rodata);
data/animations/spriteAnimations166.o(.rodata);
src/playerItem/playerItemShield.o(.rodata);
src/playerItem/playerItemFireRodProjectile.o(.rodata);
#ifdef DEMO_USA
src/demo.o(.rodata);
#endif
src/staffroll.o(.rodata);
data/const/staffroll.o(.rodata);
src/menu/kinstone_menu.o(.rodata);
src/menu/figurine_menu.o(.rodata);
src/menu/kinstoneMenu.o(.rodata);
src/menu/figurineMenu.o(.rodata);
data/gfx/figurines.o(.rodata);
data/const/figurine_menu.o(.rodata);
src/menu/pause_menu.o(.rodata);
data/const/subtask2.o(.rodata);
src/data/figurineMenuData.o(.rodata);
src/menu/pauseMenu.o(.rodata);
src/subtask/subtaskMapHint.o(.rodata);
src/menu/pauseMenuScreen6.o(.rodata);
src/subtask/subtaskLocalMapHint.o(.rodata);
src/subtask/subtaskFastTravel.o(.rodata);
data/const/subtask.o(.rodata);
src/playerItem/playerItemSword.o(.rodata);
data/projectile_functions.o(.rodata);
src/projectile/darkNutSwordSlash.o(.rodata);
@@ -1622,7 +1693,7 @@ SECTIONS {
src/playerItem/playerItemGustJar.o(.rodata);
data/const/playerItem/playerItemGustJar.o(.rodata);
data/gfx/fixed_type_gfx.o(.rodata);
data/const/movement.o(.rodata);
src/data/objPalettes.o(.rodata);
src/movement.o(.rodata);
src/data/transitions.o(.rodata);
src/data/screenTransitions.o(.rodata);
src/beanstalkSubtask.c
+22 -24
View File
@@ -26,18 +26,9 @@ extern void gMapData;
extern u8 gUpdateVisibleTiles;
extern u16 gMapDataTopSpecial[];
extern u16 gMapDataBottomSpecial[];
extern const u8 gGlobalGfxAndPalettes[];
extern const u8 gUnk_081091E4[];
extern void (*const gUnk_080B4458[])(void);
extern const u16 gUnk_080B44A0[];
extern const u16 gUnk_080B4410[];
extern const s16 gUnk_080B4488[];
extern const s16 gUnk_080B44A8[];
extern const struct_080B44D0 gUnk_080B44D0[];
typedef struct {
u16 tileType;
u16 kind;
@@ -47,6 +38,18 @@ typedef struct {
u16 unk_a;
} Data;
extern const u16 gUnk_080B4410[]; // TODO figure out structure
extern void (*const gUnk_080B4458[])(void);
extern const s16 gUnk_080B4468[]; // TODO struct xy
extern const s16 gUnk_080B4478[]; // TODO struct xy
extern const s16 gUnk_080B4488[];
extern const s16 gUnk_080B4490[]; // TODO struct xy
extern const u16 gUnk_080B44A0[];
extern const s16 gUnk_080B44A8[]; // TODO struct xy
extern const u32 gUnk_080B44B8[]; // TODO actually function pointers?
extern const Data gUnk_080B44C0[];
extern const Data gUnk_080B44C2[];
void sub_0801AD6C(const Data*, u32);
bool32 sub_0801A4F8(void);
bool32 sub_0801AA58(Entity*, u32, u32);
@@ -110,31 +113,30 @@ void SetBGDefaults(void) {
gMapTop.bgSettings->control = gUnk_080B77C0[1];
}
void sub_080197D4(u32* param_1) {
void sub_080197D4(struct_08109194* param_1) {
u32 uVar1;
u8* src;
void* dest;
do {
dest = (void*)param_1[1];
dest = param_1->dest;
if (dest != NULL) {
src = &gMapData + (*param_1 & 0x7fffffff);
if ((param_1[2] & 0x80000000) != 0) {
src = &gMapData + (param_1->src & 0x7fffffff);
if ((param_1->size & 0x80000000) != 0) {
if ((u32)dest >> 0x18 == 6) {
LZ77UnCompVram(src, dest);
} else {
LZ77UnCompWram(src, dest);
}
} else {
MemCopy(src, dest, param_1[2]);
MemCopy(src, dest, param_1->size);
}
} else {
LoadPaletteGroup((u32) * (u16*)param_1);
LoadPaletteGroup(*(u16*)param_1);
sub_080533CC();
}
param_1 += 3;
uVar1 = *(param_1 - 3);
} while ((uVar1 & 0x80000000) != 0);
param_1++;
} while (((param_1 - 1)->src & 0x80000000) != 0);
}
// Has ifdefs for other variants
@@ -483,10 +485,6 @@ u32 sub_0801AC68(u32 position, u32 data) {
return data << 2;
}
extern const Data gUnk_080B44C0[];
extern const Data gUnk_080B44C2[];
extern const u32 gUnk_080B44B8[];
void sub_0801AC98(void) {
u32 position;
u32 width;
@@ -571,11 +569,11 @@ u32 sub_0801AE34(void) {
return gRoomControls.scroll_flags >> 1 & 1;
}
void sub_0801AE44(s32 param_1) {
void sub_0801AE44(bool32 loadGfx) {
void (*func)(void);
gRoomControls.unk_34 = 0;
sub_0807BFD0();
if (param_1 != 0) {
if (loadGfx != 0) {
LoadRoomGfx();
}
sub_080809D4();
src/color.c
+72 -72
View File
@@ -35,7 +35,7 @@ void sub_0801CFD0(u32 index) {
p->_0_0 = 4;
p->_0_4 = 1;
p->_1 = 0x80;
p->_2 = 0xFFFF;
p->objPaletteId = 0xffff;
}
void sub_0801D000(u32 a1) {
@@ -56,58 +56,58 @@ void sub_0801D000(u32 a1) {
gUnk_02001A3C._0_0 = 0;
gUnk_02001A3C._0_4 = 0;
gUnk_02001A3C._1 = 0;
gUnk_02001A3C._2 = 0;
gUnk_02001A3C.objPaletteId = 0;
}
}
}
u32 LoadObjPalette(Entity* entity, u32 a2) {
Palette* puVar1;
int iVar2;
u32 LoadObjPalette(Entity* entity, u32 objPaletteId) {
Palette* palette;
s32 slot;
u32 uVar3;
u32 uVar4;
iVar2 = FindPalette(a2);
if (iVar2 < 0) {
if (a2 < 0x16) {
slot = FindPalette(objPaletteId);
if (slot < 0) {
if (objPaletteId < 0x16) {
uVar3 = 1;
} else {
uVar3 = gUnk_08133368[(a2 - 0x16)].BYTES.byte3;
uVar3 = gUnk_08133368[(objPaletteId - 0x16)].BYTES.byte3;
uVar3 &= 0xf;
}
iVar2 = FindFreeObjPalette(uVar3);
if (iVar2 < 0) {
slot = FindFreeObjPalette(uVar3);
if (slot < 0) {
CleanUpObjPalettes();
iVar2 = FindFreeObjPalette(uVar3);
slot = FindFreeObjPalette(uVar3);
}
if (iVar2 >= 0) {
puVar1 = &gPaletteList[iVar2];
puVar1->_2 = a2;
puVar1->_1 = 0;
puVar1->_0_4 = uVar3;
puVar1->_0_0 = 3;
if (slot >= 0) {
palette = &gPaletteList[slot];
palette->objPaletteId = objPaletteId;
palette->_1 = 0;
palette->_0_4 = uVar3;
palette->_0_0 = 3;
for (uVar3 = uVar3 - 1; uVar3 != 0; uVar3--) {
puVar1++;
puVar1->_2 = 0;
puVar1->_1 = 0;
puVar1->_0_4 = uVar3;
puVar1->_0_0 = 2;
palette++;
palette->objPaletteId = 0;
palette->_1 = 0;
palette->_0_4 = uVar3;
palette->_0_0 = 2;
}
LoadObjPaletteAtIndex(a2, iVar2);
LoadObjPaletteAtIndex(objPaletteId, slot);
}
}
SetEntityObjPalette(entity, iVar2);
return iVar2;
SetEntityObjPalette(entity, slot);
return slot;
}
s32 FindPalette(u32 a1) {
s32 FindPalette(u32 objPaletteId) {
u32 index;
Palette* palette;
if (a1 <= 5)
return a1;
if (objPaletteId <= 5)
return objPaletteId;
for (index = 6, palette = gPaletteList; index < ARRAY_COUNT(gPaletteList); index++) {
if (a1 == palette[index]._2) {
if (objPaletteId == palette[index].objPaletteId) {
return index;
}
}
@@ -115,37 +115,37 @@ s32 FindPalette(u32 a1) {
return -1;
}
u32 FindFreeObjPalette(u32 a1) {
u32 uVar1;
u32 uVar2;
u32 FindFreeObjPalette(u32 paletteCount) {
u32 count;
u32 index;
u32 tmp;
for (uVar1 = 0, uVar2 = 6; uVar2 < ARRAY_COUNT(gPaletteList); uVar2++) {
switch ((gPaletteList[uVar2]._0_0)) {
for (count = 0, index = 6; index < ARRAY_COUNT(gPaletteList); index++) {
switch ((gPaletteList[index]._0_0)) {
case 0:
uVar1 = uVar1 + 1;
if (a1 > uVar1)
count = count + 1;
if (paletteCount > count)
continue;
tmp = uVar1 - 1;
return uVar2 - tmp;
tmp = count - 1;
return index - tmp;
default:
uVar1 = 0;
count = 0;
break;
}
}
for (uVar1 = 0, uVar2 = 6; uVar2 < ARRAY_COUNT(gPaletteList); uVar2++) {
switch (gPaletteList[uVar2]._0_0) {
for (count = 0, index = 6; index < ARRAY_COUNT(gPaletteList); index++) {
switch (gPaletteList[index]._0_0) {
case 0:
case 1:
uVar1++;
if (a1 <= uVar1) {
tmp = uVar1 - 1;
return uVar2 - tmp;
count++;
if (paletteCount <= count) {
tmp = count - 1;
return index - tmp;
}
break;
default:
uVar1 = 0;
count = 0;
break;
}
}
@@ -154,7 +154,7 @@ u32 FindFreeObjPalette(u32 a1) {
NONMATCH("asm/non_matching/color/SetEntityObjPalette.inc", void SetEntityObjPalette(Entity* entity, u32 palette)) {
u32 uVar1;
Palette* pPVar1;
Palette* pal;
if (palette < 0) {
palette = 0;
@@ -164,15 +164,15 @@ NONMATCH("asm/non_matching/color/SetEntityObjPalette.inc", void SetEntityObjPale
}
entity->palette.b.b0 = palette;
entity->palette.b.b4 = palette;
pPVar1 = &gPaletteList[palette];
if ((s8)pPVar1->_0_0 != 4) {
pPVar1->_1++;
uVar1 = pPVar1->_0_4;
pPVar1->_0_0 = 3;
pal = &gPaletteList[palette];
if ((s8)pal->_0_0 != 4) {
pal->_1++;
uVar1 = pal->_0_4;
pal->_0_0 = 3;
while (uVar1 = uVar1 - 1, uVar1 != 0) {
pPVar1 = pPVar1 + 1;
pPVar1->_0_4 = uVar1;
pPVar1->_0_0 = 2;
pal = pal + 1;
pal->_0_4 = uVar1;
pal->_0_0 = 2;
}
}
}
@@ -204,7 +204,7 @@ void sub_0801D244(u32 a1) {
}
}
void sub_0801D28C(Entity* entity, u32 palette) {
void sub_0801D28C(Entity* entity, u32 objPaletteId) {
u32 c = entity->spriteAnimation[1];
Palette* list = gPaletteList;
Palette* p = &list[c];
@@ -213,31 +213,31 @@ void sub_0801D28C(Entity* entity, u32 palette) {
u32 lo = ((u32)((*(u8*)p) << 0x1c)) >> 0x1c;
if (lo == 3) {
p->_2 = palette;
LoadObjPaletteAtIndex(palette, c);
p->objPaletteId = objPaletteId;
LoadObjPaletteAtIndex(objPaletteId, c);
}
}
void ChangeObjPalette(Entity* entity, u32 a2) {
void ChangeObjPalette(Entity* entity, u32 objPaletteId) {
UnloadOBJPalette(entity);
LoadObjPalette(entity, a2);
LoadObjPalette(entity, objPaletteId);
}
void LoadObjPaletteAtIndex(u32 a1, u32 a2) {
void LoadObjPaletteAtIndex(u32 objPaletteId, u32 a2) {
u16* buffer;
gUsedPalettes |= 1 << (a2 + 0x10);
if (5 < a1) {
if (a1 == 0x15) {
if (objPaletteId > 5) {
if (objPaletteId == 0x15) {
buffer = gPaletteBuffer;
MemFill16(buffer[0x3C], buffer + (a2 + 0x10) * 0x10, 0x20);
} else if (a1 < 0x15) {
LoadPalettes((u8*)(gPaletteBuffer + (a1 - 6) * 0x10), a2 + 0x10, 1);
} else if (objPaletteId < 0x15) {
LoadPalettes((u8*)(gPaletteBuffer + (objPaletteId - 6) * 0x10), a2 + 0x10, 1);
} else {
u32 tmp1 = gUnk_08133368[(a1 - 0x16)].WORD_U;
u32 tmp2 = (tmp1 >> 0x18) & 0xf;
tmp1 &= 0xffffff;
LoadPalettes(gGlobalGfxAndPalettes + tmp1, a2 + 0x10, tmp2);
u32 offset = gUnk_08133368[(objPaletteId - 0x16)].WORD_U;
u32 numPalettes = (offset >> 0x18) & 0xf;
offset &= 0xffffff;
LoadPalettes(gGlobalGfxAndPalettes + offset, a2 + 0x10, numPalettes);
}
}
}
@@ -260,7 +260,7 @@ void CleanUpObjPalettes(void) {
gPaletteList[index1]._0_0 = 0;
gPaletteList[index1]._0_4 = 0;
gPaletteList[index1]._1 = 0;
gPaletteList[index1]._2 = 0;
gPaletteList[index1].objPaletteId = 0;
break;
}
}
@@ -337,7 +337,7 @@ void sub_0801D48C(u32 a1, u32 a2) {
pPVar1->_0_0 = 0;
pPVar1->_0_4 = 0;
pPVar1->_1 = 0;
pPVar1->_2 = 0;
pPVar1->objPaletteId = 0;
MemCopy(iVar3, iVar4, 0x20);
iVar3 += 0x10;
pPVar1++;
src/common.c
+56 -52
View File
@@ -79,7 +79,7 @@ extern const DungeonLayout** const gUnk_080C9C50[];
extern u8 gMapDataBottomSpecial[];
u32 sub_0801DF10(const DungeonLayout* lyt);
bool32 sub_0801DF90(TileEntity* tileEntity, u32 bank);
bool32 IsRoomVisited(TileEntity* tileEntity, u32 bank);
u32 sub_0801DF60(u32 a1, u8* p);
u32 sub_0801DF78(u32 a1, u32 a2);
void sub_0801DF28(u32 x, u32 y, s32 color);
@@ -437,6 +437,7 @@ void DrawDungeonFeatures(u32 floor, void* data, u32 size) {
layout = gUnk_080C9C50[gArea.dungeon_idx][floor];
MemClear(gMapDataBottomSpecial, 0x8000);
while (layout->area != 0) {
// ROOM_VISIT_MARKER has to be first TileEntity in the room.
tileEntity = (TileEntity*)GetRoomProperty(layout->area, layout->room, 3);
bankOffset = sub_0801DF10(layout);
features = 0;
@@ -446,7 +447,7 @@ void DrawDungeonFeatures(u32 floor, void* data, u32 size) {
if (HasDungeonSmallKey()) {
features = 2;
}
if (sub_0801DF90(tileEntity, bankOffset)) {
if (IsRoomVisited(tileEntity, bankOffset)) {
features = 3;
}
}
@@ -514,12 +515,12 @@ u32 sub_0801DF78(u32 a1, u32 a2) {
}
}
bool32 sub_0801DF90(TileEntity* tileEntity, u32 bank) {
bool32 IsRoomVisited(TileEntity* tileEntity, u32 bank) {
if (tileEntity == NULL)
return FALSE;
for (; tileEntity->type != 0; tileEntity++) {
if (tileEntity->type == 1)
if (tileEntity->type == ROOM_VISIT_MARKER)
return CheckLocalFlagByBank(bank, tileEntity->localFlag);
}
return FALSE;
@@ -531,7 +532,7 @@ void sub_0801DFB4(Entity* entity, u32 textIndex, u32 a3, u32 a4) {
gFuseInfo._8 = a3;
gFuseInfo._a = a4;
gFuseInfo.ent = entity;
gFuseInfo._3 = gUnk_03003DF0.unk_2;
gFuseInfo.kinstoneId = gUnk_03003DF0.unk_2;
if (entity != NULL) {
gFuseInfo.prevUpdatePriority = entity->updatePriority;
entity->updatePriority = 2;
@@ -738,12 +739,12 @@ void sub_0801E64C(s32 param_1, s32 param_2, s32 param_3, s32 param_4, s32 param_
}
}
void sub_0801E6C8(u32 param_1) {
void sub_0801E6C8(u32 kinstoneId) {
u32 tmp;
u32 index;
if (param_1 - 1 < 100) {
if (kinstoneId - 1 < 100) {
for (index = 0; index < 0x80; index++) {
if (param_1 == gSave.unk1C1[index]) {
if (kinstoneId == gSave.unk1C1[index]) {
gSave.unk1C1[index] = 0xf1;
}
}
@@ -752,7 +753,7 @@ void sub_0801E6C8(u32 param_1) {
gSave.unk1C1[tmp] = 0xf2;
}
for (index = 0; index < 0x20; index++) {
if (param_1 == gUnk_03003DF0.array[index].unk_3) {
if (kinstoneId == gUnk_03003DF0.array[index].unk_3) {
gUnk_03003DF0.array[index].unk_3 = 0xf1;
}
}
@@ -803,18 +804,18 @@ u32 sub_0801E7D0(u32 a1) {
return gSave.unk12B[tmp];
}
u32 CheckKinstoneFused(u32 idx) {
if (idx > 100 || idx < 1) {
u32 CheckKinstoneFused(u32 kinstoneId) {
if (kinstoneId > 100 || kinstoneId < 1) {
return 0;
}
return ReadBit(&gSave.unk241, idx);
return ReadBit(&gSave.fusedKinstones, kinstoneId);
}
bool32 sub_0801E810(u32 idx) {
if (idx > 100 || idx < 1) {
bool32 sub_0801E810(u32 kinstoneId) {
if (kinstoneId > 100 || kinstoneId < 1) {
return FALSE;
}
return ReadBit(&gSave.unk24E, idx);
return ReadBit(&gSave.unk24E, kinstoneId);
}
ASM_FUNC("asm/non_matching/common/sub_0801E82C.inc", void sub_0801E82C(void));
@@ -829,57 +830,59 @@ s32 sub_0801E8B0(u32 idx) {
return -1;
}
// Check conditions, something with kinstones
void sub_0801E8D4(void) {
u32 i;
for (i = 10; i <= 100; ++i) {
if (CheckKinstoneFused(i) && !sub_0801E810(i)) {
u32 evt_type = gUnk_080C9CBC[i].evt_type;
struct_080FE320* s = &gUnk_080FE320[evt_type];
u32 kinstoneId;
for (kinstoneId = 10; kinstoneId <= 100; ++kinstoneId) {
if (CheckKinstoneFused(kinstoneId) && !sub_0801E810(kinstoneId)) {
u32 worldEventId = gKinstoneWorldEvents[kinstoneId].worldEventId;
const WorldEvent* s = &gWorldEvents[worldEventId];
#if !defined EU && !defined JP
u32 flag = s->flag;
#endif
u32 tmp;
switch (s->_10) {
case 0:
switch (s->condition) {
case CND_0:
tmp = 0;
break;
case 1:
tmp = s->_11;
case CND_1:
tmp = s->bank;
break;
case 2:
case CND_2:
tmp = 0xf;
break;
case 3:
case CND_3:
tmp = 0x10;
break;
case 4:
case CND_4:
tmp = 0x11;
break;
#if !defined EU && !defined JP
case 5:
tmp = 4;
flag = 0x83;
// Special conditions for BEANDEMO_00 to BEANDEMO_04
case CND_5:
tmp = LOCAL_BANK_3;
flag = SORA_10_H00;
break;
case 6:
tmp = 4;
flag = 0x84;
case CND_6:
tmp = LOCAL_BANK_3;
flag = SORA_11_H00;
break;
case 7:
tmp = 4;
flag = 0x87;
case CND_7:
tmp = LOCAL_BANK_3;
flag = SORA_12_T00;
break;
case 8:
tmp = 4;
flag = 0x88;
case CND_8:
tmp = LOCAL_BANK_3;
flag = SORA_13_H00;
break;
case 9:
tmp = 4;
flag = 0x8b;
case CND_9:
tmp = LOCAL_BANK_3;
flag = SORA_14_T00;
break;
#ifndef DEMO_JP
case 10:
tmp = 5;
flag = 0x88;
case CND_10:
tmp = LOCAL_BANK_4;
flag = KS_B15;
break;
#endif
#endif
@@ -889,7 +892,7 @@ void sub_0801E8D4(void) {
#else
if (sub_0807CB24(tmp, s->flag)) {
#endif
WriteBit(&gSave.unk24E, i);
WriteBit(&gSave.unk24E, kinstoneId);
}
}
}
@@ -911,7 +914,7 @@ void (*const gUnk_080C9CAC[])(void) = {
// TODO merge
#ifdef JP
const struct_080C9CBC gUnk_080C9CBC[] = {
const KinstoneWorldEvent gKinstoneWorldEvents[] = {
{ 15, 44, 45, 8, 0, 0, 0, 0 }, { 4, 8, 1, 0, 0, 1, 2, 0 }, { 4, 9, 1, 0, 0, 2, 2, 0 },
{ 4, 10, 1, 0, 0, 3, 2, 0 }, { 4, 10, 1, 0, 0, 3, 2, 0 }, { 4, 9, 1, 0, 0, 2, 2, 0 },
{ 4, 13, 2, 0, 0, 6, 2, 0 }, { 4, 14, 2, 0, 0, 7, 2, 0 }, { 4, 15, 2, 0, 0, 8, 2, 0 },
@@ -956,7 +959,7 @@ const struct_080C9CBC gUnk_080C9CBC[] = {
#else
#ifdef EU
const struct_080C9CBC gUnk_080C9CBC[] = {
const KinstoneWorldEvent gKinstoneWorldEvents[] = {
{ 15, 44, 45, 8, 0, 0, 0, 0 }, { 4, 8, 1, 0, 0, 1, 2, 0 }, { 4, 9, 1, 0, 0, 2, 2, 0 },
{ 4, 10, 1, 0, 0, 3, 2, 0 }, { 4, 10, 1, 0, 0, 3, 2, 0 }, { 4, 9, 1, 0, 0, 2, 2, 0 },
{ 4, 13, 2, 0, 0, 6, 2, 0 }, { 4, 14, 2, 0, 0, 7, 2, 0 }, { 4, 15, 2, 0, 0, 8, 2, 0 },
@@ -999,7 +1002,7 @@ const struct_080C9CBC gUnk_080C9CBC[] = {
{ 2, 43, 7, 8, 0, 18, 0, 0 },
};
#else
const struct_080C9CBC gUnk_080C9CBC[] = {
const KinstoneWorldEvent gKinstoneWorldEvents[] = {
{ 15, 44, 45, 8, 0, 0, 0, 0 }, { 4, 8, 1, 0, 0, 1, 2, 0 }, { 4, 9, 1, 0, 0, 2, 2, 0 },
{ 4, 10, 1, 0, 0, 3, 2, 0 }, { 4, 10, 1, 0, 0, 3, 2, 0 }, { 4, 9, 1, 0, 0, 2, 2, 0 },
{ 4, 13, 2, 0, 0, 6, 2, 0 }, { 4, 14, 2, 0, 0, 7, 2, 0 }, { 4, 15, 2, 0, 0, 8, 2, 0 },
@@ -1063,13 +1066,14 @@ const u8 gUnk_080CA11C[] = {
24, 45, 53, 54, 55, 57, 60, 68, 70, 71, 78, 80, 83, 85, 86, 88, 95, 96, 0, 0,
};
// Get a random kinstone
u32 sub_0801EA74(void) {
s32 r = (s32)Random() % 18;
u32 i;
for (i = 0; i < 18; ++i) {
u32 n = gUnk_080CA11C[r];
if (!CheckKinstoneFused(n))
return n;
u32 kinstoneId = gUnk_080CA11C[r];
if (!CheckKinstoneFused(kinstoneId))
return kinstoneId;
r = (r + 1) % 18;
}
return 0xF2;
src/cutscene.c
+779
View File
@@ -0,0 +1,779 @@
/**
* @file cutscene.c
*
* @brief Cutscenes
*/
#include "cutscene.h"
#include "enemy.h"
#include "fade.h"
#include "fileselect.h"
#include "functions.h"
#include "game.h"
#include "main.h"
#include "menu.h"
#include "npc.h"
#include "object.h"
#include "screen.h"
void sub_08051F78(void);
void sub_08051FF0(void);
void sub_08052004(void);
const EntityData gUnk_080FCB94[] = {
{ OBJECT, 15, CHUCHU_BOSS_CUTSCENE, 0, 0, 0x1c8, 0x288, 0 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
void sub_080535AC(void);
void sub_080535F4(void);
void nullsub_481(void);
void sub_08053618(void);
void (*const gUnk_080FCBB4[])(void) = {
sub_080535AC,
sub_080535F4,
nullsub_481,
sub_08053618,
};
void CutsceneMain_Init(void) {
gUnk_080FCBB4[gMenu.overlayType]();
}
void sub_080535AC(void) {
gMenu.overlayType = 1;
gMenu.transitionTimer = 120;
gUI.field_0x6 = 1;
gUpdateVisibleTiles = 1;
gScreen.lcd.displayControl &= 0xfeff;
LoadRoomEntityList(gUnk_080FCB94);
SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 8);
}
void sub_080535F4(void) {
if (gFadeControl.active == 0) {
ResetSystemPriority();
gMenu.overlayType = 2;
}
}
void nullsub_481(void) {
}
void sub_08053618(void) {
gMenu.transitionTimer--;
if (gMenu.transitionTimer == 0) {
sub_08052004();
}
}
void sub_08053634(void) {
gUI.nextToLoad = 3; // Subtask_FadeOut
MessageInitialize();
}
void sub_08053648(void) {
Entity* obj = CreateObject(SMOKE, 0, 0);
if (obj != NULL) {
obj->x.HALF.HI = gRoomControls.origin_x + 0x2d0;
obj->y.HALF.HI = gRoomControls.origin_y + 0x148;
}
}
void sub_0805367C(void) {
gMenu.overlayType++;
}
void sub_0805368C(void) {
Entity* entity = FindEntityByID(OBJECT, HOUSE_DOOR_INT, 6);
if (entity != NULL) {
DeleteEntity(entity);
SoundReq(SFX_F0); // TODO Door sound during intro
}
}
void sub_080536A8(void) {
sub_080A71C4(5, 5, FADE_INSTANT, 0x10);
}
void sub_080536B8(void) {
sub_080A71C4(5, 3, FADE_INSTANT, 4);
SetFade(FADE_IN_OUT | FADE_INSTANT, 0x100);
}
extern Script script_IntroCameraTarget;
extern Script script_ZeldaMoveToLinksHouse;
extern Script script_HouseDoorIntro;
extern Script script_CutsceneOrchestratorIntro2;
const EntityData gUnk_080FCBC4[] = {
{ OBJECT, 79, CUTSCENE_ORCHESTRATOR, 0, 0, 0x230, 0x1a8, (u32)&script_IntroCameraTarget },
{ NPC, 79, ZELDA, 0, 0, 0x230, 0x1a8, (u32)&script_ZeldaMoveToLinksHouse },
{ OBJECT, 79, HOUSE_DOOR_EXT, 3, 3, 0x290, 0x193, (u32)&script_HouseDoorIntro },
{ OBJECT, 79, CUTSCENE_ORCHESTRATOR, 0, 0, 0x2d0, 0x1a8, (u32)&script_CutsceneOrchestratorIntro2 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
extern Script script_CutsceneOrchestratorIntro;
extern Script script_SmithIntro;
extern Script script_ZeldaIntro;
const EntityData gUnk_080FCC14[] = {
{ OBJECT, 79, CUTSCENE_ORCHESTRATOR, 0, 0, 0x0, 0x0, (u32)&script_CutsceneOrchestratorIntro },
{ NPC, 79, SMITH, 0, 0, 0xb8, 0x60, (u32)&script_SmithIntro },
{ NPC, 79, ZELDA, 0, 0, 0x8, 0x5e, (u32)&script_ZeldaIntro },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
extern Script script_ZeldaLeaveLinksHouse;
const EntityData gUnk_080FCC54[] = {
{ NPC, 79, ZELDA, 0, 0, 0xa0, 0x5d, (u32)&script_ZeldaLeaveLinksHouse },
{ OBJECT, 15, HOUSE_DOOR_INT, 4, 256, 0x78, 0x88, 0 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
const Font gUnk_080FCC84 = {
&gBG1Buffer[0x1cf], BG_TILE_ADDR(0x188), gTextGfxBuffer, 0, 0xf020, 0xf0, 1, 0, 0, 0, 0, 5, 0, 0, 0
};
const Font gUnk_080FCC9C = {
&gBG1Buffer[0x96], BG_TILE_ADDR(0x188), gTextGfxBuffer, 0, 0xf020, 0x78, 1, 0, 0, 0, 0, 5, 0, 0, 0
};
const struct_080FCCB4 gUnk_080FCCB4[] = {
{ &gUnk_080FCC84, 240, 96, 193, 1 }, { &gUnk_080FCC84, 240, 96, 453, 6 }, { &gUnk_080FCC9C, 120, 160, 363, 4 },
{ &gUnk_080FCC9C, 120, 160, 498, 4 }, { &gUnk_080FCC84, 240, 96, 368, 4 }, { &gUnk_080FCC84, 240, 96, 358, 4 },
};
void sub_08053758(void);
void sub_08053800(void);
void sub_08053894(void);
void sub_08053800(void);
void sub_08053894(void);
void sub_08053800(void);
void sub_08053894(void);
void sub_08053800(void);
void sub_08053894(void);
void sub_08053800(void);
void sub_08053904(void);
void sub_08053974(void);
void nullsub_482(void);
void sub_080539BC(void);
void (*const gUnk_080FCCFC[])(void) = {
sub_08053758, sub_08053800, sub_08053894, sub_08053800, sub_08053894, sub_08053800, sub_08053894, sub_08053800,
sub_08053894, sub_08053800, sub_08053904, sub_08053974, nullsub_482, sub_080539BC, nullsub_482,
};
void sub_080536D4(void) {
gUnk_080FCCFC[gMenu.overlayType]();
}
void sub_0805370C(void);
void (*const gUnk_080FCD38[])(void) = {
sub_0805370C,
nullsub_482,
};
void sub_080536F0(void) {
gUnk_080FCD38[gMenu.overlayType]();
}
void sub_0805370C(void) {
gMenu.overlayType++;
gUpdateVisibleTiles = 1;
sub_08051FF0();
LoadRoomEntityList((EntityData*)gUnk_080FCC54);
SetFade(FADE_INSTANT, 0x10);
}
void sub_08053758(void);
void sub_08053800(void);
void sub_08053894(void);
void sub_08053800(void);
void sub_08053894(void);
void sub_08053800(void);
void sub_08053894(void);
void sub_08053800(void);
void sub_08053894(void);
void sub_08053800(void);
void sub_08053894(void);
void sub_08053800(void);
void sub_08053894(void);
void sub_080539F4(void);
void sub_08053A1C(void);
void sub_08053A5C(void);
void sub_08053A90(void);
void (*const gUnk_080FCD40[])(void) = {
sub_08053758, sub_08053800, sub_08053894, sub_08053800, sub_08053894, sub_08053800,
sub_08053894, sub_08053800, sub_08053894, sub_08053800, sub_08053894, sub_08053800,
sub_08053894, sub_080539F4, sub_08053A1C, sub_08053A5C, sub_08053A90,
};
void sub_0805373C(void) {
gUnk_080FCD40[gMenu.overlayType]();
}
void sub_08053758(void) {
gMenu.overlayType = 1;
gMenu.transitionTimer = 120;
gMenu.field_0xa = 0x1e;
*((u8*)&gMenu + 0x10) = 0; // TODO
gUI.field_0x6 = 1;
gMapBottom.bgSettings = NULL;
gMapTop.bgSettings = NULL;
gRoomControls.camera_target = NULL;
gRoomControls.scroll_y = 0;
gRoomControls.scroll_x = 0;
ClearBgAnimations();
DispReset(0);
gScreen.lcd.displayControl = 0x2640;
gScreen.controls.layerFXControl = 0x2244;
gScreen.controls.alphaBlend = 0x1000;
gScreen.controls.windowInsideControl = 0x1f;
gScreen.controls.windowOutsideControl = 0x3f;
gScreen.controls.window0HorizontalDimensions = 0xf0;
gScreen.controls.window0VerticalDimensions = 0x60;
gScreen.bg1.control = 0x1c4e;
gScreen.bg2.control = 0x1dc1;
SoundReq(BGM_STORY);
ResetSystemPriority();
SetFade(FADE_IN_OUT | FADE_INSTANT, 0x100);
}
void sub_08053800(void) {
u32 index;
const struct_080FCCB4* ptr;
if (gFadeControl.active == 0) {
index = gGenericMenu.unk10.a[0];
ptr = &gUnk_080FCCB4[index];
gGenericMenu.base.transitionTimer = ptr->transitionTimer;
gGenericMenu.base.field_0xa = 0x1e;
gGenericMenu.unk10.a[0]++;
gGenericMenu.base.overlayType++;
gGenericMenu.base.storyPanelIndex = 0;
LoadPaletteGroup(index + 0x8a);
LoadGfxGroup(index + 0x3a);
MemClear(&gBG1Buffer, 0x800);
ShowTextBox(TEXT_INDEX(TEXT_PICORI, 1) + index, ptr->font);
gScreen.bg1.updated = 1;
gScreen.controls.alphaBlend = 0x10;
gScreen.controls.window0HorizontalDimensions = ptr->width;
gScreen.controls.window0VerticalDimensions = ptr->height;
SetFade(FADE_INSTANT, ptr->fadeSpeed);
}
}
void sub_08053894(void) {
u32 tmp;
if (gFadeControl.active == 0) {
gMenu.transitionTimer--;
if (gMenu.field_0xa != 0) {
gMenu.field_0xa--;
} else {
if (((gRoomTransition.frameCount & 1) == 0) && (gMenu.storyPanelIndex < 0x10)) {
tmp = ++gMenu.storyPanelIndex << 0x18;
gScreen.controls.alphaBlend = (tmp >> 0x10) | (0x10 - ((tmp) >> 0x19));
}
}
if (gMenu.transitionTimer == 0) {
gMenu.overlayType++;
SetFade(FADE_IN_OUT | FADE_INSTANT, 8);
}
}
}
void sub_08053904(void) {
u32 tmp;
if (gFadeControl.active == 0) {
gMenu.transitionTimer--;
if (gMenu.field_0xa != 0) {
gMenu.field_0xa--;
} else {
if (((gRoomTransition.frameCount & 1) == 0) && (gMenu.storyPanelIndex < 0x10)) {
tmp = ++gMenu.storyPanelIndex << 0x18;
gScreen.controls.alphaBlend = (tmp >> 0x10) | (0x10 - (tmp >> 0x19));
}
}
if (gMenu.transitionTimer == 0) {
gMenu.overlayType++;
SetFade(FADE_IN_OUT | FADE_INSTANT, 1);
}
}
}
void sub_08053974(void) {
if (gFadeControl.active == 0) {
InitFade();
DispReset(1);
SetBGDefaults();
sub_08051F78();
LoadRoomEntityList(gUnk_080FCBC4);
SetFade(FADE_IN_OUT | FADE_INSTANT, 0x100);
gMenu.overlayType++;
}
}
void nullsub_482(void) {
}
void sub_080539BC(void) {
SetBGDefaults();
DeleteAllEntities();
sub_08051F9C(0x22, 0x11, 0, 0);
sub_0804B0B0(0x22, 0x11);
LoadRoomEntityList(gUnk_080FCC14);
gMenu.overlayType++;
}
void sub_080539F4(void) {
if (gFadeControl.active == 0) {
DispReset(1);
gMenu.overlayType++;
gMenu.transitionTimer = 60;
}
}
void sub_08053A1C(void) {
gMenu.transitionTimer--;
if (gMenu.transitionTimer == 0) {
gMenu.overlayType++;
gMenu.transitionTimer = 8;
MessageFromTarget(TEXT_INDEX(TEXT_PICORI, 0x07));
gMessage.textWindowPosX = 1;
gMessage.textWindowPosY = 8;
SetFade(FADE_INSTANT, 8);
}
}
void sub_08053A5C(void) {
if (((gMessage.doTextBox & 0x7f) == 0) && --gMenu.transitionTimer == 0) {
gMenu.overlayType++;
SetFade(FADE_IN_OUT | FADE_INSTANT, 8);
}
}
void sub_08053A90(void) {
if (gFadeControl.active == 0) {
gUI.nextToLoad = 3; // Subtask_FadeOut
SetBGDefaults();
}
}
extern Script script_CutsceneOrchestratorMinishVaati;
extern Script script_MinishEzlo;
extern Script script_CutsceneMiscObjectMinishCap;
extern Script script_Vaati;
const EntityData gUnk_080FCD84[] = {
{ OBJECT, 79, CUTSCENE_ORCHESTRATOR, 0, 0, 0x0, 0x0, (u32)&script_CutsceneOrchestratorMinishVaati },
{ NPC, 79, MINISH_EZLO, 0, 0, 0x78, 0xd8, (u32)&script_MinishEzlo },
{ OBJECT, 79, CUTSCENE_MISC_OBJECT, 1, 0, 0x78, 0x58, (u32)&script_CutsceneMiscObjectMinishCap },
{ NPC, 79, VAATI, 1, 0, 0x78, 0x68, (u32)&script_Vaati },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
void sub_08053ACC(void);
void sub_08053B00(void);
void sub_08053B10(void);
void (*const gUnk_080FCDD4[])(void) = {
sub_08053ACC,
sub_08053B00,
sub_08053B10,
};
void sub_08053AB0(void) {
gUnk_080FCDD4[gMenu.overlayType]();
}
void sub_08053ACC(void) {
gMenu.overlayType++;
gUpdateVisibleTiles = 1;
sub_08051FF0();
LoadRoomEntityList(gUnk_080FCD84);
SetFade(FADE_IN_OUT | FADE_INSTANT, 0x100);
}
void sub_08053B00(void) {
gMenu.overlayType++;
}
void sub_08053B10(void) {
if (CheckRoomFlag(1)) {
gMenu.menuType++;
DispReset(1);
SetFade(FADE_INSTANT, 0x100);
}
}
void sub_08053B3C(void) {
sub_080A71C4(5, 4, FADE_IN_OUT | FADE_INSTANT, 0x100);
SetFade(FADE_IN_OUT | FADE_INSTANT, 0x100);
}
extern Script script_CutsceneOrchestratorTakeoverCutscene;
extern Script script_KingDaltusTakeover;
extern Script script_VaatiTakeover;
extern Script script_ZeldaStoneTakeover;
const EntityData gUnk_080FCDE0[] = {
{ OBJECT, 79, CUTSCENE_ORCHESTRATOR, 0, 0, 0x0, 0x0, (u32)&script_CutsceneOrchestratorTakeoverCutscene },
{ NPC, 79, KING_DALTUS, 0, 0, 0x88, 0x58, (u32)&script_KingDaltusTakeover },
{ NPC, 79, VAATI, 1, 0, 0x88, 0xe0, (u32)&script_VaatiTakeover },
{ NPC, 79, ZELDA, 0, 0, 0xb8, 0x58, (u32)&script_ZeldaStoneTakeover },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
extern Script script_MinisterPothoTakeover;
extern Script script_GuardTakeover;
extern Script script_GuardTakeover;
const EntityData gUnk_080FCE30[] = {
{ NPC, 79, MINISTER_POTHO, 0, 0, 0x68, 0x58, (u32)&script_MinisterPothoTakeover },
{ NPC, 79, GUARD_1, 0, 0, 0x78, 0xe8, (u32)&script_GuardTakeover },
{ NPC, 79, GUARD_1, 1, 0, 0x78, 0x108, (u32)&script_GuardTakeover },
{ NPC, 79, GUARD_1, 2, 0, 0x78, 0x128, (u32)&script_GuardTakeover },
{ NPC, 79, GUARD_1, 3, 0, 0x98, 0xe8, (u32)&script_GuardTakeover },
{ NPC, 79, GUARD_1, 4, 0, 0x98, 0x108, (u32)&script_GuardTakeover },
{ NPC, 79, GUARD_1, 5, 0, 0x98, 0x128, (u32)&script_GuardTakeover },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
void sub_08053B74(void);
void sub_08053BAC(void);
void sub_08053BBC(void);
void (*const gUnk_080FCEB0[])(void) = {
sub_08053B74,
sub_08053BAC,
sub_08053BBC,
};
void sub_08053B58(void) {
gUnk_080FCEB0[gMenu.overlayType]();
}
void sub_08053B74(void) {
gMenu.overlayType++;
gUpdateVisibleTiles = 1;
LoadRoomEntityList(gUnk_080FCDE0);
ResetSystemPriority();
ResetEntityPriority();
SetFade(FADE_IN_OUT | FADE_INSTANT, 0x100);
}
void sub_08053BAC(void) {
gMenu.overlayType++;
}
void sub_08053BBC(void) {
if (CheckRoomFlag(0)) {
gMenu.menuType++;
DispReset(1);
SetFade(FADE_INSTANT, 0x100);
}
}
void sub_08053BE8(void) {
sub_080A71C4(5, 2, FADE_IN_OUT | FADE_INSTANT, 0x100);
SetFade(FADE_IN_OUT | FADE_INSTANT, 0x100);
}
extern Script script_ZeldaStoneInDHC;
extern Script script_ZeldaStoneDHC;
const EntityData gUnk_080FCEBC[] = {
{ NPC, 79, ZELDA, 0, 0, 0x78, 0x68, (u32)&script_ZeldaStoneInDHC },
{ NPC, 79, VAATI, 1, 0, 0x78, 0x98, (u32)&script_ZeldaStoneDHC },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
void sub_08053C20(void);
void nullsub_483(void);
void sub_08053C60(void);
void (*const gUnk_080FCEEC[])(void) = {
sub_08053C20,
nullsub_483,
sub_08053C60,
};
void sub_08053C04(void) {
gUnk_080FCEEC[gMenu.overlayType]();
}
void sub_08053C20(void) {
gMenu.overlayType = 1;
gMenu.transitionTimer = 120; // Go to game over after 2 minutes.
gUpdateVisibleTiles = 1;
sub_08051FF0();
LoadStaticBackground(4);
LoadRoomEntityList(gUnk_080FCEBC);
SetFade(FADE_INSTANT, 0x10);
SoundReq(BGM_FIGHT_THEME2);
}
void nullsub_483(void) {
}
void sub_08053C60(void) {
SetFade(FADE_IN_OUT | FADE_INSTANT, 2);
SoundReq(SFX_SUMMON);
SoundReq(SONG_STOP_BGM);
SetTask(TASK_GAMEOVER);
}
void sub_08053C84(void) {
gMenu.overlayType = 2;
}
void sub_08053CAC(void);
void sub_08053CAC(void);
void sub_08053E58(void);
void (*const gUnk_080FCEF8[])(void) = {
sub_08053CAC,
sub_08053CAC,
sub_08053E58,
};
void CutsceneMain_Exit(void) {
gUnk_080FCEF8[gMenu.field_0x3]();
}
const EntityData gUnk_080FCF24[];
const EntityData gUnk_080FCF44[];
const EntityData gUnk_080FCF64[];
const EntityData gUnk_080FCF84[];
const struct_080FCF04 gUnk_080FCF04[] = {
{ gUnk_080FCF24, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_2F, 0, 0 },
{ gUnk_080FCF44, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_1F, 0, 0 },
{ gUnk_080FCF64, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_2F, 0, 0 },
{ gUnk_080FCF84, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_1F, 0, 0 },
};
const EntityData gUnk_080FCF24[] = {
{ OBJECT, 15, GROUND_ITEM, 83, 512, 0x88, 0x68, 0 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
const EntityData gUnk_080FCF44[] = {
{ OBJECT, 15, GROUND_ITEM, 83, 512, 0x68, 0x68, 0 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
const EntityData gUnk_080FCF64[] = {
{ OBJECT, 15, GROUND_ITEM, 83, 512, 0x88, 0x68, 0 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
const EntityData gUnk_080FCF84[] = {
{ OBJECT, 15, GROUND_ITEM, 83, 512, 0x68, 0x68, 0 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
void sub_08053CC8(void);
void sub_08053D34(void);
void sub_08053D90(void);
void sub_08053DB4(void);
void sub_08053E30(void);
void (*const gUnk_080FCFA4[])(void) = {
sub_08053CC8, sub_08053D34, sub_08053D90, sub_08053DB4, sub_08053E30,
};
void sub_08053CAC(void) {
gUnk_080FCFA4[gMenu.overlayType]();
}
void sub_08053CC8(void) {
const struct_080FCF04* ptr;
ptr = gUnk_080FCF04 + gMenu.field_0x3 * 2;
gMenu.field_0xc = (void*)&ptr[1];
LoadRoomEntityList(ptr->entityData);
LoadRoomEntityList(GetRoomProperty(ptr->area, ptr->room, 1));
LoadRoomEntityList(GetRoomProperty(ptr->area, ptr->room, 2));
gMenu.overlayType = 1;
gScreen.lcd.displayControl &= 0xfeff;
gUpdateVisibleTiles = 1;
SetFade(FADE_INSTANT, 0x10);
if (ptr->room == 0x1d) { // TODO what room is this?
gMenu.field_0xa = 1;
}
}
void sub_08053D34(void) {
if (gMenu.field_0xa != 0) {
gMenu.field_0xa = 0;
if (CheckLocalFlagByBank(FLAG_BANK_7, 0x3d)) {
SetTileType(0x74, 0xc4, 1);
}
if (CheckLocalFlagByBank(FLAG_BANK_7, 0x3e)) {
SetTileType(0x74, 0xcc, 1);
}
}
if (gFadeControl.active == 0) {
gMenu.transitionTimer = 120;
gMenu.overlayType++;
}
}
void sub_08053D90(void) {
gMenu.transitionTimer--;
if (gMenu.transitionTimer == 0) {
gMenu.overlayType++;
SetFadeInverted(0x10);
}
}
void sub_08053DB4(void) {
if (gFadeControl.active == 0) {
struct_080FCF04* ptr = (struct_080FCF04*)gMenu.field_0xc;
sub_08052FF4(gMenu.field_0xc[4], gMenu.field_0xc[5]);
InitializeCamera();
gUpdateVisibleTiles = 1;
gRoomControls.scroll_x = (s8)ptr->scrollX + gRoomControls.scroll_x;
gRoomControls.scroll_y = (s8)ptr->scrollY + gRoomControls.scroll_y;
LoadRoomEntityList(ptr->entityData);
LoadRoomEntityList((EntityData*)GetRoomProperty(ptr->area, ptr->room, 1));
LoadRoomEntityList((EntityData*)GetRoomProperty(ptr->area, ptr->room, 2));
gMenu.transitionTimer = 120;
gMenu.overlayType++;
SetFadeInverted(0x10);
}
}
void sub_08053E30(void) {
if ((gFadeControl.active == 0) && --gMenu.transitionTimer == 0) {
gMenu.menuType++;
}
}
const EntityData gUnk_080FCFE8[];
const EntityData gUnk_080FD008[];
const EntityData gUnk_080FD028[];
const EntityData gUnk_080FD048[];
const EntityData gUnk_080FD078[];
const EntityData gUnk_080FD098[];
const EntityData gUnk_080FD0C8[];
const EntityData gUnk_080FD0E8[];
const struct_080FCFB8 gUnk_080FCFB8[] = {
{ gUnk_080FCFE8, gUnk_080FD008, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_DARKNUT, 16, 16 },
{ gUnk_080FD028, gUnk_080FD048, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_DARKNUTS, 16, 16 },
{ gUnk_080FD078, gUnk_080FD098, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_DARKNUTS, 16, 16 },
{ gUnk_080FD0C8, gUnk_080FD0E8, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_DARKNUT, 16, 16 },
};
const EntityData gUnk_080FCFE8[] = {
{ OBJECT, 15, BOSS_DOOR, 8, 0, 0x88, 0x28, 65535 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
const EntityData gUnk_080FD008[] = {
{ ENEMY, 47, DARK_NUT, 2, 0, 0x88, 0x68, 0 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
const EntityData gUnk_080FD028[] = {
{ OBJECT, 15, BOSS_DOOR, 8, 0, 0x88, 0x28, 65535 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
const EntityData gUnk_080FD048[] = {
{ ENEMY, 47, DARK_NUT, 1, 0, 0x70, 0x68, 0 },
{ ENEMY, 47, DARK_NUT, 0, 0, 0xa0, 0x68, 0 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
const EntityData gUnk_080FD078[] = {
{ OBJECT, 15, BOSS_DOOR, 10, 0, 0x88, 0xa8, 65535 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
const EntityData gUnk_080FD098[] = {
{ ENEMY, 47, DARK_NUT, 0, 0, 0x70, 0x68, 0 },
{ ENEMY, 47, DARK_NUT, 1, 0, 0xa0, 0x68, 0 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
const EntityData gUnk_080FD0C8[] = {
{ OBJECT, 15, BOSS_DOOR, 10, 0, 0x88, 0xa8, 65535 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
const EntityData gUnk_080FD0E8[] = {
{ ENEMY, 47, DARK_NUT, 2, 0, 0x88, 0x68, 0 },
{ 0xff, 0, 0, 0, 0, 0x0, 0x0, 0 },
};
void sub_08053E74(void);
void sub_08053EC4(void);
void sub_08053EFC(void);
void sub_08053F20(void);
void sub_08053EC4(void);
void sub_08053EFC(void);
void sub_08053F20(void);
void sub_08053EC4(void);
void sub_08053EFC(void);
void sub_08053F20(void);
void sub_08053EC4(void);
void sub_08053F88(void);
void (*const gUnk_080FD108[])(void) = {
sub_08053E74, sub_08053EC4, sub_08053EFC, sub_08053F20, sub_08053EC4, sub_08053EFC,
sub_08053F20, sub_08053EC4, sub_08053EFC, sub_08053F20, sub_08053EC4, sub_08053F88,
};
void sub_08053E58(void) {
gUnk_080FD108[gMenu.overlayType]();
}
void sub_08053E74(void) {
const struct_080FCFB8* ptr = gUnk_080FCFB8;
gMenu.field_0xc = (u8*)ptr;
LoadRoomEntityList(ptr->entityData1);
gMenu.transitionTimer = 120;
gMenu.field_0xa = 0x3c;
gMenu.overlayType++;
gScreen.lcd.displayControl &= 0xfeff;
gUpdateVisibleTiles = 1;
SetMinPriority(1);
SetFade(FADE_INSTANT, 8);
}
void sub_08053EC4(void) {
EntityData** data;
if ((gFadeControl.active == 0) && (--gMenu.field_0xa == 0)) {
data = (EntityData**)(gMenu.field_0xc + 4); // TODO entityData2 of struct_080FCFB8
gMenu.field_0xc += 0xc;
LoadRoomEntityList(*data);
gMenu.overlayType++;
}
}
void sub_08053EFC(void) {
if (--gMenu.transitionTimer == 0) {
gMenu.overlayType++;
SetFadeInverted(8);
}
}
void sub_08053F20(void) {
struct_080FCFB8* ptr;
if (gFadeControl.active == 0) {
DeleteAllEntities();
ptr = (struct_080FCFB8*)gMenu.field_0xc;
sub_08052FF4(ptr->area, ptr->room);
InitializeCamera();
gUpdateVisibleTiles = 1;
gRoomControls.scroll_x = (s8)ptr->scrollX + gRoomControls.scroll_x;
gRoomControls.scroll_y = (s8)ptr->scrollY + gRoomControls.scroll_y;
LoadRoomEntityList((ptr)->entityData1);
gMenu.transitionTimer = 120;
gMenu.field_0xa = 0x3c;
gMenu.overlayType++;
SetFadeInverted(8);
}
}
void sub_08053F88(void) {
if ((gFadeControl.active == 0) && --gMenu.transitionTimer == 0) {
gMenu.menuType++;
ResetEntityPriority();
}
}
void sub_080536D4(void);
void sub_08053B58(void);
void sub_0805373C(void);
void sub_08053AB0(void);
void sub_080536F0(void);
void sub_08053C04(void);
void (*const gUnk_080FD138[])(void) = {
sub_080536D4, sub_08053B58, sub_0805373C, sub_08053AB0, sub_080536F0, sub_08053C04,
};
void CutsceneMain_Update(void) {
gUnk_080FD138[gMenu.field_0x3]();
}
src/data/figurineMenuData.c
+56
View File
@@ -0,0 +1,56 @@
#include "figurineMenu.h"
#include "pauseMenu.h"
#include "subtask.h"
#include "subtask2.h"
// This data also belongs in figurine_menu.c, but the data/gfx/figurines.s are inbetween.
// TODO convert them to c code as well.
// clang-format off
// Pause menu screens
const struct_08128A38 gUnk_08128A38[] = {
[PauseMenuScreen_0] = { 0, 1, PauseMenu_Variant0 },
[PauseMenuScreen_1] = { 0, 1, PauseMenu_ItemMenu },
[PauseMenuScreen_2] = { 1, 2, PauseMenu2 },
[PauseMenuScreen_3] = { 8, 2, PauseMenu_Variant0 },
[PauseMenuScreen_4] = { 2, 15, PauseMenu_Screen_4 },
[PauseMenuScreen_5] = { 3, 15, PauseMenu_Screen_5 },
[PauseMenuScreen_6] = { 4, 15, PauseMenu_Screen_6 },
[PauseMenuScreen_7] = { 5, 2, PauseMenu_Screen_7 },
[PauseMenuScreen_8] = { 6, 2, PauseMenu_Screen_8 },
[PauseMenuScreen_9] = { 9, 2, PauseMenu_Screen_9 },
[PauseMenuScreen_10] = { 10, 2, PauseMenu_Screen_10 },
[PauseMenuScreen_11] = { 10, 1, PauseMenu_Screen_10 },
[PauseMenuScreen_12] = { 2, 15, PauseMenu_Variant0 },
[PauseMenuScreen_13] = { 7, 15, PauseMenu_Variant0 },
[PauseMenuScreen_14] = { 0, 1, PauseMenu_Variant0 },
[PauseMenuScreen_15] = { 0, 1, PauseMenu_Variant0 },
[PauseMenuScreen_16] = { 0, 1, PauseMenu_Variant0 },
[PauseMenuScreen_17] = { 0, 1, PauseMenu_Variant0 },
[PauseMenuScreen_18] = { 0, 1, PauseMenu_Variant0 },
[PauseMenuScreen_19] = { 0, 1, PauseMenu_Variant0 },
};
// TODO extract the bg controls
const struct_08128AD8 gUnk_08128AD8[] = {
{ 182, 90, 1024, 7173, 7427 },
{ 183, 91, 1024, 7173, 7427 },
{ 185, 94, 34304, 7171, 7435 },
{ 184, 92, 1536, 7170, 7427 },
{ 185, 129, 1536, 7178, 7427 },
{ 204, 125, 1024, 7171, 7427 },
{ 205, 126, 1536, 7170, 7427 },
{ 185, 93, 34304, 7171, 7435 },
{ 206, 89, 3840, 7170, 7427 },
#ifdef EU
{ 0, 128, 1536, 7170, 7431 },
{ 0, 127, 1536, 7170, 7431 },
#else
{ 207, 128, 1536, 7170, 7431 },
{ 207, 127, 1536, 7170, 7431 },
#endif
};
// clang-format on
src/data/hitbox.c
+138
View File
@@ -0,0 +1,138 @@
/**
* @file hitbox.c
*
* @brief Hitboxes
*/
#include "hitbox.h"
const Hitbox gHitbox_0 = { 0, -3, { 5, 3, 3, 5 }, 6, 6 };
const Hitbox gHitbox_30 = { 0, 6, { 5, 3, 3, 5 }, 10, 16 };
const Hitbox gHitbox_31 = { 0, 6, { 5, 3, 3, 5 }, 10, 15 };
const Hitbox gHitbox_1 = { 0, 0, { 5, 3, 3, 5 }, 6, 6 };
const Hitbox gHitbox_2 = { 0, -3, { 5, 3, 3, 5 }, 8, 8 };
const Hitbox gUnk_080FD178 = { 0, 0, { 5, 3, 3, 5 }, 8, 8 };
const Hitbox gHitbox_3 = { 0, -3, { 5, 3, 3, 5 }, 12, 12 };
const Hitbox gHitbox_4 = { 0, 0, { 9, 6, 6, 9 }, 10, 10 };
const Hitbox gUnk_080FD190 = { 0, 0, { 12, 8, 8, 12 }, 14, 14 };
const Hitbox gHitbox_5 = { 0, -1, { 6, 3, 3, 6 }, 6, 5 };
const Hitbox gHitbox_6 = { 0, 0, { 4, 2, 2, 4 }, 2, 2 };
const Hitbox3D gUnk_080FD1A8 = { 0, -3, { 6, 3, 3, 6 }, 2, 2, 64, { 0, 0, 0 } };
const Hitbox gUnk_080FD1B4 = { 0, -4, { 8, 5, 6, 7 }, 8, 10 };
const Hitbox unused1 = { 0, -3, { 0, 0, 0, 0 }, 0, 0 };
const Hitbox gHitbox_7 = { 0, 0, { 2, 0, 0, 2 }, 2, 2 };
const Hitbox gHitbox_8 = { 0, 1, { 5, 2, 3, 4 }, 4, 4 };
const Hitbox gUnk_080FD1D4 = { 0, -3, { 0, 0, 0, 0 }, 10, 8 };
const Hitbox gUnk_080FD1DC = { 0, 0, { 6, 4, 4, 6 }, 6, 6 };
const Hitbox gUnk_080FD1E4 = { 0, 0, { 0, 0, 0, 0 }, 4, 4 };
const Hitbox gUnk_080FD1EC = { 0, 0, { 0, 0, 0, 0 }, 2, 2 };
const Hitbox gUnk_080FD1F4 = { 0, -1, { 6, 4, 4, 6 }, 4, 4 };
const Hitbox gUnk_080FD1FC = { 0, 0, { 6, 4, 4, 6 }, 6, 6 };
const Hitbox gUnk_080FD204 = { 0, 0, { 0, 0, 0, 0 }, 5, 5 };
const Hitbox gUnk_080FD20C = { 0, 0, { 0, 0, 0, 0 }, 4, 4 };
const Hitbox gUnk_080FD214 = { 0, 0, { 0, 0, 0, 0 }, 2, 2 };
const Hitbox gUnk_080FD21C = { 0, 0, { 6, 4, 4, 6 }, 6, 6 };
const Hitbox gUnk_080FD224 = { 0, -2, { 0, 0, 0, 0 }, 5, 3 };
const Hitbox3D gUnk_080FD22C = { 0, 0, { 5, 3, 3, 5 }, 6, 6, 12, { 0, 0, 0 } };
const Hitbox gUnk_080FD238 = { 0, 4, { 25, 8, 8, 12 }, 26, 8 };
const Hitbox gUnk_080FD240 = { 0, 12, { 28, 14, 14, 16 }, 24, 24 };
const Hitbox gUnk_080FD248 = { 0, 0, { 28, 14, 14, 16 }, 16, 16 };
const Hitbox gHitbox_9 = { 0, -4, { 5, 3, 3, 5 }, 6, 6 };
const Hitbox gUnk_080FD258 = { 0, -6, { 9, 6, 5, 10 }, 7, 8 };
const Hitbox gUnk_080FD260 = { 0, -3, { 5, 3, 3, 4 }, 3, 3 };
const Hitbox gHitbox_10 = { 0, -3, { 0, 0, 0, 0 }, 2, 3 };
const Hitbox gUnk_080FD270 = { 0, 0, { 4, 4, 4, 4 }, 2, 6 };
const Hitbox gUnk_080FD278 = { 0, 0, { 4, 4, 4, 4 }, 6, 2 };
const Hitbox gUnk_080FD280 = { 0, -2, { 0, 0, 0, 0 }, 12, 14 };
const Hitbox gUnk_080FD288 = { 0, -3, { 14, 12, 10, 12 }, 12, 10 };
const Hitbox gUnk_080FD290 = { 0, 0, { 5, 3, 3, 5 }, 6, 6 };
const Hitbox gUnk_080FD298 = { 0, 0, { 0, 0, 0, 0 }, 4, 4 };
const Hitbox gUnk_080FD2A0 = { 0, 0, { 0, 0, 0, 0 }, 2, 2 };
const Hitbox gUnk_080FD2A8 = { 0, -6, { 34, 24, 28, 32 }, 26, 21 };
const Hitbox gHitbox_11 = { 0, -4, { 0, 0, 0, 0 }, 7, 4 };
const Hitbox gHitbox_12 = { 0, -6, { 0, 0, 0, 0 }, 7, 4 };
const Hitbox gHitbox_13 = { 0, 0, { 9, 4, 4, 9 }, 4, 4 };
const Hitbox gHitbox_14 = { 0, -3, { 6, 4, 4, 6 }, 5, 5 };
const Hitbox gUnk_080FD2D0 = { 0, -8, { 5, 3, 3, 5 }, 18, 16 };
const Hitbox gUnk_080FD2D8 = { 0, -14, { 5, 3, 3, 5 }, 4, 4 };
const Hitbox gUnk_080FD2E0 = { 0, 0, { 5, 3, 3, 5 }, 12, 12 };
const Hitbox gUnk_080FD2E8 = { 0, 0, { 5, 3, 3, 5 }, 32, 32 };
const Hitbox gUnk_080FD2F0 = { 0, 0, { 6, 4, 4, 6 }, 6, 6 };
const Hitbox gHitbox_15 = { 0, 0, { 6, 4, 4, 6 }, 9, 9 };
const Hitbox gHitbox_16 = { 0, -7, { 0, 0, 0, 0 }, 8, 7 };
const Hitbox gUnk_080FD308 = { 0, -12, { 16, 8, 8, 16 }, 8, 8 };
const Hitbox gUnk_080FD310 = { 0, -2, { 5, 3, 3, 5 }, 9, 9 };
const Hitbox gHitbox_17 = { 0, 1, { 8, 6, 6, 8 }, 6, 6 };
const Hitbox gUnk_080FD320 = { 0, 0, { 5, 3, 3, 5 }, 8, 12 };
const Hitbox gUnk_080FD328 = { 0, 0, { 5, 3, 3, 5 }, 6, 12 };
const Hitbox gUnk_080FD330 = { 0, -6, { 5, 3, 3, 5 }, 6, 6 };
const Hitbox gHitbox_18 = { 0, -4, { 6, 3, 3, 6 }, 6, 6 };
const Hitbox3D gUnk_080FD340 = { 0, 0, { 6, 3, 3, 6 }, 3, 3, 16, { 0, 0, 0 } };
const Hitbox gUnk_080FD34C = { 0, 0, { 4, 2, 2, 4 }, 4, 4 };
const Hitbox gUnk_080FD354 = { 0, -2, { 0, 0, 0, 0 }, 32, 10 };
const Hitbox gUnk_080FD35C = { 11, 2, { 0, 0, 0, 0 }, 9, 8 };
const Hitbox gUnk_080FD364 = { 12, 6, { 0, 0, 0, 0 }, 9, 8 };
const Hitbox gUnk_080FD36C = { -11, 2, { 0, 0, 0, 0 }, 9, 8 };
const Hitbox gUnk_080FD374 = { -12, 6, { 0, 0, 0, 0 }, 9, 8 };
const Hitbox gUnk_080FD37C = { -2, -6, { 0, 0, 0, 0 }, 4, 5 };
const Hitbox gUnk_080FD384 = { 2, -6, { 0, 0, 0, 0 }, 4, 5 };
const Hitbox gUnk_080FD38C = { 0, 0, { 0, 0, 0, 0 }, 16, 12 };
const Hitbox gUnk_080FD394 = { 31, 2, { 0, 0, 0, 0 }, 9, 8 };
const Hitbox gUnk_080FD39C = { 8, 12, { 0, 0, 0, 0 }, 10, 10 };
const Hitbox gUnk_080FD3A4 = { 0, 12, { 0, 0, 0, 0 }, 6, 18 };
const Hitbox gUnk_080FD3AC = { -18, 10, { 0, 0, 0, 0 }, 12, 12 };
const Hitbox gUnk_080FD3B4 = { -31, 2, { 0, 0, 0, 0 }, 9, 8 };
const Hitbox gUnk_080FD3BC = { -8, 12, { 0, 0, 0, 0 }, 10, 10 };
const Hitbox gUnk_080FD3C4 = { 18, 10, { 0, 0, 0, 0 }, 12, 12 };
const Hitbox gUnk_080FD3CC = { 0, 0, { 72, 60, 60, 72 }, 40, 40 };
const Hitbox unused2 = { 0, 0, { 52, 44, 44, 52 }, 40, 40 };
const Hitbox gUnk_080FD3DC = { 0, 0, { 8, 8, 8, 8 }, 16, 16 };
const Hitbox gUnk_080FD3E4 = { 0, 0, { 8, 8, 8, 8 }, 16, 16 };
const Hitbox gUnk_080FD3EC = { 0, 0, { 8, 8, 8, 8 }, 16, 16 };
const Hitbox gUnk_080FD3F4 = { 0, 0, { 8, 5, 5, 8 }, 16, 16 };
const Hitbox3D gUnk_080FD3FC = { 0, -3, { 5, 3, 3, 5 }, 6, 6, 16, { 0, 0, 0 } };
const Hitbox gUnk_080FD408 = { 0, 0, { 9, 4, 4, 9 }, 4, 4 };
const Hitbox3D gHitbox_19 = { 0, -3, { 5, 3, 3, 5 }, 6, 6, 12, { 0, 0, 0 } };
const Hitbox gUnk_080FD41C = { 0, 0, { 0, 0, 0, 0 }, 6, 6 };
const Hitbox gUnk_080FD424 = { -3, 0, { 0, 0, 0, 0 }, 5, 6 };
const Hitbox gUnk_080FD42C = { 0, -1, { 0, 0, 0, 0 }, 6, 6 };
const Hitbox gUnk_080FD434 = { 3, 0, { 0, 0, 0, 0 }, 5, 6 };
const Hitbox3D gUnk_080FD43C = { -16, 12, { 0, 0, 0, 0 }, 8, 4, 24, { 0, 0, 0 } };
const Hitbox gHitbox_20 = { 0, 0, { 0, 0, 0, 0 }, 4, 4 };
const Hitbox gUnk_080FD450 = { 0, -3, { 0, 0, 0, 0 }, 4, 4 };
const Hitbox gHitbox_21 = { 0, 0, { 0, 0, 0, 0 }, 1, 1 };
const Hitbox gHitbox_22 = { 0, 0, { 0, 0, 0, 0 }, 2, 2 };
const Hitbox gHitbox_23 = { 0, -3, { 4, 3, 3, 4 }, 4, 4 };
const Hitbox gHitbox_32 = { 0, -5, { 9, 6, 6, 9 }, 10, 10 };
const Hitbox unused3 = { 0, -4, { 5, 3, 3, 5 }, 5, 5 };
const Hitbox gHitbox_24 = { 0, -3, { 5, 3, 3, 5 }, 3, 3 };
const Hitbox gUnk_080FD488 = { 0, -3, { 6, 3, 3, 4 }, 4, 3 };
const Hitbox gUnk_080FD490 = { 0, -3, { 3, 2, 2, 3 }, 2, 2 };
const Hitbox3D gHitbox_25 = { 0, -6, { 5, 3, 3, 5 }, 6, 6, 16, { 0, 0, 0 } };
const Hitbox3D gHitbox_26 = { 0, -5, { 4, 2, 2, 4 }, 4, 4, 16, { 0, 0, 0 } };
const Hitbox unused4 = { 0, -7, { 8, 6, 6, 8 }, 6, 6 };
const Hitbox gUnk_080FD4B8 = { 0, 0, { 0, 0, 0, 0 }, 3, 8 };
const Hitbox gUnk_080FD4C0 = { 0, 0, { 0, 0, 0, 0 }, 3, 16 };
const Hitbox gUnk_080FD4C8 = { 0, 0, { 0, 0, 0, 0 }, 3, 24 };
const Hitbox gUnk_080FD4D0 = { 0, 0, { 0, 0, 0, 0 }, 3, 32 };
const Hitbox gUnk_080FD4D8 = { 0, 0, { 0, 0, 0, 0 }, 3, 40 };
const Hitbox gUnk_080FD4E0 = { 0, 0, { 0, 0, 0, 0 }, 3, 48 };
const Hitbox gUnk_080FD4E8 = { 0, 0, { 0, 0, 0, 0 }, 3, 56 };
const Hitbox gUnk_080FD4F0 = { 0, 0, { 0, 0, 0, 0 }, 16, 3 };
const Hitbox gUnk_080FD4F8 = { 0, 0, { 0, 0, 0, 0 }, 24, 3 };
const Hitbox gUnk_080FD500 = { 0, 0, { 0, 0, 0, 0 }, 32, 3 };
const Hitbox gUnk_080FD508 = { 0, 0, { 0, 0, 0, 0 }, 40, 3 };
const Hitbox gUnk_080FD510 = { 0, 0, { 0, 0, 0, 0 }, 48, 3 };
const Hitbox gUnk_080FD518 = { 0, 0, { 0, 0, 0, 0 }, 56, 3 };
const Hitbox gUnk_080FD520 = { 0, 0, { 0, 0, 0, 0 }, 64, 3 };
const Hitbox gHitbox_27 = { 0, 0, { 3, 2, 2, 3 }, 1, 1 };
const Hitbox gUnk_080FD530 = { 0, 9, { 10, 8, 8, 10 }, 12, 12 };
const Hitbox3D gUnk_080FD538 = { 0, -4, { 28, 23, 23, 28 }, 6, 6, 10, { 0, 0, 0 } };
const Hitbox gUnk_080FD544 = { 0, -20, { 36, 24, 28, 32 }, 16, 16 };
const Hitbox3D gHitbox_28 = { 0, 0, { 0, 0, 0, 0 }, 16, 16, 14, { 0, 0, 0 } };
const Hitbox gUnk_080FD558 = { 0, 0, { 5, 3, 3, 5 }, 4, 4 };
const Hitbox gUnk_080FD560 = { 0, 0, { 0, 0, 0, 0 }, 1, 1 };
const Hitbox gHitbox_29 = { 0, -4, { 7, 5, 5, 7 }, 7, 7 };
const Hitbox gUnk_080FD570 = { 0, -4, { 0, 0, 0, 0 }, 8, 6 };
const Hitbox gUnk_080FD578 = { 0, -4, { 0, 0, 0, 0 }, 12, 6 };
const Hitbox gUnk_080FD580 = { 0, -3, { 8, 5, 5, 8 }, 10, 10 };
const Hitbox gUnk_080FD588 = { 0, -7, { 5, 3, 3, 5 }, 6, 6 };
src/data/objPalettes.c
+132
View File
@@ -0,0 +1,132 @@
#include "global.h"
#include "assets/gfx_offsets.h"
const u32 gUnk_08133368[] = {
offset_gPalette_14 | 1 << 0x18, offset_gPalette_15 | 1 << 0x18, offset_gPalette_16 | 1 << 0x18,
offset_gPalette_17 | 1 << 0x18, offset_gPalette_22 | 1 << 0x18, offset_gPalette_23 | 1 << 0x18,
offset_gPalette_102 | 1 << 0x18, offset_gPalette_321 | 1 << 0x18, offset_gPalette_100 | 1 << 0x18,
offset_gPalette_101 | 1 << 0x18, offset_gPalette_103 | 1 << 0x18, offset_gPalette_118 | 1 << 0x18,
offset_gPalette_105 | 1 << 0x18, offset_gPalette_104 | 1 << 0x18, offset_gPalette_106 | 1 << 0x18,
offset_gPalette_89 | 1 << 0x18, offset_gPalette_90 | 1 << 0x18, offset_gPalette_91 | 1 << 0x18,
offset_gPalette_107 | 1 << 0x18, offset_gPalette_109 | 1 << 0x18, offset_gPalette_94 | 1 << 0x18,
offset_gPalette_47 | 1 << 0x18, offset_gPalette_79 | 1 << 0x18, offset_gPalette_80 | 1 << 0x18,
offset_gPalette_24 | 1 << 0x18, offset_gPalette_679 | 1 << 0x18, offset_gPalette_205 | 1 << 0x18,
offset_gPalette_206 | 1 << 0x18, offset_gPalette_207 | 1 << 0x18, offset_gPalette_239 | 1 << 0x18,
offset_gPalette_231 | 1 << 0x18, offset_gPalette_133 | 1 << 0x18, offset_gPalette_134 | 1 << 0x18,
offset_gPalette_129 | 1 << 0x18, offset_gPalette_135 | 1 << 0x18, offset_gPalette_136 | 1 << 0x18,
offset_gPalette_137 | 1 << 0x18, offset_gPalette_138 | 1 << 0x18, offset_gPalette_139 | 1 << 0x18,
offset_gPalette_140 | 1 << 0x18, offset_gPalette_130 | 1 << 0x18, offset_gPalette_131 | 1 << 0x18,
offset_gPalette_132 | 1 << 0x18, offset_gPalette_141 | 1 << 0x18, offset_gPalette_142 | 1 << 0x18,
offset_gPalette_144 | 1 << 0x18, offset_gPalette_145 | 1 << 0x18, offset_gPalette_146 | 1 << 0x18,
offset_gPalette_143 | 1 << 0x18, offset_gPalette_147 | 1 << 0x18, offset_gPalette_148 | 1 << 0x18,
offset_gPalette_149 | 1 << 0x18, offset_gPalette_150 | 1 << 0x18, offset_gPalette_151 | 1 << 0x18,
offset_gPalette_152 | 1 << 0x18, offset_gPalette_153 | 1 << 0x18, offset_gPalette_154 | 1 << 0x18,
offset_gPalette_155 | 1 << 0x18, offset_gPalette_128 | 1 << 0x18, offset_gPalette_156 | 1 << 0x18,
offset_gPalette_168 | 1 << 0x18, offset_gPalette_169 | 1 << 0x18, offset_gPalette_170 | 1 << 0x18,
offset_gPalette_248 | 1 << 0x18, offset_gPalette_249 | 1 << 0x18, offset_gPalette_250 | 1 << 0x18,
offset_gPalette_251 | 1 << 0x18, offset_gPalette_252 | 1 << 0x18, offset_gPalette_253 | 1 << 0x18,
offset_gPalette_254 | 1 << 0x18, offset_gPalette_255 | 1 << 0x18, offset_gPalette_256 | 1 << 0x18,
offset_gPalette_257 | 1 << 0x18, offset_gPalette_258 | 1 << 0x18, offset_gPalette_259 | 1 << 0x18,
offset_gPalette_260 | 1 << 0x18, offset_gPalette_261 | 1 << 0x18, offset_gPalette_262 | 1 << 0x18,
offset_gPalette_263 | 1 << 0x18, offset_gPalette_264 | 1 << 0x18, offset_gPalette_265 | 1 << 0x18,
offset_gPalette_266 | 1 << 0x18, offset_gPalette_267 | 1 << 0x18, offset_gPalette_268 | 1 << 0x18,
offset_gPalette_269 | 1 << 0x18, offset_gPalette_270 | 1 << 0x18, offset_gPalette_271 | 1 << 0x18,
offset_gPalette_3773 | 1 << 0x18, offset_gPalette_92 | 1 << 0x18, offset_gPalette_85 | 1 << 0x18,
offset_gPalette_86 | 1 << 0x18, offset_gPalette_87 | 1 << 0x18, offset_gPalette_3774 | 1 << 0x18,
offset_gPalette_123 | 1 << 0x18, offset_gPalette_2212 | 1 << 0x18, offset_gPalette_2213 | 1 << 0x18,
offset_gPalette_124 | 1 << 0x18, offset_gPalette_42 | 1 << 0x18, offset_gPalette_235 | 1 << 0x18,
offset_gPalette_236 | 1 << 0x18, offset_gPalette_237 | 1 << 0x18, offset_gPalette_238 | 1 << 0x18,
offset_gPalette_108 | 1 << 0x18, offset_gPalette_93 | 1 << 0x18, offset_gPalette_680 | 1 << 0x18,
offset_gPalette_43 | 1 << 0x18, offset_gPalette_44 | 1 << 0x18, offset_gPalette_45 | 1 << 0x18,
offset_gPalette_46 | 1 << 0x18, offset_gPalette_125 | 1 << 0x18, offset_gPalette_284 | 1 << 0x18,
offset_gPalette_283 | 1 << 0x18, offset_gPalette_285 | 1 << 0x18, offset_gPalette_286 | 1 << 0x18,
offset_gPalette_287 | 1 << 0x18, offset_gPalette_288 | 1 << 0x18, offset_gPalette_289 | 1 << 0x18,
offset_gPalette_290 | 1 << 0x18, offset_gPalette_291 | 1 << 0x18, offset_gPalette_292 | 1 << 0x18,
offset_gPalette_293 | 1 << 0x18, offset_gPalette_294 | 1 << 0x18, offset_gPalette_295 | 1 << 0x18,
offset_gPalette_296 | 1 << 0x18, offset_gPalette_297 | 1 << 0x18, offset_gPalette_2214 | 1 << 0x18,
offset_gPalette_224 | 1 << 0x18, offset_gPalette_225 | 1 << 0x18, offset_gPalette_226 | 1 << 0x18,
offset_gPalette_227 | 1 << 0x18, offset_gPalette_228 | 1 << 0x18, offset_gPalette_229 | 1 << 0x18,
offset_gPalette_1261 | 1 << 0x18, offset_gPalette_318 | 1 << 0x18, offset_gPalette_319 | 1 << 0x18,
offset_gPalette_320 | 1 << 0x18, offset_gPalette_2140 | 1 << 0x18, offset_gPalette_2141 | 1 << 0x18,
offset_gPalette_2142 | 1 << 0x18, offset_gPalette_2159 | 1 << 0x18, offset_gPalette_2160 | 1 << 0x18,
offset_gPalette_2161 | 1 << 0x18, offset_gPalette_2178 | 1 << 0x18, offset_gPalette_2179 | 1 << 0x18,
offset_gPalette_2180 | 1 << 0x18, offset_gPalette_2197 | 1 << 0x18, offset_gPalette_2198 | 1 << 0x18,
offset_gPalette_2199 | 1 << 0x18, offset_gPalette_95 | 1 << 0x18, offset_gPalette_18 | 1 << 0x18,
offset_gPalette_19 | 1 << 0x18, offset_gPalette_20 | 1 << 0x18, offset_gPalette_21 | 1 << 0x18,
offset_gPalette_96 | 1 << 0x18, offset_gPalette_97 | 1 << 0x18, offset_gPalette_98 | 1 << 0x18,
offset_gPalette_99 | 1 << 0x18, offset_gPalette_110 | 1 << 0x18, offset_gPalette_208 | 2 << 0x18,
offset_gPalette_210 | 2 << 0x18, offset_gPalette_233 | 1 << 0x18, offset_gPalette_157 | 1 << 0x18,
offset_gPalette_158 | 1 << 0x18, offset_gPalette_159 | 1 << 0x18, offset_gPalette_160 | 1 << 0x18,
offset_gPalette_161 | 1 << 0x18, offset_gPalette_162 | 1 << 0x18, offset_gPalette_163 | 1 << 0x18,
offset_gPalette_164 | 1 << 0x18, offset_gPalette_165 | 1 << 0x18, offset_gPalette_166 | 1 << 0x18,
offset_gPalette_167 | 1 << 0x18, offset_gPalette_171 | 1 << 0x18, offset_gPalette_172 | 1 << 0x18,
offset_gPalette_173 | 1 << 0x18, offset_gPalette_234 | 1 << 0x18, offset_gPalette_111 | 1 << 0x18,
offset_gPalette_113 | 1 << 0x18, offset_gPalette_114 | 1 << 0x18, offset_gPalette_48 | 1 << 0x18,
offset_gPalette_49 | 1 << 0x18, offset_gPalette_50 | 1 << 0x18, offset_gPalette_51 | 1 << 0x18,
offset_gPalette_52 | 1 << 0x18, offset_gPalette_53 | 1 << 0x18, offset_gPalette_54 | 1 << 0x18,
offset_gPalette_322 | 1 << 0x18, offset_gPalette_299 | 1 << 0x18, offset_gPalette_300 | 1 << 0x18,
offset_gPalette_298 | 1 << 0x18, offset_gPalette_301 | 1 << 0x18, offset_gPalette_303 | 1 << 0x18,
offset_gPalette_304 | 1 << 0x18, offset_gPalette_305 | 1 << 0x18, offset_gPalette_306 | 1 << 0x18,
offset_gPalette_307 | 1 << 0x18, offset_gPalette_55 | 1 << 0x18, offset_gPalette_57 | 1 << 0x18,
offset_gPalette_58 | 1 << 0x18, offset_gPalette_59 | 1 << 0x18, offset_gPalette_60 | 1 << 0x18,
offset_gPalette_61 | 1 << 0x18, offset_gPalette_62 | 1 << 0x18, offset_gPalette_63 | 1 << 0x18,
offset_gPalette_64 | 1 << 0x18, offset_gPalette_65 | 1 << 0x18, offset_gPalette_66 | 1 << 0x18,
offset_gPalette_67 | 1 << 0x18, offset_gPalette_68 | 1 << 0x18, offset_gPalette_69 | 1 << 0x18,
offset_gPalette_70 | 1 << 0x18, offset_gPalette_174 | 1 << 0x18, offset_gPalette_212 | 1 << 0x18,
offset_gPalette_213 | 1 << 0x18, offset_gPalette_214 | 1 << 0x18, offset_gPalette_215 | 1 << 0x18,
offset_gPalette_216 | 1 << 0x18, offset_gPalette_72 | 1 << 0x18, offset_gPalette_78 | 1 << 0x18,
offset_gPalette_73 | 1 << 0x18, offset_gPalette_74 | 1 << 0x18, offset_gPalette_75 | 1 << 0x18,
offset_gPalette_76 | 1 << 0x18, offset_gPalette_77 | 1 << 0x18, offset_gPalette_175 | 1 << 0x18,
offset_gPalette_176 | 1 << 0x18, offset_gPalette_177 | 1 << 0x18, offset_gPalette_178 | 1 << 0x18,
offset_gPalette_179 | 1 << 0x18, offset_gPalette_180 | 1 << 0x18, offset_gPalette_181 | 1 << 0x18,
offset_gPalette_182 | 1 << 0x18, offset_gPalette_183 | 1 << 0x18, offset_gPalette_184 | 1 << 0x18,
offset_gPalette_185 | 1 << 0x18, offset_gPalette_186 | 1 << 0x18, offset_gPalette_187 | 1 << 0x18,
offset_gPalette_188 | 1 << 0x18, offset_gPalette_189 | 1 << 0x18, offset_gPalette_190 | 1 << 0x18,
offset_gPalette_191 | 1 << 0x18, offset_gPalette_192 | 1 << 0x18, offset_gPalette_193 | 1 << 0x18,
offset_gPalette_194 | 1 << 0x18, offset_gPalette_195 | 1 << 0x18, offset_gPalette_196 | 1 << 0x18,
offset_gPalette_197 | 1 << 0x18, offset_gPalette_198 | 1 << 0x18, offset_gPalette_199 | 1 << 0x18,
offset_gPalette_200 | 1 << 0x18, offset_gPalette_201 | 1 << 0x18, offset_gPalette_202 | 1 << 0x18,
offset_gPalette_308 | 1 << 0x18, offset_gPalette_309 | 1 << 0x18, offset_gPalette_310 | 1 << 0x18,
offset_gPalette_311 | 1 << 0x18, offset_gPalette_312 | 1 << 0x18, offset_gPalette_313 | 1 << 0x18,
offset_gPalette_282 | 1 << 0x18, offset_gPalette_217 | 1 << 0x18, offset_gPalette_204 | 1 << 0x18,
offset_gPalette_218 | 2 << 0x18, offset_gPalette_220 | 1 << 0x18, offset_gPalette_221 | 1 << 0x18,
offset_gPalette_222 | 1 << 0x18, offset_gPalette_127 | 1 << 0x18, offset_gPalette_115 | 1 << 0x18,
offset_gPalette_302 | 1 << 0x18, offset_gPalette_274 | 1 << 0x18, offset_gPalette_275 | 1 << 0x18,
offset_gPalette_276 | 1 << 0x18, offset_gPalette_277 | 1 << 0x18, offset_gPalette_278 | 1 << 0x18,
offset_gPalette_279 | 1 << 0x18, offset_gPalette_329 | 1 << 0x18, offset_gPalette_331 | 1 << 0x18,
offset_gPalette_332 | 1 << 0x18, offset_gPalette_116 | 1 << 0x18, offset_gPalette_334 | 1 << 0x18,
offset_gPalette_344 | 1 << 0x18, offset_gPalette_345 | 1 << 0x18, offset_gPalette_346 | 1 << 0x18,
offset_gPalette_347 | 1 << 0x18, offset_gPalette_348 | 1 << 0x18, offset_gPalette_349 | 1 << 0x18,
offset_gPalette_350 | 1 << 0x18, offset_gPalette_71 | 1 << 0x18, offset_gPalette_56 | 1 << 0x18,
offset_gPalette_328 | 1 << 0x18, offset_gPalette_232 | 1 << 0x18, offset_gPalette_25 | 1 << 0x18,
offset_gPalette_26 | 1 << 0x18, offset_gPalette_117 | 1 << 0x18, offset_gPalette_27 | 1 << 0x18,
offset_gPalette_28 | 1 << 0x18, offset_gPalette_29 | 1 << 0x18, offset_gPalette_30 | 1 << 0x18,
offset_gPalette_31 | 1 << 0x18, offset_gPalette_32 | 1 << 0x18, offset_gPalette_280 | 1 << 0x18,
offset_gPalette_281 | 1 << 0x18, offset_gPalette_333 | 1 << 0x18, offset_gPalette_314 | 1 << 0x18,
offset_gPalette_315 | 1 << 0x18, offset_gPalette_316 | 1 << 0x18, offset_gPalette_317 | 1 << 0x18,
offset_gPalette_330 | 1 << 0x18, offset_gPalette_335 | 1 << 0x18, offset_gPalette_336 | 1 << 0x18,
offset_gPalette_337 | 1 << 0x18, offset_gPalette_338 | 1 << 0x18, offset_gPalette_339 | 1 << 0x18,
offset_gPalette_340 | 1 << 0x18, offset_gPalette_341 | 1 << 0x18, offset_gPalette_342 | 1 << 0x18,
offset_gPalette_343 | 1 << 0x18, offset_gPalette_82 | 1 << 0x18, offset_gPalette_223 | 1 << 0x18,
offset_gPalette_240 | 1 << 0x18, offset_gPalette_241 | 1 << 0x18, offset_gPalette_242 | 1 << 0x18,
offset_gPalette_243 | 1 << 0x18, offset_gPalette_244 | 1 << 0x18, offset_gPalette_245 | 1 << 0x18,
offset_gPalette_246 | 1 << 0x18, offset_gPalette_247 | 1 << 0x18, offset_gPalette_272 | 1 << 0x18,
offset_gPalette_273 | 1 << 0x18, offset_gPalette_352 | 1 << 0x18, offset_gPalette_353 | 1 << 0x18,
offset_gPalette_351 | 1 << 0x18, offset_gPalette_126 | 1 << 0x18, offset_gPalette_327 | 1 << 0x18,
offset_gPalette_203 | 1 << 0x18, offset_gPalette_3430 | 1 << 0x18, offset_gPalette_3431 | 1 << 0x18,
offset_gPalette_3432 | 2 << 0x18, offset_gPalette_3434 | 1 << 0x18, offset_gPalette_3435 | 1 << 0x18,
offset_gPalette_3436 | 1 << 0x18, offset_gPalette_9 | 1 << 0x18, offset_gPalette_33 | 1 << 0x18,
offset_gPalette_34 | 1 << 0x18, offset_gPalette_35 | 1 << 0x18, offset_gPalette_36 | 1 << 0x18,
offset_gPalette_37 | 1 << 0x18, offset_gPalette_38 | 1 << 0x18, offset_gPalette_39 | 1 << 0x18,
offset_gPalette_40 | 1 << 0x18, offset_gPalette_41 | 1 << 0x18, offset_gPalette_83 | 1 << 0x18,
offset_gPalette_119 | 1 << 0x18, offset_gPalette_120 | 1 << 0x18, offset_gPalette_121 | 1 << 0x18,
offset_gPalette_81 | 1 << 0x18, offset_gPalette_84 | 1 << 0x18, offset_gPalette_88 | 1 << 0x18,
offset_gPalette_230 | 1 << 0x18,
#ifdef EU
offset_gPalette_2257 | 1 << 0x18, offset_gPalette_2258 | 1 << 0x18,
#else
offset_gPalette_2259 | 1 << 0x18, offset_gPalette_2260 | 1 << 0x18,
#endif
offset_gPalette_10 | 1 << 0x18, offset_gPalette_112 | 1 << 0x18, offset_gPalette_122 | 1 << 0x18,
offset_gPalette_13 | 1 << 0x18,
};

Some files were not shown because too many files have changed in this diff Show More