Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-24 23:17:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove type chart.h

Browse Source
This commit is contained in:
DizzyEggg 2024-12-04 11:54:20 +01:00
parent 53cb5d78ad
commit db1f3b00b1
16 changed files with 134 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
data/data_80F4E2C.s
View File

@ -1,67 +0,0 @@
.section .rodata
.global gUnknown_80F519C
gUnknown_80F519C: @ 80F519C
@ replacing .incbin "baserom.gba", 0x000f519c, 0x4
.byte 0x1e, 0x00, 0x00, 0x00
.global gUnknown_80F51A0
gUnknown_80F51A0: @ 80F51A0
@ replacing .incbin "baserom.gba", 0x000f51a0, 0x4
.byte 0x1e, 0x00, 0x00, 0x00
.global gUnknown_80F51A4
gUnknown_80F51A4: @ 80F51A4
@ replacing .incbin "baserom.gba", 0x000f51a4, 0x10
.byte 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0x04, 0x00, 0x00
.byte 0x00, 0x02, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00
.global gUnknown_80F51B4
gUnknown_80F51B4: @ 80F51B4
@ replacing .incbin "baserom.gba", 0x000f51b4, 0x10
.byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00
.global gUnknown_80F51C4
gUnknown_80F51C4: @ 80F51C4
@ replacing .incbin "baserom.gba", 0x000f51c4, 0x10
.byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00
.global gUnknown_80F51D4
gUnknown_80F51D4: @ 80F51D4
@ replacing .incbin "baserom.gba", 0x000f51d4, 0x10
.byte 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00
.global gUnknown_80F51E4
gUnknown_80F51E4: @ 80F51E4
@ replacing .incbin "baserom.gba", 0x000f51e4, 0x8
.byte 0x01, 0x02, 0x0d, 0x01, 0x03, 0x06, 0x03, 0x06
.global gUnknown_80F51EC
gUnknown_80F51EC: @ 80F51EC
@ replacing .incbin "baserom.gba", 0x000f51ec, 0x20
.4byte 256
.4byte 512
.4byte 512
.4byte 256
.4byte 512
.4byte 512
.4byte 512
.4byte 512
.global gCastformByWeather
gCastformByWeather: @ 80F520C
@ replacing .incbin "baserom.gba", 0x000f520c, 0x20
.byte 0x01, 0x00, 0x78, 0x01
.byte 0x02, 0x00, 0x7a, 0x01
.byte 0x01, 0x00, 0x78, 0x01
.byte 0x01, 0x00, 0x78, 0x01
.byte 0x03, 0x00, 0x7b, 0x01
.byte 0x06, 0x00, 0x79, 0x01
.byte 0x03, 0x00, 0x7b, 0x01
.byte 0x06, 0x00, 0x79, 0x01

27
include/dungeon_battle_data.h
View File

@ -3,6 +3,7 @@
#include "math.h"
#include "constants/weather.h"
#include "constants/type.h"
extern const s16 gFreezeTurnRange[2];
extern const s16 gBurnTurnRange[2];
@ -144,5 +145,31 @@ extern const s16 gGeoPebbleThrownDmgValue;
extern const s24_8 gAtkStatStageMultipliers[21];
extern const s24_8 gDefStatStageMultipliers[21];
extern const s24_8 gAccEvsStatStageMultipliers[2][21];
extern const s32 gDetectBandAccuracyDebuffValue;
extern const s32 gIqQuickDodgerAccuracyDebuffValue;
extern const s24_8 gReversalModifiers[4];
extern const s24_8 gWaterSpoutModifiers[4];
extern const s24_8 gEruptionModifiers[4];
extern const s32 gStockpileHealHpValues[4];
extern const u8 gWeatherBallTypes[WEATHER_COUNT];
extern const s24_8 gWeatherBallModifiers[WEATHER_COUNT];
struct CastformWeatherData
{
u8 type;
s16 monsterId;
};
extern const struct CastformWeatherData gCastformByWeather[WEATHER_COUNT];
#define NUM_EFFECTIVENESS 4
#define EFFECTIVENESS_IMMUNE 0
#define EFFECTIVENESS_RESIST 1
#define EFFECTIVENESS_NEUTRAL 2
#define EFFECTIVENESS_SUPER 3
extern const s16 gTypeEffectivenessChart[NUM_TYPES][NUM_TYPES];
#endif

16
include/type_chart.h
View File

@ -1,16 +0,0 @@
#ifndef GUARD_TYPE_CHART_H
#define GUARD_TYPE_CHART_H
#include "constants/type.h"
#define NUM_EFFECTIVENESS 4
#define EFFECTIVENESS_IMMUNE 0
#define EFFECTIVENESS_RESIST 1
#define EFFECTIVENESS_NEUTRAL 2
#define EFFECTIVENESS_SUPER 3
// [Attacking type][Defending type]
extern const s16 gTypeEffectivenessChart[NUM_TYPES][NUM_TYPES];
#endif

2
ld_script.txt
View File

@ -542,8 +542,6 @@ SECTIONS {
data/data_80F4DB4.o(.rodata);
src/dungeon_ai_attack.o(.rodata);
src/dungeon_battle_data.o(.rodata);
data/data_80F4E2C.o(.rodata);
src/type_chart.o(.rodata);
data/data_80F54B4.o(.rodata);
src/move_checks.o(.rodata);
data/data_80F5668.o(.rodata);

2
src/code_8041AD0.c
View File

@ -7,7 +7,7 @@
#include "code_806CD90.h"
#include "code_8041AD0.h"
#include "code_800DAC0.h"
#include "type_chart.h"
#include "dungeon_battle_data.h"
#include "constants/direction.h"
#include "constants/status.h"
#include "constants/type.h"

12
src/code_8069E0C.c
View File

@ -40,16 +40,8 @@
#include "constants/iq_skill.h"
#include "structs/str_806B7F8.h"
#include "structs/str_202ED28.h"
#include "dungeon_battle_data.h"
struct CastformWeatherData
{
u8 type;
s16 monsterId;
};
extern const struct CastformWeatherData gCastformByWeather[WEATHER_COUNT];
extern u8 gUnknown_80F51E4[];
extern u8 *gUnknown_80FCC7C[];
extern u8 *gUnknown_80FCCAC[];
extern u8 *gUnknown_80FDCC8[];
@ -222,7 +214,7 @@ void sub_8069F9C(Entity *pokemon, Entity *target, Move *move)
u8 type = GetMoveTypeForMonster(pokemon,move);
if (move->id == MOVE_WEATHER_BALL) {
u32 weather = GetApparentWeather(pokemon);
type = gUnknown_80F51E4[weather];
type = gWeatherBallTypes[weather];
}
if (type != TYPE_NONE && !MonsterIsType(target,type)) {
const u8 *str;

1
src/code_806CD90.c
View File

@ -33,7 +33,6 @@
#include "move_effects_target.h"
#include "dungeon_pokemon_attributes.h"
#include "code_8041AD0.h"
#include "type_chart.h"
#include "dungeon_message.h"
#include "dungeon_map_access.h"
#include "dungeon_battle_data.h"

1
src/code_806E8B0.c
View File

@ -15,7 +15,6 @@
#include "math.h"
#include "number_util.h"
#include "status.h"
#include "type_chart.h"
#include "dungeon_random.h"
#include "code_80450F8.h"
#include "code_8045A00.h"

1
src/code_806FDF4.c
View File

@ -22,7 +22,6 @@
#include "position_util.h"
#include "text_util.h"
#include "dungeon_util_1.h"
#include "type_chart.h"
#include "math.h"
#include "dungeon_battle_data.h"
#include "string_format.h"

25
src/data/type_chart.h
View File

@ -1,25 +0,0 @@
#define IMMUNE EFFECTIVENESS_IMMUNE
#define RESIST EFFECTIVENESS_RESIST
#define NEUTRAL EFFECTIVENESS_NEUTRAL
#define SUPER EFFECTIVENESS_SUPER
const s16 gTypeEffectivenessChart[NUM_TYPES][NUM_TYPES] = {
{NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL},
{NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, RESIST},
{NEUTRAL, NEUTRAL, RESIST, RESIST, SUPER, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, RESIST, NEUTRAL, RESIST, NEUTRAL, SUPER},
{NEUTRAL, NEUTRAL, SUPER, RESIST, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, NEUTRAL, NEUTRAL},
{NEUTRAL, NEUTRAL, RESIST, SUPER, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, SUPER, RESIST, NEUTRAL, RESIST, SUPER, NEUTRAL, RESIST, NEUTRAL, RESIST},
{NEUTRAL, NEUTRAL, NEUTRAL, SUPER, RESIST, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, IMMUNE, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, NEUTRAL, NEUTRAL},
{NEUTRAL, NEUTRAL, RESIST, RESIST, SUPER, NEUTRAL, RESIST, NEUTRAL, NEUTRAL, SUPER, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST},
{NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, NEUTRAL, RESIST, RESIST, RESIST, SUPER, NEUTRAL, NEUTRAL, SUPER, SUPER},
{NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, RESIST, NEUTRAL, NEUTRAL, IMMUNE},
{NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, IMMUNE, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, SUPER},
{NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, RESIST, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, RESIST},
{NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, SUPER, NEUTRAL, NEUTRAL, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, IMMUNE, RESIST},
{NEUTRAL, NEUTRAL, RESIST, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, RESIST, RESIST, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, RESIST, NEUTRAL, SUPER, RESIST},
{NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, RESIST, NEUTRAL, RESIST, SUPER, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST},
{NEUTRAL, IMMUNE, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, RESIST},
{NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST},
{NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, RESIST},
{NEUTRAL, NEUTRAL, RESIST, RESIST, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, RESIST}
};

94
src/dungeon_battle_data.c
View File

@ -2,6 +2,8 @@
#include "dungeon_battle_data.h"
#include "math.h"
#include "constants/weather.h"
#include "constants/type.h"
#include "constants/monster.h"
const s16 gFreezeTurnRange[2] = {3, 5};
const s16 gBurnTurnRange[2] = {0x7F, 0x7F};
@ -211,3 +213,95 @@ const s24_8 gAccEvsStatStageMultipliers[2][21] =
IntToF248_2(0.2500), IntToF248_2(0.1993), IntToF248_2(0.1485)
},
};
const s32 gDetectBandAccuracyDebuffValue = 30; // For attacking mon, which effectively raises target's evasion
const s32 gIqQuickDodgerAccuracyDebuffValue = 30; // For attacking mon, which effectively raises target's evasion
const s24_8 gReversalModifiers[4] = {IntToF248_2(8), IntToF248_2(4), IntToF248_2(2), IntToF248_2(1)}; // Based on hp/max HP ratio
const s24_8 gWaterSpoutModifiers[4] = {IntToF248_2(0.1), IntToF248_2(0.2), IntToF248_2(0.5), IntToF248_2(1)}; // Based on hp/max HP ratio
const s24_8 gEruptionModifiers[4] = {IntToF248_2(0.1), IntToF248_2(0.2), IntToF248_2(0.5), IntToF248_2(1)}; // Based on hp/max HP ratio
const s32 gStockpileHealHpValues[4] = {0, 20, 40, 80};
const u8 gWeatherBallTypes[WEATHER_COUNT] =
{
[WEATHER_CLEAR] = TYPE_NORMAL,
[WEATHER_SUNNY] = TYPE_FIRE,
[WEATHER_SANDSTORM] = TYPE_ROCK,
[WEATHER_CLOUDY] = TYPE_NORMAL,
[WEATHER_RAIN] = TYPE_WATER,
[WEATHER_HAIL] = TYPE_ICE,
[WEATHER_FOG] = TYPE_WATER,
[WEATHER_SNOW] = TYPE_ICE,
};
const s24_8 gWeatherBallModifiers[WEATHER_COUNT] =
{
[WEATHER_CLEAR] = IntToF248_2(1.0),
[WEATHER_SUNNY] = IntToF248_2(2.0),
[WEATHER_SANDSTORM] = IntToF248_2(2.0),
[WEATHER_CLOUDY] = IntToF248_2(1.0),
[WEATHER_RAIN] = IntToF248_2(2.0),
[WEATHER_HAIL] = IntToF248_2(2.0),
[WEATHER_FOG] = IntToF248_2(2.0),
[WEATHER_SNOW] = IntToF248_2(2.0),
};
const struct CastformWeatherData gCastformByWeather[WEATHER_COUNT] =
{
[WEATHER_CLEAR] = {
.type = TYPE_NORMAL,
.monsterId = MONSTER_CASTFORM
},
[WEATHER_SUNNY] = {
.type = TYPE_FIRE,
.monsterId = MONSTER_CASTFORM_SUNNY
},
[WEATHER_SANDSTORM] = {
.type = TYPE_NORMAL,
.monsterId = MONSTER_CASTFORM
},
[WEATHER_CLOUDY] = {
.type = TYPE_NORMAL,
.monsterId = MONSTER_CASTFORM
},
[WEATHER_RAIN] = {
.type = TYPE_WATER,
.monsterId = MONSTER_CASTFORM_RAINY
},
[WEATHER_HAIL] = {
.type = TYPE_ICE,
.monsterId = MONSTER_CASTFORM_SNOWY
},
[WEATHER_FOG] = {
.type = TYPE_WATER,
.monsterId = MONSTER_CASTFORM_RAINY
},
[WEATHER_SNOW] = {
.type = TYPE_ICE,
.monsterId = MONSTER_CASTFORM_SNOWY
},
};
#define IMMUNE EFFECTIVENESS_IMMUNE
#define RESIST EFFECTIVENESS_RESIST
#define NEUTRAL EFFECTIVENESS_NEUTRAL
#define SUPER EFFECTIVENESS_SUPER
const s16 gTypeEffectivenessChart[NUM_TYPES][NUM_TYPES] = {
// NONE NORMAL FIRE WATER GRASS ELECTRIC ICE FIGHTING POISON GROUND FLYING PSYCHIC BUG ROCK GHOST DRAGON DARK STEEL
[TYPE_NONE] = {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL},
[TYPE_NORMAL] = {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, RESIST},
[TYPE_FIRE] = {NEUTRAL, NEUTRAL, RESIST, RESIST, SUPER, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, RESIST, NEUTRAL, RESIST, NEUTRAL, SUPER},
[TYPE_WATER] = {NEUTRAL, NEUTRAL, SUPER, RESIST, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, NEUTRAL, NEUTRAL},
[TYPE_GRASS] = {NEUTRAL, NEUTRAL, RESIST, SUPER, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, SUPER, RESIST, NEUTRAL, RESIST, SUPER, NEUTRAL, RESIST, NEUTRAL, RESIST},
[TYPE_ELECTRIC] = {NEUTRAL, NEUTRAL, NEUTRAL, SUPER, RESIST, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, IMMUNE, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, NEUTRAL, NEUTRAL},
[TYPE_ICE] = {NEUTRAL, NEUTRAL, RESIST, RESIST, SUPER, NEUTRAL, RESIST, NEUTRAL, NEUTRAL, SUPER, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST},
[TYPE_FIGHTING] = {NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, NEUTRAL, RESIST, RESIST, RESIST, SUPER, NEUTRAL, NEUTRAL, SUPER, SUPER},
[TYPE_POISON] = {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, RESIST, NEUTRAL, NEUTRAL, IMMUNE},
[TYPE_GROUND] = {NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, IMMUNE, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, SUPER},
[TYPE_FLYING] = {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, RESIST, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, RESIST},
[TYPE_PSYCHIC] = {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, SUPER, NEUTRAL, NEUTRAL, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, IMMUNE, RESIST},
[TYPE_BUG] = {NEUTRAL, NEUTRAL, RESIST, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, RESIST, RESIST, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, RESIST, NEUTRAL, SUPER, RESIST},
[TYPE_ROCK] = {NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, RESIST, NEUTRAL, RESIST, SUPER, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST},
[TYPE_GHOST] = {NEUTRAL, IMMUNE, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, RESIST},
[TYPE_DRAGON] = {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST},
[TYPE_DARK] = {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, RESIST},
[TYPE_STEEL] = {NEUTRAL, NEUTRAL, RESIST, RESIST, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, RESIST}
};

7
src/dungeon_move.c
View File

@ -10,7 +10,6 @@
#include "constants/status.h"
#include "constants/weather.h"
#include "constants/iq_skill.h"
#include "type_chart.h"
#include "position_util.h"
#include "dungeon_items.h"
#include "code_806CD90.h"
@ -318,8 +317,6 @@ static void SortTargets(Entity **targetsArray, Entity *attacker);
extern const s32 gUnknown_8106A50;
extern const s32 gUnknown_8106A4C;
extern const s32 gUnknown_80F519C;
extern const s32 gUnknown_80F51A0;
extern const u8 *const gUnknown_80FEEA4;
extern const u8 *const gUnknown_80FEEC8;
extern const u8 *const gUnknown_80FEEEC;
@ -2719,10 +2716,10 @@ static bool8 AccuracyCalc(Entity *attacker, Entity *target, Move *move, s32 accu
return TRUE;
if (HasHeldItem(target, ITEM_DETECT_BAND)) {
accuracy -= gUnknown_80F519C;
accuracy -= gDetectBandAccuracyDebuffValue;
}
if (IQSkillIsEnabled(target, IQ_QUICK_DODGER)) {
accuracy -= gUnknown_80F51A0;
accuracy -= gIqQuickDodgerAccuracyDebuffValue;
}
statStageAccuracy = attackerInfo->hitChanceStages[0];

17
src/move_actions.c
View File

@ -47,7 +47,6 @@ extern s16 gUnknown_80F4DE8;
extern u8 *gUnknown_80FAD6C[];
extern s16 gUnknown_80F4DE4;
extern u8 *gUnknown_80FBD58[];
extern s24_8 gUnknown_80F51B4[];
extern s16 gUnknown_80F4DC0;
extern s16 gUnknown_80F4DF8;
extern s16 gUnknown_80F4DD0;
@ -57,7 +56,6 @@ extern s16 gUnknown_80F4DF4;
extern u8 gUnknown_202F21A;
extern s16 gUnknown_80F4DD6;
extern u8 gUnknown_202F219;
extern s24_8 gUnknown_80F51A4[];
extern u8 *gUnknown_80FACA4[];
extern u8 *gUnknown_80FD104[];
extern s16 gUnknown_80F4DD4;
@ -83,8 +81,6 @@ extern u8 *gUnknown_80FCFE4[];
extern u32 gUnknown_8106A4C;
extern s16 gUnknown_80F4DF6;
extern s16 gUnknown_80F4E0A;
extern u8 gUnknown_80F51E4[];
extern u32 gUnknown_80F51EC[];
extern u8 *gUnknown_80FC734[];
extern u8 *gUnknown_80FC7EC[];
extern u8 *gUnknown_80FCF74[];
@ -122,7 +118,6 @@ extern u8 *gUnknown_80FCF7C[];
extern u8 *gUnknown_80FC730[];
extern s16 gUnknown_80F4DF2;
extern u8 *gUnknown_80FC770[];
extern s32 gUnknown_80F51D4[];
extern s16 gUnknown_80F4DD2;
extern u8 *gUnknown_80FCA3C[];
extern u8 *gUnknown_80FD170[];
@ -175,7 +170,7 @@ extern void HandleExplosion(Entity *pokemon, Entity *target, DungeonPos *pos, u3
extern void nullsub_92(Entity *);
extern u32 sub_8055864(Entity *pokemon, Entity *target, Move *param_3, s32 param_4, s32 param_5);
extern u8 sub_807EAA0(u32, u32);
extern s32 sub_80556BC(Entity *, Entity *, u8, Move *, u32, u32);
extern s32 sub_80556BC(Entity *, Entity *, u8, Move *, s24_8, u32);
// move_util.h
extern bool8 sub_805727C(Entity *, Entity *, s16);
@ -554,8 +549,8 @@ bool32 WeatherBallMoveAction(Entity * pokemon, Entity * target, Move * move, u32
s32 flag;
weather = GetApparentWeather(pokemon);
flag = sub_80556BC(pokemon,target,gUnknown_80F51E4[weather],move,
gUnknown_80F51EC[weather],param_4);
flag = sub_80556BC(pokemon,target,gWeatherBallTypes[weather],move,
gWeatherBallModifiers[weather],param_4);
if (flag) {
flag = TRUE;
}
@ -1081,7 +1076,7 @@ bool8 ReversalMoveAction(Entity * pokemon, Entity * target, Move * move, u32 par
index = 3;
}
flag = HandleDamagingMove(pokemon,target,move,gUnknown_80F51A4[index],param_4) ? TRUE : FALSE;
flag = HandleDamagingMove(pokemon,target,move,gReversalModifiers[index],param_4) ? TRUE : FALSE;
return flag;
}
@ -1366,7 +1361,7 @@ bool8 WaterSpoutMoveAction(Entity * pokemon, Entity * target, Move * move, u32 p
index = 3;
}
flag = HandleDamagingMove(pokemon,target,move,gUnknown_80F51B4[index],param_4) ? TRUE : FALSE;
flag = HandleDamagingMove(pokemon,target,move,gWaterSpoutModifiers[index],param_4) ? TRUE : FALSE;
return flag;
}
@ -2480,7 +2475,7 @@ bool8 SwallowMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4
stockpileStage = &GetEntInfo(target)->stockpileStage;
if (*stockpileStage != 0) {
HealTargetHP(pokemon,target,gUnknown_80F51D4[*stockpileStage],0,TRUE);
HealTargetHP(pokemon,target,gStockpileHealHpValues[*stockpileStage],0,TRUE);
*stockpileStage = 0;
}
else {

4
src/status_actions.c
View File

@ -135,8 +135,6 @@ extern u32 gMetronomeCalledArrayId;
extern s16 gUnknown_80F4DC6;
extern u8 *gUnknown_80FEFF4[];
extern s24_8 gUnknown_80F51C4[];
bool8 EruptionMoveAction(Entity * pokemon, Entity * target, Move *move, u32 param_4)
{
EntityInfo *entityInfo;
@ -160,7 +158,7 @@ bool8 EruptionMoveAction(Entity * pokemon, Entity * target, Move *move, u32 para
index = 3;
}
flag = HandleDamagingMove(pokemon,target,move,gUnknown_80F51C4[index],param_4) ? TRUE : FALSE;
flag = HandleDamagingMove(pokemon,target,move,gEruptionModifiers[index],param_4) ? TRUE : FALSE;
return flag;
}

4
src/type_chart.c
View File

@ -1,4 +0,0 @@
#include "global.h"
#include "type_chart.h"
#include "data/type_chart.h"

3
src/type_effectiveness.c
View File

@ -1,6 +1,5 @@
#include "global.h"
#include "type_effectiveness.h"
#include "constants/ability.h"
#include "constants/status.h"
#include "constants/weather.h"
@ -10,7 +9,7 @@
#include "dungeon_util.h"
#include "math.h"
#include "status.h"
#include "type_chart.h"
#include "dungeon_battle_data.h"
#include "weather.h"