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 000000000..59797f3e0 Binary files /dev/null and b/Graphics/characters/MermaidMan_FMA_ITEMOFS/Render/PSX/MermaidMan_FMA_ITEMOFS_SitAsleep0000.BMP differ 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 000000000..b592a0b06 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0000.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0001.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0001.bmp new file mode 100644 index 000000000..61aab350c Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0001.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0002.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0002.bmp new file mode 100644 index 000000000..e54b90285 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0002.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0003.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0003.bmp new file mode 100644 index 000000000..6cf527090 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0003.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0004.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0004.bmp new file mode 100644 index 000000000..0d741bdb5 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0004.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0005.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0005.bmp new file mode 100644 index 000000000..0b5b3f47f Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0005.bmp differ 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 000000000..906088493 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0006.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0007.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0007.bmp new file mode 100644 index 000000000..02b65694d Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0007.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0008.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0008.bmp new file mode 100644 index 000000000..ecb137306 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0008.bmp differ 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 000000000..19828da9b Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0009.bmp differ 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 000000000..c589354de Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0010.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0011.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0011.bmp new file mode 100644 index 000000000..ba32214ae Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0011.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0012.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0012.bmp new file mode 100644 index 000000000..e1dd1ce5c Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0012.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0013.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0013.bmp new file mode 100644 index 000000000..2c4e24529 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0013.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0014.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0014.bmp new file mode 100644 index 000000000..c6c9c01bc Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0014.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0015.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0015.bmp new file mode 100644 index 000000000..b7e9452fb Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0015.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0016.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0016.bmp new file mode 100644 index 000000000..ef9398cbb Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0016.bmp differ 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 000000000..b41767aea Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0017.bmp differ 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 000000000..91a15fe3d Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0018.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0019.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0019.bmp new file mode 100644 index 000000000..b8f30ff7b Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0019.bmp differ 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 000000000..da7e31c24 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0020.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0021.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0021.bmp new file mode 100644 index 000000000..08925f743 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0021.bmp differ 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 000000000..ef5023ce7 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0022.bmp differ 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 000000000..42343f969 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0023.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0024.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0024.bmp new file mode 100644 index 000000000..ef5023ce7 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0024.bmp differ 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 000000000..70015e714 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0025.bmp differ 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 000000000..f0fd2e11c Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0026.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0027.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0027.bmp new file mode 100644 index 000000000..27e97249a Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0027.bmp differ 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 000000000..384b1975c Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0028.bmp differ 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 000000000..7158250e8 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0029.bmp differ 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 000000000..1618751f0 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0030.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0031.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0031.bmp new file mode 100644 index 000000000..1618751f0 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0031.bmp differ diff --git a/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0032.bmp b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0032.bmp new file mode 100644 index 000000000..1618751f0 Binary files /dev/null and b/Graphics/characters/SpongeBob_FMA_ITEMOFS/Render/PSX/SpongeBob_FMA_ITEMOFS_Stumble/SpongeBob_FMA_ITEMOFS_Stumble0032.bmp differ diff --git a/data/DataCache.scr b/data/DataCache.scr index 1da121998..54ba36306 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -230,6 +230,7 @@ actors/GARY.SBK actors/SANDY.SBK actors/PATRICK.SBK actors/MERMAIDMAN.SBK +actors/MERMAIDMAN_FMA_ITEMOFS.SBK actors/PLANKTON.SBK actors/ANENOME.SBK diff --git a/makefile.gfx b/makefile.gfx index cbe937477..0e3d4d448 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -108,7 +108,7 @@ ACTOR_DIRS_TO_MAKE := $(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR) MKACTOR_OPTS:= -c:16 ACTOR_SPONGEBOB := SpongeBob SpongeBob_CoralBlower SpongeBob_JellyLauncher SpongeBob_Net SpongeBob_Glove SpongeBob_Wand SpongeBob_JellyFish SpongeBob_FMA SpongeBob_FMA_ITEMOFS -ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan +ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan MermaidMan_FMA_ITEMOFS ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil \ Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish \ diff --git a/source/fma/fma.cpp b/source/fma/fma.cpp index ebcdab5bb..3ef583684 100644 --- a/source/fma/fma.cpp +++ b/source/fma/fma.cpp @@ -99,6 +99,7 @@ FX #ifndef __ANIM_MERMAIDMAN_HEADER__ #include "actor_mermaidman_anim.h" #endif +#include "actor_mermaidman_fma_itemofs_anim.h" #ifndef __ANIM_BARNACLEBOY_HEADER__ #include "actor_barnacleboy_anim.h" @@ -261,7 +262,6 @@ struct sFMAAnim typedef struct { FileEquate m_file[3]; - DVECTOR m_ItemOfs; sFMAAnim m_anims[FMA_NUM_ANIMS]; } ACTOR_GRAPHICS_DATA; @@ -336,7 +336,7 @@ static CScene *s_nextGameSceneTable[FMA_NUM_NEXT_SCENES]= static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= { { // SpongeBob - {ACTORS_SPONGEBOB_SBK,ACTORS_SPONGEBOB_FMA_SBK,ACTORS_SPONGEBOB_FMA_ITEMOFS_SBK},{-48,-48}, + {ACTORS_SPONGEBOB_SBK,ACTORS_SPONGEBOB_FMA_SBK,ACTORS_SPONGEBOB_FMA_ITEMOFS_SBK}, { /*FMA_ANIM_IDLE*/ {0,ANIM_SPONGEBOB_IDLEBREATH, 0,-1}, /*FMA_ANIM_WALK*/ {0,ANIM_SPONGEBOB_RUN, 2,ANIM_SPONGEBOB_FMA_ITEMOFS_RUN}, @@ -346,7 +346,7 @@ static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= /*FMA_ANIM_IDEA*/ {1,ANIM_SPONGEBOB_FMA_IDEA, 0,-1}, /*FMA_ANIM_QUICKEXIT*/ {1,ANIM_SPONGEBOB_FMA_QUICKEXIT, 0,-1}, /*FMA_ANIM_SHOUT*/ {1,ANIM_SPONGEBOB_FMA_SHOUT, 0,-1}, -/*FMA_ANIM_STUMBLE*/ {1,ANIM_SPONGEBOB_FMA_STUMBLE, 0,-1}, +/*FMA_ANIM_STUMBLE*/ {1,ANIM_SPONGEBOB_FMA_STUMBLE, 2,ANIM_SPONGEBOB_FMA_ITEMOFS_STUMBLE}, /*FMA_ANIM_THROW*/ {1,ANIM_SPONGEBOB_FMA_THROW, 0,-1}, /*FMA_ANIM_HIDE*/ {0,-1, 0,-1}, /*FMA_ANIM_UNHIDE*/ {0,-1, 0,-1}, @@ -358,7 +358,7 @@ static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= }, }, { // Barnicle Boy - {ACTORS_BARNACLEBOY_SBK, (FileEquate)0,(FileEquate)0},{-32,-48}, + {ACTORS_BARNACLEBOY_SBK, (FileEquate)0,(FileEquate)0}, { /*FMA_ANIM_IDLE*/ {0,ANIM_BARNACLEBOY_IDLE, 0,-1}, /*FMA_ANIM_WALK*/ {0,-1, 0,-1}, @@ -380,7 +380,7 @@ static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= }, }, { // Mermaid Man - {ACTORS_MERMAIDMAN_SBK, (FileEquate)0,(FileEquate)0},{-32,-64}, + {ACTORS_MERMAIDMAN_SBK,ACTORS_MERMAIDMAN_FMA_ITEMOFS_SBK,(FileEquate)0}, { /*FMA_ANIM_IDLE*/ {0,ANIM_MERMAIDMAN_IDLE, 0,-1}, /*FMA_ANIM_WALK*/ {0,-1, 0,-1}, @@ -397,12 +397,12 @@ static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= /*FMA_ANIM_UNHIDEIDLE*/ {0,-1, 0,-1}, /*FMA_ANIM_SIT*/ {0,ANIM_MERMAIDMAN_SIT, 0,-1}, /*FMA_ANIM_SITLOOKLEFT*/ {0,-1, 0,-1}, -/*FMA_ANIM_SITASLEEP*/ {0,ANIM_MERMAIDMAN_SITASLEEP, 0,-1}, +/*FMA_ANIM_SITASLEEP*/ {0,ANIM_MERMAIDMAN_SITASLEEP, 1,ANIM_MERMAIDMAN_FMA_ITEMOFS_SITASLEEP}, /*FMA_ANIM_RUBHEAD*/ {0,-1, 0,-1}, }, }, { // Gary Da Snail - {ACTORS_GARY_SBK, (FileEquate)0,(FileEquate)0},{0,0}, + {ACTORS_GARY_SBK, (FileEquate)0,(FileEquate)0}, { /*FMA_ANIM_IDLE*/ {0,ANIM_GARY_IDLE, 0,-1}, /*FMA_ANIM_WALK*/ {0,ANIM_GARY_IDLE, 0,-1}, @@ -424,7 +424,7 @@ static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= }, }, { // Plankton - {ACTORS_PLANKTON_SBK, (FileEquate)0,(FileEquate)0},{0,0}, + {ACTORS_PLANKTON_SBK, (FileEquate)0,(FileEquate)0}, { /*FMA_ANIM_IDLE*/ {0,ANIM_PLANKTON_IDLE, 0,-1}, /*FMA_ANIM_WALK*/ {0,-1, 0,-1}, @@ -446,7 +446,7 @@ static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= }, }, { // Patrick - {ACTORS_PATRICK_SBK, (FileEquate)0,(FileEquate)0},{0,0}, + {ACTORS_PATRICK_SBK, (FileEquate)0,(FileEquate)0}, { /*FMA_ANIM_IDLE*/ {0,ANIM_PATRICK_IDLEBREATHE, 0,-1}, /*FMA_ANIM_WALK*/ {0,-1, 0,-1}, @@ -468,7 +468,7 @@ static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= }, }, { // Krusty - {ACTORS_KRUSTY_SBK, (FileEquate)0,(FileEquate)0},{0,0}, + {ACTORS_KRUSTY_SBK, (FileEquate)0,(FileEquate)0}, { /*FMA_ANIM_IDLE*/ {0,ANIM_KRUSTY_IDLEBREATHE, 0,-1}, /*FMA_ANIM_WALK*/ {0,-1, 0,-1}, @@ -490,7 +490,7 @@ static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= }, }, { // Squidward - {ACTORS_SQUIDWARD_SBK, (FileEquate)0,(FileEquate)0},{0,0}, + {ACTORS_SQUIDWARD_SBK, (FileEquate)0,(FileEquate)0}, { /*FMA_ANIM_IDLE*/ {0,ANIM_SQUIDWARD_IDLEBREATHE, 0,-1}, /*FMA_ANIM_WALK*/ {0,-1, 0,-1}, @@ -512,7 +512,7 @@ static const ACTOR_GRAPHICS_DATA s_actorGraphicsData[FMA_NUM_ACTORS]= }, }, { // Sandy - {ACTORS_SANDY_SBK, (FileEquate)0,(FileEquate)0},{0,0}, + {ACTORS_SANDY_SBK, (FileEquate)0,(FileEquate)0}, { /*FMA_ANIM_IDLE*/ {0,ANIM_SANDY_IDLE, 0,-1}, /*FMA_ANIM_WALK*/ {0,-1, 0,-1}, @@ -679,8 +679,8 @@ static const int s_FMAC1EndScript[]= SC_WAIT_ON_CAMERA_STOP, SC_WAIT_ON_ACTOR_STOP, FMA_ACTOR_SPONGEBOB, SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_STUMBLE,0, - SC_THROW_ITEM_TO_ACTOR, 0,FMA_ACTOR_MM,48,120, SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_CH2_01_DAT, + SC_THROW_ITEM_TO_ACTOR, 0,FMA_ACTOR_MM,48,120, // scene 6 - sarnie flys thru the air // SC_SPRITE_SHIT @@ -690,7 +690,6 @@ static const int s_FMAC1EndScript[]= SC_WALK_ACTOR_TO_POSITION, FMA_ACTOR_SPONGEBOB,216*16,30*16,56, SC_WAIT_ON_CAMERA_STOP, SC_WAIT_ON_THROWN_ITEM, 0, - SC_CARRY_ITEM, 0,FMA_ACTOR_MM, // Scene 7 - MM Eats sarnie SC_WAIT_ON_ACTOR_STOP, FMA_ACTOR_SPONGEBOB, @@ -1290,6 +1289,7 @@ void CFmaScene::render() { int i; ACTOR_DATA *actor; + sItemData *item; CGameScene::setCameraMtx(); @@ -1315,37 +1315,33 @@ void CFmaScene::render() pos.vx=actor->m_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;