From ca556e0aa891c717ddb3a9363a5f7849857fd6d5 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 23 Jul 2001 18:41:23 +0000 Subject: [PATCH] --- .../MermaidMan_FMA_ITEMOFS/AnimList.Txt | 2 + .../MermaidMan_FMA_ITEMOFS_SitAsleep0000.BMP | Bin 0 -> 2934 bytes .../SpongeBob_FMA_ITEMOFS/AnimList.Txt | 1 + .../SpongeBob_FMA_ITEMOFS_Stumble0000.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0001.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0002.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0003.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0004.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0005.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0006.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0007.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0008.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0009.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0010.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0011.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0012.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0013.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0014.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0015.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0016.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0017.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0018.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0019.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0020.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0021.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0022.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0023.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0024.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0025.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0026.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0027.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0028.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0029.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0030.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0031.bmp | Bin 0 -> 8310 bytes .../SpongeBob_FMA_ITEMOFS_Stumble0032.bmp | Bin 0 -> 8310 bytes data/DataCache.scr | 1 + makefile.gfx | 2 +- source/fma/fma.cpp | 94 +++++++++--------- 39 files changed, 52 insertions(+), 48 deletions(-) create mode 100644 Graphics/characters/MermaidMan_FMA_ITEMOFS/AnimList.Txt create mode 100644 Graphics/characters/MermaidMan_FMA_ITEMOFS/Render/PSX/MermaidMan_FMA_ITEMOFS_SitAsleep0000.BMP create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0000.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0001.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0002.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0003.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0004.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0005.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0006.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0007.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0008.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0009.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0010.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0011.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0012.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0013.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0014.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0015.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0016.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0017.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0018.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0019.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0020.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0021.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0022.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0023.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0024.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0025.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0026.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0027.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0028.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0029.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0030.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0031.bmp create mode 100644 Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0032.bmp diff --git a/Graphics/characters/MermaidMan_FMA_ITEMOFS/AnimList.Txt b/Graphics/characters/MermaidMan_FMA_ITEMOFS/AnimList.Txt new file mode 100644 index 000000000..dc8f84f16 --- /dev/null +++ b/Graphics/characters/MermaidMan_FMA_ITEMOFS/AnimList.Txt @@ -0,0 +1,2 @@ +SitAsleep + diff --git a/Graphics/characters/MermaidMan_FMA_ITEMOFS/Render/PSX/MermaidMan_FMA_ITEMOFS_SitAsleep0000.BMP b/Graphics/characters/MermaidMan_FMA_ITEMOFS/Render/PSX/MermaidMan_FMA_ITEMOFS_SitAsleep0000.BMP new file mode 100644 index 0000000000000000000000000000000000000000..59797f3e0891e4d04be2ea06e47a479fd90250fb GIT binary patch literal 2934 zcmZ?rE#qbYgEAng0mKeK90A0P3@ktr2!Qg!P%HrCg7AMJWa$3Su=n17hO0n2=^0Su z|9^&ObJj34&)LGjkhFzi3J^Ok*}|}7$r6UFW=)15OG^f?APEKm0SS<)qhK@yMnhmU d1V%$(Gz5qUfe%Ee8C5bG0;3@?8Ulkq1ORQ89&`Wz literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/AnimList.Txt b/Graphics/characters/SpongeBob_FMA_ITEMOFS/AnimList.Txt index 8a8a8953d..35d021825 100644 --- a/Graphics/characters/SpongeBob_FMA_ITEMOFS/AnimList.Txt +++ b/Graphics/characters/SpongeBob_FMA_ITEMOFS/AnimList.Txt @@ -1 +1,2 @@ Run +Stumble diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0000.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0000.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b592a0b06fd4ea271d2b176ed34924c3151c4386 GIT binary patch literal 8310 zcmeIuJqp4=7=+;wEEa48FAxZdtw%5jsd9!C-XUNoh=`4~g$ka)Hno*!5NuNhu`+_J zpFd5GAiT58veRtwL`fFtlg#eEb^2>VO?z1asnhzlZS!4k=UyCi%ZD2D7E-d-q`asb zpEa7FwApQ?)l#!@CGWk`XC)o?io%DSbM^y4009ILKmdWdz_mVE2q1s}0tg_000Iag YfB*srAb*%;T({#$!~RN&x0+o` z^(KYJ%d>Wey|h_tkyP^DYx=CDQ>G|<$T?>l2m%NofB*t@fp-0a836+Rexxo*dihW(WkZ#BD? z>P-rbmuKw`dug-QBB|uP*YsIQr%X}!kaNy95CjlF0D-zdyFOxq00IagfB*srAbEsWp_Y^|+agJ5fEVPyoF zTpx>=;y=T=%rwL0OS3%IH@VHkI{&w!rrj*D)M@?Nw&$nb&hvKA<2clyUr5?0<4xEf&c&j literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0006.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0006.bmp new file mode 100644 index 0000000000000000000000000000000000000000..906088493a133c36a4faaee0a6da1683a9e5813c GIT binary patch literal 8310 zcmeIuJqp4=7=+;wEEX&jyg(o*wjRMCSmg{BxkJEC5D^<|3l(yLwANOhA&}P6!paD; ze*PT5BIP^FEW6DVPZXztK1uB!Sm(bs)U=l+kh-mJJNA9o+qqwI-Hsy-`ztBlYIZHv zn-m%^&)OaK(q^qiQptO->9dkfnWFF^=bSAN1Q0*~0R#|00D&3>+BI%5g#ZEwAb9dkfnWFF^=bZgO5I_I{1Q0*~0R#}JjX=9Lo3IE12q1s} Z0tg_000IagfB*srAbguHSJ{yq;Bimj(y+tcJ7y4x8q2|{z{6snq5ov zCWXe!vv!BQv{`GBRPx?y`mCf=rYL;KIcEz50R#|0009ILKmdXI1lsjYv4j8u2q1s} Z0tg_000IagfB*srAbzzdwb9iadK literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0009.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0009.bmp new file mode 100644 index 0000000000000000000000000000000000000000..19828da9b65a018a19ab845d965ff6a1ad010f84 GIT binary patch literal 8310 zcmeIuJqp4=7=+;wEEa48FAxZdtw%5jsd9!C-XUNoh=`4~g$ka)Hno*!5NuNhu`+_J zpFan%Ncqk(%WgBp6D3)oPcpmv*6FVeHSJ{yq)zMGwte6AcJ9SNw|uBUZy_aXP0EY9 z@mZt!Nt@kPS}ipjSMuH~eOA(OuPA)TIcEz50R#|0009ILK%iEEYprXHA%Fk^2q1s} Z0tg_000IagfB*srAb literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0010.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0010.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c589354dea37bcf0576a0b0ebc44262e68b5485e GIT binary patch literal 8310 zcmeIuI|{-;6ougEsWp_Y^|+agJ5fEVPyoF zTpx>=;y=T=%rwL0OS3%IH@VHkI{&w!rrj*D)M@?Nw&$nb&hvKA<2clyUr5xpj$rFptq2cwI=07 z-T180{G`opE3KBAjVpQYl|C!!xK|WDxpj$rFptq2cwI=07 z-T180{G`opE3KBAjVpQYl|C!!xK|WD?b!ESZ|8o=bvuqU?60JFtJ$?w zZ&GNyJZpE@OPjS8NhR;Srq4<`Ws1UwoO8B;Ab?b!ESZ|8o=bvuqU?60JFtJ$?w zZ&GNyJZpE@OPjS8NhR;Srq4<`Ws1UwoO8B;AbEsWp_Y^|+agJ5fEVPyoF zTpx>=;y=T=%rwL0OS3%IH@VHkI{&w!rrj*D)M@?Nw&$nb&hvKA<2clyUr5?b!ESZ|8o=bvuqU?60JFtJ$?w zZ&GNyJZpE@OPjS8NhR;Srq4<`Ws1UwoO8B;Ab>!PK)Ytf2mu5TKmY**5I_I{1Q0*~ Z0R#|0009ILKmY**5I_I{1Q7Teffos09iadK literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0017.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0017.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b41767aea8527aa44e79c834cc693695c78443b6 GIT binary patch literal 8310 zcmeIuF$%&!6olasEEa48FAxZdtw%5jsd9!C-XUNo1Q8o+3l%(pZE7peAlO=pSQ$Y! zPt7U9Kg&FJn}zp9Nfzjr%;wNKuiH}FZk9mmb^h(z^ILD{bvx==j5Qi8rDUVo{i=R^ z(PVMfcE6L>E9KKt-g~8=QaT+Jg>O0M><5BCqXiy~-j3xEKmY**5I_I{1Q0*~0R#|0 X009ILKmY**5I_I{1Q0*~fm)yfr4k;3 literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0018.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0018.bmp new file mode 100644 index 0000000000000000000000000000000000000000..91a15fe3d51e2094f0acb2d38b69a2269ac53473 GIT binary patch literal 8310 zcmeIuI|{-;6ougOmAvzDGDEQ&e;zHfjSGc>%1JhA%Fk^2q1s}0tg_000Iag YfB*srAbdBT*-T{^jS&Ay`u0T=bUXI2p~`|aIGIPK>z^+5I_I{1Q0*~0R#|0 Z009ILKmY**5I_I{1Q0*~0R;X?;00;|9)bV> literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0020.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0020.bmp new file mode 100644 index 0000000000000000000000000000000000000000..da7e31c245181c67a7a15dc7ade8a70463dae104 GIT binary patch literal 8310 zcmeIuI|{-;6oug?b!ESZ|8o=bvuqU?60JFtJ$?w zZ&GNyJZpE@OPjS8NhR;Srq4<`Ws1UwoO8B;Ab>!O>VPqo&DQT({7eX>a>1s+w)Uzr@9{WI1V-FEv0m$>8(^e zzG$>KYg_E3^-A+eE$_XuS1q0PO1e)u=j;c900O}Z+=JbW#SlOM0R#|0009ILKmY** Y5I_I{1Q0*~0R#|0009ILKp-%IH}c~if&c&j literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0022.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0022.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ef5023ce7aeead382be4d848c97efff55efbd007 GIT binary patch literal 8310 zcmeIuI|{-;6oug literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0023.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0023.bmp new file mode 100644 index 0000000000000000000000000000000000000000..42343f9694f529d384f94edfb6aab3742a03f697 GIT binary patch literal 8310 zcmeIuI|{-;6ougEsWp_Y^|+agJ5fEVPyoF zTpx>=;y=T=%rwL0OS3%IH@VHkI{&w!rrj*D)M@?Nw&$nb&hvKA<2clyUr5 literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0025.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0025.bmp new file mode 100644 index 0000000000000000000000000000000000000000..70015e714c0582cc880cdb6474ddbba336b2b78f GIT binary patch literal 8310 zcmeIuI|{-;6oug literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0026.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0026.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f0fd2e11c9c669c10da8a2c35bb4e8291ad6d65d GIT binary patch literal 8310 zcmeIuFA4%d9L4b`7zPXqUSMHStRBHdFzp!(dxr&^AR-pCL4`fRRbAb^*!Nv;=YGj`JB~E$ucUaZ*|k(} zQfRz9Yj@a7o3$26CGWka&q_LFio%DSbGASbKmY**>JVtxG0G+a2q1s}0tg_000Iag YfB*srAb$ns literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0028.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0028.bmp new file mode 100644 index 0000000000000000000000000000000000000000..384b1975c6c1433d9afc136acd7d74991c594ea3 GIT binary patch literal 8310 zcmeIuI|{-;6oug2Yq%3DA%Fk^2q1s}0tg_0 Z00IagfB*srAb literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0029.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0029.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7158250e8e8b1f62226d2d8299eab494ec30af21 GIT binary patch literal 8310 zcmeIuI|{-;6ougO>VPqo&DQT({7eX>a>1s+w)Uzr@9{WI1V-FEv0m$>8(^e zzG$>KYg_E3^-A+eE$_XuS1q0PO1e)u=j;c900IagfIx5p_uw{SAp{UW009ILKmY** Y5I_I{1Q0*~0R#|0009ILKp=2|HzcJVf&c&j literal 0 HcmV?d00001 diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0030.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0030.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1618751f06d5c3b610bdf42f97535d30262725a9 GIT binary patch literal 8310 zcmeIuJqp4=7=+;wEEa48FAxZdtw%5jsd9!C-XUNoh=`4~g$ka)Hno*!5NuNhu`+_J zpFd5GAiT58veRtwL`fFtlg#eEb^2>VO?z1asnhzlZS!4k=UyCi%ZD2D7E-d-q`asb zpEa7FwApQ?)l#!@CGWk`XC)o?io%DSbM^y4009ILKmdW7z_qp*2q1s}0tg_000Iag YfB*srAbVO?z1asnhzlZS!4k=UyCi%ZD2D7E-d-q`asb zpEa7FwApQ?)l#!@CGWk`XC)o?io%DSbM^y4009ILKmdW7z_qp*2q1s}0tg_000Iag YfB*srAbVO?z1asnhzlZS!4k=UyCi%ZD2D7E-d-q`asb zpEa7FwApQ?)l#!@CGWk`XC)o?io%DSbM^y4009ILKmdW7z_qp*2q1s}0tg_000Iag YfB*srAbm_pos.vx-m_cameraPos.vx; pos.vy=actor->m_pos.vy-m_cameraPos.vy; int AnimNo,AnimBank; + int facing; ASSERT(s_actorGraphicsData[i].m_anims[actor->m_animState].Anim!=-1); AnimNo=s_actorGraphicsData[i].m_anims[actor->m_animState].Anim; AnimBank=s_actorGraphicsData[i].m_anims[actor->m_animState].Bank; actor->m_gfx[AnimBank]->Render(pos,AnimNo,actor->m_animFrame,actor->m_facing); - - // Is there an item anim for this anim? - AnimNo=s_actorGraphicsData[i].m_anims[actor->m_animState].itemAnim; - if(AnimNo!=-1) - { - // Yeah.. grab the item offsets and remember them - int x,y; - AnimBank=s_actorGraphicsData[i].m_anims[actor->m_animState].itemBank; - actor->m_gfx[AnimBank]->getFrameOffsets(AnimNo,actor->m_animFrame,&x,&y); - actor->m_ItemOfs.vx=x; - actor->m_ItemOfs.vy=y; - } } actor++; } + item=m_itemData; for (i=0; im_visible) { - DVECTOR pos; - pos.vx=item->m_Pos.vx-m_cameraPos.vx; - pos.vy=item->m_Pos.vy-m_cameraPos.vy; - CGameScene::getSpriteBank()->printFT4(item->m_Frame,pos.vx,pos.vy,item->m_facing,0,OTPOS__PICKUP_POS-3); + SpriteBank *sb; + sFrameHdr *fh; + DVECTOR pos; + + sb=CGameScene::getSpriteBank(); + fh=sb->getFrameHeader(item->m_Frame); + pos.vx=item->m_Pos.vx-m_cameraPos.vx+(fh->W/2); + if(!item->m_facing)pos.vx-=fh->W; + pos.vy=item->m_Pos.vy-m_cameraPos.vy-fh->H; + sb->printFT4(fh,pos.vx,pos.vy,item->m_facing,0,OTPOS__PICKUP_POS-3); } + item++; } CActorPool::CleanUpCache(); @@ -1450,7 +1446,18 @@ void CFmaScene::think(int _frames) { // hold on last frame actor->m_animFrame=LastFrame; } - + } + + // Is there an item anim for this anim? + AnimNo=s_actorGraphicsData[i].m_anims[actor->m_animState].itemAnim; + if(AnimNo!=-1) + { + // Yeah.. grab the item offsets and remember them + int x,y; + AnimBank=s_actorGraphicsData[i].m_anims[actor->m_animState].itemBank; + actor->m_gfx[AnimBank]->getFrameOffsets(AnimNo,actor->m_animFrame,&x,&y); + actor->m_ItemOfs.vx=x; + actor->m_ItemOfs.vy=y; } } @@ -1516,15 +1523,8 @@ void CFmaScene::think(int _frames) // Being carried by an actor item->m_Pos=actor->m_pos; item->m_facing=actor->m_facing; - if (item->m_facing) - { - item->m_Pos.vx-=/*actorGraphics->m_ItemOfs.vx+*/actor->m_ItemOfs.vx; - } - else - { - item->m_Pos.vx+=/*actorGraphics->m_ItemOfs.vx+*/actor->m_ItemOfs.vx; - } - item->m_Pos.vy+=/*actorGraphics->m_ItemOfs.vy+*/actor->m_ItemOfs.vy; + item->m_Pos.vx=item->m_facing?-actor->m_ItemOfs.vx:actor->m_ItemOfs.vx; + item->m_Pos.vy+=actor->m_ItemOfs.vy; } } @@ -1811,17 +1811,17 @@ void CFmaScene::startNextScriptCommand() item->m_endMoveFrame=m_frameCount+*m_pc++; // Calc the positions - const ACTOR_GRAPHICS_DATA *actorGraphics=&s_actorGraphicsData[item->m_TargetActor]; - item->m_TargetPos=m_actorData[item->m_TargetActor].m_pos; - if(m_actorData[item->m_TargetActor].m_facing) + const ACTOR_DATA *actor=&m_actorData[item->m_TargetActor]; + item->m_TargetPos=actor->m_pos; + if(actor->m_facing) { - item->m_TargetPos.vx-=actorGraphics->m_ItemOfs.vx; + item->m_TargetPos.vx-=actor->m_ItemOfs.vx; } else { - item->m_TargetPos.vx+=actorGraphics->m_ItemOfs.vx; + item->m_TargetPos.vx+=actor->m_ItemOfs.vx; } - item->m_TargetPos.vy+=actorGraphics->m_ItemOfs.vy; + item->m_TargetPos.vy+=actor->m_ItemOfs.vy; item->m_startPos=item->m_Pos; } break;