Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-25 07:29:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ScrCmd review cleanup

Browse Source
This commit is contained in:
TheSylphIsIn 2025-02-08 16:38:52 -05:00
parent 64abb1b69c
commit 67eb129ac8
42 changed files with 125 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/scrcmd.inc
View File

@ -860,7 +860,7 @@
.short \successVar
.endm
@ eggGiverTextId corresponds to an entry in special_met_location_names.gmm. 9 is "Traveling Man", 10 is "Riley", 11 is "Cynthia".
@ eggGiverTextId corresponds to an entry in special_met_location_names.gmm.
.macro GiveEgg species, eggGiverTextId
.short 151
.short \species

4
include/pokemon.h
View File

@ -33,6 +33,8 @@
#define FACE_BACK 0
#define FACE_FRONT 2
#define INIT_IVS_RANDOM 32
enum EvolutionClass {
EVO_CLASS_BY_LEVEL = 0,
EVO_CLASS_BY_TRADE,
@ -805,7 +807,7 @@ void Pokemon_PlayCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 specie
*/
void Pokemon_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 species, int form, int pan, int volume, int forceDefaultChatot, int heapID, u8 delay);
BOOL Pokemon_IsEligibleForAction(Pokemon *mon);
void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int metLocation, int metTerrain, int heapId);
void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapId heapId);
void Pokemon_UpdateAfterCatch(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
void Pokemon_GiveHeldItem(Pokemon *mon, u32 battleType, int itemRates);
BOOL Pokemon_CanLearnTM(Pokemon *mon, u8 tmID);

2
include/scrcmd.h
View File

@ -4,6 +4,6 @@
#include "field_script_context.h"
BOOL sub_02041CC8(ScriptContext *ctx);
BOOL ScrCmd_ResumeScriptOnAppExit(ScriptContext *ctx);
BOOL ScriptContext_WaitForApplication(ScriptContext *ctx);
#endif // POKEPLATINUM_SCRCMD_H

2
include/unk_0203D1B8.h
View File

@ -70,7 +70,7 @@ void sub_0203DE88(FieldSystem *fieldSystem, SaveData *param1);
void sub_0203DFE8(FieldTask *param0, int param1, int param2, int param3, int param4, const u16 *param5, u16 *param6);
void sub_0203E09C(FieldSystem *fieldSystem, TrainerCard *param1);
BOOL sub_0203E0AC(FieldSystem *fieldSystem, void *param1);
void sub_0203E0C0(FieldSystem *fieldSystem, ChooseStarterData *param1);
void FieldSystem_LaunchChooseStarterApp(FieldSystem *fieldSystem, ChooseStarterData *param1);
void sub_0203E0D0(FieldSystem *fieldSystem);
void sub_0203E0FC(FieldSystem *fieldSystem, int param1);
void *sub_0203E1AC(FieldSystem *fieldSystem, int param1, int param2);

2
include/unk_020474B8.h
View File

@ -23,7 +23,7 @@ BOOL ScrCmd_0D8(ScriptContext *param0);
BOOL ScrCmd_0D9(ScriptContext *param0);
BOOL ScrCmd_BufferSpeciesNameFromVar(ScriptContext *ctx);
BOOL ScrCmd_0DB(ScriptContext *param0);
BOOL ScrCmd_BufferRivalStarterSpeciesName(ScriptContext *param0);
BOOL ScrCmd_BufferRivalStarterSpeciesName(ScriptContext *ctx);
BOOL ScrCmd_0DD(ScriptContext *param0);
BOOL ScrCmd_BufferUndergroundGoodsName(ScriptContext *ctx);
BOOL ScrCmd_BufferUndergroundTrapName(ScriptContext *ctx);

2
include/unk_0204CFFC.h
View File

@ -6,7 +6,7 @@
BOOL ScrCmd_GivePokemon(ScriptContext *param0);
BOOL ScrCmd_198(ScriptContext *param0);
BOOL ScrCmd_199(ScriptContext *param0);
BOOL ScrCmd_GiveEgg(ScriptContext *param0);
BOOL ScrCmd_GiveEgg(ScriptContext *ctx);
BOOL ScrCmd_098(ScriptContext *param0);
BOOL ScrCmd_099(ScriptContext *param0);
BOOL ScrCmd_09A(ScriptContext *param0);

2
include/unk_02054884.h
View File

@ -8,7 +8,7 @@
#define PARTY_SLOT_NONE 0xFF
BOOL Pokemon_CanBattle(Pokemon *mon);
BOOL Pokemon_GiveMonFromScript(int heapID, SaveData *saveData, u16 species, u8 level, u16 param4, int param5, int param6);
BOOL Pokemon_GiveMonFromScript(enum HeapId heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain);
BOOL sub_02054930(int unused, SaveData *saveData, u16 param2, u8 param3, int param4, int param5);
void sub_02054988(Party *party, int param1, int param2, u16 param3);
int Party_HasMonWithMove(Party *party, u16 moveID);

4
res/field/scripts/scripts_canalave_city.s
View File

@ -157,8 +157,8 @@ _028A:
Message 0
CloseMessage
GetPlayerStarterSpecies 0x800C
GoToIfEq 0x800C, 0x183, _02EB
GoToIfEq 0x800C, 0x186, _02F7
GoToIfEq 0x800C, SPECIES_TURTWIG, _02EB
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _02F7
GoTo _02DF
_02DF:

3
res/field/scripts/scripts_eterna_city.s
View File

@ -1,5 +1,6 @@
#include "macros/scrcmd.inc"
#include "res/text/bank/eterna_city.h"
#include "res/text/bank/special_met_location_names.h"
.data
@ -1179,7 +1180,7 @@ _0E4B:
Message 10
Message 16
CloseMessage
GiveEgg SPECIES_TOGEPI, 11
GiveEgg SPECIES_TOGEPI, SPECIAL_METLOC_NAME_CYNTHIA
SetVar 0x407A, 5
Return

4
res/field/scripts/scripts_eterna_city_underground_man_house.s
View File

@ -260,8 +260,8 @@ _0347:
_037F:
GetPlayerStarterSpecies 0x800C
GoToIfEq 0x800C, 0x186, _03A3
GoToIfEq 0x800C, 0x183, _03B5
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _03A3
GoToIfEq 0x800C, SPECIES_TURTWIG, _03B5
GoTo _03C7
_03A3:

4
res/field/scripts/scripts_fight_area.s
View File

@ -250,9 +250,9 @@ _0306:
_030C:
GetPlayerStarterSpecies 0x800C
SetVar 0x8004, 0x39D
GoToIfEq 0x800C, 0x186, _033E
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _033E
SetVar 0x8004, 0x39C
GoToIfEq 0x800C, 0x183, _033E
GoToIfEq 0x800C, SPECIES_TURTWIG, _033E
SetVar 0x8004, 0x39B
Return

2
res/field/scripts/scripts_hearthome_city_northwest_house.s
View File

@ -36,7 +36,7 @@ _0057:
BufferPlayerName 0
Message 3
WaitSound
GivePokemon SPECIES_EEVEE, 20, 0, 0x800C
GivePokemon SPECIES_EEVEE, 20, ITEM_NONE, 0x800C
SetFlag 0x131
Message 4
ScrCmd_03E 0x800C

3
res/field/scripts/scripts_iron_island_b2f_left_room.s
View File

@ -1,5 +1,6 @@
#include "macros/scrcmd.inc"
#include "res/text/bank/iron_island_b2f_left_room.h"
#include "res/text/bank/special_met_location_names.h"
.data
@ -261,7 +262,7 @@ _031C:
PlaySound SEQ_FANFA4
WaitSound
Message 12
GiveEgg SPECIES_RIOLU, 10
GiveEgg SPECIES_RIOLU, SPECIAL_METLOC_NAME_RILEY
SetFlag 0x1E5
ClearFlag 226
Call _0371

8
res/field/scripts/scripts_jubilife_city.s
View File

@ -913,18 +913,18 @@ _0BAA:
_0BCA:
GetPlayerStarterSpecies 0x800C
SetVar 0x8004, 0x268
GoToIfEq 0x800C, 0x186, _0C2E
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0C2E
SetVar 0x8004, 0x269
GoToIfEq 0x800C, 0x189, _0C2E
GoToIfEq 0x800C, SPECIES_PIPLUP, _0C2E
SetVar 0x8004, 0x26A
Return
_0BFC:
GetPlayerStarterSpecies 0x800C
SetVar 0x8004, 0x265
GoToIfEq 0x800C, 0x186, _0C2E
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0C2E
SetVar 0x8004, 0x266
GoToIfEq 0x800C, 0x189, _0C2E
GoToIfEq 0x800C, SPECIES_PIPLUP, _0C2E
SetVar 0x8004, 0x267
Return

6
res/field/scripts/scripts_jubilife_tv_2f.s
View File

@ -35,9 +35,9 @@ _0044:
FacePlayer
GoToIfSet 0x13D, _00A4
GetPlayerStarterSpecies 0x800C
CallIfEq 0x800C, 0x183, _00B4
CallIfEq 0x800C, 0x186, _00BC
CallIfEq 0x800C, 0x189, _00C4
CallIfEq 0x800C, SPECIES_TURTWIG, _00B4
CallIfEq 0x800C, SPECIES_CHIMCHAR, _00BC
CallIfEq 0x800C, SPECIES_PIPLUP, _00C4
SetVar 0x410A, 0x8004
ScrCmd_343 0, 0x8004
Message 1

2
res/field/scripts/scripts_mining_museum.s
View File

@ -231,7 +231,7 @@ _03F2:
PlaySound SEQ_FANFA4
Message 8
WaitSound
GivePokemon 0x40B4, 20, 0, 0x800C
GivePokemon 0x40B4, 20, ITEM_NONE, 0x800C
IncrementGameRecord RECORD_UNK_115
SetVar 0x40B4, 0
Message 9

10
res/field/scripts/scripts_pastoria_city.s
View File

@ -108,9 +108,9 @@ _012F:
FacePlayer
GoToIfSet 0x128, _0189
GetPlayerStarterSpecies 0x800C
CallIfEq 0x800C, 0x183, _0194
CallIfEq 0x800C, 0x186, _019C
CallIfEq 0x800C, 0x189, _01A4
CallIfEq 0x800C, SPECIES_TURTWIG, _0194
CallIfEq 0x800C, SPECIES_CHIMCHAR, _019C
CallIfEq 0x800C, SPECIES_PIPLUP, _01A4
ScrCmd_261 0, 0x8004
Message 37
SetVar 0x8005, 1
@ -577,8 +577,8 @@ _04C8:
ApplyMovement 26, _05CC
WaitMovement
GetPlayerStarterSpecies 0x800C
GoToIfEq 0x800C, 0x183, _054B
GoToIfEq 0x800C, 0x186, _0557
GoToIfEq 0x800C, SPECIES_TURTWIG, _054B
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0557
GoTo _053F
_053F:

4
res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s
View File

@ -150,8 +150,8 @@ _01C1:
Message 0
CloseMessage
GetPlayerStarterSpecies 0x800C
GoToIfEq 0x800C, 0x183, _0203
GoToIfEq 0x800C, 0x186, _020F
GoToIfEq 0x800C, SPECIES_TURTWIG, _0203
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _020F
GoTo _01F7
_01F7:

6
res/field/scripts/scripts_route_201.s
View File

@ -284,7 +284,7 @@ _042E:
FadeScreen 6, 1, 1, 0
WaitFadeScreen
GetPlayerStarterSpecies 0x8000
GivePokemon 0x8000, 5, 0, 0x800C
GivePokemon 0x8000, 5, ITEM_NONE, 0x800C
ApplyMovement 5, _07F8
ApplyMovement 2, _0760
ApplyMovement 0xFF, _0884
@ -359,8 +359,8 @@ _057A:
CloseMessage
ScrCmd_06D 2, 15
GetPlayerStarterSpecies 0x800C
GoToIfEq 0x800C, 0x183, _05BB
GoToIfEq 0x800C, 0x186, _05C5
GoToIfEq 0x800C, SPECIES_TURTWIG, _05BB
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _05C5
GoTo _05B1
End

4
res/field/scripts/scripts_route_203.s
View File

@ -91,8 +91,8 @@ _0111:
Message 0
CloseMessage
GetPlayerStarterSpecies 0x800C
GoToIfEq 0x800C, 0x183, _014C
GoToIfEq 0x800C, 0x186, _0158
GoToIfEq 0x800C, SPECIES_TURTWIG, _014C
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0158
GoTo _0140
_0140:

4
res/field/scripts/scripts_route_209_gate_to_hearthome_city.s
View File

@ -33,8 +33,8 @@ _001D:
Message 1
CloseMessage
GetPlayerStarterSpecies 0x800C
GoToIfEq 0x800C, 0x183, _00B3
GoToIfEq 0x800C, 0x186, _00C1
GoToIfEq 0x800C, SPECIES_TURTWIG, _00B3
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _00C1
GoTo _00A5
End

4
res/field/scripts/scripts_spear_pillar.s
View File

@ -338,9 +338,9 @@ _041C:
_0424:
GetPlayerStarterSpecies 0x800C
SetVar 0x8004, 0x26C
GoToIfEq 0x800C, 0x186, _0454
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0454
SetVar 0x8004, 0x26B
GoToIfEq 0x800C, 0x183, _0454
GoToIfEq 0x800C, SPECIES_TURTWIG, _0454
SetVar 0x8004, 0x25F
_0454:
Return

4
res/field/scripts/scripts_survival_area.s
View File

@ -172,8 +172,8 @@ _01BE:
Message 2
CloseMessage
GetPlayerStarterSpecies 0x800C
GoToIfEq 0x800C, 0x183, _0236
GoToIfEq 0x800C, 0x186, _0272
GoToIfEq 0x800C, SPECIES_TURTWIG, _0236
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0272
GoTo _01FA
End

8
res/field/scripts/scripts_trainers_school.s
View File

@ -170,8 +170,8 @@ _01E7:
Message 10
CloseMessage
GetPlayerStarterSpecies 0x800C
GoToIfEq 0x800C, 0x183, _0220
GoToIfEq 0x800C, 0x186, _022E
GoToIfEq 0x800C, SPECIES_TURTWIG, _0220
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _022E
GoTo _0212
End
@ -264,8 +264,8 @@ _031A:
Message 16
CloseMessage
GetPlayerStarterSpecies 0x800C
GoToIfEq 0x800C, 0x183, _0353
GoToIfEq 0x800C, 0x186, _0361
GoToIfEq 0x800C, SPECIES_TURTWIG, _0353
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0361
GoTo _0345
End

8
res/field/scripts/scripts_veilstone_city.s
View File

@ -649,18 +649,18 @@ _0919:
_0939:
GetPlayerStarterSpecies 0x800C
SetVar 0x8004, 0x271
GoToIfEq 0x800C, 0x186, _099D
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _099D
SetVar 0x8004, 0x272
GoToIfEq 0x800C, 0x189, _099D
GoToIfEq 0x800C, SPECIES_PIPLUP, _099D
SetVar 0x8004, 0x270
Return
_096B:
GetPlayerStarterSpecies 0x800C
SetVar 0x8004, 0x26E
GoToIfEq 0x800C, 0x186, _099D
GoToIfEq 0x800C, SPECIES_CHIMCHAR, _099D
SetVar 0x8004, 0x26F
GoToIfEq 0x800C, 0x189, _099D
GoToIfEq 0x800C, SPECIES_PIPLUP, _099D
SetVar 0x8004, 0x26D
Return

2
res/field/scripts/scripts_veilstone_city_northeast_house.s
View File

@ -37,7 +37,7 @@ _005B:
BufferPlayerName 0
Message 3
WaitSound
GivePokemon SPECIES_PORYGON, 25, 0, 0x800C
GivePokemon SPECIES_PORYGON, 25, ITEM_NONE, 0x800C
SetFlag 151
Message 4
ScrCmd_03E 0x800C

6
res/field/scripts/scripts_veilstone_store_1f.s
View File

@ -87,9 +87,9 @@ _00A9:
FacePlayer
GoToIfSet 0x129, _0109
GetPlayerStarterSpecies 0x800C
CallIfEq 0x800C, 0x183, _0119
CallIfEq 0x800C, 0x186, _0121
CallIfEq 0x800C, 0x189, _0129
CallIfEq 0x800C, SPECIES_TURTWIG, _0119
CallIfEq 0x800C, SPECIES_CHIMCHAR, _0121
CallIfEq 0x800C, SPECIES_PIPLUP, _0129
SetVar 0x4107, 0x8004
ScrCmd_343 0, 0x8004
Message 3

26
res/text/special_met_location_names.gmm
View File

@ -1,55 +1,55 @@
<?xml version="1.0"?>
<body language="English">
<key value="4216" />
<row id="pl_msg_00000435_00000" index="0">
<row id="SPECIAL_METLOC_NAME_DAYCARE" index="0">
<attribute name="window_context_name">used</attribute>
<language name="English">Day-Care Couple</language>
</row>
<row id="pl_msg_00000435_00001" index="1">
<row id="SPECIAL_METLOC_NAME_TRADE" index="1">
<attribute name="window_context_name">used</attribute>
<language name="English">Link trade</language>
</row>
<row id="pl_msg_00000435_00002" index="2">
<row id="SPECIAL_METLOC_NAME_TRADE2" index="2">
<attribute name="window_context_name">used</attribute>
<language name="English">Link trade</language>
</row>
<row id="pl_msg_00000435_00003" index="3">
<row id="SPECIAL_METLOC_NAME_KANTO" index="3">
<attribute name="window_context_name">used</attribute>
<language name="English">Kanto</language>
</row>
<row id="pl_msg_00000435_00004" index="4">
<row id="SPECIAL_METLOC_NAME_JOHTO" index="4">
<attribute name="window_context_name">used</attribute>
<language name="English">Johto</language>
</row>
<row id="pl_msg_00000435_00005" index="5">
<row id="SPECIAL_METLOC_NAME_HOENN" index="5">
<attribute name="window_context_name">used</attribute>
<language name="English">Hoenn</language>
</row>
<row id="pl_msg_00000435_00006" index="6">
<row id="SPECIAL_METLOC_NAME_SINNOH" index="6">
<attribute name="window_context_name">used</attribute>
<language name="English">Sinnoh</language>
</row>
<row id="pl_msg_00000435_00007" index="7">
<row id="SPECIAL_METLOC_NAME_EMPTY" index="7">
<attribute name="window_context_name">used</attribute>
<language name="English">----</language>
</row>
<row id="pl_msg_00000435_00008" index="8">
<row id="SPECIAL_METLOC_NAME_DISTANT_LAND" index="8">
<attribute name="window_context_name">used</attribute>
<language name="English">Distant land</language>
</row>
<row id="pl_msg_00000435_00009" index="9">
<row id="SPECIAL_METLOC_NAME_TRAVELING_MAN" index="9">
<attribute name="window_context_name">used</attribute>
<language name="English">Traveling Man</language>
</row>
<row id="pl_msg_00000435_00010" index="10">
<row id="SPECIAL_METLOC_NAME_RILEY" index="10">
<attribute name="window_context_name">used</attribute>
<language name="English">Riley</language>
</row>
<row id="pl_msg_00000435_00011" index="11">
<row id="SPECIAL_METLOC_NAME_CYNTHIA" index="11">
<attribute name="window_context_name">used</attribute>
<language name="English">Cynthia</language>
</row>
<row id="pl_msg_00000435_00012" index="12">
<row id="SPECIAL_METLOC_NAME_MYSTERY_ZONE" index="12">
<attribute name="window_context_name">used</attribute>
<language name="English">Mystery Zone</language>
</row>

4
src/field_battle_data_transfer.c
View File

@ -169,9 +169,9 @@ FieldBattleDTO *FieldBattleDTO_NewCatchingTutorial(enum HeapId heapID, const Fie
Bag_TryAddItem(dto->bag, ITEM_POKE_BALL, 20, heapID);
mon = Pokemon_New(heapID);
Pokemon_InitWith(mon, VarsFlags_GetPlayerCounterpartStarterSpecies(SaveData_GetVarsFlags(fieldSystem->saveData)), 5, 32, FALSE, 0, OTID_NOT_SHINY, 0);
Pokemon_InitWith(mon, VarsFlags_GetPlayerCounterpartStarterSpecies(SaveData_GetVarsFlags(fieldSystem->saveData)), 5, INIT_IVS_RANDOM, FALSE, 0, OTID_NOT_SHINY, 0);
Party_AddPokemon(dto->parties[BATTLER_PLAYER_1], mon);
Pokemon_InitWith(mon, SPECIES_BIDOOF, 2, 32, FALSE, 0, OTID_NOT_SHINY, 0);
Pokemon_InitWith(mon, SPECIES_BIDOOF, 2, INIT_IVS_RANDOM, FALSE, 0, OTID_NOT_SHINY, 0);
Party_AddPokemon(dto->parties[BATTLER_ENEMY_1], mon);
Heap_FreeToHeap(mon);

20
src/overlay005/ov5_021E622C.c
View File

@ -2603,7 +2603,7 @@ void Egg_CreateEgg(Pokemon *egg, u16 species, u8 param2, TrainerInfo *trainerInf
u8 hatchCycles = SpeciesData_GetSpeciesValue(species, SPECIES_DATA_HATCH_CYCLES);
Strbuf *eggName;
Pokemon_InitWith(egg, species, 1, 32, FALSE, 0, OTID_NOT_SET, 0);
Pokemon_InitWith(egg, species, 1, INIT_IVS_RANDOM, FALSE, 0, OTID_NOT_SET, 0);
metLvl = 0;
ball = ITEM_POKE_BALL;
@ -2624,14 +2624,14 @@ void Egg_CreateEgg(Pokemon *egg, u16 species, u8 param2, TrainerInfo *trainerInf
Strbuf_Free(eggName);
if (param4 == 4) {
u32 v6 = TrainerInfo_ID(trainerInfo);
u32 v7 = TrainerInfo_Gender(trainerInfo);
Strbuf *v8 = TrainerInfo_NameNewStrbuf(trainerInfo, 32);
u32 trainerId = TrainerInfo_ID(trainerInfo);
u32 gender = TrainerInfo_Gender(trainerInfo);
Strbuf *otName = TrainerInfo_NameNewStrbuf(trainerInfo, 32);
Pokemon_SetValue(egg, MON_DATA_OTNAME_STRBUF, v8);
Pokemon_SetValue(egg, MON_DATA_OT_ID, &v6);
Pokemon_SetValue(egg, MON_DATA_OT_GENDER, &v7);
Strbuf_Free(v8);
Pokemon_SetValue(egg, MON_DATA_OTNAME_STRBUF, otName);
Pokemon_SetValue(egg, MON_DATA_OT_ID, &trainerId);
Pokemon_SetValue(egg, MON_DATA_OT_GENDER, &gender);
Strbuf_Free(otName);
}
sub_0209304C(egg, trainerInfo, param4, metLocation, 0);
@ -2663,7 +2663,7 @@ void ov5_021E6DE8(Pokemon *param0, u16 param1, UnkStruct_02026310 *param2, u32 p
}
}
Pokemon_InitWith(param0, param1, 1, 32, TRUE, v2, OTID_NOT_SET, 0);
Pokemon_InitWith(param0, param1, 1, INIT_IVS_RANDOM, TRUE, v2, OTID_NOT_SET, 0);
v0 = 0;
v1 = ITEM_POKE_BALL;
@ -3071,7 +3071,7 @@ static void ov5_021E742C(Pokemon *param0, int param1)
}
}
Pokemon_InitWith(v16, v0, 1, 32, TRUE, v3, OTID_NOT_SET, 0);
Pokemon_InitWith(v16, v0, 1, INIT_IVS_RANDOM, TRUE, v3, OTID_NOT_SET, 0);
for (v7 = 0; v7 < LEARNED_MOVES_MAX; v7++) {
Pokemon_SetValue(v16, MON_DATA_MOVE1 + v7, &(v1[v7]));

2
src/overlay006/ov6_02246184.c
View File

@ -157,7 +157,7 @@ static void ov6_0224630C(Pokemon *param0, UnkStruct_ov6_0224630C *param1, u32 pa
u8 v1;
u32 v2;
Pokemon_InitWith(param0, param1->unk_00, param2, 32, TRUE, param1->unk_38, OTID_SET, param1->unk_20);
Pokemon_InitWith(param0, param1->unk_00, param2, INIT_IVS_RANDOM, TRUE, param1->unk_38, OTID_SET, param1->unk_20);
v0 = ov6_022462E4(param4, param3);

2
src/overlay006/wild_encounters.c
View File

@ -1039,7 +1039,7 @@ static void CreateWildMonShinyWithGenderOrNature(const u16 species, const u8 lev
} while (TRUE);
}
Pokemon_InitWith(newEncounter, species, level, 32, TRUE, newEncounterPersonality, OTID_SET, encounterFieldParams->trainerID);
Pokemon_InitWith(newEncounter, species, level, INIT_IVS_RANDOM, TRUE, newEncounterPersonality, OTID_SET, encounterFieldParams->trainerID);
GF_ASSERT(AddWildMonToParty(partyId, encounterFieldParams, newEncounter, battleParams));
Heap_FreeToHeap(newEncounter);

2
src/overlay087/ov87_021D106C.c
View File

@ -539,7 +539,7 @@ static void ov87_021D1970(UnkStruct_ov87_021D106C *param0)
v2 = param0->unk_04;
for (v3 = 0; v3 < v2->unk_14; v3++) {
Pokemon_InitWith(param0->unk_1FC, v2->unk_20[v3].unk_10, v2->unk_20[v3].unk_12, 32, TRUE, v2->unk_20[v3].unk_08, OTID_SET, v2->unk_20[v3].unk_0C);
Pokemon_InitWith(param0->unk_1FC, v2->unk_20[v3].unk_10, v2->unk_20[v3].unk_12, INIT_IVS_RANDOM, TRUE, v2->unk_20[v3].unk_08, OTID_SET, v2->unk_20[v3].unk_0C);
Pokemon_SetValue(param0->unk_1FC, MON_DATA_FORM, (void *)(&(v2->unk_20[v3].unk_13)));
Pokemon_BuildArchivedSprite(&v1, param0->unk_1FC, 2);
sub_02013720(v1.archive, v1.character, 61, &v0, param0->unk_200, v2->unk_20[v3].unk_08, 0, 2, v2->unk_20[v3].unk_10);

10
src/pokemon.c
View File

@ -124,7 +124,7 @@ static BOOL Pokemon_HasMove(Pokemon *mon, u16 moveID);
static s8 BoxPokemon_GetFlavorAffinity(BoxPokemon *boxMon, int flavor);
static BOOL IsBoxPokemonInfectedWithPokerus(BoxPokemon *boxMon);
static BOOL BoxPokemonHasCuredPokerus(BoxPokemon *boxMon);
static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int metLocation, int metTerrain, int heapId);
static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapId heapId);
static void PostCaptureBoxPokemonProcessing(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
static BOOL CanBoxPokemonLearnTM(BoxPokemon *boxMon, u8 tmID);
static void BoxPokemon_CalcAbility(BoxPokemon *boxMon);
@ -291,7 +291,7 @@ static void sub_02073E18(BoxPokemon *boxMon, int monSpecies, int monLevel, int m
v1 = ITEM_POKE_BALL;
BoxPokemon_SetValue(boxMon, MON_DATA_POKEBALL, &v1);
if (monIVs < 32) {
if (monIVs < INIT_IVS_RANDOM) {
BoxPokemon_SetValue(boxMon, MON_DATA_HP_IV, &monIVs);
BoxPokemon_SetValue(boxMon, MON_DATA_ATK_IV, &monIVs);
BoxPokemon_SetValue(boxMon, MON_DATA_DEF_IV, &monIVs);
@ -4372,9 +4372,9 @@ BOOL Pokemon_IsEligibleForAction(Pokemon *mon)
return sub_02005844(monSpecies, monForm);
}
void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int metLocation, int metTerrain, int heapId)
void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapId heapId)
{
InitializeBoxPokemonAfterCapture(&mon->box, param1, monPokeball, metLocation, metTerrain, heapId);
InitializeBoxPokemonAfterCapture(&mon->box, trainerInfo, monPokeball, metLocation, metTerrain, heapId);
if (monPokeball == ITEM_HEAL_BALL) {
int monMaxHP = Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL);
@ -4385,7 +4385,7 @@ void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, in
}
}
static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *trainer, int monPokeball, int metLocation, int metTerrain, int heapId)
static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *trainer, int monPokeball, int metLocation, int metTerrain, enum HeapId heapId)
{
UpdateBoxMonStatusAndTrainerInfo(boxMon, trainer, 0, metLocation, heapId);
BoxPokemon_SetValue(boxMon, MON_DATA_MET_GAME, &gGameVersion);

2
src/roaming_pokemon.c
View File

@ -321,7 +321,7 @@ void RoamingPokemon_ActivateSlot(SaveData *saveData, const u8 slot)
roamerMonData = Pokemon_New(4);
Pokemon_Init(roamerMonData);
Pokemon_InitWith(roamerMonData, species, level, 32, FALSE, 0, OTID_SET, TrainerInfo_ID_LowHalf(trainer));
Pokemon_InitWith(roamerMonData, species, level, INIT_IVS_RANDOM, FALSE, 0, OTID_SET, TrainerInfo_ID_LowHalf(trainer));
Roamer_SetData(newRoamer, ROAMER_DATA_STATUS, 0);
Roamer_SetData(newRoamer, ROAMER_DATA_ACTIVE, 1);
Roamer_SetData(newRoamer, ROAMER_DATA_IVS, Pokemon_GetValue(roamerMonData, MON_DATA_COMBINED_IVS, NULL));

38
src/scrcmd.c
View File

@ -3534,7 +3534,7 @@ static BOOL ScrCmd_191(ScriptContext *ctx)
v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19);
*v0 = sub_0203D3C0(32, ctx->fieldSystem);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}
@ -3545,7 +3545,7 @@ static BOOL ScrCmd_2A5(ScriptContext *ctx)
v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19);
*v0 = sub_0203D3E4(32, ctx->fieldSystem);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}
@ -3712,7 +3712,7 @@ static BOOL ScrCmd_194(ScriptContext *ctx)
u16 v4 = ScriptContext_GetVar(ctx);
*v0 = sub_0203D578(32, ctx->fieldSystem, v3, v2, v4, v1);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}
@ -3754,7 +3754,7 @@ static BOOL ScrCmd_196(ScriptContext *ctx)
u16 v1 = ScriptContext_GetVar(ctx);
*v0 = sub_0203D5C8(32, ctx->fieldSystem, v1);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}
@ -3784,7 +3784,7 @@ static BOOL ScrCmd_2E7(ScriptContext *ctx)
u16 v2 = ScriptContext_GetVar(ctx);
*v0 = sub_0203E63C(32, ctx->fieldSystem, v1, v2);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}
@ -3908,7 +3908,7 @@ static BOOL sub_02041D3C(ScriptContext *ctx)
return 1;
}
BOOL ScrCmd_ResumeScriptOnAppExit(ScriptContext *ctx)
BOOL ScriptContext_WaitForApplication(ScriptContext *ctx)
{
FieldSystem *fieldSystem = ctx->fieldSystem;
@ -4216,7 +4216,7 @@ static BOOL ScrCmd_130(ScriptContext *ctx)
static BOOL ScrCmd_205(ScriptContext *ctx)
{
sub_0203E224(ctx->fieldSystem);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}
@ -4224,7 +4224,7 @@ static BOOL ScrCmd_205(ScriptContext *ctx)
static BOOL ScrCmd_310(ScriptContext *ctx)
{
sub_0203E704(ctx->fieldSystem);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}
@ -4322,7 +4322,7 @@ static BOOL ScrCmd_0AC(ScriptContext *ctx)
FieldSystem *fieldSystem = ctx->fieldSystem;
sub_0203DDFC(fieldSystem);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}
@ -4391,7 +4391,7 @@ static BOOL ScrCmd_0B2(ScriptContext *ctx)
if (sub_02039074(ctx->fieldSystem->saveData)) {
*v1 = 1;
sub_0203E0FC(ctx->fieldSystem, v0);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
} else {
*v1 = 0;
}
@ -4417,8 +4417,8 @@ static BOOL ScrCmd_StartChooseStarterScene(ScriptContext *ctx)
chooseStarterData->options = SaveData_Options(ctx->fieldSystem->saveData);
sub_0203E0C0(ctx->fieldSystem, *fieldSysDataPtr); // launches choose_starter application
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
FieldSystem_LaunchChooseStarterApp(ctx->fieldSystem, *fieldSysDataPtr);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return TRUE;
}
@ -4452,7 +4452,7 @@ static BOOL ScrCmd_178(ScriptContext *ctx)
GF_ASSERT(*v0 == 0);
*v0 = sub_0203D264(ctx->fieldSystem, v1);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}
@ -5124,7 +5124,7 @@ static BOOL ScrCmd_12A(ScriptContext *ctx)
static BOOL ScrCmd_12B(ScriptContext *ctx)
{
sub_0203E0D0(ctx->fieldSystem);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}
@ -6769,7 +6769,7 @@ static void sub_020451B4(FieldSystem *fieldSystem, u16 param1)
Pokemon *v1 = Pokemon_New(32);
Pokemon_Init(v1);
Pokemon_InitWith(v1, param1, 50, 32, FALSE, 0, OTID_NOT_SET, 0);
Pokemon_InitWith(v1, param1, 50, INIT_IVS_RANDOM, FALSE, 0, OTID_NOT_SET, 0);
Pokedex_Encounter(v0, v1);
Heap_FreeToHeap(v1);
@ -7471,7 +7471,7 @@ static BOOL ScrCmd_290(ScriptContext *ctx)
v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19);
*v0 = sub_0203D410(32, ctx->fieldSystem, v1);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}
@ -7902,7 +7902,7 @@ BOOL ScrCmd_2E2(ScriptContext *ctx)
void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19);
*v0 = sub_0203E608(ctx->fieldSystem, 32);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}
@ -8058,7 +8058,7 @@ static BOOL ScrCmd_2F6(ScriptContext *ctx)
if (sub_02039074(ctx->fieldSystem->saveData)) {
*v2 = 1;
sub_0203E6C0(ctx->fieldSystem, v1, v0);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
} else {
*v2 = 0;
}
@ -8271,7 +8271,7 @@ static BOOL ScrCmd_313(ScriptContext *ctx)
static BOOL ScrCmd_320(ScriptContext *ctx)
{
sub_0203E714(ctx->fieldSystem);
ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(ctx, ScriptContext_WaitForApplication);
return 1;
}

2
src/string_template.c
View File

@ -490,7 +490,7 @@ void StringTemplate_SetMetLocationName(StringTemplate *template, u32 idx, u32 lo
u32 bankID, msgID;
if (metLocationType == 0 && metLocationID == 0) {
bankID = sMetLocationBanks[1];
msgID = pl_msg_00000435_00012;
msgID = SPECIAL_METLOC_NAME_MYSTERY_ZONE;
} else {
bankID = sMetLocationBanks[2];
msgID = pl_msg_00000434_00002;

4
src/unk_0203D1B8.c
View File

@ -1317,7 +1317,7 @@ BOOL sub_0203E0AC(FieldSystem *fieldSystem, void *param1)
return 1;
}
void sub_0203E0C0(FieldSystem *fieldSystem, ChooseStarterData *param1)
void FieldSystem_LaunchChooseStarterApp(FieldSystem *fieldSystem, ChooseStarterData *chooseStarterData)
{
FS_EXTERN_OVERLAY(choose_starter);
@ -1328,7 +1328,7 @@ void sub_0203E0C0(FieldSystem *fieldSystem, ChooseStarterData *param1)
FS_OVERLAY_ID(choose_starter)
};
FieldSystem_StartChildProcess(fieldSystem, &template, param1);
FieldSystem_StartChildProcess(fieldSystem, &template, chooseStarterData);
}
void sub_0203E0D0(FieldSystem *fieldSystem)

12
src/unk_0204CFFC.c
View File

@ -42,7 +42,7 @@ BOOL ScrCmd_GivePokemon(ScriptContext *ctx)
playerParty = Party_GetFromSavedata(fieldSystem->saveData);
*partyHasRoom = Pokemon_GiveMonFromScript(HEAP_ID_FIELDMAP, fieldSystem->saveData, species, level, heldItem, metLocation, metTerrain);
return 0;
return FALSE;
}
BOOL ScrCmd_198(ScriptContext *param0)
@ -85,17 +85,17 @@ BOOL ScrCmd_199(ScriptContext *param0)
return 0;
}
BOOL ScrCmd_GiveEgg(ScriptContext *param0)
BOOL ScrCmd_GiveEgg(ScriptContext *ctx)
{
int specialMetLoc;
u8 partyCount;
BOOL partyHasRoom;
Party *playerParty;
Pokemon *egg;
FieldSystem *fieldSystem = param0->fieldSystem;
FieldSystem *fieldSystem = ctx->fieldSystem;
TrainerInfo *trainer = SaveData_GetTrainerInfo(fieldSystem->saveData);
u16 species = ScriptContext_GetVar(param0);
u16 eggGiver = ScriptContext_GetVar(param0);
u16 species = ScriptContext_GetVar(ctx);
u16 eggGiver = ScriptContext_GetVar(ctx);
playerParty = Party_GetFromSavedata(fieldSystem->saveData);
partyCount = Party_GetCurrentCount(playerParty);
@ -111,7 +111,7 @@ BOOL ScrCmd_GiveEgg(ScriptContext *param0)
Heap_FreeToHeap(egg);
}
return 0;
return FALSE;
}
BOOL ScrCmd_098(ScriptContext *param0)

4
src/unk_0204EDA4.c
View File

@ -27,7 +27,7 @@ BOOL ScrCmd_1C6(ScriptContext *param0)
v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19);
*v1 = sub_0203D6E4(32, param0->fieldSystem, v0);
ScriptContext_Pause(param0, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(param0, ScriptContext_WaitForApplication);
return 1;
}
@ -86,7 +86,7 @@ static void sub_0204EE90(ScriptContext *param0, u16 param1, Pokemon *param2, u16
v1->unk_15 = param1;
sub_0203E284(param0->fieldSystem, v1);
ScriptContext_Pause(param0, ScrCmd_ResumeScriptOnAppExit);
ScriptContext_Pause(param0, ScriptContext_WaitForApplication);
Heap_FreeToHeap(param3);
}

4
src/unk_02054884.c
View File

@ -29,7 +29,7 @@ BOOL Pokemon_CanBattle(Pokemon *mon)
return !Pokemon_GetValue(mon, MON_DATA_IS_EGG, NULL);
}
BOOL Pokemon_GiveMonFromScript(int heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain)
BOOL Pokemon_GiveMonFromScript(enum HeapId heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain)
{
BOOL result;
Pokemon *mon;
@ -41,7 +41,7 @@ BOOL Pokemon_GiveMonFromScript(int heapID, SaveData *saveData, u16 species, u8 l
mon = Pokemon_New(heapID);
Pokemon_Init(mon);
Pokemon_InitWith(mon, species, level, 32, FALSE, 0, OTID_NOT_SET, 0);
Pokemon_InitWith(mon, species, level, INIT_IVS_RANDOM, FALSE, 0, OTID_NOT_SET, 0);
Pokemon_SetCatchData(mon, trainerInfo, ITEM_POKE_BALL, metLocation, metTerrain, heapID);
item = heldItem;

2
src/unk_02094EDC.c
View File

@ -622,7 +622,7 @@ void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int par
u32 v2;
v2 = sub_02074128(param0->unk_14, param0->unk_20_12, 0);
Pokemon_InitWith(param1, param0->unk_14, 10, 32, TRUE, v2, OTID_NOT_SHINY, 0xf0f0f0f);
Pokemon_InitWith(param1, param0->unk_14, 10, INIT_IVS_RANDOM, TRUE, v2, OTID_NOT_SHINY, 0xf0f0f0f);
for (v0 = 0; v0 < 4; v0++) {
v1 = param0->unk_0C[v0];