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-03 22:22:14 -04:00
committed by GitHub
parent ecf2097abb 1f4c88c952
commit 6b04ea0727
173 changed files with 12838 additions and 2094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View File

@@ -595,76 +595,76 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1
createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, 1
createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652
createvobject EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 2, 15, 0, 3, 1
createvobject EVENT_OBJ_GFX_MAN_5, 3, 5, 0, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 5, 7, 0, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_3, 8, 10, 0, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1
createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 12, 14, 0, 3, 1
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 2, 3, 1
createvobject EVENT_OBJ_GFX_HIKER, 14, 12, 2, 3, 1
createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_3, 18, 6, 1, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, 1
createvobject EVENT_OBJ_GFX_MAN_2, 21, 10, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, 1
createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 14, 1, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1
createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_5, 3, 5, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 5, 7, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_3, 8, 10, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 12, 14, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_HIKER, 14, 12, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_3, 18, 6, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_2, 21, 10, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 14, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH
return
BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773

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

@@ -63,7 +63,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
waitmovement 0
applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77
waitmovement 0
moveobjectoffscreen 1
copyobjectxytoperm 1
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT

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

@@ -180,7 +180,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
resetobjectpriority 2, MAP_ROUTE109
moveobjectoffscreen 2
copyobjectxytoperm 2
release
end

4
data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
View File

@@ -67,8 +67,8 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
waitmessage
waitfanfare
closemessage
moveobjectoffscreen 3
moveobjectoffscreen 4
copyobjectxytoperm 3
copyobjectxytoperm 4
setflag FLAG_ENTERED_ELITE_FOUR
releaseall
end

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

@@ -62,7 +62,7 @@ FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2
waitmovement 0
applymovement 1, FarawayIsland_Interior_Movement_267DCE
waitmovement 0
moveobjectoffscreen 1
copyobjectxytoperm 1
setvar VAR_TEMP_1, 1
releaseall
end

1
data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
View File

@@ -144,7 +144,6 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
compare VAR_TEMP_1, 2
call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220328
updatemoneybox 0, 0
nop
bufferitemname 0, VAR_TEMP_0
playse SE_JIHANKI
msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, MSGBOX_DEFAULT

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

@@ -9,7 +9,7 @@ LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD
end
LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6
special sub_818D9C0
special SetLilycoveLadyGfx
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0
compare VAR_RESULT, 1

222
data/maps/LinkContestRoom1/scripts.inc
View File

@@ -172,131 +172,131 @@ LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8
end
LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B
setvar VAR_TEMP_1, 5
setvar VAR_TEMP_1, EVENT_OBJ_GFX_NINJA_BOY
return
LinkContestRoom1_EventScript_23BA71:: @ 823BA71
setvar VAR_TEMP_1, 6
setvar VAR_TEMP_1, EVENT_OBJ_GFX_TWIN
return
LinkContestRoom1_EventScript_23BA77:: @ 823BA77
setvar VAR_TEMP_1, 7
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_1
return
LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D
setvar VAR_TEMP_1, 8
setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_1
return
LinkContestRoom1_EventScript_23BA83:: @ 823BA83
setvar VAR_TEMP_1, 10
setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_2
return
LinkContestRoom1_EventScript_23BA89:: @ 823BA89
setvar VAR_TEMP_1, 11
setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_BOY
return
LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F
setvar VAR_TEMP_1, 12
setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_GIRL
return
LinkContestRoom1_EventScript_23BA95:: @ 823BA95
setvar VAR_TEMP_1, 13
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_3
return
LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B
setvar VAR_TEMP_1, 14
setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_3
return
LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1
setvar VAR_TEMP_1, 15
setvar VAR_TEMP_1, EVENT_OBJ_GFX_RICH_BOY
return
LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7
setvar VAR_TEMP_1, 17
setvar VAR_TEMP_1, EVENT_OBJ_GFX_FAT_MAN
return
LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD
setvar VAR_TEMP_1, 18
setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_F
return
LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3
setvar VAR_TEMP_1, 19
setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_1
return
LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9
setvar VAR_TEMP_1, 20
setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_2
return
LinkContestRoom1_EventScript_23BABF:: @ 823BABF
setvar VAR_TEMP_1, 21
setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_M
return
LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5
setvar VAR_TEMP_1, 22
setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_F
return
LinkContestRoom1_EventScript_23BACB:: @ 823BACB
setvar VAR_TEMP_1, 25
setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_M
return
LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1
setvar VAR_TEMP_1, 26
setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_4
return
LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7
setvar VAR_TEMP_1, 27
setvar VAR_TEMP_1, EVENT_OBJ_GFX_COOK
return
LinkContestRoom1_EventScript_23BADD:: @ 823BADD
setvar VAR_TEMP_1, 47
setvar VAR_TEMP_1, EVENT_OBJ_GFX_LASS
return
LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3
setvar VAR_TEMP_1, 30
setvar VAR_TEMP_1, EVENT_OBJ_GFX_OLD_WOMAN
return
LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9
setvar VAR_TEMP_1, 31
setvar VAR_TEMP_1, EVENT_OBJ_GFX_CAMPER
return
LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF
setvar VAR_TEMP_1, 32
setvar VAR_TEMP_1, EVENT_OBJ_GFX_PICNICKER
return
LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5
setvar VAR_TEMP_1, 33
setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_3
return
LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB
setvar VAR_TEMP_1, 34
setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_5
return
LinkContestRoom1_EventScript_23BB01:: @ 823BB01
setvar VAR_TEMP_1, 35
setvar VAR_TEMP_1, EVENT_OBJ_GFX_YOUNGSTER
return
LinkContestRoom1_EventScript_23BB07:: @ 823BB07
setvar VAR_TEMP_1, 36
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BUG_CATCHER
return
LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D
setvar VAR_TEMP_1, 37
setvar VAR_TEMP_1, EVENT_OBJ_GFX_PSYCHIC_M
return
LinkContestRoom1_EventScript_23BB13:: @ 823BB13
setvar VAR_TEMP_1, 38
setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCHOOL_KID_M
return
LinkContestRoom1_EventScript_23BB19:: @ 823BB19
setvar VAR_TEMP_1, 44
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BLACK_BELT
return
LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F
setvar VAR_TEMP_1, 45
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BEAUTY
return
LinkContestRoom1_EventScript_23BB25:: @ 823BB25
setvar VAR_TEMP_1, 46
setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCIENTIST_1
return
LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
@@ -312,97 +312,97 @@ LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
return
LinkContestRoom1_EventScript_23BB78:: @ 823BB78
createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
return
LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, 4
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, 3
createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
return
LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, 4
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, 1
createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, 2
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, 2
createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, 2
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, 2
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, 2
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, 2
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
return
LinkContestRoom1_EventScript_23BC92:: @ 823BC92
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, 4
createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, 4
createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, 4
createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, 4
createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, 4
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3
createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, 3
createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, 3
createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, 3
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, 3
createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, 3
createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, 2
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, 2
createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, 2
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, 2
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, 2
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, 2
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
return
LinkContestRoom1_EventScript_23BD86:: @ 823BD86
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, 4
createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, 4
createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, 4
createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, 4
createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, 4
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3
createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, 3
createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, 3
createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, 3
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, 3
createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, 3
createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
return
LinkContestRoom1_EventScript_23BE44:: @ 823BE44

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

@@ -40,7 +40,6 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33
givecoins 50
takemoney 0x3e8, 0
updatemoneybox 0, 0
nop
updatecoinsbox 1, 6
playse SE_REGI
msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT
@@ -61,7 +60,6 @@ MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75
givecoins 500
takemoney 0x2710, 0
updatemoneybox 0, 0
nop
updatecoinsbox 1, 6
playse SE_REGI
msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT

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

@@ -236,7 +236,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F
msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_223BC2
setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F
moveobjectoffscreen 9
copyobjectxytoperm 9
switch VAR_FACING
case 3, MossdeepCity_SpaceCenter_1F_EventScript_223278
case 3, MossdeepCity_SpaceCenter_1F_EventScript_223289

6
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
View File

@@ -70,9 +70,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09
applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89
waitmovement 0
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2
moveobjectoffscreen 5
moveobjectoffscreen 7
moveobjectoffscreen 6
copyobjectxytoperm 5
copyobjectxytoperm 7
copyobjectxytoperm 6
releaseall
end

1
data/maps/MtChimney/scripts.inc
View File

@@ -131,7 +131,6 @@ MtChimney_EventScript_22EF51:: @ 822EF51
MtChimney_EventScript_22EF5E:: @ 822EF5E
takemoney 0xc8, 0
updatemoneybox 0, 0
nop
return
MtChimney_EventScript_22EF69:: @ 822EF69

6
data/maps/Route104/scripts.inc
View File

@@ -114,7 +114,7 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B
waitmovement 0
applymovement 34, Route104_Movement_1ECDCA
waitmovement 0
moveobjectoffscreen 34
copyobjectxytoperm 34
msgbox Route104_Text_1EDCED, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if_eq Route104_EventScript_1ECDED
@@ -203,7 +203,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F
waitmovement 0
applymovement 34, Route104_Movement_1ECDCA
waitmovement 0
moveobjectoffscreen 34
copyobjectxytoperm 34
msgbox Route104_Text_1EE009, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if_eq Route104_EventScript_1ECF09
@@ -416,7 +416,7 @@ Route104_EventScript_1ED139:: @ 81ED139
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
resetobjectpriority 2, MAP_DEWFORD_TOWN
moveobjectoffscreen 2
copyobjectxytoperm 2
setvar VAR_BOARD_BRINEY_BOAT_STATE, 0
goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4
goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE

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

@@ -88,7 +88,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442
goto_if_set FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_22A482
msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT
random 8
addvar VAR_RESULT, 133
addvar VAR_RESULT, FIRST_BERRY_INDEX
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull

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

@@ -58,7 +58,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
resetobjectpriority 2, MAP_DEWFORD_TOWN
moveobjectoffscreen 2
copyobjectxytoperm 2
release
end

1
data/maps/Route109_SeashoreHouse/scripts.inc
View File

@@ -58,7 +58,6 @@ Route109_SeashoreHouse_EventScript_269484:: @ 8269484
msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT
takemoney 0x12c, 0
updatemoneybox 0, 0
nop
giveitem_std ITEM_SODA_POP
hidemoneybox
nop

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

@@ -77,7 +77,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
fadescreen 0
applymovement 5, Route119_WeatherInstitute_2F_Movement_270187
waitmovement 0
moveobjectoffscreen 5
copyobjectxytoperm 5
goto Route119_WeatherInstitute_2F_EventScript_27004D
end

1
data/maps/Route121_SafariZoneEntrance/scripts.inc
View File

@@ -68,7 +68,6 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT
takemoney 0x1f4, 0
updatemoneybox 0, 0
nop
msgbox Route121_SafariZoneEntrance_Text_2A5036, MSGBOX_DEFAULT
playfanfare MUS_FANFA4
message Route121_SafariZoneEntrance_Text_2A5052

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

@@ -494,7 +494,7 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E
call_if_eq RustboroCity_EventScript_1E0BF3
setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN
setvar VAR_RUSTBORO_CITY_STATE, 3
moveobjectoffscreen 9
copyobjectxytoperm 9
msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT
releaseall
end

4
data/maps/RusturfTunnel/scripts.inc
View File

@@ -285,8 +285,8 @@ RusturfTunnel_EventScript_22D083:: @ 822D083
applymovement 6, RusturfTunnel_Movement_22D0AB
applymovement 7, RusturfTunnel_Movement_22D0AB
waitmovement 0
moveobjectoffscreen 6
moveobjectoffscreen 7
copyobjectxytoperm 6
copyobjectxytoperm 7
setvar VAR_RUSTURF_TUNNEL_STATE, 3
releaseall
end

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

@@ -26,7 +26,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
call_if_eq SeafloorCavern_Entrance_EventScript_234539
delay 30
setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
moveobjectoffscreen 1
copyobjectxytoperm 1
msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT
closemessage
applymovement 1, Common_Movement_WalkInPlaceUp

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

@@ -77,7 +77,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
closemessage
setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE
setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE
moveobjectoffscreen 4
copyobjectxytoperm 4
setobjectmovementtype 4, MOVEMENT_TYPE_FACE_RIGHT
releaseall
end

1
data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
View File

@@ -40,7 +40,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8
playse SE_REGI
takemoney 0x32, 0
updatemoneybox 0, 0
nop
msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT
setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
hidemoneybox

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

@@ -1366,14 +1366,14 @@ SootopolisCity_EventScript_1E646F:: @ 81E646F
SootopolisCity_EventScript_1E64B2:: @ 81E64B2
applymovement 18, SootopolisCity_Movement_1E64EC
waitmovement 0
moveobjectoffscreen 18
copyobjectxytoperm 18
setvar VAR_SOOTOPOLIS_WALLACE_STATE, 1
return
SootopolisCity_EventScript_1E64C5:: @ 81E64C5
applymovement 18, SootopolisCity_Movement_1E64EF
waitmovement 0
moveobjectoffscreen 18
copyobjectxytoperm 18
setvar VAR_SOOTOPOLIS_WALLACE_STATE, 2
return

4
data/maps/SootopolisCity_Gym_1F/scripts.inc
View File

@@ -222,6 +222,10 @@ SootopolisCity_Gym_1F_Text_225268: @ 8225268
.string "A grand illusion of water sculpted\n"
.string "by POKéMON and myself!$"
@ NOTE: This defeat text actually causes a buffer overflow. It's about 50 bytes too long for
@ the gDisplayedStringBattle buffer that it's put into, and it stomps all over the gBattleTextBuffs
@ after, as well as the otherwise unused array after that. One wonders if that's the reason for
@ the existence of that unused array of ints.
SootopolisCity_Gym_1F_Text_225432: @ 8225432
.string "Ahahaha, excellent!\n"
.string "Very well, you are the winner.\p"

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

@@ -36,7 +36,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
waitmovement 0
applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21
waitmovement 0
moveobjectoffscreen 1
copyobjectxytoperm 1
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1

2
data/maps/UnknownLinkContestRoom_25_29/map.json
View File

@@ -1,5 +1,5 @@
{
"id": "MAP_UNKNOWN_MAP_25_29",
"id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29",
"name": "UnknownLinkContestRoom_25_29",
"layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
"music": "MUS_NIBI",

2
data/maps/UnknownLinkContestRoom_25_30/map.json
View File

@@ -1,5 +1,5 @@
{
"id": "MAP_UNKNOWN_MAP_25_30",
"id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30",
"name": "UnknownLinkContestRoom_25_30",
"layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
"music": "MUS_NIBI",

2
data/maps/UnknownLinkContestRoom_25_31/map.json
View File

@@ -1,5 +1,5 @@
{
"id": "MAP_UNKNOWN_MAP_25_31",
"id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31",
"name": "UnknownLinkContestRoom_25_31",
"layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
"music": "MUS_NIBI",

2
data/maps/UnknownLinkContestRoom_25_32/map.json
View File

@@ -1,5 +1,5 @@
{
"id": "MAP_UNKNOWN_MAP_25_32",
"id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32",
"name": "UnknownLinkContestRoom_25_32",
"layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
"music": "MUS_NIBI",

2
data/maps/UnknownLinkContestRoom_25_33/map.json
View File

@@ -1,5 +1,5 @@
{
"id": "MAP_UNKNOWN_MAP_25_33",
"id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33",
"name": "UnknownLinkContestRoom_25_33",
"layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
"music": "MUS_NIBI",

2
data/maps/UnknownLinkContestRoom_25_34/map.json
View File

@@ -1,5 +1,5 @@
{
"id": "MAP_UNKNOWN_MAP_25_34",
"id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34",
"name": "UnknownLinkContestRoom_25_34",
"layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
"music": "MUS_NIBI",

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

@@ -44,7 +44,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC
msgbox VictoryRoad_1F_Text_236020, MSGBOX_DEFAULT
clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
moveobjectoffscreen 4
copyobjectxytoperm 4
setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
copyvar VAR_VICTORY_ROAD_1F_STATE, VAR_0x8008
releaseall