Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-28 03:34:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

more data

Browse Source
This commit is contained in:
DizzyEggg
2024-12-03 20:00:39 +01:00
parent cdaa211c58
commit 396427cc75
9 changed files with 79 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
data/data_80F4E2C.s
View File

@@ -2,121 +2,6 @@
.global gUnknown_80F4F50
gUnknown_80F4F50: @ 80F4F50
@ replacing .incbin "baserom.gba", 0x000f4f50, 0x4
.byte 0x00, 0x02
.byte 0x00, 0x00
.global gUnknown_80F4F54
gUnknown_80F4F54: @ 80F4F54
@ replacing .incbin "baserom.gba", 0x000f4f54, 0x4
.byte 0x00, 0x02
.byte 0x00, 0x00
.global gUnknown_80F4F58
gUnknown_80F4F58: @ 80F4F58
@ replacing .incbin "baserom.gba", 0x000f4f58, 0x4
.byte 0x00, 0x02
.byte 0x00, 0x00
.global gUnknown_80F4F5C
gUnknown_80F4F5C: @ 80F4F5C
@ replacing .incbin "baserom.gba", 0x000f4f5c, 0x4
.byte 0x00, 0x02
.byte 0x00, 0x00
.global gUnknown_80F4F60
gUnknown_80F4F60: @ 80F4F60
@ replacing .incbin "baserom.gba", 0x000f4f60, 0x4
.byte 0x00, 0x02
.byte 0x00, 0x00
.global gUnknown_80F4F64
gUnknown_80F4F64: @ 80F4F64
@ replacing .incbin "baserom.gba", 0x000f4f64, 0x4
.byte 0x00, 0x02
.byte 0x00, 0x00
.global gUnknown_80F4F68
gUnknown_80F4F68: @ 80F4F68
@ replacing .incbin "baserom.gba", 0x000f4f68, 0x4
.byte 0x00, 0x02
.byte 0x00, 0x00
.global gUnknown_80F4F6C
gUnknown_80F4F6C: @ 80F4F6C
@ replacing .incbin "baserom.gba", 0x000f4f6c, 0x4
.byte 0x00, 0x02
.byte 0x00, 0x00
.global gUnknown_80F4F70
gUnknown_80F4F70: @ 80F4F70
@ replacing .incbin "baserom.gba", 0x000f4f70, 0x2
.byte 0x05, 0x00
.global gUnknown_80F4F72
gUnknown_80F4F72: @ 80F4F72
@ replacing .incbin "baserom.gba", 0x000f4f72, 0x2
.byte 0x04, 0x00
.global gUnknown_80F4F74
gUnknown_80F4F74: @ 80F4F74
@ replacing .incbin "baserom.gba", 0x000f4f74, 0x2
.byte 0x05, 0x00
.global gUnknown_80F4F76
gUnknown_80F4F76: @ 80F4F76
@ replacing .incbin "baserom.gba", 0x000f4f76, 0x2
.byte 0x06, 0x00
.global gUnknown_80F4F78
gUnknown_80F4F78: @ 80F4F78
@ replacing .incbin "baserom.gba", 0x000f4f78, 0x2
.byte 0x08, 0x00
.global gUnknown_80F4F7A
gUnknown_80F4F7A: @ 80F4F7A
@ replacing .incbin "baserom.gba", 0x000f4f7a, 0x2
.byte 0xe7, 0x03
.global gUnknown_80F4F7C
gUnknown_80F4F7C: @ 80F4F7C
@ replacing .incbin "baserom.gba", 0x000f4f7c, 0x2
.byte 0x37, 0x00
.global gUnknown_80F4F7E
gUnknown_80F4F7E: @ 80F4F7E
@ replacing .incbin "baserom.gba", 0x000f4f7e, 0x2
.byte 0x41, 0x00
.global gUnknown_80F4F80
gUnknown_80F4F80: @ 80F4F80
@ replacing .incbin "baserom.gba", 0x000f4f80, 0x2
.byte 0x23, 0x00
.global gUnknown_80F4F82
gUnknown_80F4F82: @ 80F4F82
@ replacing .incbin "baserom.gba", 0x000f4f82, 0x2
.byte 0x05, 0x00
.global gUnknown_80F4F84
gUnknown_80F4F84: @ 80F4F84
@ replacing .incbin "baserom.gba", 0x000f4f84, 0x2
.byte 0x14, 0x00
.global gUnknown_80F4F86
gUnknown_80F4F86: @ 80F4F86
@ replacing .incbin "baserom.gba", 0x000f4f86, 0x4
.byte 0x0a, 0x00
.byte 0x0f, 0x00
.global gUnknown_80F4F8A
gUnknown_80F4F8A: @ 80F4F8A
@ replacing .incbin "baserom.gba", 0x000f4f8a, 0x2
.byte 0x05, 0x00
.global gUnknown_80F4F8C
gUnknown_80F4F8C: @ 80F4F8C
@ replacing .incbin "baserom.gba", 0x000f4f8c, 0x2

22
include/dungeon_battle_data.h
View File

@@ -79,5 +79,27 @@ extern const s16 gMoveWeatherDuration;
extern const s16 gGinsengPlus3BoostChance;
extern const s24_8 gSolarBeamModifier;
extern const s24_8 gSkyAttackModifier;
extern const s24_8 gRazorWindModifier;
extern const s24_8 gFocusPunchModifier;
extern const s24_8 gSkullBashModifier;
extern const s24_8 gFlyModifier;
extern const s24_8 gBounceModifier;
extern const s24_8 gDiveModifier;
extern const s24_8 gDigModifier;
extern const s24_8 gFacadeModifier;
extern const s16 gBurnDmgValue;
extern const s16 gPoisonDmgValue;
extern const s16 gConstrictionDmgValue;
extern const s16 gWrapDmgValue;
extern const s16 gNightmareDmgValue;
extern const s16 gNappingHpHealValue;
extern const s16 gSonicboomDmgValue;
extern const s16 gDragonRageDmgValue;
extern const s16 gVacuumCutDmgValue;
extern const s16 gSplashDmgValue;
extern const s16 gSpikeTrapDmgValue;
extern const s16 gChestnutTrapDmgValue;
extern const s16 gPitfallTrapDmgValue;
#endif

1
src/code_806CD90.c
View File

@@ -300,7 +300,6 @@ extern const s16 gUnknown_80F4E1A;
extern const s16 gUnknown_80F4E1C;
extern const s16 gUnknown_80F4E1E;
extern const s16 gUnknown_80F4E20;
extern const s16 gUnknown_80F4F8C;
extern const u8 *const gUnknown_80FCFA4;
extern const u8 *const gUnknown_80FCA90;
extern const u8 *const gUnknown_80F9600;

12
src/code_8073CF0.c
View File

@@ -88,15 +88,11 @@ extern const s16 gWarpScarfActivationChances[];
extern const s16 gUnknown_80F4FC8[];
extern const s16 gUnknown_80F4F8E;
extern const s16 gUnknown_80F4E0C;
extern const s16 gUnknown_80F4F70;
extern const s16 gUnknown_80F4F72;
extern const s16 gUnknown_80F4FC4;
extern const s16 gUnknown_80F4FC0;
extern const s16 gUnknown_80F4FB2;
extern const s16 gUnknown_80F4FB4;
extern const s16 gUnknown_80F4F74;
extern const s16 gUnknown_80F4FC2;
extern const s16 gUnknown_80F4F76;
extern s48_16 gUnknown_80F54F4[8];
extern const s32 gUnknown_80F60DC[];
@@ -428,7 +424,7 @@ void sub_8074094(Entity *entity)
return;
entityInfo->burnClassStatus.damageCountdown = gBurnDmgCountdown;
TrySendImmobilizeSleepEndMsg(entity, entity);
DealDamageToEntity(entity, gUnknown_80F4F70, 1, 0x208);
DealDamageToEntity(entity, gBurnDmgValue, 1, 0x208);
}
if (!EntityExists(entity) || sub_8044B28())
return;
@@ -441,7 +437,7 @@ void sub_8074094(Entity *entity)
return;
entityInfo->burnClassStatus.damageCountdown = gPoisonDmgCountdown;
TrySendImmobilizeSleepEndMsg(entity, entity);
DealDamageToEntity(entity, gUnknown_80F4F72, 3, 0x20A);
DealDamageToEntity(entity, gPoisonDmgValue, 3, 0x20A);
}
if (!EntityExists(entity) || sub_8044B28())
return;
@@ -474,7 +470,7 @@ void sub_8074094(Entity *entity)
entityInfo->frozenClassStatus.damageCountdown = gConstrictionDmgCountdown;
TrySendImmobilizeSleepEndMsg(entity, entity);
sub_8041C4C(entity, entityInfo->frozenClassStatus.unk4);
DealDamageToEntity(entity, gUnknown_80F4F74, 2, 0x209);
DealDamageToEntity(entity, gConstrictionDmgValue, 2, 0x209);
}
if (!EntityExists(entity) || sub_8044B28())
return;
@@ -486,7 +482,7 @@ void sub_8074094(Entity *entity)
return;
entityInfo->frozenClassStatus.damageCountdown = gWrapDmgCountdown;
TrySendImmobilizeSleepEndMsg(entity, entity);
DealDamageToEntity(entity, gUnknown_80F4F76, 5, 0x20B);
DealDamageToEntity(entity, gWrapDmgValue, 5, 0x20B);
}
if (!EntityExists(entity) || sub_8044B28())
return;

6
src/code_8077274_1.c
View File

@@ -73,8 +73,6 @@ extern u8 *gUnknown_80FABC0[];
extern u8 *gUnknown_80FA888[];
extern u8 *gUnknown_80FA8A8[];
extern u8 *gUnknown_80FA868[];
extern s16 gUnknown_80F4F78;
extern s32 gUnknown_80F4F7A;
extern u8 *gUnknown_80FA6E8[];
extern u8 *gUnknown_80FA708[];
extern u8 *gUnknown_80FA70C[];
@@ -1155,13 +1153,13 @@ void EndSleepClassStatus(Entity * pokemon, Entity * target, bool8 param_3, bool8
isAsleep = TRUE;
TryDisplayDungeonLoggableMessage3(pokemon,target,*gUnknown_80FA70C);
if (param_4) {
DealDamageToEntity(target,gUnknown_80F4F78,8,0x20f);
DealDamageToEntity(target,gNightmareDmgValue,8,0x20f);
}
break;
case STATUS_NAPPING:
isAsleep = TRUE;
TryDisplayDungeonLoggableMessage3(pokemon,target,*gUnknown_80FA710);
HealTargetHP(pokemon,target,gUnknown_80F4F7A, 0, FALSE);
HealTargetHP(pokemon,target,gNappingHpHealValue, 0, FALSE);
entityInfo->sleepClassStatus.status = 0;
sub_8079F20(pokemon,target,1,1);
break;

23
src/dungeon_battle_data.c
View File

@@ -86,3 +86,26 @@ UNUSED static const s16 sUnusedConfig1 = 95;
const s16 gGinsengPlus3BoostChance = 12;
const s24_8 gSolarBeamModifier = IntToF248_2(2.0);
const s24_8 gSkyAttackModifier = IntToF248_2(2.0);
const s24_8 gRazorWindModifier = IntToF248_2(2.0);
const s24_8 gFocusPunchModifier = IntToF248_2(2.0);
const s24_8 gSkullBashModifier = IntToF248_2(2.0);
const s24_8 gFlyModifier = IntToF248_2(2.0);
const s24_8 gBounceModifier = IntToF248_2(2.0);
const s24_8 gDiveModifier = IntToF248_2(2.0);
const s24_8 gDigModifier = IntToF248_2(2.0);
const s24_8 gFacadeModifier = IntToF248_2(2.0);
const s16 gBurnDmgValue = 5;
const s16 gPoisonDmgValue = 4;
const s16 gConstrictionDmgValue = 5;
const s16 gWrapDmgValue = 6;
const s16 gNightmareDmgValue = 8;
const s16 gNappingHpHealValue = 999;
const s16 gSonicboomDmgValue = 55;
const s16 gDragonRageDmgValue = 65;
const s16 gVacuumCutDmgValue = 35;
const s16 gSplashDmgValue = 5;
const s16 gSpikeTrapDmgValue = 20;
const s16 gChestnutTrapDmgValue = 10;
UNUSED static const s16 sMaybeUnusedTrapDmgValue = 15;
const s16 gPitfallTrapDmgValue = 5;

29
src/move_actions.c
View File

@@ -60,10 +60,8 @@ extern s16 gUnknown_80F4DD6;
extern u8 gUnknown_202F219;
extern s24_8 gUnknown_80F51A4[];
extern u8 *gUnknown_80FACA4[];
extern s24_8 gUnknown_80F4F54;
extern u8 *gUnknown_80FD104[];
extern s16 gUnknown_80F4DD4;
extern s24_8 gUnknown_80F4F6C;
extern u32 gUnknown_80F4DE6;
extern u32 gUnknown_80F4DEE;
extern u32 gUnknown_80F4DC2;
@@ -71,7 +69,6 @@ extern u8 *gUnknown_80FD294[];
extern u8 *gUnknown_80FD2B4[];
extern u8 *gUnknown_80FAC74[];
extern u8 *gUnknown_80FAC54[];
extern s24_8 gUnknown_80F4F50;
extern s16 gUnknown_80F4DB8;
extern s16 gUnknown_80F4DBA;
extern s16 gUnknown_80F55BC[];
@@ -97,7 +94,6 @@ extern u32 gUnknown_8106A50;
extern s16 gUnknown_80F4E08;
extern u8 *gUnknown_80FD14C[];
extern u8 *gUnknown_80FAD4C[];
extern s24_8 gUnknown_80F4F68;
extern s16 gUnknown_80F502A[];
extern s24_8 gUnknown_8106A54[];
extern s16 gUnknown_80F4DF0;
@@ -105,9 +101,7 @@ extern s16 gUnknown_80F4DE0;
extern s16 gUnknown_80F4DC4;
extern u8 *gUnknown_80FCF78[];
extern s16 gUnknown_80F4DF0;
extern s24_8 gUnknown_80F4F5C;
extern u8 *gUnknown_80FACFC[];
extern s16 gUnknown_80F4F7C;
extern u8 *gUnknown_80FACE4[];
extern u8 *gUnknown_80FEB8C[];
extern u32 gUnknown_8106A4C;
@@ -117,7 +111,6 @@ extern s16 gUnknown_80F4DEC;
extern s16 gUnknown_80F4E00;
extern u8 *gUnknown_80FD128[];
extern u8 *gUnknown_80FAD2C[];
extern s24_8 gUnknown_80F4F64;
extern u8 gSecretPowerTable[];
extern s16 gUnknown_80F4E06;
extern u8 *gUnknown_80FC74C[];
@@ -138,7 +131,6 @@ extern u8 *gUnknown_80FD170[];
extern u8 *gUnknown_80FCCE8[];
extern u8 *gUnknown_80FD18C[];
extern u8 *gUnknown_80FD57C[];
extern s16 gUnknown_80F4F82;
extern u8 *gUnknown_80FEBDC[];
extern u8 *gUnknown_80FC5CC[];
extern s16 gUnknown_80F4DFA;
@@ -148,7 +140,6 @@ extern s16 gUnknown_80F4DFE;
extern u8 *gUnknown_81004EC[];
extern s16 gUnknown_80F4DFC;
extern u8 *gUnknown_80FC7C8[];
extern s24_8 gUnknown_80F4F60;
extern u8 *gUnknown_80FAD10[];
extern s16 gUnknown_80F4DCC;
extern s16 gUnknown_80F4DBE;
@@ -333,7 +324,7 @@ bool8 DigMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
}
else {
if (MoveMatchesBideClassStatus(pokemon,move)) {
HandleDamagingMove(pokemon,target,move,gUnknown_80F4F68,param_4);
HandleDamagingMove(pokemon,target,move,gDigModifier,param_4);
sub_8079764(pokemon);
}
else {
@@ -875,7 +866,7 @@ bool8 RazorWindMoveAction(Entity * pokemon, Entity * target, Move * move, u32 pa
bool8 flag;
if (MoveMatchesBideClassStatus(pokemon,move)) {
flag = HandleDamagingMove(pokemon,target,move,gUnknown_80F4F50,param_4) ? TRUE : FALSE;
flag = HandleDamagingMove(pokemon,target,move,gRazorWindModifier,param_4) ? TRUE : FALSE;
sub_8079764(pokemon);
}
else {
@@ -980,7 +971,7 @@ bool8 FacadeMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4)
modifier = IntToF248_2(1);
if((GetEntInfo(pokemon)->burnClassStatus.status) != STATUS_NONE)
modifier = gUnknown_80F4F6C;
modifier = gFacadeModifier;
flag = HandleDamagingMove(pokemon,target,move,modifier,param_4) ? TRUE : FALSE;
return flag;
}
@@ -1035,7 +1026,7 @@ bool8 FocusPunchMoveAction(Entity * pokemon, Entity * target, Move * move, u32 p
bool8 flag;
if (MoveMatchesBideClassStatus(pokemon,move)) {
flag = HandleDamagingMove(pokemon,target,move,gUnknown_80F4F54,param_4) ? TRUE : FALSE;
flag = HandleDamagingMove(pokemon,target,move,gFocusPunchModifier,param_4) ? TRUE : FALSE;
sub_8079764(pokemon);
}
else {
@@ -1812,7 +1803,7 @@ bool8 SonicboomMoveAction(Entity * pokemon,Entity * target,Move * move,u32 param
u8 local_20;
local_20 = 0;
sub_806F370(pokemon,target,gUnknown_80F4F7C,1,&local_20,GetMoveType(move),sub_8057600(move,param_4),0,1,0);
sub_806F370(pokemon,target,gSonicboomDmgValue,1,&local_20,GetMoveType(move),sub_8057600(move,param_4),0,1,0);
local_20 = local_20 == 0;
return local_20;
}
@@ -1823,7 +1814,7 @@ bool8 FlyMoveAction(Entity * pokemon, Entity * target, Move * move, u32 param_4)
flag = FALSE;
if (MoveMatchesBideClassStatus(pokemon,move)) {
flag = HandleDamagingMove(pokemon,target,move,gUnknown_80F4F5C,param_4) != 0 ? TRUE : FALSE;
flag = HandleDamagingMove(pokemon,target,move,gFlyModifier,param_4) != 0 ? TRUE : FALSE;
sub_8079764(pokemon);
}
else {
@@ -1848,7 +1839,7 @@ bool8 DiveMoveAction(Entity * pokemon, Entity * target, Move * move, u32 param_4
TryDisplayDungeonLoggableMessage3(pokemon,target,*gUnknown_80FD128);
}
else if (MoveMatchesBideClassStatus(pokemon,move)) {
flag = HandleDamagingMove(pokemon,target,move,gUnknown_80F4F64,param_4) != 0 ? TRUE : FALSE;
flag = HandleDamagingMove(pokemon,target,move,gDiveModifier,param_4) != 0 ? TRUE : FALSE;
sub_8079764(pokemon);
}
else {
@@ -2180,7 +2171,7 @@ bool8 BounceMoveAction(Entity * pokemon,Entity * target,Move * move,u32 param_4)
flag = FALSE;
if (MoveMatchesBideClassStatus(pokemon, move)) {
if (HandleDamagingMove(pokemon, target, move, gUnknown_80F4F60, param_4) != 0) {
if (HandleDamagingMove(pokemon, target, move, gBounceModifier, param_4) != 0) {
flag = TRUE;
if (sub_805727C(pokemon, target, gUnknown_80F4DCC) != 0) {
ParalyzeStatusTarget(pokemon, target, FALSE);
@@ -2701,10 +2692,10 @@ _0805A8C2:
if (GetEntityType(entity) == ENTITY_MONSTER) {
InitPokemonMove(&stackMove,MOVE_REGULAR_ATTACK);
if (sub_80571F0(entity,&stackMove) == 0) {
sub_806F370(pokemon,entity,gUnknown_80F4F82,0,0,TYPE_NONE,sub_8057600(move, param_4),0,1,0);
sub_806F370(pokemon,entity,gSplashDmgValue,0,0,TYPE_NONE,sub_8057600(move, param_4),0,1,0);
}
if ((sub_8044B28() == 0) && (EntityExists(pokemon))) {
sub_806F370(pokemon,pokemon,gUnknown_80F4F82,0,0,0,0x1fe,0,0,0);
sub_806F370(pokemon,pokemon,gSplashDmgValue,0,0,0,0x1fe,0,0,0);
if ((sub_8044B28() == 0) && (EntityExists(pokemon))) goto _0805A9FE;
}
}

33
src/status_actions.c
View File

@@ -58,7 +58,7 @@ extern s16 sub_803D970(u32);
extern bool8 sub_806AA0C(s32, u32);
extern void sub_806BB6C(Entity *, s32);
extern void HandleSwitcherOrb(Entity *, Entity *, u32);
extern u32 HandleDamagingMove(Entity *, Entity *, Move *, u32, u32);
extern u32 HandleDamagingMove(Entity *, Entity *, Move *, s24_8, u32);
extern void sub_806A6E8(Entity *);
extern u8 sub_8069D18(DungeonPos *);
extern u8 sub_804AD34(DungeonPos *);
@@ -96,11 +96,9 @@ extern u8 *gUnknown_80FDCE4[];
extern u32 gUnknown_8106A50;
extern u8 *gPtrSleepingTargetOnlyMessage[];
extern u8 *gUnknown_80FAFF0[];
extern u32 gUnknown_80F4F58;
extern u32 gUnknown_8106A4C;
extern u8 *gUnknown_80FD450[];
extern u8 *gUnknown_80FD434[];
extern s16 gUnknown_80F4F80;
extern u8 *gUnknown_80FF678[];
extern u8 *gUnknown_80FD0B8[];
extern u8 *gUnknown_80FD0B4[];
@@ -123,7 +121,6 @@ extern u8 *gUnknown_80FD40C[];
extern u8 *gUnknown_80FD3F0[];
extern u32 gUnknown_8106A50;
extern s16 gUnknown_80F4DDC;
extern s16 gUnknown_80F4F7E;
extern u8 *gUnknown_80FDCA0[];
extern u8 *gUnknown_80FDC9C[];
extern s16 gUnknown_80F4DD8;
@@ -140,7 +137,7 @@ extern u32 gMetronomeCalledArrayId;
extern s16 gUnknown_80F4DC6;
extern u8 *gUnknown_80FEFF4[];
extern u32 gUnknown_80F51C4[];
extern s24_8 gUnknown_80F51C4[];
bool8 EruptionMoveAction(Entity * pokemon, Entity * target, Move *move, u32 param_4)
{
@@ -193,7 +190,7 @@ bool8 PoisonTailMoveAction(Entity * pokemon, Entity * target, Move *move, s32 pa
bool8 flag;
flag = FALSE;
if (HandleDamagingMove(pokemon,target,move,0x100,param_4) != 0) {
if (HandleDamagingMove(pokemon,target,move,IntToF248_2(1),param_4) != 0) {
flag = TRUE;
if (sub_805727C(pokemon,target,gUnknown_80F4DC6) != 0) {
PoisonedStatusTarget(pokemon,target,FALSE);
@@ -254,7 +251,7 @@ bool8 sub_805B17C(Entity * pokemon, Entity * target, Move *move, s32 param_4)
uVar4 = 0x7e;
}
}
if (HandleDamagingMove(pokemon,target,move,0x100,param_4) != 0) {
if (HandleDamagingMove(pokemon,target,move,IntToF248_2(1),param_4) != 0) {
flag = TRUE;
if (sub_805727C(pokemon,target,gUnknown_80F4E08) != 0) {
SqueezedStatusTarget(pokemon,target,uVar4,0);
@@ -349,7 +346,7 @@ bool8 MistBallMoveAction(Entity * pokemon,Entity * target,Move *move, s32 param_
bool8 flag;
flag = FALSE;
if (HandleDamagingMove(pokemon,target,move,0x100,param_4) != 0) {
if (HandleDamagingMove(pokemon,target,move,IntToF248_2(1),param_4) != 0) {
flag = TRUE;
if (sub_805727C(pokemon,target,gUnknown_80F4DD8) != 0) {
LowerAttackStageTarget(pokemon,target,gUnknown_8106A50,1,1,0);
@@ -366,7 +363,7 @@ bool8 DestinyBondMoveAction(Entity * pokemon,Entity * target,Move *move, s32 par
bool8 FalseSwipeMoveAction(Entity * pokemon,Entity * target,Move *move, s32 param_4)
{
return (HandleDamagingMove(pokemon,target,move,0x100,param_4)) ? TRUE : FALSE;
return (HandleDamagingMove(pokemon,target,move,IntToF248_2(1),param_4)) ? TRUE : FALSE;
}
bool8 MirrorCoatMoveAction(Entity * pokemon,Entity * target,Move *move, s32 param_4)
@@ -385,7 +382,7 @@ bool8 CalmMindMoveAction(Entity * pokemon,Entity * target,Move *move, s32 param_
bool8 HiddenPowerMoveAction(Entity * pokemon,Entity * target,Move *move, s32 param_4)
{
HandleDamagingMove(pokemon,target,move,0x100,param_4);
HandleDamagingMove(pokemon,target,move,IntToF248_2(1),param_4);
return TRUE;
}
@@ -395,7 +392,7 @@ bool8 MetalClawMoveAction(Entity * pokemon,Entity * target,Move *move, s32 param
bool8 flag;
flag = FALSE;
if (HandleDamagingMove(pokemon,target,move,0x100,param_5) != 0) {
if (HandleDamagingMove(pokemon,target,move,IntToF248_2(1),param_5) != 0) {
flag = TRUE;
if (sub_805727C(pokemon,pokemon,gUnknown_80F4DCE) != 0) {
entityInfo = GetEntInfo(pokemon);
@@ -508,7 +505,7 @@ bool8 DreamEaterMoveAction(Entity * pokemon, Entity * target, Move *move, s32 pa
flag = FALSE;
hasLiquidOoze = AbilityIsActive(target, ABILITY_LIQUID_OOZE);
if (IsSleeping(target)) {
iVar3 = HandleDamagingMove(pokemon,target,move,0x100,param_4);
iVar3 = HandleDamagingMove(pokemon,target,move,IntToF248_2(1),param_4);
if (iVar3 != 0) {
flag = TRUE;
newHP = iVar3 / 2;
@@ -584,7 +581,7 @@ bool8 DragonRageMoveAction(Entity * pokemon, Entity * target, Move *move, s32 pa
u8 local_20;
local_20 = 0;
sub_806F370(pokemon,target,gUnknown_80F4F7E,1,&local_20,GetMoveType(move),sub_8057600(move,param_4),0,1,0);
sub_806F370(pokemon,target,gDragonRageDmgValue,1,&local_20,GetMoveType(move),sub_8057600(move,param_4),0,1,0);
local_20 = (local_20 == 0);
return local_20;
}
@@ -601,7 +598,7 @@ bool8 SkullBashMoveAction(Entity * pokemon, Entity * target, Move * move, s32 pa
bool8 flag;
if (MoveMatchesBideClassStatus(pokemon,move)) {
flag = HandleDamagingMove(pokemon,target,move,gUnknown_80F4F58,param_4) != 0 ? 1 : 0;
flag = HandleDamagingMove(pokemon,target,move,gSkullBashModifier,param_4) != 0 ? 1 : 0;
sub_8079764(pokemon);
}
else {
@@ -616,7 +613,7 @@ bool8 LusterPurgeMoveAction(Entity * pokemon, Entity * target, Move * move, s32
bool8 flag;
flag = FALSE;
if (HandleDamagingMove(pokemon,target,move,0x100,param_4) != 0) {
if (HandleDamagingMove(pokemon,target,move,IntToF248_2(1),param_4) != 0) {
flag = TRUE;
if(sub_805727C(pokemon, target, gUnknown_80F4DDC))
{
@@ -633,7 +630,7 @@ bool8 StruggleMoveAction(Entity * pokemon, Entity * target, Move * move, s32 par
bool8 flag;
flag = FALSE;
if (HandleDamagingMove(pokemon,target,move,0x100,param_4) != 0) {
if (HandleDamagingMove(pokemon,target,move,IntToF248_2(1),param_4) != 0) {
flag = TRUE;
if (RollSecondaryEffect(pokemon,0) != 0) {
entityHP = GetEntInfo(pokemon)->maxHPStat;
@@ -688,7 +685,7 @@ bool8 ThiefAction(Entity * pokemon, Entity * target, Move *move, s32 param_4)
Item *targetItem;
flag = FALSE;
if (HandleDamagingMove(pokemon,target,move,0x100,param_4) != 0) {
if (HandleDamagingMove(pokemon,target,move,IntToF248_2(1),param_4) != 0) {
flag = TRUE;
if (sub_805727C(pokemon,target, 0) != 0) {
pokemonInfo1 = GetEntInfo(pokemon);
@@ -1050,7 +1047,7 @@ bool8 VacuumCutMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param
{
bool8 flag;
flag = sub_8055864(pokemon, target, move, gUnknown_80F4F80, param_4) != 0 ? TRUE : FALSE;
flag = sub_8055864(pokemon, target, move, gVacuumCutDmgValue, param_4) != 0 ? TRUE : FALSE;
return flag;
}

9
src/trap.c
View File

@@ -51,11 +51,8 @@ extern u8 *gUnknown_80FDB2C[];
extern s16 gUnknown_80F4E0E;
extern s16 gUnknown_80F4F84;
extern s16 gUnknown_80F4F86;
extern u32 gUnknown_8106A4C;
extern u32 gUnknown_8106A50;
extern s16 gUnknown_80F4F8A;
void sub_806A9B4(Entity *, u32);
@@ -335,7 +332,7 @@ void HandleTrap(Entity *pokemon, DungeonPos *pos, int param_3, char param_4)
break;
case TRAP_CHESTNUT_TRAP:
if (target != NULL) {
DealDamageToEntity(target,gUnknown_80F4F86,0xf,0x213);
DealDamageToEntity(target,gChestnutTrapDmgValue,0xf,0x213);
}
break;
case TRAP_WONDER_TILE:
@@ -347,7 +344,7 @@ void HandleTrap(Entity *pokemon, DungeonPos *pos, int param_3, char param_4)
break;
case TRAP_SPIKE_TRAP:
if (target != NULL) {
DealDamageToEntity(target,gUnknown_80F4F84,10,0x206);
DealDamageToEntity(target,gSpikeTrapDmgValue,10,0x206);
}
}
if (EntityExists(target)) {
@@ -543,7 +540,7 @@ void HandlePitfallTrap(Entity *pokemon, Entity *target, Tile *tile)
info->unk15C = 1;
info->unk15E = 1;
sub_803E708(0x28,0x4b);
DealDamageToEntity(target,gUnknown_80F4F8A,0x11,0x215);
DealDamageToEntity(target,gPitfallTrapDmgValue,0x11,0x215);
gDungeon->unk2 = 2;
return;
}