diff options
Diffstat (limited to 'data')
62 files changed, 1407 insertions, 2965 deletions
diff --git a/data/animations/npc/bladeBrothers.s b/data/animations/npc/bladeBrothers.s index 4ae287d6..9e768314 100644 --- a/data/animations/npc/bladeBrothers.s +++ b/data/animations/npc/bladeBrothers.s @@ -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" diff --git a/data/animations/npc/kid.s b/data/animations/npc/kid.s index 7c0ab4e6..fcaf867e 100644 --- a/data/animations/npc/kid.s +++ b/data/animations/npc/kid.s @@ -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 diff --git a/data/animations/npc/sturgeon.s b/data/animations/npc/sturgeon.s index 9b38a7b6..a4fa9b14 100644 --- a/data/animations/npc/sturgeon.s +++ b/data/animations/npc/sturgeon.s @@ -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
\ No newline at end of file diff --git a/data/const/objectUtils.s b/data/animations/spriteAnimations166.s index 4ec60fa0..e49e063d 100644 --- a/data/const/objectUtils.s +++ b/data/animations/spriteAnimations166.s @@ -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" diff --git a/data/animations/spriteAnimations322.s b/data/animations/spriteAnimations322.s new file mode 100644 index 00000000..34951694 --- /dev/null +++ b/data/animations/spriteAnimations322.s @@ -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 diff --git a/data/const/collisionMatrix.s b/data/const/collisionMatrix.s new file mode 100644 index 00000000..14af6d20 --- /dev/null +++ b/data/const/collisionMatrix.s @@ -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" diff --git a/data/const/enemyUtils.s b/data/const/enemyUtils.s deleted file mode 100644 index c1af4f6d..00000000 --- a/data/const/enemyUtils.s +++ /dev/null @@ -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" diff --git a/data/const/enterPortalSubtask.s b/data/const/enterPortalSubtask.s deleted file mode 100644 index 6a48b0a8..00000000 --- a/data/const/enterPortalSubtask.s +++ /dev/null @@ -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" diff --git a/data/const/entity.s b/data/const/entity.s index 6d01b7ba..af8d9ff0 100644 --- a/data/const/entity.s +++ b/data/const/entity.s @@ -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" diff --git a/data/const/fade.s b/data/const/fade.s deleted file mode 100644 index 2a313307..00000000 --- a/data/const/fade.s +++ /dev/null @@ -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" diff --git a/data/const/figurine_menu.s b/data/const/figurine_menu.s deleted file mode 100644 index ab68b97d..00000000 --- a/data/const/figurine_menu.s +++ /dev/null @@ -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 diff --git a/data/const/fileselect_after.s b/data/const/fileselect_after.s deleted file mode 100644 index 3f38e66b..00000000 --- a/data/const/fileselect_after.s +++ /dev/null @@ -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 diff --git a/data/const/fileselect_before.s b/data/const/fileselect_before.s deleted file mode 100644 index bd996c19..00000000 --- a/data/const/fileselect_before.s +++ /dev/null @@ -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" diff --git a/data/const/game.s b/data/const/game.s deleted file mode 100644 index e2ae564b..00000000 --- a/data/const/game.s +++ /dev/null @@ -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" diff --git a/data/const/game_2.s b/data/const/game_2.s index b39ff9aa..b2567dbf 100644 --- a/data/const/game_2.s +++ b/data/const/game_2.s @@ -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 diff --git a/data/const/manager/enterRoomTextboxManager.s b/data/const/manager/enterRoomTextboxManager.s index 9b1984ac..40870ad3 100644 --- a/data/const/manager/enterRoomTextboxManager.s +++ b/data/const/manager/enterRoomTextboxManager.s @@ -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" diff --git a/data/const/movement.s b/data/const/movement.s deleted file mode 100644 index e85c3236..00000000 --- a/data/const/movement.s +++ /dev/null @@ -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 diff --git a/data/const/npc/bladeBrothers.s b/data/const/npc/bladeBrothers.s deleted file mode 100644 index e96d6f92..00000000 --- a/data/const/npc/bladeBrothers.s +++ /dev/null @@ -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" diff --git a/data/const/npc/dog.s b/data/const/npc/dog.s deleted file mode 100644 index 1052fe61..00000000 --- a/data/const/npc/dog.s +++ /dev/null @@ -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" diff --git a/data/const/npc/forestMinish.s b/data/const/npc/forestMinish.s deleted file mode 100644 index 97cf8805..00000000 --- a/data/const/npc/forestMinish.s +++ /dev/null @@ -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" diff --git a/data/const/npc/gorman.s b/data/const/npc/gorman.s deleted file mode 100644 index ddd35df3..00000000 --- a/data/const/npc/gorman.s +++ /dev/null @@ -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" - diff --git a/data/const/npc/guard.s b/data/const/npc/guard.s index 5cefab70..80437a5e 100644 --- a/data/const/npc/guard.s +++ b/data/const/npc/guard.s @@ -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" diff --git a/data/const/npc/kid.s b/data/const/npc/kid.s deleted file mode 100644 index 40071f15..00000000 --- a/data/const/npc/kid.s +++ /dev/null @@ -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" - diff --git a/data/const/npc/postman.s b/data/const/npc/postman.s deleted file mode 100644 index 4c069bbe..00000000 --- a/data/const/npc/postman.s +++ /dev/null @@ -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" diff --git a/data/const/npc/sittingPerson.s b/data/const/npc/sittingPerson.s deleted file mode 100644 index 38ddfe1f..00000000 --- a/data/const/npc/sittingPerson.s +++ /dev/null @@ -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" diff --git a/data/const/npc/sturgeon.s b/data/const/npc/sturgeon.s index 7da0e49d..669693b4 100644 --- a/data/const/npc/sturgeon.s +++ b/data/const/npc/sturgeon.s @@ -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" diff --git a/data/const/npcUtils.s b/data/const/npcUtils.s deleted file mode 100644 index d532a0fe..00000000 --- a/data/const/npcUtils.s +++ /dev/null @@ -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" - diff --git a/data/const/playerItem/playerItemBow.s b/data/const/playerItem/playerItemBow.s deleted file mode 100644 index 6c7e9b98..00000000 --- a/data/const/playerItem/playerItemBow.s +++ /dev/null @@ -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" diff --git a/data/const/playerItem/playerItemCellOverwriteSet.s b/data/const/playerItem/playerItemCellOverwriteSet.s index ff2bddd6..97280cad 100644 --- a/data/const/playerItem/playerItemCellOverwriteSet.s +++ b/data/const/playerItem/playerItemCellOverwriteSet.s @@ -2,7 +2,7 @@ .include "constants/constants.inc" .section .rodata - .align 2 + @.align 2 @ before: playerItemBottle @ after: playerItemCellOverwriteSet diff --git a/data/const/playerItem/playerItemShield.s b/data/const/playerItem/playerItemShield.s deleted file mode 100644 index f782d79a..00000000 --- a/data/const/playerItem/playerItemShield.s +++ /dev/null @@ -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" diff --git a/data/const/playerUtils.s b/data/const/playerUtils.s deleted file mode 100644 index ae459b34..00000000 --- a/data/const/playerUtils.s +++ /dev/null @@ -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" diff --git a/data/const/sub_08055E08.s b/data/const/sub_08055E08.s deleted file mode 100644 index 886a191c..00000000 --- a/data/const/sub_08055E08.s +++ /dev/null @@ -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 diff --git a/data/const/subtask.s b/data/const/subtask.s index e1c00700..a5234fc3 100644 --- a/data/const/subtask.s +++ b/data/const/subtask.s @@ -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 - -gUnk_080FEEC8:: @ 080FEEC8 - .4byte sub_08054D04 - .4byte sub_08054D3C - .4byte sub_08054D74 - -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_080FEF34:: @ 080FEF34 - .4byte sub_08054DAC - .4byte nullsub_484 - -gUnk_080FEF3C:: @ 080FEF3C - .4byte sub_08054E1C - .4byte sub_08054E5C - .4byte sub_08054E9C - -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_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_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_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_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_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_080FF108:: @ 080FF108 - .4byte gUnk_080FEF48 - .4byte gUnk_080FEF78 - .4byte gUnk_080FEFA8 - .4byte gUnk_080FEFE8 - .4byte gUnk_080FF038 - .4byte gUnk_080FF098 - -gUnk_080FF120:: @ 080FF120 - .4byte sub_08054FAC - .4byte sub_08055014 - -gUnk_080FF128:: @ 080FF128 - .incbin "data_080FEEB8/gUnk_080FF128.bin" - .4byte script_GoronMerchantArriving - .incbin "data_080FEEB8/gUnk_080FF128_1.bin" - -gUnk_080FF148:: @ 080FF148 - .4byte sub_08055054 - .4byte sub_0805508C - .4byte sub_08055090 - -gUnk_080FF154:: @ 080FF154 - .incbin "data_080FEEB8/gUnk_080FF154.bin" - .4byte script_MutohKinstone - .incbin "data_080FEEB8/gUnk_080FF154_1.bin" - -gUnk_080FF174:: @ 080FF174 - .4byte sub_080550B0 - .4byte nullsub_487 - -gUnk_080FF17C:: @ 080FF17C - .incbin "data_080FEEB8/gUnk_080FF17C.bin" - .4byte script_GhostBrotherKinstone - .incbin "data_080FEEB8/gUnk_080FF17C_1.bin" - -gUnk_080FF1CC:: @ 080FF1CC - .4byte sub_08055114 - .4byte nullsub_488 - -gUnk_080FF1D4:: @ 080FF1D4 - .incbin "data_080FEEB8/gUnk_080FF1D4.bin" - -gUnk_080FF1F4:: @ 080FF1F4 - .4byte sub_08055184 - .4byte sub_08055224 - .4byte sub_0805524C - .4byte sub_080552E0 - -gUnk_080FF204:: @ 080FF204 - .incbin "data_080FEEB8/gUnk_080FF204.bin" - -gUnk_080FF228:: @ 080FF228 - .4byte sub_08055318 - .4byte sub_08055350 - .4byte sub_08055380 - .4byte sub_080553B8 - -gUnk_080FF238:: @ 080FF238 - .4byte sub_08055430 - .4byte sub_08055468 - .4byte sub_08055498 - .4byte sub_080554D4 - -gUnk_080FF248:: @ 080FF248 - .4byte sub_08055518 - .4byte sub_08055548 - .4byte sub_08055580 - -gUnk_080FF254:: @ 080FF254 - .4byte sub_080555B8 - .4byte sub_0805560C - .4byte sub_08055634 - .4byte sub_08055674 - -gUnk_080FF264:: @ 080FF264 - .incbin "data_080FEEB8/gUnk_080FF264.bin" - .4byte script_CarlovKinstone - .incbin "data_080FEEB8/gUnk_080FF264_1.bin" - -gUnk_080FF284:: @ 080FF284 - .4byte sub_080556AC - .4byte nullsub_489 - -gUnk_080FF28C:: @ 080FF28C - .4byte sub_08055710 - .4byte sub_0805576C - .4byte sub_08055798 - -gUnk_080FF298:: @ 080FF298 - .incbin "data_080FEEB8/gUnk_080FF298.bin" - -gUnk_080FF2B8:: @ 080FF2B8 - .4byte sub_080557D0 - .4byte nullsub_490 - -gUnk_080FF2C0:: @ 080FF2C0 - .incbin "data_080FEEB8/gUnk_080FF2C0.bin" - .4byte script_GormanFirstAppearance - .incbin "data_080FEEB8/gUnk_080FF2C0_1.bin" - -gUnk_080FF300:: @ 080FF300 - .4byte sub_08055834 - .4byte nullsub_491 - -gUnk_080FF308:: @ 080FF308 - .incbin "data_080FEEB8/gUnk_080FF308.bin" - .4byte script_SyrupKinstone - .incbin "data_080FEEB8/gUnk_080FF308_1.bin" - -gUnk_080FF328:: @ 080FF328 - .4byte sub_080558A4 - .4byte nullsub_492 - -gUnk_080FF330:: @ 080FF330 - .4byte sub_08055908 - .4byte sub_08055948 - .4byte sub_08055978 - -gUnk_080FF33C:: @ 080FF33C - .incbin "data_080FEEB8/gUnk_080FF33C.bin" - -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 +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" + +Subtask_MapHint_Functions:: @ 08128E70 + .4byte Subtask_MapHint_0 + .4byte Subtask_MapHint_1 + +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 + +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_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 diff --git a/data/const/subtask2.s b/data/const/subtask2.s deleted file mode 100644 index 537031fd..00000000 --- a/data/const/subtask2.s +++ /dev/null @@ -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 diff --git a/data/const/ui.s b/data/const/ui.s index 21114cf0..23f3eaeb 100644 --- a/data/const/ui.s +++ b/data/const/ui.s @@ -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 diff --git a/data/gfx/gfx_and_palettes.s b/data/gfx/gfx_and_palettes.s index 9a4e60af..91af788c 100644 --- a/data/gfx/gfx_and_palettes.s +++ b/data/gfx/gfx_and_palettes.s @@ -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" diff --git a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc index f2ee4050..135e95c0 100644 --- a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc +++ b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc @@ -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 diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 7ee1968c..126ad33e 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -24,7 +24,7 @@ script_0800D650: Call sub_0807FBC4 Call sub_0807FBA0 SetEntitySpeed 0x0700 - _0807F0B4 0x0007 + SetScrollSpeed 7 CameraTargetEntity _0807EDD4 0x01e8, 0x01b8 Wait 0x003c diff --git a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc index 9a46581f..f4372344 100644 --- a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc +++ b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc @@ -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 diff --git a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc index 76640636..65c464af 100644 --- a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc +++ b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc @@ -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 diff --git a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc index 60b87ab5..f63130ca 100644 --- a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc @@ -12,7 +12,7 @@ SCRIPT_START script_Npc4EOutsideLinksHouse WaitForFadeFinish SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 - _0807F0B4 0x0004 + SetScrollSpeed 4 CameraTargetPlayer Call EnablePauseMenu EnablePlayerControl diff --git a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc index be79b6e2..f89bcaa1 100644 --- a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc @@ -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 diff --git a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc index 074c3e75..c1affdb9 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc @@ -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 diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc index 1aa6c7fa..eb566324 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc @@ -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 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc index cd6a0d9b..0884bbc7 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc @@ -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 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc index 0a7ccb4a..14a92e0c 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc @@ -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 diff --git a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc index 952b62d8..bfcfdea3 100644 --- a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc @@ -1,7 +1,7 @@ @ Hyrule Town NPC4E Kinstone Cutscene SCRIPT_START script_Npc4EFirstKinstone BeginBlock - _0807F0B4 0x0001 + SetScrollSpeed 1 CameraTargetPlayer EndBlock script_0800F09A: diff --git a/data/scripts/cutscene/originStory/script_CutsceneOrchestratorMinishVaati.inc b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorMinishVaati.inc index e18c6468..38109c0e 100644 --- a/data/scripts/cutscene/originStory/script_CutsceneOrchestratorMinishVaati.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorMinishVaati.inc @@ -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 diff --git a/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc index 6d3e1cbe..a04a4ef1 100644 --- a/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc @@ -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 diff --git a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc index a802c19a..53cf9705 100644 --- a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc +++ b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc @@ -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 diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc index d4e0b0ab..b20b5172 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc @@ -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 diff --git a/data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeoverCutscene.inc b/data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeoverCutscene.inc index 0ea36fde..5f75acdc 100644 --- a/data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeoverCutscene.inc +++ b/data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeoverCutscene.inc @@ -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 diff --git a/data/scripts/dhc/script_CutsceneOrchestratorVaatiWithZelda.inc b/data/scripts/dhc/script_CutsceneOrchestratorVaatiWithZelda.inc index dcbe756b..f6743f5b 100644 --- a/data/scripts/dhc/script_CutsceneOrchestratorVaatiWithZelda.inc +++ b/data/scripts/dhc/script_CutsceneOrchestratorVaatiWithZelda.inc @@ -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 diff --git a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc index cadcafdc..a147db33 100644 --- a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc @@ -8,7 +8,7 @@ script_0800DB7C: SetPlayerIdle Call WaitForPlayerNormal Call DisablePauseMenuAndPutAwayItems - _0807F0B4 0x0001 + SetScrollSpeed 1 SetEntityPositionRelative 0x0078, 0x0078 CameraTargetEntity Call WaitForCameraTouchRoomBorder diff --git a/data/scripts/dhc/script_Vaati1Intro.inc b/data/scripts/dhc/script_Vaati1Intro.inc index 8e7a3d72..30ea180c 100644 --- a/data/scripts/dhc/script_Vaati1Intro.inc +++ b/data/scripts/dhc/script_Vaati1Intro.inc @@ -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 diff --git a/data/scripts/hyruleTown/script_CutsceneOrchestratorAllBooksCollected.inc b/data/scripts/hyruleTown/script_CutsceneOrchestratorAllBooksCollected.inc index 148ddcf9..133c4a9e 100644 --- a/data/scripts/hyruleTown/script_CutsceneOrchestratorAllBooksCollected.inc +++ b/data/scripts/hyruleTown/script_CutsceneOrchestratorAllBooksCollected.inc @@ -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 diff --git a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc index cd82075c..afa05cc5 100644 --- a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc +++ b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc @@ -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 diff --git a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc index 7fac00e4..c79401b8 100644 --- a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc +++ b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc @@ -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 diff --git a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc index ed7ce571..97e1d836 100644 --- a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc +++ b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc @@ -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 diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc index 3bab3e34..abe02e5b 100644 --- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -79,7 +79,7 @@ script_080138D0: WaitUntilTextboxCloses SetSyncFlag 0x00040000 .ifndef EU - _0807F0B4 0x0002 + SetScrollSpeed 2 SetEntityPositionRelative 0x00e8, 0x00d8 CameraTargetEntity .endif diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc index e6357030..be00febe 100644 --- a/data/scripts/unused/script_08016482.inc +++ b/data/scripts/unused/script_08016482.inc @@ -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 diff --git a/data/scripts/veilFalls/script_BigGoron3.inc b/data/scripts/veilFalls/script_BigGoron3.inc index c3d78354..1fa9e8d7 100644 --- a/data/scripts/veilFalls/script_BigGoron3.inc +++ b/data/scripts/veilFalls/script_BigGoron3.inc @@ -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 |