pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-18 23:42:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Various script cleanup (#284)

Browse Source 
* update star_rod_idx_to_c for battles

* name spiked_goomba and paragoomba animations

* name cleft animations

* finish battle struct disasm

* fix for kmr part 3

* name jr troopa animations

Co-authored by: T00nbink <martyntoby@gmail.com>

* ignore star rod crash.xml

* foliage.inc.c

* foliage data

* script: =f -> = (float)

* script: add (int) cast
This commit is contained in:
alex 2021-04-28 09:58:21 +01:00 committed by GitHub
parent ac3797ea56
commit d530ca24cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
203 changed files with 1433 additions and 855 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -47,6 +47,7 @@ build/
/out
dump
*.backup
crash.xml
/tools/Yay0compress
/tools/n64crc

29
include/enums.h
View File

@ -1610,4 +1610,33 @@ enum RenderMode {
RENDER_MODE_CLOUD_NO_ZB = 0x2F,
};
enum ActorFlags {
ACTOR_FLAG_NO_SHADOW = 0x00000004, ///< Hide shadow.
ACTOR_FLAG_FLYING = 0x00000200, ///< Quake Hammer can't hit.
ACTOR_FLAG_HP_OFFSET_BELOW = 0x00000800, ///< HP bar offset below actor (e.g. Swooper when upside-down).
ACTOR_FLAG_TARGET_ONLY = 0x00004000, ///< Battle ends even if undefeated. No turn.
ACTOR_FLAG_NO_ATTACK = 0x00200000, ///< Skip attack turn.
ACTOR_FLAG_NO_DMG_POPUP = 0x02000000, ///< Hide damage popup.
};
enum ActorPartFlags {
PART_FLAG_INVISIBLE = 0x00000001,
PART_FLAG_NO_TARGET = 0x00020000, ///< Cannot be targeted.
PART_FLAG_MULTI_TARGET = 0x00800000, ///< Can be targeted with multi-target attacks (e.g. Star Storm).
};
enum ActorEventFlags {
EVENT_FLAG_FIREY = 0x00000002, ///< Player takes burn damage upon contact.
EVENT_FLAG_ICY = 0x00000008, ///< No known effect, but is used.
EVENT_FLAG_SPIKY_TOP = 0x00000010, ///< Player takes spike damage from jump attacks.
EVENT_FLAG_ILLUSORY = 0x00000020, ///< Player attacks pass through and miss.
EVENT_FLAG_ELECTRIFIED = 0x00000080, ///< Player takes shock damage upon contact.
EVENT_FLAG_EXPLOSIVE = 0x00000200, ///< Blast and fire attacks trigger an explosion.
EVENT_FLAG_FLIPABLE = 0x00001000, ///< Actor can be flipped; triggered by jump and quake attacks.
EVENT_FLAG_GROUNDABLE = 0x00004000, ///< Actor can be knocked down from flight; triggered by jump attacks.
EVENT_FLAG_SPIKY_FRONT = 0x00010000, ///< Player takes spike damage from hammer attacks.
EVENT_FLAG_ENCHANTED = 0x00040000, ///< Actor glows and listens for the Star Beam event.
EVENT_FLAG_POWER_BOUNCE = 0x00100000, ///< Actor listens for Power Bounce events.
};
#endif

78
src/battle/area_kmr_part_1/goomba.c
View File

@ -173,46 +173,46 @@ Script goomba_dispatch = SCRIPT({
GetLastEvent(ACTOR_SELF, SI_VAR(0));
match SI_VAR(0) {
EVENT_HIT_COMBO, EVENT_HIT {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, pain);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain);
await DoNormalHit;
}
== EVENT_BURN_HIT {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, burn_pain);
SI_VAR(2) = c NPC_ANIM(goomba, normal, burn_dead);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, burn_pain);
SI_VAR(2) = (const) NPC_ANIM(goomba, normal, burn_dead);
await DoBurnHit;
}
== EVENT_BURN_DEATH {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, burn_pain);
SI_VAR(2) = c NPC_ANIM(goomba, normal, burn_dead);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, burn_pain);
SI_VAR(2) = (const) NPC_ANIM(goomba, normal, burn_dead);
await DoBurnHit;
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, burn_dead);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, burn_dead);
await DoDeath;
return;
}
== EVENT_SPIN_SMASH_HIT {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, pain);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain);
await DoSpinSmashHit;
}
== EVENT_SPIN_SMASH_DEATH {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, pain);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain);
await DoSpinSmashHit;
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, dead);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, dead);
await DoDeath;
return;
}
== EVENT_SHOCK_HIT {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, electrocute);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, electrocute);
await DoShockHit;
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, pain);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain);
await DoJumpBack;
JumpToGoal(ACTOR_SELF, 5, 0, 1, 0);
SetAnimationRate(ACTOR_SELF, 1, 2.0);
@ -227,26 +227,26 @@ Script goomba_dispatch = SCRIPT({
JumpToGoal(ACTOR_SELF, 5, 0, 1, 0);
}
== EVENT_SHOCK_DEATH {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, electrocute);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, electrocute);
await DoShockHit;
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, dead);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, dead);
await DoDeath;
return;
}
== EVENT_STAR_BEAM, 23, EVENT_IMMUNE, EVENT_AIR_LIFT_FAILED {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, idle);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, idle);
await DoImmune;
}
== EVENT_DEATH {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, pain);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain);
await DoNormalHit;
sleep 10;
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, dead);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, dead);
await DoDeath;
return;
}
@ -260,25 +260,25 @@ Script goomba_dispatch = SCRIPT({
HPBarToHome(ACTOR_SELF);
}
== EVENT_RECOVER_STATUS {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, idle);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, idle);
await DoRecover;
}
== EVENT_SCARE_AWAY {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, run);
SI_VAR(2) = c NPC_ANIM(goomba, normal, pain);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, run);
SI_VAR(2) = (const) NPC_ANIM(goomba, normal, pain);
await DoScareAway;
return;
}
== EVENT_BEGIN_AIR_LIFT {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, run);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, run);
await DoAirLift;
}
== EVENT_BLOW_AWAY {
SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, pain);
SI_VAR(0) = (const) 1;
SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain);
await DoBlowAway;
return;
} else {

2
src/battle/area_kmr_part_2/43A5A0.c
View File

@ -2,4 +2,4 @@
#define NAMESPACE b_area_kmr_part_2
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/battle/battle.h
View File

@ -257,7 +257,7 @@ typedef struct Stage {
/* 0x0C */ Bytecode* preBattle;
/* 0x10 */ Bytecode* postBattle;
/* 0x14 */ const char* bg;
/* 0x18 */ s32 unk_18;
/* 0x18 */ s32* foregroundModelList;
/* 0x1C */ s32 unk_1C;
/* 0x20 */ s32 unk_20;
/* 0x24 */ s32 unk_24;

2
src/battle/item/coconut/coconut.c
View File

@ -37,7 +37,7 @@ s32 N(modelCommandList)[] = {
};
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_COCONUT;
SI_VAR(10) = (const) ITEM_COCONUT;
await N(UseItemWithEffect);

2
src/battle/item/dizzy_dial/dizzy_dial.c
View File

@ -1,7 +1,7 @@
#include "dizzy_dial.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_DIZZY_DIAL;
SI_VAR(10) = (const) ITEM_DIZZY_DIAL;
await N(UseItemWithEffect);
UseCamPreset(2);
MoveBattleCamOver(20);

2
src/battle/item/dried_shroom/dried_shroom.c
View File

@ -1,7 +1,7 @@
#include "dried_shroom.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_DRIED_SHROOM;
SI_VAR(10) = (const) ITEM_DRIED_SHROOM;
await N(UseItemWithEffect);
await N(EatItem);
SetAnimation(ACTOR_PLAYER, 0, ANIM_STICK_OUT_TONGUE);

2
src/battle/item/dusty_hammer/dusty_hammer.c
View File

@ -36,7 +36,7 @@ s32 N(modelCommandList)[] = {
};
Script N(main) = SCRIPT({
SI_VAR(10) =c 0x86;
SI_VAR(10) = (const) 0x86;
await N(UseItemWithEffect);
UseCamPreset(3);
MoveBattleCamOver(15);

2
src/battle/item/egg_missile/egg_missile.c
View File

@ -112,7 +112,7 @@ s32 N(modelCommandList)[] = {
};
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_EGG_MISSILE;
SI_VAR(10) = (const) ITEM_EGG_MISSILE;
await N(UseItemWithEffect);
UseCamPreset(3);
MoveBattleCamOver(15);

2
src/battle/item/electro_pop/electro_pop.c
View File

@ -1,7 +1,7 @@
#include "electro_pop.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_ELECTRO_POP;
SI_VAR(10) = (const) ITEM_ELECTRO_POP;
await N(UseItemWithEffect);
await N(EatItem);
GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));

2
src/battle/item/fire_flower/fire_flower.c
View File

@ -1,7 +1,7 @@
#include "fire_flower.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_FIRE_FLOWER;
SI_VAR(10) = (const) ITEM_FIRE_FLOWER;
await N(UseItemWithEffect);
N(FadeBackgroundToBlack)();
PlaySound(SOUND_UNKNOWN_377);

2
src/battle/item/fright_jar/fright_jar.c
View File

@ -1,7 +1,7 @@
#include "fright_jar.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_FRIGHT_JAR;
SI_VAR(10) = (const) ITEM_FRIGHT_JAR;
await N(UseItemWithEffect);
N(FadeBackgroundToBlack)();
spawn {

2
src/battle/item/hustle_drink/hustle_drink.c
View File

@ -1,7 +1,7 @@
#include "hustle_drink.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_HUSTLE_DRINK;
SI_VAR(10) = (const) ITEM_HUSTLE_DRINK;
await N(UseItemWithEffect);
await N(DrinkItem);
SetAnimation(ACTOR_PLAYER, 0, ANIM_SQUISH);

2
src/battle/item/insecticide_herb/insecticide_herb.c
View File

@ -36,7 +36,7 @@ s32 N(modelCommandList)[] = {
};
Script script = SCRIPT({
SI_VAR(10) = c ITEM_INSECTICIDE_HERB;
SI_VAR(10) = (const) ITEM_INSECTICIDE_HERB;
await N(UseItemWithEffect);
UseCamPreset(3);
MoveBattleCamOver(15);

2
src/battle/item/life_shroom/life_shroom.c
View File

@ -87,7 +87,7 @@ Script N(main) = SCRIPT({
await N(script6);
return;
}
SI_VAR(10) = c ITEM_LIFE_SHROOM;
SI_VAR(10) = (const) ITEM_LIFE_SHROOM;
SI_VAR(1) = SI_VAR(15);
await N(UseItemWithEffect);
await N(EatItem);

2
src/battle/item/mystery/mystery.c
View File

@ -46,7 +46,7 @@ s32 N(D_802A229C_72D84C)[8] = {
};
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_MYSTERY;
SI_VAR(10) = (const) ITEM_MYSTERY;
await N(UseItemWithEffect);
spawn {
sleep 220;

2
src/battle/item/pebble/pebble.c
View File

@ -36,7 +36,7 @@ s32 N(modelCommandList)[] = {
};
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_PEBBLE;
SI_VAR(10) = (const) ITEM_PEBBLE;
await N(UseItemWithEffect);
UseCamPreset(3);
MoveBattleCamOver(15);

2
src/battle/item/please_come_back/please_come_back.c
View File

@ -1,7 +1,7 @@
#include "please_come_back.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_DIZZY_DIAL;
SI_VAR(10) = (const) ITEM_DIZZY_DIAL;
await N(UseItemWithEffect);
SetGoalToHome(ACTOR_PLAYER);
SetJumpAnimations(ACTOR_PLAYER, 0, ANIM_MIDAIR_STILL, ANIM_MIDAIR, ANIM_10009);

2
src/battle/item/pow_block/pow_block.c
View File

@ -1,7 +1,7 @@
#include "pow_block.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_P_O_W_BLOCK;
SI_VAR(10) = (const) ITEM_P_O_W_BLOCK;
await N(UseItemWithEffect);
sleep 10;
MakeEntity(0x802EA2E0, -40, 60, 0, 0, MAKE_ENTITY_END);

2
src/battle/item/repel_gel/repel_gel.c
View File

@ -1,7 +1,7 @@
#include "repel_gel.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_REPEL_GEL;
SI_VAR(10) = (const) ITEM_REPEL_GEL;
await N(UseItemWithEffect);
PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_375);
SetAnimation(ACTOR_PLAYER, 0, ANIM_30008);

2
src/battle/item/shooting_star/shooting_star.c
View File

@ -1,7 +1,7 @@
#include "shooting_star.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_SHOOTING_STAR;
SI_VAR(10) = (const) ITEM_SHOOTING_STAR;
await N(UseItemWithEffect);
spawn {
sleep 5;

2
src/battle/item/sleepy_sheep/sleepy_sheep.c
View File

@ -101,7 +101,7 @@ s32 N(modelCommandList)[] = {
};
Script N(main) = SCRIPT({
SI_VAR(10) =c ITEM_SLEEPY_SHEEP;
SI_VAR(10) = (const) ITEM_SLEEPY_SHEEP;
await N(UseItemWithEffect);
UseCamPreset(19);
SetBattleCamTarget(0xFFFFFFBD, 0xFFFFFFF1, 0xFFFFFFFB);

2
src/battle/item/snowman_doll/snowman_doll.c
View File

@ -1,7 +1,7 @@
#include "snowman_doll.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_SNOWMAN_DOLL;
SI_VAR(10) = (const) ITEM_SNOWMAN_DOLL;
await N(UseItemWithEffect);
N(FadeBackgroundToBlack)();
PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_363);

2
src/battle/item/stone_cap/stone_cap.c
View File

@ -1,7 +1,7 @@
#include "stone_cap.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_STONE_CAP;
SI_VAR(10) = (const) ITEM_STONE_CAP;
await N(UseItemWithEffect);
PlaySound(SOUND_UNKNOWN_361);
SetAnimation(ACTOR_PLAYER, 0, ANIM_30009);

2
src/battle/item/stop_watch/stop_watch.c
View File

@ -1,7 +1,7 @@
#include "stop_watch.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_STOP_WATCH;
SI_VAR(10) = (const) ITEM_STOP_WATCH;
await N(UseItemWithEffect);
spawn {
sleep 5;

4
src/battle/item/strange_cake/strange_cake.c
View File

@ -25,7 +25,7 @@ s32 N(D_802A2858_732B58)[] = {
Script N(script6) = SCRIPT({
GetMenuSelection(SI_VAR(0), SI_VAR(1), SI_VAR(2));
if (SI_VAR(1) == 211) {
SI_VAR(10) = c ITEM_KOOKY_COOKIE;
SI_VAR(10) = (const) ITEM_KOOKY_COOKIE;
SI_VAR(1) = 0;
await N(UseItemWithEffect);
await N(EatItem);
@ -47,7 +47,7 @@ Script N(script6) = SCRIPT({
sleep 20;
SetAnimation(ACTOR_PLAYER, 0, ANIM_GOT_ITEM);
} else {
SI_VAR(10) = c ITEM_STRANGE_CAKE;
SI_VAR(10) = (const) ITEM_STRANGE_CAKE;
SI_VAR(1) = 0;
await N(UseItemWithEffect);
await N(EatItem);

2
src/battle/item/super_soda/super_soda.c
View File

@ -77,7 +77,7 @@ Script N(script6) = SCRIPT({
});
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_SUPER_SODA;
SI_VAR(10) = (const) ITEM_SUPER_SODA;
await N(UseItemWithEffect);
InitTargetIterator();
GetOwnerTarget(SI_VAR(0), SI_VAR(1));

2
src/battle/item/tasty_tonic/tasty_tonic.c
View File

@ -1,7 +1,7 @@
#include "tasty_tonic.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_TASTY_TONIC;
SI_VAR(10) = (const) ITEM_TASTY_TONIC;
await N(UseItemWithEffect);
InitTargetIterator();
GetOwnerTarget(SI_VAR(0), SI_VAR(1));

2
src/battle/item/thunder_bolt/thunder_bolt.c
View File

@ -1,7 +1,7 @@
#include "thunder_bolt.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_THUNDER_BOLT;
SI_VAR(10) = (const) ITEM_THUNDER_BOLT;
await N(UseItemWithEffect);
spawn {
sleep 5;

2
src/battle/item/thunder_rage/thunder_rage.c
View File

@ -1,7 +1,7 @@
#include "thunder_rage.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_THUNDER_RAGE;
SI_VAR(10) = (const) ITEM_THUNDER_RAGE;
await N(UseItemWithEffect);
parallel {
sleep 5;

2
src/battle/item/ultra_shroom/ultra_shroom.c
View File

@ -1,7 +1,7 @@
#include "ultra_shroom.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_SUPER_SHROOM;
SI_VAR(10) = (const) ITEM_SUPER_SHROOM;
await N(UseItemWithEffect);
AddBattleCamZoom(50);
MoveBattleCamOver(20);

2
src/battle/item/unknown_item/unknown_item.c
View File

@ -1,7 +1,7 @@
#include "unknown_item.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_ULTRA_SHROOM;
SI_VAR(10) = (const) ITEM_ULTRA_SHROOM;
await N(UseItemWithEffect);
await N(EatItem);
GetActorPos(ACTOR_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2));

2
src/battle/item/volt_shroom/volt_shroom.c
View File

@ -1,7 +1,7 @@
#include "volt_shroom.h"
Script N(main) = SCRIPT({
SI_VAR(10) = c ITEM_VOLT_SHROOM;
SI_VAR(10) = (const) ITEM_VOLT_SHROOM;
await N(UseItemWithEffect);
await N(EatItem);
SetAnimation(ACTOR_PLAYER, 0, ANIM_10002);

64
src/world/area_arn/arn_02/events.c
View File

@ -106,22 +106,22 @@ StaticNpc N(npcGroup_802414CC) = {
.maxCoinBonus = 3,
.movement = { -196, 130, 104, 50, 30, -32767, 1, -196, 130, 104, 120 },
.animations = {
NPC_ANIM(cleft, Palette_01, Anim_2),
NPC_ANIM(cleft, Palette_01, Anim_6),
NPC_ANIM(cleft, Palette_01, Anim_7),
NPC_ANIM(cleft, Palette_01, Anim_7),
NPC_ANIM(cleft, Palette_01, Anim_2),
NPC_ANIM(cleft, Palette_01, Anim_2),
NPC_ANIM(cleft, Palette_01, Anim_8),
NPC_ANIM(cleft, Palette_01, Anim_8),
NPC_ANIM(cleft, Palette_01, Anim_14),
NPC_ANIM(cleft, Palette_01, Anim_17),
NPC_ANIM(cleft, Palette_01, Anim_13),
NPC_ANIM(cleft, Palette_01, Anim_15),
NPC_ANIM(cleft, Palette_01, Anim_10),
NPC_ANIM(cleft, Palette_01, Anim_11),
NPC_ANIM(cleft, Palette_01, Anim_16),
NPC_ANIM(cleft, Palette_01, Anim_0),
NPC_ANIM(cleft, hyper, idle),
NPC_ANIM(cleft, hyper, walk),
NPC_ANIM(cleft, hyper, run),
NPC_ANIM(cleft, hyper, run),
NPC_ANIM(cleft, hyper, idle),
NPC_ANIM(cleft, hyper, idle),
NPC_ANIM(cleft, hyper, skid),
NPC_ANIM(cleft, hyper, skid),
NPC_ANIM(cleft, hyper, rock),
NPC_ANIM(cleft, hyper, rock_darken),
NPC_ANIM(cleft, hyper, from_rock),
NPC_ANIM(cleft, hyper, into_rock),
NPC_ANIM(cleft, hyper, charge_still),
NPC_ANIM(cleft, hyper, charge),
NPC_ANIM(cleft, hyper, rock_lighten),
NPC_ANIM(cleft, hyper, still),
},
.unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00},
};
@ -139,22 +139,22 @@ StaticNpc N(npcGroup_802416BC) = {
.maxCoinBonus = 3,
.movement = { 641, 268, 202, 50, 30, -32767, 1, 641, 268, 202, 120 },
.animations = {
NPC_ANIM(cleft, Palette_01, Anim_2),
NPC_ANIM(cleft, Palette_01, Anim_6),
NPC_ANIM(cleft, Palette_01, Anim_7),
NPC_ANIM(cleft, Palette_01, Anim_7),
NPC_ANIM(cleft, Palette_01, Anim_2),
NPC_ANIM(cleft, Palette_01, Anim_2),
NPC_ANIM(cleft, Palette_01, Anim_8),
NPC_ANIM(cleft, Palette_01, Anim_8),
NPC_ANIM(cleft, Palette_01, Anim_14),
NPC_ANIM(cleft, Palette_01, Anim_17),
NPC_ANIM(cleft, Palette_01, Anim_13),
NPC_ANIM(cleft, Palette_01, Anim_15),
NPC_ANIM(cleft, Palette_01, Anim_10),
NPC_ANIM(cleft, Palette_01, Anim_11),
NPC_ANIM(cleft, Palette_01, Anim_16),
NPC_ANIM(cleft, Palette_01, Anim_0),
NPC_ANIM(cleft, hyper, idle),
NPC_ANIM(cleft, hyper, walk),
NPC_ANIM(cleft, hyper, run),
NPC_ANIM(cleft, hyper, run),
NPC_ANIM(cleft, hyper, idle),
NPC_ANIM(cleft, hyper, idle),
NPC_ANIM(cleft, hyper, skid),
NPC_ANIM(cleft, hyper, skid),
NPC_ANIM(cleft, hyper, rock),
NPC_ANIM(cleft, hyper, rock_darken),
NPC_ANIM(cleft, hyper, from_rock),
NPC_ANIM(cleft, hyper, into_rock),
NPC_ANIM(cleft, hyper, charge_still),
NPC_ANIM(cleft, hyper, charge),
NPC_ANIM(cleft, hyper, rock_lighten),
NPC_ANIM(cleft, hyper, still),
},
.unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00},
};

6
src/world/area_arn/arn_03/events.c
View File

@ -122,7 +122,7 @@ Script N(80241CD4) = SCRIPT({
RemoveKeyItemAt(SI_VAR(1));
GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
N(AddPlayerHandsOffset)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
SI_VAR(0) |=c 0x50000;
SI_VAR(0) |= (const) 0x50000;
MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
SetPlayerAnimation(0x60005);
sleep 30;
@ -666,13 +666,13 @@ Script N(idle_80243D28) = SCRIPT({
SI_VAR(4) += 60;
loop {
RandInt(5, SI_VAR(5));
SI_VAR(6) =f SI_VAR(5);
SI_VAR(6) = (float) SI_VAR(5);
SI_VAR(6) *= 0.1005859375;
SI_VAR(6) += 0.80078125;
SetNpcSpeed(NPC_SELF, SI_VAR(6));
NpcMoveTo(NPC_SELF, SI_VAR(3), SI_VAR(2), 0);
RandInt(5, SI_VAR(5));
SI_VAR(6) =f SI_VAR(5);
SI_VAR(6) = (float) SI_VAR(5);
SI_VAR(6) *= 0.1005859375;
SI_VAR(6) += 0.80078125;
SetNpcSpeed(NPC_SELF, SI_VAR(6));

96
src/world/area_arn/arn_04/events.c
View File

@ -133,22 +133,22 @@ StaticNpc N(npcGroup_80243840) = {
.maxCoinBonus = 2,
.movement = { -350, 180, 150, 30, 0, -32767, 0, -350, 180, 150, 150 },
.animations = {
NPC_ANIM(paragoomba, Palette_02, Anim_1),
NPC_ANIM(paragoomba, Palette_02, Anim_3),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_1),
NPC_ANIM(paragoomba, Palette_02, Anim_1),
NPC_ANIM(paragoomba, Palette_02, Anim_6),
NPC_ANIM(paragoomba, Palette_02, Anim_6),
NPC_ANIM(paragoomba, Palette_02, Anim_5),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, hyper, idle),
NPC_ANIM(paragoomba, hyper, walk),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, idle),
NPC_ANIM(paragoomba, hyper, idle),
NPC_ANIM(paragoomba, hyper, pain),
NPC_ANIM(paragoomba, hyper, pain),
NPC_ANIM(paragoomba, hyper, attack),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
},
.unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00},
};
@ -200,22 +200,22 @@ StaticNpc N(npcGroup_80243C20) = {
.maxCoinBonus = 3,
.movement = { 150, 177, 160, 30, 0, -32767, 0, 150, 177, 160, 150 },
.animations = {
NPC_ANIM(cleft, Palette_01, Anim_2),
NPC_ANIM(cleft, Palette_01, Anim_6),
NPC_ANIM(cleft, Palette_01, Anim_7),
NPC_ANIM(cleft, Palette_01, Anim_7),
NPC_ANIM(cleft, Palette_01, Anim_2),
NPC_ANIM(cleft, Palette_01, Anim_2),
NPC_ANIM(cleft, Palette_01, Anim_8),
NPC_ANIM(cleft, Palette_01, Anim_8),
NPC_ANIM(cleft, Palette_01, Anim_14),
NPC_ANIM(cleft, Palette_01, Anim_17),
NPC_ANIM(cleft, Palette_01, Anim_13),
NPC_ANIM(cleft, Palette_01, Anim_15),
NPC_ANIM(cleft, Palette_01, Anim_10),
NPC_ANIM(cleft, Palette_01, Anim_11),
NPC_ANIM(cleft, Palette_01, Anim_16),
NPC_ANIM(cleft, Palette_01, Anim_0),
NPC_ANIM(cleft, hyper, idle),
NPC_ANIM(cleft, hyper, walk),
NPC_ANIM(cleft, hyper, run),
NPC_ANIM(cleft, hyper, run),
NPC_ANIM(cleft, hyper, idle),
NPC_ANIM(cleft, hyper, idle),
NPC_ANIM(cleft, hyper, skid),
NPC_ANIM(cleft, hyper, skid),
NPC_ANIM(cleft, hyper, rock),
NPC_ANIM(cleft, hyper, rock_darken),
NPC_ANIM(cleft, hyper, from_rock),
NPC_ANIM(cleft, hyper, into_rock),
NPC_ANIM(cleft, hyper, charge_still),
NPC_ANIM(cleft, hyper, charge),
NPC_ANIM(cleft, hyper, rock_lighten),
NPC_ANIM(cleft, hyper, still),
},
.unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00},
};
@ -233,22 +233,22 @@ StaticNpc N(npcGroup_80243E10) = {
.maxCoinBonus = 3,
.movement = { 550, 230, 125, 30, 0, -32767, 0, 550, 230, 125, 150 },
.animations = {
NPC_ANIM(cleft, Palette_01, Anim_2),
NPC_ANIM(cleft, Palette_01, Anim_6),
NPC_ANIM(cleft, Palette_01, Anim_7),
NPC_ANIM(cleft, Palette_01, Anim_7),
NPC_ANIM(cleft, Palette_01, Anim_2),
NPC_ANIM(cleft, Palette_01, Anim_2),
NPC_ANIM(cleft, Palette_01, Anim_8),
NPC_ANIM(cleft, Palette_01, Anim_8),
NPC_ANIM(cleft, Palette_01, Anim_14),
NPC_ANIM(cleft, Palette_01, Anim_17),
NPC_ANIM(cleft, Palette_01, Anim_13),
NPC_ANIM(cleft, Palette_01, Anim_15),
NPC_ANIM(cleft, Palette_01, Anim_10),
NPC_ANIM(cleft, Palette_01, Anim_11),
NPC_ANIM(cleft, Palette_01, Anim_16),
NPC_ANIM(cleft, Palette_01, Anim_0),
NPC_ANIM(cleft, hyper, idle),
NPC_ANIM(cleft, hyper, walk),
NPC_ANIM(cleft, hyper, run),
NPC_ANIM(cleft, hyper, run),
NPC_ANIM(cleft, hyper, idle),
NPC_ANIM(cleft, hyper, idle),
NPC_ANIM(cleft, hyper, skid),
NPC_ANIM(cleft, hyper, skid),
NPC_ANIM(cleft, hyper, rock),
NPC_ANIM(cleft, hyper, rock_darken),
NPC_ANIM(cleft, hyper, from_rock),
NPC_ANIM(cleft, hyper, into_rock),
NPC_ANIM(cleft, hyper, charge_still),
NPC_ANIM(cleft, hyper, charge),
NPC_ANIM(cleft, hyper, rock_lighten),
NPC_ANIM(cleft, hyper, still),
},
.unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00},
};

4
src/world/area_arn/arn_05/events.c
View File

@ -818,13 +818,13 @@ Script N(idle_8024459C) = SCRIPT({
SI_VAR(4) += 60;
loop {
RandInt(5, SI_VAR(5));
SI_VAR(6) =f SI_VAR(5);
SI_VAR(6) = (float) SI_VAR(5);
SI_VAR(6) *= 0.1005859375;
SI_VAR(6) += 0.80078125;
SetNpcSpeed(NPC_SELF, SI_VAR(6));
NpcMoveTo(NPC_SELF, SI_VAR(3), SI_VAR(2), 0);
RandInt(5, SI_VAR(5));
SI_VAR(6) =f SI_VAR(5);
SI_VAR(6) = (float) SI_VAR(5);
SI_VAR(6) *= 0.1005859375;
SI_VAR(6) += 0.80078125;
SetNpcSpeed(NPC_SELF, SI_VAR(6));

104
src/world/area_arn/arn_07/events.c
View File

@ -32,13 +32,13 @@ Script N(802437AC) = SCRIPT({
SI_VAR(2) = 1.0;
loop 50 {
SI_VAR(2) -= 0.0107421875;
SI_VAR(0) +=f SI_VAR(2);
SI_VAR(0) += (float) SI_VAR(2);
RotateModel(27, SI_VAR(0), 0, 0, 1);
sleep 1;
}
loop 50 {
SI_VAR(2) += 0.0107421875;
SI_VAR(0) +=f SI_VAR(2);
SI_VAR(0) += (float) SI_VAR(2);
RotateModel(27, SI_VAR(0), 0, 0, 1);
sleep 1;
}
@ -412,8 +412,8 @@ Script N(idle_80244CC8) = SCRIPT({
MakeLerp(50, 80, 15, 0);
loop {
UpdateLerp();
SI_VAR(2) =f SI_VAR(0);
SI_VAR(2) /=f 100;
SI_VAR(2) = (float) SI_VAR(0);
SI_VAR(2) /= (float) 100;
SetNpcScale(NPC_SELF, SI_VAR(2), SI_VAR(2), SI_VAR(2));
sleep 1;
if (SI_VAR(1) == 0) {
@ -1017,22 +1017,22 @@ StaticNpc N(npcGroup_802470BC) = {
.maxCoinBonus = 2,
.movement = { -216, 60, -10, 30, 0, -32767, 0, -216, 60, -10, 250 },
.animations = {
NPC_ANIM(paragoomba, Palette_02, Anim_1),
NPC_ANIM(paragoomba, Palette_02, Anim_3),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_1),
NPC_ANIM(paragoomba, Palette_02, Anim_1),
NPC_ANIM(paragoomba, Palette_02, Anim_6),
NPC_ANIM(paragoomba, Palette_02, Anim_6),
NPC_ANIM(paragoomba, Palette_02, Anim_5),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, hyper, idle),
NPC_ANIM(paragoomba, hyper, walk),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, idle),
NPC_ANIM(paragoomba, hyper, idle),
NPC_ANIM(paragoomba, hyper, pain),
NPC_ANIM(paragoomba, hyper, pain),
NPC_ANIM(paragoomba, hyper, attack),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
},
.unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00},
};
@ -1054,22 +1054,22 @@ StaticNpc N(npcGroup_802472AC) = {
.maxCoinBonus = 2,
.movement = { 0, 60, 150, 30, 0, -32767, 0, 0, 60, 150, 250 },
.animations = {
NPC_ANIM(paragoomba, Palette_02, Anim_1),
NPC_ANIM(paragoomba, Palette_02, Anim_3),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_1),
NPC_ANIM(paragoomba, Palette_02, Anim_1),
NPC_ANIM(paragoomba, Palette_02, Anim_6),
NPC_ANIM(paragoomba, Palette_02, Anim_6),
NPC_ANIM(paragoomba, Palette_02, Anim_5),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, hyper, idle),
NPC_ANIM(paragoomba, hyper, walk),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, idle),
NPC_ANIM(paragoomba, hyper, idle),
NPC_ANIM(paragoomba, hyper, pain),
NPC_ANIM(paragoomba, hyper, pain),
NPC_ANIM(paragoomba, hyper, attack),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
},
.unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00},
};
@ -1091,22 +1091,22 @@ StaticNpc N(npcGroup_8024749C) = {
.maxCoinBonus = 2,
.movement = { 260, 60, 30, 30, 0, -32767, 0, 260, 60, 30, 250 },
.animations = {
NPC_ANIM(paragoomba, Palette_02, Anim_1),
NPC_ANIM(paragoomba, Palette_02, Anim_3),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_1),
NPC_ANIM(paragoomba, Palette_02, Anim_1),
NPC_ANIM(paragoomba, Palette_02, Anim_6),
NPC_ANIM(paragoomba, Palette_02, Anim_6),
NPC_ANIM(paragoomba, Palette_02, Anim_5),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, Palette_02, Anim_4),
NPC_ANIM(paragoomba, hyper, idle),
NPC_ANIM(paragoomba, hyper, walk),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, idle),
NPC_ANIM(paragoomba, hyper, idle),
NPC_ANIM(paragoomba, hyper, pain),
NPC_ANIM(paragoomba, hyper, pain),
NPC_ANIM(paragoomba, hyper, attack),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
NPC_ANIM(paragoomba, hyper, run),
},
.unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00},
};

2
src/world/area_dro/dro_01/95E7A0.c
View File

@ -22,4 +22,4 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435D4_95E7D4);
#include "world/common/SomeXYZFunc2.inc.c"
#define NAMESPACE dro_01
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_flo/flo_03/CA72E0.c
View File

@ -29,4 +29,4 @@ ApiStatus N(func_80240040_CA72E0)(ScriptInstance* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "world/area_flo/flo_03/CA72E0", func_80240158_CA73F8);
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_flo/flo_07/CAC5D0.c
View File

@ -1,6 +1,6 @@
#include "flo_07.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC5D0", func_8024061C_CAC80C);
/*

2
src/world/area_flo/flo_08/CAFAC0.c
View File

@ -54,4 +54,4 @@ INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241B5C_CB089C);
INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241BCC_CB090C);
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_flo/flo_09/CB50E0.c
View File

@ -1,4 +1,4 @@
#include "flo_09.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_flo/flo_10/CBA430.c
View File

@ -1,4 +1,4 @@
#include "flo_10.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_flo/flo_12/CC0E70.c
View File

@ -1,6 +1,6 @@
#include "flo_12.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_8024027C_CC10AC);

2
src/world/area_flo/flo_18/CDCC30.c
View File

@ -1,4 +1,4 @@
#include "flo_18.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_flo/flo_22/CEC290.c
View File

@ -1,4 +1,4 @@
#include "flo_22.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_flo/flo_24/CF0980.c
View File

@ -1,4 +1,4 @@
#include "flo_24.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_flo/flo_25/CF4BC0.c
View File

@ -1,4 +1,4 @@
#include "flo_25.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_hos/hos_03/A1BB70.c
View File

@ -1,4 +1,4 @@
#include "hos_03.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_iwa/iwa_10/91FB20.c
View File

@ -1,4 +1,4 @@
#include "iwa_10.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_00/B21EA0.c
View File

@ -1,4 +1,4 @@
#include "jan_00.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_01/B291C0.c
View File

@ -1,4 +1,4 @@
#include "jan_01.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_02/B2EB50.c
View File

@ -1,4 +1,4 @@
#include "jan_02.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_03/B37C20.c
View File

@ -1,4 +1,4 @@
#include "jan_03.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_04/B44F10.c
View File

@ -1,4 +1,4 @@
#include "jan_04.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_04/B451F0.c
View File

@ -9,5 +9,5 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240BE8_B45358);
INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240D0C_B4547C);
#define NAMESPACE dup_jan_04
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE jan_04

2
src/world/area_jan/jan_05/B4AF10.c
View File

@ -1,6 +1,6 @@
#include "jan_05.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AF10", func_802406DC_B4B14C);

2
src/world/area_jan/jan_05/B4B260.c
View File

@ -250,7 +250,7 @@ ApiStatus N(func_8024219C_B4CC0C)(ScriptInstance *script, s32 isInitialCall) {
*/
#define NAMESPACE dup_jan_05
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE jan_05
ApiStatus func_8024268C_B4D0FC(ScriptInstance* script) {

2
src/world/area_jan/jan_06/B52D30.c
View File

@ -1,4 +1,4 @@
#include "jan_06.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_06/B52F70.c
View File

@ -250,5 +250,5 @@ ApiStatus N(func_802420EC_B5491C)(ScriptInstance *script, s32 isInitialCall) {
*/
#define NAMESPACE dup_jan_06
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE jan_06

2
src/world/area_jan/jan_07/B5A610.c
View File

@ -1,4 +1,4 @@
#include "jan_07.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_07/B5A850.c
View File

@ -1,7 +1,7 @@
#include "jan_07.h"
#define NAMESPACE dup_jan_07
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE jan_07

2
src/world/area_jan/jan_08/B5E5C0.c
View File

@ -1,6 +1,6 @@
#include "jan_08.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E5C0", func_8024054C_B5E7FC);

2
src/world/area_jan/jan_08/B604A0.c
View File

@ -1,7 +1,7 @@
#include "jan_08.h"
#define NAMESPACE dup_jan_08
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE jan_08

2
src/world/area_jan/jan_09/B660A0.c
View File

@ -1,6 +1,6 @@
#include "jan_09.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_09/B660A0", func_8024082C_B662DC);

2
src/world/area_jan/jan_09/B67190.c
View File

@ -1,5 +1,5 @@
#include "jan_09.h"
#define NAMESPACE dup_jan_09
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE jan_09

2
src/world/area_jan/jan_10/B6D610.c
View File

@ -1,6 +1,6 @@
#include "jan_10.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_10/B6D610", func_802414BC_B6D84C);

2
src/world/area_jan/jan_10/B6D890.c
View File

@ -1,5 +1,5 @@
#include "jan_10.h"
#define NAMESPACE dup_jan_10
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE jan_10

2
src/world/area_jan/jan_12/B730B0.c
View File

@ -8,5 +8,5 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_80240170_B73220);
INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_802401CC_B7327C);
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_13/B767B0.c
View File

@ -8,5 +8,5 @@ INCLUDE_ASM(s32, "world/area_jan/jan_13/B767B0", func_80240214_B769C4);
INCLUDE_ASM(s32, "world/area_jan/jan_13/B767B0", func_802402B8_B76A68);
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_14/B7A050.c
View File

@ -8,5 +8,5 @@ INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A050", func_80240170_B7A1C0);
INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A050", func_802401CC_B7A21C);
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_15/B7D9E0.c
View File

@ -1,4 +1,4 @@
#include "jan_15.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_16/B80300.c
View File

@ -1,4 +1,4 @@
#include "jan_16.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_jan/jan_22/B851A0.c
View File

@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_80241168_B852E8);
INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_802412E0_B85460);
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_8024160C_B8578C);

2
src/world/area_jan/jan_22/B858A0.c
View File

@ -1,5 +1,5 @@
#include "jan_22.h"
#define NAMESPACE dup_jan_22
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE jan_22

2
src/world/area_kmr/kmr_02/8B37D0.c
View File

@ -1,4 +1,4 @@
#include "kmr_02.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

242
src/world/area_kmr/kmr_03/8C83A0.c
View File

@ -1,215 +1,47 @@
#include "kmr_03.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
// *INDENT-OFF*
Script N(searchBush_802417F0) = {
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(0)),
SI_CMD(ScriptOpcode_BUFFER_READ_4, SI_VAR(1), SI_VAR(2), SI_VAR(3), SI_VAR(4)),
SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_VAR(5), SI_VAR(15), SI_VAR(7)),
SI_CMD(ScriptOpcode_SPAWN_THREAD),
SI_CMD(ScriptOpcode_SET, SI_FLAG(0), 0),
SI_CMD(ScriptOpcode_IF_NE, SI_VAR(1), 0),
SI_CMD(ScriptOpcode_LOOP, 5),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(1)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(2)),
SI_CMD(ScriptOpcode_LOOP, SI_VAR(2)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)),
SI_CMD(ScriptOpcode_CALL, N(SomeMatrixOperation2), SI_VAR(3), SI_FIXED(0.1005859375), 1, SI_VAR(15), 0),
SI_CMD(ScriptOpcode_IF_EQ, SI_FLAG(0), 0),
SI_CMD(ScriptOpcode_SET, SI_FLAG(0), 1),
SI_CMD(ScriptOpcode_CALL, PlaySoundAtModel, SI_VAR(3), 339, 0),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(1)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(2)),
SI_CMD(ScriptOpcode_LOOP, SI_VAR(2)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)),
SI_CMD(ScriptOpcode_CALL, N(SomeMatrixOperation2), SI_VAR(3), SI_FIXED(0.1005859375), -1, SI_VAR(15), 0),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(1)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(2)),
SI_CMD(ScriptOpcode_LOOP, SI_VAR(2)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)),
SI_CMD(ScriptOpcode_CALL, TranslateModel, SI_VAR(3), 0, 0, 0),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
SI_CMD(ScriptOpcode_SPAWN_THREAD),
SI_CMD(ScriptOpcode_IF_NE, SI_VAR(2), 0),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(2)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)),
SI_CMD(ScriptOpcode_LOOP, SI_VAR(3)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(4)),
SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(5), SI_VAR(6), SI_VAR(7)),
SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(8), SI_VAR(9), SI_VAR(10)),
SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(10), 0),
SI_CMD(ScriptOpcode_CALL, DropItemEntity, SI_VAR(4), SI_VAR(5), SI_VAR(6), SI_VAR(7), SI_VAR(8), SI_VAR(9)),
SI_CMD(ScriptOpcode_ELSE),
SI_CMD(ScriptOpcode_CALL, GetValueByRef, SI_VAR(10), SI_VAR(11)),
SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(11), 0),
SI_CMD(ScriptOpcode_CALL, SetValueByRef, SI_VAR(10), 1),
SI_CMD(ScriptOpcode_CALL, DropItemEntity, SI_VAR(4), SI_VAR(5), SI_VAR(6), SI_VAR(7), SI_VAR(8), SI_VAR(9)),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
SI_CMD(ScriptOpcode_IF_NE, SI_VAR(4), 0),
SI_CMD(ScriptOpcode_AWAIT_SCRIPT, 0xFE363C84),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_RETURN),
SI_CMD(ScriptOpcode_END)
};
// *INDENT-ON*
// *INDENT-OFF*
Script N(shakeTree_80241B50) = {
SI_CMD(ScriptOpcode_SET_TIMESCALE, SI_FIXED(2.0)),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(0)),
SI_CMD(ScriptOpcode_BUFFER_READ_4, SI_VAR(1), SI_VAR(2), SI_VAR(3), SI_VAR(4)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(5)),
SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_VAR(6), SI_VAR(15), SI_VAR(8)),
SI_CMD(ScriptOpcode_CALL, PlaySound, 357),
SI_CMD(ScriptOpcode_CALL, PlaySound, 358),
SI_CMD(ScriptOpcode_SPAWN_THREAD),
SI_CMD(ScriptOpcode_SET, SI_FLAG(0), 0),
SI_CMD(ScriptOpcode_IF_NE, SI_VAR(1), 0),
SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
SI_CMD(ScriptOpcode_LOOP, 5),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(1)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(2)),
SI_CMD(ScriptOpcode_LOOP, SI_VAR(2)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)),
SI_CMD(ScriptOpcode_CALL, N(SomeMatrixOperation2), SI_VAR(3), SI_FIXED(0.1005859375), SI_FIXED(0.2001953125), SI_VAR(15), 0),
SI_CMD(ScriptOpcode_IF_EQ, SI_FLAG(0), 0),
SI_CMD(ScriptOpcode_SET, SI_FLAG(0), 1),
SI_CMD(ScriptOpcode_CALL, PlaySoundAtModel, SI_VAR(3), 358, 0),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(1)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(2)),
SI_CMD(ScriptOpcode_LOOP, SI_VAR(2)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)),
SI_CMD(ScriptOpcode_CALL, N(SomeMatrixOperation2), SI_VAR(3), SI_FIXED(0.1005859375), SI_FIXED(-0.19921875), SI_VAR(15), 0),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(1)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(2)),
SI_CMD(ScriptOpcode_LOOP, SI_VAR(2)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)),
SI_CMD(ScriptOpcode_CALL, TranslateModel, SI_VAR(3), 0, 0, 0),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
SI_CMD(ScriptOpcode_SPAWN_THREAD),
SI_CMD(ScriptOpcode_SET, SI_FLAG(0), 0),
SI_CMD(ScriptOpcode_IF_NE, SI_VAR(2), 0),
SI_CMD(ScriptOpcode_LOOP, 5),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(2)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)),
SI_CMD(ScriptOpcode_LOOP, SI_VAR(3)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(4)),
SI_CMD(ScriptOpcode_CALL, N(SomeMatrixOperation2), SI_VAR(4), SI_FIXED(0.1005859375), SI_FIXED(0.2001953125), SI_VAR(15), 0),
SI_CMD(ScriptOpcode_IF_EQ, SI_FLAG(0), 0),
SI_CMD(ScriptOpcode_SET, SI_FLAG(0), 1),
SI_CMD(ScriptOpcode_CALL, PlaySoundAtModel, SI_VAR(4), 357, 0),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(2)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)),
SI_CMD(ScriptOpcode_LOOP, SI_VAR(3)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(4)),
SI_CMD(ScriptOpcode_CALL, N(SomeMatrixOperation2), SI_VAR(4), SI_FIXED(0.1005859375), SI_FIXED(-0.19921875), SI_VAR(15), 0),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(2)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)),
SI_CMD(ScriptOpcode_LOOP, SI_VAR(3)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(4)),
SI_CMD(ScriptOpcode_CALL, TranslateModel, SI_VAR(4), 0, 0, 0),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
SI_CMD(ScriptOpcode_SPAWN_THREAD),
SI_CMD(ScriptOpcode_IF_NE, SI_VAR(3), 0),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(3)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(4)),
SI_CMD(ScriptOpcode_LOOP, SI_VAR(4)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(5)),
SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(6), SI_VAR(7), SI_VAR(8)),
SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(9), SI_VAR(10), SI_VAR(11)),
SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(11), 0),
SI_CMD(ScriptOpcode_CALL, DropItemEntity, SI_VAR(5), SI_VAR(6), SI_VAR(7), SI_VAR(8), SI_VAR(9), SI_VAR(10)),
SI_CMD(ScriptOpcode_ELSE),
SI_CMD(ScriptOpcode_CALL, GetValueByRef, SI_VAR(11), SI_VAR(12)),
SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(12), 0),
SI_CMD(ScriptOpcode_CALL, SetValueByRef, SI_VAR(11), 1),
SI_CMD(ScriptOpcode_CALL, DropItemEntity, SI_VAR(5), SI_VAR(6), SI_VAR(7), SI_VAR(8), SI_VAR(9), SI_VAR(10)),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
SI_CMD(ScriptOpcode_SPAWN_THREAD),
SI_CMD(ScriptOpcode_IF_NE, SI_VAR(4), 0),
SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(4)),
SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(5)),
SI_CMD(ScriptOpcode_LOOP, SI_VAR(5)),
SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(6), SI_VAR(7), SI_VAR(8)),
SI_CMD(ScriptOpcode_CALL, PlayEffect, 20, 0, SI_VAR(6), SI_VAR(7), SI_VAR(8), 100, 0, 0, 0, 0, 0, 0, 0, 0),
SI_CMD(ScriptOpcode_END_LOOP),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
SI_CMD(ScriptOpcode_IF_NE, SI_VAR(5), 0),
SI_CMD(ScriptOpcode_AWAIT_SCRIPT, 0xFE363C85),
SI_CMD(ScriptOpcode_END_IF),
SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
SI_CMD(ScriptOpcode_RETURN),
SI_CMD(ScriptOpcode_END)
};
// *INDENT-ON*
s32 N(treeModelList_Bush1_Bush)[] = {
0x00000001, 0x00000040,
FoliageModelList N(treeModelList_Bush1_Bush) = {
.count = 1,
.models = { 0x40 },
};
s32 N(treeEffectVectors_Bush1)[] = {
0x00000001, 0x0000008F, 0x00000010, 0x000001CE,
FoliageVectorList N(treeEffectVectors_Bush1) = {
.count = 1,
.vectors = {
{ 143, 16, 462 },
},
};
s32 N(searchBushEvent_Bush1)[] = {
N(treeModelList_Bush1_Bush), 0x00000000, N(treeEffectVectors_Bush1), 0x00000000,
SearchBushConfig N(bush1) = {
.bush = &N(treeModelList_Bush1_Bush),
.vectors = &N(treeEffectVectors_Bush1),
};
s32 N(treeModelList_Tree1_Leaves)[] = {
0x00000001, 0x0000003E,
FoliageModelList N(treeModelList_Tree1_Leaves) = {
.count = 1,
.models = { 0x3E },
};
s32 N(treeModelList_Tree1_Trunk)[] = {
0x00000001, 0x0000003D,
FoliageModelList N(treeModelList_Tree1_Trunk) = {
.count = 1,
.models = { 0x3D },
};
s32 N(treeEffectVectors_Tree1)[] = {
0x00000002, 0xFFFFFFB0, 0x00000082, 0x00000012, 0x0000001C, 0x00000082, 0x00000027,
FoliageVectorList N(treeEffectVectors_Tree1) = {
.count = 2,
.vectors = {
{ 0xFFFFFFB0, 0x00000082, 0x00000012 },
{ 0x0000001C, 0x00000082, 0x00000027 },
},
};
Script N(tree1_Callback) = SCRIPT({
if (SI_SAVE_FLAG(53) == 1) {
if (SI_SAVE_FLAG(53) == TRUE) {
return;
}
if (SI_MAP_FLAG(10) == 1) {
if (SI_MAP_FLAG(10) == TRUE) {
return;
}
sleep 10;
@ -222,19 +54,21 @@ Script N(tree1_Callback) = SCRIPT({
SI_MAP_FLAG(10) = 1;
});
s32 N(shakeTreeEvent_Tree1)[] = {
N(treeModelList_Tree1_Leaves), N(treeModelList_Tree1_Trunk), 0x00000000, N(treeEffectVectors_Tree1), N(tree1_Callback),
ShakeTreeConfig N(tree1) = {
.leaves = &N(treeModelList_Tree1_Leaves),
.trunk = &N(treeModelList_Tree1_Trunk),
.vectors = &N(treeEffectVectors_Tree1),
.callback = N(tree1_Callback),
};
s32 N(triggerCoord_802422A8)[] = {
0xC2280000, 0x00000000, 0xC1500000, 0x00000000,
};
Vec4f N(tree1Point) = { -42.0f, 0.0f, -13.0f, 0.0f };
Script N(802422B8) = SCRIPT({
SI_VAR(0) = N(searchBushEvent_Bush1);
bind N(searchBush_802417F0) to TRIGGER_WALL_PRESS_A 53;
SI_VAR(0) = N(shakeTreeEvent_Tree1);
bind N(shakeTree_80241B50) to TRIGGER_WALL_HAMMER 52;
bind N(shakeTree_80241B50) to TRIGGER_POINT_BOMB N(triggerCoord_802422A8);
SI_VAR(0) = N(bush1);
bind N(searchBush) to TRIGGER_WALL_PRESS_A 53;
SI_VAR(0) = N(tree1);
bind N(shakeTree) to TRIGGER_WALL_HAMMER 52;
bind N(shakeTree) to TRIGGER_POINT_BOMB N(tree1Point);
});

2
src/world/area_kmr/kmr_04/8CA960.c
View File

@ -1,6 +1,6 @@
#include "kmr_04.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE dup_kmr_04
#include "world/common/CheckPartnerFlags1000.inc.c"

2
src/world/area_kmr/kmr_05/8CF570.c
View File

@ -1,6 +1,6 @@
#include "kmr_05.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
ApiStatus func_8024173C_8CF7AC(ScriptInstance* script, s32 isInitialCall) {
if (get_enemy_safe(6) == NULL) {

2
src/world/area_kmr/kmr_10/8D88A0.c
View File

@ -1,4 +1,4 @@
#include "kmr_10.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_kmr/kmr_11/8DA100.c
View File

@ -1,6 +1,6 @@
#include "kmr_11.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_8024023C_8DA33C);

2
src/world/area_kmr/kmr_11/8DB020.c
View File

@ -1,6 +1,6 @@
#include "kmr_11.h"
#define NAMESPACE dup_kmr_11
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE kmr_11

2
src/world/area_kmr/kmr_20/8EBE50.c
View File

@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240330_8EC150);
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240358_8EC178);
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802405BC_8EC3DC);

2
src/world/area_kmr/kmr_20/8ECC40.c
View File

@ -1,6 +1,6 @@
#include "kmr_20.h"
#define NAMESPACE dup_kmr_20
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE kmr_20

2
src/world/area_kmr/kmr_20/8ECE80.c
View File

@ -1,6 +1,6 @@
#include "kmr_20.h"
#define NAMESPACE dup2_kmr_20
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE kmr_20

2
src/world/area_kmr/kmr_20/8ED5A0.c
View File

@ -23,7 +23,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417B4_8ED5D4);
#define NAMESPACE kmr_20
#define NAMESPACE dup3_kmr_20
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
#define NAMESPACE kmr_20
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241C9C_8EDABC);

2
src/world/area_mac/mac_01/806D10.c
View File

@ -1,4 +1,4 @@
#include "mac_01.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_mac/mac_02/823970.c
View File

@ -1,4 +1,4 @@
#include "mac_02.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_mac/mac_03/833500.c
View File

@ -1,4 +1,4 @@
#include "mac_03.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_mac/mac_04/842DF0.c
View File

@ -1,4 +1,4 @@
#include "mac_04.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_mim/mim_11/BB79F0.c
View File

@ -1,4 +1,4 @@
#include "mim_11.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_nok/nok_01/9C7D10.c
View File

@ -1,4 +1,4 @@
#include "nok_01.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_nok/nok_02/9DB380.c
View File

@ -1,4 +1,4 @@
#include "nok_02.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_nok/nok_11/9F4A40.c
View File

@ -129,7 +129,7 @@ ApiStatus N(func_80241AE0_9F6520)(ScriptInstance* script, s32 isInitialCall) {
}
*/
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"
INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241F08_9F6948);

2
src/world/area_nok/nok_12/9FAB20.c
View File

@ -1,4 +1,4 @@
#include "nok_12.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_nok/nok_15/A09440.c
View File

@ -1,4 +1,4 @@
#include "nok_15.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_sam/sam_02/D05730.c
View File

@ -16,5 +16,5 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240034_D05764);
INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240404_D05B34);
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

2
src/world/area_sam/sam_04/D135D0.c
View File

@ -1,4 +1,4 @@
#include "sam_04.h"
#include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/foliage.inc.c"

Some files were not shown because too many files have changed in this diff Show More