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

Merge branch 'master' into event-flags

Browse Source
This commit is contained in:
garak
2018-10-17 12:30:45 -04:00
committed by GitHub
parent ff97873c30 f67bbbdaaa
commit 7d88b9647f
56 changed files with 1280 additions and 2679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
data/event_scripts.s
View File

@@ -431,7 +431,7 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/SecretBase_YellowCave3/scripts.inc"
.include "data/maps/SecretBase_YellowCave4/scripts.inc"
gUnknown_0823B4BB:: @ 823B4BB
EventScript_SecretBasePC:: @ 823B4BB
lockall
playse 2
message Text_276805
@@ -492,7 +492,7 @@ EventScript_23B585:: @ 823B585
special sub_80E9C88
end
gUnknown_0823B589:: @ 823B589
EventScript_RecordMixingSecretBasePC:: @ 823B589
lockall
message Text_276805
playse 2
@@ -581,13 +581,13 @@ EventScript_23B680:: @ 823B680
special sub_80EBB28
end
gUnknown_0823B684:: @ 823B684
EventScript_SecretBaseSandOrnament:: @ 823B684
special sub_80EBE7C
dofieldeffect 52
waitstate
end
gUnknown_0823B68C:: @ 823B68C
EventScript_SecretBaseShieldOrToyTV:: @ 823B68C
special sub_80FAC78
compare VAR_RESULT, 0
goto_eq EventScript_23B6BC
@@ -1685,7 +1685,7 @@ EventScript_271CA1:: @ 8271CA1
setvar VAR_RESULT, 0
return
EventScript_271CB7:: @ 8271CB7
EventScript_HiddenItemScript:: @ 8271CB7
lockall
waitse
giveitem VAR_0x8005, 1
@@ -1761,7 +1761,7 @@ EventScript_271D89:: @ 8271D89
release
end
EventScript_271D92:: @ 8271D92
EventScript_PC:: @ 8271D92
lockall
setvar VAR_0x8004, 0
special DoPCTurnOnEffect
@@ -1902,7 +1902,7 @@ Route109_EventScript_271E95:: @ 8271E95
setvar VAR_0x4096, 0
return
EventScript_271EA0:: @ 8271EA0
EventScript_UseSurf:: @ 8271EA0
checkpartymove MOVE_SURF
compare VAR_RESULT, 6
goto_eq EventScript_271ED6
@@ -2201,7 +2201,7 @@ SSTidalRooms_EventScript_272083:: @ 8272083
fadescreen 0
return
EventScript_27208F:: @ 827208F
EventScript_RegionMap:: @ 827208F
lockall
msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, 4
fadescreen 1
@@ -3074,31 +3074,31 @@ Movement_2725CB:: @ 82725CB
walk_up
step_end
EventScript_2725CE:: @ 82725CE
EventScript_PictureBookShelf:: @ 82725CE
msgbox Text_2A81E5, 3
end
EventScript_2725D7:: @ 82725D7
EventScript_BookShelf:: @ 82725D7
msgbox Text_2A820D, 3
end
EventScript_2725E0:: @ 82725E0
EventScript_PokemonCenterBookshelf:: @ 82725E0
msgbox Text_2A8232, 3
end
EventScript_2725E9:: @ 82725E9
EventScript_Vase:: @ 82725E9
msgbox Text_2A8276, 3
end
EventScript_2725F2:: @ 82725F2
EventScript_TrashCan:: @ 82725F2
msgbox Text_2A82B3, 3
end
EventScript_2725FB:: @ 82725FB
EventScript_ShopShelf:: @ 82725FB
msgbox Text_2A82BF, 3
end
EventScript_272604:: @ 8272604
EventScript_Blueprint:: @ 8272604
msgbox Text_2A82F7, 3
end
@@ -3322,7 +3322,7 @@ EventScript_2736B3:: @ 82736B3
msgbox gUnknown_08272C98, 3
end
EventScript_2736BC:: @ 82736BC
EventScript_Poison:: @ 82736BC
lockall
special sub_80F972C
waitstate
@@ -3565,7 +3565,7 @@ RustboroCity_DevonCorp_2F_EventScript_273811:: @ 8273811
release
end
EventScript_27381B:: @ 827381B
EventScript_Questionnaire:: @ 827381B
lockall
msgbox gUnknown_0827339F, 5
compare VAR_RESULT, 0
@@ -5859,7 +5859,7 @@ EventScript_2926F8:: @ 82926F8
.include "data/scripts/players_house.inc"
EventScript_292DE5:: @ 8292DE5
EventScript_RunningShoesManual:: @ 8292DE5
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, 3
end
@@ -6010,7 +6010,7 @@ MirageTower_3F_MapScript2_2A8327: @ 82A8327
MtPyre_2F_MapScript2_2A8327: @ 82A8327
SkyPillar_2F_MapScript2_2A8327: @ 82A8327
SkyPillar_4F_MapScript2_2A8327: @ 82A8327
map_script_2 VAR_ICE_STEP_COUNT, 0, gUnknown_082A8337
map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole
.2byte 0
GraniteCave_B1F_MapScript1_2A8331: @ 82A8331
@@ -6020,7 +6020,7 @@ MtPyre_2F_MapScript1_2A8331: @ 82A8331
copyvar VAR_ICE_STEP_COUNT, 0x1
end
gUnknown_082A8337:: @ 82A8337
EventScript_FallDownHole:: @ 82A8337
lockall
delay 20
applymovement 255, GraniteCave_B1F_Movement_2A8369
@@ -11691,7 +11691,7 @@ TrainerHill_Roof_MapScript2_2C8381: @ 82C8381
map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF
.2byte 0
TrainerHill_1F_EventScript_2C8393:: @ 82C8393
EventScript_TrainerHillTimer:: @ 82C8393
lockall
setvar VAR_0x8004, 7
special sp194_trainer_tower

2
data/maps/LittlerootTown_BrendansHouse_2F/events.inc
View File

@@ -20,7 +20,7 @@ LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320
warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328
bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, gUnknown_081F860D
bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, EventScript_PlayerPCMale
bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F8656
bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_292781
bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F865F

2
data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
View File

@@ -245,7 +245,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609
walk_in_place_fastest_left
step_end
gUnknown_081F860D:: @ 81F860D
EventScript_PlayerPCMale:: @ 81F860D
lockall
checkplayergender
compare VAR_RESULT, 0

2
data/maps/LittlerootTown_MaysHouse_2F/events.inc
View File

@@ -23,7 +23,7 @@ LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608
bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F865F
bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F8656
bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_29278D
bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, gUnknown_081F9553
bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PlayerPCFemale
LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638
map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents

2
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
View File

@@ -301,7 +301,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A
msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, 4
return
gUnknown_081F9553:: @ 81F9553
EventScript_PlayerPCFemale:: @ 81F9553
lockall
checkplayergender
compare VAR_RESULT, 0

2
data/maps/SootopolisCity/scripts.inc
View File

@@ -927,7 +927,7 @@ SootopolisCity_EventScript_1E6154:: @ 81E6154
msgbox SootopolisCity_Text_1E65C8, 3
end
SootopolisCity_EventScript_1E615D:: @ 81E615D
EventScript_ClosedSootopolisDoor:: @ 81E615D
msgbox SootopolisCity_Text_1E6604, 3
end

16
data/scripts/cable_club.inc
View File

@@ -474,7 +474,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
release
compare VAR_0x8004, 5
goto_eq OldaleTown_PokemonCenter_2F_EventScript_277036
special sub_809D2BC
special SetCableClubWarp
warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8
special sub_80AF948
waitstate
@@ -486,7 +486,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B
return
OldaleTown_PokemonCenter_2F_EventScript_277036:: @ 8277036
special sub_809D2BC
special SetCableClubWarp
warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8
special sub_80AF948
waitstate
@@ -576,7 +576,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A
closedoor 9, 1
waitdooranim
release
special sub_809D2BC
special SetCableClubWarp
setwarp MAP_TRADE_CENTER, 255, 5, 8
special sub_80AF948
waitstate
@@ -651,7 +651,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
closedoor 9, 1
waitdooranim
release
special sub_809D2BC
special SetCableClubWarp
setwarp MAP_RECORD_CORNER, 255, 8, 9
special sub_80AF948
waitstate
@@ -702,7 +702,7 @@ MossdeepCity_GameCorner_1F_EventScript_2772F9:: @ 82772F9
end
OldaleTown_PokemonCenter_2F_EventScript_277306:: @ 8277306
special sub_809D2BC
special SetCableClubWarp
special sub_80AF948
waitstate
end
@@ -784,7 +784,7 @@ MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360
walk_up
step_end
gUnknown_08277365:: @ 8277365
EventScript_CableBoxResults:: @ 8277365
lockall
setvar VAR_0x8004, 0
special ShowLinkBattleRecords
@@ -1050,7 +1050,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
closedoor 5, 1
waitdooranim
special sub_8018090
special sub_809D2BC
special SetCableClubWarp
warpteleport2 MAP_UNION_ROOM, 255, 7, 11
waitstate
special UnionRoomSpecial
@@ -1392,7 +1392,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A
waitstate
end
OldaleTown_PokemonCenter_2F_EventScript_277B8A:: @ 8277B8A
EventScript_WirelessBoxResults:: @ 8277B8A
lockall
checkflag FLAG_SYS_POKEDEX_GET
goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27733F

2
data/scripts/day_care.inc
View File

@@ -289,7 +289,7 @@ Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
release
end
Route117_PokemonDayCare_EventScript_291FC0:: @ 8291FC0
EventScript_EggHatch:: @ 8291FC0
lockall
msgbox Text_292668, 4
special EggHatch

8
data/scripts/field_move_scripts.inc
View File

@@ -223,7 +223,7 @@ FieryPath_Text_290A16: @ 8290A16
.string "STRENGTH made it possible to move\n"
.string "boulders around.$"
EventScript_290A49:: @ 8290A49
EventScript_UseWaterfall:: @ 8290A49
lockall
checkpartymove MOVE_WATERFALL
compare VAR_RESULT, 6
@@ -237,7 +237,7 @@ EventScript_290A49:: @ 8290A49
dofieldeffect 43
goto EventScript_290A8C
EventScript_290A83:: @ 8290A83
EventScript_CannotUseWaterfall:: @ 8290A83
lockall
EventScript_290A84:: @ 8290A84
@@ -258,7 +258,7 @@ Text_290AC3: @ 8290AC3
Text_290AFC: @ 8290AFC
.string "{STR_VAR_1} used WATERFALL.$"
EventScript_290B0F:: @ 8290B0F
EventScript_UseDive:: @ 8290B0F
lockall
checkpartymove MOVE_DIVE
compare VAR_RESULT, 6
@@ -283,7 +283,7 @@ EventScript_290B58:: @ 8290B58
releaseall
end
EventScript_290B5A:: @ 8290B5A
EventScript_UseDiveUnderwater:: @ 8290B5A
lockall
checkpartymove MOVE_DIVE
compare VAR_RESULT, 6

4
data/scripts/secret_power_tm.inc
View File

@@ -104,10 +104,10 @@ Route111_Movement_276696: @ 8276696
walk_down
step_end
EventScript_2766A2:: @ 82766A2
EventScript_SecretPower1:: @ 82766A2
special sub_80EB290
end
EventScript_2766A6:: @ 82766A6
EventScript_SecretPower2:: @ 82766A6
special sub_80EB2C8
end

2
data/scripts/tv.inc
View File

@@ -1,4 +1,4 @@
EventScript_27EE0B:: @ 827EE0B
EventScript_TV:: @ 827EE0B
lockall
incrementgamestat 44
special ResetTVShowState

2
data/specials.inc
View File

@@ -9,7 +9,7 @@
.align 2
gSpecials:: @ 81DBA64
def_special HealPlayerParty
def_special sub_809D2BC
def_special SetCableClubWarp
def_special sub_80AF948
def_special sub_80AF9F8
def_special sub_80B36EC