Skip to content

Commit

Permalink
Link ftPr_SpecialLw (936 bytes) (#1328)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ribbanya
ribbanya authored Feb 26, 2024
1 parent c52b71c commit 6c345b5
Show file tree
Hide file tree
Showing 10 changed files with 490 additions and 766 deletions.
305 changes: 3 additions & 302 deletions asm/melee/ft/chara/ftPurin/ftPr_SpecialLw.s → asm/melee/ft/chara/ftPurin/ftPr_SpecialS.s
View file
Original file line number Diff line number Diff line change
@@ -1,292 +1,10 @@
.include "macros.inc"
.file "ftPr_SpecialLw.c"
.file "ftPr_SpecialS.c"

# 0x8013CE8C - 0x801422E8
# 0x8013D234 - 0x801422E8
.text
.balign 4

.fn ftPr_SpecialLw_Enter, global
/* 8013CE8C 00139A6C 7C 08 02 A6 */ mflr r0
/* 8013CE90 00139A70 90 01 00 04 */ stw r0, 0x4(r1)
/* 8013CE94 00139A74 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8013CE98 00139A78 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 8013CE9C 00139A7C 7C 7F 1B 78 */ mr r31, r3
/* 8013CEA0 00139A80 80 63 00 2C */ lwz r3, 0x2c(r3)
/* 8013CEA4 00139A84 C0 22 A2 40 */ lfs f1, ftPr_Init_804D9C20@sda21(r0)
/* 8013CEA8 00139A88 C0 03 00 2C */ lfs f0, 0x2c(r3)
/* 8013CEAC 00139A8C FC 01 00 00 */ fcmpu cr0, f1, f0
/* 8013CEB0 00139A90 40 82 00 28 */ bne .L_8013CED8
/* 8013CEB4 00139A94 C0 22 A2 44 */ lfs f1, ftPr_Init_804D9C24@sda21(r0)
/* 8013CEB8 00139A98 7F E3 FB 78 */ mr r3, r31
/* 8013CEBC 00139A9C C0 42 A2 48 */ lfs f2, ftPr_Init_804D9C28@sda21(r0)
/* 8013CEC0 00139AA0 38 80 01 71 */ li r4, 0x171
/* 8013CEC4 00139AA4 FC 60 08 90 */ fmr f3, f1
/* 8013CEC8 00139AA8 38 A0 00 00 */ li r5, 0x0
/* 8013CECC 00139AAC 38 C0 00 00 */ li r6, 0x0
/* 8013CED0 00139AB0 4B F2 C4 DD */ bl Fighter_ChangeMotionState
/* 8013CED4 00139AB4 48 00 00 24 */ b .L_8013CEF8
.L_8013CED8:
/* 8013CED8 00139AB8 C0 22 A2 44 */ lfs f1, ftPr_Init_804D9C24@sda21(r0)
/* 8013CEDC 00139ABC 7F E3 FB 78 */ mr r3, r31
/* 8013CEE0 00139AC0 C0 42 A2 48 */ lfs f2, ftPr_Init_804D9C28@sda21(r0)
/* 8013CEE4 00139AC4 38 80 01 73 */ li r4, 0x173
/* 8013CEE8 00139AC8 FC 60 08 90 */ fmr f3, f1
/* 8013CEEC 00139ACC 38 A0 00 00 */ li r5, 0x0
/* 8013CEF0 00139AD0 38 C0 00 00 */ li r6, 0x0
/* 8013CEF4 00139AD4 4B F2 C4 B9 */ bl Fighter_ChangeMotionState
.L_8013CEF8:
/* 8013CEF8 00139AD8 7F E3 FB 78 */ mr r3, r31
/* 8013CEFC 00139ADC 4B F3 1C A9 */ bl ftAnim_8006EBA4
/* 8013CF00 00139AE0 80 9F 00 2C */ lwz r4, 0x2c(r31)
/* 8013CF04 00139AE4 38 00 00 00 */ li r0, 0x0
/* 8013CF08 00139AE8 3C 60 80 14 */ lis r3, ftPr_SpecialHi_8013CE7C@ha
/* 8013CF0C 00139AEC 90 04 22 00 */ stw r0, 0x2200(r4)
/* 8013CF10 00139AF0 38 03 CE 7C */ addi r0, r3, ftPr_SpecialHi_8013CE7C@l
/* 8013CF14 00139AF4 90 04 21 BC */ stw r0, 0x21bc(r4)
/* 8013CF18 00139AF8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8013CF1C 00139AFC 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8013CF20 00139B00 38 21 00 20 */ addi r1, r1, 0x20
/* 8013CF24 00139B04 7C 08 03 A6 */ mtlr r0
/* 8013CF28 00139B08 4E 80 00 20 */ blr
.endfn ftPr_SpecialLw_Enter

.fn ftPr_SpecialAirLw_Enter, global
/* 8013CF2C 00139B0C 7C 08 02 A6 */ mflr r0
/* 8013CF30 00139B10 90 01 00 04 */ stw r0, 0x4(r1)
/* 8013CF34 00139B14 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8013CF38 00139B18 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 8013CF3C 00139B1C 7C 7F 1B 78 */ mr r31, r3
/* 8013CF40 00139B20 80 63 00 2C */ lwz r3, 0x2c(r3)
/* 8013CF44 00139B24 C0 22 A2 40 */ lfs f1, ftPr_Init_804D9C20@sda21(r0)
/* 8013CF48 00139B28 C0 03 00 2C */ lfs f0, 0x2c(r3)
/* 8013CF4C 00139B2C FC 01 00 00 */ fcmpu cr0, f1, f0
/* 8013CF50 00139B30 40 82 00 28 */ bne .L_8013CF78
/* 8013CF54 00139B34 C0 22 A2 44 */ lfs f1, ftPr_Init_804D9C24@sda21(r0)
/* 8013CF58 00139B38 7F E3 FB 78 */ mr r3, r31
/* 8013CF5C 00139B3C C0 42 A2 48 */ lfs f2, ftPr_Init_804D9C28@sda21(r0)
/* 8013CF60 00139B40 38 80 01 72 */ li r4, 0x172
/* 8013CF64 00139B44 FC 60 08 90 */ fmr f3, f1
/* 8013CF68 00139B48 38 A0 00 00 */ li r5, 0x0
/* 8013CF6C 00139B4C 38 C0 00 00 */ li r6, 0x0
/* 8013CF70 00139B50 4B F2 C4 3D */ bl Fighter_ChangeMotionState
/* 8013CF74 00139B54 48 00 00 24 */ b .L_8013CF98
.L_8013CF78:
/* 8013CF78 00139B58 C0 22 A2 44 */ lfs f1, ftPr_Init_804D9C24@sda21(r0)
/* 8013CF7C 00139B5C 7F E3 FB 78 */ mr r3, r31
/* 8013CF80 00139B60 C0 42 A2 48 */ lfs f2, ftPr_Init_804D9C28@sda21(r0)
/* 8013CF84 00139B64 38 80 01 74 */ li r4, 0x174
/* 8013CF88 00139B68 FC 60 08 90 */ fmr f3, f1
/* 8013CF8C 00139B6C 38 A0 00 00 */ li r5, 0x0
/* 8013CF90 00139B70 38 C0 00 00 */ li r6, 0x0
/* 8013CF94 00139B74 4B F2 C4 19 */ bl Fighter_ChangeMotionState
.L_8013CF98:
/* 8013CF98 00139B78 7F E3 FB 78 */ mr r3, r31
/* 8013CF9C 00139B7C 4B F3 1C 09 */ bl ftAnim_8006EBA4
/* 8013CFA0 00139B80 80 9F 00 2C */ lwz r4, 0x2c(r31)
/* 8013CFA4 00139B84 38 00 00 00 */ li r0, 0x0
/* 8013CFA8 00139B88 3C 60 80 14 */ lis r3, ftPr_SpecialHi_8013CE7C@ha
/* 8013CFAC 00139B8C 90 04 22 00 */ stw r0, 0x2200(r4)
/* 8013CFB0 00139B90 38 03 CE 7C */ addi r0, r3, ftPr_SpecialHi_8013CE7C@l
/* 8013CFB4 00139B94 90 04 21 BC */ stw r0, 0x21bc(r4)
/* 8013CFB8 00139B98 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8013CFBC 00139B9C 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8013CFC0 00139BA0 38 21 00 20 */ addi r1, r1, 0x20
/* 8013CFC4 00139BA4 7C 08 03 A6 */ mtlr r0
/* 8013CFC8 00139BA8 4E 80 00 20 */ blr
.endfn ftPr_SpecialAirLw_Enter

.fn ftPr_SpecialLw_Anim, global
/* 8013CFCC 00139BAC 7C 08 02 A6 */ mflr r0
/* 8013CFD0 00139BB0 90 01 00 04 */ stw r0, 0x4(r1)
/* 8013CFD4 00139BB4 94 21 FF E8 */ stwu r1, -0x18(r1)
/* 8013CFD8 00139BB8 93 E1 00 14 */ stw r31, 0x14(r1)
/* 8013CFDC 00139BBC 7C 7F 1B 78 */ mr r31, r3
/* 8013CFE0 00139BC0 4B F3 22 59 */ bl ftAnim_IsFramesRemaining
/* 8013CFE4 00139BC4 2C 03 00 00 */ cmpwi r3, 0x0
/* 8013CFE8 00139BC8 40 82 00 0C */ bne .L_8013CFF4
/* 8013CFEC 00139BCC 7F E3 FB 78 */ mr r3, r31
/* 8013CFF0 00139BD0 4B F4 D2 CD */ bl ft_8008A2BC
.L_8013CFF4:
/* 8013CFF4 00139BD4 80 01 00 1C */ lwz r0, 0x1c(r1)
/* 8013CFF8 00139BD8 83 E1 00 14 */ lwz r31, 0x14(r1)
/* 8013CFFC 00139BDC 38 21 00 18 */ addi r1, r1, 0x18
/* 8013D000 00139BE0 7C 08 03 A6 */ mtlr r0
/* 8013D004 00139BE4 4E 80 00 20 */ blr
.endfn ftPr_SpecialLw_Anim

.fn ftPr_SpecialAirLw_Anim, global
/* 8013D008 00139BE8 7C 08 02 A6 */ mflr r0
/* 8013D00C 00139BEC 90 01 00 04 */ stw r0, 0x4(r1)
/* 8013D010 00139BF0 94 21 FF E8 */ stwu r1, -0x18(r1)
/* 8013D014 00139BF4 93 E1 00 14 */ stw r31, 0x14(r1)
/* 8013D018 00139BF8 7C 7F 1B 78 */ mr r31, r3
/* 8013D01C 00139BFC 4B F3 22 1D */ bl ftAnim_IsFramesRemaining
/* 8013D020 00139C00 2C 03 00 00 */ cmpwi r3, 0x0
/* 8013D024 00139C04 40 82 00 0C */ bne .L_8013D030
/* 8013D028 00139C08 7F E3 FB 78 */ mr r3, r31
/* 8013D02C 00139C0C 4B F8 F7 05 */ bl ftCo_800CC730
.L_8013D030:
/* 8013D030 00139C10 80 01 00 1C */ lwz r0, 0x1c(r1)
/* 8013D034 00139C14 83 E1 00 14 */ lwz r31, 0x14(r1)
/* 8013D038 00139C18 38 21 00 18 */ addi r1, r1, 0x18
/* 8013D03C 00139C1C 7C 08 03 A6 */ mtlr r0
/* 8013D040 00139C20 4E 80 00 20 */ blr
.endfn ftPr_SpecialAirLw_Anim

.fn ftPr_SpecialLw_IASA, global
/* 8013D044 00139C24 4E 80 00 20 */ blr
.endfn ftPr_SpecialLw_IASA

.fn ftPr_SpecialAirLw_IASA, global
/* 8013D048 00139C28 4E 80 00 20 */ blr
.endfn ftPr_SpecialAirLw_IASA

.fn ftPr_SpecialLw_Phys, global
/* 8013D04C 00139C2C 7C 08 02 A6 */ mflr r0
/* 8013D050 00139C30 90 01 00 04 */ stw r0, 0x4(r1)
/* 8013D054 00139C34 94 21 FF F8 */ stwu r1, -0x8(r1)
/* 8013D058 00139C38 4B F4 7E E5 */ bl ft_80084F3C
/* 8013D05C 00139C3C 80 01 00 0C */ lwz r0, 0xc(r1)
/* 8013D060 00139C40 38 21 00 08 */ addi r1, r1, 0x8
/* 8013D064 00139C44 7C 08 03 A6 */ mtlr r0
/* 8013D068 00139C48 4E 80 00 20 */ blr
.endfn ftPr_SpecialLw_Phys

.fn ftPr_SpecialAirLw_Phys, global
/* 8013D06C 00139C4C 7C 08 02 A6 */ mflr r0
/* 8013D070 00139C50 90 01 00 04 */ stw r0, 0x4(r1)
/* 8013D074 00139C54 94 21 FF F8 */ stwu r1, -0x8(r1)
/* 8013D078 00139C58 4B F4 7E 75 */ bl ft_80084EEC
/* 8013D07C 00139C5C 80 01 00 0C */ lwz r0, 0xc(r1)
/* 8013D080 00139C60 38 21 00 08 */ addi r1, r1, 0x8
/* 8013D084 00139C64 7C 08 03 A6 */ mtlr r0
/* 8013D088 00139C68 4E 80 00 20 */ blr
.endfn ftPr_SpecialAirLw_Phys

.fn ftPr_SpecialLw_Coll, global
/* 8013D08C 00139C6C 7C 08 02 A6 */ mflr r0
/* 8013D090 00139C70 90 01 00 04 */ stw r0, 0x4(r1)
/* 8013D094 00139C74 94 21 FF E8 */ stwu r1, -0x18(r1)
/* 8013D098 00139C78 93 E1 00 14 */ stw r31, 0x14(r1)
/* 8013D09C 00139C7C 7C 7F 1B 78 */ mr r31, r3
/* 8013D0A0 00139C80 4B F4 57 01 */ bl ft_800827A0
/* 8013D0A4 00139C84 2C 03 00 00 */ cmpwi r3, 0x0
/* 8013D0A8 00139C88 40 82 00 0C */ bne .L_8013D0B4
/* 8013D0AC 00139C8C 7F E3 FB 78 */ mr r3, r31
/* 8013D0B0 00139C90 48 00 00 55 */ bl ftPr_SpecialLw_8013D104
.L_8013D0B4:
/* 8013D0B4 00139C94 80 01 00 1C */ lwz r0, 0x1c(r1)
/* 8013D0B8 00139C98 83 E1 00 14 */ lwz r31, 0x14(r1)
/* 8013D0BC 00139C9C 38 21 00 18 */ addi r1, r1, 0x18
/* 8013D0C0 00139CA0 7C 08 03 A6 */ mtlr r0
/* 8013D0C4 00139CA4 4E 80 00 20 */ blr
.endfn ftPr_SpecialLw_Coll

.fn ftPr_SpecialAirLw_Coll, global
/* 8013D0C8 00139CA8 7C 08 02 A6 */ mflr r0
/* 8013D0CC 00139CAC 90 01 00 04 */ stw r0, 0x4(r1)
/* 8013D0D0 00139CB0 94 21 FF E8 */ stwu r1, -0x18(r1)
/* 8013D0D4 00139CB4 93 E1 00 14 */ stw r31, 0x14(r1)
/* 8013D0D8 00139CB8 7C 7F 1B 78 */ mr r31, r3
/* 8013D0DC 00139CBC 4B F4 4C 31 */ bl ft_80081D0C
/* 8013D0E0 00139CC0 2C 03 00 00 */ cmpwi r3, 0x0
/* 8013D0E4 00139CC4 41 82 00 0C */ beq .L_8013D0F0
/* 8013D0E8 00139CC8 7F E3 FB 78 */ mr r3, r31
/* 8013D0EC 00139CCC 48 00 00 B1 */ bl ftPr_SpecialLw_8013D19C
.L_8013D0F0:
/* 8013D0F0 00139CD0 80 01 00 1C */ lwz r0, 0x1c(r1)
/* 8013D0F4 00139CD4 83 E1 00 14 */ lwz r31, 0x14(r1)
/* 8013D0F8 00139CD8 38 21 00 18 */ addi r1, r1, 0x18
/* 8013D0FC 00139CDC 7C 08 03 A6 */ mtlr r0
/* 8013D100 00139CE0 4E 80 00 20 */ blr
.endfn ftPr_SpecialAirLw_Coll

.fn ftPr_SpecialLw_8013D104, global
/* 8013D104 00139CE4 7C 08 02 A6 */ mflr r0
/* 8013D108 00139CE8 90 01 00 04 */ stw r0, 0x4(r1)
/* 8013D10C 00139CEC 94 21 FF E8 */ stwu r1, -0x18(r1)
/* 8013D110 00139CF0 93 E1 00 14 */ stw r31, 0x14(r1)
/* 8013D114 00139CF4 93 C1 00 10 */ stw r30, 0x10(r1)
/* 8013D118 00139CF8 7C 7E 1B 78 */ mr r30, r3
/* 8013D11C 00139CFC 83 E3 00 2C */ lwz r31, 0x2c(r3)
/* 8013D120 00139D00 7F E3 FB 78 */ mr r3, r31
/* 8013D124 00139D04 4B F4 04 B1 */ bl ftCommon_8007D5D4
/* 8013D128 00139D08 C0 22 A2 40 */ lfs f1, ftPr_Init_804D9C20@sda21(r0)
/* 8013D12C 00139D0C C0 1F 00 2C */ lfs f0, 0x2c(r31)
/* 8013D130 00139D10 FC 01 00 00 */ fcmpu cr0, f1, f0
/* 8013D134 00139D14 40 82 00 2C */ bne .L_8013D160
/* 8013D138 00139D18 3C 80 0C 4C */ lis r4, 0xc4c
/* 8013D13C 00139D1C C0 3F 08 94 */ lfs f1, 0x894(r31)
/* 8013D140 00139D20 C0 42 A2 48 */ lfs f2, ftPr_Init_804D9C28@sda21(r0)
/* 8013D144 00139D24 7F C3 F3 78 */ mr r3, r30
/* 8013D148 00139D28 C0 62 A2 44 */ lfs f3, ftPr_Init_804D9C24@sda21(r0)
/* 8013D14C 00139D2C 38 A4 50 8E */ addi r5, r4, 0x508e
/* 8013D150 00139D30 38 80 01 72 */ li r4, 0x172
/* 8013D154 00139D34 38 C0 00 00 */ li r6, 0x0
/* 8013D158 00139D38 4B F2 C2 55 */ bl Fighter_ChangeMotionState
/* 8013D15C 00139D3C 48 00 00 28 */ b .L_8013D184
.L_8013D160:
/* 8013D160 00139D40 3C 80 0C 4C */ lis r4, 0xc4c
/* 8013D164 00139D44 C0 3F 08 94 */ lfs f1, 0x894(r31)
/* 8013D168 00139D48 C0 42 A2 48 */ lfs f2, ftPr_Init_804D9C28@sda21(r0)
/* 8013D16C 00139D4C 7F C3 F3 78 */ mr r3, r30
/* 8013D170 00139D50 C0 62 A2 44 */ lfs f3, ftPr_Init_804D9C24@sda21(r0)
/* 8013D174 00139D54 38 A4 50 8E */ addi r5, r4, 0x508e
/* 8013D178 00139D58 38 80 01 74 */ li r4, 0x174
/* 8013D17C 00139D5C 38 C0 00 00 */ li r6, 0x0
/* 8013D180 00139D60 4B F2 C2 2D */ bl Fighter_ChangeMotionState
.L_8013D184:
/* 8013D184 00139D64 80 01 00 1C */ lwz r0, 0x1c(r1)
/* 8013D188 00139D68 83 E1 00 14 */ lwz r31, 0x14(r1)
/* 8013D18C 00139D6C 83 C1 00 10 */ lwz r30, 0x10(r1)
/* 8013D190 00139D70 38 21 00 18 */ addi r1, r1, 0x18
/* 8013D194 00139D74 7C 08 03 A6 */ mtlr r0
/* 8013D198 00139D78 4E 80 00 20 */ blr
.endfn ftPr_SpecialLw_8013D104

.fn ftPr_SpecialLw_8013D19C, global
/* 8013D19C 00139D7C 7C 08 02 A6 */ mflr r0
/* 8013D1A0 00139D80 90 01 00 04 */ stw r0, 0x4(r1)
/* 8013D1A4 00139D84 94 21 FF E8 */ stwu r1, -0x18(r1)
/* 8013D1A8 00139D88 93 E1 00 14 */ stw r31, 0x14(r1)
/* 8013D1AC 00139D8C 93 C1 00 10 */ stw r30, 0x10(r1)
/* 8013D1B0 00139D90 7C 7E 1B 78 */ mr r30, r3
/* 8013D1B4 00139D94 83 E3 00 2C */ lwz r31, 0x2c(r3)
/* 8013D1B8 00139D98 7F E3 FB 78 */ mr r3, r31
/* 8013D1BC 00139D9C 4B F4 06 41 */ bl ftCommon_8007D7FC
/* 8013D1C0 00139DA0 C0 22 A2 40 */ lfs f1, ftPr_Init_804D9C20@sda21(r0)
/* 8013D1C4 00139DA4 C0 1F 00 2C */ lfs f0, 0x2c(r31)
/* 8013D1C8 00139DA8 FC 01 00 00 */ fcmpu cr0, f1, f0
/* 8013D1CC 00139DAC 40 82 00 2C */ bne .L_8013D1F8
/* 8013D1D0 00139DB0 3C 80 0C 4C */ lis r4, 0xc4c
/* 8013D1D4 00139DB4 C0 3F 08 94 */ lfs f1, 0x894(r31)
/* 8013D1D8 00139DB8 C0 42 A2 48 */ lfs f2, ftPr_Init_804D9C28@sda21(r0)
/* 8013D1DC 00139DBC 7F C3 F3 78 */ mr r3, r30
/* 8013D1E0 00139DC0 C0 62 A2 44 */ lfs f3, ftPr_Init_804D9C24@sda21(r0)
/* 8013D1E4 00139DC4 38 A4 50 8E */ addi r5, r4, 0x508e
/* 8013D1E8 00139DC8 38 80 01 71 */ li r4, 0x171
/* 8013D1EC 00139DCC 38 C0 00 00 */ li r6, 0x0
/* 8013D1F0 00139DD0 4B F2 C1 BD */ bl Fighter_ChangeMotionState
/* 8013D1F4 00139DD4 48 00 00 28 */ b .L_8013D21C
.L_8013D1F8:
/* 8013D1F8 00139DD8 3C 80 0C 4C */ lis r4, 0xc4c
/* 8013D1FC 00139DDC C0 3F 08 94 */ lfs f1, 0x894(r31)
/* 8013D200 00139DE0 C0 42 A2 48 */ lfs f2, ftPr_Init_804D9C28@sda21(r0)
/* 8013D204 00139DE4 7F C3 F3 78 */ mr r3, r30
/* 8013D208 00139DE8 C0 62 A2 44 */ lfs f3, ftPr_Init_804D9C24@sda21(r0)
/* 8013D20C 00139DEC 38 A4 50 8E */ addi r5, r4, 0x508e
/* 8013D210 00139DF0 38 80 01 73 */ li r4, 0x173
/* 8013D214 00139DF4 38 C0 00 00 */ li r6, 0x0
/* 8013D218 00139DF8 4B F2 C1 95 */ bl Fighter_ChangeMotionState
.L_8013D21C:
/* 8013D21C 00139DFC 80 01 00 1C */ lwz r0, 0x1c(r1)
/* 8013D220 00139E00 83 E1 00 14 */ lwz r31, 0x14(r1)
/* 8013D224 00139E04 83 C1 00 10 */ lwz r30, 0x10(r1)
/* 8013D228 00139E08 38 21 00 18 */ addi r1, r1, 0x18
/* 8013D22C 00139E0C 7C 08 03 A6 */ mtlr r0
/* 8013D230 00139E10 4E 80 00 20 */ blr
.endfn ftPr_SpecialLw_8013D19C

.fn ftPr_SpecialS_Enter, global
/* 8013D234 00139E14 7C 08 02 A6 */ mflr r0
/* 8013D238 00139E18 38 80 01 6B */ li r4, 0x16b
Expand Down Expand Up @@ -6094,27 +5812,10 @@
.4byte 0x65000000
.endobj ftPr_Init_804D3EA8

# 0x804D9C20 - 0x804D9C98
# 0x804D9C30 - 0x804D9C98
.section .sdata2, "a"
.balign 8

.obj ftPr_Init_804D9C20, global
.float -1
.endobj ftPr_Init_804D9C20

.obj ftPr_Init_804D9C24, global
.float 0
.endobj ftPr_Init_804D9C24

.obj ftPr_Init_804D9C28, global
.float 1
.endobj ftPr_Init_804D9C28

.obj gap_11_804D9C2C_sdata2, global
.hidden gap_11_804D9C2C_sdata2
.4byte 0x00000000
.endobj gap_11_804D9C2C_sdata2

.obj ftPr_Init_804D9C30, global
.float 0
.endobj ftPr_Init_804D9C30
Expand Down
8 changes: 6 additions & 2 deletions config/GALE01/splits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1289,9 +1289,13 @@ melee/ft/chara/ftPurin/ftPr_SpecialHi.c:
.sdata2 start:0x804D9C10 end:0x804D9C1C

melee/ft/chara/ftPurin/ftPr_SpecialLw.c:
.text start:0x8013CE8C end:0x801422E8
.text start:0x8013CE8C end:0x8013D234
.sdata2 start:0x804D9C20 end:0x804D9C2C

melee/ft/chara/ftPurin/ftPr_SpecialS.c:
.text start:0x8013D234 end:0x801422E8
.sdata start:0x804D3E98 end:0x804D3EB0
.sdata2 start:0x804D9C20 end:0x804D9C98
.sdata2 start:0x804D9C30 end:0x804D9C98

melee/ft/chara/ftLuigi/ftLg_Init.c:
.text start:0x801422E8 end:0x8014267C
Expand Down
3 changes: 2 additions & 1 deletion configure.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,8 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
# Jigglypuff
Object(Matching, "melee/ft/chara/ftPurin/ftPr_Init.c"),
Object(Matching, "melee/ft/chara/ftPurin/ftPr_SpecialHi.c"),
Object(NonMatching, "melee/ft/chara/ftPurin/ftPr_SpecialLw.c"),
Object(Matching, "melee/ft/chara/ftPurin/ftPr_SpecialLw.c"),
Object(NonMatching, "melee/ft/chara/ftPurin/ftPr_SpecialS.c"),
# Luigi
Object(Matching, "melee/ft/chara/ftLuigi/ftLg_Init.c"),
Object(Matching, "melee/ft/chara/ftLuigi/ftLg_SpecialN.c"),
Expand Down
3 changes: 2 additions & 1 deletion obj_files.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,8 @@ TEXT_O_FILES +=\
TEXT_O_FILES +=\
$(BUILD_DIR)/src/melee/ft/chara/ftPurin/ftPr_Init.c.o\
$(BUILD_DIR)/src/melee/ft/chara/ftPurin/ftPr_SpecialHi.c.o\
$(BUILD_DIR)/asm/melee/ft/chara/ftPurin/ftPr_SpecialLw.s.o\
$(BUILD_DIR)/src/melee/ft/chara/ftPurin/ftPr_SpecialLw.c.o\
$(BUILD_DIR)/asm/melee/ft/chara/ftPurin/ftPr_SpecialS.s.o\

TEXT_O_FILES +=\
$(BUILD_DIR)/src/melee/ft/chara/ftLuigi/ftLg_Init.c.o\
Expand Down
3 changes: 2 additions & 1 deletion src/melee/ft/chara/ftPurin/ftPr_Init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include "ftPr_SpecialHi.h"
#include "ftPr_SpecialLw.h"
#include "ftPr_SpecialS.h"
#include "types.h"

#include "ef/eflib.h"
#include "ef/efsync.h"
Expand All @@ -16,7 +18,6 @@
#include "ft/ftparts.h"
#include "ft/types.h"
#include "ftCommon/ftCo_09CB.h"
#include "ftPurin/types.h"
#include "it/it_26B1.h"

#include <common_structs.h>
Expand Down
Loading

0 comments on commit 6c345b5

Please sign in to comment.