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-22 12:18:48 -04:00
committed by GitHub
parent 58b8d7c297 9d4fc9234b
commit a180d2af49
94 changed files with 2841 additions and 2662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
data/event_scripts.s
View File

@@ -11,12 +11,15 @@
#include "constants/flags.h"
#include "constants/game_stat.h"
#include "constants/decorations.h"
#include "constants/item.h"
#include "constants/items.h"
#include "constants/heal_locations.h"
#include "constants/layouts.h"
#include "constants/map_scripts.h"
#include "constants/maps.h"
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/script_menu.h"
#include "constants/secret_bases.h"
#include "constants/songs.h"
#include "constants/species.h"
@@ -822,7 +825,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_ROUTE_103_BIRCH
setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR
setflag FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER
setflag FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER
setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE
setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON
setflag FLAG_UNKNOWN_0x393
@@ -1019,50 +1022,50 @@ Std_ObtainItem:: @ 8271AD3
EventScript_271AE3:: @ 8271AE3
bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
checkitemtype VAR_0x8000
call EventScript_271B08
call EventScript_BufferStdString
compare VAR_0x8007, 1
call_if_eq EventScript_271B95
compare VAR_0x8007, 0
call_if_eq EventScript_271BA9
return
EventScript_271B08:: @ 8271B08
EventScript_BufferStdString:: @ 8271B08
switch VAR_RESULT
case 1, EventScript_271B45
case 5, EventScript_271B55
case 2, EventScript_271B65
case 3, EventScript_271B75
case 4, EventScript_271B85
case POCKET_ITEMS, EventScript_StdStringItem
case POCKET_KEY_ITEMS, EventScript_StdStringKeyItems
case POCKET_POKE_BALLS, EventScript_StdStringPokeballs
case POCKET_TM_HM, EventScript_StdStringTMHMS
case POCKET_BERRIES, EventScript_StdStringBerries
end
EventScript_271B45:: @ 8271B45
bufferstdstring 2, 14
EventScript_StdStringItem:: @ 8271B45
bufferstdstring 2, STDSTRING_ITEMS
compare VAR_0x8007, 1
call_if_eq EventScript_271BAF
call_if_eq EventScript_PlayFanfare4
return
EventScript_271B55:: @ 8271B55
bufferstdstring 2, 15
EventScript_StdStringKeyItems:: @ 8271B55
bufferstdstring 2, STDSTRING_KEYITEMS
compare VAR_0x8007, 1
call_if_eq EventScript_271BAF
call_if_eq EventScript_PlayFanfare4
return
EventScript_271B65:: @ 8271B65
bufferstdstring 2, 16
EventScript_StdStringPokeballs:: @ 8271B65
bufferstdstring 2, STDSTRING_POKEBALLS
compare VAR_0x8007, 1
call_if_eq EventScript_271BAF
call_if_eq EventScript_PlayFanfare4
return
EventScript_271B75:: @ 8271B75
bufferstdstring 2, 17
EventScript_StdStringTMHMS:: @ 8271B75
bufferstdstring 2, STDSTRING_TMHMS
compare VAR_0x8007, 1
call_if_eq EventScript_271BB3
return
EventScript_271B85:: @ 8271B85
bufferstdstring 2, 18
EventScript_StdStringBerries:: @ 8271B85
bufferstdstring 2, STDSTRING_BERRIES
compare VAR_0x8007, 1
call_if_eq EventScript_271BAF
call_if_eq EventScript_PlayFanfare4
return
EventScript_271B95:: @ 8271B95
@@ -1076,7 +1079,7 @@ EventScript_271BA9:: @ 8271BA9
setvar VAR_RESULT, 0
return
EventScript_271BAF:: @ 8271BAF
EventScript_PlayFanfare4:: @ 8271BAF
playfanfare MUS_FANFA4
return
@@ -1120,7 +1123,7 @@ Std_FindItem:: @ 8271BFD
copyvar VAR_0x8007, VAR_RESULT
bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
checkitemtype VAR_0x8000
call EventScript_271B08
call EventScript_BufferStdString
compare VAR_0x8007, 1
call_if_eq EventScript_PickItemUp
compare VAR_0x8007, 0
@@ -1173,7 +1176,7 @@ EventScript_HiddenItemScript:: @ 8271CB7
copyvar VAR_0x8007, VAR_RESULT
bufferitemnameplural 1, VAR_0x8005, 1
checkitemtype VAR_0x8005
call EventScript_271B08
call EventScript_BufferStdString
compare VAR_0x8007, 1
goto_if_eq EventScript_271CE8
compare VAR_0x8007, 0
@@ -1254,7 +1257,7 @@ EventScript_PC:: @ 8271D92
EventScript_271DAC:: @ 8271DAC
message gText_WhichPCShouldBeAccessed
waitmessage
special ScrSpecial_CreatePCMenu
special ScriptMenu_CreatePCMultichoice
waitstate
goto EventScript_271DBC
end
@@ -1265,7 +1268,7 @@ EventScript_271DBC:: @ 8271DBC
case 1, EventScript_271DF9
case 2, EventScript_271E54
case 3, EventScript_271E47
case 127, EventScript_271E47
case MULTI_B_PRESSED, EventScript_271E47
end
EventScript_271DF9:: @ 8271DF9
@@ -1655,15 +1658,13 @@ Route101_EventScript_272184:: @ 8272184
msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT
return
BattleFrontier_OutsideWest_EventScript_2721E2:: @ 82721E2
LilycoveCity_Harbor_EventScript_2721E2:: @ 82721E2
SlateportCity_Harbor_EventScript_2721E2:: @ 82721E2
Common_EventScript_FerryDepart:: @ 82721E2
delay 60
applymovement VAR_0x8004, SlateportCity_Harbor_Movement_2721F0
applymovement VAR_0x8004, Movement_FerryDepart
waitmovement 0
return
SlateportCity_Harbor_Movement_2721F0: @ 82721F0
Movement_FerryDepart: @ 82721F0
walk_slow_right
walk_slow_right
walk_slow_right
@@ -1720,7 +1721,7 @@ SouthernIsland_Exterior_EventScript_272250:: @ 8272250
call_if_eq BattleFrontier_OutsideWest_EventScript_242A2C
delay 30
hideobjectat 255, MAP_PETALBURG_CITY
call BattleFrontier_OutsideWest_EventScript_2721E2
call Common_EventScript_FerryDepart
return
EventScript_272274:: @ 8272274
@@ -3663,7 +3664,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96
BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8
message BattleFrontier_BattleTowerLobby_Text_27F7BA
waitmessage
multichoice 20, 8, 45, 1
multichoice 20, 8, MULTI_SATISFACTION, 1
copyvar VAR_0x8008, VAR_RESULT
compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38
@@ -3855,7 +3856,7 @@ MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D
.include "data/text/roulette.inc"
.include "data/text/pokedex_rating.inc"
.include "data/text/lottery_corner.inc"
.include "data/text/eon_ticket.inc"
.include "data/text/event_ticket_1.inc"
.include "data/text/braille.inc"
.include "data/text/berries.inc"
.include "data/text/shoal_cave.inc"
@@ -5094,77 +5095,7 @@ VerdanturfTown_BattleTentLobby_Text_2C6878: @ 82C6878
.string "The VERDANTURF BATTLE TENT\n"
.string "rules are listed.$"
LilycoveCity_Harbor_Text_2C68A5: @ 82C68A5
.string "What's up, youngster?\p"
.string "What, it's you who's supposed to have\n"
.string "a tattered old map?\p"
.string "Let's have a look.\n"
.string "… … … … … …\p"
.string "Boy, this is quite a ways away.\n"
.string "I'm afraid I can't help you…$"
LilycoveCity_Harbor_Text_2C6951: @ 82C6951
.string "BRINEY: Hold on a second!\p"
.string "What's the idea of turning down\n"
.string "someone that I owe so much to?$"
LilycoveCity_Harbor_Text_2C69AA: @ 82C69AA
.string "{PLAYER}{KUN}, I'm terribly sorry.\p"
.string "You came to me seeking my help,\n"
.string "and we almost turned you away.\p"
.string "Well, let me make things right.\p"
.string "We'll sail right away, of course!\p"
.string "Let's find this island on\n"
.string "this OLD SEA MAP!$"
LilycoveCity_Harbor_Text_2C6A71: @ 82C6A71
.string "Is it you who brought that odd\n"
.string "ticket?\p"
.string "Where you're trying to go is an island\n"
.string "that's far, far away.\p"
.string "No one knows what awaits there…\p"
.string "The very thought excites my blood\n"
.string "as a sailing man!\p"
.string "Get on board, youngster!$"
FarawayIsland_Entrance_Text_2C6B42: @ 82C6B42
.string "CAPT. BRINEY can be so maddeningly\n"
.string "fickle…\p"
.string "Do you want to return to LILYCOVE?$"
BirthIsland_Harbor_Text_2C6B90: @ 82C6B90
.string "What an oddly shaped island, eh?\n"
.string "Do you want to return to LILYCOVE?$"
LilycoveCity_Harbor_Text_2C6BD4: @ 82C6BD4
.string "Is it you who brought those\n"
.string "odd tickets?\p"
.string "… … …Hm.\p"
.string "These tickets will get you to islands\n"
.string "that are far, far away.\p"
.string "No one knows what awaits there,\n"
.string "or what may happen there.\p"
.string "The very thought excites my blood\n"
.string "as a sailing man!\p"
.string "Get on board, youngster!\n"
.string "Where shall we sail first?$"
NavelRock_Harbor_Text_2C6CE6: @ 82C6CE6
.string "Did… Did you hear that?\n"
.string "That low growling from deep in there.\p"
.string "Are you sure it's safe?\n"
.string "Do you think we should leave?$"
FarawayIsland_Entrance_Text_2C6D5A: @ 82C6D5A
.string "The writing is fading as if it was\n"
.string "written a long time ago…\p"
.string "“…ber, 6th day\n"
.string "If any human…sets foot here…\l"
.string "again…et it be a kindhearted pers…\l"
.string "…ith that hope, I depar…”$"
FarawayIsland_Interior_Text_2C6DFF: @ 82C6DFF
.string "Myuu…$"
.include "data/text/event_ticket_2.inc"
MauvilleCity_Text_2C6E05: @ 82C6E05
.string "This move can be learned only\n"