pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

extern ActorDescs

Browse Source
This commit is contained in:
Alex Bates 2020-12-30 09:36:44 +00:00
parent 87e2e13eed
commit fdf9454cde
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle/actor/paragoomba.h
View File

@ -1,7 +1,9 @@
#ifndef _BATTLE_ACTOR_PARAGOOMBA_ #ifndef _BATTLE_ACTOR_PARAGOOMBA_
#define _BATTLE_ACTOR_PARAGOOMBA_ #define _BATTLE_ACTOR_PARAGOOMBA_
#include "battle/battle.h"
// TODO: disasm // TODO: disasm
#define paragoomba 0x8021CD00 extern ActorDesc paragoomba;
#endif #endif

4
src/battle/actor/spiked_goomba.h
View File

@ -1,7 +1,9 @@
#ifndef _BATTLE_ACTOR_SPIKED_GOOMBA_ #ifndef _BATTLE_ACTOR_SPIKED_GOOMBA_
#define _BATTLE_ACTOR_SPIKED_GOOMBA_ #define _BATTLE_ACTOR_SPIKED_GOOMBA_
#include "battle/battle.h"
// TODO: disasm // TODO: disasm
#define spikedGoomba 0x8021B0AC extern ActorDesc spiked_goomba;
#endif #endif

24
src/battle/area_kmr_part_1/battles.c
View File

@ -22,7 +22,7 @@ Formation formation2 = {
Formation formation3 = { Formation formation3 = {
{ &goomba, .position = 1, .priority = 10 }, { &goomba, .position = 1, .priority = 10 },
{ paragoomba, .position = 6, .priority = 9 }, { &paragoomba, .position = 6, .priority = 9 },
}; };
Formation formation4 = { Formation formation4 = {
@ -34,37 +34,37 @@ Formation formation4 = {
Formation formation5 = { Formation formation5 = {
{ &goomba, .position = 1, .priority = 10 }, { &goomba, .position = 1, .priority = 10 },
{ spikedGoomba, .position = 2, .priority = 9 }, { &spiked_goomba, .position = 2, .priority = 9 },
}; };
Formation formation6 = { Formation formation6 = {
{ &goomba, .position = 0, .priority = 10 }, { &goomba, .position = 0, .priority = 10 },
{ paragoomba, .position = 5, .priority = 9 }, { &paragoomba, .position = 5, .priority = 9 },
{ &goomba, .position = 2, .priority = 8 }, { &goomba, .position = 2, .priority = 8 },
{ paragoomba, .position = 7, .priority = 7 }, { &paragoomba, .position = 7, .priority = 7 },
}; };
Formation formation7 = { Formation formation7 = {
{ paragoomba, .position = 5, .priority = 10 }, { &paragoomba, .position = 5, .priority = 10 },
}; };
Formation formation8 = { Formation formation8 = {
{ paragoomba, .position = 5, .priority = 10 }, { &paragoomba, .position = 5, .priority = 10 },
{ paragoomba, .position = 6, .priority = 9 }, { &paragoomba, .position = 6, .priority = 9 },
}; };
Formation formation9 = { Formation formation9 = {
{ paragoomba, .position = 4, .priority = 10 }, { &paragoomba, .position = 4, .priority = 10 },
{ paragoomba, .position = 5, .priority = 9 }, { &paragoomba, .position = 5, .priority = 9 },
{ paragoomba, .position = 6, .priority = 8 }, { &paragoomba, .position = 6, .priority = 8 },
}; };
Formation formation10 = { Formation formation10 = {
{ spikedGoomba, .position = 1, .priority = 10 }, { &spiked_goomba, .position = 1, .priority = 10 },
}; };
Formation formation11 = { Formation formation11 = {
{ spikedGoomba, .position = 1, .priority = 10 }, { &spiked_goomba, .position = 1, .priority = 10 },
{ &goomba, .position = 2, .priority = 9 }, { &goomba, .position = 2, .priority = 9 },
}; };

3
undefined_syms.txt
View File

@ -357,3 +357,6 @@ D_DE0079B8 = 0xDE0079B8;
D_DE003E00 = 0xDE003E00; D_DE003E00 = 0xDE003E00;
D_C1F06370 = 0xC1F06370; D_C1F06370 = 0xC1F06370;
D_DE001F00 = 0xDE001F00; D_DE001F00 = 0xDE001F00;
paragoomba = 0x8021CD00;
spiked_goomba = 0x8021B0AC;