Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-09 01:25:58 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Move more data to src in pokemon_3

Browse Source
This commit is contained in:
Seth Barberee
2024-02-19 16:50:03 -08:00
parent 5ee826049e
commit 4f4dc91976
4 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
data/data_8107010.s
View File

@@ -1916,46 +1916,3 @@ gTacticsTargetLeader: @ 810A36B
.byte 0x01
.byte 0x00
.byte 0x00
.global gReqTacticLvls
gReqTacticLvls: @ 810A378
@ replacing .incbin "baserom.gba", 0x0010a378, 0x18
.2byte 1
.2byte 25
.2byte 1
.2byte 1
.2byte 999
.2byte 999
.2byte 35
.2byte 40
.2byte 20
.2byte 15
.2byte 10
.2byte 999
.global gReqIQSkillPts
gReqIQSkillPts: @ 810A390
.byte 0x0f, 0x27, 0x00, 0x00
.byte 0x69, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00
.byte 0xf4, 0x01, 0x00, 0x00
.byte 0x64, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00
.byte 0x28, 0x00, 0x00, 0x00
.byte 0x19, 0x00, 0x00, 0x00
.byte 0xc8, 0x00, 0x00, 0x00
.byte 0x0a, 0x00, 0x00, 0x00
.byte 0x7d, 0x00, 0x00, 0x00
.byte 0x90, 0x01, 0x00, 0x00
.byte 0xde, 0x03, 0x00, 0x00
.byte 0x8c, 0x00, 0x00, 0x00
.byte 0x20, 0x03, 0x00, 0x00
.byte 0xfa, 0x00, 0x00, 0x00
.byte 0xa0, 0x00, 0x00, 0x00
.byte 0x46, 0x00, 0x00, 0x00
.byte 0x58, 0x02, 0x00, 0x00
.byte 0x2c, 0x01, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00

1
ld_script.txt
View File

@@ -547,6 +547,7 @@ SECTIONS {
src/dungeon_capabilities.o(.rodata);
src/dungeon_ai_targeting.o(.rodata);
data/data_8107010.o(.rodata);
src/pokemon_3.o(.rodata);
src/items.o(.rodata);
src/code_8048480.o(.rodata);
src/friend_area.o(.rodata);

44
src/data/pokemon_3.h Normal file
View File

@@ -0,0 +1,44 @@
const s16 gReqTacticLvls[NUM_TACTICS] =
{
[TACTIC_LETS_GO_TOGETHER] = 1,
[TACTIC_GO_THE_OTHER_WAY] = 25,
[TACTIC_GO_AFTER_FOES] = 1,
[TACTIC_AVOID_THE_FIRST_HIT] = 1,
[TACTIC_ALL_FOR_ONE] = 999,
[TACTIC_GROUP_SAFETY] = 999,
[TACTIC_AVOID_TROUBLE] = 35,
[TACTIC_BE_PATIENT] = 40,
[TACTIC_KEEP_YOUR_DISTANCE] = 20,
[TACTIC_WAIT_THERE] = 15,
[TACTIC_GET_AWAY] = 10,
[TACTIC_UNUSED] = 999,
};
const s32 gReqIQSkillPts[NUM_IQ_SKILLS] =
{
[IQ_NONE] = 9999,
[IQ_TYPE_ADVANTAGE_MASTER] = 105,
[IQ_ITEM_CATCHER] = 1,
[IQ_COURSE_CHECKER] = 1,
[IQ_SURE_HIT_ATTACKER] = 500,
[IQ_QUICK_DODGER] = 100,
[IQ_PP_CHECKER] = 2,
[IQ_NONTRAITOR] = 40,
[IQ_STATUS_CHECKER] = 25,
[IQ_EXP_GO_GETTER] = 200,
[IQ_EFFICIENCY_EXPERT] = 10,
[IQ_WEAK_TYPE_PICKER] = 125,
[IQ_ALL_TERRAIN_HIKER] = 400,
[IQ_SUPER_MOBILE] = 990,
[IQ_TRAP_AVOIDER] = 140,
[IQ_HOUSE_AVOIDER] = 800,
[IQ_ENERGY_SAVER] = 250,
[IQ_NONSLEEPER] = 160,
[IQ_SELF_CURER] = 70,
[IQ_TRAP_SEER] = 600,
[IQ_LAVA_EVADER] = 300,
[IQ_DEDICATED_TRAVELER] = 1,
[IQ_ITEM_MASTER] = 1,
[IQ_EXCLUSIVE_MOVE_USER] = 1,
};

5
src/pokemon_3.c
View File

@@ -18,9 +18,6 @@ extern u8 *gIQSkillDescriptions[];
extern u8 *gTacticsDescriptions[];
extern u8 *gTactics[];
extern bool8 gTacticsTargetLeader[];
extern s16 gReqTacticLvls[];
extern s32 gReqIQSkillPts[];
extern u32 gIQSkillGroups[];
struct unkStruct_808E9EC
@@ -46,6 +43,8 @@ extern s16 gUnknown_810AC66; // 0x8
// 2, 4, 6, 7, 8, 9, 0xA, 0xD, 0xF, 0x11
extern s32 gUnknown_810AC90[10];
#include "data/pokemon_3.h"
extern void SaveDungeonLocation(struct unkStruct_8094924*, DungeonLocation*);
extern void xxx_save_poke_sub_c_808F41C(struct unkStruct_8094924*, struct unkPokeSubStruct_C*);
void RestoreDungeonLocation(struct unkStruct_8094924*, DungeonLocation*);