jprdonnelly/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2026-04-04 20:00:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

struct renaming and trigger/entity cleanup (#623)

Browse Source 
* rename static structs to blueprint

* evt structs renamed

* renamed HudElementAnim to HudScript, worked on triggers

* fix Trigger/TriggerBP fields and entity cleanup

* entity data cleanup 1

* block

* blue warp pipe

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta
2022-01-16 08:28:09 -05:00
committed by GitHub
parent 079302ff23
commit 4e33a016eb
520 changed files with 4974 additions and 4990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
include/script_api/battle.h
View File

@@ -325,91 +325,91 @@ ApiStatus func_8026EBF8(Evt* script, s32 isInitialCall);
ApiStatus SetupMashMeter(Evt* script, s32 isInitialCall);
ApiStatus SetActionResult(Evt* script, s32 isInitialCall);
extern EvtSource PlayerScriptDispatcher;
extern EvtSource PeachScriptDispatcher;
extern EvtSource ExecutePlayerAction;
extern EvtSource ExecutePeachAction;
extern EvtSource HandleEvent_Player;
extern EvtSource BtlPutPartnerAway;
extern EvtSource BtlBringPartnerOut;
extern EvtSource MarioEnterStage;
extern EvtSource PeachEnterStage;
extern EvtSource PlayerFirstStrike;
extern EvtSource StartDefend;
extern EvtSource RunAwayStart;
extern EvtSource RunAwayFail;
extern EvtSource RunAwayReset;
extern EvtSource PlayEatFX;
extern EvtSource PlayDrinkFX;
extern EvtSource UseLifeShroom;
extern EvtSource MerleeRunOut;
extern EvtSource MerleeAttackBonus;
extern EvtSource MerleeDefenseBonus;
extern EvtSource MerleeExpBonus;
extern EvtSource PlayerHappy;
extern EvtSource DoDizzyAttack;
extern EvtSource RegainAbility;
extern EvtSource UseMystery;
extern EvtSource DoSleepHit;
extern EvtSource DoDizzyHit;
extern EvtSource DoParalyzeHit;
extern EvtSource DoPoisonHit;
extern EvtSource DoStopHit;
extern EvtSource DoFreezeHit;
extern EvtSource DoShrinkHit;
extern EvtSource ForceNextTarget;
extern EvtSource DoNormalHit;
extern EvtSource D_80294AFC;
extern EvtSource D_80294FE4;
extern EvtSource D_80294C68;
extern EvtSource D_80295EC4;
extern EvtSource D_80295744;
extern EvtSource D_8029621C;
extern EvtSource D_802977BC;
extern EvtSource D_80296014;
extern EvtSource D_80297814;
extern EvtSource D_802976E8;
extern EvtSource D_8029C12C;
extern EvtSource DoBurnHit;
extern EvtSource DoShockHit;
extern EvtSource D_8029A76C;
extern EvtSource D_80294720;
extern EvtSource DoImmune;
extern EvtSource DoDeath;
extern EvtSource Collapse;
extern EvtSource DoScareAway;
extern EvtSource DoSpinSmashHit;
extern EvtSource D_8029BBB4;
extern EvtSource DoJumpBack;
extern EvtSource DoReturnHome;
extern EvtSource DoRecover;
extern EvtSource D_8029C0A4;
extern EvtSource DoAirLift;
extern EvtSource DoBlowAway;
extern EvtSource Rumble_1;
extern EvtSource Rumble_2;
extern EvtSource Rumble_3;
extern EvtSource Rumble_4;
extern EvtSource Rumble_5;
extern EvtSource Rumble_6;
extern EvtSource Rumble_7;
extern EvtSource Rumble_Unused_1;
extern EvtSource Rumble_Unused_2;
extern EvtSource Rumble_Unused_3;
extern EvtSource Rumble_Unused_4;
extern EvtSource CamPreset_A;
extern EvtSource CamPreset_B;
extern EvtSource CamPreset_C;
extern EvtSource CamPreset_D;
extern EvtSource CamPreset_E;
extern EvtSource CamPreset_F;
extern EvtSource CamPreset_G;
extern EvtSource CamPreset_H;
extern EvtSource CamPreset_I;
extern EvtSource CamPreset_J;
extern EvtSource CamPreset_K;
extern EvtSource CamPreset_L;
extern EvtSource CamPreset_M;
extern EvtSource CamPreset_N;
extern EvtScript PlayerScriptDispatcher;
extern EvtScript PeachScriptDispatcher;
extern EvtScript ExecutePlayerAction;
extern EvtScript ExecutePeachAction;
extern EvtScript HandleEvent_Player;
extern EvtScript BtlPutPartnerAway;
extern EvtScript BtlBringPartnerOut;
extern EvtScript MarioEnterStage;
extern EvtScript PeachEnterStage;
extern EvtScript PlayerFirstStrike;
extern EvtScript StartDefend;
extern EvtScript RunAwayStart;
extern EvtScript RunAwayFail;
extern EvtScript RunAwayReset;
extern EvtScript PlayEatFX;
extern EvtScript PlayDrinkFX;
extern EvtScript UseLifeShroom;
extern EvtScript MerleeRunOut;
extern EvtScript MerleeAttackBonus;
extern EvtScript MerleeDefenseBonus;
extern EvtScript MerleeExpBonus;
extern EvtScript PlayerHappy;
extern EvtScript DoDizzyAttack;
extern EvtScript RegainAbility;
extern EvtScript UseMystery;
extern EvtScript DoSleepHit;
extern EvtScript DoDizzyHit;
extern EvtScript DoParalyzeHit;
extern EvtScript DoPoisonHit;
extern EvtScript DoStopHit;
extern EvtScript DoFreezeHit;
extern EvtScript DoShrinkHit;
extern EvtScript ForceNextTarget;
extern EvtScript DoNormalHit;
extern EvtScript D_80294AFC;
extern EvtScript D_80294FE4;
extern EvtScript D_80294C68;
extern EvtScript D_80295EC4;
extern EvtScript D_80295744;
extern EvtScript D_8029621C;
extern EvtScript D_802977BC;
extern EvtScript D_80296014;
extern EvtScript D_80297814;
extern EvtScript D_802976E8;
extern EvtScript D_8029C12C;
extern EvtScript DoBurnHit;
extern EvtScript DoShockHit;
extern EvtScript D_8029A76C;
extern EvtScript D_80294720;
extern EvtScript DoImmune;
extern EvtScript DoDeath;
extern EvtScript Collapse;
extern EvtScript DoScareAway;
extern EvtScript DoSpinSmashHit;
extern EvtScript D_8029BBB4;
extern EvtScript DoJumpBack;
extern EvtScript DoReturnHome;
extern EvtScript DoRecover;
extern EvtScript D_8029C0A4;
extern EvtScript DoAirLift;
extern EvtScript DoBlowAway;
extern EvtScript Rumble_1;
extern EvtScript Rumble_2;
extern EvtScript Rumble_3;
extern EvtScript Rumble_4;
extern EvtScript Rumble_5;
extern EvtScript Rumble_6;
extern EvtScript Rumble_7;
extern EvtScript Rumble_Unused_1;
extern EvtScript Rumble_Unused_2;
extern EvtScript Rumble_Unused_3;
extern EvtScript Rumble_Unused_4;
extern EvtScript CamPreset_A;
extern EvtScript CamPreset_B;
extern EvtScript CamPreset_C;
extern EvtScript CamPreset_D;
extern EvtScript CamPreset_E;
extern EvtScript CamPreset_F;
extern EvtScript CamPreset_G;
extern EvtScript CamPreset_H;
extern EvtScript CamPreset_I;
extern EvtScript CamPreset_J;
extern EvtScript CamPreset_K;
extern EvtScript CamPreset_L;
extern EvtScript CamPreset_M;
extern EvtScript CamPreset_N;
#endif

6
include/script_api/common.h
View File

@@ -47,7 +47,7 @@ ApiStatus ShowCoinCounter(Evt* script, s32 isInitialCall);
ApiStatus MakeEntity(Evt* script, s32 isInitialCall);
ApiStatus AssignScript(Evt* script, s32 isInitialCall);
ApiStatus AssignAreaFlag(Evt* script, s32 isInitialCall);
ApiStatus AssignFlag(Evt* script, s32 isInitialCall);
ApiStatus AssignChestFlag(Evt* script, s32 isInitialCall);
ApiStatus AssignBlockFlag(Evt* script, s32 isInitialCall);
ApiStatus AssignPanelFlag(Evt* script, s32 isInitialCall);
ApiStatus AssignCrateFlag(Evt* script, s32 isInitialCall);
@@ -306,7 +306,7 @@ ApiStatus MakeTransformGroup(Evt* script, s32 isInitialCall);
ApiStatus Spawn802D9D50(Evt* script, s32 isInitialCall);
extern EvtSource EnemyNpcHit;
extern EvtSource EnemyNpcDefeat;
extern EvtScript EnemyNpcHit;
extern EvtScript EnemyNpcDefeat;
#endif

16
include/script_api/map.h
View File

@@ -20,14 +20,14 @@ ApiStatus GetGridIndexFromPos(Evt* script, s32 isInitialCall);
ApiStatus SetPushBlockFallEffect(Evt* script, s32 isInitialCall);
ApiStatus TeleportPartnerToPlayer(Evt* script, s32 isInitialCall);
extern EvtSource EnterWalk;
extern EvtSource EnterWalkShort;
extern EvtSource EnterSavePoint;
extern EvtSource ExitWalk;
extern EvtSource ExitSingleDoor;
extern EvtSource EnterSingleDoor;
extern EvtSource ExitDoubleDoor;
extern EvtSource EnterDoubleDoor;
extern EvtScript EnterWalk;
extern EvtScript EnterWalkShort;
extern EvtScript EnterSavePoint;
extern EvtScript ExitWalk;
extern EvtScript ExitSingleDoor;
extern EvtScript EnterSingleDoor;
extern EvtScript ExitDoubleDoor;
extern EvtScript EnterDoubleDoor;
#endif