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

Merge branch 'master' into document-eventscripts

Browse Source
This commit is contained in:
GriffinR
2019-09-17 18:01:20 -04:00
committed by GitHub
parent 945d3d3a27 459fca289c
commit 58b8d7c297
49 changed files with 1225 additions and 982 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common_syms/field_specials.txt
+1 -1
View File
@@ -1 +1 @@
gUnknown_030061D0 gScrollableMultichoice_ListMenuTemplate
data/event_scripts.s
+9 -8
View File
@@ -7,6 +7,7 @@
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h" #include "constants/event_object_movement_constants.h"
#include "constants/field_effects.h" #include "constants/field_effects.h"
#include "constants/field_specials.h"
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/game_stat.h" #include "constants/game_stat.h"
#include "constants/decorations.h" #include "constants/decorations.h"
@@ -1130,7 +1131,7 @@ Std_FindItem:: @ 8271BFD
EventScript_PickItemUp:: @ 8271C3A EventScript_PickItemUp:: @ 8271C3A
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
giveitem VAR_0x8004, VAR_0x8005 giveitem VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, sub_81398C0 specialvar VAR_RESULT, BufferTMHMMoveName
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if_eq EventScript_271C8F call_if_eq EventScript_271C8F
@@ -1182,7 +1183,7 @@ EventScript_HiddenItemScript:: @ 8271CB7
EventScript_271CE8:: @ 8271CE8 EventScript_271CE8:: @ 8271CE8
copyvar VAR_0x8008, VAR_0x8004 copyvar VAR_0x8008, VAR_0x8004
copyvar VAR_0x8004, VAR_0x8005 copyvar VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, sub_81398C0 specialvar VAR_RESULT, BufferTMHMMoveName
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq EventScript_271D0E goto_if_eq EventScript_271D0E
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@@ -2545,34 +2546,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
@@ -2591,7 +2592,7 @@ EventScript_Questionnaire:: @ 827381B
call Common_ShowEasyChatScreen call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
specialvar VAR_0x8008, sub_813B490 specialvar VAR_0x8008, GetMartEmployeeObjectEventId
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_if_eq EventScript_27386D goto_if_eq EventScript_27386D
compare VAR_0x8004, 2 compare VAR_0x8004, 2
data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
+25 -25
View File
@@ -3,17 +3,17 @@ BattleFrontier_BattlePointExchangeServiceCorner_MapScripts:: @ 825F070
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071:: @ 825F071 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071:: @ 825F071
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, MSGBOX_DEFAULT
special sub_813A958 special ShowBattlePointsWindow
return return
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, MSGBOX_DEFAULT
special sub_813A988 special CloseBattlePointsWindow
release release
end end
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A
specialvar VAR_TEMP_1, sub_813AA04 specialvar VAR_TEMP_1, GetFrontierBattlePoints
compare VAR_TEMP_1, VAR_0x8008 compare VAR_TEMP_1, VAR_0x8008
goto_if_ge BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 goto_if_ge BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, MSGBOX_DEFAULT
@@ -39,9 +39,9 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
special sub_813A9A4 special TakeFrontierBattlePoints
givedecoration VAR_0x8009 givedecoration VAR_0x8009
special sub_813A8FC special UpdateBattlePointsWindow
playse SE_REGI playse SE_REGI
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, MSGBOX_DEFAULT
compare VAR_TEMP_2, 0 compare VAR_TEMP_2, 0
@@ -51,7 +51,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, MSGBOX_DEFAULT
special sub_813A988 special CloseBattlePointsWindow
release release
end end
@@ -60,9 +60,9 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166 goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
special sub_813A9A4 special TakeFrontierBattlePoints
giveitem VAR_0x8009, 1 giveitem VAR_0x8009, 1
special sub_813A8FC special UpdateBattlePointsWindow
playse SE_REGI playse SE_REGI
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, MSGBOX_DEFAULT
compare VAR_TEMP_2, 2 compare VAR_TEMP_2, 2
@@ -72,7 +72,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166:: @ 825F166 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166:: @ 825F166
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, MSGBOX_DEFAULT
special sub_813A988 special CloseBattlePointsWindow
release release
end end
@@ -85,11 +85,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173:: @ 825F173
end end
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185
setvar VAR_0x8004, 3 setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1
special sub_813AA18 special ShowFrontierExchangeCornerItemIconWindow
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
special sub_813AA44 special CloseFrontierExchangeCornerItemIconWindow
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E
case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241 case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241
@@ -204,11 +204,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C:: @ 825F37C
end end
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E
setvar VAR_0x8004, 4 setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2
special sub_813AA18 special ShowFrontierExchangeCornerItemIconWindow
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
special sub_813AA44 special CloseFrontierExchangeCornerItemIconWindow
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0 case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0
case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413 case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413
@@ -273,11 +273,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F:: @ 825F49F
end end
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1
setvar VAR_0x8004, 5 setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR
special sub_813AA18 special ShowFrontierExchangeCornerItemIconWindow
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
special sub_813AA44 special CloseFrontierExchangeCornerItemIconWindow
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E
case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541 case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541
@@ -352,11 +352,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0:: @ 825F5F0
end end
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602
setvar VAR_0x8004, 6 setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR
special sub_813AA18 special ShowFrontierExchangeCornerItemIconWindow
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
special sub_813AA44 special CloseFrontierExchangeCornerItemIconWindow
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690 case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690
case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3 case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+1 -1
View File
@@ -318,7 +318,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91
BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4 BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
special sub_813B968 special GetBattlePyramidHint
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattlePyramidLobby_EventScript_250C8E case 0, BattleFrontier_BattlePyramidLobby_EventScript_250C8E
case 1, BattleFrontier_BattlePyramidLobby_EventScript_250C97 case 1, BattleFrontier_BattlePyramidLobby_EventScript_250C97
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+1 -1
View File
@@ -25,7 +25,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
return return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F
special sub_813A76C special SetBattleTowerLinkPlayerGfx
return return
BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33 BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
+1 -1
View File
@@ -25,7 +25,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B
return return
BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91 BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91
special sub_813A76C special SetBattleTowerLinkPlayerGfx
return return
BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95 BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95
data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
+2 -2
View File
@@ -12,9 +12,9 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86 applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A
waitmovement 0 waitmovement 0
special sub_813A080 special BufferBattleTowerElevatorFloors
waitse waitse
special ShakeScreenInElevator special MoveElevator
waitstate waitstate
delay 48 delay 48
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E
data/maps/BattleFrontier_Lounge1/scripts.inc
+1 -1
View File
@@ -31,7 +31,7 @@ BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF
specialvar VAR_RESULT, ScriptGetPartyMonSpecies specialvar VAR_RESULT, ScriptGetPartyMonSpecies
compare VAR_RESULT, SPECIES_EGG compare VAR_RESULT, SPECIES_EGG
goto_if_eq BattleFrontier_Lounge1_EventScript_25E7FF goto_if_eq BattleFrontier_Lounge1_EventScript_25E7FF
special sub_8139D98 special BufferVarsForIVRater
compare VAR_0x8005, 90 compare VAR_0x8005, 90
goto_if_le BattleFrontier_Lounge1_EventScript_25E87F goto_if_le BattleFrontier_Lounge1_EventScript_25E87F
compare VAR_0x8005, 120 compare VAR_0x8005, 120
data/maps/BattleFrontier_Lounge2/scripts.inc
+1 -1
View File
@@ -40,7 +40,7 @@ BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D
call_if_le BattleFrontier_Lounge2_EventScript_2606F8 call_if_le BattleFrontier_Lounge2_EventScript_2606F8
compare VAR_FRONTIER_MANIAC_FACILITY, 4 compare VAR_FRONTIER_MANIAC_FACILITY, 4
call_if_ge BattleFrontier_Lounge2_EventScript_260701 call_if_ge BattleFrontier_Lounge2_EventScript_260701
special sub_8139F20 special ShowFrontierManiacMessage
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
data/maps/BattleFrontier_Lounge3/scripts.inc
+23 -23
View File
@@ -14,7 +14,7 @@ BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83
end end
BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF
special sub_813A820 special ShowFrontierGamblerLookingMessage
waitmessage waitmessage
waitbuttonpress waitbuttonpress
msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO
@@ -25,7 +25,7 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF
goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5 goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5
message BattleFrontier_Lounge3_Text_262B42 message BattleFrontier_Lounge3_Text_262B42
waitmessage waitmessage
special sub_813A958 special ShowBattlePointsWindow
goto BattleFrontier_Lounge3_EventScript_261DE9 goto BattleFrontier_Lounge3_EventScript_261DE9
end end
@@ -33,10 +33,10 @@ BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9
multichoice 20, 4, 87, 0 multichoice 20, 4, 87, 0
copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_Lounge3_EventScript_261E30 case FRONTIER_GAMBLER_BET_5, BattleFrontier_Lounge3_EventScript_261E30
case 1, BattleFrontier_Lounge3_EventScript_261E3B case FRONTIER_GAMBLER_BET_10, BattleFrontier_Lounge3_EventScript_261E3B
case 2, BattleFrontier_Lounge3_EventScript_261E46 case FRONTIER_GAMBLER_BET_15, BattleFrontier_Lounge3_EventScript_261E46
case 3, BattleFrontier_Lounge3_EventScript_261FAF case FRONTIER_GAMBLER_BET_CANCEL, BattleFrontier_Lounge3_EventScript_261FAF
case 127, BattleFrontier_Lounge3_EventScript_261FAF case 127, BattleFrontier_Lounge3_EventScript_261FAF
end end
@@ -56,7 +56,7 @@ BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46
end end
BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
specialvar VAR_TEMP_1, sub_813AA04 specialvar VAR_TEMP_1, GetFrontierBattlePoints
compare VAR_TEMP_1, VAR_0x8008 compare VAR_TEMP_1, VAR_0x8008
goto_if_ge BattleFrontier_Lounge3_EventScript_261E75 goto_if_ge BattleFrontier_Lounge3_EventScript_261E75
msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT
@@ -67,19 +67,19 @@ BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75 BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
special sub_813A9A4 special TakeFrontierBattlePoints
setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
special sub_813A8FC special UpdateBattlePointsWindow
playse SE_REGI playse SE_REGI
msgbox BattleFrontier_Lounge3_Text_262BE0, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_262BE0, MSGBOX_DEFAULT
goto BattleFrontier_Lounge3_EventScript_261E96 goto BattleFrontier_Lounge3_EventScript_261E96
end end
BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96 BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96
special sub_813A854 special ShowFrontierGamblerGoMessage
waitmessage waitmessage
waitbuttonpress waitbuttonpress
special sub_813A988 special CloseBattlePointsWindow
release release
end end
@@ -105,37 +105,37 @@ BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB
BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9 BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9
msgbox BattleFrontier_Lounge3_Text_26346B, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_26346B, MSGBOX_DEFAULT
compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
goto_if_ge BattleFrontier_Lounge3_EventScript_261F12 goto_if_ge BattleFrontier_Lounge3_EventScript_261F12
goto BattleFrontier_Lounge3_EventScript_261DAF goto BattleFrontier_Lounge3_EventScript_261DAF
end end
BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12
compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
goto_if_eq BattleFrontier_Lounge3_EventScript_261F9E goto_if_eq BattleFrontier_Lounge3_EventScript_261F9E
compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2 compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WON
goto_if_eq BattleFrontier_Lounge3_EventScript_261F2E goto_if_eq BattleFrontier_Lounge3_EventScript_261F2E
goto BattleFrontier_Lounge3_EventScript_261F71 goto BattleFrontier_Lounge3_EventScript_261F71
end end
BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E
msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0 compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_5
call_if_eq BattleFrontier_Lounge3_EventScript_261F80 call_if_eq BattleFrontier_Lounge3_EventScript_261F80
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1 compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_10
call_if_eq BattleFrontier_Lounge3_EventScript_261F8A call_if_eq BattleFrontier_Lounge3_EventScript_261F8A
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2 compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_15
call_if_eq BattleFrontier_Lounge3_EventScript_261F94 call_if_eq BattleFrontier_Lounge3_EventScript_261F94
msgbox BattleFrontier_Lounge3_Text_2633D4, 9 msgbox BattleFrontier_Lounge3_Text_2633D4, 9
special sub_813A9D0 special GiveFrontierBattlePoints
msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT
setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WAITING
release release
end end
BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71 BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71
msgbox BattleFrontier_Lounge3_Text_263298, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_263298, MSGBOX_DEFAULT
setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WAITING
release release
end end
@@ -155,7 +155,7 @@ BattleFrontier_Lounge3_EventScript_261F94:: @ 8261F94
return return
BattleFrontier_Lounge3_EventScript_261F9E:: @ 8261F9E BattleFrontier_Lounge3_EventScript_261F9E:: @ 8261F9E
special sub_813A854 special ShowFrontierGamblerGoMessage
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
@@ -167,7 +167,7 @@ BattleFrontier_Lounge3_EventScript_261FA5:: @ 8261FA5
end end
BattleFrontier_Lounge3_EventScript_261FAF:: @ 8261FAF BattleFrontier_Lounge3_EventScript_261FAF:: @ 8261FAF
special sub_813A988 special CloseBattlePointsWindow
goto BattleFrontier_Lounge3_EventScript_261FA5 goto BattleFrontier_Lounge3_EventScript_261FA5
end end
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
+35 -35
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 sub_813A7B8 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/maps/BattleFrontier_Lounge7/scripts.inc
+20 -18
View File
@@ -19,11 +19,11 @@ BattleFrontier_Lounge7_EventScript_265276:: @ 8265276
BattleFrontier_Lounge7_EventScript_265284:: @ 8265284 BattleFrontier_Lounge7_EventScript_265284:: @ 8265284
message BattleFrontier_Lounge7_Text_2658EF message BattleFrontier_Lounge7_Text_2658EF
waitmessage waitmessage
special sub_813A958 special ShowBattlePointsWindow
setvar VAR_TEMP_E, 0 setvar VAR_TEMP_E, 0
setvar VAR_0x8004, 9 setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
copyvar VAR_TEMP_D, VAR_RESULT copyvar VAR_TEMP_D, VAR_RESULT
switch VAR_RESULT switch VAR_RESULT
@@ -45,9 +45,9 @@ BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F
message BattleFrontier_Lounge7_Text_2658EF message BattleFrontier_Lounge7_Text_2658EF
waitmessage waitmessage
setvar VAR_TEMP_E, 0 setvar VAR_TEMP_E, 0
setvar VAR_0x8004, 9 setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_1
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
copyvar VAR_TEMP_D, VAR_RESULT copyvar VAR_TEMP_D, VAR_RESULT
switch VAR_RESULT switch VAR_RESULT
@@ -133,11 +133,11 @@ BattleFrontier_Lounge7_EventScript_265466:: @ 8265466
BattleFrontier_Lounge7_EventScript_265474:: @ 8265474 BattleFrontier_Lounge7_EventScript_265474:: @ 8265474
message BattleFrontier_Lounge7_Text_2658EF message BattleFrontier_Lounge7_Text_2658EF
waitmessage waitmessage
special sub_813A958 special ShowBattlePointsWindow
setvar VAR_TEMP_E, 1 setvar VAR_TEMP_E, 1
setvar VAR_0x8004, 10 setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
copyvar VAR_TEMP_D, VAR_RESULT copyvar VAR_TEMP_D, VAR_RESULT
switch VAR_RESULT switch VAR_RESULT
@@ -159,9 +159,9 @@ BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F
message BattleFrontier_Lounge7_Text_2658EF message BattleFrontier_Lounge7_Text_2658EF
waitmessage waitmessage
setvar VAR_TEMP_E, 1 setvar VAR_TEMP_E, 1
setvar VAR_0x8004, 10 setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
copyvar VAR_TEMP_D, VAR_RESULT copyvar VAR_TEMP_D, VAR_RESULT
switch VAR_RESULT switch VAR_RESULT
@@ -230,8 +230,8 @@ BattleFrontier_Lounge7_EventScript_26562A:: @ 826562A
end end
BattleFrontier_Lounge7_EventScript_265635:: @ 8265635 BattleFrontier_Lounge7_EventScript_265635:: @ 8265635
special sub_813ADB8 special CloseBattleFrontierTutorWindow
special sub_813A988 special CloseBattlePointsWindow
msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT
release release
end end
@@ -241,16 +241,18 @@ BattleFrontier_Lounge7_EventScript_265645:: @ 8265645
release release
end end
@ VAR_0x8004 here is used to determine which move name to buffer
@ VAR_0x8005 here is used to determine which move tutor was spoken to
BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F
copyvar VAR_0x8004, VAR_TEMP_D copyvar VAR_0x8004, VAR_TEMP_D
copyvar VAR_0x8005, VAR_TEMP_E copyvar VAR_0x8005, VAR_TEMP_E
special sub_813AC7C special BufferBattleFrontierTutorMoveName
buffernumberstring 1, VAR_0x8008 buffernumberstring 1, VAR_0x8008
copyvar VAR_0x8004, VAR_TEMP_C copyvar VAR_0x8004, VAR_TEMP_C
msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_Lounge7_EventScript_2656CA goto_if_eq BattleFrontier_Lounge7_EventScript_2656CA
specialvar VAR_TEMP_1, sub_813AA04 specialvar VAR_TEMP_1, GetFrontierBattlePoints
compare VAR_TEMP_1, VAR_0x8008 compare VAR_TEMP_1, VAR_0x8008
goto_if_ge BattleFrontier_Lounge7_EventScript_265696 goto_if_ge BattleFrontier_Lounge7_EventScript_265696
msgbox BattleFrontier_Lounge7_Text_265997, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge7_Text_265997, MSGBOX_DEFAULT
@@ -259,17 +261,17 @@ BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F
BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 BattleFrontier_Lounge7_EventScript_265696:: @ 8265696
msgbox BattleFrontier_Lounge7_Text_26595A, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge7_Text_26595A, MSGBOX_DEFAULT
special sub_813AEB4 special GetBattleFrontierTutorMoveIndex
fadescreen 1 fadescreen 1
special sub_813A988 special CloseBattlePointsWindow
special sub_813ADB8 special CloseBattleFrontierTutorWindow
special sub_81B892C special sub_81B892C
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_Lounge7_EventScript_265645 goto_if_eq BattleFrontier_Lounge7_EventScript_265645
msgbox BattleFrontier_Lounge7_Text_2659C7, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge7_Text_2659C7, MSGBOX_DEFAULT
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
special sub_813A9A4 special TakeFrontierBattlePoints
release release
end end
data/maps/BattleFrontier_ReceptionGate/scripts.inc
+2 -2
View File
@@ -136,8 +136,8 @@ BattleFrontier_ReceptionGate_EventScript_266310:: @ 8266310
BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320 BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320
message BattleFrontier_ReceptionGate_Text_26689D message BattleFrontier_ReceptionGate_Text_26689D
waitmessage waitmessage
setvar VAR_0x8004, 8 setvar VAR_0x8004, SCROLL_MULTI_BF_RECEPTIONIST
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_ReceptionGate_EventScript_2663AE case 0, BattleFrontier_ReceptionGate_EventScript_2663AE
data/maps/BattleFrontier_ScottsHouse/scripts.inc
+1 -1
View File
@@ -218,7 +218,7 @@ BattleFrontier_ScottsHouse_EventScript_2639E9:: @ 82639E9
end end
BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
special sub_813A9D0 special GiveFrontierBattlePoints
msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9 msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9
msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT
setflag FLAG_SCOTT_GIVES_BATTLE_POINTS setflag FLAG_SCOTT_GIVES_BATTLE_POINTS
data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+21 -21
View File
@@ -7,11 +7,11 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC
copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR
special sub_8139B60 special ShowDeptStoreElevatorFloorSelect
message gText_WhichFloorWouldYouLike message gText_WhichFloorWouldYouLike
waitmessage waitmessage
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
specialvar VAR_RESULT, sub_81399F4 specialvar VAR_RESULT, GetDeptStoreDefaultFloorChoice
switch VAR_RESULT switch VAR_RESULT
case 0, LilycoveCity_DepartmentStoreElevator_EventScript_220689 case 0, LilycoveCity_DepartmentStoreElevator_EventScript_220689
case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220695 case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220695
@@ -57,72 +57,72 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5
end end
LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718
setvar VAR_0x8006, 4 setvar VAR_0x8006, DEPT_STORE_FLOORNUM_1F
setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1
compare VAR_DEPT_STORE_FLOOR, 4 compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
setvar VAR_DEPT_STORE_FLOOR, 4 setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
end end
LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740
setvar VAR_0x8006, 5 setvar VAR_0x8006, DEPT_STORE_FLOORNUM_2F
setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1
compare VAR_DEPT_STORE_FLOOR, 5 compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
setvar VAR_DEPT_STORE_FLOOR, 5 setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
end end
LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768
setvar VAR_0x8006, 6 setvar VAR_0x8006, DEPT_STORE_FLOORNUM_3F
setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1
compare VAR_DEPT_STORE_FLOOR, 6 compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
setvar VAR_DEPT_STORE_FLOOR, 6 setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
end end
LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790
setvar VAR_0x8006, 7 setvar VAR_0x8006, DEPT_STORE_FLOORNUM_4F
setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1
compare VAR_DEPT_STORE_FLOOR, 7 compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
setvar VAR_DEPT_STORE_FLOOR, 7 setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
end end
LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8 LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8
setvar VAR_0x8006, 8 setvar VAR_0x8006, DEPT_STORE_FLOORNUM_5F
setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1
compare VAR_DEPT_STORE_FLOOR, 8 compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
setvar VAR_DEPT_STORE_FLOOR, 8 setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
end end
LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0 LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0
special sub_8139C10 special CloseDeptStoreElevatorWindow
release release
end end
LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
special sub_8139C10 special CloseDeptStoreElevatorWindow
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
waitmovement 0 waitmovement 0
waitse waitse
special ShakeScreenInElevator special MoveElevator
waitstate waitstate
setflag FLAG_TEMP_2 setflag FLAG_TEMP_2
return return
LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
special SetDepartmentStoreFloorVar special SetDeptStoreFloor
return return
data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+2 -2
View File
@@ -558,8 +558,8 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
special BufferStreakTrainerText special BufferStreakTrainerText
message LilycoveCity_PokemonTrainerFanClub_Text_281C95 message LilycoveCity_PokemonTrainerFanClub_Text_281C95
waitmessage waitmessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, SCROLL_MULTI_POKEMON_FAN_CLUB_RATER
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
switch VAR_RESULT switch VAR_RESULT
data/maps/MauvilleCity_GameCorner/scripts.inc
+1 -1
View File
@@ -288,7 +288,7 @@ MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77
goto MauvilleCity_GameCorner_EventScript_20FF8A goto MauvilleCity_GameCorner_EventScript_20FF8A
MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A
special sub_81398C0 special BufferTMHMMoveName
msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_210118 goto_if_eq MauvilleCity_GameCorner_EventScript_210118
data/maps/PetalburgCity_Gym/scripts.inc
+1 -1
View File
@@ -418,7 +418,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
setflag FLAG_DEFEATED_PETALBURG_GYM setflag FLAG_DEFEATED_PETALBURG_GYM
setvar VAR_PETALBURG_GYM_STATE, 7 setvar VAR_PETALBURG_GYM_STATE, 7
setflag FLAG_BADGE05_GET setflag FLAG_BADGE05_GET
special sub_813B9A0 special ResetHealLocationFromDewford
call PetalburgCity_Gym_EventScript_2721F8 call PetalburgCity_Gym_EventScript_2721F8
setflag FLAG_HIDE_MAUVILLE_GYM_WATTSON setflag FLAG_HIDE_MAUVILLE_GYM_WATTSON
clearflag FLAG_HIDE_MAUVILLE_CITY_WATTSON clearflag FLAG_HIDE_MAUVILLE_CITY_WATTSON
data/maps/Route113_GlassWorkshop/scripts.inc
+2 -2
View File
@@ -52,8 +52,8 @@ Route113_GlassWorkshop_EventScript_26ED9D:: @ 826ED9D
Route113_GlassWorkshop_EventScript_26EDA7:: @ 826EDA7 Route113_GlassWorkshop_EventScript_26EDA7:: @ 826EDA7
setvar VAR_0x8009, 0 setvar VAR_0x8009, 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, SCROLL_MULTI_GLASS_WORKSHOP_VENDOR
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
switch VAR_RESULT switch VAR_RESULT
case 0, Route113_GlassWorkshop_EventScript_26EE1E case 0, Route113_GlassWorkshop_EventScript_26EE1E
data/maps/SlateportCity/scripts.inc
+2 -2
View File
@@ -748,8 +748,8 @@ SlateportCity_EventScript_1DD3C0:: @ 81DD3C0
SlateportCity_EventScript_1DD3CA:: @ 81DD3CA SlateportCity_EventScript_1DD3CA:: @ 81DD3CA
message SlateportCity_Text_1DEE67 message SlateportCity_Text_1DEE67
waitmessage waitmessage
setvar VAR_0x8004, 7 setvar VAR_0x8004, SCROLL_MULTI_BERRY_POWDER_VENDOR
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
switch VAR_RESULT switch VAR_RESULT
case 0, SlateportCity_EventScript_1DD46E case 0, SlateportCity_EventScript_1DD46E
data/maps/SootopolisCity/scripts.inc
+4 -4
View File
@@ -217,7 +217,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
setweather WEATHER_ALTERNATING setweather WEATHER_ALTERNATING
doweather doweather
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_813B7D8 special Script_DoRayquazaScene
waitstate waitstate
applymovement 10, Common_Movement_WalkInPlaceLeft applymovement 10, Common_Movement_WalkInPlaceLeft
applymovement 9, Common_Movement_WalkInPlaceRight applymovement 9, Common_Movement_WalkInPlaceRight
@@ -317,7 +317,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
setweather WEATHER_ALTERNATING setweather WEATHER_ALTERNATING
doweather doweather
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_813B7D8 special Script_DoRayquazaScene
waitstate waitstate
applymovement 10, Common_Movement_WalkInPlaceLeft applymovement 10, Common_Movement_WalkInPlaceLeft
applymovement 9, Common_Movement_WalkInPlaceRight applymovement 9, Common_Movement_WalkInPlaceRight
@@ -509,7 +509,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
removeobject 10 removeobject 10
addobject 11 addobject 11
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
special sub_813B7D8 special Script_DoRayquazaScene
waitstate waitstate
playse SE_T_KAMI playse SE_T_KAMI
special SpawnCameraObject special SpawnCameraObject
@@ -562,7 +562,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
removeobject 10 removeobject 10
addobject 11 addobject 11
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
special sub_813B7D8 special Script_DoRayquazaScene
waitstate waitstate
special SpawnCameraObject special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5E63 applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5E63
data/maps/TrainerHill_Elevator/scripts.inc
+4 -2
View File
@@ -39,18 +39,20 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375
waitstate waitstate
end end
@ Unused
TrainerHill_Elevator_EventScript_2693CE:: @ 82693CE TrainerHill_Elevator_EventScript_2693CE:: @ 82693CE
goto TrainerHill_Elevator_EventScript_2693D4 goto TrainerHill_Elevator_EventScript_2693D4
end end
@ Functionally unused
TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4 TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4
special sub_8139C10 special CloseDeptStoreElevatorWindow
releaseall releaseall
end end
TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9 TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9
waitse waitse
special ShakeScreenInElevator special MoveElevator
waitstate waitstate
return return
data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+2 -2
View File
@@ -332,8 +332,8 @@ VerdanturfTown_BattleTentLobby_EventScript_201B02:: @ 8201B02
VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11 VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11
message VerdanturfTown_BattleTentLobby_Text_24EF88 message VerdanturfTown_BattleTentLobby_Text_24EF88
waitmessage waitmessage
setvar VAR_0x8004, 12 setvar VAR_0x8004, SCROLL_MULTI_BATTLE_TENT_RULES
special sub_813A128 special ShowScrollableMultichoice
waitstate waitstate
switch VAR_RESULT switch VAR_RESULT
case 0, VerdanturfTown_BattleTentLobby_EventScript_201B7E case 0, VerdanturfTown_BattleTentLobby_EventScript_201B7E
data/scripts/cable_club.inc
+2 -2
View File
@@ -978,7 +978,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B
faceplayer faceplayer
setvar VAR_FRONTIER_FACILITY, 8 setvar VAR_FRONTIER_FACILITY, 8
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
specialvar VAR_RESULT, sub_813990C specialvar VAR_RESULT, IsBadEggInParty
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B
copyvar VAR_0x8007, VAR_LAST_TALKED copyvar VAR_0x8007, VAR_LAST_TALKED
@@ -1086,7 +1086,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4
faceplayer faceplayer
setvar VAR_FRONTIER_FACILITY, 9 setvar VAR_FRONTIER_FACILITY, 9
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
specialvar VAR_RESULT, sub_813990C specialvar VAR_RESULT, IsBadEggInParty
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B
specialvar VAR_RESULT, IsWirelessAdapterConnected specialvar VAR_RESULT, IsWirelessAdapterConnected
data/specials.inc
+36 -36
View File
@@ -227,7 +227,7 @@ gSpecials:: @ 81DBA64
def_special ShowPokedexRatingMessage def_special ShowPokedexRatingMessage
def_special DoPCTurnOnEffect def_special DoPCTurnOnEffect
def_special DoPCTurnOffEffect def_special DoPCTurnOffEffect
def_special SetDepartmentStoreFloorVar def_special SetDeptStoreFloor
def_special DoLotteryCornerComputerEffect def_special DoLotteryCornerComputerEffect
def_special EndLotteryCornerComputerEffect def_special EndLotteryCornerComputerEffect
def_special sub_81B951C def_special sub_81B951C
@@ -284,8 +284,8 @@ gSpecials:: @ 81DBA64
def_special sub_80FB7A4 def_special sub_80FB7A4
def_special DoSoftReset def_special DoSoftReset
def_special GameClear def_special GameClear
def_special ShakeScreenInElevator def_special MoveElevator
def_special nullsub_55 def_special ShowGlassWorkshopMenu
def_special SpawnCameraObject def_special SpawnCameraObject
def_special RemoveCameraObject def_special RemoveCameraObject
def_special GetPokeblockNameByMonNature def_special GetPokeblockNameByMonNature
@@ -316,7 +316,7 @@ gSpecials:: @ 81DBA64
def_special CopyCurSecretBaseOwnerName_StrVar1 def_special CopyCurSecretBaseOwnerName_StrVar1
def_special ScriptCheckFreePokemonStorageSpace def_special ScriptCheckFreePokemonStorageSpace
def_special DoSealedChamberShakingEffect1 def_special DoSealedChamberShakingEffect1
def_special sub_8139B60 def_special ShowDeptStoreElevatorFloorSelect
def_special GetShieldToyTVDecorationInfo def_special GetShieldToyTVDecorationInfo
def_special IsPokerusInParty def_special IsPokerusInParty
def_special SetSootopolisGymCrackedIceMetatiles def_special SetSootopolisGymCrackedIceMetatiles
@@ -339,7 +339,7 @@ gSpecials:: @ 81DBA64
def_special ScriptGetMultiplayerId def_special ScriptGetMultiplayerId
def_special ScriptGetPartyMonSpecies def_special ScriptGetPartyMonSpecies
def_special sub_81B98DC def_special sub_81B98DC
def_special nullsub_54 def_special TryInitBattleTowerAwardManEventObject
def_special MoveOutOfSecretBaseFromOutside def_special MoveOutOfSecretBaseFromOutside
def_special LoadPlayerBag def_special LoadPlayerBag
def_special sub_80B05B4 def_special sub_80B05B4
@@ -356,7 +356,7 @@ gSpecials:: @ 81DBA64
def_special sub_80EE2CC def_special sub_80EE2CC
def_special sub_80EE72C def_special sub_80EE72C
def_special sub_80EE7C0 def_special sub_80EE7C0
def_special nullsub_55 def_special ShowGlassWorkshopMenu
def_special PutFanClubSpecialOnTheAir def_special PutFanClubSpecialOnTheAir
def_special sub_80EED10 def_special sub_80EED10
def_special sub_80EED34 def_special sub_80EED34
@@ -422,7 +422,7 @@ gSpecials:: @ 81DBA64
def_special DoMirageTowerCeilingCrumble def_special DoMirageTowerCeilingCrumble
def_special SetMirageTowerVisibility def_special SetMirageTowerVisibility
def_special StartPlayerDescendMirageTower def_special StartPlayerDescendMirageTower
def_special sub_81398C0 def_special BufferTMHMMoveName
def_special IsWirelessAdapterConnected def_special IsWirelessAdapterConnected
def_special BerryBlenderLinkBecomeLeader def_special BerryBlenderLinkBecomeLeader
def_special BerryBlenderLinkJoinGroup def_special BerryBlenderLinkJoinGroup
@@ -433,7 +433,7 @@ gSpecials:: @ 81DBA64
def_special sub_801DC20 def_special sub_801DC20
def_special sub_81B8958 def_special sub_81B8958
def_special sub_8018090 def_special sub_8018090
def_special sub_813990C def_special IsBadEggInParty
def_special ValidateReceivedWonderCard def_special ValidateReceivedWonderCard
def_special HasAtLeastOneBerry def_special HasAtLeastOneBerry
def_special sub_802C920 def_special sub_802C920
@@ -441,8 +441,8 @@ gSpecials:: @ 81DBA64
def_special sub_8027A5C def_special sub_8027A5C
def_special sub_8027AAC def_special sub_8027AAC
def_special sub_8139980 def_special sub_8139980
def_special sub_81399F4 def_special GetDeptStoreDefaultFloorChoice
def_special sub_8139D98 def_special BufferVarsForIVRater
def_special sub_80F905C def_special sub_80F905C
def_special sub_800B518 def_special sub_800B518
def_special sub_80F90DC def_special sub_80F90DC
@@ -450,43 +450,43 @@ gSpecials:: @ 81DBA64
def_special sub_80F9160 def_special sub_80F9160
def_special ShowRankingHallRecordsWindow def_special ShowRankingHallRecordsWindow
def_special ScrollRankingHallRecordsWindow def_special ScrollRankingHallRecordsWindow
def_special sub_8139F20 def_special ShowFrontierManiacMessage
def_special sub_80F9134 def_special sub_80F9134
def_special sub_80F9154 def_special sub_80F9154
def_special sub_80B3028 def_special sub_80B3028
def_special sub_813A128 def_special ShowScrollableMultichoice
def_special sub_813A630 def_special sub_813A630
def_special sub_813A080 def_special BufferBattleTowerElevatorFloors
def_special sub_81C6A94 def_special sub_81C6A94
def_special sub_81C4F24 def_special sub_81C4F24
def_special sub_81B95E0 def_special sub_81B95E0
def_special sub_81B9620 def_special sub_81B9620
def_special sub_813A76C def_special SetBattleTowerLinkPlayerGfx
def_special sub_813A7B8 def_special ShowNatureGirlMessage
def_special sub_813A958 def_special ShowBattlePointsWindow
def_special sub_813A8FC def_special UpdateBattlePointsWindow
def_special sub_813A988 def_special CloseBattlePointsWindow
def_special sub_813A9D0 def_special GiveFrontierBattlePoints
def_special sub_813A9A4 def_special TakeFrontierBattlePoints
def_special sub_813AA04 def_special GetFrontierBattlePoints
def_special sub_813AA18 def_special ShowFrontierExchangeCornerItemIconWindow
def_special sub_813AA44 def_special CloseFrontierExchangeCornerItemIconWindow
def_special DisplayBerryPowderVendorMenu def_special DisplayBerryPowderVendorMenu
def_special RemoveBerryPowderVendorMenu def_special RemoveBerryPowderVendorMenu
def_special HasEnoughBerryPowder def_special HasEnoughBerryPowder
def_special TakeBerryPowder def_special TakeBerryPowder
def_special PrintPlayerBerryPowderAmount def_special PrintPlayerBerryPowderAmount
def_special sub_813A820 def_special ShowFrontierGamblerLookingMessage
def_special sub_813A854 def_special ShowFrontierGamblerGoMessage
def_special sub_813B7D8 def_special Script_DoRayquazaScene
def_special sub_81C72A4 def_special sub_81C72A4
def_special sp106_CreateStartMenu def_special sp106_CreateStartMenu
def_special CountPlayerTrainerStars def_special CountPlayerTrainerStars
def_special sub_813AC7C def_special BufferBattleFrontierTutorMoveName
def_special sub_813ADB8 def_special CloseBattleFrontierTutorWindow
def_special sub_813ADD4 def_special sub_813ADD4
def_special sub_81B892C def_special sub_81B892C
def_special sub_813AEB4 def_special GetBattleFrontierTutorMoveIndex
def_special sub_813AF48 def_special sub_813AF48
def_special DoDeoxysRockInteraction def_special DoDeoxysRockInteraction
def_special sub_813B1D0 def_special sub_813B1D0
@@ -495,13 +495,13 @@ 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
def_special GetUnusualWeatherMapNameAndType def_special GetUnusualWeatherMapNameAndType
def_special sub_813B490 def_special GetMartEmployeeObjectEventId
def_special sub_80A08CC def_special sub_80A08CC
def_special Unused_SetWeatherSunny def_special Unused_SetWeatherSunny
def_special sub_81AFDA0 def_special sub_81AFDA0
@@ -516,7 +516,7 @@ gSpecials:: @ 81DBA64
def_special sub_813B568 def_special sub_813B568
def_special sub_813B534 def_special sub_813B534
def_special CallTrainerHillFunction def_special CallTrainerHillFunction
def_special sub_813B7D8 def_special Script_DoRayquazaScene @ Listed twice
def_special sub_813B80C def_special sub_813B80C
def_special sub_81D4BEC def_special sub_81D4BEC
def_special sub_80224D0 def_special sub_80224D0
@@ -524,14 +524,14 @@ gSpecials:: @ 81DBA64
def_special DoWaldaNamingScreen def_special DoWaldaNamingScreen
def_special TryGetWallpaperWithWaldaPhrase def_special TryGetWallpaperWithWaldaPhrase
def_special PlayerNotAtTrainerHillEntrance def_special PlayerNotAtTrainerHillEntrance
def_special sub_813B968 def_special GetBattlePyramidHint
def_special sub_80F8B94 def_special sub_80F8B94
def_special ShowTrainerHillRecords def_special ShowTrainerHillRecords
def_special sub_80B4808 def_special sub_80B4808
def_special sub_813B9A0 def_special ResetHealLocationFromDewford
def_special sub_81B9918 def_special sub_81B9918
def_special sub_80722E0 def_special sub_80722E0
def_special TryPrepareSecondApproachingTrainer def_special TryPrepareSecondApproachingTrainer
def_special RemoveRecordsWindow def_special RemoveRecordsWindow
def_special sub_8139C10 def_special CloseDeptStoreElevatorWindow
def_special sub_80B3BC4 def_special sub_80B3BC4
include/constants/battle_frontier.h
+32
View File
@@ -1,6 +1,8 @@
#ifndef GUARD_CONSTANTS_BATTLE_FRONTIER_H #ifndef GUARD_CONSTANTS_BATTLE_FRONTIER_H
#define GUARD_CONSTANTS_BATTLE_FRONTIER_H #define GUARD_CONSTANTS_BATTLE_FRONTIER_H
#define FRONTIER_CHALLENGE(facility, mode) ((facility << 8) + mode)
// Battle Frontier facility ids. // Battle Frontier facility ids.
#define FRONTIER_FACILITY_TOWER 0 #define FRONTIER_FACILITY_TOWER 0
#define FRONTIER_FACILITY_DOME 1 #define FRONTIER_FACILITY_DOME 1
@@ -41,6 +43,36 @@
#define SPECIAL_BATTLE_PIKE_DOUBLE 9 #define SPECIAL_BATTLE_PIKE_DOUBLE 9
#define SPECIAL_BATTLE_PYRAMID 10 #define SPECIAL_BATTLE_PYRAMID 10
#define MAX_BATTLE_FRONTIER_POINTS 9999
// Frontier Maniac
#define FRONTIER_MANIAC_BATTLE_TOWER_SINGLES 0
#define FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES 1
#define FRONTIER_MANIAC_BATTLE_TOWER_MULTIS 2
#define FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS 3
#define FRONTIER_MANIAC_BATTLE_DOME 4
#define FRONTIER_MANIAC_BATTLE_FACTORY 5
#define FRONTIER_MANIAC_BATTLE_PALACE 6
#define FRONTIER_MANIAC_BATTLE_ARENA 7
#define FRONTIER_MANIAC_BATTLE_PIKE 8
#define FRONTIER_MANIAC_BATTLE_PYRAMID 9
#define FRONTIER_MANIAC_FACILITY_COUNT 10
#define FRONTIER_MANIAC_MESSAGE_COUNT 3
// Frontier Gambler
#define FRONTIER_GAMBLER_WAITING 0
#define FRONTIER_GAMBLER_PLACED_BET 1
#define FRONTIER_GAMBLER_WON 2
#define FRONTIER_GAMBLER_LOST 3
#define FRONTIER_GAMBLER_BET_5 0
#define FRONTIER_GAMBLER_BET_10 1
#define FRONTIER_GAMBLER_BET_15 2
#define FRONTIER_GAMBLER_BET_CANCEL 3
#define FRONTIER_GAMBLER_CHALLENGE_COUNT 12
// For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special. // For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special.
#define RESULTS_LINK_CONTEST 7 #define RESULTS_LINK_CONTEST 7
include/constants/field_specials.h
+52
View File
@@ -0,0 +1,52 @@
#ifndef GUARD_CONSTANTS_FIELD_SPECIALS_H
#define GUARD_CONSTANTS_FIELD_SPECIALS_H
// PC Locations
#define PC_LOCATION_OTHER 0
#define PC_LOCATION_BRENDANS_HOUSE 1
#define PC_LOCATION_MAYS_HOUSE 2
// SS Tidal Locations
#define SS_TIDAL_LOCATION_OTHER 0
#define SS_TIDAL_LOCATION_SLATEPORT 1
#define SS_TIDAL_LOCATION_LILYCOVE 2
#define SS_TIDAL_LOCATION_ROUTE124 3
#define SS_TIDAL_LOCATION_ROUTE131 4
// Scrollable Multichoice Menus
#define SCROLL_MULTI_NONE 0
#define SCROLL_MULTI_GLASS_WORKSHOP_VENDOR 1
#define SCROLL_MULTI_POKEMON_FAN_CLUB_RATER 2
#define SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1 3
#define SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2 4
#define SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR 5
#define SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR 6
#define SCROLL_MULTI_BERRY_POWDER_VENDOR 7
#define SCROLL_MULTI_BF_RECEPTIONIST 8
#define SCROLL_MULTI_BF_MOVE_TUTOR_1 9
#define SCROLL_MULTI_BF_MOVE_TUTOR_2 10
#define SCROLL_MULTI_SS_TIDAL_DESTINATION 11
#define SCROLL_MULTI_BATTLE_TENT_RULES 12
#define MAX_SCROLL_MULTI_ON_SCREEN 6
#define MAX_SCROLL_MULTI_LENGTH 16
// Dept Store Floor Numbers
#define DEPT_STORE_FLOORNUM_B4F 0
#define DEPT_STORE_FLOORNUM_B3F 1
#define DEPT_STORE_FLOORNUM_B2F 2
#define DEPT_STORE_FLOORNUM_B1F 3
#define DEPT_STORE_FLOORNUM_1F 4
#define DEPT_STORE_FLOORNUM_2F 5
#define DEPT_STORE_FLOORNUM_3F 6
#define DEPT_STORE_FLOORNUM_4F 7
#define DEPT_STORE_FLOORNUM_5F 8
#define DEPT_STORE_FLOORNUM_6F 9
#define DEPT_STORE_FLOORNUM_7F 10
#define DEPT_STORE_FLOORNUM_8F 11
#define DEPT_STORE_FLOORNUM_9F 12
#define DEPT_STORE_FLOORNUM_10F 13
#define DEPT_STORE_FLOORNUM_11F 14
#define DEPT_STORE_FLOORNUM_ROOFTOP 15
#endif // GUARD_CONSTANTS_FIELD_SPECIALS_H
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
+4 -4
View File
@@ -61,14 +61,14 @@
#define VAR_0x402E 0x402E #define VAR_0x402E 0x402E
#define VAR_FRONTIER_MANIAC_FACILITY 0x402F #define VAR_FRONTIER_MANIAC_FACILITY 0x402F
#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 #define VAR_FRONTIER_GAMBLER_CHALLENGE 0x4030
#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F 0x4031 #define VAR_FRONTIER_GAMBLER_SET_CHALLENGE 0x4031
#define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032 #define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032
#define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033 #define VAR_FRONTIER_GAMBLER_STATE 0x4033
#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
+11 -11
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);
@@ -19,17 +19,17 @@ bool32 ShouldDoRoxanneCall(void);
bool32 ShouldDoRivalRayquazaCall(void); bool32 ShouldDoRivalRayquazaCall(void);
bool32 CountSSTidalStep(u16 delta); bool32 CountSSTidalStep(u16 delta);
u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y); u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y);
void sub_813A128(void); void ShowScrollableMultichoice(void);
void sub_813A878(u8 a0); void FrontierGamblerSetWonOrLost(bool8 won);
u8 sub_813BADC(u8 a0); u8 sub_813BADC(u8 a0);
bool8 sub_813B9C0(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 warp0_in_pokecenter(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/global.tv.h
+1 -2
View File
@@ -4,8 +4,7 @@
enum enum
{ {
TVSHOW_OFF_AIR, TVSHOW_OFF_AIR,
TVSHOW_FAN_CLUB_LETTER,
TVSHOW_FAN_CLUB_LETTER = 1,
TVSHOW_RECENT_HAPPENINGS, TVSHOW_RECENT_HAPPENINGS,
TVSHOW_PKMN_FAN_CLUB_OPINIONS, TVSHOW_PKMN_FAN_CLUB_OPINIONS,
TVSHOW_UNKN_SHOWTYPE_04, TVSHOW_UNKN_SHOWTYPE_04,
include/party_menu.h
+35
View File
@@ -26,6 +26,41 @@ enum
PARTY_GIVE_ITEM, PARTY_GIVE_ITEM,
}; };
enum
{
TUTOR_MOVE_MEGA_PUNCH,
TUTOR_MOVE_SWORDS_DANCE,
TUTOR_MOVE_MEGA_KICK,
TUTOR_MOVE_BODY_SLAM,
TUTOR_MOVE_DOUBLE_EDGE,
TUTOR_MOVE_COUNTER,
TUTOR_MOVE_SEISMIC_TOSS,
TUTOR_MOVE_MIMIC,
TUTOR_MOVE_METRONOME,
TUTOR_MOVE_SOFT_BOILED,
TUTOR_MOVE_DREAM_EATER,
TUTOR_MOVE_THUNDER_WAVE,
TUTOR_MOVE_EXPLOSION,
TUTOR_MOVE_ROCK_SLIDE,
TUTOR_MOVE_SUBSTITUTE,
TUTOR_MOVE_DYNAMIC_PUNCH,
TUTOR_MOVE_ROLLOUT,
TUTOR_MOVE_PSYCH_UP,
TUTOR_MOVE_SNORE,
TUTOR_MOVE_ICY_WIND,
TUTOR_MOVE_ENDURE,
TUTOR_MOVE_MUD_SLAP,
TUTOR_MOVE_ICE_PUNCH,
TUTOR_MOVE_SWAGGER,
TUTOR_MOVE_SLEEP_TALK,
TUTOR_MOVE_SWIFT,
TUTOR_MOVE_DEFENSE_CURL,
TUTOR_MOVE_THUNDER_PUNCH,
TUTOR_MOVE_FIRE_PUNCH,
TUTOR_MOVE_FURY_CUTTER,
TUTOR_MOVE_COUNT
};
struct Struct203CEC8 struct Struct203CEC8
{ {
MainCallback exitCallback; MainCallback exitCallback;
include/slot_machine.h
+1
View File
@@ -4,6 +4,7 @@
#define NUM_REELS 3 #define NUM_REELS 3
#define REEL_NUM_TAGS 21 #define REEL_NUM_TAGS 21
#define REEL_TAG_HEIGHT 24 #define REEL_TAG_HEIGHT 24
#define SLOT_MACHINE_COUNT 12
// Lucky Flags // Lucky Flags
#define LUCKY_BIAS_REPLAY (1 << 0) #define LUCKY_BIAS_REPLAY (1 << 0)
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/clock.c
+1 -1
View File
@@ -25,7 +25,7 @@ static void InitTimeBasedEvents(void)
void DoTimeBasedEvents(void) void DoTimeBasedEvents(void)
{ {
if (FlagGet(FLAG_SYS_CLOCK_SET) && !sub_813B9C0()) if (FlagGet(FLAG_SYS_CLOCK_SET) && !InPokemonCenter())
{ {
RtcCalcLocalTime(); RtcCalcLocalTime();
UpdatePerDay(&gLocalTime); UpdatePerDay(&gLocalTime);
src/data/battle_frontier/battle_frontier_exchange_corner.h
+99
View File
@@ -0,0 +1,99 @@
static const u16 sFrontierExchangeCorner_Decor1[] =
{
DECOR_KISS_POSTER,
DECOR_KISS_CUSHION,
DECOR_SMOOCHUM_DOLL,
DECOR_TOGEPI_DOLL,
DECOR_MEOWTH_DOLL,
DECOR_CLEFAIRY_DOLL,
DECOR_DITTO_DOLL,
DECOR_CYNDAQUIL_DOLL,
DECOR_CHIKORITA_DOLL,
DECOR_TOTODILE_DOLL,
0xFFFF
};
static const u16 sFrontierExchangeCorner_Decor2[] =
{
DECOR_LAPRAS_DOLL,
DECOR_SNORLAX_DOLL,
DECOR_VENUSAUR_DOLL,
DECOR_CHARIZARD_DOLL,
DECOR_BLASTOISE_DOLL,
0xFFFF
};
static const u16 sFrontierExchangeCorner_Vitamins[] =
{
ITEM_PROTEIN,
ITEM_CALCIUM,
ITEM_IRON,
ITEM_ZINC,
ITEM_CARBOS,
ITEM_HP_UP,
0xFFFF
};
static const u16 sFrontierExchangeCorner_HoldItems[] =
{
ITEM_LEFTOVERS,
ITEM_WHITE_HERB,
ITEM_QUICK_CLAW,
ITEM_MENTAL_HERB,
ITEM_BRIGHT_POWDER,
ITEM_CHOICE_BAND,
ITEM_KINGS_ROCK,
ITEM_FOCUS_BAND,
ITEM_SCOPE_LENS,
0xFFFF
};
static const u8 *const sFrontierExchangeCorner_Decor1Descriptions[] =
{
BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA,
BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0,
BattleFrontier_BattlePointExchangeServiceCorner_Text_260201,
BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F,
BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B,
BattleFrontier_BattlePointExchangeServiceCorner_Text_260287,
BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5,
BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0,
BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F,
BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E,
gText_Exit,
};
static const u8 *const sFrontierExchangeCorner_Decor2Descriptions[] =
{
BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
gText_Exit
};
static const u8 *const sFrontierExchangeCorner_VitaminsDescriptions[] =
{
BattleFrontier_BattlePointExchangeServiceCorner_Text_260397,
BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE,
BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6,
BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E,
BattleFrontier_BattlePointExchangeServiceCorner_Text_260436,
BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C,
gText_Exit
};
static const u8 *const sFrontierExchangeCorner_HoldItemsDescriptions[] =
{
BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A,
BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC,
BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8,
BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F,
BattleFrontier_BattlePointExchangeServiceCorner_Text_260542,
BattleFrontier_BattlePointExchangeServiceCorner_Text_260575,
BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8,
BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2,
BattleFrontier_BattlePointExchangeServiceCorner_Text_260613,
gText_Exit
};
src/data/pokemon/tutor_learnsets.h
+1 -32
View File
@@ -1,35 +1,4 @@
#define TUTOR_MOVE_MEGA_PUNCH 0 const u16 gTutorMoves[TUTOR_MOVE_COUNT] =
#define TUTOR_MOVE_SWORDS_DANCE 1
#define TUTOR_MOVE_MEGA_KICK 2
#define TUTOR_MOVE_BODY_SLAM 3
#define TUTOR_MOVE_DOUBLE_EDGE 4
#define TUTOR_MOVE_COUNTER 5
#define TUTOR_MOVE_SEISMIC_TOSS 6
#define TUTOR_MOVE_MIMIC 7
#define TUTOR_MOVE_METRONOME 8
#define TUTOR_MOVE_SOFT_BOILED 9
#define TUTOR_MOVE_DREAM_EATER 10
#define TUTOR_MOVE_THUNDER_WAVE 11
#define TUTOR_MOVE_EXPLOSION 12
#define TUTOR_MOVE_ROCK_SLIDE 13
#define TUTOR_MOVE_SUBSTITUTE 14
#define TUTOR_MOVE_DYNAMIC_PUNCH 15
#define TUTOR_MOVE_ROLLOUT 16
#define TUTOR_MOVE_PSYCH_UP 17
#define TUTOR_MOVE_SNORE 18
#define TUTOR_MOVE_ICY_WIND 19
#define TUTOR_MOVE_ENDURE 20
#define TUTOR_MOVE_MUD_SLAP 21
#define TUTOR_MOVE_ICE_PUNCH 22
#define TUTOR_MOVE_SWAGGER 23
#define TUTOR_MOVE_SLEEP_TALK 24
#define TUTOR_MOVE_SWIFT 25
#define TUTOR_MOVE_DEFENSE_CURL 26
#define TUTOR_MOVE_THUNDER_PUNCH 27
#define TUTOR_MOVE_FIRE_PUNCH 28
#define TUTOR_MOVE_FURY_CUTTER 29
const u16 gTutorMoves[] =
{ {
[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
+701 -657
View File
File diff suppressed because it is too large Load Diff
src/frontier_util.c
+3 -3
View File
@@ -794,15 +794,15 @@ static void sub_81A17A0(void)
case 0: case 0:
break; break;
case 1: case 1:
sub_813A878(0); FrontierGamblerSetWonOrLost(FALSE);
VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.field_CA8); VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.field_CA8);
break; break;
case 4: case 4:
sub_813A878(0); FrontierGamblerSetWonOrLost(FALSE);
VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.field_CA8); VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.field_CA8);
break; break;
case 3: case 3:
sub_813A878(1); FrontierGamblerSetWonOrLost(TRUE);
VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.field_CA8); VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.field_CA8);
break; break;
case 2: case 2:
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/option_menu.c
+30 -23
View File
@@ -48,6 +48,13 @@ enum
WIN_OPTIONS WIN_OPTIONS
}; };
#define YPOS_TEXTSPEED (MENUITEM_TEXTSPEED * 16)
#define YPOS_BATTLESCENE (MENUITEM_BATTLESCENE * 16)
#define YPOS_BATTLESTYLE (MENUITEM_BATTLESTYLE * 16)
#define YPOS_SOUND (MENUITEM_SOUND * 16)
#define YPOS_BUTTONMODE (MENUITEM_BUTTONMODE * 16)
#define YPOS_FRAMETYPE (MENUITEM_FRAMETYPE * 16)
// this file's functions // this file's functions
static void Task_OptionMenuFadeIn(u8 taskId); static void Task_OptionMenuFadeIn(u8 taskId);
static void Task_OptionMenuProcessInput(u8 taskId); static void Task_OptionMenuProcessInput(u8 taskId);
@@ -80,13 +87,13 @@ static const u8 sEqualSignGfx[] = INCBIN_U8("graphics/misc/option_menu_equals_si
static const u8 *const sOptionMenuItemsNames[MENUITEM_COUNT] = static const u8 *const sOptionMenuItemsNames[MENUITEM_COUNT] =
{ {
gText_TextSpeed, [MENUITEM_TEXTSPEED] = gText_TextSpeed,
gText_BattleScene, [MENUITEM_BATTLESCENE] = gText_BattleScene,
gText_BattleStyle, [MENUITEM_BATTLESTYLE] = gText_BattleStyle,
gText_Sound, [MENUITEM_SOUND] = gText_Sound,
gText_ButtonMode, [MENUITEM_BUTTONMODE] = gText_ButtonMode,
gText_Frame, [MENUITEM_FRAMETYPE] = gText_Frame,
gText_OptionMenuCancel, [MENUITEM_CANCEL] = gText_OptionMenuCancel,
}; };
static const struct WindowTemplate sOptionMenuWinTemplates[] = static const struct WindowTemplate sOptionMenuWinTemplates[] =
@@ -280,12 +287,12 @@ static void Task_OptionMenuProcessInput(u8 taskId)
if (gTasks[taskId].data[TD_MENUSELECTION] > 0) if (gTasks[taskId].data[TD_MENUSELECTION] > 0)
gTasks[taskId].data[TD_MENUSELECTION]--; gTasks[taskId].data[TD_MENUSELECTION]--;
else else
gTasks[taskId].data[TD_MENUSELECTION] = 6; gTasks[taskId].data[TD_MENUSELECTION] = MENUITEM_CANCEL;
HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]); HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
} }
else if (gMain.newKeys & DPAD_DOWN) else if (gMain.newKeys & DPAD_DOWN)
{ {
if (gTasks[taskId].data[TD_MENUSELECTION] <= 5) if (gTasks[taskId].data[TD_MENUSELECTION] < MENUITEM_CANCEL)
gTasks[taskId].data[TD_MENUSELECTION]++; gTasks[taskId].data[TD_MENUSELECTION]++;
else else
gTasks[taskId].data[TD_MENUSELECTION] = 0; gTasks[taskId].data[TD_MENUSELECTION] = 0;
@@ -431,7 +438,7 @@ static void TextSpeed_DrawChoices(u8 selection)
styles[2] = 0; styles[2] = 0;
styles[selection] = 1; styles[selection] = 1;
DrawOptionMenuChoice(gText_TextSpeedSlow, 104, 0, styles[0]); DrawOptionMenuChoice(gText_TextSpeedSlow, 104, YPOS_TEXTSPEED, styles[0]);
widthSlow = GetStringWidth(1, gText_TextSpeedSlow, 0); widthSlow = GetStringWidth(1, gText_TextSpeedSlow, 0);
widthMid = GetStringWidth(1, gText_TextSpeedMid, 0); widthMid = GetStringWidth(1, gText_TextSpeedMid, 0);
@@ -439,9 +446,9 @@ static void TextSpeed_DrawChoices(u8 selection)
widthMid -= 94; widthMid -= 94;
xMid = (widthSlow - widthMid - widthFast) / 2 + 104; xMid = (widthSlow - widthMid - widthFast) / 2 + 104;
DrawOptionMenuChoice(gText_TextSpeedMid, xMid, 0, styles[1]); DrawOptionMenuChoice(gText_TextSpeedMid, xMid, YPOS_TEXTSPEED, styles[1]);
DrawOptionMenuChoice(gText_TextSpeedFast, GetStringRightAlignXOffset(1, gText_TextSpeedFast, 198), 0, styles[2]); DrawOptionMenuChoice(gText_TextSpeedFast, GetStringRightAlignXOffset(1, gText_TextSpeedFast, 198), YPOS_TEXTSPEED, styles[2]);
} }
static u8 BattleScene_ProcessInput(u8 selection) static u8 BattleScene_ProcessInput(u8 selection)
@@ -463,8 +470,8 @@ static void BattleScene_DrawChoices(u8 selection)
styles[1] = 0; styles[1] = 0;
styles[selection] = 1; styles[selection] = 1;
DrawOptionMenuChoice(gText_BattleSceneOn, 104, 16, styles[0]); DrawOptionMenuChoice(gText_BattleSceneOn, 104, YPOS_BATTLESCENE, styles[0]);
DrawOptionMenuChoice(gText_BattleSceneOff, GetStringRightAlignXOffset(1, gText_BattleSceneOff, 198), 16, styles[1]); DrawOptionMenuChoice(gText_BattleSceneOff, GetStringRightAlignXOffset(1, gText_BattleSceneOff, 198), YPOS_BATTLESCENE, styles[1]);
} }
static u8 BattleStyle_ProcessInput(u8 selection) static u8 BattleStyle_ProcessInput(u8 selection)
@@ -486,8 +493,8 @@ static void BattleStyle_DrawChoices(u8 selection)
styles[1] = 0; styles[1] = 0;
styles[selection] = 1; styles[selection] = 1;
DrawOptionMenuChoice(gText_BattleStyleShift, 104, 32, styles[0]); DrawOptionMenuChoice(gText_BattleStyleShift, 104, YPOS_BATTLESTYLE, styles[0]);
DrawOptionMenuChoice(gText_BattleStyleSet, GetStringRightAlignXOffset(1, gText_BattleStyleSet, 198), 32, styles[1]); DrawOptionMenuChoice(gText_BattleStyleSet, GetStringRightAlignXOffset(1, gText_BattleStyleSet, 198), YPOS_BATTLESTYLE, styles[1]);
} }
static u8 Sound_ProcessInput(u8 selection) static u8 Sound_ProcessInput(u8 selection)
@@ -510,8 +517,8 @@ static void Sound_DrawChoices(u8 selection)
styles[1] = 0; styles[1] = 0;
styles[selection] = 1; styles[selection] = 1;
DrawOptionMenuChoice(gText_SoundMono, 104, 48, styles[0]); DrawOptionMenuChoice(gText_SoundMono, 104, YPOS_SOUND, styles[0]);
DrawOptionMenuChoice(gText_SoundStereo, GetStringRightAlignXOffset(1, gText_SoundStereo, 198), 48, styles[1]); DrawOptionMenuChoice(gText_SoundStereo, GetStringRightAlignXOffset(1, gText_SoundStereo, 198), YPOS_SOUND, styles[1]);
} }
static u8 FrameType_ProcessInput(u8 selection) static u8 FrameType_ProcessInput(u8 selection)
@@ -568,8 +575,8 @@ static void FrameType_DrawChoices(u8 selection)
text[i] = EOS; text[i] = EOS;
DrawOptionMenuChoice(gText_FrameType, 104, 80, 0); DrawOptionMenuChoice(gText_FrameType, 104, YPOS_FRAMETYPE, 0);
DrawOptionMenuChoice(text, 128, 80, 1); DrawOptionMenuChoice(text, 128, YPOS_FRAMETYPE, 1);
} }
static u8 ButtonMode_ProcessInput(u8 selection) static u8 ButtonMode_ProcessInput(u8 selection)
@@ -605,7 +612,7 @@ static void ButtonMode_DrawChoices(u8 selection)
styles[2] = 0; styles[2] = 0;
styles[selection] = 1; styles[selection] = 1;
DrawOptionMenuChoice(gText_ButtonTypeNormal, 104, 64, styles[0]); DrawOptionMenuChoice(gText_ButtonTypeNormal, 104, YPOS_BUTTONMODE, styles[0]);
widthNormal = GetStringWidth(1, gText_ButtonTypeNormal, 0); widthNormal = GetStringWidth(1, gText_ButtonTypeNormal, 0);
widthLR = GetStringWidth(1, gText_ButtonTypeLR, 0); widthLR = GetStringWidth(1, gText_ButtonTypeLR, 0);
@@ -613,9 +620,9 @@ static void ButtonMode_DrawChoices(u8 selection)
widthLR -= 94; widthLR -= 94;
xLR = (widthNormal - widthLR - widthLA) / 2 + 104; xLR = (widthNormal - widthLR - widthLA) / 2 + 104;
DrawOptionMenuChoice(gText_ButtonTypeLR, xLR, 64, styles[1]); DrawOptionMenuChoice(gText_ButtonTypeLR, xLR, YPOS_BUTTONMODE, styles[1]);
DrawOptionMenuChoice(gText_ButtonTypeLEqualsA, GetStringRightAlignXOffset(1, gText_ButtonTypeLEqualsA, 198), 64, styles[2]); DrawOptionMenuChoice(gText_ButtonTypeLEqualsA, GetStringRightAlignXOffset(1, gText_ButtonTypeLEqualsA, 198), YPOS_BUTTONMODE, styles[2]);
} }
static void DrawTextOption(void) static void DrawTextOption(void)
src/overworld.c
+1 -1
View File
@@ -1759,7 +1759,7 @@ void CB2_ContinueSavedGame(void)
static void FieldClearVBlankHBlankCallbacks(void) static void FieldClearVBlankHBlankCallbacks(void)
{ {
if (warp0_in_pokecenter() == TRUE) if (UsedPokemonCenterWarp() == TRUE)
CloseLink(); CloseLink();
if (gWirelessCommType != 0) if (gWirelessCommType != 0)
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());
} }
} }
src/region_map.c
+6 -5
View File
@@ -24,6 +24,7 @@
#include "region_map.h" #include "region_map.h"
#include "constants/region_map_sections.h" #include "constants/region_map_sections.h"
#include "heal_location.h" #include "heal_location.h"
#include "constants/field_specials.h"
#include "constants/heal_locations.h" #include "constants/heal_locations.h"
#include "constants/map_types.h" #include "constants/map_types.h"
#include "constants/rgb.h" #include "constants/rgb.h"
@@ -1144,20 +1145,20 @@ static void RegionMap_InitializeStateBasedOnSSTidalLocation(void)
x = 0; x = 0;
switch (GetSSTidalLocation(&mapGroup, &mapNum, &xOnMap, &yOnMap)) switch (GetSSTidalLocation(&mapGroup, &mapNum, &xOnMap, &yOnMap))
{ {
case 1: case SS_TIDAL_LOCATION_SLATEPORT:
gRegionMap->mapSecId = MAPSEC_SLATEPORT_CITY; gRegionMap->mapSecId = MAPSEC_SLATEPORT_CITY;
break; break;
case 2: case SS_TIDAL_LOCATION_LILYCOVE:
gRegionMap->mapSecId = MAPSEC_LILYCOVE_CITY; gRegionMap->mapSecId = MAPSEC_LILYCOVE_CITY;
break; break;
case 3: case SS_TIDAL_LOCATION_ROUTE124:
gRegionMap->mapSecId = MAPSEC_ROUTE_124; gRegionMap->mapSecId = MAPSEC_ROUTE_124;
break; break;
case 4: case SS_TIDAL_LOCATION_ROUTE131:
gRegionMap->mapSecId = MAPSEC_ROUTE_131; gRegionMap->mapSecId = MAPSEC_ROUTE_131;
break; break;
default: default:
case 0: case SS_TIDAL_LOCATION_OTHER:
mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
gRegionMap->mapSecId = mapHeader->regionMapSectionId; gRegionMap->mapSecId = mapHeader->regionMapSectionId;
src/script_menu.c
+3 -2
View File
@@ -13,6 +13,7 @@
#include "strings.h" #include "strings.h"
#include "task.h" #include "task.h"
#include "text.h" #include "text.h"
#include "constants/field_specials.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/songs.h" #include "constants/songs.h"
@@ -1493,8 +1494,8 @@ static void sub_80E2578(void)
count = temp; count = temp;
if (count == 7) if (count == 7)
{ {
gSpecialVar_0x8004 = 11; gSpecialVar_0x8004 = SCROLL_MULTI_SS_TIDAL_DESTINATION;
sub_813A128(); ShowScrollableMultichoice();
} }
else else
{ {
src/tv.c
+2 -2
View File
@@ -2786,11 +2786,11 @@ bool8 GetPriceReduction(u8 newsKind)
{ {
u8 i; u8 i;
if (newsKind == 0) if (newsKind == POKENEWS_NONE)
{ {
return FALSE; return FALSE;
} }
for (i = 0; i < 16; i ++) for (i = 0; i < POKE_NEWS_COUNT; i ++)
{ {
if (gSaveBlock1Ptr->pokeNews[i].kind == newsKind) if (gSaveBlock1Ptr->pokeNews[i].kind == newsKind)
{ {