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

nerge with master, fix conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-16 01:08:55 +01:00
parent 039c9f4bd8 224fdbf026
commit 44abbae60b
189 changed files with 20685 additions and 24533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -482,7 +482,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A
goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A
compare_var_to_value VAR_0x40D3, 2
goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
checkflag FLAG_0x119
goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2

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

@@ -293,7 +293,7 @@ PetalburgWoods_EventScript_22E284:: @ 822E284
PetalburgWoods_EventScript_22E2C5:: @ 822E2C5
special sub_80B4808
waitmovement 0
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq PetalburgWoods_EventScript_22E2D6
release
end
@@ -308,7 +308,7 @@ PetalburgWoods_EventScript_22E2D6:: @ 822E2D6
end
PetalburgWoods_EventScript_22E2EF:: @ 822E2EF
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq PetalburgWoods_EventScript_22E302
msgbox PetalburgWoods_Text_22E889, 4
release

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

@@ -33,7 +33,7 @@ Route102_EventScript_1EC105:: @ 81EC105
Route102_EventScript_1EC146:: @ 81EC146
special sub_80B4808
waitmovement 0
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route102_EventScript_1EC157
release
end
@@ -48,7 +48,7 @@ Route102_EventScript_1EC157:: @ 81EC157
end
Route102_EventScript_1EC170:: @ 81EC170
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route102_EventScript_1EC183
msgbox Route102_Text_2945AC, 4
release

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

@@ -896,7 +896,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D
Route104_EventScript_1ED3CE:: @ 81ED3CE
special sub_80B4808
waitmovement 0
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route104_EventScript_1ED3DF
release
end
@@ -911,7 +911,7 @@ Route104_EventScript_1ED3DF:: @ 81ED3DF
end
Route104_EventScript_1ED3F8:: @ 81ED3F8
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route104_EventScript_1ED40B
msgbox Route104_Text_295689, 4
release
@@ -947,7 +947,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B
Route104_EventScript_1ED47C:: @ 81ED47C
special sub_80B4808
waitmovement 0
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route104_EventScript_1ED48D
release
end
@@ -962,7 +962,7 @@ Route104_EventScript_1ED48D:: @ 81ED48D
end
Route104_EventScript_1ED4A6:: @ 81ED4A6
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route104_EventScript_1ED4B9
msgbox Route104_Text_2958C1, 4
release
@@ -998,7 +998,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9
Route104_EventScript_1ED52A:: @ 81ED52A
special sub_80B4808
waitmovement 0
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route104_EventScript_1ED53B
release
end
@@ -1013,7 +1013,7 @@ Route104_EventScript_1ED53B:: @ 81ED53B
end
Route104_EventScript_1ED554:: @ 81ED554
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route104_EventScript_1ED567
msgbox Route104_Text_295AC3, 4
release

8
data/scripts/maps/Route116.inc
View File

@@ -271,7 +271,7 @@ Route116_EventScript_1F2EB7:: @ 81F2EB7
end
Route116_EventScript_1F2EF8:: @ 81F2EF8
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route116_EventScript_1F2F03
release
end
@@ -288,7 +288,7 @@ Route116_EventScript_1F2F03:: @ 81F2F03
end
Route116_EventScript_1F2F22:: @ 81F2F22
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route116_EventScript_1F2F35
msgbox Route116_Text_29BD92, 4
release
@@ -332,7 +332,7 @@ Route116_EventScript_1F2F93:: @ 81F2F93
end
Route116_EventScript_1F2FD4:: @ 81F2FD4
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route116_EventScript_1F2FDF
release
end
@@ -349,7 +349,7 @@ Route116_EventScript_1F2FDF:: @ 81F2FDF
end
Route116_EventScript_1F2FFE:: @ 81F2FFE
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route116_EventScript_1F3011
msgbox Route116_Text_29C010, 4
release

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

@@ -52,7 +52,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715
waitmovement 0
msgbox RustboroCity_Text_1E22A5, 4
closemessage
setflag FLAG_0x12F
setflag FLAG_HAS_MATCH_CALL
applymovement 15, RustboroCity_Movement_2725A4
waitmovement 0
playse SE_TK_KASYA

2
data/scripts/players_house.inc
View File

@@ -318,7 +318,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F
compare_var_to_value VAR_0x408C, 4
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A19
checkflag FLAG_0x052
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86