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

Merge branch 'master' into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2019-12-06 02:34:54 -05:00
committed by GitHub
parent cb90f22c5e 7beddd16dd
commit c51e0f3bae
106 changed files with 1965 additions and 1418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
data/scripts/battle_pike.inc
View File

@@ -3,8 +3,8 @@ BattleFrontier_BattlePikeRoomNormal_MapScripts_2C3E1B: @ 82C3E1B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp
BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25
battlepike_setroomobjects
battlepike_getroomtype
pike_setroomobjects
pike_getroomtype
switch VAR_RESULT
case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1
case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1
@@ -48,7 +48,7 @@ BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE
BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 82C3EE8
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_LINK_RECEPTIONIST
battlepike_getroomtype
pike_getroomtype
compare VAR_RESULT, PIKE_ROOM_STATUS
goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35
compare VAR_RESULT, PIKE_ROOM_HARD_BATTLE
@@ -89,14 +89,14 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp:: @ 82C3F64
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F
battlepike_getstreak
pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
battlepike_setstreak VAR_RESULT
pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
battlepike_setnextroom
battlepike_getroomtype
pike_setnextroom
pike_getroomtype
switch VAR_RESULT
case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom
case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom
@@ -152,18 +152,18 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D:: @ 82C408D
end
BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2
battlepike_ispartyfullhealth
pike_ispartyfullhealth
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing
compare VAR_RESULT, TRUE
call_if_ne BattleFrontier_BattlePikeRoom_EventScript_EnableHealing
battlepike_getstreak
pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
battlepike_setstreak VAR_RESULT
pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
battlepike_isfinalroom
pike_isfinalroom
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom
compare VAR_RESULT, FALSE
@@ -172,11 +172,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2
end
BattleFrontier_BattlePikeRoom_EventScript_DisableHealing:: @ 82C4128
battlepike_nohealing TRUE
pike_nohealing TRUE
return
BattleFrontier_BattlePikeRoom_EventScript_EnableHealing:: @ 82C4136
battlepike_nohealing FALSE
pike_nohealing FALSE
return
BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom:: @ 82C4144
@@ -194,20 +194,19 @@ BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C
return
BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174
setvar VAR_0x8004, BATTLE_PIKE_FUNC_7
special CallBattlePikeFunction
battlepike_ispartyfullhealth
pike_exitwildmonroom
pike_ispartyfullhealth
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing
compare VAR_RESULT, TRUE
call_if_ne BattleFrontier_BattlePikeRoom_EventScript_EnableHealing
battlepike_getstreak
pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
battlepike_setstreak VAR_RESULT
pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
battlepike_isfinalroom
pike_isfinalroom
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom
compare VAR_RESULT, FALSE

27
data/scripts/cable_club.inc
View File

@@ -49,7 +49,7 @@ CableClub_EventScript_DistributeEonTicket:: @ 8276B23
end
@ Unused?
OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62
CableClub_EventScript_MysteryGiftThankYou2:: @ 8276B62
msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_DEFAULT
release
end
@@ -301,7 +301,7 @@ CableClub_EventScript_Colosseum:: @ 8276EB7
end
CableClub_EventScript_SelectBattleMode:: @ 8276EC2
message CableClub_Text_WhichBattleMode
message CableClub_Text_PlayWhichBattleMode
waitmessage
multichoice 0, 0, MULTI_BATTLE_MODE, 0
switch VAR_RESULT
@@ -795,39 +795,40 @@ EventScript_TradeCenter_Chair3:: @ 8277413
waitstate
end
@ VAR_TEMP_1 for below scripts set by ReceiveGiftItem
EventScript_RecordCenter_Spot0:: @ 827741D
setvar VAR_0x8005, 0
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
compare VAR_TEMP_1, ITEM_NONE
goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot1:: @ 8277432
setvar VAR_0x8005, 1
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
compare VAR_TEMP_1, ITEM_NONE
goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot2:: @ 8277447
setvar VAR_0x8005, 2
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
compare VAR_TEMP_1, ITEM_NONE
goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot3:: @ 827745C
setvar VAR_0x8005, 3
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
compare VAR_TEMP_1, ITEM_NONE
goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
RecordCorner_EventScript_277471:: @ 8277471
RecordCorner_EventScript_ReceivedGiftItem:: @ 8277471
bufferitemname 1, VAR_TEMP_1
message RecordCorner_Text_PlayerSentOverOneX
waitmessage
@@ -868,7 +869,7 @@ TradeCenter_EventScript_Attendant:: @ 82774B6
closemessage
end
RecordCorner_EventScript_2774C6:: @ 82774C6
RecordCorner_EventScript_Attendant:: @ 82774C6
compare VAR_TEMP_0, 0
goto_if_ne RecordCorner_EventScript_AlreadyMixed
special Script_FacePlayer
@@ -1090,7 +1091,7 @@ CableClub_EventScript_WirelessTrade:: @ 827780D
end
CableClub_EventScript_WirelessBattleSelect:: @ 827783B
message CableClub_Text_WhichBattleMode
message CableClub_Text_PlayWhichBattleMode
waitmessage
multichoice 0, 0, MULTI_BATTLE_MODE, 0
switch VAR_RESULT

4
data/scripts/day_care.inc
View File

@@ -262,7 +262,7 @@ Route117_PokemonDayCare_Movement_RetrieveDaycareMon: @ 8291F47
step_end
@ Unused. Possibly a commented script, or a typo end added to the above Movement script
Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B
Route117_PokemonDayCare_EventScript_UnusedEnd:: @ 8291F5B
end
Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
@@ -279,7 +279,7 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
end
@ Unused
Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
Route117_PokemonDayCare_EventScript_UnusedRetrieveMon:: @ 8291F95
special ShowDaycareLevelMenu
waitstate
compare VAR_RESULT, 2

12
data/scripts/field_poison.inc
View File

@@ -29,15 +29,13 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8
message gText_PlayerWhitedOut
waitmessage
waitbuttonpress
setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN
special CallBattlePikeFunction
compare VAR_RESULT, 1
pike_inchallenge
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattlePike_EventScript_Retire
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
special CallBattlePyramidFunction
compare VAR_RESULT, 1
pyramid_inchallenge
compare VAR_RESULT, 1 @ On Pyramid floor
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 2
compare VAR_RESULT, 2 @ On Pyramid peak
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
trainerhill_inchallenge
compare VAR_RESULT, TRUE

3
data/scripts/mauville_man.inc
View File

@@ -289,7 +289,8 @@ MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales: @ 828E7EE
.string "Then tell me, have you any tales that\n"
.string "are even remotely legendary?$"
MauvilleCity_PokemonCenter_1F_Text_28E844: @ 828E844
@ Unused
MauvilleCity_PokemonCenter_1F_Text_HearAnotherLegendaryTale: @ 828E844
.string "Incidentally… Would you care to hear\n"
.string "another legendary tale?$"

3
data/scripts/obtain_item.inc
View File

@@ -128,8 +128,7 @@ EventScript_PickUpItem:: @ 8271C3A
waitfanfare
waitmessage
bufferitemnameplural 1, VAR_0x8004, VAR_0x8005
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
special CallBattlePyramidFunction
pyramid_inchallenge
compare VAR_RESULT, 1
goto_if_eq EventScript_PutBattlePyramidItemInBag
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT