dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Review changes for #807

Browse Source
This commit is contained in:
GriffinR
2019-09-17 01:49:07 -04:00
committed by huderlem
parent 6ab49da811
commit 6ab192e739
14 changed files with 224 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+5 -5
View File
@@ -2897,34 +2897,34 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2737A0:: @ 82737A0
MossdeepCity_StevensHouse_EventScript_2737A0:: @ 82737A0 MossdeepCity_StevensHouse_EventScript_2737A0:: @ 82737A0
Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0 Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0
RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0 RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0
bufferboxname 0, VAR_STORAGE_UNKNOWN bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
bufferspeciesname 1, VAR_TEMP_1 bufferspeciesname 1, VAR_TEMP_1
call_if_unset FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB call_if_unset FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB
call_if_set FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6 call_if_set FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6
return return
LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB
specialvar VAR_RESULT, sub_813B21C specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4
msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT
return return
LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4 LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4
specialvar VAR_RESULT, get_unknown_box_id specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT bufferboxname 2, VAR_RESULT
msgbox gText_PkmnBoxSomeonesPCFull, MSGBOX_DEFAULT msgbox gText_PkmnBoxSomeonesPCFull, MSGBOX_DEFAULT
return return
LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6 LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6
specialvar VAR_RESULT, sub_813B21C specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF
msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT
return return
LittlerootTown_ProfessorBirchsLab_EventScript_2737FF:: @ 82737FF LittlerootTown_ProfessorBirchsLab_EventScript_2737FF:: @ 82737FF
specialvar VAR_RESULT, get_unknown_box_id specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT bufferboxname 2, VAR_RESULT
msgbox gText_PkmnBoxLanettesPCFull, MSGBOX_DEFAULT msgbox gText_PkmnBoxLanettesPCFull, MSGBOX_DEFAULT
return return
data/maps/BattleFrontier_Lounge5/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_Lounge5_EventScript_2645C6", "script": "BattleFrontier_Lounge5_EventScript_NatureGirl",
"flag": "0" "flag": "0"
}, },
{ {
data/maps/BattleFrontier_Lounge5/scripts.inc
+34 -34
View File
@@ -1,34 +1,34 @@
BattleFrontier_Lounge5_MapScripts:: @ 82645C5 BattleFrontier_Lounge5_MapScripts:: @ 82645C5
.byte 0 .byte 0
BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 BattleFrontier_Lounge5_EventScript_NatureGirl:: @ 82645C6
lock lock
faceplayer faceplayer
msgbox BattleFrontier_Lounge5_Text_264632, MSGBOX_YESNO msgbox BattleFrontier_Lounge5_Text_NatureGirlGreeting, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_Lounge5_EventScript_26460D goto_if_eq BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown
special sub_81B94B0 special sub_81B94B0
waitstate waitstate
lock lock
faceplayer faceplayer
compare VAR_0x8004, 255 compare VAR_0x8004, 255
goto_if_eq BattleFrontier_Lounge5_EventScript_26460D goto_if_eq BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown
specialvar VAR_RESULT, ScriptGetPartyMonSpecies specialvar VAR_RESULT, ScriptGetPartyMonSpecies
compare VAR_RESULT, SPECIES_EGG compare VAR_RESULT, SPECIES_EGG
goto_if_eq BattleFrontier_Lounge5_EventScript_264603 goto_if_eq BattleFrontier_Lounge5_EventScript_NatureGirlEgg
special ShowNatureGirlMessage special ShowNatureGirlMessage
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
end end
BattleFrontier_Lounge5_EventScript_264603:: @ 8264603 BattleFrontier_Lounge5_EventScript_NatureGirlEgg:: @ 8264603
msgbox BattleFrontier_Lounge5_Text_264EEE, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge5_Text_NatureGirlEgg, MSGBOX_DEFAULT
release release
end end
BattleFrontier_Lounge5_EventScript_26460D:: @ 826460D BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown:: @ 826460D
msgbox BattleFrontier_Lounge5_Text_26467F, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge5_Text_NatureGirlNoneShown, MSGBOX_DEFAULT
release release
end end
@@ -44,149 +44,149 @@ BattleFrontier_Lounge5_EventScript_264629:: @ 8264629
msgbox BattleFrontier_Lounge5_Text_264FAB, MSGBOX_NPC msgbox BattleFrontier_Lounge5_Text_264FAB, MSGBOX_NPC
end end
BattleFrontier_Lounge5_Text_264632:: @ 8264632 BattleFrontier_Lounge5_Text_NatureGirlGreeting:: @ 8264632
.string "Ehehe!\n" .string "Ehehe!\n"
.string "I can tell what POKéMON are thinking!\p" .string "I can tell what POKéMON are thinking!\p"
.string "Please!\n" .string "Please!\n"
.string "Can I see your POKéMON?$" .string "Can I see your POKéMON?$"
BattleFrontier_Lounge5_Text_26467F:: @ 826467F BattleFrontier_Lounge5_Text_NatureGirlNoneShown:: @ 826467F
.string "Boo!\n" .string "Boo!\n"
.string "Cheapie!$" .string "Cheapie!$"
BattleFrontier_Lounge5_Text_26468D:: @ 826468D BattleFrontier_Lounge5_Text_NatureGirlHardy:: @ 826468D
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to battle!\n" .string "This one says it likes to battle!\n"
.string "It will battle even if it has a lot\l" .string "It will battle even if it has a lot\l"
.string "of ouchies!$" .string "of ouchies!$"
BattleFrontier_Lounge5_Text_2646E5:: @ 82646E5 BattleFrontier_Lounge5_Text_NatureGirlLonely:: @ 82646E5
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n" .string "This one says it likes to be sneaky!\n"
.string "But if it gets enough ouchies,\l" .string "But if it gets enough ouchies,\l"
.string "it will hit back!$" .string "it will hit back!$"
BattleFrontier_Lounge5_Text_264741:: @ 8264741 BattleFrontier_Lounge5_Text_NatureGirlBrave:: @ 8264741
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to battle!\n" .string "This one says it likes to battle!\n"
.string "But if it gets enough ouchies,\l" .string "But if it gets enough ouchies,\l"
.string "it will worry about itself!$" .string "it will worry about itself!$"
BattleFrontier_Lounge5_Text_2647A4:: @ 82647A4 BattleFrontier_Lounge5_Text_NatureGirlAdamant:: @ 82647A4
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to battle!\n" .string "This one says it likes to battle!\n"
.string "It will battle even if it has a lot\l" .string "It will battle even if it has a lot\l"
.string "of ouchies!$" .string "of ouchies!$"
BattleFrontier_Lounge5_Text_2647FC:: @ 82647FC BattleFrontier_Lounge5_Text_NatureGirlNaughty:: @ 82647FC
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it looks after itself!\n" .string "This one says it looks after itself!\n"
.string "But if it gets enough ouchies,\l" .string "But if it gets enough ouchies,\l"
.string "it will hit back!$" .string "it will hit back!$"
BattleFrontier_Lounge5_Text_264858:: @ 8264858 BattleFrontier_Lounge5_Text_NatureGirlBold:: @ 8264858
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n" .string "This one says it likes to be sneaky!\n"
.string "But if it gets enough ouchies,\l" .string "But if it gets enough ouchies,\l"
.string "it will worry about itself!$" .string "it will worry about itself!$"
BattleFrontier_Lounge5_Text_2648BE:: @ 82648BE BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky:: @ 82648BE
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to battle!\n" .string "This one says it likes to battle!\n"
.string "It will battle even if it has a lot\l" .string "It will battle even if it has a lot\l"
.string "of ouchies!$" .string "of ouchies!$"
BattleFrontier_Lounge5_Text_264916:: @ 8264916 BattleFrontier_Lounge5_Text_NatureGirlRelaxed:: @ 8264916
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n" .string "This one says it likes to be sneaky!\n"
.string "But if it gets enough ouchies,\l" .string "But if it gets enough ouchies,\l"
.string "it will hit back!$" .string "it will hit back!$"
BattleFrontier_Lounge5_Text_264972:: @ 8264972 BattleFrontier_Lounge5_Text_NatureGirlImpish:: @ 8264972
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to battle!\n" .string "This one says it likes to battle!\n"
.string "But if it gets enough ouchies,\l" .string "But if it gets enough ouchies,\l"
.string "it will worry about itself!$" .string "it will worry about itself!$"
BattleFrontier_Lounge5_Text_2649D5:: @ 82649D5 BattleFrontier_Lounge5_Text_NatureGirlLax:: @ 82649D5
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n" .string "This one says it likes to be sneaky!\n"
.string "It says it likes to be sneaky even\l" .string "It says it likes to be sneaky even\l"
.string "if it has a lot of ouchies!$" .string "if it has a lot of ouchies!$"
BattleFrontier_Lounge5_Text_264A3F:: @ 8264A3F BattleFrontier_Lounge5_Text_NatureGirlTimid:: @ 8264A3F
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to battle!\n" .string "This one says it likes to battle!\n"
.string "But if it gets enough ouchies,\l" .string "But if it gets enough ouchies,\l"
.string "it will turn sneaky!$" .string "it will turn sneaky!$"
BattleFrontier_Lounge5_Text_264A9B:: @ 8264A9B BattleFrontier_Lounge5_Text_NatureGirlHasty:: @ 8264A9B
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to battle!\n" .string "This one says it likes to battle!\n"
.string "It will battle even if it has a lot\l" .string "It will battle even if it has a lot\l"
.string "of ouchies!$" .string "of ouchies!$"
BattleFrontier_Lounge5_Text_264AF3:: @ 8264AF3 BattleFrontier_Lounge5_Text_NatureGirlSerious:: @ 8264AF3
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n" .string "This one says it likes to be sneaky!\n"
.string "It says it likes to be sneaky even\l" .string "It says it likes to be sneaky even\l"
.string "if it has a lot of ouchies!$" .string "if it has a lot of ouchies!$"
BattleFrontier_Lounge5_Text_264B5D:: @ 8264B5D BattleFrontier_Lounge5_Text_NatureGirlJolly:: @ 8264B5D
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n" .string "This one says it likes to be sneaky!\n"
.string "But if it gets enough ouchies,\l" .string "But if it gets enough ouchies,\l"
.string "it will worry about itself!$" .string "it will worry about itself!$"
BattleFrontier_Lounge5_Text_264BC3:: @ 8264BC3 BattleFrontier_Lounge5_Text_NatureGirlModest:: @ 8264BC3
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it looks after itself!\n" .string "This one says it looks after itself!\n"
.string "It says it worries about itself whether\l" .string "It says it worries about itself whether\l"
.string "or not it has a lot of ouchies!$" .string "or not it has a lot of ouchies!$"
BattleFrontier_Lounge5_Text_264C36:: @ 8264C36 BattleFrontier_Lounge5_Text_NatureGirlMild:: @ 8264C36
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it looks after itself!\n" .string "This one says it looks after itself!\n"
.string "But if it gets enough ouchies,\l" .string "But if it gets enough ouchies,\l"
.string "it will turn sneaky!$" .string "it will turn sneaky!$"
BattleFrontier_Lounge5_Text_264C95:: @ 8264C95 BattleFrontier_Lounge5_Text_NatureGirlBashful:: @ 8264C95
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it looks after itself!\n" .string "This one says it looks after itself!\n"
.string "It says it worries about itself even\l" .string "It says it worries about itself even\l"
.string "if it has a lot of ouchies!$" .string "if it has a lot of ouchies!$"
BattleFrontier_Lounge5_Text_264D01:: @ 8264D01 BattleFrontier_Lounge5_Text_NatureGirlRash:: @ 8264D01
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to be sneaky!\n" .string "This one says it likes to be sneaky!\n"
.string "It says it likes to be sneaky even\l" .string "It says it likes to be sneaky even\l"
.string "if it has a lot of ouchies!$" .string "if it has a lot of ouchies!$"
BattleFrontier_Lounge5_Text_264D6B:: @ 8264D6B BattleFrontier_Lounge5_Text_NatureGirlCalm:: @ 8264D6B
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it looks after itself!\n" .string "This one says it looks after itself!\n"
.string "It says it worries about itself even\l" .string "It says it worries about itself even\l"
.string "if it has a lot of ouchies!$" .string "if it has a lot of ouchies!$"
BattleFrontier_Lounge5_Text_264DD7:: @ 8264DD7 BattleFrontier_Lounge5_Text_NatureGirlGentle:: @ 8264DD7
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it looks after itself!\n" .string "This one says it looks after itself!\n"
.string "But if it gets enough ouchies,\l" .string "But if it gets enough ouchies,\l"
.string "it will hit back!$" .string "it will hit back!$"
BattleFrontier_Lounge5_Text_264E33:: @ 8264E33 BattleFrontier_Lounge5_Text_NatureGirlSassy:: @ 8264E33
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it likes to battle!\n" .string "This one says it likes to battle!\n"
.string "But if it gets enough ouchies,\l" .string "But if it gets enough ouchies,\l"
.string "it will turn sneaky!$" .string "it will turn sneaky!$"
BattleFrontier_Lounge5_Text_264E8F:: @ 8264E8F BattleFrontier_Lounge5_Text_NatureGirlCareful:: @ 8264E8F
.string "Hmhm…\p" .string "Hmhm…\p"
.string "This one says it looks after itself!\n" .string "This one says it looks after itself!\n"
.string "But if it gets enough ouchies,\l" .string "But if it gets enough ouchies,\l"
.string "it will turn sneaky!$" .string "it will turn sneaky!$"
BattleFrontier_Lounge5_Text_264EEE:: @ 8264EEE BattleFrontier_Lounge5_Text_NatureGirlEgg:: @ 8264EEE
.string "That's silly! An EGG is asleep!\n" .string "That's silly! An EGG is asleep!\n"
.string "I can't talk to it!$" .string "I can't talk to it!$"
data/specials.inc
+2 -2
View File
@@ -495,8 +495,8 @@ gSpecials:: @ 81DBA64
def_special StartMirageTowerShake def_special StartMirageTowerShake
def_special StartMirageTowerFossilFallAndSink def_special StartMirageTowerFossilFallAndSink
def_special ChangeBoxPokemonNickname def_special ChangeBoxPokemonNickname
def_special get_unknown_box_id def_special GetPCBoxToSendMon
def_special sub_813B21C def_special ShouldShowBoxWasFullMessage
def_special SetMatchCallRegisteredFlag def_special SetMatchCallRegisteredFlag
def_special sub_8175280 def_special sub_8175280
def_special CreateUnusualWeatherEvent def_special CreateUnusualWeatherEvent
include/constants/flags.h
+1 -1
View File
@@ -1400,7 +1400,7 @@
#define FLAG_ENABLE_SHIP_BIRTH_ISLAND (SYSTEM_FLAGS + 0x75) #define FLAG_ENABLE_SHIP_BIRTH_ISLAND (SYSTEM_FLAGS + 0x75)
#define FLAG_ENABLE_SHIP_FARAWAY_ISLAND (SYSTEM_FLAGS + 0x76) #define FLAG_ENABLE_SHIP_FARAWAY_ISLAND (SYSTEM_FLAGS + 0x76)
#define FLAG_SYS_STORAGE_UNKNOWN_FLAG (SYSTEM_FLAGS + 0x77) #define FLAG_SHOWN_BOX_WAS_FULL_MESSAGE (SYSTEM_FLAGS + 0x77)
#define FLAG_ARRIVED_ON_FARAWAY_ISLAND (SYSTEM_FLAGS + 0x78) #define FLAG_ARRIVED_ON_FARAWAY_ISLAND (SYSTEM_FLAGS + 0x78)
#define FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT (SYSTEM_FLAGS + 0x79) #define FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT (SYSTEM_FLAGS + 0x79)
include/constants/vars.h
+1 -1
View File
@@ -68,7 +68,7 @@
#define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 #define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034
#define VAR_DEOXYS_ROCK_LEVEL 0x4035 #define VAR_DEOXYS_ROCK_LEVEL 0x4035
#define VAR_STORAGE_UNKNOWN 0x4036 #define VAR_PC_BOX_TO_SEND_MON 0x4036
#define VAR_UNUSUAL_WEATHER_LOCATION 0x4037 #define VAR_UNUSUAL_WEATHER_LOCATION 0x4037
#define VAR_UNUSUAL_WEATHER_STEP_COUNTER 0x4038 #define VAR_UNUSUAL_WEATHER_STEP_COUNTER 0x4038
#define VAR_SHOULD_END_UNUSUAL_WEATHER 0x4039 #define VAR_SHOULD_END_UNUSUAL_WEATHER 0x4039
include/field_specials.h
+7 -7
View File
@@ -5,8 +5,8 @@ extern bool8 gBikeCyclingChallenge;
extern u8 gBikeCollisions; extern u8 gBikeCollisions;
u8 GetLeadMonIndex(void); u8 GetLeadMonIndex(void);
u8 sub_813B260(void); u8 IsDestinationBoxFull(void);
u16 get_unknown_box_id(void); u16 GetPCBoxToSendMon(void);
bool8 InMultiBattleRoom(void); bool8 InMultiBattleRoom(void);
void sub_813BF10(void); void sub_813BF10(void);
void IncrementBirthIslandRockStepCount(void); void IncrementBirthIslandRockStepCount(void);
@@ -23,13 +23,13 @@ void ShowScrollableMultichoice(void);
void FrontierGamblerSetWonOrLost(bool8 won); void FrontierGamblerSetWonOrLost(bool8 won);
u8 sub_813BADC(u8 a0); u8 sub_813BADC(u8 a0);
bool8 InPokemonCenter(void); bool8 InPokemonCenter(void);
void SetShoalItemFlag(u16 v0); void SetShoalItemFlag(u16 unused);
void UpdateFrontierManiac(u16 a0); void UpdateFrontierManiac(u16 daysSince);
void UpdateFrontierGambler(u16 a0); void UpdateFrontierGambler(u16 daysSince);
void ResetCyclingRoadChallengeData(void); void ResetCyclingRoadChallengeData(void);
bool8 UsedPokemonCenterWarp(void); bool8 UsedPokemonCenterWarp(void);
void ResetFanClub(void); void ResetFanClub(void);
bool8 sub_813B21C(void); bool8 ShouldShowBoxWasFullMessage(void);
void set_unknown_box_id(u8 id); void SetPCBoxToSendMon(u8 boxId);
#endif // GUARD_FIELD_SPECIALS_H #endif // GUARD_FIELD_SPECIALS_H
include/strings.h
+23 -25
View File
@@ -758,31 +758,29 @@ extern const u8 BattleFrontier_Lounge2_Text_26174D[];
extern const u8 BattleFrontier_Lounge2_Text_2617F9[]; extern const u8 BattleFrontier_Lounge2_Text_2617F9[];
extern const u8 BattleFrontier_Lounge2_Text_2618C4[]; extern const u8 BattleFrontier_Lounge2_Text_2618C4[];
extern const u8 BattleFrontier_Lounge5_Text_26468D[]; // Battle Frontier Nature Girl
extern const u8 BattleFrontier_Lounge5_Text_2646E5[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlHardy[];
extern const u8 BattleFrontier_Lounge5_Text_264741[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlLonely[];
extern const u8 BattleFrontier_Lounge5_Text_2647A4[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlBrave[];
extern const u8 BattleFrontier_Lounge5_Text_2647FC[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlAdamant[];
extern const u8 BattleFrontier_Lounge5_Text_264858[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlNaughty[];
extern const u8 BattleFrontier_Lounge5_Text_2648BE[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlBold[];
extern const u8 BattleFrontier_Lounge5_Text_264916[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky[];
extern const u8 BattleFrontier_Lounge5_Text_264972[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlRelaxed[];
extern const u8 BattleFrontier_Lounge5_Text_2649D5[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlImpish[];
extern const u8 BattleFrontier_Lounge5_Text_264A3F[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlLax[];
extern const u8 BattleFrontier_Lounge5_Text_264A9B[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlTimid[];
extern const u8 BattleFrontier_Lounge5_Text_264AF3[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlHasty[];
extern const u8 BattleFrontier_Lounge5_Text_264B5D[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlSerious[];
extern const u8 BattleFrontier_Lounge5_Text_2648BE[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlJolly[];
extern const u8 BattleFrontier_Lounge5_Text_264BC3[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlModest[];
extern const u8 BattleFrontier_Lounge5_Text_264C36[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlMild[];
extern const u8 BattleFrontier_Lounge5_Text_2648BE[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlBashful[];
extern const u8 BattleFrontier_Lounge5_Text_264C95[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlRash[];
extern const u8 BattleFrontier_Lounge5_Text_264D01[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlCalm[];
extern const u8 BattleFrontier_Lounge5_Text_264D6B[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlGentle[];
extern const u8 BattleFrontier_Lounge5_Text_264DD7[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlSassy[];
extern const u8 BattleFrontier_Lounge5_Text_264E33[]; extern const u8 BattleFrontier_Lounge5_Text_NatureGirlCareful[];
extern const u8 BattleFrontier_Lounge5_Text_264E8F[];
extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
extern const u8 BattleFrontier_Lounge3_Text_262261[]; extern const u8 BattleFrontier_Lounge3_Text_262261[];
extern const u8 BattleFrontier_Lounge3_Text_26230D[]; extern const u8 BattleFrontier_Lounge3_Text_26230D[];
src/battle_script_commands.c
+4 -4
View File
@@ -10227,17 +10227,17 @@ static void atkF0_givecaughtmon(void)
{ {
if (GiveMonToPlayer(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY) if (GiveMonToPlayer(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY)
{ {
if (!sub_813B21C()) if (!ShouldShowBoxWasFullMessage())
{ {
gBattleCommunication[MULTISTRING_CHOOSER] = 0; gBattleCommunication[MULTISTRING_CHOOSER] = 0;
StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN))); StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON)));
GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2); GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
} }
else else
{ {
StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN))); StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON))); // box the mon was sent to
GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2); GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
StringCopy(gStringVar3, GetBoxNamePtr(get_unknown_box_id())); StringCopy(gStringVar3, GetBoxNamePtr(GetPCBoxToSendMon())); //box the mon was going to be sent to
gBattleCommunication[MULTISTRING_CHOOSER] = 2; gBattleCommunication[MULTISTRING_CHOOSER] = 2;
} }
src/data/pokemon/tutor_learnsets.h
+1 -1
View File
@@ -1,4 +1,4 @@
const u16 gTutorMoves[] = const u16 gTutorMoves[TUTOR_MOVE_COUNT] =
{ {
[TUTOR_MOVE_MEGA_PUNCH] = MOVE_MEGA_PUNCH, [TUTOR_MOVE_MEGA_PUNCH] = MOVE_MEGA_PUNCH,
[TUTOR_MOVE_SWORDS_DANCE] = MOVE_SWORDS_DANCE, [TUTOR_MOVE_SWORDS_DANCE] = MOVE_SWORDS_DANCE,
src/field_specials.c
+132 -132
View File
@@ -66,20 +66,20 @@
EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE; EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE;
EWRAM_DATA u8 gBikeCollisions = 0; EWRAM_DATA u8 gBikeCollisions = 0;
static EWRAM_DATA u32 gBikeCyclingTimer = 0; static EWRAM_DATA u32 sBikeCyclingTimer = 0;
static EWRAM_DATA u8 gUnknown_0203AB5C = 0; static EWRAM_DATA u8 sUnknown_0203AB5C = 0;
static EWRAM_DATA u8 sPetalburgGymSlidingDoorFrameCounter = 0; static EWRAM_DATA u8 sPetalburgGymSlidingDoorFrameCounter = 0;
static EWRAM_DATA u8 gTutorMoveAndElevatorWindowId = 0; static EWRAM_DATA u8 sTutorMoveAndElevatorWindowId = 0;
static EWRAM_DATA u16 gLilycoveDeptStore_NeverRead = 0; static EWRAM_DATA u16 sLilycoveDeptStore_NeverRead = 0;
static EWRAM_DATA u16 gLilycoveDeptStore_DefaultFloorChoice = 0; static EWRAM_DATA u16 sLilycoveDeptStore_DefaultFloorChoice = 0;
static EWRAM_DATA struct ListMenuItem *gScrollableMultichoice_ListMenuItem = NULL; static EWRAM_DATA struct ListMenuItem *sScrollableMultichoice_ListMenuItem = NULL;
static EWRAM_DATA u16 gScrollableMultichoice_ScrollOffset = 0; static EWRAM_DATA u16 sScrollableMultichoice_ScrollOffset = 0;
static EWRAM_DATA u16 gFrontierExchangeCorner_NeverRead = 0; static EWRAM_DATA u16 sFrontierExchangeCorner_NeverRead = 0;
static EWRAM_DATA u8 gScrollableMultichoice_ItemSpriteId = 0; static EWRAM_DATA u8 sScrollableMultichoice_ItemSpriteId = 0;
static EWRAM_DATA u8 gBattlePointsWindowId = 0; static EWRAM_DATA u8 sBattlePointsWindowId = 0;
static EWRAM_DATA u8 gFrontierExchangeCorner_ItemIconWindowId = 0; static EWRAM_DATA u8 sFrontierExchangeCorner_ItemIconWindowId = 0;
static EWRAM_DATA u8 gUnknown_0203AB6F = 0; static EWRAM_DATA u8 sPCBoxToSendMon = 0;
static EWRAM_DATA u32 gUnknown_0203AB70 = 0; static EWRAM_DATA u32 sUnknown_0203AB70 = 0;
struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate; struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate;
@@ -149,14 +149,14 @@ void ResetCyclingRoadChallengeData(void)
{ {
gBikeCyclingChallenge = FALSE; gBikeCyclingChallenge = FALSE;
gBikeCollisions = 0; gBikeCollisions = 0;
gBikeCyclingTimer = 0; sBikeCyclingTimer = 0;
} }
void Special_BeginCyclingRoadChallenge(void) void Special_BeginCyclingRoadChallenge(void)
{ {
gBikeCyclingChallenge = TRUE; gBikeCyclingChallenge = TRUE;
gBikeCollisions = 0; gBikeCollisions = 0;
gBikeCyclingTimer = gMain.vblankCounter1; sBikeCyclingTimer = gMain.vblankCounter1;
} }
u16 GetPlayerAvatarBike(void) u16 GetPlayerAvatarBike(void)
@@ -242,7 +242,7 @@ static void DetermineCyclingRoadResults(u32 numFrames, u8 numBikeCollisions)
} }
void FinishCyclingRoadChallenge(void) { void FinishCyclingRoadChallenge(void) {
const u32 numFrames = gMain.vblankCounter1 - gBikeCyclingTimer; const u32 numFrames = gMain.vblankCounter1 - sBikeCyclingTimer;
DetermineCyclingRoadResults(numFrames, gBikeCollisions); DetermineCyclingRoadResults(numFrames, gBikeCollisions);
RecordCyclingRoadResults(numFrames, gBikeCollisions); RecordCyclingRoadResults(numFrames, gBikeCollisions);
@@ -587,8 +587,8 @@ void SpawnLinkPartnerEventObject(void)
linkSpriteId = EVENT_OBJ_GFX_RIVAL_MAY_NORMAL; linkSpriteId = EVENT_OBJ_GFX_RIVAL_MAY_NORMAL;
break; break;
} }
SpawnSpecialEventObjectParameterized(linkSpriteId, movementTypes[j], 0xf0 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0); SpawnSpecialEventObjectParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0);
LoadLinkPartnerEventObjectSpritePalette(linkSpriteId, 0xf0 - i, i); LoadLinkPartnerEventObjectSpritePalette(linkSpriteId, 240 - i, i);
j++; j++;
if (j == MAX_LINK_PLAYERS) if (j == MAX_LINK_PLAYERS)
{ {
@@ -825,7 +825,7 @@ static const u16 sPetalburgGymSlidingDoorMetatiles[] = {
void PetalburgGymSpecial1(void) void PetalburgGymSpecial1(void)
{ {
gUnknown_0203AB5C = 0; sUnknown_0203AB5C = 0;
sPetalburgGymSlidingDoorFrameCounter = 0; sPetalburgGymSlidingDoorFrameCounter = 0;
PlaySE(SE_KI_GASYAN); PlaySE(SE_KI_GASYAN);
CreateTask(Task_PetalburgGym, 8); CreateTask(Task_PetalburgGym, 8);
@@ -833,10 +833,10 @@ void PetalburgGymSpecial1(void)
static void Task_PetalburgGym(u8 taskId) static void Task_PetalburgGym(u8 taskId)
{ {
if (gUnknown_085B2B78[sPetalburgGymSlidingDoorFrameCounter] == gUnknown_0203AB5C) if (gUnknown_085B2B78[sPetalburgGymSlidingDoorFrameCounter] == sUnknown_0203AB5C)
{ {
PetalburgGymFunc(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[sPetalburgGymSlidingDoorFrameCounter]); PetalburgGymFunc(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[sPetalburgGymSlidingDoorFrameCounter]);
gUnknown_0203AB5C = 0; sUnknown_0203AB5C = 0;
if ((++sPetalburgGymSlidingDoorFrameCounter) == ARRAY_COUNT(sPetalburgGymSlidingDoorMetatiles)) if ((++sPetalburgGymSlidingDoorFrameCounter) == ARRAY_COUNT(sPetalburgGymSlidingDoorMetatiles))
{ {
DestroyTask(taskId); DestroyTask(taskId);
@@ -845,7 +845,7 @@ static void Task_PetalburgGym(u8 taskId)
} }
else else
{ {
gUnknown_0203AB5C++; sUnknown_0203AB5C++;
} }
} }
@@ -1088,10 +1088,10 @@ static void PCTurnOnEffect_0(struct Task *task)
task->data[3]++; task->data[3]++;
} }
static void PCTurnOnEffect_1(s16 pcOff, s8 dx, s8 dy) static void PCTurnOnEffect_1(s16 isPcTurnedOn, s8 dx, s8 dy)
{ {
u16 tileId = 0; u16 tileId = 0;
if (pcOff != 0) if (isPcTurnedOn)
{ {
if (gSpecialVar_0x8004 == PC_LOCATION_OTHER) if (gSpecialVar_0x8004 == PC_LOCATION_OTHER)
{ {
@@ -1337,11 +1337,11 @@ void BufferEReaderTrainerName(void)
u16 GetSlotMachineId(void) u16 GetSlotMachineId(void)
{ {
static const u8 sSlotMachineRandomSeed[] = {12, 2, 4, 5, 1, 8, 7, 11, 3, 10, 9, 6}; static const u8 sSlotMachineRandomSeeds[] = {12, 2, 4, 5, 1, 8, 7, 11, 3, 10, 9, 6};
static const u8 sSlotMachineIds[] = {0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5}; static const u8 sSlotMachineIds[] = {0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5};
static const u8 sSlotMachineServiceDayIds[] = {3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5}; static const u8 sSlotMachineServiceDayIds[] = {3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5};
u32 rnd = gSaveBlock1Ptr->easyChatPairs[0].unk0_0 + gSaveBlock1Ptr->easyChatPairs[0].unk2 + sSlotMachineRandomSeed[gSpecialVar_0x8004]; u32 rnd = gSaveBlock1Ptr->easyChatPairs[0].unk0_0 + gSaveBlock1Ptr->easyChatPairs[0].unk2 + sSlotMachineRandomSeeds[gSpecialVar_0x8004];
if (GetPriceReduction(POKENEWS_GAME_CORNER)) if (GetPriceReduction(POKENEWS_GAME_CORNER))
{ {
return sSlotMachineServiceDayIds[rnd % SLOT_MACHINE_COUNT]; return sSlotMachineServiceDayIds[rnd % SLOT_MACHINE_COUNT];
@@ -1444,7 +1444,7 @@ u8 TryUpdateRusturfTunnelState(void)
return FALSE; return FALSE;
} }
void SetShoalItemFlag(u16 v0) void SetShoalItemFlag(u16 unused)
{ {
FlagSet(FLAG_SYS_SHOAL_ITEM); FlagSet(FLAG_SYS_SHOAL_ITEM);
} }
@@ -1805,37 +1805,37 @@ void SetDeptStoreFloor(void)
u16 GetDeptStoreDefaultFloorChoice(void) u16 GetDeptStoreDefaultFloorChoice(void)
{ {
gLilycoveDeptStore_NeverRead = 0; sLilycoveDeptStore_NeverRead = 0;
gLilycoveDeptStore_DefaultFloorChoice = 0; sLilycoveDeptStore_DefaultFloorChoice = 0;
if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(LILYCOVE_CITY_DEPARTMENT_STORE_1F)) if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(LILYCOVE_CITY_DEPARTMENT_STORE_1F))
{ {
switch (gSaveBlock1Ptr->dynamicWarp.mapNum) switch (gSaveBlock1Ptr->dynamicWarp.mapNum)
{ {
case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_5F): case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_5F):
gLilycoveDeptStore_NeverRead = 0; sLilycoveDeptStore_NeverRead = 0;
gLilycoveDeptStore_DefaultFloorChoice = 0; sLilycoveDeptStore_DefaultFloorChoice = 0;
break; break;
case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_4F): case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_4F):
gLilycoveDeptStore_NeverRead = 0; sLilycoveDeptStore_NeverRead = 0;
gLilycoveDeptStore_DefaultFloorChoice = 1; sLilycoveDeptStore_DefaultFloorChoice = 1;
break; break;
case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_3F): case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_3F):
gLilycoveDeptStore_NeverRead = 0; sLilycoveDeptStore_NeverRead = 0;
gLilycoveDeptStore_DefaultFloorChoice = 2; sLilycoveDeptStore_DefaultFloorChoice = 2;
break; break;
case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_2F): case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_2F):
gLilycoveDeptStore_NeverRead = 0; sLilycoveDeptStore_NeverRead = 0;
gLilycoveDeptStore_DefaultFloorChoice = 3; sLilycoveDeptStore_DefaultFloorChoice = 3;
break; break;
case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_1F): case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_1F):
gLilycoveDeptStore_NeverRead = 0; sLilycoveDeptStore_NeverRead = 0;
gLilycoveDeptStore_DefaultFloorChoice = 4; sLilycoveDeptStore_DefaultFloorChoice = 4;
break; break;
} }
} }
return gLilycoveDeptStore_DefaultFloorChoice; return sLilycoveDeptStore_DefaultFloorChoice;
} }
void MoveElevator(void) void MoveElevator(void)
@@ -1897,23 +1897,23 @@ void ShowDeptStoreElevatorFloorSelect(void)
{ {
int xPos; int xPos;
gTutorMoveAndElevatorWindowId = AddWindow(&gElevatorFloor_WindowTemplate); sTutorMoveAndElevatorWindowId = AddWindow(&gElevatorFloor_WindowTemplate);
SetStandardWindowBorderStyle(gTutorMoveAndElevatorWindowId, 0); SetStandardWindowBorderStyle(sTutorMoveAndElevatorWindowId, 0);
xPos = GetStringCenterAlignXOffset(1, gText_ElevatorNowOn, 64); xPos = GetStringCenterAlignXOffset(1, gText_ElevatorNowOn, 64);
AddTextPrinterParameterized(gTutorMoveAndElevatorWindowId, 1, gText_ElevatorNowOn, xPos, 1, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(sTutorMoveAndElevatorWindowId, 1, gText_ElevatorNowOn, xPos, 1, TEXT_SPEED_FF, NULL);
xPos = GetStringCenterAlignXOffset(1, gDeptStoreFloorNames[gSpecialVar_0x8005], 64); xPos = GetStringCenterAlignXOffset(1, gDeptStoreFloorNames[gSpecialVar_0x8005], 64);
AddTextPrinterParameterized(gTutorMoveAndElevatorWindowId, 1, gDeptStoreFloorNames[gSpecialVar_0x8005], xPos, 17, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(sTutorMoveAndElevatorWindowId, 1, gDeptStoreFloorNames[gSpecialVar_0x8005], xPos, 17, TEXT_SPEED_FF, NULL);
PutWindowTilemap(gTutorMoveAndElevatorWindowId); PutWindowTilemap(sTutorMoveAndElevatorWindowId);
CopyWindowToVram(gTutorMoveAndElevatorWindowId, 3); CopyWindowToVram(sTutorMoveAndElevatorWindowId, 3);
} }
void CloseDeptStoreElevatorWindow(void) void CloseDeptStoreElevatorWindow(void)
{ {
ClearStdWindowAndFrameToTransparent(gTutorMoveAndElevatorWindowId, TRUE); ClearStdWindowAndFrameToTransparent(sTutorMoveAndElevatorWindowId, TRUE);
RemoveWindow(gTutorMoveAndElevatorWindowId); RemoveWindow(sTutorMoveAndElevatorWindowId);
} }
static void MoveElevatorWindowLights(u16 floorDelta, bool8 descending) static void MoveElevatorWindowLights(u16 floorDelta, bool8 descending)
@@ -2571,19 +2571,19 @@ static void Task_ShowScrollableMultichoice(u8 taskId)
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
ScriptContext2_Enable(); ScriptContext2_Enable();
gScrollableMultichoice_ScrollOffset = 0; sScrollableMultichoice_ScrollOffset = 0;
gScrollableMultichoice_ItemSpriteId = MAX_SPRITES; sScrollableMultichoice_ItemSpriteId = MAX_SPRITES;
FillFrontierExchangeCornerWindowAndItemIcon(task->data[11], 0); FillFrontierExchangeCornerWindowAndItemIcon(task->data[11], 0);
ShowBattleFrontierTutorWindow(task->data[11], 0); ShowBattleFrontierTutorWindow(task->data[11], 0);
gScrollableMultichoice_ListMenuItem = AllocZeroed(task->data[1] * 8); sScrollableMultichoice_ListMenuItem = AllocZeroed(task->data[1] * 8);
gFrontierExchangeCorner_NeverRead = 0; sFrontierExchangeCorner_NeverRead = 0;
InitScrollableMultichoice(); InitScrollableMultichoice();
for (unk1 = 0, i = 0; i < task->data[1]; i++) for (unk1 = 0, i = 0; i < task->data[1]; i++)
{ {
const u8 *text = sScrollableMenuOptions[gSpecialVar_0x8004][i]; const u8 *text = sScrollableMenuOptions[gSpecialVar_0x8004][i];
gScrollableMultichoice_ListMenuItem[i].name = text; sScrollableMultichoice_ListMenuItem[i].name = text;
gScrollableMultichoice_ListMenuItem[i].id = i; sScrollableMultichoice_ListMenuItem[i].id = i;
unk1 = display_text_and_get_width(text, unk1); unk1 = display_text_and_get_width(text, unk1);
} }
@@ -2619,7 +2619,7 @@ static void Task_ShowScrollableMultichoice(u8 taskId)
static void InitScrollableMultichoice(void) static void InitScrollableMultichoice(void)
{ {
gScrollableMultichoice_ListMenuTemplate.items = gScrollableMultichoice_ListMenuItem; gScrollableMultichoice_ListMenuTemplate.items = sScrollableMultichoice_ListMenuItem;
gScrollableMultichoice_ListMenuTemplate.moveCursorFunc = ScrollableMultichoice_MoveCursor; gScrollableMultichoice_ListMenuTemplate.moveCursorFunc = ScrollableMultichoice_MoveCursor;
gScrollableMultichoice_ListMenuTemplate.itemPrintFunc = NULL; gScrollableMultichoice_ListMenuTemplate.itemPrintFunc = NULL;
gScrollableMultichoice_ListMenuTemplate.totalItems = 1; gScrollableMultichoice_ListMenuTemplate.totalItems = 1;
@@ -2649,12 +2649,12 @@ static void ScrollableMultichoice_MoveCursor(s32 itemIndex, bool8 onInit, struct
u16 selection; u16 selection;
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
ListMenuGetScrollAndRow(task->data[14], &selection, NULL); ListMenuGetScrollAndRow(task->data[14], &selection, NULL);
gScrollableMultichoice_ScrollOffset = selection; sScrollableMultichoice_ScrollOffset = selection;
ListMenuGetCurrentItemArrayId(task->data[14], &selection); ListMenuGetCurrentItemArrayId(task->data[14], &selection);
HideFrontierExchangeCornerItemIcon(task->data[11], gFrontierExchangeCorner_NeverRead); HideFrontierExchangeCornerItemIcon(task->data[11], sFrontierExchangeCorner_NeverRead);
FillFrontierExchangeCornerWindowAndItemIcon(task->data[11], selection); FillFrontierExchangeCornerWindowAndItemIcon(task->data[11], selection);
ShowBattleFrontierTutorMoveDescription(task->data[11], selection); ShowBattleFrontierTutorMoveDescription(task->data[11], selection);
gFrontierExchangeCorner_NeverRead = selection; sFrontierExchangeCorner_NeverRead = selection;
} }
} }
@@ -2701,7 +2701,7 @@ static void CloseScrollableMultichoice(u8 taskId)
HideFrontierExchangeCornerItemIcon(task->data[11], selection); HideFrontierExchangeCornerItemIcon(task->data[11], selection);
ScrollableMultichoice_RemoveScrollArrows(taskId); ScrollableMultichoice_RemoveScrollArrows(taskId);
DestroyListMenuTask(task->data[14], NULL, NULL); DestroyListMenuTask(task->data[14], NULL, NULL);
Free(gScrollableMultichoice_ListMenuItem); Free(sScrollableMultichoice_ListMenuItem);
ClearStdWindowAndFrameToTransparent(task->data[13], 1); ClearStdWindowAndFrameToTransparent(task->data[13], 1);
FillWindowPixelBuffer(task->data[13], PIXEL_FILL(0)); FillWindowPixelBuffer(task->data[13], PIXEL_FILL(0));
CopyWindowToVram(task->data[13], 2); CopyWindowToVram(task->data[13], 2);
@@ -2771,7 +2771,7 @@ static void ScrollableMultichoice_UpdateScrollArrows(u8 taskId)
template.secondY = task->data[5] * 8 + 10; template.secondY = task->data[5] * 8 + 10;
template.fullyUpThreshold = 0; template.fullyUpThreshold = 0;
template.fullyDownThreshold = task->data[1] - task->data[0]; template.fullyDownThreshold = task->data[1] - task->data[0];
task->data[12] = AddScrollIndicatorArrowPair(&template, &gScrollableMultichoice_ScrollOffset); task->data[12] = AddScrollIndicatorArrowPair(&template, &sScrollableMultichoice_ScrollOffset);
} }
} }
@@ -2825,31 +2825,31 @@ void SetBattleTowerLinkPlayerGfx(void)
void ShowNatureGirlMessage(void) void ShowNatureGirlMessage(void)
{ {
static const u8 *const sNatureGirlMessages[] = { static const u8 *const sNatureGirlMessages[] = {
[NATURE_HARDY] = BattleFrontier_Lounge5_Text_26468D, [NATURE_HARDY] = BattleFrontier_Lounge5_Text_NatureGirlHardy,
[NATURE_LONELY] = BattleFrontier_Lounge5_Text_2646E5, [NATURE_LONELY] = BattleFrontier_Lounge5_Text_NatureGirlLonely,
[NATURE_BRAVE] = BattleFrontier_Lounge5_Text_264741, [NATURE_BRAVE] = BattleFrontier_Lounge5_Text_NatureGirlBrave,
[NATURE_ADAMANT] = BattleFrontier_Lounge5_Text_2647A4, [NATURE_ADAMANT] = BattleFrontier_Lounge5_Text_NatureGirlAdamant,
[NATURE_NAUGHTY] = BattleFrontier_Lounge5_Text_2647FC, [NATURE_NAUGHTY] = BattleFrontier_Lounge5_Text_NatureGirlNaughty,
[NATURE_BOLD] = BattleFrontier_Lounge5_Text_264858, [NATURE_BOLD] = BattleFrontier_Lounge5_Text_NatureGirlBold,
[NATURE_DOCILE] = BattleFrontier_Lounge5_Text_2648BE, [NATURE_DOCILE] = BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky,
[NATURE_RELAXED] = BattleFrontier_Lounge5_Text_264916, [NATURE_RELAXED] = BattleFrontier_Lounge5_Text_NatureGirlRelaxed,
[NATURE_IMPISH] = BattleFrontier_Lounge5_Text_264972, [NATURE_IMPISH] = BattleFrontier_Lounge5_Text_NatureGirlImpish,
[NATURE_LAX] = BattleFrontier_Lounge5_Text_2649D5, [NATURE_LAX] = BattleFrontier_Lounge5_Text_NatureGirlLax,
[NATURE_TIMID] = BattleFrontier_Lounge5_Text_264A3F, [NATURE_TIMID] = BattleFrontier_Lounge5_Text_NatureGirlTimid,
[NATURE_HASTY] = BattleFrontier_Lounge5_Text_264A9B, [NATURE_HASTY] = BattleFrontier_Lounge5_Text_NatureGirlHasty,
[NATURE_SERIOUS] = BattleFrontier_Lounge5_Text_264AF3, [NATURE_SERIOUS] = BattleFrontier_Lounge5_Text_NatureGirlSerious,
[NATURE_JOLLY] = BattleFrontier_Lounge5_Text_264B5D, [NATURE_JOLLY] = BattleFrontier_Lounge5_Text_NatureGirlJolly,
[NATURE_NAIVE] = BattleFrontier_Lounge5_Text_2648BE, [NATURE_NAIVE] = BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky,
[NATURE_MODEST] = BattleFrontier_Lounge5_Text_264BC3, [NATURE_MODEST] = BattleFrontier_Lounge5_Text_NatureGirlModest,
[NATURE_MILD] = BattleFrontier_Lounge5_Text_264C36, [NATURE_MILD] = BattleFrontier_Lounge5_Text_NatureGirlMild,
[NATURE_QUIET] = BattleFrontier_Lounge5_Text_2648BE, [NATURE_QUIET] = BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky,
[NATURE_BASHFUL] = BattleFrontier_Lounge5_Text_264C95, [NATURE_BASHFUL] = BattleFrontier_Lounge5_Text_NatureGirlBashful,
[NATURE_RASH] = BattleFrontier_Lounge5_Text_264D01, [NATURE_RASH] = BattleFrontier_Lounge5_Text_NatureGirlRash,
[NATURE_CALM] = BattleFrontier_Lounge5_Text_264D6B, [NATURE_CALM] = BattleFrontier_Lounge5_Text_NatureGirlCalm,
[NATURE_GENTLE] = BattleFrontier_Lounge5_Text_264DD7, [NATURE_GENTLE] = BattleFrontier_Lounge5_Text_NatureGirlGentle,
[NATURE_SASSY] = BattleFrontier_Lounge5_Text_264E33, [NATURE_SASSY] = BattleFrontier_Lounge5_Text_NatureGirlSassy,
[NATURE_CAREFUL] = BattleFrontier_Lounge5_Text_264E8F, [NATURE_CAREFUL] = BattleFrontier_Lounge5_Text_NatureGirlCareful,
[NATURE_QUIRKY] = BattleFrontier_Lounge5_Text_2648BE, [NATURE_QUIRKY] = BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky,
}; };
u8 nature; u8 nature;
@@ -2940,7 +2940,7 @@ void FrontierGamblerSetWonOrLost(bool8 won)
{ {
if (sFrontierChallenges[challenge] == FRONTIER_CHALLENGE(frontierFacilityId, battleMode)) if (sFrontierChallenges[challenge] == FRONTIER_CHALLENGE(frontierFacilityId, battleMode))
{ {
if (won != FALSE) if (won)
{ {
VarSet(VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WON); VarSet(VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WON);
} }
@@ -2958,7 +2958,7 @@ void UpdateBattlePointsWindow(void)
u32 x; u32 x;
StringCopy(ConvertIntToDecimalStringN(string, gSaveBlock2Ptr->frontier.battlePoints, STR_CONV_MODE_RIGHT_ALIGN, 4), gText_BP); StringCopy(ConvertIntToDecimalStringN(string, gSaveBlock2Ptr->frontier.battlePoints, STR_CONV_MODE_RIGHT_ALIGN, 4), gText_BP);
x = GetStringRightAlignXOffset(1, string, 48); x = GetStringRightAlignXOffset(1, string, 48);
AddTextPrinterParameterized(gBattlePointsWindowId, 1, string, x, 1, 0, NULL); AddTextPrinterParameterized(sBattlePointsWindowId, 1, string, x, 1, 0, NULL);
} }
void ShowBattlePointsWindow(void) void ShowBattlePointsWindow(void)
@@ -2973,16 +2973,16 @@ void ShowBattlePointsWindow(void)
.baseBlock = 8, .baseBlock = 8,
}; };
gBattlePointsWindowId = AddWindow(&sBattlePoints_WindowTemplate); sBattlePointsWindowId = AddWindow(&sBattlePoints_WindowTemplate);
SetStandardWindowBorderStyle(gBattlePointsWindowId, 0); SetStandardWindowBorderStyle(sBattlePointsWindowId, 0);
UpdateBattlePointsWindow(); UpdateBattlePointsWindow();
CopyWindowToVram(gBattlePointsWindowId, 2); CopyWindowToVram(sBattlePointsWindowId, 2);
} }
void CloseBattlePointsWindow(void) void CloseBattlePointsWindow(void)
{ {
ClearStdWindowAndFrameToTransparent(gBattlePointsWindowId, TRUE); ClearStdWindowAndFrameToTransparent(sBattlePointsWindowId, TRUE);
RemoveWindow(gBattlePointsWindowId); RemoveWindow(sBattlePointsWindowId);
} }
void TakeFrontierBattlePoints(void) void TakeFrontierBattlePoints(void)
@@ -3026,15 +3026,15 @@ void ShowFrontierExchangeCornerItemIconWindow(void)
.baseBlock = 20, .baseBlock = 20,
}; };
gFrontierExchangeCorner_ItemIconWindowId = AddWindow(&sFrontierExchangeCorner_ItemIconWindowTemplate); sFrontierExchangeCorner_ItemIconWindowId = AddWindow(&sFrontierExchangeCorner_ItemIconWindowTemplate);
SetStandardWindowBorderStyle(gFrontierExchangeCorner_ItemIconWindowId, 0); SetStandardWindowBorderStyle(sFrontierExchangeCorner_ItemIconWindowId, 0);
CopyWindowToVram(gFrontierExchangeCorner_ItemIconWindowId, 2); CopyWindowToVram(sFrontierExchangeCorner_ItemIconWindowId, 2);
} }
void CloseFrontierExchangeCornerItemIconWindow(void) void CloseFrontierExchangeCornerItemIconWindow(void)
{ {
ClearStdWindowAndFrameToTransparent(gFrontierExchangeCorner_ItemIconWindowId, TRUE); ClearStdWindowAndFrameToTransparent(sFrontierExchangeCorner_ItemIconWindowId, TRUE);
RemoveWindow(gFrontierExchangeCorner_ItemIconWindowId); RemoveWindow(sFrontierExchangeCorner_ItemIconWindowId);
} }
static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection) static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
@@ -3056,7 +3056,7 @@ static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
{ {
FreeSpriteTilesByTag(5500); FreeSpriteTilesByTag(5500);
FreeSpritePaletteByTag(5500); FreeSpritePaletteByTag(5500);
gScrollableMultichoice_ItemSpriteId = AddDecorationIconObject(sFrontierExchangeCorner_Decor1[selection], 33, 88, 0, 5500, 5500); sScrollableMultichoice_ItemSpriteId = AddDecorationIconObject(sFrontierExchangeCorner_Decor1[selection], 33, 88, 0, 5500, 5500);
} }
break; break;
case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2: case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2:
@@ -3069,7 +3069,7 @@ static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
{ {
FreeSpriteTilesByTag(5500); FreeSpriteTilesByTag(5500);
FreeSpritePaletteByTag(5500); FreeSpritePaletteByTag(5500);
gScrollableMultichoice_ItemSpriteId = AddDecorationIconObject(sFrontierExchangeCorner_Decor2[selection], 33, 88, 0, 5500, 5500); sScrollableMultichoice_ItemSpriteId = AddDecorationIconObject(sFrontierExchangeCorner_Decor2[selection], 33, 88, 0, 5500, 5500);
} }
break; break;
case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR: case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR:
@@ -3088,19 +3088,19 @@ static void ShowFrontierExchangeCornerItemIcon(u16 item)
{ {
FreeSpriteTilesByTag(5500); FreeSpriteTilesByTag(5500);
FreeSpritePaletteByTag(5500); FreeSpritePaletteByTag(5500);
gScrollableMultichoice_ItemSpriteId = AddItemIconSprite(5500, 5500, item); sScrollableMultichoice_ItemSpriteId = AddItemIconSprite(5500, 5500, item);
if (gScrollableMultichoice_ItemSpriteId != MAX_SPRITES) if (sScrollableMultichoice_ItemSpriteId != MAX_SPRITES)
{ {
gSprites[gScrollableMultichoice_ItemSpriteId].oam.priority = 0; gSprites[sScrollableMultichoice_ItemSpriteId].oam.priority = 0;
gSprites[gScrollableMultichoice_ItemSpriteId].pos1.x = 36; gSprites[sScrollableMultichoice_ItemSpriteId].pos1.x = 36;
gSprites[gScrollableMultichoice_ItemSpriteId].pos1.y = 92; gSprites[sScrollableMultichoice_ItemSpriteId].pos1.y = 92;
} }
} }
static void HideFrontierExchangeCornerItemIcon(u16 menu, u16 unused) static void HideFrontierExchangeCornerItemIcon(u16 menu, u16 unused)
{ {
if (gScrollableMultichoice_ItemSpriteId != MAX_SPRITES) if (sScrollableMultichoice_ItemSpriteId != MAX_SPRITES)
{ {
switch (menu) switch (menu)
{ {
@@ -3108,10 +3108,10 @@ static void HideFrontierExchangeCornerItemIcon(u16 menu, u16 unused)
case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2: case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2:
case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR: case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR:
case SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR: case SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR:
DestroySpriteAndFreeResources(&gSprites[gScrollableMultichoice_ItemSpriteId]); DestroySpriteAndFreeResources(&gSprites[sScrollableMultichoice_ItemSpriteId]);
break; break;
} }
gScrollableMultichoice_ItemSpriteId = MAX_SPRITES; sScrollableMultichoice_ItemSpriteId = MAX_SPRITES;
} }
} }
@@ -3172,8 +3172,8 @@ static void ShowBattleFrontierTutorWindow(u8 menu, u16 selection)
{ {
if (gSpecialVar_0x8006 == 0) if (gSpecialVar_0x8006 == 0)
{ {
gTutorMoveAndElevatorWindowId = AddWindow(&sBattleFrontierTutor_WindowTemplate); sTutorMoveAndElevatorWindowId = AddWindow(&sBattleFrontierTutor_WindowTemplate);
SetStandardWindowBorderStyle(gTutorMoveAndElevatorWindowId, 0); SetStandardWindowBorderStyle(sTutorMoveAndElevatorWindowId, 0);
} }
ShowBattleFrontierTutorMoveDescription(menu, selection); ShowBattleFrontierTutorMoveDescription(menu, selection);
} }
@@ -3213,22 +3213,22 @@ static void ShowBattleFrontierTutorMoveDescription(u8 menu, u16 selection)
if (menu == SCROLL_MULTI_BF_MOVE_TUTOR_1 || menu == SCROLL_MULTI_BF_MOVE_TUTOR_2) if (menu == SCROLL_MULTI_BF_MOVE_TUTOR_1 || menu == SCROLL_MULTI_BF_MOVE_TUTOR_2)
{ {
FillWindowPixelRect(gTutorMoveAndElevatorWindowId, PIXEL_FILL(1), 0, 0, 96, 48); FillWindowPixelRect(sTutorMoveAndElevatorWindowId, PIXEL_FILL(1), 0, 0, 96, 48);
if (menu == SCROLL_MULTI_BF_MOVE_TUTOR_2) if (menu == SCROLL_MULTI_BF_MOVE_TUTOR_2)
{ {
AddTextPrinterParameterized(gTutorMoveAndElevatorWindowId, 1, sBattleFrontier_TutorMoveDescriptions2[selection], 0, 1, 0, NULL); AddTextPrinterParameterized(sTutorMoveAndElevatorWindowId, 1, sBattleFrontier_TutorMoveDescriptions2[selection], 0, 1, 0, NULL);
} }
else else
{ {
AddTextPrinterParameterized(gTutorMoveAndElevatorWindowId, 1, sBattleFrontier_TutorMoveDescriptions1[selection], 0, 1, 0, NULL); AddTextPrinterParameterized(sTutorMoveAndElevatorWindowId, 1, sBattleFrontier_TutorMoveDescriptions1[selection], 0, 1, 0, NULL);
} }
} }
} }
void CloseBattleFrontierTutorWindow(void) void CloseBattleFrontierTutorWindow(void)
{ {
ClearStdWindowAndFrameToTransparent(gTutorMoveAndElevatorWindowId, TRUE); ClearStdWindowAndFrameToTransparent(sTutorMoveAndElevatorWindowId, TRUE);
RemoveWindow(gTutorMoveAndElevatorWindowId); RemoveWindow(sTutorMoveAndElevatorWindowId);
} }
// Never called // Never called
@@ -3300,7 +3300,7 @@ void sub_813AF48(void)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
DestroyListMenuTask(task->data[14], NULL, NULL); DestroyListMenuTask(task->data[14], NULL, NULL);
Free(gScrollableMultichoice_ListMenuItem); Free(sScrollableMultichoice_ListMenuItem);
ClearStdWindowAndFrameToTransparent(task->data[13], TRUE); ClearStdWindowAndFrameToTransparent(task->data[13], TRUE);
FillWindowPixelBuffer(task->data[13], PIXEL_FILL(0)); FillWindowPixelBuffer(task->data[13], PIXEL_FILL(0));
ClearWindowTilemap(task->data[13]); ClearWindowTilemap(task->data[13]);
@@ -3444,47 +3444,47 @@ void sub_813B1D0(void)
BlendPalettes(0x04000000, 16, 0); BlendPalettes(0x04000000, 16, 0);
} }
void set_unknown_box_id(u8 id) void SetPCBoxToSendMon(u8 boxId)
{ {
gUnknown_0203AB6F = id; sPCBoxToSendMon = boxId;
} }
u16 get_unknown_box_id(void) u16 GetPCBoxToSendMon(void)
{ {
return gUnknown_0203AB6F; return sPCBoxToSendMon;
} }
bool8 sub_813B21C(void) bool8 ShouldShowBoxWasFullMessage(void)
{ {
if (FlagGet(FLAG_SYS_STORAGE_UNKNOWN_FLAG) == FALSE) if (!FlagGet(FLAG_SHOWN_BOX_WAS_FULL_MESSAGE))
{ {
if (StorageGetCurrentBox() != VarGet(VAR_STORAGE_UNKNOWN)) if (StorageGetCurrentBox() != VarGet(VAR_PC_BOX_TO_SEND_MON))
{ {
FlagSet(FLAG_SYS_STORAGE_UNKNOWN_FLAG); FlagSet(FLAG_SHOWN_BOX_WAS_FULL_MESSAGE);
return TRUE; return TRUE;
} }
} }
return FALSE; return FALSE;
} }
bool8 sub_813B260(void) bool8 IsDestinationBoxFull(void)
{ {
int box; int box;
int i; int i;
set_unknown_box_id(VarGet(VAR_STORAGE_UNKNOWN)); SetPCBoxToSendMon(VarGet(VAR_PC_BOX_TO_SEND_MON));
box = StorageGetCurrentBox(); box = StorageGetCurrentBox();
do do
{ {
for (i = 0; i < IN_BOX_COUNT; i++) for (i = 0; i < IN_BOX_COUNT; i++)
{ {
if (GetBoxMonData(GetBoxedMonPtr(box, i), MON_DATA_SPECIES, 0) == 0) if (GetBoxMonData(GetBoxedMonPtr(box, i), MON_DATA_SPECIES, 0) == SPECIES_NONE)
{ {
if (get_unknown_box_id() != box) if (GetPCBoxToSendMon() != box)
{ {
FlagClear(FLAG_SYS_STORAGE_UNKNOWN_FLAG); FlagClear(FLAG_SHOWN_BOX_WAS_FULL_MESSAGE);
} }
VarSet(VAR_STORAGE_UNKNOWN, box); VarSet(VAR_PC_BOX_TO_SEND_MON, box);
return sub_813B21C(); return ShouldShowBoxWasFullMessage();
} }
} }
@@ -3701,7 +3701,7 @@ bool32 sub_813B514(void)
void sub_813B534(void) void sub_813B534(void)
{ {
gUnknown_0203AB70 = gBattleTypeFlags; sUnknown_0203AB70 = gBattleTypeFlags;
gBattleTypeFlags = 0; gBattleTypeFlags = 0;
if (!gReceivedRemoteLinkPlayers) if (!gReceivedRemoteLinkPlayers)
{ {
@@ -3835,7 +3835,7 @@ static void sub_813B57C(u8 taskId)
{ {
sub_800AC34(); sub_800AC34();
} }
gBattleTypeFlags = gUnknown_0203AB70; gBattleTypeFlags = sUnknown_0203AB70;
EnableBothScriptContexts(); EnableBothScriptContexts();
DestroyTask(taskId); DestroyTask(taskId);
break; break;
src/naming_screen.c
+4 -4
View File
@@ -541,16 +541,16 @@ static void DisplaySentToPCMessage(void)
{ {
u8 stringToDisplay = 0; u8 stringToDisplay = 0;
if (!sub_813B260()) if (!IsDestinationBoxFull())
{ {
StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN))); StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON)));
StringCopy(gStringVar2, gNamingScreenData->destBuffer); StringCopy(gStringVar2, gNamingScreenData->destBuffer);
} }
else else
{ {
StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN))); StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON)));
StringCopy(gStringVar2, gNamingScreenData->destBuffer); StringCopy(gStringVar2, gNamingScreenData->destBuffer);
StringCopy(gStringVar3, GetBoxNamePtr(get_unknown_box_id())); StringCopy(gStringVar3, GetBoxNamePtr(GetPCBoxToSendMon()));
stringToDisplay = 2; stringToDisplay = 2;
} }
src/pokemon.c
+4 -4
View File
@@ -4329,7 +4329,7 @@ u8 SendMonToPC(struct Pokemon* mon)
{ {
s32 boxNo, boxPos; s32 boxNo, boxPos;
set_unknown_box_id(VarGet(VAR_STORAGE_UNKNOWN)); SetPCBoxToSendMon(VarGet(VAR_PC_BOX_TO_SEND_MON));
boxNo = StorageGetCurrentBox(); boxNo = StorageGetCurrentBox();
@@ -4344,9 +4344,9 @@ u8 SendMonToPC(struct Pokemon* mon)
CopyMon(checkingMon, &mon->box, sizeof(mon->box)); CopyMon(checkingMon, &mon->box, sizeof(mon->box));
gSpecialVar_MonBoxId = boxNo; gSpecialVar_MonBoxId = boxNo;
gSpecialVar_MonBoxPos = boxPos; gSpecialVar_MonBoxPos = boxPos;
if (get_unknown_box_id() != boxNo) if (GetPCBoxToSendMon() != boxNo)
FlagClear(FLAG_SYS_STORAGE_UNKNOWN_FLAG); FlagClear(FLAG_SHOWN_BOX_WAS_FULL_MESSAGE);
VarSet(VAR_STORAGE_UNKNOWN, boxNo); VarSet(VAR_PC_BOX_TO_SEND_MON, boxNo);
return MON_GIVEN_TO_PC; return MON_GIVEN_TO_PC;
} }
} }
src/pokemon_storage_system.c
+5 -5
View File
@@ -453,7 +453,7 @@ EWRAM_DATA static bool8 sInPartyMenu = 0;
EWRAM_DATA static u8 sCurrentBoxOption = 0; EWRAM_DATA static u8 sCurrentBoxOption = 0;
EWRAM_DATA static u8 gUnknown_02039D0E = 0; EWRAM_DATA static u8 gUnknown_02039D0E = 0;
EWRAM_DATA static u8 sWhichToReshow = 0; EWRAM_DATA static u8 sWhichToReshow = 0;
EWRAM_DATA static u8 gUnknown_02039D10 = 0; EWRAM_DATA static u8 sLastUsedBox = 0;
EWRAM_DATA static u16 gUnknown_02039D12 = 0; EWRAM_DATA static u16 gUnknown_02039D12 = 0;
EWRAM_DATA static struct Pokemon gUnknown_02039D14 = {0}; EWRAM_DATA static struct Pokemon gUnknown_02039D14 = {0};
EWRAM_DATA static s8 sBoxCursorArea = 0; EWRAM_DATA static s8 sBoxCursorArea = 0;
@@ -2167,7 +2167,7 @@ static void Cb2_EnterPSS(u8 boxOption)
gUnknown_02039D12 = 0; gUnknown_02039D12 = 0;
sPSSData->state = 0; sPSSData->state = 0;
sPSSData->taskId = CreateTask(Cb_InitPSS, 3); sPSSData->taskId = CreateTask(Cb_InitPSS, 3);
gUnknown_02039D10 = StorageGetCurrentBox(); sLastUsedBox = StorageGetCurrentBox();
SetMainCallback2(Cb2_PSS); SetMainCallback2(Cb2_PSS);
} }
} }
@@ -4366,10 +4366,10 @@ static bool8 DoShowPartyMenu(void)
static void sub_80CABE0(void) static void sub_80CABE0(void)
{ {
if (gUnknown_02039D10 != StorageGetCurrentBox()) if (sLastUsedBox != StorageGetCurrentBox())
{ {
FlagClear(FLAG_SYS_STORAGE_UNKNOWN_FLAG); FlagClear(FLAG_SHOWN_BOX_WAS_FULL_MESSAGE);
VarSet(VAR_STORAGE_UNKNOWN, StorageGetCurrentBox()); VarSet(VAR_PC_BOX_TO_SEND_MON, StorageGetCurrentBox());
} }
} }